diff --git a/.actrc b/.actrc
new file mode 100644
index 00000000000000..44367d36ab8b94
--- /dev/null
+++ b/.actrc
@@ -0,0 +1,27 @@
+# This file contains settings for local github action runner act:
+# https://github.com/nektos/act
+#
+# It is recommended to run specific jobs that you need, all jobs except those
+# running on should darwin work.
+# e.g. act -j build_linux
+#
+# It is recommended to set up a separate bridge network
+# and possibly define it in  ~/.actrc like so:
+# --network=bridge
+# https://docs.docker.com/network/drivers/bridge/
+
+# Remove containers after finishing a job, comment out for debugging
+--rm
+
+# Reuse the checkout from host, otherwise act will do docker cp that makes
+# running jobs a lot longer even on SSD. Clean up your .environment before
+# running it.
+--bind
+
+# Easier to have 1:1 match between triggering jobs and reading logs when they
+# use the same name
+--log-prefix-job-id
+
+# Default runner image does not include enough.
+# https://github.com/nektos/act#default-runners-are-intentionally-incomplete
+-P ubuntu-latest=catthehacker/ubuntu:full-latest
diff --git a/.github/actions/checkout-submodules-and-bootstrap/action.yaml b/.github/actions/checkout-submodules-and-bootstrap/action.yaml
index 892cf93716cb8d..8ddaec14e7bc47 100644
--- a/.github/actions/checkout-submodules-and-bootstrap/action.yaml
+++ b/.github/actions/checkout-submodules-and-bootstrap/action.yaml
@@ -17,6 +17,8 @@ runs:
   steps:
     - name: Dump disk info
       uses: ./.github/actions/dump-disk-info
+    - name: Set git safe directory for local act runs
+      uses: ./.github/actions/git-safe-directory
     - name: Checkout submodules
       uses: ./.github/actions/checkout-submodules
       with:
diff --git a/.github/actions/git-safe-directory/action.yaml b/.github/actions/git-safe-directory/action.yaml
new file mode 100644
index 00000000000000..1308c4ea1bf524
--- /dev/null
+++ b/.github/actions/git-safe-directory/action.yaml
@@ -0,0 +1,9 @@
+name: Git safe directory
+description: For running act with checkout owned by non-root user
+runs:
+  using: "composite"
+  steps:
+    - name: Set git safe.directory to "*"
+      if: ${{ env.ACT }}
+      shell: bash
+      run: git config --system --add safe.directory '*'
\ No newline at end of file
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index f9e4a7a44840c5..c6fa9bcf943bef 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -105,7 +105,7 @@ labelPRBasedOnFilePath:
         - src/darwin/*
 
     efr32:
-        - src/platform/efr32/*
+        - src/platform/silabs/*
 
     esp32:
         - src/platform/ESP32/*
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 2a1dee179aa3e0..7418a53ef5fc67 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -33,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 588ded31e8cbf9..ac717ef1e7b245 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -135,7 +135,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -283,7 +283,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -343,7 +343,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -451,7 +451,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index 2b5b34478b677f..e68021d143fa59 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:22
+            image: ghcr.io/project-chip/chip-build-esp32:26
             options: --user root
 
         steps:
@@ -75,7 +75,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:22
+            image: ghcr.io/project-chip/chip-build-nrf-platform:26
             options: --user root
 
         steps:
@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:22
+            image: ghcr.io/project-chip/chip-build-telink:26
             options: --user root
 
         steps:
@@ -106,6 +106,9 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: telink
+            # - name: Update Zephyr to specific revision (for developers purpose)
+            #   shell: bash
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
             - name: CI Examples Telink
               shell: bash
               run: |
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index c19e1dd911755c..a8d18c5dec9d85 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -40,7 +40,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: ghcr.io/project-chip/chip-build-cirque:22
+        #             image: ghcr.io/project-chip/chip-build-cirque:26
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 21f2a227be1a72..74d2f7e32deb0f 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -98,6 +98,7 @@ jobs:
                         --target darwin-x64-ota-requestor-${BUILD_VARIANT} \
                         --target darwin-x64-tv-app-${BUILD_VARIANT} \
                         --target darwin-x64-bridge-${BUILD_VARIANT} \
+                        --target darwin-x64-lit-icd-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
                      "
@@ -147,8 +148,8 @@ jobs:
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
               with:
-                  name: framework-build-log-darwin-${{BUILD_VARIANT_FRAMEWORK_TOOL}}
-                  path: out/darwin-x64-darwin-framework-tool-${{BUILD_VARIANT_FRAMEWORK_TOOL}}/darwin_framework_build.log
+                  name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL}
+                  path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 8b7e44ef82ee00..50ab4e0142eed5 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -111,10 +111,8 @@ jobs:
                   # -enableUndefinedBehaviorSanitizer instruments the code in Matter.framework,
                   # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
                   TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'> >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
-                  # And the same thing, but with MTR_PER_CONTROLLER_STORAGE_ENABLED turned on.
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage-err.log >&2)
-                  # And the same thing, but with MTR_ENABLE_PROVISIONAL also turned on.
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=1 MTR_ENABLE_PROVISIONAL=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional-err.log >&2)
+                  # And the same thing, but with MTR_PER_CONTROLLER_STORAGE_ENABLED turned off, so we test that it does not break for now.
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=0' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage-err.log >&2)
                   # And the same thing, but with MTR_NO_AVAILABILITY not turned on.  This requires -Wno-unguarded-availability-new to avoid availability errors.
                   TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited}' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations-err.log >&2)
                   # -enableThreadSanitizer instruments the code in Matter.framework,
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 4e4e2abf319891..e89d26c1c335d4 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -81,7 +81,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:22
+            image: ghcr.io/project-chip/chip-build-doxygen:26
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 42afb3ee37b1e7..ac1e6d01fde353 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:22
+            image: ghcr.io/project-chip/chip-build-ameba:26
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 7bb7e790595f10..918a5e0e67bd49 100644
--- a/.github/workflows/examples-asr.yaml
+++ b/.github/workflows/examples-asr.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:22
+            image: ghcr.io/project-chip/chip-build-asr:26
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 53a43c267251c6..0efaf4831a91b0 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -35,7 +35,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:22
+      image: ghcr.io/project-chip/chip-build-bouffalolab:26
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
index 4229f9800f2df8..c2ad4bfef8b2a8 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:22
+            image: ghcr.io/project-chip/chip-build-ti:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index 5a77c801447b6e..a3a17188ae677d 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:22
+            image: ghcr.io/project-chip/chip-build-ti:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 899ac288dc1c70..83c66dcf6e7bfe 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -38,7 +38,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:22
+      image: ghcr.io/project-chip/chip-build-efr32:26
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index f1b8ff3b6f20a7..48ffb63425f611 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:22
+            image: ghcr.io/project-chip/chip-build-esp32:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -130,7 +130,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:22
+            image: ghcr.io/project-chip/chip-build-esp32:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index 7fc006fe8f6698..4ea2a28f61cc6f 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:22
+            image: ghcr.io/project-chip/chip-build-infineon:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
index 541106d618e2d5..5d811a986c757a 100644
--- a/.github/workflows/examples-k32w.yaml
+++ b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:22
+            image: ghcr.io/project-chip/chip-build-k32w:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index 4645b4e897d3ff..c49b8d84d75fdc 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:22
+            image: ghcr.io/project-chip/chip-build-crosscompile:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -64,6 +64,7 @@ jobs:
                         --target linux-arm64-minmdns-clang \
                         --target linux-arm64-light-rpc-ipv6only-clang \
                         --target linux-arm64-thermostat-no-ble-clang \
+                        --target linux-arm64-lit-icd-no-ble-clang \
                         build \
                      "
             - name: Bloat report - chip-tool
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index e34148a8ff0a91..f5aaa654af9295 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:22
+            image: ghcr.io/project-chip/chip-build-imx:26
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 8661b99d253b5f..4845ce0b235567 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index a73d825ee444e8..7ecdfdb6f8a41f 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-mbed-os:22
+            image: ghcr.io/project-chip/chip-build-mbed-os:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index b5658efdcdf687..6f87859071cb8b 100644
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index b1cf4cd87279f3..c8495aad304a60 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:22
+            image: ghcr.io/project-chip/chip-build-nrf-platform:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index de63249ee89d6a..f468341b0b84b1 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-openiotsdk:22
+            image: ghcr.io/project-chip/chip-build-openiotsdk:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index 3590b33a7c6829..027aaa80c18a87 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index dce5de01d786d9..6da7ccd697fe06 100644
--- a/.github/workflows/examples-stm32.yaml
+++ b/.github/workflows/examples-stm32.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index 225ddf16fd190b..e7b760d0cf7e53 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:22
+            image: ghcr.io/project-chip/chip-build-telink:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -54,13 +54,16 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
-            - name: Build example Telink (B92) Air Quality Sensor App
+            # - name: Update Zephyr to specific revision (for developers purpose)
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
+
+            - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-air-quality-sensor' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-air-quality-sensor' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a air-quality-sensor-app \
-                    out/telink-tlsr9528a-air-quality-sensor/zephyr/zephyr.elf \
+                    telink tlsr9528a_retention air-quality-sensor-app \
+                    out/telink-tlsr9528a_retention-air-quality-sensor/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
@@ -102,13 +105,13 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B92) Contact Sensor App
+            - name: Build example Telink (B92 retention) Contact Sensor App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-contact-sensor' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-contact-sensor' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a contact-sensor-app \
-                    out/telink-tlsr9528a-contact-sensor/zephyr/zephyr.elf \
+                    telink tlsr9528a_retention contact-sensor-app \
+                    out/telink-tlsr9528a_retention-contact-sensor/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
@@ -196,15 +199,6 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B91) Resource Monitoring App
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-resource-monitoring' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9518adk80d resource-monitoring-app \
-                    out/telink-tlsr9518adk80d-resource-monitoring/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
             - name: clean out build output
               run: rm -rf ./out
 
@@ -220,25 +214,25 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B92) Smoke CO Alarm App
+            - name: Build example Telink (B92 retention) Smoke CO Alarm App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-smoke-co-alarm' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-smoke-co-alarm' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a smoke_co_alarm-app \
-                    out/telink-tlsr9528a-smoke-co-alarm/zephyr/zephyr.elf \
+                    telink tlsr9528a_retention smoke_co_alarm-app \
+                    out/telink-tlsr9528a_retention-smoke-co-alarm/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B92) Temperature Measurement App
+            - name: Build example Telink (B91 Mars) Temperature Measurement App with OTA
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-temperature-measurement' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-temperature-measurement-mars-ota' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a temperature-measurement-app \
-                    out/telink-tlsr9528a-temperature-measurement/zephyr/zephyr.elf \
+                    telink tlsr9518adk80d temperature-measurement-app-mars-ota \
+                    out/telink-tlsr9518adk80d-temperature-measurement-mars-ota/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index f6ca3bb793dc87..807491dc2e5871 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen:22
+            image: ghcr.io/project-chip/chip-build-tizen:26
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index a227bdd6e16d08..2cb3cc1d48e7da 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:22
+            image: ghcr.io/project-chip/chip-build-android:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 21ae6619fe0e73..687ff3c9a5e404 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml
index b1c8e2304469bd..e7819c57f20b84 100644
--- a/.github/workflows/issue-labeler.yaml
+++ b/.github/workflows/issue-labeler.yaml
@@ -11,7 +11,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v3.2 #May not be the latest version
+    - uses: github/issue-labeler@v3.3 #May not be the latest version
       with:
         configuration-path: .github/issue-labeler.yml
         not-before: 2020-01-15T02:54:32Z
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index fe27fe9cdd4eb1..9e800ba2e7ef99 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -40,7 +40,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:22
+            image: ghcr.io/project-chip/chip-build-java:26
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
diff --git a/.github/workflows/kotlin-style.yaml b/.github/workflows/kotlin-style.yaml
index 9cd6717f800943..c3b15250a907ef 100644
--- a/.github/workflows/kotlin-style.yaml
+++ b/.github/workflows/kotlin-style.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "detekt"
-        uses: natiginfo/action-detekt-all@1.23.1
+        uses: natiginfo/action-detekt-all@1.23.4
         # Detekt seems not to like circular symlinks, so we set up
         # explicit paths below
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b70ac09cb8ad5b..f7f691c7568250 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
 
         steps:
             - name: Checkout
@@ -51,9 +51,6 @@ jobs:
                       #       https://github.com/project-chip/connectedhomeip/issues/19176
                       #       https://github.com/project-chip/connectedhomeip/issues/19175
                       #       https://github.com/project-chip/connectedhomeip/issues/19173
-                      #       https://github.com/project-chip/connectedhomeip/issues/19169
-                      #       https://github.com/project-chip/connectedhomeip/issues/22640
-                      if [ "$idl_file" = './examples/all-clusters-app/all-clusters-common/all-clusters-app.matter' ]; then continue; fi
                       if [ "$idl_file" = './examples/log-source-app/log-source-common/log-source-app.matter' ]; then continue; fi
                       if [ "$idl_file" = './examples/placeholder/linux/apps/app1/config.matter' ]; then continue; fi
                       if [ "$idl_file" = './examples/placeholder/linux/apps/app2/config.matter' ]; then continue; fi
@@ -102,6 +99,19 @@ jobs:
               run: |
                   git grep -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
 
+            # git grep exits with 0 if it finds a match, but we want
+            # to fail (exit nonzero) on match.  And we want to exclude this file,
+            # to avoid our grep regexp matching itself.
+            - name: Check for use of PRI*64, which are not supported on some libcs.
+              if: always()
+              run: |
+                  # TODO: MessageDefHelper should ideally not be excluded here.
+                  # TODO: chip_im_initiatore should ideally not be excluded here.
+                  # TODO: TLVDebug should ideally not be excluded here.
+                  # TODO: protocol_decoder.cpp should ideally not be excluded here.
+                  # TODO: PersistentStorageMacros.h should ideally not be excluded here.
+                  git grep -n "PRI.64" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/chip-tool' ':(exclude)examples/tv-casting-app' ':(exclude)src/app/MessageDef/MessageDefHelper.cpp' ':(exclude)src/app/tests/integration/chip_im_initiator.cpp' ':(exclude)src/lib/core/TLVDebug.cpp' ':(exclude)src/lib/dnssd/tests/TestTxtFields.cpp' ':(exclude)src/lib/format/protocol_decoder.cpp' ':(exclude)src/lib/support/PersistentStorageMacros.h' ':(exclude)src/messaging/tests/echo/echo_requester.cpp' ':(exclude)src/platform/Linux' ':(exclude)src/platform/Ameba' ':(exclude)src/platform/ESP32' ':(exclude)src/platform/webos' ':(exclude)zzz_generated/chip-tool' ':(exclude)src/tools/chip-cert/Cmd_PrintCert.cpp' && exit 1 || exit 0
+
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index 269692c1461410..58a1a67e180115 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -31,7 +31,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:22
+            image: ghcr.io/project-chip/chip-build-minimal:26
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index ac677a83d61468..a45534cc2f15bb 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:22
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -76,7 +76,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen-qemu:22
+            image: ghcr.io/project-chip/chip-build-tizen-qemu:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 9baca19da32835..903c8d0acf0051 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:22
+            image: ghcr.io/project-chip/chip-build-esp32:26
 
         steps:
             - name: Checkout
@@ -68,7 +68,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:22
+            image: ghcr.io/project-chip/chip-build-efr32:26
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index ee0fe3400830ab..7791b230f5b037 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:22
+            image: ghcr.io/project-chip/chip-build-android:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d6c580e643e9ff..e289d9823ed0b5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -47,7 +47,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -114,7 +114,10 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml \
@@ -129,6 +132,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml \
@@ -141,7 +145,9 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml \
@@ -167,6 +173,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
@@ -194,6 +201,7 @@ jobs:
                         --target linux-x64-ota-requestor-${BUILD_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         --target linux-x64-bridge-${BUILD_VARIANT} \
+                        --target linux-x64-lit-icd-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
                      "
@@ -213,6 +221,7 @@ jobs:
                      --ota-requestor-app ./out/linux-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/linux-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
+                     --lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
                   "
 
             - name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -251,6 +260,7 @@ jobs:
                      --ota-requestor-app ./out/linux-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/linux-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
+                     --lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
                   "
             - name: Run Tests using chip-repl (including slow)
               if: github.event_name == 'push'
@@ -267,6 +277,7 @@ jobs:
                      --ota-requestor-app ./out/linux-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/linux-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
+                     --lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
                   "
             - name: Uploading core files
               uses: actions/upload-artifact@v3
@@ -332,6 +343,7 @@ jobs:
                         --target darwin-x64-ota-requestor-${BUILD_VARIANT} \
                         --target darwin-x64-tv-app-${BUILD_VARIANT} \
                         --target darwin-x64-bridge-${BUILD_VARIANT} \
+                        --target darwin-x64-lit-icd-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
                      "
@@ -352,6 +364,7 @@ jobs:
                      --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
+                      --lit-icd-app ./out/darwin-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
                   "
 
             - name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -402,7 +415,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -428,6 +441,7 @@ jobs:
                    "./scripts/build/build_examples.py \
                       --target linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test \
                       --target linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test \
+                      --target linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test \
                       --target linux-x64-python-bindings \
                       build \
                       --copy-artifacts-to objdir-clone \
@@ -437,7 +451,7 @@ jobs:
                   mkdir -p out/trace_data
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--log-level INFO -t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RR_1_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
-                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceBasicComposition.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceBasicComposition.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_SC_3_6.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_7.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_TestEventTrigger.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -446,6 +460,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_ACE_1_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_CGEN_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TestGroupTableReports.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_1.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_2.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_4.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -459,7 +474,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_12.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_13.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_3_1.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
-                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_ICDM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test/lit-icd-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_ICDM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index 9a365cb09c2438..0896aa4ff3a75e 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -30,14 +30,14 @@ jobs:
 
         strategy:
             matrix:
-                type: [main, clang, mbedtls, rotating_device_id]
+                type: [main, clang, mbedtls, rotating_device_id, icd]
         env:
             BUILD_TYPE: ${{ matrix.type }}
 
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -65,6 +65,7 @@ jobs:
                      "clang") GN_ARGS='is_clang=true';;
                      "mbedtls") GN_ARGS='chip_crypto="mbedtls"';;
                      "rotating_device_id") GN_ARGS='chip_crypto="boringssl" chip_enable_rotating_device_id=true';;
+                     "icd") GN_ARGS='chip_enable_icd_server=true';;
                      *) ;;
                   esac
 
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 8ccd058de07b87..7ab698049dfb08 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -30,7 +30,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index a83069e9468d28..61b6ddea5b807d 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -32,7 +32,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:22
+            image: ghcr.io/project-chip/chip-build:26
         defaults:
             run:
                 shell: sh
diff --git a/.gitmodules b/.gitmodules
index 6683ee97ecb02e..fdfac588c0eb35 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -54,7 +54,7 @@
 	path = third_party/freertos/repo
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	branch  = V10.3.1-kernel-only
-	platforms = ameba,cc13xx_26xx,bouffalolab,efr32,esp32,k32w,infineon,qpg,cc32xx,silabs_docker
+	platforms = ameba,cc13xx_26xx,bouffalolab,esp32,k32w,infineon,qpg,cc32xx
 [submodule "simw-top-mini"]
 	path = third_party/simw-top-mini/repo
 	url = https://github.com/NXP/plug-and-trust.git
@@ -72,7 +72,7 @@
 	path = third_party/openthread/ot-efr32
 	url = https://github.com/SiliconLabs/ot-efr32.git
 	branch  = matter_sve
-	platforms = efr32,silabs_docker
+	platforms = silabs,silabs_docker
 [submodule "third_party/openthread/ot-ifx"]
 	path = third_party/openthread/ot-ifx
 	url = https://github.com/Infineon/ot-ifx-release.git
@@ -149,10 +149,6 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
 	url = https://github.com/Infineon/wifi-host-driver
 	platforms = infineon
-[submodule "p6/wifi-mw-core"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core
-	url = https://github.com/Infineon/wifi-mw-core
-	platforms = infineon
 [submodule "p6/TARGET_CY8CKIT-062S2-43012"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/TARGET_CY8CKIT-062S2-43012
 	url = https://github.com/Infineon/TARGET_CY8CKIT-062S2-43012
@@ -239,22 +235,22 @@
 	path = third_party/silabs/matter_support
 	url = https://github.com/SiliconLabs/sdk_support.git
 	branch = main
-	platforms = efr32,silabs_docker
+	platforms = silabs,silabs_docker
 [submodule "third_party/silabs/gecko_sdk"]
 	path = third_party/silabs/gecko_sdk
 	url = https://github.com/SiliconLabs/gecko_sdk.git
 	branch = v4.3.2
-	platforms = efr32
+	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
 	url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
 	branch = 2.8.2
-	platforms = efr32,silabs_docker
+	platforms = silabs
 [submodule "third_party/silabs/wifi_sdk"]
 	path = third_party/silabs/wifi_sdk
 	url = https://github.com/SiliconLabs/wiseconnect.git
 	branch = v3.1.0
-	platforms = efr32
+	platforms = silabs
 [submodule "editline"]
 	path = third_party/editline/repo
 	url = https://github.com/troglobit/editline.git
@@ -324,3 +320,7 @@
 	url = https://github.com/STMicroelectronics/STM32CubeWB.git
 	branch = v1.17.0
 	platforms = stm32
+[submodule "p6/lwip-network-interface-integration"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
+	url = https://github.com/Infineon/lwip-network-interface-integration.git
+	platforms = infineon
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 371df3b0e1ee60..8822dafadbe2db 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,82 +2,142 @@
 
 This Project CHIP Open Source Code of Conduct applies to all those contributing
 to, participating in, or maintaining the Project CHIP open source project,
-including Zigbee Alliance members and non-members.
+including Connectivity Standards Alliance members and non-members.
+
+# Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and our
+We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and
-expression, level of experience, education, socio-economic status, nationality,
-personal appearance, race, religion, or sexual identity and orientation.
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
--   Using welcoming and inclusive language
--   Being respectful of differing viewpoints and experiences
--   Gracefully accepting constructive criticism
--   Focusing on what is best for the community
--   Showing empathy towards other community members
+-   Demonstrating empathy and kindness toward other people
+-   Being respectful of differing opinions, viewpoints, and experiences
+-   Giving and gracefully accepting constructive feedback
+-   Accepting responsibility and apologizing to those affected by our mistakes,
+    and learning from the experience
+-   Focusing on what is best not just for us as individuals, but for the overall
+    community
+-   Respecting people's privacy and private product plans
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
--   The use of violent threats, abusive, discriminatory, or derogatory language
--   The use of sexualized language or imagery and unwelcome sexual attention or
-    advances
--   Trolling, insulting/derogatory comments, and personal or political attacks
+-   The use of sexualized language or imagery, and sexual attention or advances
+    of any kind
+-   Trolling, insulting or derogatory comments, and personal or political
+    attacks
 -   Public or private harassment
--   Publishing others' private information, such as a physical or electronic
-    address, without explicit permission
--   Posting of violent content
--   Engaging in unwanted physical contact
+-   Publishing others' private information, such as a physical or email address,
+    without their explicit permission
 -   Other conduct which could reasonably be considered inappropriate in a
     professional setting
--   Advocating for or encouraging any of the above behaviors
+-   Disclosure of private information, unreleased products
+-   Disclosure of unreleased specification information outside of Connectivity
+    Standards Alliance approved forums
+
+## Enforcement Responsibilities
 
-## Our Responsibilities
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers are expected to take appropriate and fair corrective action
-in response to any instances of unacceptable behavior. Project maintainers have
-the right and responsibility to remove, edit, or reject comments, commits, code,
-wiki edits, issues, and other contributions that are not aligned to this Code of
-Conduct, or to ban temporarily or permanently any contributor for other
-behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the Project CHIP open source team at [INSERT EMAIL
-ADDRESS]. All complaints will be reviewed and investigated and will result in a
-response that is deemed necessary and appropriate to the circumstances. The
-Project CHIP open source team should maintain confidentiality with regard to the
-reporter of an incident. Further details of specific enforcement policies may be
-posted separately.
+reported to the community leaders responsible for enforcement at
+help@csa-iot.org. All submissions will be reviewed and investigated promptly and
+fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by Project
-CHIP open source leadership.
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder][mozilla coc].
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][faq]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[mozilla coc]: https://github.com/mozilla/diversity
+[faq]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/build/toolchain/flashable_executable.gni b/build/toolchain/flashable_executable.gni
index 97b2b44f1ac51c..6233d58382b43d 100644
--- a/build/toolchain/flashable_executable.gni
+++ b/build/toolchain/flashable_executable.gni
@@ -147,6 +147,12 @@ template("flashable_executable") {
       } else {
         flashing_options = []
       }
+
+      # Allows to set a different image name in the flasher script
+      if (defined(invoker.flashing_image_name)) {
+        image_name = invoker.flashing_image_name
+      }
+
       flashing_options += [
         "--application",
         rebase_path(image_name, root_out_dir, root_out_dir),
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
index 00bfed5df9b124..b73398bca4c2bf 100644
--- a/config/esp32/components/chip/Kconfig
+++ b/config/esp32/components/chip/Kconfig
@@ -96,6 +96,22 @@ menu "CHIP Core"
             help
                 Link the application against CHIP interactive shell.
 
+        config CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH
+            int "Maximum command line buffer length of the chip shell"
+            depends on ENABLE_CHIP_SHELL
+            default 256
+            help
+                Maximum command line buffer length of the chip shell. The command strings might be received
+                incompletely in the command handlers if they are longer than this buffer length.
+
+        config CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT
+            int "Maximum command line arguments count of the chip shell"
+            depends on ENABLE_CHIP_SHELL
+            default 32
+            help
+                Maximum command line arguments count of the chip shell. The command arguments might be ignored
+                if they are more than this count.
+
         config ENABLE_CHIP_CONTROLLER_BUILD
             bool "Enable chip-controller build"
             default n
@@ -624,6 +640,16 @@ menu "CHIP Device Layer"
 
                 When set, WoBLE advertisements will stop while a WoBLE connection is active.
 
+        config CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART
+            int "Enable CHIPoBLE advertising start automatically after device power-up"
+            range 0 1
+            default 0
+            depends on ENABLE_CHIPOBLE
+            help
+                CHIPs device may start advertising automatically only if its all primary device
+                functions are within a CHIP network. Device providing unrelated to CHIP functionalities
+                should not start advertising automatically after power-up.
+
         config USE_BLE_ONLY_FOR_COMMISSIONING
 	    bool "Use BLE only for commissioning"
 	    default y
diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
index 8721bbc46ad2f7..21222ceed22ae6 100644
--- a/config/nrfconnect/.nrfconnect-recommended-revision
+++ b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -1 +1 @@
-v2.4.0
+v2.5.0
diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
index 95e49ac59e0262..33528638670917 100644
--- a/config/nrfconnect/chip-module/Kconfig
+++ b/config/nrfconnect/chip-module/Kconfig
@@ -16,6 +16,10 @@
 
 rsource "../../zephyr/Kconfig"
 
+config CHIP
+	imply NVS_LOOKUP_CACHE
+	imply NVS_LOOKUP_CACHE_FOR_SETTINGS
+
 if CHIP
 
 config CHIP_NRF_PLATFORM
@@ -119,7 +123,6 @@ config CHIP_FACTORY_DATA_CUSTOM_BACKEND
 
 config CHIP_FACTORY_DATA_BUILD
 	bool "Generate factory data contents"
-	default n
 	help
 	  Enables generation of the factory data contents during the building. This
 	  option requires the factory_data partition in Partition Manager
@@ -170,6 +173,7 @@ config CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE
 
 config CHIP_FACTORY_DATA_GENERATE_ONBOARDING_CODES
 	bool "Generate onboarding codes during the generation of a factory data set"
+	default y
 	help
 	  Enables generation of onboarding codes (manual pairing code and QR code)
 	  during the generation of a factory data set. You can provide the 
@@ -220,7 +224,8 @@ config CHIP_FACTORY_DATA_USER_CERTS_PAI_CERT
 	string "Path to the PAI certificate (DER format)"
 	help
 	  Provides the absolute path to the PAI certificate in the DER format.
-endif
+
+endif # CHIP_FACTORY_DATA_CERT_SOURCE_USER
 
 # Configs for SPAKE2+ generation
 config CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER
@@ -235,14 +240,12 @@ config CHIP_DEVICE_GENERATE_ROTATING_DEVICE_UID
 	help
 	  Enables the generation of a random Rotating device ID unique ID.
 
-endif #CHIP_FACTORY_DATA_BUILD
+endif # CHIP_FACTORY_DATA_BUILD
 
 # See config/zephyr/Kconfig for full definition
 config CHIP_FACTORY_RESET_ERASE_NVS
 	bool
-	default y if CHIP_FACTORY_DATA || CHIP_FACTORY_DATA_CUSTOM_BACKEND
-
-endif
+	default y
 
 config CHIP_LOG_SIZE_OPTIMIZATION
 	bool "Disable some detailed logs to decrease flash usage"
@@ -260,3 +263,14 @@ config CHIP_IPV4
 	  If disabled, it allows to build nRF Connect SDK application
 	  with IPv4 support independently of the Matter stack still
 	  running over IPv6.
+
+config CHIP_OPENTHREAD_JOINER_ENABLED
+	bool "Specify whether the Thread Joiner functionality is used when it is enabled"
+	default n
+	depends on NET_L2_OPENTHREAD
+	depends on OPENTHREAD_JOINER
+	help
+	  If disabled, it allows to optimize memory usage even if Thread Joiner
+	  support is enabled.
+
+endif # CHIP
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index 30611686b1e41a..8684adb2be3c52 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -65,6 +65,18 @@ config FPU
 config SHELL
     default y
 
+config SHELL_MINIMAL
+    default y
+
+# Enable getting reboot reasons information
+config HWINFO
+	bool
+	default y
+
+config HWINFO_SHELL
+	bool
+	default n
+
 config PTHREAD_IPC
     bool
     default n
@@ -75,7 +87,7 @@ config POSIX_MAX_FDS
 
 # Application stack size
 config MAIN_STACK_SIZE
-    default 8192
+    default 6144
 
 config INIT_STACKS
     default y
@@ -88,16 +100,16 @@ config NET_IF_MCAST_IPV6_ADDR_COUNT
 
 # Network buffers
 config NET_PKT_RX_COUNT
-    default 16
+    default 8
 
 config NET_PKT_TX_COUNT
-    default 16
+    default 8
 
 config NET_BUF_RX_COUNT
-    default 80
+    default 16
 
 config NET_BUF_TX_COUNT
-    default 80
+    default 16
 
 # Bluetooth Low Energy configs
 
@@ -162,6 +174,14 @@ config BT_DEVICE_NAME_GATT_WRITABLE
     bool
     default n
 
+config BT_GATT_CACHING
+    bool
+    default n
+
+# Disable 2M PHY due to interoperability issues.
+config BT_CTLR_PHY_2M
+    default n
+
 # Enable NFC support
 
 config CHIP_NFC_COMMISSIONING
@@ -196,9 +216,6 @@ endif # BOARD_NRF7002DK_NRF5340_CPUAPP
 config CHIP_EXTENDED_DISCOVERY
     default n
 
-config NVS_LOOKUP_CACHE
-    default y
-
 config NVS_LOOKUP_CACHE_SIZE
     default 512
 
@@ -209,6 +226,10 @@ config NET_L2_OPENTHREAD
 
 if NET_L2_OPENTHREAD
 
+# Disable OpenThread shell
+config OPENTHREAD_SHELL
+    default n
+
 # Disable certain parts of Zephyr IPv6 stack
 config NET_IPV6_NBR_CACHE
     bool
@@ -218,6 +239,9 @@ config NET_IPV6_NBR_CACHE
 config IEEE802154_NRF5_RX_STACK_SIZE
     default 1024
 
+config OPENTHREAD_THREAD_STACK_SIZE
+	default 4096
+
 endif
 
 if CHIP_WIFI
@@ -226,9 +250,40 @@ choice WPA_SUPP_LOG_LEVEL_CHOICE
 	default WPA_SUPP_LOG_LEVEL_ERR
 endchoice
 
+# increase the prefixes limit to match
+# maximum number of IPv6 addresses per interface
+config NET_IF_IPV6_PREFIX_COUNT
+    default 6
+
+# it saves us 20kB of FLASH
+config WPA_SUPP_NO_DEBUG
+    default y
+
+config NRF700X_LOG_VERBOSE
+    default n
+
+choice WIFI_NRF700X_LOG_LEVEL_CHOICE
+    default WIFI_NRF700X_LOG_LEVEL_OFF
+endchoice
+
 config NRF_WIFI_LOW_POWER
     default n
 
+config NRF700X_RX_NUM_BUFS
+    default 16
+
+config NRF700X_TX_MAX_DATA_SIZE
+    default 1280
+
+config NRF700X_RX_MAX_DATA_SIZE
+    default 1280
+
+config NRF700X_MAX_TX_TOKENS
+    default 10
+
+config NRF700X_MAX_TX_AGGREGATION
+    default 1
+
 config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
     default n
 
@@ -243,7 +298,7 @@ config NET_IF_MCAST_IPV6_ADDR_COUNT
     default 8
 
 config NET_SOCKETS_POLL_MAX
-    default 4
+    default 6
 
 config MBEDTLS_SSL_OUT_CONTENT_LEN
     default 900
@@ -260,13 +315,13 @@ config SHELL_STACK_SIZE
     default 2616
 
 config HEAP_MEM_POOL_SIZE
-    default 200000
-
-config CHIP_MALLOC_SYS_HEAP_SIZE
-    default 28672 # 28 kB
+    default 80000
 
 endif
 
+config CHIP_MALLOC_SYS_HEAP_SIZE
+    default 28672 if CHIP_WIFI
+    default 8192 if NET_L2_OPENTHREAD
 
 # Enable mbedTLS from nrf_security library
 
@@ -284,10 +339,7 @@ config MBEDTLS_ENABLE_HEAP
     default y
 
 config MBEDTLS_HEAP_SIZE
-    default 15360
-
-config MBEDTLS_TLS_LIBRARY
-    default y
+    default 8192
 
 config NRF_SECURITY_ADVANCED
     default y
@@ -307,9 +359,6 @@ config MBEDTLS_CTR_DRBG_C
 config MBEDTLS_CIPHER_MODE_CTR
     default y
 
-config MBEDTLS_ECJPAKE_C
-    default y
-
 config MBEDTLS_SHA256_C
     default y
 
@@ -351,37 +400,10 @@ config MBEDTLS_GCM_C
 config MBEDTLS_RSA_C
     default n
 
-config PSA_WANT_KEY_TYPE_CHACHA20
-    default n
-
-config PSA_WANT_ALG_GCM
-    default n
-
-config PSA_WANT_ALG_CHACHA20_POLY1305
-    default n
-
-config PSA_WANT_ALG_SHA_1
-    default n
-
-config PSA_WANT_ALG_SHA_224
-    default n
-
-config PSA_WANT_ALG_SHA_384
-    default n
-
-config PSA_WANT_ALG_SHA_512
-    default n
-
-config PSA_WANT_ALG_RIPEMD160
-    default n
-
-config PSA_WANT_ALG_MD5
-    default n
-
-config PSA_WANT_ALG_CFB
+config MBEDTLS_SSL_SRV_C
     default n
 
-config PSA_WANT_ALG_OFB
+config MBEDTLS_SSL_COOKIE_C
     default n
 
 # Disable not used shell modules
diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
index 9b5a1e7aee9029..a6c2ea99ad431d 100644
--- a/config/nrfconnect/chip-module/Kconfig.features
+++ b/config/nrfconnect/chip-module/Kconfig.features
@@ -21,7 +21,7 @@ if CHIP
 
 config CHIP_WIFI
 	bool "Enable nrfconnect Wi-Fi support"
-	default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP
+	default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB
 	select WIFI_NRF700X
 	select WIFI
 	select WPA_SUPP
@@ -73,6 +73,20 @@ config SPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 
 endif # CHIP_SPI_NOR
 
+config CHIP_MEMORY_PROFILING
+	bool "Enable features for tracking memory usage"
+	select CHIP_STATISTICS
+	select CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT if CHIP_MALLOC_SYS_HEAP
+	select MBEDTLS_MEMORY_DEBUG if !CHIP_CRYPTO_PSA
+	select SYS_HEAP_RUNTIME_STATS if CHIP_MALLOC_SYS_HEAP
+	select KERNEL_SHELL
+	select NET_STATISTICS
+	select NET_SHELL
+	select NET_BUF_POOL_USAGE
+	select OPENTHREAD_SHELL if !CHIP_WIFI
+	help
+	  Enables features for tracking memory usage in Matter.
+
 config CHIP_NUS
 	bool "Enable Nordic UART service for Matter purposes"
 	select BT_NUS
@@ -270,7 +284,7 @@ endchoice
 config CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY
 	int "After removing the last fabric wait defined time [in milliseconds] to perform an action"
 	depends on !CHIP_LAST_FABRIC_REMOVED_NONE
-	default 500
+	default 1000
 	help
 	  After removing the last fabric the device will wait for the defined time and then perform
 	  an action chosen by the CHIP_LAST_FABRIC_REMOVED_ACTION option. This schedule will allow for
diff --git a/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults b/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
index 83290b2b492f28..17c7115e28b750 100644
--- a/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
@@ -58,6 +58,10 @@ config BT_CTLR_ASSERT_HANDLER
 config BT_HCI_RAW_RESERVE
     default 1
 
+# Disable 2M PHY due to interoperability issues.
+config BT_CTLR_PHY_2M
+    default n
+
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
 # Host number of completed commands does not follow normal flow control.
 config BT_BUF_CMD_TX_COUNT
diff --git a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults
index 72169ca50afd8e..31759beba22ffc 100644
--- a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults
@@ -43,6 +43,10 @@ config FLASH
 config FPROTECT
     default y
 
+choice LIBC_IMPLEMENTATION
+    default MINIMAL_LIBC
+endchoice
+
 # nRF7002DK uses SPI NOR external flash
 if BOARD_NRF7002DK_NRF5340_CPUAPP
 
@@ -140,6 +144,9 @@ config FLASH_SIMULATOR_STATS
 config ENABLE_MGMT_PERUSER
     default y
 
+config ZCBOR
+    default y
+
 config BOOT_MGMT_CUSTOM_STORAGE_ERASE
     default y
 
diff --git a/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults
index eb0b01e2664ce7..3d40e47429a074 100644
--- a/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults
@@ -58,6 +58,10 @@ config BT_CTLR_ASSERT_HANDLER
 config BT_HCI_RAW_RESERVE
     default 1
 
+# Disable 2M PHY due to interoperability issues.
+config BT_CTLR_PHY_2M
+    default n
+
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
 # Host number of completed commands does not follow normal flow control.
 config BT_BUF_CMD_TX_COUNT
diff --git a/config/nrfconnect/chip-module/generate_factory_data.cmake b/config/nrfconnect/chip-module/generate_factory_data.cmake
index 491411cb6a3dd4..dc1794562d89cf 100644
--- a/config/nrfconnect/chip-module/generate_factory_data.cmake
+++ b/config/nrfconnect/chip-module/generate_factory_data.cmake
@@ -180,7 +180,7 @@ endfunction()
 #
 function(nrfconnect_generate_factory_data)
 
-find_package(Python REQUIRED)
+find_package(Python3 REQUIRED)
 
 # CHIP_ROOT must be provided as a reference set all localization of scripts
 if(NOT CHIP_ROOT)
diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
index e9d506e538f131..8e798c058525c6 100644
--- a/config/telink/chip-module/CMakeLists.txt
+++ b/config/telink/chip-module/CMakeLists.txt
@@ -143,10 +143,11 @@ set_property(GLOBAL APPEND PROPERTY ZEPHYR_INTERFACE_LIBS chip)
 # Define 'chip-ota-image' target for building CHIP OTA image
 # ==============================================================================
 
+string(REPLACE "_retention" "" BASE_BOARD ${BOARD})
 
 if(${TLNK_USB_DONGLE} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb_boot.overlay")
-    set(USB_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb_boot.overlay")
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_usb_boot.overlay")
+    set(USB_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_usb_boot.overlay")
   else()
     unset(USB_BOOT_DTC_OVERLAY_FILE)
   endif()
@@ -154,8 +155,18 @@ else()
   unset(USB_BOOT_DTC_OVERLAY_FILE)
 endif()
 
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-    set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
+if(${TLNK_MARS_BOARD} MATCHES y)
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_mars_boot.overlay")
+    set(MARS_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_mars_boot.overlay")
+  else()
+    unset(MARS_BOOT_DTC_OVERLAY_FILE)
+  endif()
+else()
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
+if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}.overlay")
+    set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}.overlay")
 else()
     unset(GLOBAL_DTC_OVERLAY_FILE)
 endif()
@@ -184,8 +195,8 @@ math(EXPR boot_blocks "${mcuboot_size} / ${BLOCK_SIZE}" OUTPUT_FORMAT DECIMAL)
 if (CONFIG_BOOTLOADER_MCUBOOT)
     add_custom_target(build_mcuboot ALL
         COMMAND
-        west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE}"
+        west build -b ${BASE_BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE};${MARS_BOOT_DTC_OVERLAY_FILE}"
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/chip-module/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )
diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
index b1bd07660937bd..93ebc31a0f426e 100644
--- a/config/telink/chip-module/Kconfig
+++ b/config/telink/chip-module/Kconfig
@@ -202,3 +202,8 @@ config CHIP_ENABLE_POWER_ON_FACTORY_RESET
 	  Enable power on factory reset sequence. If device power triggered off during
 	  first 5 seconds after power on and this sequence repeated 5 times - factory
 	  reset will be involved.
+
+config CHIP_USE_MARS_SENSOR
+	bool "Use Mars board sensor"
+	depends on SOC_SERIES_RISCV_TELINK_B9X && (BOARD_TLSR9518ADK80D || BOARD_TLSR9518ADK80D_RETENTION)
+	default n
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
index f346a2c1eeb807..54137bc281562b 100644
--- a/config/telink/chip-module/Kconfig.defaults
+++ b/config/telink/chip-module/Kconfig.defaults
@@ -64,7 +64,7 @@ config INIT_STACKS
     default y
 
 config IDLE_STACK_SIZE
-    default 387 if PM
+    default 512 if PM
 
 config ISR_STACK_SIZE
     default 502 if PM
@@ -73,7 +73,7 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
     default 616 if PM
 
 config HEAP_MEM_POOL_SIZE
-    default 128 if PM
+    default 256
 
 config COMMON_LIBC_MALLOC_ARENA_SIZE 
     default 12288
@@ -98,6 +98,9 @@ config NET_BUF_TX_COUNT
     default 16 if PM
     default 32
 
+config GPIO
+    default y
+
 # Bluetooth Low Energy configs
 
 config BT
@@ -154,6 +157,24 @@ choice B9X_BLE_CTRL_MAC_TYPE
     default B9X_BLE_CTRL_MAC_TYPE_RANDOM_STATIC
 endchoice
 
+# Board retention config
+if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
+config BOARD_TLSR9X_NON_RETENTION_RAM_CODE
+    default y if PM
+
+config TELINK_B9x_MATTER_RETENTION_LAYOUT
+    default y if PM
+
+config PWM
+    default n
+endif
+
+# Board non-retention config
+if BOARD_TLSR9528A || BOARD_TLSR9518ADK80D
+config PWM
+    default y
+endif
+
 # Config dynamic interrupts to have posibility to switch between BLE/Thread radio drivers
 config DYNAMIC_INTERRUPTS
     default y
diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
index 4ebccfa2c0b0c6..bd4b52ecb7a193 100644
--- a/config/zephyr/Kconfig
+++ b/config/zephyr/Kconfig
@@ -453,6 +453,12 @@ config CHIP_MALLOC_SYS_HEAP_SIZE
 	  the heap used by the memory allocation functions based on sys_heap from
 	  Zephyr RTOS.
 
+config CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT
+	bool "Enable support for heap watermarks based on Zephyr sys_heap"
+	help
+	  Enables support for getting current heap high watermark and resetting 
+	  watermarks. 
+
 endif
 
 module = MATTER
diff --git a/data_model/README.md b/data_model/README.md
index ada763cd7f2804..36f38cae0ff1f8 100644
--- a/data_model/README.md
+++ b/data_model/README.md
@@ -1,3 +1,7 @@
+---
+orphan: true
+---
+
 ## Contents
 
 This folder contains a machine-readable representation of matter clusters.
diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml
index 4add6f4189d279..3cd5c02590ea0a 100644
--- a/data_model/clusters/AccountLogin.xml
+++ b/data_model/clusters/AccountLogin.xml
@@ -73,9 +73,8 @@ Davis, CA 95616, USA
       <access invokePrivilege="operate" fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="SetupPIN" type="string">
-        <quality nullable="true"/>
         <mandatoryConform/>
-        <constraint type="minLength" value="11"/>
+        <constraint type="desc"/>
       </field>
     </command>
     <command id="0x02" name="Login" response="Y">
diff --git a/data_model/clusters/AlarmBase.xml b/data_model/clusters/AlarmBase.xml
index b169d4fe9be24a..834089869b21da 100644
--- a/data_model/clusters/AlarmBase.xml
+++ b/data_model/clusters/AlarmBase.xml
@@ -115,13 +115,13 @@ Davis, CA 95616, USA
       <field id="1" name="Active" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="1" name="Inactive" type="AlarmMap" default="0">
+      <field id="2" name="Inactive" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="2" name="State" type="AlarmMap" default="0">
+      <field id="3" name="State" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="3" name="Mask" type="AlarmMap" default="0">
+      <field id="4" name="Mask" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
     </event>
diff --git a/data_model/clusters/BallastConfiguration.xml b/data_model/clusters/BallastConfiguration.xml
index a6d553ddcc6ead..416b8cd7014beb 100644
--- a/data_model/clusters/BallastConfiguration.xml
+++ b/data_model/clusters/BallastConfiguration.xml
@@ -124,12 +124,12 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0030" name="LampType" type="string" default="empty string">
+    <attribute id="0x0030" name="LampType" type="string" default="&quot;">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <optionalConform/>
       <constraint type="maxLength" value="16"/>
     </attribute>
-    <attribute id="0x0031" name="LampManufacturer" type="string" default="empty string">
+    <attribute id="0x0031" name="LampManufacturer" type="string" default="&quot;">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <optionalConform/>
       <constraint type="maxLength" value="16"/>
diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml
index 3227cf9a5a446e..b75540d94a6baf 100644
--- a/data_model/clusters/Channel.xml
+++ b/data_model/clusters/Channel.xml
@@ -129,8 +129,9 @@ Davis, CA 95616, USA
         <feature name="CL"/>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct">
+    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct" default="null">
       <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
         <feature name="LI"/>
       </mandatoryConform>
diff --git a/data_model/clusters/ContentControl.xml b/data_model/clusters/ContentControl.xml
index 3642777b46a76d..ff38faf1f10909 100644
--- a/data_model/clusters/ContentControl.xml
+++ b/data_model/clusters/ContentControl.xml
@@ -79,12 +79,12 @@ Davis, CA 95616, USA
   </features>
   <dataTypes>
     <struct name="RatingNameStruct">
-      <field id="1" name="RatingName" type="string">
+      <field id="0" name="RatingName" type="string">
         <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="8"/>
       </field>
-      <field id="2" name="RatingNameDesc" type="string">
+      <field id="1" name="RatingNameDesc" type="string">
         <access read="true"/>
         <optionalConform/>
         <constraint type="maxLength" value="64"/>
@@ -92,60 +92,66 @@ Davis, CA 95616, USA
     </struct>
   </dataTypes>
   <attributes>
-    <attribute id="0x0001" name="Enabled" type="bool">
+    <attribute id="0x0000" name="Enabled" type="bool">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
+      <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0002" name="OnDemandRatings" type="list[RatingNameStruct Type]">
+    <attribute id="0x0001" name="OnDemandRatings" type="list[RatingNameStruct Type]">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="OCR"/>
       </mandatoryConform>
+      <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0003" name="OnDemandRatingThreshold" type="string">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+    <attribute id="0x0002" name="OnDemandRatingThreshold" type="string">
+      <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="OCR"/>
       </mandatoryConform>
       <constraint type="maxLength" value="8"/>
     </attribute>
-    <attribute id="0x0004" name="ScheduledContentRatings" type="list[RatingNameStruct Type]">
+    <attribute id="0x0003" name="ScheduledContentRatings" type="list[RatingNameStruct Type]">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="SCR"/>
       </mandatoryConform>
+      <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0005" name="ScheduledContentRatingThreshold" type="string">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+    <attribute id="0x0004" name="ScheduledContentRatingThreshold" type="string">
+      <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="SCR"/>
       </mandatoryConform>
       <constraint type="maxLength" value="8"/>
     </attribute>
-    <attribute id="0x0006" name="ScreenDailyTime" type="elapsed-s">
+    <attribute id="0x0005" name="ScreenDailyTime" type="elapsed-s">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="ST"/>
       </mandatoryConform>
+      <constraint type="max" value="86400"/>
     </attribute>
-    <attribute id="0x0007" name="RemainingScreenTime" type="elapsed-s">
+    <attribute id="0x0006" name="RemainingScreenTime" type="elapsed-s">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="ST"/>
       </mandatoryConform>
+      <constraint type="max" value="86400"/>
     </attribute>
-    <attribute id="0x0008" name="BlockUnrated" type="bool">
+    <attribute id="0x0007" name="BlockUnrated" type="bool">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="BU"/>
       </mandatoryConform>
+      <constraint type="desc"/>
     </attribute>
   </attributes>
   <commands>
     <command id="0x00" name="UpdatePIN" response="Y">
-      <access invokePrivilege="operate" timed="true"/>
+      <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform>
-        <feature name="PIN"/>
+        <feature name="PM"/>
       </mandatoryConform>
       <field id="0" name="OldPIN" type="string">
         <mandatoryConform/>
@@ -159,13 +165,13 @@ Davis, CA 95616, USA
     <command id="0x01" name="ResetPIN" response="ResetPINResponse">
       <access invokePrivilege="admin" timed="true"/>
       <mandatoryConform>
-        <feature name="PIN"/>
+        <feature name="PM"/>
       </mandatoryConform>
     </command>
     <command id="0x02" name="ResetPINResponse" direction="responseFromServer">
       <access invokePrivilege="operate"/>
       <mandatoryConform>
-        <feature name="PIN"/>
+        <feature name="PM"/>
       </mandatoryConform>
       <field id="0" name="PINCode" type="string">
         <mandatoryConform/>
@@ -173,20 +179,12 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x03" name="Enable" response="Y">
-      <access invokePrivilege="operate" timed="true"/>
+      <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform/>
-      <field id="0" name="PINCode" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="6"/>
-      </field>
     </command>
     <command id="0x04" name="Disable" response="Y">
-      <access invokePrivilege="operate" timed="true"/>
+      <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform/>
-      <field id="0" name="PINCode" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="6"/>
-      </field>
     </command>
     <command id="0x05" name="AddBonusTime" response="Y">
       <access invokePrivilege="operate"/>
@@ -194,7 +192,7 @@ Davis, CA 95616, USA
         <feature name="ST"/>
       </mandatoryConform>
       <field id="0" name="PINCode" type="string">
-        <mandatoryConform/>
+        <optionalConform/>
         <constraint type="maxLength" value="6"/>
       </field>
       <field id="1" name="BonusTime" type="elapsed-s" default="300s">
@@ -202,36 +200,44 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x06" name="SetScreenDailyTime" response="Y">
-      <access invokePrivilege="operate"/>
+      <access invokePrivilege="manage"/>
       <mandatoryConform>
         <feature name="ST"/>
       </mandatoryConform>
-      <field id="0" name="PINCode" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="6"/>
-      </field>
-      <field id="1" name="ScreenTime" type="elapsed-s">
+      <field id="0" name="ScreenTime" type="elapsed-s">
         <mandatoryConform/>
       </field>
     </command>
     <command id="0x07" name="BlockUnratedContent" response="Y">
-      <access invokePrivilege="operate"/>
+      <access invokePrivilege="manage"/>
       <mandatoryConform>
         <feature name="BU"/>
       </mandatoryConform>
-      <field id="0" name="PINCode" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="6"/>
-      </field>
     </command>
     <command id="0x08" name="UnblockUnratedContent" response="Y">
-      <access invokePrivilege="operate"/>
+      <access invokePrivilege="manage"/>
       <mandatoryConform>
         <feature name="BU"/>
       </mandatoryConform>
-      <field id="0" name="PINCode" type="string">
+    </command>
+    <command id="0x09" name="SetOnDemandRatingThreshold" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+      <field id="0" name="Rating" type="string">
         <mandatoryConform/>
-        <constraint type="maxLength" value="6"/>
+        <constraint type="maxLength" value="8"/>
+      </field>
+    </command>
+    <command id="0x0a" name="SetScheduledContentRatingThreshold" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+      <field id="0" name="Rating" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="8"/>
       </field>
     </command>
   </commands>
diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml
index caa967bb9edb1e..3a596905c8aa9d 100644
--- a/data_model/clusters/DemandResponseLoadControl.xml
+++ b/data_model/clusters/DemandResponseLoadControl.xml
@@ -317,7 +317,7 @@ Davis, CA 95616, USA
         <mandatoryConform>
           <feature name="TEMPS"/>
         </mandatoryConform>
-        <constraint type="between" from="0x954d" to="0x7fff"/>
+        <constraint type="between" from="0x954D" to="0x7FFF"/>
       </field>
       <field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
         <access read="true" write="true"/>
@@ -325,7 +325,7 @@ Davis, CA 95616, USA
         <mandatoryConform>
           <feature name="TEMPS"/>
         </mandatoryConform>
-        <constraint type="between" from="0x954d" to="0x7fff"/>
+        <constraint type="between" from="0x954D" to="0x7FFF"/>
       </field>
     </struct>
   </dataTypes>
diff --git a/data_model/clusters/DiagnosticsThread.xml b/data_model/clusters/DiagnosticsThread.xml
index 2f8e97b150ffc2..ddcf246e9c99c3 100644
--- a/data_model/clusters/DiagnosticsThread.xml
+++ b/data_model/clusters/DiagnosticsThread.xml
@@ -653,7 +653,7 @@ Davis, CA 95616, USA
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x003e" name="ActiveNetworkFaults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+    <attribute id="0x003e" name="ActiveNetworkFaultsList" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
       <constraint type="max" value="4"/>
diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml
index ce0d8ae0e59c0f..97c23efb96dbe3 100644
--- a/data_model/clusters/DiagnosticsWiFi.xml
+++ b/data_model/clusters/DiagnosticsWiFi.xml
@@ -57,7 +57,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="WiFi Network Diagnostics" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="Wi-Fi Network Diagnostics" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
diff --git a/data_model/clusters/EVSE-Attributes.xml b/data_model/clusters/EVSE-Attributes.xml
index 70cada7e3a902e..2d492a27c4c0a1 100644
--- a/data_model/clusters/EVSE-Attributes.xml
+++ b/data_model/clusters/EVSE-Attributes.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Classification.xml b/data_model/clusters/EVSE-Classification.xml
index 6230a083a794e7..22df357be3e9d0 100644
--- a/data_model/clusters/EVSE-Classification.xml
+++ b/data_model/clusters/EVSE-Classification.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-ClusterID.xml b/data_model/clusters/EVSE-ClusterID.xml
index 071dbf680e7514..6f84afeb8d04bc 100644
--- a/data_model/clusters/EVSE-ClusterID.xml
+++ b/data_model/clusters/EVSE-ClusterID.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Commands.xml b/data_model/clusters/EVSE-Commands.xml
index f170a002aab7ac..030565e20f8f96 100644
--- a/data_model/clusters/EVSE-Commands.xml
+++ b/data_model/clusters/EVSE-Commands.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-DataTypes.xml b/data_model/clusters/EVSE-DataTypes.xml
index ec95fd5c8a4eac..790d66143c7025 100644
--- a/data_model/clusters/EVSE-DataTypes.xml
+++ b/data_model/clusters/EVSE-DataTypes.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Definitions.xml b/data_model/clusters/EVSE-Definitions.xml
index 5d07abc25605cb..7ff6135a3d2976 100644
--- a/data_model/clusters/EVSE-Definitions.xml
+++ b/data_model/clusters/EVSE-Definitions.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Dependencies.xml b/data_model/clusters/EVSE-Dependencies.xml
index 1797d04b915b7b..a87cb67a4623ae 100644
--- a/data_model/clusters/EVSE-Dependencies.xml
+++ b/data_model/clusters/EVSE-Dependencies.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Events.xml b/data_model/clusters/EVSE-Events.xml
index 75c8a89274da20..51401775a6fe59 100644
--- a/data_model/clusters/EVSE-Events.xml
+++ b/data_model/clusters/EVSE-Events.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-Features.xml b/data_model/clusters/EVSE-Features.xml
index ff1feadf386690..a8b48a53b401e9 100644
--- a/data_model/clusters/EVSE-Features.xml
+++ b/data_model/clusters/EVSE-Features.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/EVSE-RevisionHistory.xml b/data_model/clusters/EVSE-RevisionHistory.xml
index def04a641bf6f7..89ca30f749e5e1 100644
--- a/data_model/clusters/EVSE-RevisionHistory.xml
+++ b/data_model/clusters/EVSE-RevisionHistory.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->
diff --git a/data_model/clusters/ICDManagement.xml b/data_model/clusters/ICDManagement.xml
new file mode 100644
index 00000000000000..711b98b49b104c
--- /dev/null
+++ b/data_model/clusters/ICDManagement.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICDManagement" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Addition of LIT ICD support and ActiveModeDuration"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="ICDM" scope="Node"/>
+  <features>
+    <feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes/>
+  <attributes>
+    <attribute id="0x0000" name="IdleModeDuration" type="uint32" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="64800"/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveModeDuration" type="uint32" default="300">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ActiveModeThreshold" type="uint16" default="300">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="RegisteredClients" type="list[MonitoringRegistrationStruct Type]" default="[]">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="ICDCounter" type="uint32" default="0">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="ClientsSupportedPerFabric" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <constraint type="min" value="1"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="RegisterClient" response="RegisterClientResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="CheckInNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MonitoredSubject" type="subject-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Key" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="3" name="VerificationKey" type="octets">
+        <optionalConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+    <command id="0x01" name="RegisterClientResponse" direction="responseFromServer">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="ICDCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="UnregisterClient" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="CheckInNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VerificationKey" type="octets">
+        <optionalConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+    <command id="0x03" name="StayActiveRequest" response="StayActiveResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LIT"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="StayActiveDuration" type="uint32" default="ActiveModeThreshold">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StayActiveResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LIT"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="PromisedActiveDuration" type="uint32" default="ActiveModeThreshold">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/KeypadInput.xml b/data_model/clusters/KeypadInput.xml
index 81f16ec0830aef..7179ae676b65fe 100644
--- a/data_model/clusters/KeypadInput.xml
+++ b/data_model/clusters/KeypadInput.xml
@@ -72,6 +72,266 @@ Davis, CA 95616, USA
     </feature>
   </features>
   <dataTypes>
+    <enum name="CecKeyCodeEnum">
+      <item value="0" name="Select">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Up">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Down">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Left">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Right">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="RightUp">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="RightDown">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LeftUp">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="LeftDown">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="RootMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="SetupMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="ContentsMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="FavoriteMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Exit">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="MediaTopMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="MediaContextSensitiveMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="NumberEntryMode">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="Number11">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="Number12">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="Number0OrNumber10">
+        <mandatoryConform/>
+      </item>
+      <item value="33" name="Numbers1">
+        <mandatoryConform/>
+      </item>
+      <item value="34" name="Numbers2">
+        <mandatoryConform/>
+      </item>
+      <item value="35" name="Numbers3">
+        <mandatoryConform/>
+      </item>
+      <item value="36" name="Numbers4">
+        <mandatoryConform/>
+      </item>
+      <item value="37" name="Numbers5">
+        <mandatoryConform/>
+      </item>
+      <item value="38" name="Numbers6">
+        <mandatoryConform/>
+      </item>
+      <item value="39" name="Numbers7">
+        <mandatoryConform/>
+      </item>
+      <item value="40" name="Numbers8">
+        <mandatoryConform/>
+      </item>
+      <item value="41" name="Numbers9">
+        <mandatoryConform/>
+      </item>
+      <item value="42" name="Dot">
+        <mandatoryConform/>
+      </item>
+      <item value="43" name="Enter">
+        <mandatoryConform/>
+      </item>
+      <item value="44" name="Clear">
+        <mandatoryConform/>
+      </item>
+      <item value="47" name="NextFavorite">
+        <mandatoryConform/>
+      </item>
+      <item value="48" name="ChannelUp">
+        <mandatoryConform/>
+      </item>
+      <item value="49" name="ChannelDown">
+        <mandatoryConform/>
+      </item>
+      <item value="50" name="PreviousChannel">
+        <mandatoryConform/>
+      </item>
+      <item value="51" name="SoundSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="52" name="InputSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="53" name="DisplayInformation">
+        <mandatoryConform/>
+      </item>
+      <item value="54" name="Help">
+        <mandatoryConform/>
+      </item>
+      <item value="55" name="PageUp">
+        <mandatoryConform/>
+      </item>
+      <item value="56" name="PageDown">
+        <mandatoryConform/>
+      </item>
+      <item value="64" name="Power">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="VolumeUp">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="VolumeDown">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="Mute">
+        <mandatoryConform/>
+      </item>
+      <item value="68" name="Play">
+        <mandatoryConform/>
+      </item>
+      <item value="69" name="Stop">
+        <mandatoryConform/>
+      </item>
+      <item value="70" name="Pause">
+        <mandatoryConform/>
+      </item>
+      <item value="71" name="Record">
+        <mandatoryConform/>
+      </item>
+      <item value="72" name="Rewind">
+        <mandatoryConform/>
+      </item>
+      <item value="73" name="FastForward">
+        <mandatoryConform/>
+      </item>
+      <item value="74" name="Eject">
+        <mandatoryConform/>
+      </item>
+      <item value="75" name="Forward">
+        <mandatoryConform/>
+      </item>
+      <item value="76" name="Backward">
+        <mandatoryConform/>
+      </item>
+      <item value="77" name="StopRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="78" name="PauseRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="79" name="Reserved">
+        <mandatoryConform/>
+      </item>
+      <item value="80" name="Angle">
+        <mandatoryConform/>
+      </item>
+      <item value="81" name="SubPicture">
+        <mandatoryConform/>
+      </item>
+      <item value="82" name="VideoOnDemand">
+        <mandatoryConform/>
+      </item>
+      <item value="83" name="ElectronicProgramGuide">
+        <mandatoryConform/>
+      </item>
+      <item value="84" name="TimerProgramming">
+        <mandatoryConform/>
+      </item>
+      <item value="85" name="InitialConfiguration">
+        <mandatoryConform/>
+      </item>
+      <item value="86" name="SelectBroadcastType">
+        <mandatoryConform/>
+      </item>
+      <item value="87" name="SelectSoundPresentation">
+        <mandatoryConform/>
+      </item>
+      <item value="96" name="PlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="97" name="PausePlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="98" name="RecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="99" name="PauseRecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="100" name="StopFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="101" name="MuteFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="102" name="RestoreVolumeFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="103" name="TuneFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="104" name="SelectMediaFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="105" name="SelectAvInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="106" name="SelectAudioInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="107" name="PowerToggleFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="108" name="PowerOffFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="109" name="PowerOnFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="113" name="F1Blue">
+        <mandatoryConform/>
+      </item>
+      <item value="114" name="F2Red">
+        <mandatoryConform/>
+      </item>
+      <item value="115" name="F3Green">
+        <mandatoryConform/>
+      </item>
+      <item value="116" name="F4Yellow">
+        <mandatoryConform/>
+      </item>
+      <item value="117" name="F5">
+        <mandatoryConform/>
+      </item>
+      <item value="118" name="Data">
+        <mandatoryConform/>
+      </item>
+    </enum>
     <enum name="StatusEnum">
       <item value="0" name="Success" summary="Succeeded">
         <mandatoryConform/>
@@ -88,7 +348,7 @@ Davis, CA 95616, USA
     <command id="0x00" name="SendKey" response="SendKeyResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
-      <field id="0" name="KeyCode" type="uint8">
+      <field id="0" name="KeyCode" type="CecKeyCodeEnum">
         <mandatoryConform/>
       </field>
     </command>
diff --git a/data_model/clusters/LocalizationTimeFormat.xml b/data_model/clusters/LocalizationTimeFormat.xml
index 9c0ffa062fec58..1a7b6976a69ec6 100644
--- a/data_model/clusters/LocalizationTimeFormat.xml
+++ b/data_model/clusters/LocalizationTimeFormat.xml
@@ -103,6 +103,9 @@ Davis, CA 95616, USA
       <item value="11" name="Taiwanese" summary="Dates conveyed using the Taiwanese calendar">
         <optionalConform choice="a" more="true"/>
       </item>
+      <item value="255" name="UseActiveLocale" summary="calendar implied from active locale">
+        <optionalConform choice="a" more="true"/>
+      </item>
     </enum>
     <enum name="HourFormatEnum">
       <item value="0" name="12hr" summary="Time conveyed with a 12-hour clock">
@@ -111,17 +114,20 @@ Davis, CA 95616, USA
       <item value="1" name="24hr" summary="Time conveyed with a 24-hour clock">
         <mandatoryConform/>
       </item>
+      <item value="255" name="UseActiveLocale" summary="Use active locale clock">
+        <mandatoryConform/>
+      </item>
     </enum>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum" default="null">
+    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum" default="null">
+    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform>
         <feature name="CALFMT"/>
       </mandatoryConform>
diff --git a/data_model/clusters/MediaPlayback.xml b/data_model/clusters/MediaPlayback.xml
index 21001d287f6120..c53dc862808c12 100644
--- a/data_model/clusters/MediaPlayback.xml
+++ b/data_model/clusters/MediaPlayback.xml
@@ -61,10 +61,10 @@ Davis, CA 95616, USA
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="MEDIAPLAYBACK" scope="Endpoint"/>
   <features>
-    <feature bit="0" code="AS" name="AdvancedSeek" summary="Enables clients to implement more advanced media seeking behavior in their user interface, such as for example a &quot;seek bar&quot;.">
+    <feature bit="0" code="AS" name="AdvancedSeek" summary="Advanced media seeking">
       <optionalConform/>
     </feature>
-    <feature bit="1" code="VS" name="VariableSpeed" summary="Support for commands to support variable speed playback on media that supports it.">
+    <feature bit="1" code="VS" name="VariableSpeed" summary="Variable speed playback">
       <optionalConform/>
     </feature>
   </features>
@@ -203,12 +203,22 @@ Davis, CA 95616, USA
       <mandatoryConform>
         <feature name="VS"/>
       </mandatoryConform>
+      <field id="0" name="AudioAdvanceUnmuted" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="AA"/>
+        </mandatoryConform>
+      </field>
     </command>
     <command id="0x07" name="FastForward" response="PlaybackResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <feature name="VS"/>
       </mandatoryConform>
+      <field id="0" name="AudioAdvanceUnmuted" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="AA"/>
+        </mandatoryConform>
+      </field>
     </command>
     <command id="0x08" name="SkipForward" response="PlaybackResponse">
       <access invokePrivilege="operate"/>
diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml
index e97821db771a77..3f127cebd90367 100644
--- a/data_model/clusters/MicrowaveOvenControl.xml
+++ b/data_model/clusters/MicrowaveOvenControl.xml
@@ -55,7 +55,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050f" name="Microwave Oven Control" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005f" name="Microwave Oven Control" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml
index 0e6703b896380a..9f516bbfbb2e7b 100644
--- a/data_model/clusters/NetworkCommissioningCluster.xml
+++ b/data_model/clusters/NetworkCommissioningCluster.xml
@@ -126,7 +126,7 @@ Davis, CA 95616, USA
       <item value="2" name="5G" summary="5GHz - 5.150GHz to 5.895GHz (802.11a/n/ac/ax)">
         <optionalConform choice="a" more="true"/>
       </item>
-      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / WiFi 6E)">
+      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / Wi-Fi 6E)">
         <optionalConform choice="a" more="true"/>
       </item>
       <item value="4" name="60G" summary="60GHz - 57.24GHz to 70.20GHz (802.11ad/ay)">
diff --git a/data_model/clusters/OnOff.xml b/data_model/clusters/OnOff.xml
index 3c79220ecd67fc..bde1c4104ee5e6 100644
--- a/data_model/clusters/OnOff.xml
+++ b/data_model/clusters/OnOff.xml
@@ -73,7 +73,7 @@ Davis, CA 95616, USA
         </notTerm>
       </optionalConform>
     </feature>
-    <feature bit="1" code="DF" name="DeadFrontBehaviour" summary="Device has DeadFrontBehaviour Feature">
+    <feature bit="1" code="DF" name="DeadFrontBehavior" summary="Device has DeadFrontBehavior Feature">
       <optionalConform>
         <notTerm>
           <feature name="OFFONLY"/>
diff --git a/data_model/clusters/PowerSourceCluster.xml b/data_model/clusters/PowerSourceCluster.xml
index f7b5da82ce20fc..27caade3c634a3 100644
--- a/data_model/clusters/PowerSourceCluster.xml
+++ b/data_model/clusters/PowerSourceCluster.xml
@@ -69,24 +69,24 @@ Davis, CA 95616, USA
       <optionalConform/>
     </feature>
     <feature bit="2" code="RECHG" name="Rechargeable" summary="A rechargeable battery power source">
-      <mandatoryConform>
+      <optionalConform>
         <feature name="BAT"/>
-      </mandatoryConform>
+      </optionalConform>
     </feature>
     <feature bit="3" code="REPLC" name="Replaceable" summary="A replaceable battery power source">
-      <mandatoryConform>
+      <optionalConform>
         <feature name="BAT"/>
-      </mandatoryConform>
+      </optionalConform>
     </feature>
     <feature bit="4" code="CHGM" name="ChargeManagement" summary="A battery with charging management">
-      <mandatoryConform>
+      <optionalConform>
         <feature name="BAT"/>
-      </mandatoryConform>
+      </optionalConform>
     </feature>
     <feature bit="5" code="DCHGM" name="DischargeManagement" summary="A battery with discharging management">
-      <mandatoryConform>
+      <optionalConform>
         <feature name="BAT"/>
-      </mandatoryConform>
+      </optionalConform>
     </feature>
   </features>
   <dataTypes>
diff --git a/data_model/clusters/TargetNavigator.xml b/data_model/clusters/TargetNavigator.xml
index 3a49e7b5c6c838..ffb6955d27bf3c 100644
--- a/data_model/clusters/TargetNavigator.xml
+++ b/data_model/clusters/TargetNavigator.xml
@@ -75,6 +75,7 @@ Davis, CA 95616, USA
     <struct name="TargetInfoStruct">
       <field id="0" name="Identifier" type="uint8">
         <mandatoryConform/>
+        <constraint type="max" value="254"/>
       </field>
       <field id="1" name="Name" type="string">
         <mandatoryConform/>
@@ -86,9 +87,8 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="null">
+    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="0xFF">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <optionalConform/>
       <constraint type="desc"/>
     </attribute>
diff --git a/data_model/clusters/TimeSync.xml b/data_model/clusters/TimeSync.xml
index c7ad7b0032aaf7..4515d44012085e 100644
--- a/data_model/clusters/TimeSync.xml
+++ b/data_model/clusters/TimeSync.xml
@@ -57,7 +57,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0038" name="Time Sync" revision="2">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0038" name="Time Synchronization" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
     <revision revision="2" summary="Make TrustedTimeSource fabric-aware, add TSC feature, define list max sizes, change writable attributes to commands, remote port, add attribute for DNS support"/>
diff --git a/data_model/clusters/Timer.xml b/data_model/clusters/Timer.xml
index f4e37a2b60ceb6..ad0d864f016e92 100644
--- a/data_model/clusters/Timer.xml
+++ b/data_model/clusters/Timer.xml
@@ -119,7 +119,7 @@ Davis, CA 95616, USA
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x02" name="ReduceTime" response="Y">
+    <command id="0x03" name="ReduceTime" response="Y">
       <access invokePrivilege="operate"/>
       <optionalConform/>
       <field id="0" name="TimeReduction" type="elapsed-s">
diff --git a/data_model/clusters/WakeOnLAN.xml b/data_model/clusters/WakeOnLAN.xml
index eede336182e6dc..799c92a03fd9b8 100644
--- a/data_model/clusters/WakeOnLAN.xml
+++ b/data_model/clusters/WakeOnLAN.xml
@@ -61,11 +61,11 @@ Davis, CA 95616, USA
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="WAKEONLAN" scope="Endpoint"/>
   <attributes>
-    <attribute id="0x0000" name="MACAddress" type="hwadr">
+    <attribute id="0x0000" name="MACAddress" type="string">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <optionalConform/>
-      <constraint type="desc"/>
+      <constraint type="maxLength" value="12"/>
     </attribute>
     <attribute id="0x0001" name="LinkLocalAddress" type="ipv6adr">
       <access read="true" readPrivilege="view"/>
diff --git a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
index 038d7a7f4112c5..da2b311a5c2e53 100644
--- a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
+++ b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
@@ -127,7 +127,7 @@ Davis, CA 95616, USA
       <optionalConform/>
     </attribute>
     <attribute id="0x0015" name="SpecificationVersion">
-      <optionalConform/>
+      <disallowConform/>
     </attribute>
     <attribute id="0x0016" name="MaxPathsPerInvoke">
       <disallowConform/>
diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml
new file mode 100644
index 00000000000000..3f70f3d78ccb4b
--- /dev/null
+++ b/data_model/device_types/Aggregator.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000e" name="Aggregator" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="dynamic utility" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0025" name="Actions" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_LaundryWasher.xml b/data_model/device_types/AirPurifier.xml
similarity index 75%
rename from data_model/clusters/Mode_LaundryWasher.xml
rename to data_model/device_types/AirPurifier.xml
index 96190a4009850c..9793cd1d36b215 100644
--- a/data_model/clusters/Mode_LaundryWasher.xml
+++ b/data_model/device_types/AirPurifier.xml
@@ -55,37 +55,27 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Washer Mode" revision="1">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002d" name="Air Purifier" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial Matter release"/>
   </revisionHistory>
-  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="LWM" scope="Endpoint"/>
-  <dataTypes>
-    <struct name="ModeOptionStruct">
-      <field id="0" name="Label">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Mode">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="ModeTags">
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="8"/>
-      </field>
-    </struct>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="SupportedModes">
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
       <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="CurrentMode">
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0071" name="HEPA Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0072" name="Activated Carbon Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
       <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0002" name="StartUpMode">
-      <provisionalConform/>
-    </attribute>
-    <attribute id="0x0003" name="OnMode">
-      <provisionalConform/>
-    </attribute>
-  </attributes>
-</cluster>
\ No newline at end of file
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/AirQualitySensor.xml b/data_model/device_types/AirQualitySensor.xml
new file mode 100644
index 00000000000000..0c96fbd60515b7
--- /dev/null
+++ b/data_model/device_types/AirQualitySensor.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002c" name="Air Quality Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x005b" name="Air Quality" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040c" name="Carbon Monoxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040d" name="Carbon Dioxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0413" name="Nitrogen Dioxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0415" name="Ozone Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042a" name="PM2.5 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042b" name="Formaldehyde Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042c" name="PM1 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042d" name="PM10 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042e" name="Total Volatile Organic Compounds Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042f" name="Radon Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/BaseDeviceType.xml b/data_model/device_types/BaseDeviceType.xml
new file mode 100644
index 00000000000000..22cec956aa6061
--- /dev/null
+++ b/data_model/device_types/BaseDeviceType.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Base Device Type" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Duplicate condition replaces Multiple condition"/>
+  </revisionHistory>
+  <conditions/>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/BasicVideoPlayer.xml b/data_model/device_types/BasicVideoPlayer.xml
new file mode 100644
index 00000000000000..f6b86091004bfe
--- /dev/null
+++ b/data_model/device_types/BasicVideoPlayer.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0028" name="Basic Video Player" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="PhysicalInputs" summary="The device has physical inputs for media."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0006" name="OnOff" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0503" name="WakeOnLAN" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="server">
+      <mandatoryConform>
+        <attribute name="PhysicalInputs"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050b" name="Audio Output" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/BooleanSensor.xml b/data_model/device_types/BooleanSensor.xml
new file mode 100644
index 00000000000000..185fdc47176813
--- /dev/null
+++ b/data_model/device_types/BooleanSensor.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0041" name="Boolean Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/BridgedNode.xml b/data_model/device_types/BridgedNode.xml
new file mode 100644
index 00000000000000..a383ed2b541d6b
--- /dev/null
+++ b/data_model/device_types/BridgedNode.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x002e" name="Power Source Configuration" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="BridgedPowerSourceInfo"/>
+        </mandatoryConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x002f" name="Power Source" side="server">
+      <mandatoryConform>
+        <condition name="BridgedPowerSourceInfo"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0039" name="Bridged Device Basic Information" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/CastingVideoClient.xml b/data_model/device_types/CastingVideoClient.xml
new file mode 100644
index 00000000000000..06ef2b5492f337
--- /dev/null
+++ b/data_model/device_types/CastingVideoClient.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0029" name="Casting Video Client" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0006" name="OnOff" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="WakeOnLAN" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050a" name="Content Launcher" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050b" name="Audio Output" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050c" name="Application Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050d" name="Application Basic" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050e" name="Account Login" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/CastingVideoPlayer.xml b/data_model/device_types/CastingVideoPlayer.xml
new file mode 100644
index 00000000000000..fd26bb675cbdf6
--- /dev/null
+++ b/data_model/device_types/CastingVideoPlayer.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0023" name="Casting Video Player" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="ContentAppPlatform" summary="The device includes a Content App Platform. A Content App is usually an
+application built by a Content Provider. A Casting Video Player with a Content App Platform is able to
+launch Content Apps and represent these apps as separate endpoints."/>
+    <condition name="PhysicalInputs" summary="The device has physical inputs for media."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0006" name="OnOff" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0503" name="WakeOnLAN" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="server">
+      <mandatoryConform>
+        <attribute name="PhysicalInputs"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050a" name="Content Launcher" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050b" name="Audio Output" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050c" name="Application Launcher" side="server">
+      <mandatoryConform>
+        <attribute name="ContentAppPlatform"/>
+      </mandatoryConform>
+      <features>
+        <feature code="" name="Application Platform">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x050e" name="Account Login" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ColorDimmerSwitch.xml b/data_model/device_types/ColorDimmerSwitch.xml
new file mode 100644
index 00000000000000..dcd2ac18b1a912
--- /dev/null
+++ b/data_model/device_types/ColorDimmerSwitch.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0105" name="Color Dimmer Switch" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification superset="Dimmer Switch" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml
new file mode 100644
index 00000000000000..5897f0ee0b796a
--- /dev/null
+++ b/data_model/device_types/ColorTemperatureLight.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010c" name="Color Temperature Light" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification superset="Dimmable Light" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="CT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="RemainingTime">
+          <mandatoryConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ContactSensor.xml b/data_model/device_types/ContactSensor.xml
new file mode 100644
index 00000000000000..e8a7c3f343a9f4
--- /dev/null
+++ b/data_model/device_types/ContactSensor.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0015" name="Contact Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml
new file mode 100644
index 00000000000000..8f927c48f44a35
--- /dev/null
+++ b/data_model/device_types/ContentApp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0024" name="Content App" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050a" name="Content Launcher" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050c" name="Application Launcher" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Application Platform">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x050d" name="Application Basic" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050e" name="Account Login" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ControlBridge.xml b/data_model/device_types/ControlBridge.xml
new file mode 100644
index 00000000000000..6ed528c0122d96
--- /dev/null
+++ b/data_model/device_types/ControlBridge.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0840" name="Control Bridge" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Revision is zero before revision numbers are defined and is
+required."/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0400" name="Illuminance Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/CookSurface.xml b/data_model/device_types/CookSurface.xml
new file mode 100644
index 00000000000000..34f5556234a6e5
--- /dev/null
+++ b/data_model/device_types/CookSurface.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0077" name="Cook Surface" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Cooktop.xml b/data_model/device_types/Cooktop.xml
new file mode 100644
index 00000000000000..8288f38c8a87ba
--- /dev/null
+++ b/data_model/device_types/Cooktop.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0078" name="Cooktop" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OFFONLY">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0047" name="Timer" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/DimmableLight.xml b/data_model/device_types/DimmableLight.xml
new file mode 100644
index 00000000000000..39f193f53e7553
--- /dev/null
+++ b/data_model/device_types/DimmableLight.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0101" name="Dimmable Light" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
+  </revisionHistory>
+  <classification superset="On/Off Light" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml
new file mode 100644
index 00000000000000..c262abf3741d7e
--- /dev/null
+++ b/data_model/device_types/DimmablePlug-InUnit.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010b" name="Dimmable Plug-In Unit" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/DimmerSwitch.xml b/data_model/device_types/DimmerSwitch.xml
new file mode 100644
index 00000000000000..a3bae868a2498b
--- /dev/null
+++ b/data_model/device_types/DimmerSwitch.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0104" name="Dimmer Switch" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification superset="On/Off Light Switch" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Dishwasher.xml b/data_model/device_types/Dishwasher.xml
new file mode 100644
index 00000000000000..429e96c149abe9
--- /dev/null
+++ b/data_model/device_types/Dishwasher.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0075" name="Dishwasher" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0059" name="Dishwasher Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x005d" name="Dishwasher Alarm" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/DoorLock.xml b/data_model/device_types/DoorLock.xml
new file mode 100644
index 00000000000000..d31aaad30d8d98
--- /dev/null
+++ b/data_model/device_types/DoorLock.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000a" name="Door Lock" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="Initial Matter release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <optionalConform>
+          <condition name="Zigbee"/>
+        </optionalConform>
+        <provisionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0009" name="Alarms" side="server">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x000a" name="Time" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0020" name="Poll Control" side="server">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0101" name="Door Lock" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="RID (RFID Credential)">
+          <otherwiseConform>
+            <optionalConform>
+              <condition name="Zigbee"/>
+            </optionalConform>
+            <provisionalConform/>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="" name="LOG (Logging)">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </feature>
+        <feature code="" name="USR (User)">
+          <mandatoryConform>
+            <andTerm>
+              <condition name="Matter"/>
+              <orTerm>
+                <feature name="PIN"/>
+                <feature name="RID"/>
+                <feature name="FPG"/>
+                <feature name="FACE"/>
+              </orTerm>
+            </andTerm>
+          </mandatoryConform>
+        </feature>
+        <feature code="" name="NOT (Notification)">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="AlarmMask">
+          <optionalConform>
+            <attribute name="Alarms"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="KeypadOperationEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="RemoteOperationEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="ManualOperationEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="RFIDOperationEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="KeypadProgrammingEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="RemoteProgrammingEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+        <attribute code="" name="RFIDProgrammingEventMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+      </attributes>
+      <commands>
+        <command id="" name="Operating Event Notification">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </command>
+        <command id="" name="Programming Event Notification">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </command>
+      </commands>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml
new file mode 100644
index 00000000000000..4f4efb3ea90d1c
--- /dev/null
+++ b/data_model/device_types/DoorLockController.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000b" name="Door Lock Controller" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="Initial Matter release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform>
+        <condition name="EZ-Target"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform>
+        <condition name="EZ-Initiator"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <mandatoryConform>
+        <condition name="Zigbee"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="Zigbee"/>
+        </mandatoryConform>
+        <provisionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0038" name="TimeSync" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0101" name="Door Lock" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/EVSE.xml b/data_model/device_types/EVSE.xml
new file mode 100644
index 00000000000000..b5e57c83aa3ac1
--- /dev/null
+++ b/data_model/device_types/EVSE.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="EVSE" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="" name="Energy EVSE Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0011" name="Power Source" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0098" name="Device Energy Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="PA">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="PFR">
+          <otherwiseConform>
+            <mandatoryConform>
+              <feature name="PFA"/>
+            </mandatoryConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="" name="PFA">
+          <optionalConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0099" name="Energy EVSE" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/EnergyTariff.xml b/data_model/device_types/EnergyTariff.xml
new file mode 100644
index 00000000000000..9e6e0b4c12ab36
--- /dev/null
+++ b/data_model/device_types/EnergyTariff.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050b" name="Energy Tariff" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Matter release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/EnergyTariffCalendar.xml b/data_model/device_types/EnergyTariffCalendar.xml
new file mode 100644
index 00000000000000..3dca889b777e66
--- /dev/null
+++ b/data_model/device_types/EnergyTariffCalendar.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050b" name="Energy Tariff Calendar" revision="0">
+  <revisionHistory>
+    <revision revision="0" summary="Initial Matter release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml
new file mode 100644
index 00000000000000..4120226176e7a1
--- /dev/null
+++ b/data_model/device_types/ExtendedColorLight.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010d" name="Extended Color Light" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation; integrate DM CCB 3501"/>
+  </revisionHistory>
+  <classification superset="Color Temperature Light" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="HS">
+          <optionalConform/>
+        </feature>
+        <feature code="" name="EHUE">
+          <optionalConform/>
+        </feature>
+        <feature code="" name="CL">
+          <optionalConform/>
+        </feature>
+        <feature code="" name="XY">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="CT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="RemainingTime">
+          <mandatoryConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ExtractorHood.xml b/data_model/device_types/ExtractorHood.xml
new file mode 100644
index 00000000000000..5fdbc7c84a1583
--- /dev/null
+++ b/data_model/device_types/ExtractorHood.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007a" name="Extractor Hood" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0071" name="HEPA Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0072" name="Activated Carbon Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Rocking">
+          <disallowConform/>
+        </feature>
+        <feature code="" name="Wind">
+          <disallowConform/>
+        </feature>
+        <feature code="" name="Airflow Direction">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Fan.xml b/data_model/device_types/Fan.xml
new file mode 100644
index 00000000000000..49538ec32097b6
--- /dev/null
+++ b/data_model/device_types/Fan.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002b" name="Fan" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Added ability to be composed with a Thermostat for fan heaters"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <mandatoryConform/>
+      <attributes>
+        <attribute code="" name="FanModeSequence">
+          <access read="true"/>
+          <quality persistence="fixed"/>
+          <mandatoryConform>
+            <condition name="Matter"/>
+          </mandatoryConform>
+        </attribute>
+      </attributes>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/FlowSensor.xml b/data_model/device_types/FlowSensor.xml
new file mode 100644
index 00000000000000..8c604586481536
--- /dev/null
+++ b/data_model/device_types/FlowSensor.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0306" name="Flow Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/GenericSwitch.xml b/data_model/device_types/GenericSwitch.xml
new file mode 100644
index 00000000000000..7e13a7e18223ab
--- /dev/null
+++ b/data_model/device_types/GenericSwitch.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000f" name="Generic Switch" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Removed requirement for Fixed Label cluster (can use TagList which was added in Descriptor cluster)"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003b" name="Switch" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/HeatingCoolingUnit.xml b/data_model/device_types/HeatingCoolingUnit.xml
new file mode 100644
index 00000000000000..244ff14b0a15fa
--- /dev/null
+++ b/data_model/device_types/HeatingCoolingUnit.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0300" name="Heating/Cooling Unit" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="Initial Matter release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/HumiditySensor.xml b/data_model/device_types/HumiditySensor.xml
new file mode 100644
index 00000000000000..d59ed7caf43abe
--- /dev/null
+++ b/data_model/device_types/HumiditySensor.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0307" name="Humidity Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Zigbee 3.0"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/LaundryDryer.xml b/data_model/device_types/LaundryDryer.xml
new file mode 100644
index 00000000000000..a7d365f22e14fe
--- /dev/null
+++ b/data_model/device_types/LaundryDryer.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007c" name="Laundry Dryer" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x004a" name="Laundry Dryer Controls" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0051" name="Laundry Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/LaundryWasher.xml b/data_model/device_types/LaundryWasher.xml
new file mode 100644
index 00000000000000..07cd62a605fc9c
--- /dev/null
+++ b/data_model/device_types/LaundryWasher.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0073" name="Laundry Washer" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0051" name="Laundry Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0053" name="Laundry Washer Controls" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/LightSensor.xml b/data_model/device_types/LightSensor.xml
new file mode 100644
index 00000000000000..618901b398b5f8
--- /dev/null
+++ b/data_model/device_types/LightSensor.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0106" name="Light Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Restricting Groups client to Zigbee."/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0400" name="Illuminance Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/MicrowaveOven.xml b/data_model/device_types/MicrowaveOven.xml
new file mode 100644
index 00000000000000..8e77925b4131fc
--- /dev/null
+++ b/data_model/device_types/MicrowaveOven.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0079" name="Microwave Oven" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x005e" name="Microwave Oven Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x005f" name="Microwave Oven Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="Rocking">
+          <disallowConform/>
+        </feature>
+        <feature code="" name="Wind">
+          <disallowConform/>
+        </feature>
+        <feature code="" name="Airflow Direction">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ModeSelectDeviceType.xml b/data_model/device_types/ModeSelectDeviceType.xml
new file mode 100644
index 00000000000000..748dc1bae2f0a3
--- /dev/null
+++ b/data_model/device_types/ModeSelectDeviceType.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0027" name="Mode Select" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0050" name="Mode Select" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/NetworkInfraIntro.xml b/data_model/device_types/NetworkInfraIntro.xml
new file mode 100644
index 00000000000000..22d91b6f459c6d
--- /dev/null
+++ b/data_model/device_types/NetworkInfraIntro.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Network Infrastructure Architecture" revision=""/>
\ No newline at end of file
diff --git a/data_model/device_types/NetworkInfraManager.xml b/data_model/device_types/NetworkInfraManager.xml
new file mode 100644
index 00000000000000..750a97f22cad86
--- /dev/null
+++ b/data_model/device_types/NetworkInfraManager.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Network Infrastructure Manager" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="" name="Network Identity Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OccupancySensor.xml b/data_model/device_types/OccupancySensor.xml
new file mode 100644
index 00000000000000..bef470cc1c9ec6
--- /dev/null
+++ b/data_model/device_types/OccupancySensor.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0107" name="Occupancy Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Restricting Groups client to Zigbee."/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OnOffLight.xml b/data_model/device_types/OnOffLight.xml
new file mode 100644
index 00000000000000..1ce39e8545c84a
--- /dev/null
+++ b/data_model/device_types/OnOffLight.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0100" name="On/Off Light" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OnOffLightSwitch.xml b/data_model/device_types/OnOffLightSwitch.xml
new file mode 100644
index 00000000000000..c2c324c8ee5d2a
--- /dev/null
+++ b/data_model/device_types/OnOffLightSwitch.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0103" name="On/Off Light Switch" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml
new file mode 100644
index 00000000000000..1847119e49426c
--- /dev/null
+++ b/data_model/device_types/OnOffPlug-inUnit.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010a" name="On/Off Plug-in Unit" revision="3">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="EnhancedAddScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="EnhancedViewScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OnOffSensor.xml b/data_model/device_types/OnOffSensor.xml
new file mode 100644
index 00000000000000..d2c6553fc1140c
--- /dev/null
+++ b/data_model/device_types/OnOffSensor.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0850" name="On/Off Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Revision is zero before revision numbers are defined and is
+required."/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OtaProvider.xml b/data_model/device_types/OtaProvider.xml
new file mode 100644
index 00000000000000..28c4e3c70b88e9
--- /dev/null
+++ b/data_model/device_types/OtaProvider.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0014" name="OTA Provider" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="utility" scope="node"/>
+  <clusters>
+    <cluster id="0x0012" name="OTA Software Update Requestor" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0014" name="OTA Software Update Provider" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OtaRequestor.xml b/data_model/device_types/OtaRequestor.xml
new file mode 100644
index 00000000000000..7f5a8ca11c58c8
--- /dev/null
+++ b/data_model/device_types/OtaRequestor.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0012" name="OTA Requestor" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="utility" scope="node"/>
+  <clusters>
+    <cluster id="0x0012" name="OTA Software Update Requestor" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0014" name="OTA Software Update Provider" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Oven.xml b/data_model/device_types/Oven.xml
new file mode 100644
index 00000000000000..5a13b0ec9ba053
--- /dev/null
+++ b/data_model/device_types/Oven.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007b" name="Oven" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/PowerSource.xml b/data_model/device_types/PowerSource.xml
new file mode 100644
index 00000000000000..05aaa56f88cf92
--- /dev/null
+++ b/data_model/device_types/PowerSource.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0011" name="Power Source" revision="2">
+  <classification class="utility" scope="node"/>
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Added optional measurement clusters for energy and power"/>
+  </revisionHistory>
+  <clusters>
+    <cluster id="0x002f" name="Power Source" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/PressureSensor.xml b/data_model/device_types/PressureSensor.xml
new file mode 100644
index 00000000000000..f472daaf4e39ff
--- /dev/null
+++ b/data_model/device_types/PressureSensor.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0305" name="Pressure Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Pump.xml b/data_model/device_types/Pump.xml
new file mode 100644
index 00000000000000..6f1b1f39aae53c
--- /dev/null
+++ b/data_model/device_types/Pump.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0303" name="Pump" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0200" name="Pump Configuration and Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/PumpController.xml b/data_model/device_types/PumpController.xml
new file mode 100644
index 00000000000000..070e3a5912942b
--- /dev/null
+++ b/data_model/device_types/PumpController.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0304" name="Pump Controller" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x001e" name="Binding" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0200" name="Pump Configuration and Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Refrigerator.xml b/data_model/device_types/Refrigerator.xml
new file mode 100644
index 00000000000000..19a9b568872e4a
--- /dev/null
+++ b/data_model/device_types/Refrigerator.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0070" name="Refrigerator" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0057" name="Refrigerator Alarm" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/RoboticVacuumCleaner.xml b/data_model/device_types/RoboticVacuumCleaner.xml
new file mode 100644
index 00000000000000..4e02b17d772606
--- /dev/null
+++ b/data_model/device_types/RoboticVacuumCleaner.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0074" name="Robotic Vacuum Cleaner" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Add cluster usage constraints and informative data"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0054" name="RVC Run Mode" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0055" name="RVC Clean Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0061" name="RVC Operational State" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="Start">
+          <disallowConform/>
+        </command>
+        <command id="" name="Stop">
+          <disallowConform/>
+        </command>
+      </commands>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/RoomAirConditioner.xml b/data_model/device_types/RoomAirConditioner.xml
new file mode 100644
index 00000000000000..86240698da6789
--- /dev/null
+++ b/data_model/device_types/RoomAirConditioner.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0072" name="Room Air Conditioner" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml
new file mode 100644
index 00000000000000..f4792a2e1f5a96
--- /dev/null
+++ b/data_model/device_types/RootNodeDeviceType.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0016" name="Root Node" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+  </revisionHistory>
+  <classification class="node" scope="node"/>
+  <clusters>
+    <cluster id="0x001f" name="Access Control" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0028" name="Basic Information" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x002b" name="Localization Configuration" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="LanguageLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002c" name="Time Format Localization" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="TimeLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002d" name="Unit Localization" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="UnitLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002e" name="Power Source Configuration" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <optionalConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0030" name="General Commissioning" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0031" name="Network Commissioning" side="server">
+      <mandatoryConform>
+        <notTerm>
+          <attribute name="CustomNetworkConfig"/>
+        </notTerm>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0032" name="Diagnostic Logs" side="server">
+      <quality singleton="true"/>
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0033" name="General Diagnostics" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0034" name="Software Diagnostics" side="server">
+      <quality singleton="true"/>
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <quality singleton="true"/>
+      <optionalConform>
+        <condition name="Thread"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0036" name="Wi-Fi Network Diagnostics" side="server">
+      <quality singleton="true"/>
+      <optionalConform>
+        <condition name="Wi-Fi"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0037" name="Ethernet Network Diagnostics" side="server">
+      <quality singleton="true"/>
+      <optionalConform>
+        <condition name="Ethernet"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0038" name="Time Synchronization" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0038" name="Time Synchronization" side="server">
+      <quality singleton="true"/>
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x003c" name="Administrator Commissioning" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003e" name="Node Operational Credentials" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003f" name="Group Key Management" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/SmokeCOAlarm.xml b/data_model/device_types/SmokeCOAlarm.xml
new file mode 100644
index 00000000000000..5888e8148f0927
--- /dev/null
+++ b/data_model/device_types/SmokeCOAlarm.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0076" name="Smoke CO Alarm" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x005c" name="Smoke CO Alarm" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040c" name="Carbon Monoxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Speaker.xml b/data_model/device_types/Speaker.xml
new file mode 100644
index 00000000000000..f8bc0ab150036e
--- /dev/null
+++ b/data_model/device_types/Speaker.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0022" name="Speaker" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0006" name="OnOff" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/TemperatureControlledCabinet.xml b/data_model/device_types/TemperatureControlledCabinet.xml
new file mode 100644
index 00000000000000..93c09339a65a75
--- /dev/null
+++ b/data_model/device_types/TemperatureControlledCabinet.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0071" name="Temperature Controlled Cabinet" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0048" name="Oven Cavity Operational State" side="server">
+      <optionalConform>
+        <attribute name="Heater"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0049" name="Oven Mode" side="server">
+      <optionalConform>
+        <attribute name="Heater"/>
+      </optionalConform>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0052" name="Refrigerator and Temperature Controlled Cabinet Mode" side="server">
+      <optionalConform>
+        <attribute name="Cooler"/>
+      </optionalConform>
+      <features>
+        <feature code="" name="OnOff">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/TemperatureSensor.xml b/data_model/device_types/TemperatureSensor.xml
new file mode 100644
index 00000000000000..19d3fef781c717
--- /dev/null
+++ b/data_model/device_types/TemperatureSensor.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0302" name="Temperature Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml
new file mode 100644
index 00000000000000..ebc43e7dbf7203
--- /dev/null
+++ b/data_model/device_types/Thermostat.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0301" name="Thermostat" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation, added Clusters required for Matter support, restricted legacy elements to Zigbee only"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform>
+        <attribute name="Active"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0009" name="Alarms" side="server">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x000a" name="Time" side="client">
+      <optionalConform>
+        <condition name="Zigbee"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0038" name="TimeSync" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0038" name="TimeSync" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x009b" name="Energy Preference" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Schedule Configuration">
+          <otherwiseConform>
+            <optionalConform>
+              <condition name="Zigbee"/>
+            </optionalConform>
+            <provisionalConform/>
+          </otherwiseConform>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="AlarmMask">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </attribute>
+      </attributes>
+      <commands>
+        <command id="" name="Get Relay Status Log">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </command>
+        <command id="" name="Get Relay Status Log Response">
+          <optionalConform>
+            <condition name="Zigbee"/>
+          </optionalConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0204" name="Thermostat User Interface Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ThreadBorderRouter.xml b/data_model/device_types/ThreadBorderRouter.xml
new file mode 100644
index 00000000000000..5a069e57e93243
--- /dev/null
+++ b/data_model/device_types/ThreadBorderRouter.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Thread Border Router" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="" name="Thread Border Router Diagnostics" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0031" name="Network Commissioning" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="TH">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ThreePhasePowerSource.xml b/data_model/device_types/ThreePhasePowerSource.xml
new file mode 100644
index 00000000000000..3a3d5a018223b4
--- /dev/null
+++ b/data_model/device_types/ThreePhasePowerSource.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Three Phase Power Source" revision="1">
+  <classification class="utility" scope="node"/>
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <clusters>
+    <cluster id="0x000a" name="Time Synchronization" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x002f" name="Power Source" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/Valve.xml b/data_model/device_types/Valve.xml
new file mode 100644
index 00000000000000..4ce864b01ab246
--- /dev/null
+++ b/data_model/device_types/Valve.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0042" name="Valve" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0081" name="Valve Configuration and Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/VideoRemoteControl.xml b/data_model/device_types/VideoRemoteControl.xml
new file mode 100644
index 00000000000000..c86fb3ba437a55
--- /dev/null
+++ b/data_model/device_types/VideoRemoteControl.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002a" name="Video Remote Control" revision="1">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
+    <revision revision="1" summary="Initial release of this document"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0006" name="OnOff" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="WakeOnLAN" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050a" name="Content Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050b" name="Audio Output" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050c" name="Application Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050e" name="Account Login" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/WaterHeater.xml b/data_model/device_types/WaterHeater.xml
new file mode 100644
index 00000000000000..2f2f7fae235e1b
--- /dev/null
+++ b/data_model/device_types/WaterHeater.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="WaterHeater" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="" name="Water Heater Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0094" name="Water Heater Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0098" name="Device Energy Management" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="PFR">
+          <optionalConform/>
+        </feature>
+        <feature code="" name="PFA">
+          <optionalConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="HEAT">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="SCH">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/WaterLeakDetector.xml b/data_model/device_types/WaterLeakDetector.xml
new file mode 100644
index 00000000000000..596a9cebb2ac04
--- /dev/null
+++ b/data_model/device_types/WaterLeakDetector.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0043" name="Water Leak Detector" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification superset="Boolean Sensor" class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+      <events>
+        <event id="" name="StateChange">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0080" name="Boolean Sensor Configuration" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/WindowCovering.xml b/data_model/device_types/WindowCovering.xml
new file mode 100644
index 00000000000000..83f03a2a04e5ed
--- /dev/null
+++ b/data_model/device_types/WindowCovering.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0202" name="Window Covering" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0."/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <attribute name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0102" name="Window Covering" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Absolute Position">
+          <mandatoryConform>
+            <condition name="Zigbee"/>
+          </mandatoryConform>
+        </feature>
+      </features>
+      <commands>
+        <command id="" name="GoToLiftPercentage">
+          <field name="LiftPercentageValue">
+            <mandatoryConform>
+              <condition name="Zigbee"/>
+            </mandatoryConform>
+          </field>
+          <field name="LiftPercent100thsValue">
+            <mandatoryConform>
+              <condition name="Matter"/>
+            </mandatoryConform>
+          </field>
+        </command>
+        <command id="" name="GoToTiltPercentage">
+          <field name="TiltPercentageValue">
+            <mandatoryConform>
+              <condition name="Zigbee"/>
+            </mandatoryConform>
+          </field>
+          <field name="TiltPercent100thsValue">
+            <mandatoryConform>
+              <condition name="Matter"/>
+            </mandatoryConform>
+          </field>
+        </command>
+      </commands>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/WindowCoveringController.xml b/data_model/device_types/WindowCoveringController.xml
new file mode 100644
index 00000000000000..c79d5a2279f6a8
--- /dev/null
+++ b/data_model/device_types/WindowCoveringController.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0203" name="Window Covering Controller" revision="2">
+  <revisionHistory>
+    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="2" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0005" name="Scenes" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <attribute name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0102" name="Window Covering" side="client">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Absolute Position">
+          <mandatoryConform>
+            <condition name="Zigbee"/>
+          </mandatoryConform>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/scraper_version b/data_model/scraper_version
new file mode 100644
index 00000000000000..26aaba0e86632e
--- /dev/null
+++ b/data_model/scraper_version
@@ -0,0 +1 @@
+1.2.0
diff --git a/data_model/spec_sha b/data_model/spec_sha
index c8cdb81dba2809..d0a25923c7c7b5 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-6be044cb0a9bb333b70ccf9f70074afeb440b3cb
+8e4f91da4aacda4e799b9979605342a315ac7e43
diff --git a/docs/ci-cd/index.md b/docs/ci-cd/index.md
new file mode 100644
index 00000000000000..3f9f808b7d64b0
--- /dev/null
+++ b/docs/ci-cd/index.md
@@ -0,0 +1,43 @@
+# CI/CD Documentation
+
+```{toctree}
+:glob:
+
+tools/*
+```
+
+## Project Information
+
+-   [Build Guide](../guides/BUILDING.html)
+-   Sphinx documentation framework
+    -   New directories and individual files must be added to the
+        [tree](https://github.com/project-chip/connectedhomeip/blob/master/docs/index.md)
+    -   New files under directories must be added to the tree in the index file;
+        see above. Glob and regular expressions may be used to include all
+-   Pull Requests
+    -   Built in style and spelling checks must be satisfied
+    -   Larger changes should go through an approval process; reviewers are
+        automatically added
+    -   Smaller specific changes like ones to this file may be expedited with
+        the "fast track" label
+
+Work In Progress
+
+## Known Issues
+
+-   Python build running out of space
+    -   [Fail example](https://github.com/project-chip/connectedhomeip/actions/runs/6239660536/job/16938053552?pr=29333)
+    -   May need intermediate cleanup steps
+
+## Tools
+
+-   [Daily Fail Summary](tools/daily_fail_summary.html)
+
+## To Do
+
+-   Cert image auto build
+    -   [Initial code](https://github.com/woody-apple/connectedhomeip/tree/build-cert-bins)
+    -   Need to change chip-build image builds to cut down time
+    -   Do multi-platform builds for ARM64
+
+## General Improvement Ideas
diff --git a/docs/ci-cd/tools/daily_fail_summary.md b/docs/ci-cd/tools/daily_fail_summary.md
new file mode 100644
index 00000000000000..8855a7a3de6086
--- /dev/null
+++ b/docs/ci-cd/tools/daily_fail_summary.md
@@ -0,0 +1,34 @@
+### Daily Fail Summary
+
+#### Source
+
+Workflow:
+https://github.com/project-chip/connectedhomeip/blob/master/.github/workflows/recent_fail_summary.yaml
+
+Script:
+https://github.com/project-chip/connectedhomeip/blob/master/scripts/tools/summarize_fail.py
+
+Fail Definitions:
+https://github.com/project-chip/connectedhomeip/blob/master/scripts/tools/build_fail_definitions.yaml
+
+#### Summary
+
+Runs once per day; takes inventory of the previous day's workflow runs and
+parses them for fail statistics. Creates temporarily cached artifacts for easy
+data parsing. Also saves a daily pass percentage list of all workflows at
+https://github.com/project-chip/connectedhomeip/blob/daily_pass_percentage/docs/daily_pass_percentage.md.
+Fail definitions can be added to the file defined above to allow fast root cause
+determination of any fail with an error message.
+
+#### To Do
+
+-   Keep fail signature list updated to track causes of all common fails
+-   Include Darwin Test fail definitions in fail summary script - for starters,
+    Test Reliable Message Protocol
+
+#### Improvement Ideas
+
+-   Make script artifact more known and accessible so it can be easily shared
+    and used by everyone
+-   Deliver daily fail summaries in short form through a Slack bot for easy
+    access
diff --git a/docs/conf.py b/docs/conf.py
index 1f2f0d96cf74e8..52402d86518b80 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -32,9 +32,6 @@
     "examples/thermostat/nxp/linux-se05x/README.md",
     "examples/common/m5stack-tft/repo",
     "docs/guides/README.md",
-    "scripts/tools/memory/memdf/README.md",
-    "scripts/tools/memory/platform/README.md",
-    "scripts/tools/memory/README-GitHub-CI.md",
 ]
 
 
@@ -67,6 +64,7 @@
 
 external_content_contents = [
     (MATTER_BASE / "docs", "[!_R]*"),
+    (MATTER_BASE, "data_model/**/*.md"),
     (MATTER_BASE, "README.md"),
     (MATTER_BASE, "examples/**/*.md"),
     (MATTER_BASE, "examples/**/*.png"),
@@ -82,5 +80,6 @@
     "README",  # cannot detect README.md
     "scripts/",
     "examples/android/",
+    "data_model/",
 ]
 external_content_link_extensions = [".md", ".png", ".jpg", ".svg"]
diff --git a/docs/examples/index.md b/docs/examples/index.md
index c6d211bcaeee9d..703bcb5fb3bc7f 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -294,15 +294,6 @@ tv-casting-app/APIs.md
 window-app/**/README
 ```
 
-## Resource monitoring example
-
-```{toctree}
-:glob:
-:maxdepth: 1
-
-resource-monitoring-app/**/README
-```
-
 ## RVC example
 
 ```{toctree}
diff --git a/docs/guides/index.md b/docs/guides/index.md
index a818ee2b777912..2119b46059a8c0 100644
--- a/docs/guides/index.md
+++ b/docs/guides/index.md
@@ -55,6 +55,7 @@ ti/ti_platform_overview
 
 -   [Access Control](./access-control-guide.md)
 -   [IP Commissioning](./ip_commissioning.md)
+-   [Matter IDL tooling and validation](./matter_idl_tooling.md)
 
 ## Setup Guides
 
diff --git a/docs/guides/matter_idl_tooling.md b/docs/guides/matter_idl_tooling.md
new file mode 100644
index 00000000000000..09953e1d5ef0ca
--- /dev/null
+++ b/docs/guides/matter_idl_tooling.md
@@ -0,0 +1,86 @@
+# The `.matter` IDL file format
+
+The matter IDL file format is designed to be a human-readable representation of
+data structures, cluster definitions and endpoint composition.
+
+Since it is designed to be easy for both machine and humans to read, it is the
+basis of some tools to make validating zap-based cluster definitions easier.
+
+More details on the format in
+[matter_idl/README.md](../../scripts/py_matter_idl/matter_idl/README.md).
+
+## Parsing CSA XML Data definitions
+
+The SDK contains a copy of CSA XML data definitions in `data_model/clusters`.
+
+The files there are updated by running a scraper against the official matter
+specification and are a good source of truth for actual definitions. Update
+information available in [data_model/README.md](../../data_model/README.md).
+
+NOTE: scraper is a work in progress, XML data may be incomplete or have errors
+still.
+
+The script `./scripts/py_matter_idl/matter_idl/data_model_xml_parser.py` has the
+ability to parse one or more CSA data model XML files and output their content
+in `.matter` format. For example:
+
+```sh
+./scripts/py_matter_idl/matter_idl/data_model_xml_parser.py data_model/clusters/BooleanState.xml
+```
+
+The tool supports several options that are useful for development:
+
+| Argument(s)             | Description                                                                         |
+| ----------------------- | ----------------------------------------------------------------------------------- |
+| `-o/--output PATH`      | Output the matter file into a path instead of STDOUT.                               |
+| `--compare PATH`        | Also read another `.matter` file for compare. MUST be used with `--compare-output`. |
+| `--compare-output PATH` | Output the subset of `--compare` clusters that matches XML into PATH.               |
+
+Using `--compare` AND `--compare-output` produce output that is easier to
+compare as opposed to using existing zap-generated matter files because it
+strips out comments and it also alpha-sorts elements so that diffs are
+human-readable.
+
+### Comparing a `.matter` file against the spec
+
+Combining arguments to the tool allows getting a diff between SDK and
+specification:
+
+-   `data_model/clusters/*.xml` are assumed to be the official specification
+    definitions
+-   `src/controller/data_model/controller-clusters.matter` contains _all_
+    clusters defined in the SDK
+
+As such one can run compares such as:
+
+```sh
+./scripts/py_matter_idl/matter_idl/data_model_xml_parser.py         \
+     -o out/spec.matter                                             \
+     --compare-output out/sdk.matter                                \
+     --compare src/controller/data_model/controller-clusters.matter \
+     data_model/clusters/DoorLock.xml                               \
+  && diff out/{spec,sdk}.matter
+```
+
+NOTE: due to specification data scraper still being in development, the diff
+should be human-validated (e.g. for tool errors or Zigbee-only markers in the
+spec).
+
+## Linting `.matter` files for devices
+
+For device validation, `./scripts/idl_lint.py` provides the ability to validate
+a matter file for some basic conformance logic. These rules are expressed in
+`scripts/rules.matterlint`.
+
+The rules generally are:
+
+-   pre-loaded from silabs XML files (validates that mandatory attributes are
+    present)
+-   Hard-coded rules (e.g. mandatory clusters and attributes on specific
+    endpoints)
+
+Usage:
+
+```sh
+./scripts/idl_lint.py ./examples/window-app/common/window-app.matter
+```
diff --git a/docs/index.md b/docs/index.md
index cd865b4d31027e..c3200d13835fd4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,6 +9,7 @@ QUICK_START
 PROJECT_FLOW
 VSCODE_DEVELOPMENT
 api/index
+ci-cd/index
 discussion/index
 guides/index
 style/index
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 9b7779dc3ddf63..87799ce782fe65 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,4 +3,4 @@ Sphinx>=4.5
 sphinx-book-theme
 myst-parser
 breathe>=4.34
-pydata-sphinx-theme==0.14.1
+pydata-sphinx-theme==0.14.4
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
index d210cebb350c3a..0e4d5b1fd20c94 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -231,6 +239,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -241,6 +251,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -315,6 +327,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -390,6 +404,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -428,13 +444,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -454,6 +470,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -483,6 +501,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -499,11 +518,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -550,6 +572,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -584,6 +609,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -602,6 +629,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -639,6 +668,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -739,11 +770,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -778,17 +817,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -905,6 +941,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -977,6 +1015,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -1005,6 +1045,8 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -1053,6 +1095,8 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -1101,6 +1145,8 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1121,8 +1167,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1151,7 +1197,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute int8u speedMax = 4;
@@ -1180,9 +1226,11 @@ provisional server cluster FanControl = 514 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1194,6 +1242,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1208,6 +1258,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1263,6 +1315,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1318,6 +1372,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1373,6 +1429,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1428,6 +1486,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1483,6 +1543,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1538,6 +1600,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1593,6 +1657,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1648,6 +1714,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1703,6 +1771,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1806,8 +1876,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1883,9 +1955,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
@@ -1896,7 +1970,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 0x0001;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -1952,7 +2025,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 4;
 
     handle command Identify;
     handle command TriggerEffect;
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
index c1f47b4d162a51..4daeefb57b7fa6 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1379,6 +1411,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1552,7 +1600,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1585,14 +1633,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -2254,7 +2294,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6822,7 +6862,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6838,7 +6878,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6854,7 +6894,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/air-purifier-app/cc32xx/main/AppTask.cpp b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
index fa112c1ee23a21..e753e5ac4aed8f 100644
--- a/examples/air-purifier-app/cc32xx/main/AppTask.cpp
+++ b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
@@ -62,8 +62,8 @@ extern void DisplayBanner();
 
 #define AIR_PURIFIER_ENDPOINT 1
 #define AIR_QUALITY_SENSOR_ENDPOINT 2
-#define RELATIVE_HUMIDITY_SENSOR_ENDPOINT 3
-#define TEMPERATURE_SENSOR_ENDPOINT 4
+#define TEMPERATURE_SENSOR_ENDPOINT 3
+#define RELATIVE_HUMIDITY_SENSOR_ENDPOINT 4
 
 // Added the below three for DNS Server Initialization
 using namespace ::chip;
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
index fd0ebb160daf13..8f598f4281e4ef 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -76,6 +80,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -148,6 +154,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -225,6 +233,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -235,6 +245,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -309,6 +321,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -384,6 +398,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -422,13 +438,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -448,6 +464,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -477,6 +495,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -493,11 +512,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -544,6 +566,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -578,6 +603,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -596,6 +623,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -696,11 +725,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -735,6 +772,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -833,9 +872,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -893,11 +932,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -939,7 +980,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -972,6 +1013,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1011,6 +1054,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1056,6 +1101,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1172,6 +1219,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1244,6 +1293,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -1272,9 +1323,11 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1285,6 +1338,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1298,6 +1353,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1345,6 +1402,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1392,6 +1451,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1439,6 +1500,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1486,6 +1549,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1533,6 +1598,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1580,6 +1647,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1627,6 +1696,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1674,6 +1745,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1721,6 +1794,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1816,8 +1891,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1886,9 +1963,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2080,6 +2159,19 @@ endpoint 1 {
     handle command Identify;
   }
 
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 2;
+  }
+
   server cluster AirQuality {
     callback attribute airQuality default = 0;
     callback attribute generatedCommandList;
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
index 13bfc7a3777a90..1e8c4ca9bcc558 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1327,6 +1359,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1500,7 +1548,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1816,7 +1864,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1832,7 +1880,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1848,7 +1896,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3857,6 +3905,176 @@
             }
           ]
         },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Air Quality",
           "code": 91,
@@ -3992,7 +4210,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4008,7 +4226,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4024,7 +4242,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/air-quality-sensor-app/linux/README.md b/examples/air-quality-sensor-app/linux/README.md
index dd96aaefd9d07e..828b7eec895901 100644
--- a/examples/air-quality-sensor-app/linux/README.md
+++ b/examples/air-quality-sensor-app/linux/README.md
@@ -131,7 +131,7 @@ $ echo '{"Name":"AirQuality","NewValue":3}' > /tmp/chip_air_quality_fifo_<PID>
 Generate event `TemperatureMeasurement`, to change the temperate value.
 
 ```
-$ echo '{"Name":"TemperatureMeasurement","NewValue":18}' > /tmp/chip_air_quality_fifo_<PID>
+$ echo '{"Name":"TemperatureMeasurement","NewValue":1800}' > /tmp/chip_air_quality_fifo_<PID>
 ```
 
 ### Trigger Humidity change event
diff --git a/examples/air-quality-sensor-app/linux/main.cpp b/examples/air-quality-sensor-app/linux/main.cpp
index cad641e8971cdd..fddb23fb7b38a6 100644
--- a/examples/air-quality-sensor-app/linux/main.cpp
+++ b/examples/air-quality-sensor-app/linux/main.cpp
@@ -21,7 +21,7 @@
 #include <air-quality-sensor-manager.h>
 
 #include <app/util/af.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED
 #include <imgui_ui/ui.h>
diff --git a/examples/air-quality-sensor-app/telink/CMakeLists.txt b/examples/air-quality-sensor-app/telink/CMakeLists.txt
index fd5a5b14256426..908bea9eb73a98 100644
--- a/examples/air-quality-sensor-app/telink/CMakeLists.txt
+++ b/examples/air-quality-sensor-app/telink/CMakeLists.txt
@@ -19,6 +19,23 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
+set(ignoreMe "${TLNK_MARS_BOARD}")
+
+if(${TLNK_MARS_BOARD} MATCHES y)
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+  else()
+    unset(MARS_DTC_OVERLAY_FILE)
+  endif()
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+  else()
+    unset(MARS_CONF_OVERLAY_FILE)
+  endif()
+else()
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
   set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
 else()
@@ -41,14 +58,14 @@ endif()
 
 if(DTC_OVERLAY_FILE)
   set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
+    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
     CACHE STRING "" FORCE
   )
 else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
+  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
 endif()
 
-set(CONF_FILE prj.conf)
+set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
 
 # Load NCS/Zephyr build system
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
@@ -78,10 +95,12 @@ target_sources(app PRIVATE
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
+               ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
                ${TELINK_COMMON}/util/src/PWMDevice.cpp
+               ${TELINK_COMMON}/util/src/WS2812Device.cpp
                ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp)
 
 chip_configure_data_model(app
diff --git a/examples/air-quality-sensor-app/telink/include/AppTask.h b/examples/air-quality-sensor-app/telink/include/AppTask.h
index a1b55a9b83108f..659de081dbf01f 100644
--- a/examples/air-quality-sensor-app/telink/include/AppTask.h
+++ b/examples/air-quality-sensor-app/telink/include/AppTask.h
@@ -31,7 +31,8 @@ class AppTask : public AppTaskCommon
 
     CHIP_ERROR Init(void);
 
-    static void AirQualityActionEventHandler(AppEvent * aEvent);
+    static void AirQualitySensorUpdateTimerTimeoutCallback(k_timer * timer);
+    static void AirQualitySensorUpdateTimerEventHandler(AppEvent * aEvent);
 
     static AppTask sAppTask;
 };
diff --git a/examples/air-quality-sensor-app/telink/prj.conf b/examples/air-quality-sensor-app/telink/prj.conf
index 703e78efb7ed4a..b43fbe9636d9aa 100644
--- a/examples/air-quality-sensor-app/telink/prj.conf
+++ b/examples/air-quality-sensor-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/air-quality-sensor-app/telink/src/AppTask.cpp b/examples/air-quality-sensor-app/telink/src/AppTask.cpp
index 94988ea8bbe5a0..ac2f61b3c06f52 100644
--- a/examples/air-quality-sensor-app/telink/src/AppTask.cpp
+++ b/examples/air-quality-sensor-app/telink/src/AppTask.cpp
@@ -17,50 +17,100 @@
  */
 
 #include "AppTask.h"
+#include "SensorManagerCommon.h"
 #include <air-quality-sensor-manager.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
+using namespace chip;
 using namespace ::chip::app::Clusters;
 using namespace ::chip::app::Clusters::AirQuality;
 
-AppTask AppTask::sAppTask;
+namespace {
+k_timer sAirQualitySensorUpdateTimer;
+constexpr uint16_t kAirQualitySensorUpdateTimerPeriod = 10000; // 10s timer period
+} // namespace
 
-constexpr EndpointId kAirQualityEndpoint = 1;
+AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
+    CHIP_ERROR err;
+
 #if APP_USE_EXAMPLE_START_BUTTON
-    SetExampleButtonCallbacks(AirQualityActionEventHandler);
+    SetExampleButtonCallbacks(AirQualitySensorUpdateTimerEventHandler);
 #endif
     InitCommonParts();
 
-    AirQualitySensorManager::InitInstance(kAirQualityEndpoint);
+    err = SensorMgr().Init();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("Init of the Sensor Manager failed");
+        return err;
+    }
+
+    // Initialize air quality sensor update timer
+    k_timer_init(&sAirQualitySensorUpdateTimer, &AppTask::AirQualitySensorUpdateTimerTimeoutCallback, nullptr);
+    k_timer_user_data_set(&sAirQualitySensorUpdateTimer, this);
+    k_timer_start(&sAirQualitySensorUpdateTimer, K_MSEC(kAirQualitySensorUpdateTimerPeriod), K_NO_WAIT);
+
+    AirQualitySensorManager::InitInstance(kExampleEndpointId);
 
     return CHIP_NO_ERROR;
 }
 
 void AppTask::UpdateClusterState(void)
 {
+    CHIP_ERROR ret;
     AirQualitySensorManager * mInstance = AirQualitySensorManager::GetInstance();
+    int16_t temperature;
+    uint16_t humidity;
+
+    ret = SensorMgr().GetTempAndHumMeasurValue(&temperature, &humidity);
+    if (ret != CHIP_NO_ERROR)
+    {
+        LOG_ERR("Update of the Air Quality clusters failed");
+        return;
+    }
+
+    LOG_INF("Update Air Quality: temperature is (%d*0.01)°C, humidity is %d", temperature, humidity);
 
     // Update AirQuality value
-    mInstance->OnAirQualityChangeHandler(AirQualityEnum::kModerate);
+    mInstance->OnAirQualityChangeHandler(AirQualityEnum::kUnknown);
 
     // Update Carbon Dioxide
-    mInstance->OnCarbonDioxideMeasurementChangeHandler(400);
+    mInstance->OnCarbonDioxideMeasurementChangeHandler(0);
 
     // Update Temperature value
-    mInstance->OnTemperatureMeasurementChangeHandler(18);
+    mInstance->OnTemperatureMeasurementChangeHandler(temperature);
 
     // Update Humidity value
-    mInstance->OnHumidityMeasurementChangeHandler(60);
+    mInstance->OnHumidityMeasurementChangeHandler(humidity);
+}
+
+void AppTask::AirQualitySensorUpdateTimerTimeoutCallback(k_timer * timer)
+{
+    if (!timer)
+    {
+        return;
+    }
+
+    AppEvent event;
+    event.Type    = AppEvent::kEventType_Timer;
+    event.Handler = AirQualitySensorUpdateTimerEventHandler;
+    sAppTask.PostEvent(&event);
 }
 
-void AppTask::AirQualityActionEventHandler(AppEvent * aEvent)
+void AppTask::AirQualitySensorUpdateTimerEventHandler(AppEvent * aEvent)
 {
-    if (aEvent->Type == AppEvent::kEventType_Button)
+    if ((aEvent->Type == AppEvent::kEventType_Button) || (aEvent->Type == AppEvent::kEventType_Timer))
     {
         sAppTask.UpdateClusterState();
     }
+
+    if (aEvent->Type == AppEvent::kEventType_Timer)
+    {
+        // Start next timer to measurement the air quality sensor
+        k_timer_start(&sAirQualitySensorUpdateTimer, K_MSEC(kAirQualitySensorUpdateTimerPeriod), K_NO_WAIT);
+    }
 }
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 817358feb53ac2..0557d6764fb511 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,14 +149,19 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -205,7 +220,7 @@ provisional server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -286,6 +301,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -310,6 +327,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -330,7 +348,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -355,6 +373,8 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -379,6 +399,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -399,7 +420,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -418,6 +439,8 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for configuring On/Off switching devices. */
 server cluster OnOffSwitchConfiguration = 7 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute enum8 switchType = 0;
   attribute enum8 switchActions = 16;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -430,12 +453,14 @@ server cluster OnOffSwitchConfiguration = 7 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -446,7 +471,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -458,7 +483,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -475,55 +500,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -538,6 +563,8 @@ server cluster LevelControl = 8 {
 
 /** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
 server cluster BinaryInputBasic = 15 {
+  revision 1; // NOTE: Default/not specifically set
+
   attribute boolean outOfService = 81;
   attribute boolean presentValue = 85;
   readonly attribute bitmap8 statusFlags = 111;
@@ -551,6 +578,8 @@ server cluster BinaryInputBasic = 15 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -582,6 +611,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -604,6 +635,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -674,6 +707,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -761,6 +796,8 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -839,6 +876,8 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
   readonly attribute ProductAppearanceStruct productAppearance = 20;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -849,6 +888,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -923,6 +964,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -1001,7 +1044,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1016,6 +1061,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -1040,8 +1087,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1056,6 +1103,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -1066,7 +1115,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1077,7 +1126,9 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a Device's power system. */
 server cluster PowerSourceConfiguration = 46 {
-  readonly attribute int8u sources[] = 0;
+  revision 1;
+
+  readonly attribute endpoint_no sources[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1088,6 +1139,8 @@ server cluster PowerSourceConfiguration = 46 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1320,6 +1373,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1358,13 +1413,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1384,6 +1439,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1413,6 +1470,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1429,11 +1487,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1480,6 +1541,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1514,6 +1578,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1532,6 +1598,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1569,6 +1637,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1669,11 +1739,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1708,6 +1786,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1806,9 +1886,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1866,11 +1946,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1912,7 +1994,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1945,6 +2027,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1984,6 +2068,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 server cluster TimeSynchronization = 56 {
+  revision 2;
+
   enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
@@ -2126,6 +2212,8 @@ server cluster TimeSynchronization = 56 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2176,6 +2264,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -2221,6 +2311,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2337,6 +2429,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -2410,6 +2504,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2426,6 +2522,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2442,6 +2540,8 @@ server cluster UserLabel = 65 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -2455,76 +2555,10 @@ server cluster BooleanState = 69 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
-server cluster IcdManagement = 70 {
-  bitmap Feature : bitmap32 {
-    kCheckInProtocolSupport = 0x1;
-    kUserActiveModeTrigger = 0x2;
-    kLongIdleTimeSupport = 0x4;
-  }
-
-  bitmap UserActiveModeTriggerBitmap : bitmap32 {
-    kPowerCycle = 0x1;
-    kSettingsMenu = 0x2;
-    kCustomInstruction = 0x4;
-    kDeviceManual = 0x8;
-    kActuateSensor = 0x10;
-    kActuateSensorSeconds = 0x20;
-    kActuateSensorTimes = 0x40;
-    kActuateSensorLightsBlink = 0x80;
-    kResetButton = 0x100;
-    kResetButtonLightsBlink = 0x200;
-    kResetButtonSeconds = 0x400;
-    kResetButtonTimes = 0x800;
-    kSetupButton = 0x1000;
-    kSetupButtonSeconds = 0x2000;
-    kSetupButtonLightsBlink = 0x4000;
-    kSetupButtonTimes = 0x8000;
-    kAppDefinedButton = 0x10000;
-  }
-
-  fabric_scoped struct MonitoringRegistrationStruct {
-    fabric_sensitive node_id checkInNodeID = 1;
-    fabric_sensitive int64u monitoredSubject = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute int32u idleModeDuration = 0;
-  readonly attribute int32u activeModeDuration = 1;
-  readonly attribute int16u activeModeThreshold = 2;
-  readonly attribute access(read: administer) MonitoringRegistrationStruct registeredClients[] = 3;
-  readonly attribute access(read: administer) int32u ICDCounter = 4;
-  readonly attribute int16u clientsSupportedPerFabric = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RegisterClientRequest {
-    node_id checkInNodeID = 0;
-    int64u monitoredSubject = 1;
-    octet_string<16> key = 2;
-    optional octet_string<16> verificationKey = 3;
-  }
-
-  request struct UnregisterClientRequest {
-    node_id checkInNodeID = 0;
-    optional octet_string<16> verificationKey = 1;
-  }
-
-  response struct RegisterClientResponse = 1 {
-    int32u ICDCounter = 0;
-  }
-
-  fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
-  fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
-  command access(invoke: manage) StayActiveRequest(): DefaultSuccess = 3;
-}
-
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2563,6 +2597,8 @@ server cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster LaundryWasherMode = 81 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kNormal = 16384;
     kDelicate = 16385;
@@ -2610,6 +2646,8 @@ server cluster LaundryWasherMode = 81 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kRapidCool = 16384;
     kRapidFreeze = 16385;
@@ -2655,6 +2693,8 @@ server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
 
 /** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
 server cluster LaundryWasherControls = 83 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NumberOfRinsesEnum : enum8 {
     kNone = 0;
     kNormal = 1;
@@ -2681,6 +2721,8 @@ server cluster LaundryWasherControls = 83 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
@@ -2736,6 +2778,8 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
@@ -2785,6 +2829,8 @@ server cluster RvcCleanMode = 85 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
@@ -2810,6 +2856,8 @@ server cluster TemperatureControl = 86 {
 
 /** Attributes and commands for configuring the Refrigerator alarm. */
 server cluster RefrigeratorAlarm = 87 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap AlarmMap : bitmap32 {
     kDoorOpen = 0x1;
   }
@@ -2834,6 +2882,8 @@ server cluster RefrigeratorAlarm = 87 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster DishwasherMode = 89 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kNormal = 16384;
     kHeavy = 16385;
@@ -2880,6 +2930,8 @@ server cluster DishwasherMode = 89 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -2908,6 +2960,8 @@ server cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
+  revision 1;
+
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
@@ -3017,6 +3071,8 @@ server cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 server cluster DishwasherAlarm = 93 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap AlarmMap : bitmap32 {
     kInflowError = 0x1;
     kDrainError = 0x2;
@@ -3060,8 +3116,44 @@ server cluster DishwasherAlarm = 93 {
   command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
 }
 
+/** Attributes and commands for selecting a mode from a list of supported options. */
+provisional server cluster MicrowaveOvenMode = 94 {
+  revision 1;
+
+  enum ModeTag : enum16 {
+    kNormal = 16384;
+    kDefrost = 16385;
+  }
+
+  bitmap Feature : bitmap32 {
+    kOnOff = 0x1;
+  }
+
+  struct ModeTagStruct {
+    optional vendor_id mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<64> label = 0;
+    int8u mode = 1;
+    ModeTagStruct modeTags[] = 2;
+  }
+
+  readonly attribute ModeOptionStruct supportedModes[] = 0;
+  readonly attribute int8u currentMode = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
@@ -3122,6 +3214,8 @@ server cluster OperationalState = 96 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
@@ -3183,6 +3277,8 @@ server cluster RvcOperationalState = 97 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -3231,6 +3327,8 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -3279,6 +3377,8 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -3423,6 +3523,8 @@ server cluster WindowCovering = 258 {
 
 /** This cluster provides control of a barrier (garage door). */
 server cluster BarrierControl = 259 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap BarrierControlCapabilities : bitmap8 {
     kPartialBarrier = 0x1;
   }
@@ -3455,6 +3557,8 @@ server cluster BarrierControl = 259 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -3577,6 +3681,8 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -3673,6 +3779,8 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -3693,8 +3801,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -3723,7 +3831,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute int8u speedMax = 4;
@@ -3752,9 +3860,30 @@ provisional server cluster FanControl = 514 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3765,6 +3894,8 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -4064,6 +4195,8 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional server cluster BallastConfiguration = 769 {
+  revision 4;
+
   bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
@@ -4097,6 +4230,8 @@ provisional server cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -4117,9 +4252,11 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -4131,6 +4268,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -4148,6 +4287,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -4162,6 +4303,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -4176,6 +4319,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -4206,6 +4351,8 @@ server cluster OccupancySensing = 1030 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4261,6 +4408,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4316,6 +4465,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4371,6 +4522,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4426,6 +4579,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4481,6 +4636,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4536,6 +4693,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4591,6 +4750,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4646,6 +4807,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4701,6 +4864,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -4756,7 +4921,9 @@ server cluster RadonConcentrationMeasurement = 1071 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 server cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute char_string<12> MACAddress = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4767,6 +4934,8 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 server cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4779,6 +4948,8 @@ server cluster LowPower = 1288 {
 
 /** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
 server cluster ElectricalMeasurement = 2820 {
+  revision 3;
+
   readonly attribute bitmap32 measurementType = 0;
   readonly attribute int32s totalActivePower = 772;
   readonly attribute int16u rmsVoltage = 1285;
@@ -4800,6 +4971,8 @@ server cluster ElectricalMeasurement = 2820 {
 
 /** The Test Cluster is meant to validate the generated code */
 internal server cluster UnitTesting = 4294048773 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -5122,6 +5295,8 @@ internal server cluster UnitTesting = 4294048773 {
 
 /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */
 internal server cluster FaultInjection = 4294048774 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum FaultType : enum8 {
     kUnspecified = 0;
     kSystemFault = 1;
@@ -5248,12 +5423,14 @@ endpoint 0 {
     callback attribute uniqueID;
     callback attribute capabilityMinima;
     callback attribute productAppearance;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -5399,9 +5576,11 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -5542,7 +5721,7 @@ endpoint 0 {
     ram      attribute timeZoneDatabase default = 0;
     callback attribute timeZoneListMaxSize default = 3;
     callback attribute DSTOffsetListMaxSize;
-    ram      attribute supportsDNSResolve default = false;
+    ram      attribute supportsDNSResolve default = true;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -5633,25 +5812,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster IcdManagement {
-    callback attribute idleModeDuration default = 500;
-    callback attribute activeModeDuration default = 300;
-    callback attribute activeModeThreshold default = 300;
-    callback attribute registeredClients;
-    callback attribute ICDCounter default = 0;
-    callback attribute clientsSupportedPerFabric default = 2;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 2;
-
-    handle command RegisterClient;
-    handle command RegisterClientResponse;
-    handle command UnregisterClient;
-    handle command StayActiveRequest;
-  }
-
   server cluster RelativeHumidityMeasurement {
     ram      attribute measuredValue;
     ram      attribute minMeasuredValue default = 0;
@@ -5713,19 +5873,15 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -6067,6 +6223,17 @@ endpoint 1 {
     handle command ModifyEnabledAlarms;
   }
 
+  server cluster MicrowaveOvenMode {
+    callback attribute supportedModes;
+    callback attribute currentMode;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster OperationalState {
     emits event OperationalError;
     emits event OperationCompletion;
@@ -6797,19 +6964,15 @@ endpoint 2 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index 24e0df516f1b12..08a758eab09fd7 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data with some extensions"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -1074,6 +1074,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -1164,7 +1196,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2695,6 +2727,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2932,7 +2980,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3278,7 +3326,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3294,7 +3342,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3310,7 +3358,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4878,7 +4926,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "false",
+              "defaultValue": "true",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5819,226 +5867,6 @@
             }
           ]
         },
-        {
-          "name": "ICD Management",
-          "code": 70,
-          "mfgCode": null,
-          "define": "ICD_MANAGEMENT_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "RegisterClient",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RegisterClientResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "UnregisterClient",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "StayActiveRequest",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "IdleModeDuration",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "500",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveModeDuration",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "300",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveModeThreshold",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "300",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RegisteredClients",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ICDCounter",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClientsSupportedPerFabric",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Relative Humidity Measurement",
           "code": 1029,
@@ -6772,102 +6600,38 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "EnhancedViewSceneResponse",
-              "code": 65,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CopyScene",
-              "code": 66,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "CopySceneResponse",
-              "code": 66,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
+            {
+              "name": "EnhancedViewSceneResponse",
+              "code": 65,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             },
             {
-              "name": "SceneValid",
-              "code": 3,
+              "name": "CopyScene",
+              "code": 66,
               "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             },
+            {
+              "name": "CopySceneResponse",
+              "code": 66,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6911,16 +6675,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7000,7 +6764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7593,7 +7357,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10757,6 +10521,145 @@
             }
           ]
         },
+        {
+          "name": "Microwave Oven Mode",
+          "code": 94,
+          "mfgCode": null,
+          "define": "MICROWAVE_OVEN_MODE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "attributes": [
+            {
+              "name": "SupportedModes",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentMode",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Operational State",
           "code": 96,
@@ -13237,7 +13140,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13253,7 +13156,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13269,7 +13172,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14792,7 +14695,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14808,7 +14711,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14824,7 +14727,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -20390,76 +20293,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -20503,16 +20342,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -20592,7 +20431,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -21885,6 +21724,8 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ],
-  "log": []
-}
\ No newline at end of file
+
+  ]
+}
+
+
diff --git a/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h b/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h
new file mode 100644
index 00000000000000..dd5d5b4bcaf2eb
--- /dev/null
+++ b/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h
@@ -0,0 +1,72 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/clusters/mode-base-server/mode-base-server.h>
+#include <app/util/af.h>
+#include <app/util/config.h>
+#include <cstring>
+#include <utility>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+namespace MicrowaveOvenMode {
+
+const uint8_t ModeNormal  = 0;
+const uint8_t ModeDefrost = 1;
+
+/// This is an application level delegate to handle MicrowaveOvenMode commands according to the specific business logic.
+class ExampleMicrowaveOvenModeDelegate : public ModeBase::Delegate
+{
+private:
+    using ModeTagStructType              = detail::Structs::ModeTagStruct::Type;
+    ModeTagStructType modeTagsNormal[1]  = { { .value = to_underlying(ModeTag::kNormal) } };
+    ModeTagStructType modeTagsDefrost[1] = { { .value = to_underlying(ModeTag::kDefrost) } };
+
+    const detail::Structs::ModeOptionStruct::Type kModeOptions[2] = {
+        detail::Structs::ModeOptionStruct::Type{ .label    = CharSpan::fromCharString("Normal"),
+                                                 .mode     = ModeNormal,
+                                                 .modeTags = DataModel::List<const ModeTagStructType>(modeTagsNormal) },
+        detail::Structs::ModeOptionStruct::Type{ .label    = CharSpan::fromCharString("Defrost"),
+                                                 .mode     = ModeDefrost,
+                                                 .modeTags = DataModel::List<const ModeTagStructType>(modeTagsDefrost) }
+    };
+
+    CHIP_ERROR Init() override;
+    void HandleChangeToMode(uint8_t mode, ModeBase::Commands::ChangeToModeResponse::Type & response) override;
+
+    CHIP_ERROR GetModeLabelByIndex(uint8_t modeIndex, MutableCharSpan & label) override;
+    CHIP_ERROR GetModeValueByIndex(uint8_t modeIndex, uint8_t & value) override;
+    CHIP_ERROR GetModeTagsByIndex(uint8_t modeIndex, DataModel::List<ModeTagStructType> & tags) override;
+
+public:
+    ~ExampleMicrowaveOvenModeDelegate() override = default;
+};
+
+ModeBase::Instance * Instance();
+
+void Shutdown();
+
+} // namespace MicrowaveOvenMode
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/all-clusters-app/all-clusters-common/src/microwave-oven-mode.cpp b/examples/all-clusters-app/all-clusters-common/src/microwave-oven-mode.cpp
new file mode 100644
index 00000000000000..a7ab998dbdec9f
--- /dev/null
+++ b/examples/all-clusters-app/all-clusters-common/src/microwave-oven-mode.cpp
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <microwave-oven-mode.h>
+
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::MicrowaveOvenMode;
+using chip::Protocols::InteractionModel::Status;
+template <typename T>
+using List              = chip::app::DataModel::List<T>;
+using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::Type;
+
+static ExampleMicrowaveOvenModeDelegate * gMicrowaveOvenModeDelegate = nullptr;
+static ModeBase::Instance * gMicrowaveOvenModeInstance               = nullptr;
+
+CHIP_ERROR ExampleMicrowaveOvenModeDelegate::Init()
+{
+    return CHIP_NO_ERROR;
+}
+
+// todo refactor code by making a parent class for all ModeInstance classes to reduce flash usage.
+void ExampleMicrowaveOvenModeDelegate::HandleChangeToMode(uint8_t NewMode,
+                                                          ModeBase::Commands::ChangeToModeResponse::Type & response)
+{
+    response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
+}
+
+CHIP_ERROR ExampleMicrowaveOvenModeDelegate::GetModeLabelByIndex(uint8_t modeIndex, chip::MutableCharSpan & label)
+{
+    if (modeIndex >= ArraySize(kModeOptions))
+    {
+        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
+    }
+    return chip::CopyCharSpanToMutableCharSpan(kModeOptions[modeIndex].label, label);
+}
+
+CHIP_ERROR ExampleMicrowaveOvenModeDelegate::GetModeValueByIndex(uint8_t modeIndex, uint8_t & value)
+{
+    if (modeIndex >= ArraySize(kModeOptions))
+    {
+        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
+    }
+    value = kModeOptions[modeIndex].mode;
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ExampleMicrowaveOvenModeDelegate::GetModeTagsByIndex(uint8_t modeIndex, List<ModeTagStructType> & tags)
+{
+    if (modeIndex >= ArraySize(kModeOptions))
+    {
+        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
+    }
+
+    if (tags.size() < kModeOptions[modeIndex].modeTags.size())
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    std::copy(kModeOptions[modeIndex].modeTags.begin(), kModeOptions[modeIndex].modeTags.end(), tags.begin());
+    tags.reduce_size(kModeOptions[modeIndex].modeTags.size());
+
+    return CHIP_NO_ERROR;
+}
+
+ModeBase::Instance * MicrowaveOvenMode::Instance()
+{
+    return gMicrowaveOvenModeInstance;
+}
+
+void MicrowaveOvenMode::Shutdown()
+{
+    if (gMicrowaveOvenModeInstance != nullptr)
+    {
+        delete gMicrowaveOvenModeInstance;
+        gMicrowaveOvenModeInstance = nullptr;
+    }
+    if (gMicrowaveOvenModeDelegate != nullptr)
+    {
+        delete gMicrowaveOvenModeDelegate;
+        gMicrowaveOvenModeDelegate = nullptr;
+    }
+}
+
+void emberAfMicrowaveOvenModeClusterInitCallback(chip::EndpointId endpointId)
+{
+    VerifyOrDie(gMicrowaveOvenModeDelegate == nullptr && gMicrowaveOvenModeInstance == nullptr);
+    gMicrowaveOvenModeDelegate = new MicrowaveOvenMode::ExampleMicrowaveOvenModeDelegate;
+    gMicrowaveOvenModeInstance =
+        new ModeBase::Instance(gMicrowaveOvenModeDelegate, endpointId, MicrowaveOvenMode::Id, chip::to_underlying(Feature::kOnOff));
+    gMicrowaveOvenModeInstance->Init();
+}
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index ab7f1a5726765f..0ccc472986ed53 100644
--- a/examples/all-clusters-app/ameba/README.md
+++ b/examples/all-clusters-app/ameba/README.md
@@ -27,11 +27,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
 
 -   Setup build environment:
 
diff --git a/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h b/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h
index da82f0f6bbdaf9..f596534992e1bf 100644
--- a/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h
+++ b/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h
@@ -20,6 +20,8 @@
 #include "controller/ReadInteraction.h"
 #include <app/clusters/bindings/bindings.h>
 
+#include <type_traits>
+
 #if CONFIG_ENABLE_CHIP_SHELL
 #include "lib/shell/Engine.h"
 #include "lib/shell/commands/Help.h"
@@ -27,7 +29,9 @@
 
 using namespace chip;
 using namespace chip::app;
-using chip::app::Clusters::LevelControl::LevelControlOptions;
+using chip::app::Clusters::LevelControl::MoveModeEnum;
+using chip::app::Clusters::LevelControl::OptionsBitmap;
+using chip::app::Clusters::LevelControl::StepModeEnum;
 
 #if CONFIG_ENABLE_CHIP_SHELL
 using Shell::Engine;
@@ -40,6 +44,16 @@ Engine sShellSwitchLevelControlReadSubCommands;
 Engine sShellSwitchGroupsLevelControlSubCommands;
 #endif // defined(ENABLE_CHIP_SHELL)
 
+namespace {
+
+template <class T>
+T from_underlying(std::underlying_type_t<T> value)
+{
+    return static_cast<T>(value);
+}
+
+} // namespace
+
 void ProcessLevelControlUnicastBindingRead(BindingCommandData * data, const EmberBindingTableEntry & binding,
                                            OperationalDeviceProxy * peer_device)
 {
@@ -159,34 +173,34 @@ void ProcessLevelControlUnicastBindingCommand(BindingCommandData * data, const E
     case Clusters::LevelControl::Commands::MoveToLevel::Id:
         moveToLevelCommand.level           = static_cast<uint8_t>(data->args[0]);
         moveToLevelCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[1]);
-        moveToLevelCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveToLevelCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveToLevelCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveToLevelCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveToLevelCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::Move::Id:
-        moveCommand.moveMode        = static_cast<EmberAfMoveMode>(data->args[0]);
+        moveCommand.moveMode        = from_underlying<MoveModeEnum>(data->args[0]);
         moveCommand.rate            = static_cast<DataModel::Nullable<uint8_t>>(data->args[1]);
-        moveCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::Step::Id:
-        stepCommand.stepMode        = static_cast<EmberAfStepMode>(data->args[0]);
+        stepCommand.stepMode        = from_underlying<StepModeEnum>(data->args[0]);
         stepCommand.stepSize        = static_cast<uint8_t>(data->args[1]);
         stepCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[2]);
-        stepCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
-        stepCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[4]);
+        stepCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
+        stepCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[4]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          stepCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::Stop::Id:
-        stopCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[0]);
-        stopCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[1]);
+        stopCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[0]);
+        stopCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[1]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          stopCommand, onSuccess, onFailure);
         break;
@@ -194,34 +208,34 @@ void ProcessLevelControlUnicastBindingCommand(BindingCommandData * data, const E
     case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id:
         moveToLevelWithOnOffCommand.level           = static_cast<uint8_t>(data->args[0]);
         moveToLevelWithOnOffCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[1]);
-        moveToLevelWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveToLevelWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveToLevelWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveToLevelWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveToLevelWithOnOffCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::MoveWithOnOff::Id:
-        moveWithOnOffCommand.moveMode        = static_cast<EmberAfMoveMode>(data->args[0]);
+        moveWithOnOffCommand.moveMode        = from_underlying<MoveModeEnum>(data->args[0]);
         moveWithOnOffCommand.rate            = static_cast<DataModel::Nullable<uint8_t>>(data->args[1]);
-        moveWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveWithOnOffCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::StepWithOnOff::Id:
-        stepWithOnOffCommand.stepMode        = static_cast<EmberAfStepMode>(data->args[0]);
+        stepWithOnOffCommand.stepMode        = from_underlying<StepModeEnum>(data->args[0]);
         stepWithOnOffCommand.stepSize        = static_cast<uint8_t>(data->args[1]);
         stepWithOnOffCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[2]);
-        stepWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
-        stepWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[4]);
+        stepWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
+        stepWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[4]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          stepWithOnOffCommand, onSuccess, onFailure);
         break;
 
     case Clusters::LevelControl::Commands::StopWithOnOff::Id:
-        stopWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[0]);
-        stopWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[1]);
+        stopWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[0]);
+        stopWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[1]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          stopWithOnOffCommand, onSuccess, onFailure);
         break;
@@ -246,62 +260,62 @@ void ProcessLevelControlGroupBindingCommand(BindingCommandData * data, const Emb
     case Clusters::LevelControl::Commands::MoveToLevel::Id:
         moveToLevelCommand.level           = static_cast<uint8_t>(data->args[0]);
         moveToLevelCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[1]);
-        moveToLevelCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveToLevelCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveToLevelCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveToLevelCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToLevelCommand);
         break;
 
     case Clusters::LevelControl::Commands::Move::Id:
-        moveCommand.moveMode        = static_cast<EmberAfMoveMode>(data->args[0]);
+        moveCommand.moveMode        = from_underlying<MoveModeEnum>(data->args[0]);
         moveCommand.rate            = static_cast<DataModel::Nullable<uint8_t>>(data->args[1]);
-        moveCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveCommand);
         break;
 
     case Clusters::LevelControl::Commands::Step::Id:
-        stepCommand.stepMode        = static_cast<EmberAfStepMode>(data->args[0]);
+        stepCommand.stepMode        = from_underlying<StepModeEnum>(data->args[0]);
         stepCommand.stepSize        = static_cast<uint8_t>(data->args[1]);
         stepCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[2]);
-        stepCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
-        stepCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[4]);
+        stepCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
+        stepCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[4]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stepCommand);
         break;
 
     case Clusters::LevelControl::Commands::Stop::Id:
-        stopCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[0]);
-        stopCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[1]);
+        stopCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[0]);
+        stopCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[1]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stopCommand);
         break;
 
     case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id:
         moveToLevelWithOnOffCommand.level           = static_cast<uint8_t>(data->args[0]);
         moveToLevelWithOnOffCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[1]);
-        moveToLevelWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveToLevelWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveToLevelWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveToLevelWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToLevelWithOnOffCommand);
         break;
 
     case Clusters::LevelControl::Commands::MoveWithOnOff::Id:
-        moveWithOnOffCommand.moveMode        = static_cast<EmberAfMoveMode>(data->args[0]);
+        moveWithOnOffCommand.moveMode        = from_underlying<MoveModeEnum>(data->args[0]);
         moveWithOnOffCommand.rate            = static_cast<DataModel::Nullable<uint8_t>>(data->args[1]);
-        moveWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[2]);
-        moveWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
+        moveWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[2]);
+        moveWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveWithOnOffCommand);
         break;
 
     case Clusters::LevelControl::Commands::StepWithOnOff::Id:
-        stepWithOnOffCommand.stepMode        = static_cast<EmberAfStepMode>(data->args[0]);
+        stepWithOnOffCommand.stepMode        = from_underlying<StepModeEnum>(data->args[0]);
         stepWithOnOffCommand.stepSize        = static_cast<uint8_t>(data->args[1]);
         stepWithOnOffCommand.transitionTime  = static_cast<DataModel::Nullable<uint16_t>>(data->args[2]);
-        stepWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[3]);
-        stepWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[4]);
+        stepWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[3]);
+        stepWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[4]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stepWithOnOffCommand);
         break;
 
     case Clusters::LevelControl::Commands::StopWithOnOff::Id:
-        stopWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(data->args[0]);
-        stopWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(data->args[1]);
+        stopWithOnOffCommand.optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(data->args[0]);
+        stopWithOnOffCommand.optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(data->args[1]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stopWithOnOffCommand);
         break;
     }
diff --git a/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp b/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
old mode 100755
new mode 100644
index 859e3fb1043430..cc48488fd7e3ca
--- a/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
@@ -44,8 +44,6 @@
 #include "route_hook/asr_route_hook.h"
 #endif
 
-static const char * TAG = "app-devicecallbacks";
-
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
@@ -151,9 +149,8 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
 void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == chip::app::Clusters::OnOff::Attributes::OnOff::Id,
-                 ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1 || endpointId == 2,
-                 ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     switch (attributeId)
     {
@@ -188,8 +185,7 @@ void DeviceCallbacks::OnLevelPostAttributeChangeCallback(EndpointId endpointId,
     case chip::app::Clusters::LevelControl::Attributes::CurrentLevel::Id: {
         if (size == 1)
         {
-            uint8_t tmp = *value;
-            ChipLogProgress(Zcl, "New level: %u ", tmp);
+            ChipLogProgress(Zcl, "New level: %u ", *value);
         }
         else
         {
@@ -259,8 +255,8 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState)
 void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == chip::app::Clusters::Identify::Attributes::IdentifyTime::Id,
-                 ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04lx", TAG, attributeId));
-    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     // timerCount represents the number of callback executions before we stop the timer.
     // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
index f965d3dd9abbcf..68d6f927224585 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
@@ -68,9 +68,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run
-    $ chmod +x sysconfig-1.11.0_2225-setup.run
-    $ ./sysconfig-1.11.0_2225-setup.run
+    $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -97,13 +97,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.11.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
index 3415f19f1a4c21..ad8581b52cf26c 100644
--- a/examples/all-clusters-app/cc13x4_26x4/README.md
+++ b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
index e41cb9843c42c7..cfe028c7af7cc5 100644
--- a/examples/all-clusters-app/linux/BUILD.gn
+++ b/examples/all-clusters-app/linux/BUILD.gn
@@ -30,6 +30,7 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/laundry-washer-controls-delegate-impl.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/laundry-washer-mode.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/microwave-oven-mode.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp",
@@ -48,9 +49,6 @@ source_set("chip-all-clusters-common") {
   deps = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
-
-    # Issue 29397 for the icd:cluster dep
-    "${chip_root}/src/app/icd:cluster",
     "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
     "${chip_root}/third_party/jsoncpp",
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
index a6deafde128983..004827d742ae3c 100644
--- a/examples/all-clusters-app/linux/main-common.cpp
+++ b/examples/all-clusters-app/linux/main-common.cpp
@@ -23,10 +23,12 @@
 #include "include/tv-callbacks.h"
 #include "laundry-washer-controls-delegate-impl.h"
 #include "laundry-washer-mode.h"
+#include "microwave-oven-mode.h"
 #include "operational-state-delegate-impl.h"
 #include "resource-monitoring-delegates.h"
 #include "rvc-modes.h"
 #include "tcc-mode.h"
+#include <Options.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
 #include <app/att-storage.h>
@@ -46,10 +48,6 @@
 #include <transport/SessionManager.h>
 #include <transport/raw/PeerAddress.h>
 
-#include <app/icd/ICDManagementServer.h>
-
-#include <Options.h>
-
 using namespace chip;
 using namespace chip::app;
 using namespace chip::DeviceLayer;
@@ -217,11 +215,6 @@ void ApplicationInit()
 #endif
     Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
 
-    // Issue 29397
-    // Somehow All-cluster-app test the ICDManagementServer cluster without having
-    // CHIP_CONFIG_ENABLE_ICD_SERVER set to 1.
-    ICDManagementServer::GetInstance().SetSymmetricKeystore(Server::GetInstance().GetSessionKeystore());
-
     SetTagList(/* endpoint= */ 0, Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp0TagList));
     SetTagList(/* endpoint= */ 1, Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp1TagList));
     SetTagList(/* endpoint= */ 2, Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp2TagList));
@@ -234,6 +227,7 @@ void ApplicationShutdown()
     Clusters::LaundryWasherMode::Shutdown();
     Clusters::RvcCleanMode::Shutdown();
     Clusters::RvcRunMode::Shutdown();
+    Clusters::MicrowaveOvenMode::Shutdown();
     Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Shutdown();
     Clusters::HepaFilterMonitoring::Shutdown();
     Clusters::ActivatedCarbonFilterMonitoring::Shutdown();
diff --git a/examples/all-clusters-app/nrfconnect/README.md b/examples/all-clusters-app/nrfconnect/README.md
index a3e2edb3deac69..18df16f5e11654 100644
--- a/examples/all-clusters-app/nrfconnect/README.md
+++ b/examples/all-clusters-app/nrfconnect/README.md
@@ -176,93 +176,63 @@ communicate with it using the
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
-
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-        $ docker pull nordicsemi/nrfconnect-chip
+### Install Command Line Tools
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+### Install Toolchain Manager
 
-    In this command:
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
+To install the Toolchain Manager app, complete the following steps:
 
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the CHIP and the nRF Connect
-    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
-    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
-    Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -270,8 +240,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 86568566378149..0de8aae99d1fca 100644
--- a/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,12 +14,19 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
+
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/examples/all-clusters-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay b/examples/all-clusters-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
index 3063fbbcdee779..2ccc13adb1ddc0 100644
--- a/examples/all-clusters-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
+++ b/examples/all-clusters-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
index 07e1a69a285da4..9babcb7d362d4a 100644
--- a/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -26,10 +26,6 @@
 
 #pragma once
 
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
 // All clusters app has 3 group endpoints. This needs to defined here so that
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
diff --git a/examples/all-clusters-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/prj_dfu.conf
index e57438bf5c1aa5..ca8f536fafce18 100644
--- a/examples/all-clusters-app/nrfconnect/prj_dfu.conf
+++ b/examples/all-clusters-app/nrfconnect/prj_dfu.conf
@@ -41,3 +41,7 @@ CONFIG_ASSERT_VERBOSE=n
 CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_ASSERT_NO_COND_INFO=y
 CONFIG_ASSERT_NO_MSG_INFO=y
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/all-clusters-app/nrfconnect/prj_release.conf b/examples/all-clusters-app/nrfconnect/prj_release.conf
index fee661a740cccb..ebe3a71f8765eb 100644
--- a/examples/all-clusters-app/nrfconnect/prj_release.conf
+++ b/examples/all-clusters-app/nrfconnect/prj_release.conf
@@ -47,3 +47,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_ASSERT_VERBOSE=n
 CONFIG_PRINTK=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp
index 8344be7cda1b80..5e29a11cc9b290 100644
--- a/examples/all-clusters-app/nxp/mw320/main.cpp
+++ b/examples/all-clusters-app/nxp/mw320/main.cpp
@@ -172,7 +172,7 @@ void InitOTARequestor(void)
     // TODO: instatiate and initialize these values when QueryImageResponse tells us an image is available
     // TODO: add API for OTARequestor to pass QueryImageResponse info to the application to use for OTADownloader init
     // OTAImageProcessor ipParams;
-    // ipParams.imageFile = CharSpan("dnld_img.txt");
+    // ipParams.imageFile = "dnld_img.txt"_span;
     // gImageProcessor.SetOTAImageProcessorParams(ipParams);
     gImageProcessor.SetOTADownloader(&gDownloader);
 
diff --git a/examples/all-clusters-app/telink/prj.conf b/examples/all-clusters-app/telink/prj.conf
index f0e82ad971d4d8..18b7edcc11f395 100644
--- a/examples/all-clusters-app/telink/prj.conf
+++ b/examples/all-clusters-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index e03e2821ee0223..5908594f643e6f 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,14 +149,19 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -241,6 +256,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -265,6 +282,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -285,7 +303,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -304,12 +322,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -320,14 +340,14 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
 
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int16u remainingTime = 1;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -340,55 +360,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -403,6 +423,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -433,6 +455,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -455,6 +479,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -525,6 +551,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -611,6 +639,8 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -681,6 +711,8 @@ server cluster BasicInformation = 40 {
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -691,6 +723,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -765,6 +799,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -843,7 +879,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -858,6 +896,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -882,7 +922,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -896,6 +936,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -916,6 +958,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1145,6 +1189,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1183,13 +1229,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1209,6 +1255,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1238,6 +1286,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1254,11 +1303,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1305,6 +1357,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1339,6 +1394,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1357,6 +1414,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1394,6 +1453,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1475,6 +1536,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1488,11 +1550,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1521,6 +1591,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1618,9 +1690,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
@@ -1636,6 +1708,8 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1677,7 +1751,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1700,6 +1774,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1741,6 +1817,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -1791,6 +1869,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1831,6 +1911,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1947,6 +2029,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -2020,6 +2104,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2036,6 +2122,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2052,6 +2140,8 @@ server cluster UserLabel = 65 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -2067,6 +2157,8 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2102,6 +2194,8 @@ server cluster ModeSelect = 80 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
@@ -2127,6 +2221,8 @@ server cluster TemperatureControl = 86 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -2531,6 +2627,8 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -2638,6 +2736,8 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -2746,6 +2846,8 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -2832,6 +2934,8 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -2852,8 +2956,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -2882,7 +2986,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -2895,8 +2999,29 @@ provisional server cluster FanControl = 514 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2907,6 +3032,8 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2991,6 +3118,8 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional server cluster BallastConfiguration = 769 {
+  revision 4;
+
   bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
@@ -3015,6 +3144,8 @@ provisional server cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -3033,9 +3164,11 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3046,6 +3179,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -3063,6 +3198,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -3076,6 +3213,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -3089,6 +3228,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -3119,6 +3260,8 @@ server cluster OccupancySensing = 1030 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 server cluster WakeOnLan = 1283 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3129,16 +3272,18 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -3181,7 +3326,9 @@ server cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -3189,7 +3336,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -3206,7 +3353,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -3215,14 +3362,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -3231,6 +3371,15 @@ server cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -3250,7 +3399,7 @@ server cluster MediaPlayback = 1286 {
   readonly attribute int16u clusterRevision = 65533;
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -3261,6 +3410,8 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -3307,6 +3458,8 @@ server cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 server cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3319,7 +3472,9 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -3408,7 +3563,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -3428,11 +3583,11 @@ server cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -3440,11 +3595,7 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -3468,12 +3619,18 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -3485,13 +3642,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -3500,13 +3657,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -3524,6 +3681,8 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -3561,7 +3720,9 @@ server cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -3602,7 +3763,7 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -3613,6 +3774,8 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -3640,6 +3803,8 @@ server cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 server cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3660,13 +3825,15 @@ server cluster AccountLogin = 1294 {
     char_string setupPIN = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 /** The Test Cluster is meant to validate the generated code */
 internal server cluster UnitTesting = 4294048773 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -4066,12 +4233,14 @@ endpoint 0 {
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -4189,15 +4358,18 @@ endpoint 0 {
   server cluster GeneralDiagnostics {
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -4377,19 +4549,15 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -4941,18 +5109,14 @@ endpoint 2 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index b5931df6f9ca27..bd54cab550e1c3 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -915,6 +915,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -1005,7 +1037,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2368,6 +2400,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2403,6 +2451,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -2509,7 +2573,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2716,7 +2780,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2732,7 +2796,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2748,7 +2812,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4601,76 +4665,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4714,16 +4714,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4803,7 +4803,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5174,7 +5174,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7064,7 +7064,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7080,7 +7080,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7521,7 +7521,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7537,7 +7537,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7553,7 +7553,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10901,76 +10901,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10998,16 +10934,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -11068,7 +11004,7 @@
               "side": "server",
               "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -11087,7 +11023,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12316,6 +12252,5 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ],
-  "log": []
-}
\ No newline at end of file
+  ]
+}
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
index 86c2a0f222f3a1..b7189f9931a11c 100644
--- a/examples/all-clusters-minimal-app/ameba/README.md
+++ b/examples/all-clusters-minimal-app/ameba/README.md
@@ -27,13 +27,13 @@ The CHIP demo application is supported on
 -   Pull docker image:
 
           ```
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
           ```
 
 -   Run docker container:
 
           ```
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
           ```
 
 -   Setup build environment:
diff --git a/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
old mode 100755
new mode 100644
index a7be66c3fbef2c..89266592872d3e
--- a/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
@@ -43,8 +43,6 @@
 #include "route_hook/asr_route_hook.h"
 #endif
 
-static const char * TAG = "app-devicecallbacks";
-
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
@@ -149,9 +147,8 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
 void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == chip::app::Clusters::OnOff::Attributes::OnOff::Id,
-                 ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1 || endpointId == 2,
-                 ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     switch (attributeId)
     {
@@ -189,8 +186,8 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error
 void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == chip::app::Clusters::Identify::Attributes::IdentifyTime::Id,
-                 ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04lx", TAG, attributeId));
-    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     // timerCount represents the number of callback executions before we stop the timer.
     // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h
index 9fea28ec9fde12..b55e719c553a9b 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -25,7 +25,3 @@
  */
 
 #pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
index e1613a896fd6d8..0491fbb825666f 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/prj.conf
+++ b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
@@ -44,3 +44,7 @@ CONFIG_CHIP_OTA_REQUESTOR=n
 
 # Disable QSPI NOR
 CONFIG_CHIP_QSPI_NOR=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
index 7f64115af32736..e885563a98618f 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
+++ b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
@@ -47,3 +47,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_ASSERT_VERBOSE=n
 CONFIG_PRINTK=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
index d57f63a69a9bee..77c59d75d00c36 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
@@ -41,7 +41,7 @@ object ChipClient {
   private lateinit var chipDeviceController: ChipDeviceController
   private lateinit var androidPlatform: AndroidChipPlatform
   /* 0xFFF4 is a test vendor ID, replace with your assigned company ID */
-  private const val VENDOR_ID = 0xFFF4
+  const val VENDOR_ID = 0xFFF4
 
   fun getDeviceController(context: Context): ChipDeviceController {
     getAndroidChipPlatform(context)
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
index 571552b86f06b2..dc082d5dc5b73c 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
@@ -73,6 +73,7 @@ class SelectActionFragment : Fragment() {
     binding.wildcardBtn.setOnClickListener { handleWildcardClicked() }
     binding.unpairDeviceBtn.setOnClickListener { handleUnpairDeviceClicked() }
     binding.groupSettingBtn.setOnClickListener { handleGroupSettingClicked() }
+    binding.otaProviderBtn.setOnClickListener { handleOTAProviderClicked() }
 
     return binding.root
   }
@@ -218,6 +219,10 @@ class SelectActionFragment : Fragment() {
     showFragment(UnpairDeviceFragment.newInstance())
   }
 
+  private fun handleOTAProviderClicked() {
+    showFragment(OtaProviderClientFragment.newInstance(), false)
+  }
+
   /** Notifies listener of provision-WiFi-credentials button click. */
   private fun handleProvisionWiFiCredentialsClicked() {
     getCallback()?.SetNetworkType(ProvisionNetworkType.WIFI)
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
index 9687237a814e0d..8943801c080c80 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
@@ -12,19 +12,12 @@ import android.widget.EditText
 import android.widget.Spinner
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import chip.devicecontroller.ChipClusters
 import chip.devicecontroller.ChipDeviceController
-import chip.devicecontroller.ClusterIDMapping
+import chip.devicecontroller.ChipStructs
+import chip.devicecontroller.ChipStructs.AccessControlClusterAccessControlEntryStruct
+import chip.devicecontroller.ChipStructs.GroupKeyManagementClusterGroupKeySetStruct
 import chip.devicecontroller.GroupKeySecurityPolicy
-import chip.devicecontroller.InvokeCallback
-import chip.devicecontroller.ReportCallback
-import chip.devicecontroller.WriteAttributesCallback
-import chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
-import chip.devicecontroller.cluster.structs.GroupKeyManagementClusterGroupKeySetStruct
-import chip.devicecontroller.model.AttributeWriteRequest
-import chip.devicecontroller.model.ChipAttributePath
-import chip.devicecontroller.model.ChipEventPath
-import chip.devicecontroller.model.InvokeElement
-import chip.devicecontroller.model.NodeState
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
 import com.google.chip.chiptool.R
@@ -33,10 +26,6 @@ import com.google.chip.chiptool.util.DeviceIdUtil
 import java.lang.Exception
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import matter.tlv.AnonymousTag
-import matter.tlv.ContextSpecificTag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
 
 class GroupSettingFragment : Fragment() {
   private val deviceController: ChipDeviceController
@@ -260,14 +249,17 @@ class GroupSettingFragment : Fragment() {
       scope.launch {
         val keySetWritestruct =
           GroupKeyManagementClusterGroupKeySetStruct(
-            keySetIdEd.text.toString().toUInt(),
-            GroupKeySecurityPolicy.valueOf(keySecurityPolicySp.selectedItem.toString()).id.toUInt(),
+            keySetIdEd.text.toString().toUInt().toInt(),
+            GroupKeySecurityPolicy.valueOf(keySecurityPolicySp.selectedItem.toString())
+              .id
+              .toUInt()
+              .toInt(),
             hexStringToByteArray(epochKey0Ed.text.toString()),
-            epochStartTime0Ed.text.toString().toULong(),
+            epochStartTime0Ed.text.toString().toULong().toLong(),
             hexStringToByteArray(epochKey1Ed.text.toString()),
-            epochStartTime1Ed.text.toString().toULong(),
+            epochStartTime1Ed.text.toString().toULong().toLong(),
             hexStringToByteArray(epochKey2Ed.text.toString()),
-            epochStartTime2Ed.text.toString().toULong()
+            epochStartTime2Ed.text.toString().toULong().toLong()
           )
         sendKeySetWrite(keySetWritestruct)
         requireActivity().runOnUiThread { dialog.dismiss() }
@@ -279,41 +271,24 @@ class GroupSettingFragment : Fragment() {
   private suspend fun sendKeySetWrite(
     groupKeySetStruct: GroupKeyManagementClusterGroupKeySetStruct
   ) {
-    val tlvWriter =
-      TlvWriter()
-        .startStructure(AnonymousTag)
-        .apply {
-          groupKeySetStruct.toTlv(
-            ContextSpecificTag(
-              ClusterIDMapping.GroupKeyManagement.KeySetWriteCommandField.GroupKeySet.id
-            ),
-            this
-          )
-        }
-        .endStructure()
-
-    deviceController.invoke(
-      object : InvokeCallback {
-        override fun onError(e: java.lang.Exception?) {
+    val cluster =
+      ChipClusters.GroupKeyManagementCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        0
+      )
+    cluster.keySetWrite(
+      object : ChipClusters.DefaultClusterCallback {
+        override fun onError(e: Exception?) {
           Log.d(TAG, "onError : ", e)
           showMessage("onError : ${e.toString()}")
         }
 
-        override fun onResponse(invokeElement: InvokeElement?, successCode: Long) {
+        override fun onSuccess() {
           Log.d(TAG, "onResponse")
-          showMessage("onResponse : $successCode")
+          showMessage("onResponse")
         }
       },
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      InvokeElement.newInstance(
-        0,
-        ClusterIDMapping.GroupKeyManagement.ID,
-        ClusterIDMapping.GroupKeyManagement.Command.KeySetWrite.id,
-        tlvWriter.getEncoded(),
-        null
-      ),
-      0,
-      0
+      groupKeySetStruct
     )
   }
 
@@ -336,39 +311,30 @@ class GroupSettingFragment : Fragment() {
   }
 
   private suspend fun writeGroupKeyMap(groupId: UInt, groupKeySetId: UInt) {
-    val tlvWriter =
-      TlvWriter().apply {
-        startArray(AnonymousTag)
-        startStructure(AnonymousTag)
-        put(ContextSpecificTag(1), groupId)
-        put(ContextSpecificTag(2), groupKeySetId)
-        endStructure()
-        endArray()
-      }
-
-    deviceController.write(
-      object : WriteAttributesCallback {
-        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+    val cluster =
+      ChipClusters.GroupKeyManagementCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        0
+      )
+    cluster.writeGroupKeyMapAttribute(
+      object : ChipClusters.DefaultClusterCallback {
+        override fun onError(e: Exception?) {
           Log.d(TAG, "onError : ", e)
           showMessage("Error : ${e.toString()}")
         }
 
-        override fun onResponse(attributePath: ChipAttributePath?) {
+        override fun onSuccess() {
           Log.d(TAG, "onResponse")
           showMessage("write Success")
         }
       },
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      listOf(
-        AttributeWriteRequest.newInstance(
-          0,
-          ClusterIDMapping.GroupKeyManagement.ID,
-          ClusterIDMapping.GroupKeyManagement.Attribute.GroupKeyMap.id,
-          tlvWriter.getEncoded()
+      arrayListOf(
+        ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct(
+          groupId.toInt(),
+          groupKeySetId.toInt(),
+          deviceController.fabricIndex
         )
-      ),
-      0,
-      0
+      )
     )
   }
 
@@ -390,75 +356,52 @@ class GroupSettingFragment : Fragment() {
   }
 
   private suspend fun sendAddGroup(groupId: UInt, groupName: String) {
-    val tlvWriter =
-      TlvWriter().apply {
-        startStructure(AnonymousTag)
-        put(ContextSpecificTag(0), groupId)
-        put(ContextSpecificTag(1), groupName)
-        endStructure()
-      }
-
-    deviceController.invoke(
-      object : InvokeCallback {
+    val cluster =
+      ChipClusters.GroupsCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        0
+      )
+    cluster.addGroup(
+      object : ChipClusters.GroupsCluster.AddGroupResponseCallback {
         override fun onError(e: Exception?) {
           Log.d(TAG, "onError : ", e)
           showMessage("Error : ${e.toString()}")
         }
 
-        override fun onResponse(invokeElement: InvokeElement?, successCode: Long) {
+        override fun onSuccess(status: Int?, groupID: Int?) {
           Log.d(TAG, "onResponse")
-          showMessage("onResponse : $successCode")
+          showMessage("onResponse : $status, $groupID")
         }
       },
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      InvokeElement.newInstance(
-        0,
-        ClusterIDMapping.Groups.ID,
-        ClusterIDMapping.Groups.Command.AddGroup.id,
-        tlvWriter.getEncoded(),
-        null
-      ),
-      0,
-      0
+      groupId.toInt(),
+      groupName
     )
   }
 
   private suspend fun readAccessControl() {
-    val endpointId = 0
-    val clusterId = ClusterIDMapping.AccessControl.ID
-    val attributeId = ClusterIDMapping.AccessControl.Attribute.Acl.id
-
-    val attributePath = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
-    deviceController.readAttributePath(
-      object : ReportCallback {
-        override fun onError(
-          attributePath: ChipAttributePath?,
-          eventPath: ChipEventPath?,
-          e: Exception
-        ) {
+    val cluster =
+      ChipClusters.AccessControlCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        0
+      )
+    cluster.readAclAttribute(
+      object : ChipClusters.AccessControlCluster.AclAttributeCallback {
+        override fun onError(e: Exception?) {
           Log.d(TAG, "onError : ", e)
           showMessage("Error : $e")
         }
 
-        override fun onReport(nodeState: NodeState?) {
-          Log.d(TAG, "onResponse")
-          val tlv =
-            nodeState
-              ?.getEndpointState(endpointId)
-              ?.getClusterState(clusterId)
-              ?.getAttributeState(attributeId)
-              ?.tlv
-          requireActivity().runOnUiThread { showAddAccessControlDialog(tlv) }
+        override fun onSuccess(value: MutableList<AccessControlClusterAccessControlEntryStruct>?) {
+          requireActivity().runOnUiThread { showAddAccessControlDialog(value) }
         }
-      },
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      listOf(attributePath),
-      0
+      }
     )
   }
 
-  private fun showAddAccessControlDialog(tlv: ByteArray?) {
-    if (tlv == null) {
+  private fun showAddAccessControlDialog(
+    value: List<AccessControlClusterAccessControlEntryStruct>?
+  ) {
+    if (value == null) {
       Log.d(TAG, "Access Control read fail")
       showMessage("Access Control read fail")
       return
@@ -479,7 +422,7 @@ class GroupSettingFragment : Fragment() {
     dialogView.findViewById<Button>(R.id.addAccessControlBtn).setOnClickListener {
       scope.launch {
         sendAccessControl(
-          tlv,
+          value,
           groupIdEd.text.toString().toUInt(),
           AccessControlEntry.valueOf(accessControlEntrySp.selectedItem.toString()).id
         )
@@ -489,66 +432,52 @@ class GroupSettingFragment : Fragment() {
     dialog.show()
   }
 
-  private suspend fun sendAccessControl(tlv: ByteArray, groupId: UInt, privilege: UInt) {
-    val tlvWriter = TlvWriter().startArray(AnonymousTag)
-    var entryStructList: List<AccessControlClusterAccessControlEntryStruct>
-    TlvReader(tlv).also {
-      entryStructList = buildList {
-        it.enterArray(AnonymousTag)
-        while (!it.isEndOfContainer()) {
-          add(AccessControlClusterAccessControlEntryStruct.fromTlv(AnonymousTag, it))
-        }
-        it.exitContainer()
-      }
-    }
-
+  private suspend fun sendAccessControl(
+    value: List<AccessControlClusterAccessControlEntryStruct>,
+    groupId: UInt,
+    privilege: UInt
+  ) {
     // If GroupID is already added to AccessControl, do not add it.
-    for (entry in entryStructList) {
+    val cluster =
+      ChipClusters.AccessControlCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        0
+      )
+    val sendEntry = ArrayList<AccessControlClusterAccessControlEntryStruct>()
+    for (entry in value) {
       if (
-        entry.authMode == 3U /* Group */ &&
+        entry.authMode == AccessControlEntry.Operate.id.toInt() /* Group */ &&
           entry.subjects != null &&
-          entry.subjects!!.contains(groupId.toULong())
+          entry.subjects!!.contains(groupId.toULong().toLong())
       ) {
         continue
       }
-
-      entry.toTlv(AnonymousTag, tlvWriter)
+      sendEntry.add(entry)
     }
 
     val newEntry =
       AccessControlClusterAccessControlEntryStruct(
-        privilege,
-        3U /* Group */,
-        listOf(groupId.toULong()),
+        privilege.toInt(),
+        AccessControlEntry.Operate.id.toInt() /* Group */,
+        arrayListOf(groupId.toULong().toLong()),
         null,
-        deviceController.fabricIndex.toUInt()
+        deviceController.fabricIndex.toUInt().toInt()
       )
-    newEntry.toTlv(AnonymousTag, tlvWriter)
-    tlvWriter.endArray()
+    sendEntry.add(newEntry)
 
-    deviceController.write(
-      object : WriteAttributesCallback {
-        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+    cluster.writeAclAttribute(
+      object : ChipClusters.DefaultClusterCallback {
+        override fun onError(e: Exception?) {
           Log.d(TAG, "onError : ", e)
           showMessage("Error : ${e.toString()}")
         }
 
-        override fun onResponse(attributePath: ChipAttributePath?) {
+        override fun onSuccess() {
           Log.d(TAG, "onResponse")
           showMessage("write Success")
         }
       },
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      listOf(
-        AttributeWriteRequest.newInstance(
-          0,
-          ClusterIDMapping.AccessControl.ID,
-          ClusterIDMapping.AccessControl.Attribute.Acl.id,
-          tlvWriter.getEncoded()
-        )
-      ),
-      0,
-      0
+      sendEntry
     )
   }
 
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt
new file mode 100644
index 00000000000000..da7d6791372195
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt
@@ -0,0 +1,306 @@
+package com.google.chip.chiptool.clusterclient
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.OpenableColumns
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import chip.devicecontroller.ChipClusters
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback
+import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.OTAProviderDelegate
+import com.google.chip.chiptool.ChipClient
+import com.google.chip.chiptool.GenericChipDeviceListener
+import com.google.chip.chiptool.R
+import com.google.chip.chiptool.databinding.OtaProviderClientFragmentBinding
+import java.io.BufferedInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.util.Optional
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+class OtaProviderClientFragment : Fragment() {
+  private val deviceController: ChipDeviceController
+    get() = ChipClient.getDeviceController(requireContext())
+
+  private lateinit var scope: CoroutineScope
+
+  private lateinit var addressUpdateFragment: AddressUpdateFragment
+
+  private var _binding: OtaProviderClientFragmentBinding? = null
+
+  private var fileUri: Uri? = null
+
+  private val vendorId: Int
+    get() = binding.vendorIdEd.text.toString().toInt()
+
+  private val otaProviderCallback = OtaProviderCallback()
+  private val binding
+    get() = _binding!!
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View {
+    _binding = OtaProviderClientFragmentBinding.inflate(inflater, container, false)
+    scope = viewLifecycleOwner.lifecycleScope
+
+    deviceController.setCompletionListener(ChipControllerCallback())
+
+    addressUpdateFragment =
+      childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
+
+    binding.selectFirmwareFileBtn.setOnClickListener { selectFirmwareFileBtnClick() }
+    binding.announceOTAProviderBtn.setOnClickListener {
+      scope.launch { sendAnnounceOTAProviderBtnClick() }
+    }
+
+    binding.vendorIdEd.setText(ChipClient.VENDOR_ID.toString())
+
+    deviceController.startOTAProvider(otaProviderCallback)
+    return binding.root
+  }
+
+  private fun selectFirmwareFileBtnClick() {
+    startActivityForResult(
+      Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        addCategory(Intent.CATEGORY_OPENABLE)
+        type = "*/*"
+      },
+      REQUEST_CODE_OPEN_SAF
+    )
+  }
+
+  private fun getInputStream(uri: Uri?): InputStream? {
+    if (uri == null) {
+      return null
+    }
+    return requireContext().contentResolver.openInputStream(uri)
+  }
+
+  private fun queryName(uri: Uri?): String? {
+    if (uri == null) {
+      return null
+    }
+    val cursor = requireContext().contentResolver.query(uri, null, null, null, null)
+    return cursor?.let { c ->
+      val nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+      c.moveToFirst()
+
+      val name = cursor.getString(nameIndex)
+      c.close()
+      name
+    }
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+    super.onActivityResult(requestCode, resultCode, intent)
+    if (resultCode != Activity.RESULT_OK || intent == null) {
+      return
+    }
+    val uri = intent.data
+    if (uri == null) {
+      Log.d(TAG, "onActivityResult : null")
+      return
+    }
+    val filename = queryName(uri)
+    fileUri = uri
+    requireActivity().runOnUiThread { binding.firmwareFileTv.text = filename }
+  }
+
+  private suspend fun sendAnnounceOTAProviderBtnClick() {
+    requireActivity().runOnUiThread {
+      val version = 2L
+      val versionString = "2.0"
+
+      val filename = binding.firmwareFileTv.text.toString()
+      Log.d(TAG, "sendAnnounceOTAProviderBtnClick : $filename")
+      otaProviderCallback.setOTAFile(version, versionString, filename, fileUri)
+    }
+
+    val otaRequestCluster =
+      ChipClusters.OtaSoftwareUpdateRequestorCluster(
+        ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+        OTA_REQUESTER_ENDPOINT_ID
+      )
+    otaRequestCluster.announceOTAProvider(
+      object : DefaultClusterCallback {
+        override fun onSuccess() {
+          showMessage("announceOTAProvider command success")
+          Log.e(TAG, "announceOTAProvider command success")
+        }
+
+        override fun onError(ex: java.lang.Exception?) {
+          showMessage("announceOTAProvider command failure $ex")
+          Log.e(TAG, "announceOTAProvider command failure", ex)
+        }
+      },
+      deviceController.controllerNodeId.toULong().toLong(),
+      vendorId,
+      0 /* AnnounceReason */,
+      Optional.empty(),
+      OTA_PROVIDER_ENDPOINT_ID
+    )
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    deviceController.finishOTAProvider()
+    _binding = null
+  }
+
+  inner class OtaProviderCallback : OTAProviderDelegate {
+    private var fileName: String? = null
+    private var version: Long = 0
+    private var versionString: String? = null
+    private var uri: Uri? = null
+
+    private var inputStream: InputStream? = null
+    private var bufferedInputStream: BufferedInputStream? = null
+
+    fun setOTAFile(version: Long, versionString: String, fileName: String, uri: Uri?) {
+      this.version = version
+      this.versionString = versionString
+      this.fileName = fileName
+      this.uri = uri
+    }
+
+    override fun handleQueryImage(
+      vendorId: Int,
+      productId: Int,
+      softwareVersion: Long,
+      hardwareVersion: Int?,
+      location: String?,
+      requestorCanConsent: Boolean?,
+      metadataForProvider: ByteArray?
+    ): OTAProviderDelegate.QueryImageResponse {
+      Log.d(
+        TAG,
+        "handleQueryImage, $vendorId, $productId, $softwareVersion, $hardwareVersion, $location"
+      )
+      return OTAProviderDelegate.QueryImageResponse(version, versionString, fileName)
+    }
+
+    override fun handleOTAQueryFailure(error: Int) {
+      Log.d(TAG, "handleOTAQueryFailure, $error")
+      showMessage("handleOTAQueryFailure : $error")
+      deviceController.finishOTAProvider()
+    }
+
+    override fun handleApplyUpdateRequest(
+      nodeId: Long,
+      newVersion: Long
+    ): OTAProviderDelegate.ApplyUpdateResponse {
+      Log.d(TAG, "handleApplyUpdateRequest, $nodeId, $newVersion")
+      return OTAProviderDelegate.ApplyUpdateResponse(
+        OTAProviderDelegate.ApplyUpdateActionEnum.Proceed,
+        APPLY_WAITING_TIME
+      )
+    }
+
+    override fun handleNotifyUpdateApplied(nodeId: Long) {
+      Log.d(TAG, "handleNotifyUpdateApplied, $nodeId")
+      showMessage("Finish Firmware Update : $nodeId")
+    }
+
+    override fun handleBDXTransferSessionBegin(
+      nodeId: Long,
+      fileDesignator: String?,
+      offset: Long
+    ) {
+      Log.d(TAG, "handleBDXTransferSessionBegin, $nodeId, $fileDesignator, $offset")
+      try {
+        inputStream = getInputStream(uri)
+        bufferedInputStream = BufferedInputStream(inputStream)
+      } catch (e: IOException) {
+        Log.d(TAG, "exception", e)
+        inputStream?.close()
+        bufferedInputStream?.close()
+        inputStream = null
+        bufferedInputStream = null
+        return
+      }
+    }
+
+    override fun handleBDXTransferSessionEnd(errorCode: Long, nodeId: Long) {
+      Log.d(TAG, "handleBDXTransferSessionEnd, $errorCode, $nodeId")
+      inputStream?.close()
+      bufferedInputStream?.close()
+      inputStream = null
+      bufferedInputStream = null
+    }
+
+    override fun handleBDXQuery(
+      nodeId: Long,
+      blockSize: Int,
+      blockIndex: Long,
+      bytesToSkip: Long
+    ): OTAProviderDelegate.BDXData? {
+      // This code is just example code. This code doesn't check blockIndex and bytesToSkip
+      // variable.
+      Log.d(TAG, "handleBDXQuery, $nodeId, $blockSize, $blockIndex, $bytesToSkip")
+      showMessage("sending.. $blockIndex")
+      if (bufferedInputStream == null) {
+        return OTAProviderDelegate.BDXData(ByteArray(0), true)
+      }
+      val packet = ByteArray(blockSize)
+      val len = bufferedInputStream!!.read(packet)
+
+      val sendPacket =
+        if (len < blockSize) {
+          packet.copyOf(len)
+        } else if (len < 0) {
+          ByteArray(0)
+        } else {
+          packet.clone()
+        }
+
+      val isEOF = len < blockSize
+
+      return OTAProviderDelegate.BDXData(sendPacket, isEOF)
+    }
+  }
+
+  inner class ChipControllerCallback : GenericChipDeviceListener() {
+    override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
+      Log.d(TAG, "onCommissioningComplete for nodeId $nodeId: $errorCode")
+      showMessage("Address update complete for nodeId $nodeId with code $errorCode")
+    }
+
+    override fun onNotifyChipConnectionClosed() {
+      Log.d(TAG, "onNotifyChipConnectionClosed")
+    }
+
+    override fun onCloseBleComplete() {
+      Log.d(TAG, "onCloseBleComplete")
+    }
+
+    override fun onError(error: Throwable?) {
+      Log.d(TAG, "onError: $error")
+    }
+  }
+
+  private fun showMessage(msg: String) {
+    requireActivity().runOnUiThread { binding.commandStatusTv.text = msg }
+  }
+
+  companion object {
+    private const val TAG = "OtaProviderClientFragment"
+
+    fun newInstance(): OtaProviderClientFragment = OtaProviderClientFragment()
+
+    private const val REQUEST_CODE_OPEN_SAF = 100
+
+    private const val APPLY_WAITING_TIME = 10L
+    private const val OTA_PROVIDER_ENDPOINT_ID = 0
+    private const val OTA_REQUESTER_ENDPOINT_ID = 0
+  }
+}
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml
new file mode 100644
index 00000000000000..0fb7fe12f9e1c8
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/addressUpdateFragment"
+        android:name="com.google.chip.chiptool.clusterclient.AddressUpdateFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/vendorIdTv"
+        android:textSize="16sp"
+        android:padding="16dp"
+        android:layout_margin="8dp"
+        android:layout_alignParentStart="true"
+        android:enabled="false"
+        android:text="@string/ota_provider_vendorId_text"
+        android:layout_below="@id/addressUpdateFragment" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/vendorIdEd"
+        android:textSize="16sp"
+        android:padding="16dp"
+        android:layout_margin="8dp"
+        android:layout_toEndOf="@id/vendorIdTv"
+        android:layout_below="@id/addressUpdateFragment"
+        android:autofillHints="@string/ota_provider_vendorId_text"
+        android:inputType="numberDecimal" />
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:id="@+id/buttonLayout"
+        android:layout_below="@id/vendorIdEd"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/selectFirmwareFileBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:layout_margin="8dp"
+            android:layout_columnWeight="1"
+            android:background="@android:color/darker_gray"
+            android:text="@string/ota_provider_select_firmware_file_text"
+            android:textSize="16sp"/>
+        <TextView
+            android:id="@+id/announceOTAProviderBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:layout_margin="8dp"
+            android:background="@android:color/darker_gray"
+            android:text="@string/ota_provider_start_firmware_update_text"
+            android:textSize="16sp"/>
+    </LinearLayout>
+    <TextView
+        android:id="@+id/firmwareFileTv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/buttonLayout"
+        android:padding="16dp"
+        android:layout_margin="8dp"
+        android:layout_gravity="center"
+        android:layout_columnWeight="4"
+        android:textSize="16sp"/>
+    <TextView
+        android:id="@+id/commandStatusTv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/firmwareFileTv"
+        android:padding="16dp"
+        android:minLines="4"
+        android:singleLine="false"
+        android:textSize="20sp" />
+</RelativeLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
index bc79784b383b7a..2ec36b43128be4 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
@@ -120,6 +120,13 @@
             android:layout_marginTop="8dp"
             android:text="@string/group_setting_btn_text" />
 
+        <Button
+            android:id="@+id/otaProviderBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/ota_provider_btn_text" />
     </LinearLayout>
 
 </ScrollView>
diff --git a/examples/android/CHIPTool/app/src/main/res/values/strings.xml b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
index 205a60a16515d4..5d31d6adbf3628 100644
--- a/examples/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -254,4 +254,9 @@
     <string name="group_setting_unbind_btn_text">Unbind</string>
     <string name="group_setting_send_btn_text">Send</string>
     <string name="group_setting_write_btn_text">Write</string>
+
+    <string name="ota_provider_btn_text">OTA Provider</string>
+    <string name="ota_provider_vendorId_text">Vendor ID</string>
+    <string name="ota_provider_select_firmware_file_text">Select Firmware</string>
+    <string name="ota_provider_start_firmware_update_text">Start Firmware Update</string>
 </resources>
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index f0d2924b7cae14..9d6ed79ffef0b6 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -73,6 +77,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -94,12 +99,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -110,7 +117,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -122,7 +129,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -139,55 +146,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -202,6 +209,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -232,6 +241,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -254,6 +265,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -327,6 +340,8 @@ client cluster AccessControl = 31 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -397,6 +412,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -491,6 +508,8 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -568,6 +587,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -581,7 +602,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -596,6 +619,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -620,8 +645,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -636,6 +661,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -646,7 +673,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -657,6 +684,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -695,13 +724,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -721,6 +750,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -750,6 +781,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -766,11 +798,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -817,6 +852,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -851,6 +889,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -869,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -906,6 +948,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1006,11 +1050,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1043,6 +1095,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1141,9 +1195,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1204,6 +1258,8 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1245,7 +1301,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1276,6 +1332,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1317,6 +1375,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -1368,6 +1428,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1413,6 +1475,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1529,6 +1593,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1601,6 +1667,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1617,9 +1685,11 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1682,11 +1752,13 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1787,9 +1859,11 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index a317c4f078917e..6239fd432b0695 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -747,6 +747,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -821,7 +853,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1797,6 +1829,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2018,7 +2066,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2323,7 +2371,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2339,7 +2387,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2355,7 +2403,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5205,7 +5253,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5555,7 +5603,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5571,7 +5619,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5587,7 +5635,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/bridge-app/telink/prj.conf b/examples/bridge-app/telink/prj.conf
index c6365484b80b22..fba10bf033c9e7 100644
--- a/examples/bridge-app/telink/prj.conf
+++ b/examples/bridge-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/build_overrides/pigweed_environment.gni b/examples/build_overrides/pigweed_environment.gni
index a35e7843f84885..bf8dc3cc9dacc5 100644
--- a/examples/build_overrides/pigweed_environment.gni
+++ b/examples/build_overrides/pigweed_environment.gni
@@ -19,21 +19,3 @@ _bootstrap_root = "//third_party/connectedhomeip"
 
 import("${_bootstrap_root}/build_overrides/pigweed_environment.gni")
 
-# Rebase paths to our root.
-if (defined(pw_env_setup_CIPD_ARM)) {
-  pw_env_setup_CIPD_ARM =
-      get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_ARM}", "abspath")
-}
-if (defined(pw_env_setup_CIPD_PIGWEED)) {
-  pw_env_setup_CIPD_PIGWEED =
-      get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PIGWEED}",
-                    "abspath")
-}
-if (defined(pw_env_setup_CIPD_PYTHON)) {
-  pw_env_setup_CIPD_PYTHON =
-      get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PYTHON}", "abspath")
-}
-if (defined(pw_env_setup_VIRTUAL_ENV)) {
-  pw_env_setup_VIRTUAL_ENV =
-      get_path_info("${_bootstrap_root}/${pw_env_setup_VIRTUAL_ENV}", "abspath")
-}
diff --git a/examples/chef/README.md b/examples/chef/README.md
index 11a15261b08d97..4e1db9bf7dbff3 100644
--- a/examples/chef/README.md
+++ b/examples/chef/README.md
@@ -74,6 +74,27 @@ Follow guide in [NEW_CHEF_DEVICES.md](NEW_CHEF_DEVICES.md).
 -   `chef.py`: main script for generating samples. More info on its help
     `chef.py -h`.
 
+## General Linux Options
+
+When building chef for the Linux platform there are several options available at
+runtime. These options are also available for many Linux samples. Do not
+conflate these with chef options available at build time.
+
+Ex.:
+
+-   --discriminator <discriminator>: A 12-bit unsigned integer match the value
+    which a device advertises during commissioning.
+-   --passcode <passcode>: A 27-bit unsigned integer, which serves as proof of
+    possession during commissioning. If not provided to compute a verifier, the
+    --spake2p-verifier-base64 must be provided.
+-   --secured-device-port <port>: A 16-bit unsigned integer specifying the
+    listen port to use for secure device messages (default is 5540).
+-   --KVS <filepath>: A file to store Key Value Store items.
+
+For a full list, call the generated linux binary with
+
+-   -h, --help: Print this output and then exit.
+
 ## CI
 
 All CI jobs for chef can be found in `.github/workflows/chef.yaml`.
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
index 3783596b04a1f2..47d3c7ad3d34b7 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -683,7 +683,7 @@ def main() -> int:
 
         shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
 
-        if options.build_target in "esp32 nrfconnect ameba telink".split():
+        if options.build_target in "esp32 ameba telink".split():
             with open("project_include.cmake", "w") as f:
                 f.write(textwrap.dedent(f"""\
                         set(CONFIG_DEVICE_VENDOR_ID {options.vid})
@@ -713,8 +713,20 @@ def main() -> int:
             nrf_build_cmds = ["west build -b nrf52840dk_nrf52840"]
             if options.do_clean:
                 nrf_build_cmds.append("-p always")
+            nrf_build_cmds.append("--")
             if options.do_rpc:
-                nrf_build_cmds.append("-- -DOVERLAY_CONFIG=rpc.overlay")
+                nrf_build_cmds.append("-DOVERLAY_CONFIG=rpc.overlay")
+            nrf_build_cmds.append(
+                f"-DCONFIG_CHIP_DEVICE_VENDOR_ID={options.vid}")
+            nrf_build_cmds.append(
+                f"-DCONFIG_CHIP_DEVICE_PRODUCT_ID={options.pid}")
+            nrf_build_cmds.append(
+                f"-DCONFIG_CHIP_DEVICE_PRODUCT_NAME='\"{options.pname}\"'")
+            nrf_build_cmds.append(
+                f"-DSAMPLE_NAME={options.sample_device_type_name}")
+            nrf_build_cmds.append(
+                f"-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING='\"{sw_ver_string}\"'")
+
             shell.run_cmd(" ".join(nrf_build_cmds))
 
         elif options.build_target == "silabs-thread":
@@ -790,6 +802,11 @@ def main() -> int:
                 'chip_shell_cmd_server = false',
                 'chip_build_libshell = true',
                 'chip_config_network_layer_ble = false',
+                'chip_device_project_config_include = "<CHIPProjectAppConfig.h>"',
+                'chip_project_config_include = "<CHIPProjectAppConfig.h>"',
+                'chip_system_project_config_include = "<SystemProjectConfig.h>"',
+                'chip_project_config_include_dirs = [ "${chip_root}/examples/chef/linux/include" ]',
+                'chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]',
                 (f'target_defines = ["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID={options.vid}", '
                  f'"CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID={options.pid}", '
                  f'"CONFIG_ENABLE_PW_RPC={int(options.do_rpc)}", '
diff --git a/examples/chef/common/chef-channel-manager.cpp b/examples/chef/common/chef-channel-manager.cpp
index 6077fd3d20b6f0..b50cb0076f6f38 100644
--- a/examples/chef/common/chef-channel-manager.cpp
+++ b/examples/chef/common/chef-channel-manager.cpp
@@ -148,18 +148,18 @@ void ChefChannelManager::HandleChangeChannel(CommandResponseHelper<ChangeChannel
     // Error: Found multiple matches
     if (totalMatchedChannels > 1)
     {
-        response.status = chip::app::Clusters::Channel::ChannelStatusEnum::kMultipleMatches;
+        response.status = chip::app::Clusters::Channel::StatusEnum::kMultipleMatches;
         helper.Success(response);
     }
     else if (totalMatchedChannels == 0)
     {
         // Error: Found no match
-        response.status = chip::app::Clusters::Channel::ChannelStatusEnum::kNoMatches;
+        response.status = chip::app::Clusters::Channel::StatusEnum::kNoMatches;
         helper.Success(response);
     }
     else
     {
-        response.status      = chip::app::Clusters::Channel::ChannelStatusEnum::kSuccess;
+        response.status      = chip::app::Clusters::Channel::StatusEnum::kSuccess;
         response.data        = chip::MakeOptional(CharSpan::fromCharString("data response"));
         mCurrentChannelIndex = index;
         helper.Success(response);
diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp
index f686815b2bf9d2..b5878496182a0b 100644
--- a/examples/chef/common/stubs.cpp
+++ b/examples/chef/common/stubs.cpp
@@ -186,7 +186,7 @@ class LockManager
         endpoints[0].id = 1;
         uint8_t pin[6]  = { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 };
         endpoints[0].credentials[0].set(DlCredentialStatus::kOccupied, CredentialTypeEnum::kPin, chip::ByteSpan(pin));
-        endpoints[0].users[0].set(chip::CharSpan("default"), 1, UserStatusEnum::kOccupiedEnabled, UserTypeEnum::kUnrestrictedUser,
+        endpoints[0].users[0].set("default"_span, 1, UserStatusEnum::kOccupiedEnabled, UserTypeEnum::kUnrestrictedUser,
                                   CredentialRuleEnum::kSingle);
         endpoints[0].users[0].addCredential(CredentialTypeEnum::kPin, 1);
     }
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index b33eb9192a593d..cc3fe91578cc3c 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,12 +168,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -177,7 +186,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -186,7 +195,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -199,55 +208,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -262,6 +271,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -292,6 +303,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -314,6 +327,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +401,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -463,6 +480,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -473,6 +492,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -547,6 +568,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -625,7 +648,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,6 +665,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -664,8 +691,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -677,6 +704,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -715,13 +744,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -741,6 +770,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -778,6 +809,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -878,11 +911,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -917,6 +958,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1015,9 +1058,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1075,11 +1118,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1121,7 +1166,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1154,6 +1199,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1193,6 +1240,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1238,6 +1287,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1354,6 +1405,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1427,6 +1480,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1443,6 +1498,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1530,8 +1587,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1599,9 +1658,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index 25ac5369207196..5dddab962ab92f 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1299,6 +1331,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1472,7 +1520,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1788,7 +1836,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1804,7 +1852,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1820,7 +1868,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4398,7 +4446,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
index 309178d53e154c..55d65cc9100c0c 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -348,13 +362,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -374,6 +388,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -403,6 +419,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -419,11 +436,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -470,6 +490,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -504,6 +527,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -522,6 +547,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -559,6 +586,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -659,11 +688,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -709,6 +746,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -825,6 +864,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -897,6 +938,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -925,6 +968,8 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -969,6 +1014,8 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -1013,6 +1060,8 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1101,6 +1150,8 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1121,8 +1172,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1151,7 +1202,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute int8u speedMax = 4;
@@ -1172,9 +1223,11 @@ provisional server cluster FanControl = 514 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1185,6 +1238,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1198,6 +1253,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1252,6 +1309,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1306,6 +1365,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1360,6 +1421,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1414,6 +1477,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1468,6 +1533,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1522,6 +1589,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1576,6 +1645,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1630,6 +1701,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1684,6 +1757,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1785,8 +1860,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1848,9 +1925,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
index 972a203fbb2822..f3f41e46305681 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -6565,7 +6613,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6581,7 +6629,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6597,7 +6645,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
index 0ad1f526250985..71173b45a89cae 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -76,6 +80,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -148,6 +154,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -225,6 +233,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -235,6 +245,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -309,6 +321,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -387,7 +401,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -402,6 +418,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -426,8 +444,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -439,6 +457,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -477,13 +497,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -503,6 +523,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -532,6 +554,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -548,11 +571,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -599,6 +625,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -633,6 +662,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -651,6 +682,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -688,6 +721,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -788,11 +823,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -827,6 +870,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -872,6 +917,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -988,6 +1035,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1061,6 +1110,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1077,6 +1128,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -1105,9 +1158,11 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1119,6 +1174,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1133,6 +1190,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1188,6 +1247,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1243,6 +1304,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1298,6 +1361,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1353,6 +1418,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1408,6 +1475,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1463,6 +1532,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1518,6 +1589,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1573,6 +1646,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1628,6 +1703,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -1731,8 +1808,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1770,7 +1849,7 @@ endpoint 0 {
     callback attribute regulatoryConfig default = 0;
     callback attribute locationCapability default = 0;
     callback attribute supportsConcurrentConnection default = 1;
-    ram      attribute featureMap default = 6;
+    ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 0x0001;
 
     handle command ArmFailSafe;
@@ -1823,9 +1902,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
index 9bcbe3d733ef4d..df07c599f92608 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1208,7 +1240,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "6",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2897,7 +2945,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "NVM",
               "singleton": 0,
@@ -2913,7 +2961,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "NVM",
               "singleton": 0,
@@ -2929,7 +2977,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "NVM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
index 145397f3d450bc..9d9f290ca8346c 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -27,6 +29,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -48,6 +51,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -81,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -153,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -230,6 +239,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -240,6 +251,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -314,6 +327,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -392,7 +407,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -407,6 +424,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -431,8 +450,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -444,6 +463,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -482,13 +503,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -508,6 +529,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -537,6 +560,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -553,11 +577,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -604,6 +631,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -638,6 +668,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -656,6 +688,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -693,6 +727,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -793,11 +829,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -832,6 +876,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -877,6 +923,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -993,6 +1041,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1066,6 +1116,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1082,6 +1134,8 @@ server cluster FixedLabel = 64 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 server cluster WakeOnLan = 1283 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1092,16 +1146,18 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -1146,7 +1202,7 @@ server cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1157,7 +1213,9 @@ server cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1165,7 +1223,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1182,7 +1240,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1191,14 +1249,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -1207,6 +1258,15 @@ server cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -1226,7 +1286,7 @@ server cluster MediaPlayback = 1286 {
   readonly attribute int16u clusterRevision = 65533;
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1237,6 +1297,8 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -1283,6 +1345,8 @@ server cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 server cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1295,7 +1359,9 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -1384,7 +1450,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -1404,11 +1470,11 @@ server cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -1416,6 +1482,8 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -1501,8 +1569,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1593,9 +1663,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index 5f7070767c1420..f287b3f5abe3f1 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index f34d41305c3231..f1b1a1ffd9266b 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,14 +206,14 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
 
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int16u remainingTime = 1;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -217,55 +226,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -280,6 +289,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -313,6 +324,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -385,6 +398,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -462,6 +477,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -472,6 +489,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -546,6 +565,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -621,6 +642,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -659,13 +682,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -685,6 +708,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -714,6 +739,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -730,11 +756,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -781,6 +810,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -815,6 +847,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -833,6 +867,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -870,6 +906,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -970,11 +1008,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1009,6 +1055,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1054,6 +1102,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1170,6 +1220,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1242,6 +1294,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1567,8 +1621,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1644,9 +1700,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 54a5668ca54ea3..a2ccb2218b9b44 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1379,6 +1411,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1552,7 +1600,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2881,7 +2929,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 156d51e9f4b2b3..d5d9264c3939bf 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -142,6 +148,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -164,6 +172,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -236,6 +246,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -313,6 +325,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -323,6 +337,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -397,6 +413,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -475,7 +493,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,6 +510,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -514,8 +536,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -527,6 +549,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -565,13 +589,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -591,6 +615,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -620,6 +646,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +663,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -687,6 +717,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -721,6 +754,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -739,6 +774,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -776,6 +813,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -876,11 +915,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -915,6 +962,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -960,6 +1009,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1076,6 +1127,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1149,6 +1202,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1165,6 +1220,8 @@ server cluster FixedLabel = 64 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -1228,8 +1285,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1320,9 +1379,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 57d85478f48039..58edcaed617651 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index ad17ae87333b23..ef43de5f8a3f87 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,12 +168,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -177,7 +186,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -186,7 +195,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -199,55 +208,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -262,6 +271,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -292,6 +303,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -314,6 +327,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +401,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -463,6 +480,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -473,6 +492,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -547,6 +568,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -625,7 +648,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,6 +665,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -664,8 +691,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -677,6 +704,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -715,13 +744,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -741,6 +770,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -770,6 +801,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -786,11 +818,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -837,6 +872,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -871,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -889,6 +929,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -926,6 +968,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1026,11 +1070,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1065,6 +1117,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1110,6 +1164,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1226,6 +1282,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1299,6 +1357,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1315,6 +1375,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1404,8 +1466,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1496,9 +1560,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index b5d2ed8cfb1508..be39d61988a65f 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -664,6 +664,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -690,7 +722,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1575,6 +1607,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1748,7 +1796,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3135,7 +3183,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index d762a94ba1f721..14ba05083d114d 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -232,6 +240,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -245,7 +255,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,6 +272,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -284,7 +298,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -298,6 +312,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -308,7 +324,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -319,6 +335,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -357,13 +375,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -383,6 +401,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -412,6 +432,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +449,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -479,6 +503,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -513,6 +540,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -531,6 +560,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -631,11 +662,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -677,7 +716,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -710,6 +749,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -755,6 +796,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -871,6 +914,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -943,6 +988,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
@@ -1066,11 +1113,13 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList default = 0;
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1165,9 +1214,11 @@ endpoint 0 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index e50c640463cb6d..407747b420cdef 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -820,6 +820,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -894,7 +926,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1786,6 +1818,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2007,7 +2055,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index da9ab180420a87..8920a94371f28b 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -142,6 +148,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -164,6 +172,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -236,6 +246,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -313,6 +325,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -323,6 +337,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -397,6 +413,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -475,7 +493,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,6 +510,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -514,8 +536,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -527,6 +549,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -565,13 +589,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -591,6 +615,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -620,6 +646,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +663,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -687,6 +717,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -721,6 +754,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -739,6 +774,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -776,6 +813,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -876,11 +915,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -915,6 +962,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -960,6 +1009,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1076,6 +1127,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1149,6 +1202,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1165,6 +1220,8 @@ server cluster FixedLabel = 64 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -1700,8 +1757,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1792,9 +1851,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index 6e55ee26b2f95c..899965ed932fdb 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index c14fdc8d6a6865..a1d647da6fafb2 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,12 +168,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -177,7 +186,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -186,7 +195,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -199,55 +208,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -262,6 +271,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -292,6 +303,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -314,6 +327,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +401,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -463,6 +480,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -473,6 +492,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -547,6 +568,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -625,7 +648,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,6 +665,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -664,8 +691,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -677,6 +704,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -715,13 +744,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -741,6 +770,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -770,6 +801,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -786,11 +818,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -837,6 +872,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -871,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -889,6 +929,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -926,6 +968,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1026,11 +1070,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1065,6 +1117,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1110,6 +1164,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1226,6 +1282,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1299,6 +1357,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1315,6 +1375,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1631,8 +1693,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1723,9 +1787,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index 5d3000d8b3ab71..9d943c92a0eacd 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3103,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 1d34f61700edde..c29e963c4fc5c3 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +398,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -462,7 +478,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,6 +495,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -501,8 +521,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -514,6 +534,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -552,13 +574,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -578,6 +600,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -607,6 +631,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +648,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -674,6 +702,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -708,6 +739,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -726,6 +759,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -763,6 +798,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -863,11 +900,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -902,6 +947,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -947,6 +994,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1063,6 +1112,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1136,6 +1187,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1152,6 +1205,8 @@ server cluster FixedLabel = 64 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1172,8 +1227,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1202,7 +1257,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute int8u speedMax = 4;
@@ -1270,8 +1325,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1363,9 +1420,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 6d93d50076731c..08484afb2288f4 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1559,6 +1591,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1732,7 +1780,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index c2d2c0e8ae5753..35533ef666300a 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,6 +1226,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1233,8 +1290,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1325,9 +1384,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index 3ad57c090834ff..30c7e0d89e3214 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
index 3305b751649ce5..9a191147a58beb 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -231,6 +239,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -241,6 +251,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -279,13 +291,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -305,6 +317,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -334,6 +348,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -350,11 +365,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -401,6 +419,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -435,6 +456,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -453,6 +476,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -490,6 +515,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -590,13 +617,21 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -647,6 +682,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -692,6 +729,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -808,6 +847,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -927,8 +968,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -990,9 +1033,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
index 1f3613a429ed18..2e5d3e588ea4f3 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 7748c6c654d6d3..9187a209f8d703 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -157,12 +164,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -173,7 +182,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -181,7 +190,7 @@ server cluster LevelControl = 8 {
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -193,55 +202,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -256,6 +265,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -286,6 +297,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -308,6 +321,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -380,6 +395,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -457,6 +474,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -467,6 +486,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -541,6 +562,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -619,7 +642,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -634,6 +659,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -658,8 +685,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -671,6 +698,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -709,13 +738,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -735,6 +764,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -764,6 +795,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -780,11 +812,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -831,6 +866,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -865,6 +903,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -883,6 +923,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -920,6 +962,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1020,11 +1064,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1059,6 +1111,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1104,6 +1158,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1220,6 +1276,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1293,6 +1351,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1309,6 +1369,8 @@ server cluster FixedLabel = 64 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1466,6 +1528,8 @@ client cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1486,8 +1550,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1516,7 +1580,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute int8u speedMax = 4;
@@ -1580,8 +1644,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1672,9 +1738,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 3995dfe9782e6a..f0c2e1585333d0 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3023,7 +3071,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 474e8afbe793f0..2f15c1a9bec55a 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,6 +1226,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1233,8 +1290,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1325,9 +1384,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 0e56fbaa2449b8..503159de43d60f 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
index 8dbae5065b0756..687ad1becde51d 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -232,6 +240,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -245,7 +255,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,6 +272,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -284,7 +298,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -298,6 +312,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -308,7 +324,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -319,6 +335,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -357,13 +375,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -383,6 +401,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -412,6 +432,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +449,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -479,6 +503,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -513,6 +540,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -531,6 +560,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -631,11 +662,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -677,7 +716,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -710,6 +749,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -755,6 +796,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -871,6 +914,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -943,6 +988,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
@@ -1064,11 +1111,13 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList default = 0;
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1163,9 +1212,11 @@ endpoint 0 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
index 798ae3307bd2e0..7e92c6a621a953 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
@@ -820,6 +820,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -894,7 +926,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1786,6 +1818,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2007,7 +2055,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index f6102b019cb6b1..2d66aead52b704 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,6 +1226,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -1238,8 +1295,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1330,9 +1389,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index a33119d44de291..9e6f0d6566f168 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 55b92e1d99a5ad..7d09f158e883e6 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,6 +1226,8 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1249,8 +1306,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1341,9 +1400,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 6646443a09e65b..d4110e496bc8b3 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index c892a695de1f81..3bec6b2cb078d1 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,12 +168,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -177,7 +186,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -186,7 +195,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -199,55 +208,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -262,6 +271,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -292,6 +303,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -314,6 +327,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +401,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -463,6 +480,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -473,6 +492,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -547,6 +568,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -625,7 +648,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,6 +665,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -664,8 +691,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -677,6 +704,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -715,13 +744,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -741,6 +770,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -770,6 +801,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -786,11 +818,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -837,6 +872,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -871,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -889,6 +929,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -926,6 +968,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1026,11 +1070,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1065,6 +1117,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1110,6 +1164,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1226,6 +1282,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1299,6 +1357,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1363,8 +1423,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1455,9 +1517,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index e89d7311babe0a..c441ae5007824f 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3103,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter
index 89331830a07684..219192be944c27 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,12 +168,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -177,7 +186,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -186,7 +195,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -199,55 +208,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -262,6 +271,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -292,6 +303,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -314,6 +327,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +401,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -463,6 +480,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -473,6 +492,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -547,6 +568,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -625,7 +648,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,6 +665,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -664,8 +691,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -677,6 +704,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -715,13 +744,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -741,6 +770,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -770,6 +801,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -786,11 +818,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -837,6 +872,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -871,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -889,6 +929,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -926,6 +968,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1026,11 +1070,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1065,6 +1117,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1110,6 +1164,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1226,6 +1282,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1299,6 +1357,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1315,6 +1375,8 @@ server cluster FixedLabel = 64 {
 
 /** The Sample MEI cluster showcases a cluster manufacturer extensions */
 server cluster SampleMei = 4294048800 {
+  revision 1; // NOTE: Default/not specifically set
+
   attribute boolean flipFlop = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1386,8 +1448,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1478,9 +1542,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap
index 5b983849ca4f2f..fff208de328e3b 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.zap
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3103,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index f3f11320edc850..620a1a421215d0 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -156,7 +163,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,6 +188,8 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -205,6 +214,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -226,6 +236,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -256,6 +268,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -278,6 +292,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -350,6 +366,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -427,6 +445,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -437,6 +457,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -511,6 +533,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -589,7 +613,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -604,6 +630,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -628,8 +656,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -641,6 +669,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -679,13 +709,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -705,6 +735,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -734,6 +766,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -750,11 +783,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -801,6 +837,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -835,6 +874,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -853,6 +894,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -890,6 +933,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -990,11 +1035,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1029,6 +1082,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1074,6 +1129,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1190,6 +1247,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1263,6 +1322,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1327,8 +1388,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1419,9 +1482,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index e2e1d77b241f90..a0dcf69daaa0de 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 1b1dab03262596..7b8c7d2048be2f 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -161,6 +168,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -191,6 +200,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -213,6 +224,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -285,6 +298,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -362,6 +377,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -372,6 +389,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -446,6 +465,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -524,7 +545,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -539,6 +562,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -563,8 +588,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -576,6 +601,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -614,13 +641,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -640,6 +667,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -669,6 +698,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -685,11 +715,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -736,6 +769,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -770,6 +806,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -788,6 +826,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -825,6 +865,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -925,11 +967,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -964,6 +1014,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1009,6 +1061,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1125,6 +1179,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1198,6 +1254,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1262,8 +1320,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1354,9 +1414,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 24052570e77c22..9be8280f46acca 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index d76724d03359fe..ad10b0d7c5aa98 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,6 +1226,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1187,6 +1244,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1252,8 +1311,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1344,9 +1405,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index 1b0028275e2b40..ce0cabdcf5f7a3 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
index fc8f6d32e6a6c8..341c49272dce06 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -73,6 +77,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -94,6 +99,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -127,6 +134,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -199,6 +208,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -269,6 +280,8 @@ server cluster BasicInformation = 40 {
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -282,7 +295,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -297,6 +312,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -321,7 +338,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -335,6 +352,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -355,6 +374,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -393,13 +414,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -419,6 +440,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -448,6 +471,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -464,11 +488,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -515,6 +542,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -549,6 +579,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -567,6 +599,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -648,6 +682,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -661,11 +696,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -711,6 +754,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -827,6 +872,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -899,6 +946,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1010,9 +1059,11 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1023,6 +1074,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1040,6 +1093,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1093,11 +1148,13 @@ endpoint 0 {
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1176,14 +1233,17 @@ endpoint 0 {
   server cluster GeneralDiagnostics {
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap
index 131da70f467974..f72e57e0bf2a0b 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.zap
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap
@@ -584,6 +584,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1511,6 +1543,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1546,6 +1594,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1636,7 +1700,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3046,7 +3110,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3062,7 +3126,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3078,7 +3142,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 7f814f43e64f10..a33a8283f77648 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -73,6 +77,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -94,6 +99,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -127,6 +134,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -199,6 +208,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -269,6 +280,8 @@ server cluster BasicInformation = 40 {
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -282,7 +295,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -297,6 +312,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -321,7 +338,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -335,6 +352,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -355,6 +374,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -393,13 +414,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -419,6 +440,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -448,6 +471,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -464,11 +488,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -515,6 +542,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -549,6 +579,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -567,6 +599,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -648,6 +682,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -661,11 +696,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -711,6 +754,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -827,6 +872,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -899,6 +946,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1045,11 +1094,13 @@ endpoint 0 {
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1128,14 +1179,17 @@ endpoint 0 {
   server cluster GeneralDiagnostics {
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index 49a4e51fd9a20e..fe4e9df44c4c3d 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
@@ -584,6 +584,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1511,6 +1543,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1546,6 +1594,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1636,7 +1700,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
index 3479c924b2a5db..527d50ed0cbb37 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -232,6 +240,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -245,7 +255,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,6 +272,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -284,7 +298,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -298,6 +312,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -308,7 +324,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -319,6 +335,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -357,13 +375,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -383,6 +401,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -412,6 +432,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +449,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -479,6 +503,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -513,6 +540,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -531,6 +560,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -631,11 +662,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -677,7 +716,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -710,6 +749,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -755,6 +796,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -871,6 +914,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -943,6 +988,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
@@ -1031,11 +1078,13 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList default = 0;
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1130,9 +1179,11 @@ endpoint 0 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
index 6d0189f25a769a..bcc34cc0080a4f 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
@@ -820,6 +820,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -894,7 +926,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1786,6 +1818,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2007,7 +2055,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index a5a8b6afc1c7a0..f9c8622f2f4656 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -348,13 +362,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -374,6 +388,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -403,6 +419,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -419,11 +436,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -470,6 +490,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -504,6 +527,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -522,6 +547,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -559,6 +586,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -659,11 +688,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -709,6 +746,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -825,6 +864,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -897,6 +938,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
@@ -952,6 +995,8 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
@@ -1001,6 +1046,8 @@ server cluster RvcCleanMode = 85 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
@@ -1109,8 +1156,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1172,9 +1221,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index dad96cd186033a..c0d0c9fada8e89 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index 3f2fb5857276cc..fd516663144de9 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -163,6 +170,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -196,6 +205,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -268,6 +279,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -345,6 +358,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -355,6 +370,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -393,13 +410,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -419,6 +436,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -448,6 +467,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -464,11 +484,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -515,6 +538,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -549,6 +575,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -567,6 +595,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -604,6 +634,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -704,11 +736,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -754,6 +794,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -870,6 +912,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -942,6 +986,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1032,6 +1078,8 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1052,8 +1100,8 @@ provisional server cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1082,7 +1130,7 @@ provisional server cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -1095,8 +1143,29 @@ provisional server cluster FanControl = 514 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1154,8 +1223,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1217,9 +1288,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index 81b7dd94bb90f1..f844ff02c238a1 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2989,7 +3037,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3005,7 +3053,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
index 1c026bb8c31c30..f35fe5c9784979 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -542,6 +556,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -580,13 +596,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -606,6 +622,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -635,6 +653,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -651,11 +670,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -702,6 +724,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -736,6 +761,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -754,6 +781,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -791,6 +820,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -891,11 +922,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -941,6 +980,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1057,6 +1098,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1129,6 +1172,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
+  revision 1;
+
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
@@ -1285,8 +1330,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1348,9 +1395,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
index ac52e9a00e295e..5d20d1ac956322 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index fec8584e71a8ed..601fa08658bb54 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -67,6 +71,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -88,12 +93,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -104,7 +111,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -112,7 +119,7 @@ server cluster LevelControl = 8 {
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -124,55 +131,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -187,6 +194,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -217,6 +226,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -239,6 +250,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -311,6 +324,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -388,6 +403,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -398,6 +415,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -472,6 +491,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -550,7 +571,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -565,6 +588,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -589,8 +614,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -602,6 +627,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -640,13 +667,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -666,6 +693,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -695,6 +724,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -711,11 +741,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -762,6 +795,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -796,6 +832,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -814,6 +852,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -851,6 +891,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -951,11 +993,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -990,6 +1040,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1035,6 +1087,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1151,6 +1205,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1224,6 +1280,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1288,8 +1346,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1380,9 +1440,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index dd5e63a06d5bfd..1c877ed4327bbc 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2835,7 +2883,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 96c5c036789208..c23770638fa3ec 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -319,6 +331,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -329,6 +343,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -403,6 +419,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -481,7 +499,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,6 +516,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -520,8 +542,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -533,6 +555,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -571,13 +595,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -597,6 +621,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -626,6 +652,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +669,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -693,6 +723,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -727,6 +760,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -745,6 +780,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -782,6 +819,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -882,11 +921,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -921,6 +968,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -966,6 +1015,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1082,6 +1133,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1155,6 +1208,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1171,9 +1226,11 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1232,8 +1289,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1324,9 +1383,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 28e1691e0d9387..67d155a40253f3 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2827,7 +2875,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -2843,7 +2891,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -2859,7 +2907,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index f40c788dcde83b..7357b6b73b7f34 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -142,6 +148,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -164,6 +172,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -236,6 +246,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -313,6 +325,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -323,6 +337,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -397,6 +413,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -475,7 +493,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,6 +510,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -514,8 +536,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -527,6 +549,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -565,13 +589,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -591,6 +615,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -620,6 +646,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +663,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -687,6 +717,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -721,6 +754,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -739,6 +774,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -776,6 +813,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -876,11 +915,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -915,6 +962,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -960,6 +1009,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1076,6 +1127,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1149,6 +1202,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1165,6 +1220,8 @@ server cluster FixedLabel = 64 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1274,6 +1331,8 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional client cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -1294,8 +1353,8 @@ provisional client cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -1324,7 +1383,7 @@ provisional client cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute optional int8u speedMax = 4;
@@ -1354,8 +1413,29 @@ provisional client cluster FanControl = 514 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1366,9 +1446,11 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute optional int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1380,6 +1462,8 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 client cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1394,6 +1478,8 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1481,8 +1567,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1573,9 +1661,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index fc6192274b30ac..a2239be9ab987b 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3548,7 +3596,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3564,7 +3612,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index c5eee65da644ee..db3d5a58090813 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -142,6 +148,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -164,6 +172,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -236,6 +246,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -313,6 +325,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -323,6 +337,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -397,6 +413,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -475,7 +493,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,6 +510,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -514,8 +536,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -527,6 +549,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -565,13 +589,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -591,6 +615,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -620,6 +646,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +663,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -687,6 +717,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -721,6 +754,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -739,6 +774,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -776,6 +813,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -876,11 +915,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -915,6 +962,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -960,6 +1009,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1076,6 +1127,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1149,6 +1202,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1165,6 +1220,8 @@ server cluster FixedLabel = 64 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -1357,8 +1414,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1449,9 +1508,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 981a417a84f735..2c60ffb9256806 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap
index 0f7cf1a1d63a13..13c8c53c8cc328 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -1172,6 +1172,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1361,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2374,76 +2390,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/resource-monitoring-app/linux/include/CHIPProjectAppConfig.h b/examples/chef/linux/include/CHIPProjectAppConfig.h
similarity index 83%
rename from examples/resource-monitoring-app/linux/include/CHIPProjectAppConfig.h
rename to examples/chef/linux/include/CHIPProjectAppConfig.h
index 94b3c4dc2a79d5..b6c15f4c98230e 100644
--- a/examples/resource-monitoring-app/linux/include/CHIPProjectAppConfig.h
+++ b/examples/chef/linux/include/CHIPProjectAppConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2022 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,5 @@
 // include the CHIPProjectConfig from config/standalone
 #include <CHIPProjectConfig.h>
 
-#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 45 // 0x002D = 45 == Air Purifer
-
-#define CHIP_DEVICE_CONFIG_DEVICE_NAME "Test Resource Monitoring Device"
+// Allows app options (ports) to be configured on launch of app
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
diff --git a/examples/chef/nrfconnect/CHIPProjectConfig.h b/examples/chef/nrfconnect/CHIPProjectConfig.h
index 2bd41247a382f9..68b39c591ddfa0 100644
--- a/examples/chef/nrfconnect/CHIPProjectConfig.h
+++ b/examples/chef/nrfconnect/CHIPProjectConfig.h
@@ -27,10 +27,6 @@
 
 #pragma once
 
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
 
diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt
index 0f09001fdb5bef..8d7c9a27dcfbd4 100644
--- a/examples/chef/nrfconnect/CMakeLists.txt
+++ b/examples/chef/nrfconnect/CMakeLists.txt
@@ -20,25 +20,16 @@ get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconne
 get_filename_component(CHEF ${CMAKE_CURRENT_SOURCE_DIR}/../ REALPATH)
 
 include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
-include(${CHEF}/project_include.cmake)
 
 get_filename_component(GEN_DIR ${CHEF}/out/${SAMPLE_NAME}/zap-generated REALPATH)
 
 set(CONF_FILE prj.conf)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CHIP_CFLAGS "${CHIP_CFLAGS} -DCHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID=${CONFIG_DEVICE_VENDOR_ID}")
-set(CHIP_CFLAGS "${CHIP_CFLAGS} -DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${CONFIG_DEVICE_PRODUCT_ID}")
-if(NOT ${CONFIG_DEVICE_PRODUCT_NAME} STREQUAL "")
-    set(CHIP_CFLAGS "${CHIP_CFLAGS} -DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME=\"${CONFIG_DEVICE_PRODUCT_NAME}\"")
-endif()
-if(NOT ${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING} STREQUAL "")
-  set(CHIP_CFLAGS "${CHIP_CFLAGS} -DCHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\"${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING}\"")
-endif()
-message(STATUS "Vendor ID " ${CONFIG_DEVICE_VENDOR_ID})
-message(STATUS "Product ID " ${CONFIG_DEVICE_PRODUCT_ID})
-message(STATUS "Product Name " ${CONFIG_DEVICE_PRODUCT_NAME})
-message(STATUS "SW Version String" ${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING})
+message(STATUS "Vendor ID " ${CONFIG_CHIP_DEVICE_VENDOR_ID})
+message(STATUS "Product ID " ${CONFIG_CHIP_DEVICE_PRODUCT_ID})
+message(STATUS "Product Name " ${CONFIG_CHIP_DEVICE_PRODUCT_NAME})
+message(STATUS "SW Version String" ${CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING})
 
 # Set Kconfig root files that will be processed as a first Kconfig for used child images.
 set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root)
@@ -107,11 +98,7 @@ chip_configure_data_model(app
 include(${CHIP_ROOT}/config/nrfconnect/app/flashing.cmake)
 
 
-if (CONFIG_ENABLE_PW_RPC)
-
-target_compile_options(app PRIVATE
-                       "-DCONFIG_ENABLE_PW_RPC=1"
-)
+if (CONFIG_CHIP_PW_RPC)
 
 # Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
 link_libraries($<BUILD_INTERFACE:zephyr_interface>)
@@ -231,4 +218,4 @@ target_link_libraries(app PRIVATE
   pw_sys_io
 )
 
-endif(CONFIG_ENABLE_PW_RPC)
+endif(CONFIG_CHIP_PW_RPC)
diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp
index c4157798567e5b..d132252ecd87b3 100644
--- a/examples/chef/nrfconnect/main.cpp
+++ b/examples/chef/nrfconnect/main.cpp
@@ -39,7 +39,7 @@
 #include <ChipShellCollection.h>
 #endif
 
-#ifdef CONFIG_ENABLE_PW_RPC
+#ifdef CONFIG_CHIP_PW_RPC
 #include "Rpc.h"
 #endif
 
@@ -57,7 +57,7 @@ int main()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-#ifdef CONFIG_ENABLE_PW_RPC
+#ifdef CONFIG_CHIP_PW_RPC
     rpc::Init();
 #endif
 
diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
index eff6a00671d5b0..237fe9f11bb355 100644
--- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap
+++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
@@ -1830,7 +1830,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2974,7 +2974,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaultsList",
+              "name": "ActiveNetworkFaults",
               "code": 62,
               "mfgCode": null,
               "side": "server",
diff --git a/examples/chef/telink/prj.conf b/examples/chef/telink/prj.conf
index 9b99b6a3fcc40c..5fdb2805860a94 100755
--- a/examples/chef/telink/prj.conf
+++ b/examples/chef/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/chip-tool/args.gni b/examples/chip-tool/args.gni
index a0b30a430f23f3..30f4000365e4ef 100644
--- a/examples/chip-tool/args.gni
+++ b/examples/chip-tool/args.gni
@@ -27,3 +27,7 @@ matter_enable_tracing_support = true
 
 matter_log_json_payload_hex = true
 matter_log_json_payload_decode_full = true
+
+# make chip-tool very strict by default
+chip_tlv_validate_char_string_on_read = true
+chip_tlv_validate_char_string_on_write = true
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index 944360fb2eea3a..043fbc33ac4f30 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -19,8 +19,8 @@
 #include "CHIPCommand.h"
 
 #include <controller/CHIPDeviceControllerFactory.h>
-#include <core/CHIPBuildConfig.h>
 #include <credentials/attestation_verifier/FileAttestationTrustStore.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ScopedBuffer.h>
@@ -460,6 +460,7 @@ CHIP_ERROR CHIPCommand::InitializeCommissioner(CommissionerIdentity & identity,
         commissionerParams.controllerICAC               = icacSpan;
         commissionerParams.controllerNOC                = nocSpan;
         commissionerParams.permitMultiControllerFabrics = true;
+        commissionerParams.enableServerInteractions     = NeedsOperationalAdvertising();
     }
 
     // TODO: Initialize IPK epoch key in ExampleOperationalCredentials issuer rather than relying on DefaultIpkValue
diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h
index f1cd84439eae49..0b6124600eb415 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.h
+++ b/examples/chip-tool/commands/common/CHIPCommand.h
@@ -142,7 +142,7 @@ class CHIPCommand : public Command
     // If true, the controller will be created with server capabilities enabled,
     // such as advertising operational nodes over DNS-SD and accepting incoming
     // CASE sessions.
-    virtual bool NeedsOperationalAdvertising() { return false; }
+    virtual bool NeedsOperationalAdvertising() { return mAdvertiseOperational; }
 
     // Execute any deferred cleanups.  Used when exiting interactive mode.
     static void ExecuteDeferredCleanups(intptr_t ignored);
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
index cf8077b13c0546..26b80e54b6b322 100644
--- a/examples/chip-tool/commands/common/Command.h
+++ b/examples/chip-tool/commands/common/Command.h
@@ -267,10 +267,11 @@ class Command
 
     bool IsInteractive() { return mIsInteractive; }
 
-    CHIP_ERROR RunAsInteractive(const chip::Optional<char *> & interactiveStorageDirectory)
+    CHIP_ERROR RunAsInteractive(const chip::Optional<char *> & interactiveStorageDirectory, bool advertiseOperational)
     {
-        mStorageDirectory = interactiveStorageDirectory;
-        mIsInteractive    = true;
+        mStorageDirectory     = interactiveStorageDirectory;
+        mIsInteractive        = true;
+        mAdvertiseOperational = advertiseOperational;
         return Run();
     }
 
@@ -280,6 +281,10 @@ class Command
     // mStorageDirectory lives here so we can just set it in RunAsInteractive.
     chip::Optional<char *> mStorageDirectory;
 
+    // mAdvertiseOperational lives here so we can just set it in
+    // RunAsInteractive; it's only used by CHIPCommand.
+    bool mAdvertiseOperational = false;
+
 private:
     bool InitArgument(size_t argIndex, char * argValue);
     size_t AddArgument(const char * name, int64_t min, uint64_t max, void * out, ArgumentType type, const char * desc,
diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp
index 17871e12cff2e6..8212656b9539ba 100644
--- a/examples/chip-tool/commands/common/Commands.cpp
+++ b/examples/chip-tool/commands/common/Commands.cpp
@@ -182,7 +182,7 @@ int Commands::Run(int argc, char ** argv)
     return (err == CHIP_NO_ERROR) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-int Commands::RunInteractive(const char * command, const chip::Optional<char *> & storageDirectory)
+int Commands::RunInteractive(const char * command, const chip::Optional<char *> & storageDirectory, bool advertiseOperational)
 {
     std::vector<std::string> arguments;
     VerifyOrReturnValue(DecodeArgumentsFromInteractiveMode(command, arguments), EXIT_FAILURE);
@@ -207,7 +207,7 @@ int Commands::RunInteractive(const char * command, const chip::Optional<char *>
     }
 
     ChipLogProgress(chipTool, "Command: %s", commandStr.c_str());
-    auto err = RunCommand(argc, argv, true, storageDirectory);
+    auto err = RunCommand(argc, argv, true, storageDirectory, advertiseOperational);
 
     // Do not delete arg[0]
     for (auto i = 1; i < argc; i++)
@@ -219,7 +219,7 @@ int Commands::RunInteractive(const char * command, const chip::Optional<char *>
 }
 
 CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive,
-                                const chip::Optional<char *> & interactiveStorageDirectory)
+                                const chip::Optional<char *> & interactiveStorageDirectory, bool interactiveAdvertiseOperational)
 {
     Command * command = nullptr;
 
@@ -307,7 +307,7 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive,
 
     if (interactive)
     {
-        return command->RunAsInteractive(interactiveStorageDirectory);
+        return command->RunAsInteractive(interactiveStorageDirectory, interactiveAdvertiseOperational);
     }
 
     // Now that the command is initialized, get our storage from it as needed
diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
index 67c23b401c4147..bb6c62dcb035fe 100644
--- a/examples/chip-tool/commands/common/Commands.h
+++ b/examples/chip-tool/commands/common/Commands.h
@@ -42,7 +42,7 @@ class Commands
         Register(commandSetName, commandsList, helpText, false);
     }
     int Run(int argc, char ** argv);
-    int RunInteractive(const char * command, const chip::Optional<char *> & storageDirectory = chip::NullOptional);
+    int RunInteractive(const char * command, const chip::Optional<char *> & storageDirectory, bool advertiseOperational);
 
 private:
     struct CommandSet
@@ -56,7 +56,8 @@ class Commands
     using CommandSetMap = std::map<std::string, CommandSet>;
 
     CHIP_ERROR RunCommand(int argc, char ** argv, bool interactive = false,
-                          const chip::Optional<char *> & interactiveStorageDirectory = chip::NullOptional);
+                          const chip::Optional<char *> & interactiveStorageDirectory = chip::NullOptional,
+                          bool interactiveAdvertiseOperational                       = false);
 
     CommandSetMap::iterator GetCommandSet(std::string commandSetName);
     Command * GetCommand(CommandsVector & commands, std::string commandName);
diff --git a/examples/chip-tool/commands/common/DeviceScanner.h b/examples/chip-tool/commands/common/DeviceScanner.h
index 5ea7d036bb3d66..bcdcf26c84feb1 100644
--- a/examples/chip-tool/commands/common/DeviceScanner.h
+++ b/examples/chip-tool/commands/common/DeviceScanner.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #if CHIP_DEVICE_LAYER_TARGET_DARWIN
 
diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
index 8095ac05072022..c17eee477e5fb7 100644
--- a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
+++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
@@ -260,6 +260,11 @@ CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeDat
         value["mrpRetryActiveThreshold"] = resolutionData.mrpRetryActiveThreshold.Value().count();
     }
 
+    if (resolutionData.isICDOperatingAsLIT.HasValue())
+    {
+        value["isICDOperatingAsLIT"] = resolutionData.isICDOperatingAsLIT.Value();
+    }
+
     Json::Value rootValue;
     rootValue[kValueKey] = value;
 
diff --git a/examples/chip-tool/commands/discover/Commands.h b/examples/chip-tool/commands/discover/Commands.h
index 1b3f45ac75168c..e7a59dbaee9110 100644
--- a/examples/chip-tool/commands/discover/Commands.h
+++ b/examples/chip-tool/commands/discover/Commands.h
@@ -54,6 +54,7 @@ class Resolve : public DiscoverCommand, public chip::AddressResolve::NodeListene
         ChipLogProgress(chipTool, "   MRP retry interval (active): %" PRIu32 "ms",
                         result.mrpRemoteConfig.mActiveRetransTimeout.count());
         ChipLogProgress(chipTool, "   Supports TCP: %s", result.supportsTcp ? "yes" : "no");
+        ChipLogProgress(chipTool, "   ICD is operating as: %s", result.isICDOperatingAsLIT ? "LIT" : "SIT");
         SetCommandExitStatus(CHIP_NO_ERROR);
     }
 
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
index 6dae09ce392206..40b4431df116a6 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -369,7 +369,7 @@ bool InteractiveCommand::ParseCommand(char * command, int * status)
 
     ClearLine();
 
-    *status = mHandler->RunInteractive(command, GetStorageDirectory());
+    *status = mHandler->RunInteractive(command, GetStorageDirectory(), NeedsOperationalAdvertising());
 
     return true;
 }
diff --git a/examples/chip-tool/templates/logging/DataModelLogger-src.zapt b/examples/chip-tool/templates/logging/DataModelLogger-src.zapt
index 167021f49577d2..e6c735465dbfc2 100644
--- a/examples/chip-tool/templates/logging/DataModelLogger-src.zapt
+++ b/examples/chip-tool/templates/logging/DataModelLogger-src.zapt
@@ -162,7 +162,7 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
 {{/first}}
             case {{asUpperCamelCase parent.name}}::Events::{{asUpperCamelCase name}}::Id:
             {
-                {{zapTypeToDecodableClusterObjectType name ns=parent.name forceNotOptional=true}} value;
+                {{asUpperCamelCase parent.name}}::Events::{{asUpperCamelCase name}}::DecodableType value;
                 ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
                 return DataModelLogger::LogValue("{{name}}", 1, value);
             }
diff --git a/examples/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp
index 3e7a44b6fea550..24f88212ae23a1 100644
--- a/examples/common/imgui_ui/windows/light.cpp
+++ b/examples/common/imgui_ui/windows/light.cpp
@@ -89,8 +89,8 @@ void Light::UpdateState()
         LevelControl::Commands::MoveToLevel::DecodableType data;
 
         data.level = mTargetLevel.Value();
-        data.optionsMask.Set(LevelControl::LevelControlOptions::kExecuteIfOff);
-        data.optionsOverride.Set(LevelControl::LevelControlOptions::kExecuteIfOff);
+        data.optionsMask.Set(LevelControl::OptionsBitmap::kExecuteIfOff);
+        data.optionsOverride.Set(LevelControl::OptionsBitmap::kExecuteIfOff);
 
         (void) LevelControlServer::MoveToLevel(mEndpointId, data);
 
@@ -155,14 +155,14 @@ void Light::Render()
     ImGui::Text("Color Control:");
     ImGui::Indent();
     const char * mode = // based on ColorMode attribute: spec 3.2.7.9
-        (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION) ? "Hue/Saturation"
-        : (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y)          ? "X/Y"
-        : (mColorMode == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE)                ? "Temperature/Mireds"
-                                                                                : "UNKNOWN";
+        (mColorMode == kColorModeCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
+        : (mColorMode == kColorModeCurrentXAndCurrentY)          ? "X/Y"
+        : (mColorMode == kColorModeColorTemperature)             ? "Temperature/Mireds"
+                                                                 : "UNKNOWN";
 
     ImGui::Text("Mode: %s", mode);
 
-    if (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION)
+    if (mColorMode == kColorModeCurrentHueAndCurrentSaturation)
     {
         const float hueDegrees        = (mColorHue * 360.0f) / 254.0f;
         const float saturationPercent = 100.0f * (mColorSaturation / 254.0f);
@@ -173,12 +173,12 @@ void Light::Render()
         ImGui::ColorButton("LightColor", HueSaturationToColor(hueDegrees, saturationPercent), 0 /* ImGuiColorEditFlags_* */,
                            ImVec2(80, 80));
     }
-    else if (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y)
+    else if (mColorMode == kColorModeCurrentXAndCurrentY)
     {
         ImGui::Text("Current X: %d", mColorX);
         ImGui::Text("Current Y: %d", mColorY);
     }
-    else if (mColorMode == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE)
+    else if (mColorMode == kColorModeColorTemperature)
     {
         ImGui::Text("Color Temperature Mireds: %d", mColorTemperatureMireds);
     }
diff --git a/examples/common/imgui_ui/windows/light.h b/examples/common/imgui_ui/windows/light.h
index 68d9cebb945da5..20942373d3111c 100644
--- a/examples/common/imgui_ui/windows/light.h
+++ b/examples/common/imgui_ui/windows/light.h
@@ -44,6 +44,11 @@ class Light : public Window
 private:
     const chip::EndpointId mEndpointId;
 
+    static constexpr uint8_t kColorModeCurrentHueAndCurrentSaturation         = 0;
+    static constexpr uint8_t kColorModeCurrentXAndCurrentY                    = 1;
+    static constexpr uint8_t kColorModeColorTemperature                       = 2;
+    static constexpr uint8_t kColorModeEnhancedCurrentHueAndCurrentSaturation = 3;
+
     // OnOff
     bool mLightIsOn = false;
     chip::Optional<bool> mTargetLightIsOn; // allow UI control of this
@@ -57,7 +62,7 @@ class Light : public Window
     uint16_t mLevelRemainingTime10sOfSec = 0;
 
     // Color control
-    uint8_t mColorMode               = EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION;
+    uint8_t mColorMode               = kColorModeCurrentHueAndCurrentSaturation;
     uint8_t mColorHue                = 0;
     uint8_t mColorSaturation         = 0;
     uint16_t mColorX                 = 0;
diff --git a/examples/common/websocket-server/BUILD.gn b/examples/common/websocket-server/BUILD.gn
index d3f2aa35ff8ac9..1ea2687ce6afda 100644
--- a/examples/common/websocket-server/BUILD.gn
+++ b/examples/common/websocket-server/BUILD.gn
@@ -16,8 +16,12 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
 config("websocket_server_config_disable_warnings") {
-  # Unfortunately, some of the libwebsockets headers include -Wshadow failures.
-  cflags = [ "-Wno-shadow" ]
+  # Unfortunately, some of the libwebsockets headers include -Wshadow failures,
+  # and have tons of -Wdocumentation issues.
+  cflags = [
+    "-Wno-shadow",
+    "-Wno-documentation",
+  ]
 }
 
 static_library("websocket-server") {
diff --git a/examples/common/websocket-server/WebSocketServer.cpp b/examples/common/websocket-server/WebSocketServer.cpp
index 46f9a63c9a7034..6fbd47ddd94f9c 100644
--- a/examples/common/websocket-server/WebSocketServer.cpp
+++ b/examples/common/websocket-server/WebSocketServer.cpp
@@ -166,10 +166,15 @@ CHIP_ERROR WebSocketServer::Run(chip::Optional<uint16_t> port, WebSocketServerDe
 
     lws_context_creation_info info;
     memset(&info, 0, sizeof(info));
-    info.port             = port.ValueOr(kDefaultWebSocketServerPort);
-    info.iface            = nullptr;
-    info.pt_serv_buf_size = kMaxMessageBufferLen;
-    info.protocols        = protocols;
+    info.port                         = port.ValueOr(kDefaultWebSocketServerPort);
+    info.iface                        = nullptr;
+    info.pt_serv_buf_size             = kMaxMessageBufferLen;
+    info.protocols                    = protocols;
+    static const lws_retry_bo_t retry = {
+        .secs_since_valid_ping   = 400,
+        .secs_since_valid_hangup = 400,
+    };
+    info.retry_and_idle_policy = &retry;
 
     auto context = lws_create_context(&info);
     VerifyOrReturnError(nullptr != context, CHIP_ERROR_INTERNAL);
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 30445c5445257d..112ba2a89ddfd1 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +398,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -462,7 +478,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,6 +495,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -501,8 +521,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -514,6 +534,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -552,13 +574,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -578,6 +600,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -607,6 +631,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +648,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -674,6 +702,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -708,6 +739,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -726,6 +759,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -763,6 +798,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -863,11 +900,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -902,6 +947,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1000,9 +1047,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1060,11 +1107,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1106,7 +1155,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1139,6 +1188,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1178,6 +1229,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1223,6 +1276,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1339,6 +1394,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1412,6 +1469,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1428,6 +1487,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1444,6 +1505,8 @@ server cluster UserLabel = 65 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -1459,6 +1522,8 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1554,8 +1619,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1646,9 +1713,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
index 0fa6b11ed229eb..6b20e69bdf6d43 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
@@ -772,6 +772,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -798,7 +830,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1683,6 +1715,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1856,7 +1904,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2172,7 +2220,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2188,7 +2236,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2204,7 +2252,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/contact-sensor-app/linux/main.cpp b/examples/contact-sensor-app/linux/main.cpp
index fcc56d7c3d02a4..0b520bdd538e04 100644
--- a/examples/contact-sensor-app/linux/main.cpp
+++ b/examples/contact-sensor-app/linux/main.cpp
@@ -18,7 +18,7 @@
 
 #include <AppMain.h>
 #include <app/util/af.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED
 #include <imgui_ui/ui.h>
diff --git a/examples/contact-sensor-app/telink/prj.conf b/examples/contact-sensor-app/telink/prj.conf
index 8eea50ee19b9e4..eefe9b944c8331 100755
--- a/examples/contact-sensor-app/telink/prj.conf
+++ b/examples/contact-sensor-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn
index 3f0de6c6b0310b..e6b1a3e7654da3 100644
--- a/examples/darwin-framework-tool/BUILD.gn
+++ b/examples/darwin-framework-tool/BUILD.gn
@@ -113,12 +113,6 @@ action("build-darwin-framework") {
     args += [ "--no-enable-encoding-sentinel-enum-values" ]
   }
 
-  if (enable_provisional_features) {
-    args += [ "--enable-provisional-framework-features" ]
-  } else {
-    args += [ "--no-enable-provisional-framework-features" ]
-  }
-
   output_name = "Matter.framework"
   outputs = [
     "${root_out_dir}/macos_framework_output/Build/Products/${output_sdk_type}/${output_name}",
diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
index eb938c2abb0614..ef99e4fd0deac7 100644
--- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
+++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
@@ -21,7 +21,7 @@
 #import "CHIPToolKeypair.h"
 #import <Matter/Matter.h>
 
-#include <core/CHIPBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
 
 #include "MTRError_Utils.h"
diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
index 6fe3522dcd909b..3242b5fa2c9022 100644
--- a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
+++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
@@ -380,7 +380,7 @@ el_status_t StopFunction()
 
     ClearLine();
 
-    *status = mHandler->RunInteractive(command, GetStorageDirectory());
+    *status = mHandler->RunInteractive(command, GetStorageDirectory(), true);
 
     return YES;
 }
diff --git a/examples/darwin-framework-tool/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt
index 9d1c98e1d1d06f..b4fe946cf58258 100644
--- a/examples/darwin-framework-tool/templates/commands.zapt
+++ b/examples/darwin-framework-tool/templates/commands.zapt
@@ -41,6 +41,9 @@ public:
     {{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}(): ClusterCommand("{{cleanse_label_as_kebab_case name}}"){{#zcl_command_arguments}}{{#if_chip_complex}}, mComplex_{{asUpperCamelCase label}}(&mRequest.{{asLowerCamelCase label}}){{/if_chip_complex}}{{/zcl_command_arguments}}
     {
         {{#zcl_command_arguments}}
+        {{#if (isProvisional (asUpperCamelCase parent.parent.name preserveAcronyms=true) command=(asUpperCamelCase parent.name preserveAcronyms=true) commandField=(asStructPropertyName label))}}
+        #if MTR_ENABLE_PROVISIONAL
+        {{/if}}
         {{#if_chip_complex}}
         AddArgument("{{asUpperCamelCase label}}", &mComplex_{{asUpperCamelCase label}});
         {{else if (isString type)}}
@@ -48,6 +51,9 @@ public:
         {{else}}
         AddArgument("{{asUpperCamelCase label}}", {{as_type_min_value type language='c++'}}, {{as_type_max_value type language='c++'}}, &mRequest.{{asLowerCamelCase label}});
         {{/if_chip_complex}}
+        {{#if (isProvisional (asUpperCamelCase parent.parent.name preserveAcronyms=true) command=(asUpperCamelCase parent.name preserveAcronyms=true) commandField=(asStructPropertyName label))}}
+        #endif // MTR_ENABLE_PROVISIONAL
+        {{/if}}
         {{/zcl_command_arguments}}
         ClusterCommand::AddArguments();
     }
@@ -64,7 +70,13 @@ public:
         __auto_type * params = [[MTR{{asUpperCamelCase parent.name preserveAcronyms=true}}Cluster{{asUpperCamelCase name preserveAcronyms=true}}Params alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         {{#zcl_command_arguments}}
+        {{#if (isProvisional (asUpperCamelCase parent.parent.name preserveAcronyms=true) command=(asUpperCamelCase parent.name preserveAcronyms=true) commandField=(asStructPropertyName label))}}
+        #if MTR_ENABLE_PROVISIONAL
+        {{/if}}
         {{>decodable_value target=(concat "params." (asStructPropertyName label)) source=(concat "mRequest." (asLowerCamelCase label)) cluster=parent.parent.name type=type depth=0}}
+        {{#if (isProvisional (asUpperCamelCase parent.parent.name preserveAcronyms=true) command=(asUpperCamelCase parent.name preserveAcronyms=true) commandField=(asStructPropertyName label))}}
+        #endif // MTR_ENABLE_PROVISIONAL
+        {{/if}}
         {{/zcl_command_arguments}}
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
@@ -312,10 +324,10 @@ public:
 {{/if}}
 {{/if}}
 {{/zcl_attributes_server}}
-{{/if}}
 {{#if (isProvisional (asUpperCamelCase name preserveAcronyms=true))}}
 #endif // MTR_ENABLE_PROVISIONAL
 {{/if}}
+{{/if}}
 {{/zcl_clusters}}
 
 /*----------------------------------------------------------------------------*\
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
index 10c1d1a63d7142..1bc430a981a730 100644
--- a/examples/darwin-framework-tool/templates/tests/ciTests.json
+++ b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -54,11 +54,16 @@
         "Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster",
         "Test_TC_S_2_2",
         "Test_TC_TCCM_3_1",
+        "Test_TC_TCCM_3_2",
+        "Test_TC_TCCM_3_3",
+        "Test_TC_RVCRUNM_3_1",
         "Test_TC_TCTL_2_1",
         "Disabled because darwin-framework-tool does not support constraints arithmetic operations",
         "Test_TC_FLW_2_1",
         "Test_TC_RH_2_1",
         "Disabled because darwin-framework-tool does not handle substraction in parameters",
-        "Test_TC_S_2_3"
+        "Test_TC_S_2_3",
+        "TestScenesMultiFabric",
+        "TestScenesFabricSceneInfo"
     ]
 }
diff --git a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
index f9ed81b5e4ee96..6863b933f4131c 100644
--- a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
+++ b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
@@ -218,7 +218,11 @@ class {{filename}}: public TestCommandBridge
           {{/chip_tests_item_parameters}}
           [cluster writeAttribute{{>attribute}}WithValue:{{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument{{/chip_tests_item_parameters}} completion:^(NSError * _Nullable err) {
         {{/if}}
-            NSLog(@"{{label}} Error: %@", err);
+            if (err != nil) {
+              NSLog(@"{{label}}: Error: %@", err);
+            } else {
+              NSLog(@"{{label}}: Success");
+            }
 
             {{#chip_tests_item_responses}}
             {{#if error}}
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
index dc13534a56fe46..4cc0f304729eb9 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -148,6 +154,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -170,6 +178,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -242,6 +252,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -320,6 +332,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -333,7 +347,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -348,6 +364,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -372,7 +390,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -386,6 +404,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -396,7 +416,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -407,6 +427,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -445,13 +467,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -471,6 +493,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -500,6 +524,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -516,11 +541,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -567,6 +595,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -601,6 +632,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -619,6 +652,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -719,11 +754,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -765,7 +808,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -798,6 +841,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -832,17 +877,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -959,6 +1001,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1031,6 +1075,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
@@ -1171,11 +1217,13 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList default = 0;
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1270,9 +1318,11 @@ endpoint 0 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
@@ -1309,7 +1359,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
index 35e670751458f5..d47f5bcf2dde6f 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -960,6 +960,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -1034,7 +1066,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1926,6 +1958,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2147,7 +2195,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2484,14 +2532,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
index 80587a37fdf992..3e45d62323cfec 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
@@ -7,6 +7,7 @@ import chip.devicecontroller.model.AttributeState
 import chip.devicecontroller.model.ChipAttributePath
 import chip.devicecontroller.model.ChipEventPath
 import chip.devicecontroller.model.ChipPathId
+import chip.devicecontroller.model.DataVersionFilter
 import chip.devicecontroller.model.EventState
 import chip.devicecontroller.model.NodeState
 import com.matter.controller.commands.common.CredentialsIssuer
@@ -169,6 +170,15 @@ class PairOnNetworkLongImReadCommand(
         )
       )
 
+    val dataVersionFilterList =
+      listOf(
+        DataVersionFilter.newInstance(
+          ChipPathId.forId(/* endpointId= */ 0),
+          ChipPathId.forId(CLUSTER_ID_BASIC),
+          CLUSTER_ID_BASIC_VERSION,
+        )
+      )
+
     currentCommissioner()
       .pairDeviceWithAddress(
         getNodeId(),
@@ -184,7 +194,15 @@ class PairOnNetworkLongImReadCommand(
       .getConnectedDevicePointer(getNodeId(), InternalGetConnectedDeviceCallback())
     clear()
     currentCommissioner()
-      .readPath(InternalReportCallback(), devicePointer, attributePathList, eventPathList, false, 0)
+      .readPath(
+        InternalReportCallback(),
+        devicePointer,
+        attributePathList,
+        eventPathList,
+        dataVersionFilterList,
+        false,
+        0
+      )
     waitCompleteMs(getTimeoutMillis())
   }
 
@@ -198,5 +216,6 @@ class PairOnNetworkLongImReadCommand(
     private const val ATTR_ID_LOCAL_CONFIG_DISABLED = 16L
     private const val EVENT_ID_START_UP = 0L
     private const val GLOBAL_ATTRIBUTE_LIST = 65531L
+    private const val CLUSTER_ID_BASIC_VERSION = 0L
   }
 }
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt
index 1c0957db981232..07c0321a99b5d6 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt
@@ -7,6 +7,8 @@ import chip.devicecontroller.ResubscriptionAttemptCallback
 import chip.devicecontroller.SubscriptionEstablishedCallback
 import chip.devicecontroller.model.ChipAttributePath
 import chip.devicecontroller.model.ChipEventPath
+import chip.devicecontroller.model.ChipPathId
+import chip.devicecontroller.model.DataVersionFilter
 import chip.devicecontroller.model.NodeState
 import com.matter.controller.commands.common.CredentialsIssuer
 import java.util.Collections
@@ -81,6 +83,15 @@ class PairOnNetworkLongImSubscribeCommand(
         )
       )
 
+    val dataVersionFilterList =
+      listOf(
+        DataVersionFilter.newInstance(
+          ChipPathId.forId(/* endpointId= */ 0),
+          ChipPathId.forId(CLUSTER_ID_BASIC),
+          CLUSTER_ID_BASIC_VERSION,
+        )
+      )
+
     currentCommissioner()
       .pairDeviceWithAddress(
         getNodeId(),
@@ -103,6 +114,7 @@ class PairOnNetworkLongImSubscribeCommand(
         devicePointer,
         attributePathList,
         Collections.emptyList(),
+        dataVersionFilterList,
         0,
         5,
         false,
@@ -120,5 +132,6 @@ class PairOnNetworkLongImSubscribeCommand(
     private const val MATTER_PORT = 5540
     private const val CLUSTER_ID_BASIC = 0x0028L
     private const val ATTR_ID_LOCAL_CONFIG_DISABLED = 16L
+    private const val CLUSTER_ID_BASIC_VERSION = 0L
   }
 }
diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md
index 835b11ea444c59..15c034ee6f270d 100644
--- a/examples/light-switch-app/ameba/README.md
+++ b/examples/light-switch-app/ameba/README.md
@@ -26,11 +26,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
 
 -   Setup build environment:
 
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 7439fedadea592..95f33981f5df7f 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -97,6 +101,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -166,6 +172,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional client cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -173,8 +185,8 @@ provisional client cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -187,14 +199,23 @@ provisional client cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute optional int8u sceneCount = 0;
+  readonly attribute optional int8u currentScene = 1;
+  readonly attribute optional group_id currentGroup = 2;
+  readonly attribute optional boolean sceneValid = 3;
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute optional nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -307,7 +328,7 @@ provisional client cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -344,6 +365,8 @@ provisional client cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -368,6 +391,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -388,7 +412,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -413,6 +437,8 @@ client cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -443,6 +469,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -465,6 +493,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -537,6 +567,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -614,6 +646,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -624,6 +658,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -698,6 +734,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -776,7 +814,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -791,6 +831,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -815,8 +857,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -828,6 +870,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -866,13 +910,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -892,6 +936,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -921,6 +967,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -937,11 +984,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -988,6 +1038,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1022,6 +1075,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1040,6 +1095,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1077,6 +1134,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1177,11 +1236,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1216,6 +1283,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1314,9 +1383,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1374,11 +1443,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1420,7 +1491,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1453,6 +1524,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1492,6 +1565,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 server cluster TimeSynchronization = 56 {
+  revision 2;
+
   enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
@@ -1634,6 +1709,8 @@ server cluster TimeSynchronization = 56 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -1684,6 +1761,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1729,6 +1808,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1845,6 +1926,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1918,6 +2001,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1934,6 +2019,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1950,6 +2037,8 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
@@ -1995,6 +2084,8 @@ server cluster IcdManagement = 70 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2367,8 +2458,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2459,9 +2552,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index a92321ae63ca0c..1da8588daf412e 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -690,6 +690,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -716,7 +748,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1601,6 +1633,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1774,7 +1822,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2090,7 +2138,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2106,7 +2154,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2122,7 +2170,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/light-switch-app/nrfconnect/CMakeLists.txt b/examples/light-switch-app/nrfconnect/CMakeLists.txt
index 12d4454c91bcd5..abd1a0c6d1a2b0 100644
--- a/examples/light-switch-app/nrfconnect/CMakeLists.txt
+++ b/examples/light-switch-app/nrfconnect/CMakeLists.txt
@@ -67,6 +67,7 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
 
diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md
index 28eef95255ee60..ee78d91c2f7bd8 100644
--- a/examples/light-switch-app/nrfconnect/README.md
+++ b/examples/light-switch-app/nrfconnect/README.md
@@ -369,93 +369,63 @@ learn how to use other CLI commands of the application.
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+### Install Command Line Tools
 
-        $ docker pull nordicsemi/nrfconnect-chip
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+### Install Toolchain Manager
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-    In this command:
+To install the Toolchain Manager app, complete the following steps:
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
-
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
-
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the CHIP and the nRF Connect
-    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
-    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
-    Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -463,8 +433,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 3063fbbcdee779..2ccc13adb1ddc0 100644
--- a/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/light-switch-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay b/examples/light-switch-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
index 3063fbbcdee779..2ccc13adb1ddc0 100644
--- a/examples/light-switch-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
+++ b/examples/light-switch-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/light-switch-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/light-switch-app/nrfconnect/main/include/CHIPProjectConfig.h
index f152bdb75be4d2..2a238cbfb1ab97 100644
--- a/examples/light-switch-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/light-switch-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -28,6 +28,3 @@
 #pragma once
 
 #define CHIP_CONFIG_CONTROLLER_MAX_ACTIVE_DEVICES 2
-/* Use a default pairing code if one hasn't been provisioned in flash. */
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/light-switch-app/nrfconnect/prj.conf b/examples/light-switch-app/nrfconnect/prj.conf
index 726846ae48cee5..2327bafd36bff9 100644
--- a/examples/light-switch-app/nrfconnect/prj.conf
+++ b/examples/light-switch-app/nrfconnect/prj.conf
@@ -41,3 +41,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/light-switch-app/nrfconnect/prj_release.conf b/examples/light-switch-app/nrfconnect/prj_release.conf
index e033650db1d427..5366a4f3dc3b6c 100644
--- a/examples/light-switch-app/nrfconnect/prj_release.conf
+++ b/examples/light-switch-app/nrfconnect/prj_release.conf
@@ -54,3 +54,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
index 184e824904c519..ebb196bb76980f 100755
--- a/examples/light-switch-app/telink/prj.conf
+++ b/examples/light-switch-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/light-switch-app/telink/src/AppTask.cpp b/examples/light-switch-app/telink/src/AppTask.cpp
index 1a21866cf6bd6b..39b92cca42519d 100644
--- a/examples/light-switch-app/telink/src/AppTask.cpp
+++ b/examples/light-switch-app/telink/src/AppTask.cpp
@@ -45,6 +45,8 @@ void AppTask::SwitchActionEventHandler(AppEvent * aEvent)
 {
     if (aEvent->Type == AppEvent::kEventType_Button)
     {
+        LOG_INF("App button pressed");
+
         BindingCommandData * data = chip::Platform::New<BindingCommandData>();
         data->commandId           = chip::app::Clusters::OnOff::Commands::Toggle::Id;
         data->clusterId           = chip::app::Clusters::OnOff::Id;
diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
index 012ac3b89be5da..b17498ce331e79 100644
--- a/examples/lighting-app/ameba/README.md
+++ b/examples/lighting-app/ameba/README.md
@@ -23,11 +23,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
 
 -   Setup build environment:
 
diff --git a/examples/lighting-app/asr/src/DeviceCallbacks.cpp b/examples/lighting-app/asr/src/DeviceCallbacks.cpp
index 92c962f75702db..f486aba1f5d9e0 100644
--- a/examples/lighting-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/lighting-app/asr/src/DeviceCallbacks.cpp
@@ -43,8 +43,6 @@
 #include "route_hook/asr_route_hook.h"
 #endif
 
-static const char * TAG = "app-devicecallbacks";
-
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
@@ -168,9 +166,8 @@ extern LEDWidget lightLED;
 void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id,
-                 ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1 || endpointId == 2,
-                 ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     lightLED.Set(*value);
 
@@ -182,9 +179,8 @@ void DeviceCallbacks::OnLevelPostAttributeChangeCallback(EndpointId endpointId,
                                                          uint8_t * value)
 {
     VerifyOrExit(attributeId == app::Clusters::LevelControl::Attributes::CurrentLevel::Id,
-                 ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1 || endpointId == 2,
-                 ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     if (size == 1)
     {
@@ -232,8 +228,8 @@ void DeviceCallbacks::OnColorPostAttributeChangeCallback(EndpointId endpointId,
 void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id,
-                 ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04lx", TAG, attributeId));
-    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId));
+                 ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId));
+    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId));
 
     // timerCount represents the number of callback executions before we stop the timer.
     // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
diff --git a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
index a3f4e3120e8092..b3e6f809b6ba38 100644
--- a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
@@ -98,7 +98,7 @@ bl_iot_sdk("sdk") {
 }
 
 chip_data_model("bouffalolab-lighting") {
-  zap_file = "${example_dir}/data_model/lighting-app-wifi.zap"
+  zap_file = "${example_dir}/data_model/lighting-app-thread.zap"
 
   zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
index 229cb561e3d286..e240264c075ff1 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -209,7 +218,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -226,55 +235,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -289,6 +298,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -322,6 +333,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -394,6 +407,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -471,6 +486,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -481,6 +498,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -555,6 +574,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -633,7 +654,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,6 +671,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -672,8 +697,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -685,6 +710,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -723,13 +750,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -749,6 +776,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -778,6 +807,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -794,11 +824,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -845,6 +878,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -879,6 +915,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -897,6 +935,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -934,6 +974,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1034,11 +1076,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1072,6 +1122,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1111,6 +1163,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1156,6 +1210,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1272,6 +1328,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1345,6 +1403,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1361,6 +1421,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1377,6 +1439,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1702,8 +1766,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1797,9 +1863,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
index 3fbf144422e576..496954ec505896 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
@@ -526,6 +526,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -552,7 +584,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1437,6 +1469,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1610,7 +1658,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3192,7 +3240,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index 13abdef3120844..6c9dd9e766b5f2 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -209,7 +218,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -226,55 +235,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -289,6 +298,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -322,6 +333,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -394,6 +407,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -471,6 +486,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -481,6 +498,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -555,6 +574,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -633,7 +654,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,6 +671,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -672,8 +697,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -685,6 +710,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -723,13 +750,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -749,6 +776,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -778,6 +807,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -794,11 +824,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -845,6 +878,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -879,6 +915,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -897,6 +935,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -934,6 +974,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1034,11 +1076,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1073,6 +1123,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1171,9 +1223,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1234,6 +1286,8 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1279,6 +1333,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1395,6 +1451,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1468,6 +1526,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1484,6 +1544,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1500,6 +1562,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1834,8 +1898,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1929,9 +1995,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
index cb06c41a042700..46ee05bddcbb95 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2043,7 +2091,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2059,7 +2107,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2075,7 +2123,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4168,7 +4216,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index c53008d8112361..40e2a56a180b31 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -209,7 +218,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -226,55 +235,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -289,6 +298,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -322,6 +333,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -394,6 +407,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -471,6 +486,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -481,6 +498,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -555,6 +574,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -633,7 +654,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,6 +671,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -672,8 +697,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -685,6 +710,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -723,13 +750,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -749,6 +776,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -778,6 +807,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -794,11 +824,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -845,6 +878,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -879,6 +915,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -897,6 +935,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -934,6 +974,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1034,11 +1076,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1072,6 +1122,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1113,7 +1165,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1144,6 +1196,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1189,6 +1243,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1305,6 +1361,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1378,6 +1436,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1394,6 +1454,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1410,6 +1472,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1744,8 +1808,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1839,9 +1905,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
index c24ec8d3bc8eaf..464185ab335d6d 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3375,7 +3423,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md
index a9eacd879f5070..f6d77a423ac37a 100644
--- a/examples/lighting-app/cc13x2x7_26x2x7/README.md
+++ b/examples/lighting-app/cc13x2x7_26x2x7/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,13 +87,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -103,7 +103,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     ```
 
 ## Programming
diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md
index beb1bfc42507be..2559c732dca70a 100644
--- a/examples/lighting-app/cc13x4_26x4/README.md
+++ b/examples/lighting-app/cc13x4_26x4/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,13 +87,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -103,7 +103,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     ```
 
 ## Programming
diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp
index 280131263efa96..790bd9b7867dff 100644
--- a/examples/lighting-app/esp32/main/main.cpp
+++ b/examples/lighting-app/esp32/main/main.cpp
@@ -32,6 +32,7 @@
 #include "freertos/task.h"
 #include "nvs_flash.h"
 #include "shell_extension/launch.h"
+#include "shell_extension/openthread_cli_register.h"
 #include <app/server/Dnssd.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -156,6 +157,9 @@ extern "C" void app_main()
     ESP_LOGI(TAG, "==================================================");
 
 #if CONFIG_ENABLE_CHIP_SHELL
+#if CONFIG_OPENTHREAD_CLI
+    chip::RegisterOpenThreadCliCommands();
+#endif
     chip::LaunchShell();
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 216ad683e6b030..064abbb3432c75 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,14 +149,19 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -205,7 +220,7 @@ provisional server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -265,6 +280,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -289,6 +306,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -309,7 +327,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -328,12 +346,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -344,7 +364,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -356,7 +376,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -373,55 +393,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -436,6 +456,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -469,6 +491,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -541,6 +565,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -618,6 +644,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -628,6 +656,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -702,6 +732,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -780,7 +812,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -795,6 +829,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -819,8 +855,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -832,6 +868,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -870,13 +908,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -896,6 +934,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -925,6 +965,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -941,11 +982,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -992,6 +1036,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1026,6 +1073,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1044,6 +1093,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1081,6 +1132,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1181,11 +1234,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1220,6 +1281,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1318,9 +1381,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1378,11 +1441,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1424,7 +1489,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1457,6 +1522,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1498,6 +1565,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -1548,6 +1617,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1593,6 +1664,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1709,6 +1782,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1782,6 +1857,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1798,6 +1875,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1814,6 +1893,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2082,6 +2163,8 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -2160,8 +2243,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2255,9 +2340,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2484,18 +2571,14 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index c4f3572ec96857..6da9e05979bbf4 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1543,6 +1575,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1716,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2053,7 +2101,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2069,7 +2117,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2085,7 +2133,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4516,76 +4564,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4629,16 +4613,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4702,7 +4686,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5089,7 +5073,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/linux/BUILD.gn b/examples/lighting-app/linux/BUILD.gn
index 47c14536d9a7c3..aac02352bacf40 100644
--- a/examples/lighting-app/linux/BUILD.gn
+++ b/examples/lighting-app/linux/BUILD.gn
@@ -82,6 +82,7 @@ executable("chip-lighting-app") {
       "$dir_pw_log",
       "$dir_pw_rpc:server",
       "$dir_pw_rpc/system_server:facade",
+      "$dir_pw_rpc/system_server:socket",
       "$dir_pw_stream:socket_stream",
       "$dir_pw_stream:sys_io_stream",
       "$dir_pw_sync:mutex",
diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
index bf378bc4468339..a4480b43f0afc6 100644
--- a/examples/lighting-app/nrfconnect/CMakeLists.txt
+++ b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -72,6 +72,7 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
 
diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md
index fd2a0c0d91aaac..b5ef3d7024a0f6 100644
--- a/examples/lighting-app/nrfconnect/README.md
+++ b/examples/lighting-app/nrfconnect/README.md
@@ -265,107 +265,63 @@ NFC.
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        ```
-        $ git submodule update --init
-        ```
-
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-### Using Docker container for setup
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-To use the Docker container for setup, complete the following steps:
+### Install Command Line Tools
 
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-        ```
-        $ mkdir ~/nrfconnect
-        ```
+### Install Toolchain Manager
 
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-        ```
-        $ docker pull nordicsemi/nrfconnect-chip
-        ```
+To install the Toolchain Manager app, complete the following steps:
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
-
-         ```
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
-         ```
-
-    In this command:
-
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the Matter
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
-
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
-
-         ```
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-         ```
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the Matter and the nRF
-    Connect SDK build scripts. Replace _nrfconnect-dir_ with the path to your
-    nRF Connect SDK installation directory, and _toolchain-dir_ with the path to
-    GNU Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         ```
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
-         ```
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         ```
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-         ```
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -373,8 +329,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 240f0aaffa190f..3a80c7a3552b7a 100644
--- a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,6 +14,8 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
@@ -36,6 +38,11 @@
 	};
 };
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
+
 &pwm0 {
 	pinctrl-0 = <&pwm0_default_alt>;
 	pinctrl-1 = <&pwm0_sleep_alt>;
diff --git a/examples/lighting-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
index de203e27aa1f69..2a8c6bb21f8c4b 100644
--- a/examples/lighting-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
+++ b/examples/lighting-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -14,6 +14,8 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
@@ -36,6 +38,11 @@
 	};
 };
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
+
 &pwm0 {
 	pinctrl-0 = <&pwm0_default_alt>;
 	pinctrl-1 = <&pwm0_sleep_alt>;
diff --git a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
index 1e94e5a3995898..7e997d723549d2 100644
--- a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -27,10 +27,6 @@
 
 #pragma once
 
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
 //  Switching from Thread child to router may cause a few second packet stall.
 //  Until this is improved in OpenThread we need to increase the retransmission
 //  interval to survive the stall.
diff --git a/examples/lighting-app/nrfconnect/prj.conf b/examples/lighting-app/nrfconnect/prj.conf
index 3419b5b0fc7087..38c8be587d5600 100644
--- a/examples/lighting-app/nrfconnect/prj.conf
+++ b/examples/lighting-app/nrfconnect/prj.conf
@@ -49,3 +49,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/lighting-app/nrfconnect/prj_release.conf b/examples/lighting-app/nrfconnect/prj_release.conf
index 1977239abf0d4b..4468a07e40b088 100644
--- a/examples/lighting-app/nrfconnect/prj_release.conf
+++ b/examples/lighting-app/nrfconnect/prj_release.conf
@@ -57,3 +57,8 @@ CONFIG_ASSERT_VERBOSE=n
 CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 879cdadd19a22f..783bcd56a54587 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -206,7 +215,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -219,55 +228,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -282,6 +291,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -315,6 +326,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -386,6 +399,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -456,6 +471,8 @@ server cluster BasicInformation = 40 {
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -466,6 +483,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -540,6 +559,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -615,6 +636,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -653,13 +676,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -679,6 +702,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -708,6 +733,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -724,11 +750,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -803,6 +832,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -820,6 +851,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -901,6 +934,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -914,11 +948,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -953,6 +995,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1051,9 +1095,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1108,11 +1152,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1153,6 +1199,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1269,6 +1317,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1381,8 +1431,10 @@ endpoint 0 {
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1442,11 +1494,14 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index 4da6db3bf6d93b..5aa0118ac8d750 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -504,6 +504,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -530,7 +562,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1191,6 +1223,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1226,6 +1274,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1268,7 +1332,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1584,7 +1648,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1600,7 +1664,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1616,7 +1680,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3633,7 +3697,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/qpg/args.gni b/examples/lighting-app/qpg/args.gni
index e19f57f7d483d6..ea22dfd187fbb2 100644
--- a/examples/lighting-app/qpg/args.gni
+++ b/examples/lighting-app/qpg/args.gni
@@ -29,8 +29,6 @@ chip_stack_lock_tracking = "none"
 
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8005"
-matter_device_software_version = "0x0001"
-matter_device_software_version_string = "1.0"
 
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp
index c4fe7ff0c06e91..5781e4069ad1eb 100644
--- a/examples/lighting-app/qpg/src/AppTask.cpp
+++ b/examples/lighting-app/qpg/src/AppTask.cpp
@@ -257,15 +257,23 @@ void AppTask::InitServer(intptr_t arg)
     // Open commissioning after boot if no fabric was available
     if (chip::Server::GetInstance().GetFabricTable().FabricCount() == 0)
     {
-        PlatformMgr().ScheduleWork(OpenCommissioning, 0);
+        ChipLogProgress(NotSpecified, "No fabrics, starting commissioning.");
+        AppTask::OpenCommissioning((intptr_t) 0);
     }
 }
 
 void AppTask::OpenCommissioning(intptr_t arg)
 {
     // Enable BLE advertisements
-    chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
-    ChipLogProgress(NotSpecified, "BLE advertising started. Waiting for Pairing.");
+
+    SystemLayer().ScheduleLambda([] {
+        CHIP_ERROR err;
+        err = chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
+        if (err == CHIP_NO_ERROR)
+        {
+            ChipLogProgress(NotSpecified, "BLE advertising started. Waiting for Pairing.");
+        }
+    });
 }
 
 CHIP_ERROR AppTask::Init()
@@ -486,10 +494,8 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
             else
             {
                 // Enable BLE advertisements and pairing window
-                if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(NotSpecified, "BLE advertising started. Waiting for Pairing.");
-                }
+                AppTask::OpenCommissioning((intptr_t) 0);
+                ChipLogProgress(NotSpecified, "BLE advertising started. Waiting for Pairing.");
             }
         }
         else if (sAppTask.mFunctionTimerActive && sAppTask.mFunction == kFunction_SoftwareUpdate)
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index 7c055058372faf..9ad302c97de85b 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -206,10 +215,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -222,55 +228,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -285,6 +291,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -318,6 +326,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -390,6 +400,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -467,6 +479,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -477,6 +491,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -551,6 +567,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -626,6 +644,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -664,13 +684,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -690,6 +710,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -719,6 +741,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -735,11 +758,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -814,6 +840,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -831,6 +859,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -875,6 +905,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -957,7 +989,6 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
   readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
   readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
   readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
@@ -975,11 +1006,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1014,6 +1053,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1112,9 +1153,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1169,11 +1210,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1219,6 +1262,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1335,6 +1380,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1408,6 +1455,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1424,6 +1473,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1440,6 +1491,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -1779,11 +1832,13 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1867,7 +1922,6 @@ endpoint 0 {
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
     callback attribute upTime default = 0x0000000000000000;
-    callback attribute totalOperationalHours default = 0x00000000;
     callback attribute bootReason;
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
@@ -1877,9 +1931,11 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2107,9 +2163,6 @@ endpoint 1 {
     ram      attribute remainingTime default = 0x0000;
     ram      attribute minLevel default = 0x01;
     ram      attribute maxLevel default = 0xFE;
-    ram      attribute currentFrequency default = 0x0000;
-    ram      attribute minFrequency default = 0x0000;
-    ram      attribute maxFrequency default = 0x0000;
     ram      attribute options default = 0x00;
     ram      attribute onLevel default = 0xFF;
     persist  attribute startUpCurrentLevel default = 255;
@@ -2141,24 +2194,6 @@ endpoint 1 {
     callback attribute clusterRevision default = 1;
   }
 
-  server cluster FixedLabel {
-    callback attribute labelList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster UserLabel {
-    callback attribute labelList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster ColorControl {
     ram      attribute currentHue default = 0x00;
     ram      attribute currentSaturation default = 0x00;
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index ffd306791f7f40..6c9dc0fb1397f7 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -712,6 +712,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -786,7 +818,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1715,6 +1747,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1766,22 +1814,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "TotalOperationalHours",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "BootReason",
               "code": 4,
@@ -1936,7 +1968,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2321,7 +2353,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2337,7 +2369,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2353,7 +2385,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4777,60 +4809,12 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "CurrentFrequency",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MinFrequency",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MaxFrequency",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "Options",
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5109,218 +5093,6 @@
             }
           ]
         },
-        {
-          "name": "Fixed Label",
-          "code": 64,
-          "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Color Control",
           "code": 768,
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
index 33303e645737ce..622268ba3b8d4a 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,14 +149,19 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -205,7 +220,7 @@ provisional server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -286,6 +301,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -310,6 +327,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -330,7 +348,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -349,12 +367,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -365,7 +385,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -377,7 +397,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -394,55 +414,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -457,6 +477,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -490,6 +512,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -562,6 +586,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -639,6 +665,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -649,6 +677,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -723,6 +753,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -801,7 +833,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -816,6 +850,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -840,8 +876,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -853,6 +889,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1089,6 +1127,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1127,13 +1167,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1153,6 +1193,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1182,6 +1224,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1198,11 +1241,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1233,6 +1279,8 @@ server cluster NetworkCommissioning = 49 {
   readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
   readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
   readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute ThreadCapabilitiesBitmap supportedThreadFeatures = 9;
+  readonly attribute int16u threadVersion = 10;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1249,6 +1297,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1283,6 +1334,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1301,6 +1354,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1338,6 +1393,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1438,11 +1495,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1477,6 +1542,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1575,9 +1642,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1635,11 +1702,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1685,6 +1754,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1801,6 +1872,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1874,6 +1947,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1890,6 +1965,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1906,6 +1983,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2219,8 +2298,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2275,6 +2356,8 @@ endpoint 0 {
     ram      attribute lastNetworkingStatus;
     ram      attribute lastNetworkID;
     ram      attribute lastConnectErrorValue;
+    callback attribute supportedThreadFeatures;
+    callback attribute threadVersion;
     ram      attribute featureMap default = 2;
     ram      attribute clusterRevision default = 1;
 
@@ -2308,9 +2391,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2500,19 +2585,15 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
index 00e4fc3dc68664..dc69ec278ff7ca 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1396,6 +1428,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SupportedThreadFeatures",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ThreadCapabilitiesBitmap",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ThreadVersion",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1497,6 +1561,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1670,7 +1750,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1995,7 +2075,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2011,7 +2091,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2027,7 +2107,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4056,76 +4136,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4169,16 +4185,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4258,7 +4274,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4709,7 +4725,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5916,6 +5932,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ],
-  "log": []
-}
\ No newline at end of file
+  ]
+}
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
index 28c4570b90f7e2..3ab26ccd8033dd 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,14 +149,19 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -205,7 +220,7 @@ provisional server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -265,6 +280,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -289,6 +306,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -309,7 +327,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -328,12 +346,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -344,7 +364,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -356,7 +376,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -373,55 +393,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -436,6 +456,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -469,6 +491,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -541,6 +565,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -618,6 +644,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -628,6 +656,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -702,6 +732,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -780,7 +812,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -795,6 +829,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -819,8 +855,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -832,6 +868,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1068,6 +1106,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1106,13 +1146,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1132,6 +1172,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1161,6 +1203,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1177,11 +1220,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1228,6 +1274,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1262,6 +1311,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1280,6 +1331,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1317,6 +1370,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1417,11 +1472,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1456,6 +1519,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1497,7 +1562,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1530,6 +1595,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1575,6 +1642,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1691,6 +1760,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1764,6 +1835,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1780,6 +1853,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1796,6 +1871,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2109,8 +2186,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2198,9 +2277,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2340,19 +2421,15 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
index 76f4fde26b1b09..93b568a897ddd9 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1497,6 +1529,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1670,7 +1718,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3232,76 +3280,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3345,16 +3329,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3434,7 +3418,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3885,7 +3869,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt
index e4dd1a4adc4094..2a7e46fc3d8076 100644
--- a/examples/lighting-app/telink/CMakeLists.txt
+++ b/examples/lighting-app/telink/CMakeLists.txt
@@ -21,6 +21,21 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
 set(ignoreMe "${TLNK_USB_DONGLE}")
 
+if(${TLNK_MARS_BOARD} MATCHES y)
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+  else()
+    unset(MARS_DTC_OVERLAY_FILE)
+  endif()
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+  else()
+    unset(MARS_CONF_OVERLAY_FILE)
+  endif()
+else()
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
 if(${TLNK_USB_DONGLE} MATCHES y)
   if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.overlay")
     set(USB_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.overlay")
@@ -58,14 +73,14 @@ endif()
 
 if(DTC_OVERLAY_FILE)
   set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
+    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
     CACHE STRING "" FORCE
   )
 else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
+  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
 endif()
 
-set(CONF_FILE ${USB_CONF_OVERLAY_FILE} prj.conf)
+set(CONF_FILE ${USB_CONF_OVERLAY_FILE} ${MARS_CONF_OVERLAY_FILE} prj.conf)
 
 # Load NCS/Zephyr build system
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
@@ -99,6 +114,7 @@ target_sources(app PRIVATE
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
                ${TELINK_COMMON}/util/src/PWMDevice.cpp
+               ${TELINK_COMMON}/util/src/WS2812Device.cpp
                ${TELINK_COMMON}/util/src/ColorFormat.cpp)
 
 chip_configure_data_model(app
diff --git a/examples/lighting-app/telink/include/AppTask.h b/examples/lighting-app/telink/include/AppTask.h
index a9d9ab3712ef94..764cb209505a82 100644
--- a/examples/lighting-app/telink/include/AppTask.h
+++ b/examples/lighting-app/telink/include/AppTask.h
@@ -28,7 +28,12 @@ class AppTask : public AppTaskCommon
 #endif /* CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET */
     void SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uint8_t * value);
     void UpdateClusterState(void);
-    PWMDevice & GetPWMDevice(void) { return mPwmRgbBlueLed; }
+
+#ifdef CONFIG_WS2812_STRIP
+    WS2812Device & GetLightingDevice(void) { return mWS2812Device; }
+#else
+    PWMDevice & GetLightingDevice(void) { return mPwmRgbBlueLed; }
+#endif /* CONFIG_WS2812_STRIP */
 
 private:
     friend AppTask & GetAppTask(void);
@@ -47,11 +52,16 @@ class AppTask : public AppTaskCommon
     static unsigned int sPowerOnFactoryResetTimerCnt;
     static k_timer sPowerOnFactoryResetTimer;
 #endif /* CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET */
+
+#ifdef CONFIG_WS2812_STRIP
+    WS2812Device mWS2812Device;
+#else
     PWMDevice mPwmRgbBlueLed;
 #if USE_RGB_PWM
     PWMDevice mPwmRgbGreenLed;
     PWMDevice mPwmRgbRedLed;
 #endif
+#endif /* CONFIG_WS2812_STRIP */
 
     static AppTask sAppTask;
 };
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
index 0c71925928bec0..566c993ee92dca 100644
--- a/examples/lighting-app/telink/prj.conf
+++ b/examples/lighting-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
index 94f0f9dd571ed1..7dbb9e1aac2102 100644
--- a/examples/lighting-app/telink/src/AppTask.cpp
+++ b/examples/lighting-app/telink/src/AppTask.cpp
@@ -27,17 +27,23 @@
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 namespace {
-const struct pwm_dt_spec sPwmRgbSpecBlueLed = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0));
+#ifdef CONFIG_WS2812_STRIP
+const struct device * const ws2812_dev = DEVICE_DT_GET(DT_ALIAS(led_strip));
+#else
+const struct pwm_dt_spec sPwmRgbSpecBlueLed  = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0));
 #if USE_RGB_PWM
 const struct pwm_dt_spec sPwmRgbSpecGreenLed = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led1));
 const struct pwm_dt_spec sPwmRgbSpecRedLed   = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led2));
+#endif
+#endif // CONFIG_WS2812_STRIP
 
+#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
 uint8_t sBrightness;
 PWMDevice::Action_t sColorAction = PWMDevice::INVALID_ACTION;
 XyColor_t sXY;
 HsvColor_t sHSV;
 CtColor_t sCT;
-#endif
+#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -55,6 +61,8 @@ void AppTask::PowerOnFactoryReset(void)
 
 CHIP_ERROR AppTask::Init(void)
 {
+    CHIP_ERROR err;
+
     // Init lighting manager
     uint8_t minLightLevel = kDefaultMinLevel;
     Clusters::LevelControl::Attributes::MinLevel::Get(kExampleEndpointId, &minLightLevel);
@@ -62,7 +70,15 @@ CHIP_ERROR AppTask::Init(void)
     uint8_t maxLightLevel = kDefaultMaxLevel;
     Clusters::LevelControl::Attributes::MaxLevel::Get(kExampleEndpointId, &maxLightLevel);
 
-    CHIP_ERROR err = sAppTask.mPwmRgbBlueLed.Init(&sPwmRgbSpecBlueLed, minLightLevel, maxLightLevel, maxLightLevel);
+#ifdef CONFIG_WS2812_STRIP
+    err = sAppTask.mWS2812Device.Init(ws2812_dev, STRIP_NUM_PIXELS(led_strip));
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("WS2812 Device Init fail");
+        return err;
+    }
+#else
+    err = sAppTask.mPwmRgbBlueLed.Init(&sPwmRgbSpecBlueLed, minLightLevel, maxLightLevel, maxLightLevel);
     if (err != CHIP_NO_ERROR)
     {
         LOG_ERR("Blue RGB PWM Device Init fail");
@@ -84,6 +100,7 @@ CHIP_ERROR AppTask::Init(void)
     }
 #endif
     sAppTask.mPwmRgbBlueLed.SetCallbacks(ActionInitiated, ActionCompleted, nullptr);
+#endif // CONFIG_WS2812_STRIP
 
 #if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(LightingActionEventHandler);
@@ -95,6 +112,21 @@ CHIP_ERROR AppTask::Init(void)
 
 void AppTask::LightingActionEventHandler(AppEvent * aEvent)
 {
+#ifdef CONFIG_WS2812_STRIP
+    if (aEvent->Type == AppEvent::kEventType_Button)
+    {
+        if (sAppTask.mWS2812Device.IsTurnedOn())
+        {
+            sAppTask.mWS2812Device.Set(SET_RGB_TURN_OFF);
+        }
+        else
+        {
+            sAppTask.mWS2812Device.Set(SET_RGB_TURN_ON);
+        }
+
+        sAppTask.UpdateClusterState();
+    }
+#else
     PWMDevice::Action_t action = PWMDevice::INVALID_ACTION;
     int32_t actor              = 0;
 
@@ -130,6 +162,7 @@ void AppTask::LightingActionEventHandler(AppEvent * aEvent)
     {
         LOG_INF("Action is in progress or active");
     }
+#endif // CONFIG_WS2812_STRIP
 }
 
 void AppTask::ActionInitiated(PWMDevice::Action_t aAction, int32_t aActor)
@@ -171,22 +204,18 @@ void AppTask::ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor)
 
 void AppTask::UpdateClusterState(void)
 {
-#if USE_RGB_PWM
-    bool isTurnedOn =
-        sAppTask.mPwmRgbRedLed.IsTurnedOn() || sAppTask.mPwmRgbGreenLed.IsTurnedOn() || sAppTask.mPwmRgbBlueLed.IsTurnedOn();
-#else
-    bool isTurnedOn  = sAppTask.mPwmRgbBlueLed.IsTurnedOn();
-#endif
-    // write the new on/off value
-    EmberAfStatus status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn);
+    EmberAfStatus status;
+    bool isTurnedOn;
+    uint8_t setLevel;
 
-    if (status != EMBER_ZCL_STATUS_SUCCESS)
-    {
-        LOG_ERR("Update OnOff fail: %x", status);
-    }
+#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
+#ifdef CONFIG_WS2812_STRIP
+    isTurnedOn = sAppTask.mWS2812Device.IsTurnedOn();
+#else
+    isTurnedOn =
+        sAppTask.mPwmRgbRedLed.IsTurnedOn() || sAppTask.mPwmRgbGreenLed.IsTurnedOn() || sAppTask.mPwmRgbBlueLed.IsTurnedOn();
+#endif // CONFIG_WS2812_STRIP
 
-#if USE_RGB_PWM
-    uint8_t setLevel;
     if (sColorAction == PWMDevice::COLOR_ACTION_XY || sColorAction == PWMDevice::COLOR_ACTION_HSV ||
         sColorAction == PWMDevice::COLOR_ACTION_CT)
     {
@@ -194,11 +223,28 @@ void AppTask::UpdateClusterState(void)
     }
     else
     {
+#ifdef CONFIG_WS2812_STRIP
+        setLevel = sAppTask.mWS2812Device.GetBlueLevel();
+        if (setLevel > kDefaultMaxLevel)
+        {
+            setLevel = kDefaultMaxLevel;
+        }
+#else
         setLevel = sAppTask.mPwmRgbBlueLed.GetLevel();
+#endif // CONFIG_WS2812_STRIP
     }
 #else
-    uint8_t setLevel = sAppTask.mPwmRgbBlueLed.GetLevel();
-#endif
+    isTurnedOn = sAppTask.mPwmRgbBlueLed.IsTurnedOn();
+    setLevel   = sAppTask.mPwmRgbBlueLed.GetLevel();
+#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
+
+    // write the new on/off value
+    status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        LOG_ERR("Update OnOff fail: %x", status);
+    }
+
     status = Clusters::LevelControl::Attributes::CurrentLevel::Set(kExampleEndpointId, setLevel);
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
@@ -208,22 +254,33 @@ void AppTask::UpdateClusterState(void)
 
 void AppTask::SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uint8_t * value)
 {
-#if USE_RGB_PWM
+#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
     bool setRgbAction = false;
     RgbColor_t rgb;
-#endif
+#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
 
     if (aAction == PWMDevice::ON_ACTION || aAction == PWMDevice::OFF_ACTION)
     {
+#ifdef CONFIG_WS2812_STRIP
+        if (aAction == PWMDevice::ON_ACTION)
+        {
+            sAppTask.mWS2812Device.Set(SET_RGB_TURN_ON);
+        }
+        else if (aAction == PWMDevice::OFF_ACTION)
+        {
+            sAppTask.mWS2812Device.Set(SET_RGB_TURN_OFF);
+        }
+#else
         sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, value);
 #if USE_RGB_PWM
         sAppTask.mPwmRgbRedLed.InitiateAction(aAction, aActor, value);
         sAppTask.mPwmRgbGreenLed.InitiateAction(aAction, aActor, value);
 #endif
+#endif // CONFIG_WS2812_STRIP
     }
     else if (aAction == PWMDevice::LEVEL_ACTION)
     {
-#if USE_RGB_PWM
+#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
         // Save a new brightness for ColorControl
         sBrightness = *value;
 
@@ -238,19 +295,16 @@ void AppTask::SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uin
         }
         else
         {
-            rgb.r = sBrightness;
-            rgb.g = sBrightness;
-            rgb.b = sBrightness;
+            memset(&rgb, sBrightness, sizeof(RgbColor_t));
         }
 
         ChipLogProgress(Zcl, "New brightness: %u | R: %u, G: %u, B: %u", sBrightness, rgb.r, rgb.g, rgb.b);
         setRgbAction = true;
 #else
         sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, value);
-#endif
+#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
     }
-
-#if USE_RGB_PWM
+#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
     else if (aAction == PWMDevice::COLOR_ACTION_XY)
     {
         sXY = *reinterpret_cast<XyColor_t *>(value);
@@ -283,11 +337,15 @@ void AppTask::SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uin
 
     if (setRgbAction)
     {
+#ifdef CONFIG_WS2812_STRIP
+        sAppTask.mWS2812Device.SetLevel(&rgb);
+#else
         sAppTask.mPwmRgbRedLed.InitiateAction(aAction, aActor, &rgb.r);
         sAppTask.mPwmRgbGreenLed.InitiateAction(aAction, aActor, &rgb.g);
         sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, &rgb.b);
+#endif // CONFIG_WS2812_STRIP
     }
-#endif
+#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
 }
 
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
@@ -301,11 +359,15 @@ void AppTask::PowerOnFactoryResetEventHandler(AppEvent * aEvent)
 {
     LOG_INF("Lighting App Power On Factory Reset Handler");
     sPowerOnFactoryResetTimerCnt = 1;
+#ifdef CONFIG_WS2812_STRIP
+    sAppTask.mWS2812Device.Set(sPowerOnFactoryResetTimerCnt % 2);
+#else
     sAppTask.mPwmRgbBlueLed.Set(sPowerOnFactoryResetTimerCnt % 2);
 #if USE_RGB_PWM
     sAppTask.mPwmRgbRedLed.Set(sPowerOnFactoryResetTimerCnt % 2);
     sAppTask.mPwmRgbGreenLed.Set(sPowerOnFactoryResetTimerCnt % 2);
 #endif
+#endif // CONFIG_WS2812_STRIP
     k_timer_init(&sPowerOnFactoryResetTimer, PowerOnFactoryResetTimerEvent, nullptr);
     k_timer_start(&sPowerOnFactoryResetTimer, K_MSEC(kPowerOnFactoryResetIndicationTimeMs),
                   K_MSEC(kPowerOnFactoryResetIndicationTimeMs));
@@ -315,11 +377,15 @@ void AppTask::PowerOnFactoryResetTimerEvent(struct k_timer * timer)
 {
     sPowerOnFactoryResetTimerCnt++;
     LOG_INF("Lighting App Power On Factory Reset Handler %u", sPowerOnFactoryResetTimerCnt);
+#ifdef CONFIG_WS2812_STRIP
+    sAppTask.mWS2812Device.Set(sPowerOnFactoryResetTimerCnt % 2);
+#else
     sAppTask.mPwmRgbBlueLed.Set(sPowerOnFactoryResetTimerCnt % 2);
 #if USE_RGB_PWM
     sAppTask.mPwmRgbRedLed.Set(sPowerOnFactoryResetTimerCnt % 2);
     sAppTask.mPwmRgbGreenLed.Set(sPowerOnFactoryResetTimerCnt % 2);
 #endif
+#endif // CONFIG_WS2812_STRIP
     if (sPowerOnFactoryResetTimerCnt > kPowerOnFactoryResetIndicationMax)
     {
         k_timer_stop(timer);
diff --git a/examples/lighting-app/telink/src/ZclCallbacks.cpp b/examples/lighting-app/telink/src/ZclCallbacks.cpp
index 86e57809b67e11..53649639507142 100644
--- a/examples/lighting-app/telink/src/ZclCallbacks.cpp
+++ b/examples/lighting-app/telink/src/ZclCallbacks.cpp
@@ -48,7 +48,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
     }
     else if (clusterId == LevelControl::Id && attributeId == LevelControl::Attributes::CurrentLevel::Id)
     {
-        if (GetAppTask().GetPWMDevice().IsTurnedOn())
+        if (GetAppTask().GetLightingDevice().IsTurnedOn())
         {
             ChipLogDetail(Zcl, "Cluster LevelControl: attribute CurrentLevel set to %u", *value);
             GetAppTask().SetInitiateAction(PWMDevice::LEVEL_ACTION, static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
@@ -138,7 +138,7 @@ void emberAfOnOffClusterInitCallback(EndpointId endpoint)
     if (status == EMBER_ZCL_STATUS_SUCCESS)
     {
         // Set actual state to stored before reboot
-        GetAppTask().GetPWMDevice().Set(storedValue);
+        GetAppTask().GetLightingDevice().Set(storedValue);
     }
 
     GetAppTask().UpdateClusterState();
diff --git a/examples/lighting-app/tizen/src/DBusInterface.cpp b/examples/lighting-app/tizen/src/DBusInterface.cpp
index 86ae799dc1f5a2..7c6e29d6a1cc38 100644
--- a/examples/lighting-app/tizen/src/DBusInterface.cpp
+++ b/examples/lighting-app/tizen/src/DBusInterface.cpp
@@ -94,8 +94,8 @@ void DBusInterface::SetCurrentLevel(uint8_t value)
 void DBusInterface::SetColorMode(chip::app::Clusters::ColorControl::ColorMode colorMode)
 {
     InternalSetGuard guard(this);
-    if (light_app_color_control_get_color_mode(mIfaceColorControl) != colorMode)
-        light_app_color_control_set_color_mode(mIfaceColorControl, colorMode);
+    if (light_app_color_control_get_color_mode(mIfaceColorControl) != chip::to_underlying(colorMode))
+        light_app_color_control_set_color_mode(mIfaceColorControl, chip::to_underlying(colorMode));
 }
 
 void DBusInterface::SetColorTemperature(uint16_t value)
@@ -173,8 +173,8 @@ gboolean DBusInterface::OnCurrentLevelChanged(LightAppLevelControl * levelContro
 
     Clusters::LevelControl::Commands::MoveToLevel::DecodableType data;
     data.level = light_app_level_control_get_current_level(levelControl);
-    data.optionsMask.Set(Clusters::LevelControl::LevelControlOptions::kExecuteIfOff);
-    data.optionsOverride.Set(Clusters::LevelControl::LevelControlOptions::kExecuteIfOff);
+    data.optionsMask.Set(Clusters::LevelControl::OptionsBitmap::kExecuteIfOff);
+    data.optionsOverride.Set(Clusters::LevelControl::OptionsBitmap::kExecuteIfOff);
 
     chip::DeviceLayer::StackLock lock;
     LevelControlServer::MoveToLevel(self->mEndpointId, data);
diff --git a/examples/lighting-app/tizen/src/main.cpp b/examples/lighting-app/tizen/src/main.cpp
index 6a32e84b50cb6c..c1cda62a2378d5 100644
--- a/examples/lighting-app/tizen/src/main.cpp
+++ b/examples/lighting-app/tizen/src/main.cpp
@@ -20,6 +20,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
+#include <app/clusters/color-control-server/color-control-server.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/Tizen/NetworkCommissioningDriver.h>
 
@@ -122,8 +123,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
 void emberAfColorControlClusterInitCallback(EndpointId endpoint)
 {
     // Set the color mode to color temperature.
-    Clusters::ColorControl::Attributes::ColorMode::Set(endpoint,
-                                                       Clusters::ColorControl::ColorMode::EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE);
+    Clusters::ColorControl::Attributes::ColorMode::Set(endpoint, ColorControlServer::EnhancedColorMode::kColorTemperature);
     // Preserve the state of the color temperature attribute across reboots.
     Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::SetNull(endpoint);
 }
diff --git a/examples/resource-monitoring-app/linux/.gn b/examples/lit-icd-app/linux/.gn
similarity index 100%
rename from examples/resource-monitoring-app/linux/.gn
rename to examples/lit-icd-app/linux/.gn
diff --git a/examples/lit-icd-app/linux/BUILD.gn b/examples/lit-icd-app/linux/BUILD.gn
new file mode 100644
index 00000000000000..6a2a26c7b8a034
--- /dev/null
+++ b/examples/lit-icd-app/linux/BUILD.gn
@@ -0,0 +1,42 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+executable("lit-icd-app") {
+  sources = [ "main.cpp" ]
+
+  deps = [
+    "${chip_root}/examples/lit-icd-app/lit-icd-common",
+    "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/app/icd:manager",
+    "${chip_root}/src/lib",
+    "${chip_root}/third_party/jsoncpp",
+  ]
+
+  include_dirs = [ "include" ]
+
+  cflags = [ "-Wconversion" ]
+
+  output_dir = root_out_dir
+}
+
+group("linux") {
+  deps = [ ":lit-icd-app" ]
+}
+
+group("default") {
+  deps = [ ":linux" ]
+}
diff --git a/examples/resource-monitoring-app/linux/Dockerfile b/examples/lit-icd-app/linux/Dockerfile
similarity index 79%
rename from examples/resource-monitoring-app/linux/Dockerfile
rename to examples/lit-icd-app/linux/Dockerfile
index 78f41ab73a9897..0ed4d3035b6455 100644
--- a/examples/resource-monitoring-app/linux/Dockerfile
+++ b/examples/lit-icd-app/linux/Dockerfile
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2020-2021 Project CHIP Authors
+#   Copyright (c) 2020 Project CHIP Authors
 #   All rights reserved.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,9 @@
 #   limitations under the License.
 #
 
-ARG VERSION=1
-FROM connectedhomeip/chip-cirque-device-base:${VERSION}
-
-COPY out/debug/chip-resource-monitoring-app /usr/bin/
+from generic_node_image
+RUN apt-get install -y libglib2.0
+COPY out/debug/lit-icd-app /usr/bin/
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh", "server"]
diff --git a/examples/resource-monitoring-app/linux/args.gni b/examples/lit-icd-app/linux/args.gni
similarity index 83%
rename from examples/resource-monitoring-app/linux/args.gni
rename to examples/lit-icd-app/linux/args.gni
index 22c26955822720..50691e9c530522 100644
--- a/examples/resource-monitoring-app/linux/args.gni
+++ b/examples/lit-icd-app/linux/args.gni
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# CHIPProjectConfig.h
-
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/config/standalone/args.gni")
@@ -23,5 +21,10 @@ chip_project_config_include = "<CHIPProjectAppConfig.h>"
 chip_system_project_config_include = "<SystemProjectConfig.h>"
 
 chip_project_config_include_dirs =
-    [ "${chip_root}/examples/lighting-app/linux/include" ]
+    [ "${chip_root}/examples/lit-icd-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
+matter_enable_tracing_support = true
+
+# ICD configurations
+chip_enable_icd_server = true
+chip_subscription_timeout_resumption = false
diff --git a/examples/resource-monitoring-app/linux/build_overrides b/examples/lit-icd-app/linux/build_overrides
similarity index 100%
rename from examples/resource-monitoring-app/linux/build_overrides
rename to examples/lit-icd-app/linux/build_overrides
diff --git a/examples/lit-icd-app/linux/entrypoint.sh b/examples/lit-icd-app/linux/entrypoint.sh
new file mode 100755
index 00000000000000..db8bda19153e07
--- /dev/null
+++ b/examples/lit-icd-app/linux/entrypoint.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -ex
+
+service dbus start
+sleep 1
+/usr/sbin/otbr-agent -I wpan0 spinel+hdlc+uart:///dev/ttyUSB0 &
+sleep 1
+ot-ctl panid 0x1234
+ot-ctl ifconfig up
+ot-ctl thread start
+
+lit-icd-app
diff --git a/examples/resource-monitoring-app/telink/include/CHIPProjectConfig.h b/examples/lit-icd-app/linux/include/CHIPProjectAppConfig.h
similarity index 62%
rename from examples/resource-monitoring-app/telink/include/CHIPProjectConfig.h
rename to examples/lit-icd-app/linux/include/CHIPProjectAppConfig.h
index 8465c19cdd0537..60cf9dfd7324b5 100644
--- a/examples/resource-monitoring-app/telink/include/CHIPProjectConfig.h
+++ b/examples/lit-icd-app/linux/include/CHIPProjectAppConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2022 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,16 @@
 
 #pragma once
 
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+// include the CHIPProjectConfig from config/standalone
+#include <CHIPProjectConfig.h>
+
+// Allows app options (ports) to be configured on launch of app
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
+
+// Enable subscriptions synchronization
+#define CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED 1
+
+// ICD configurations
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC 3600
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS 10000
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS 1000
diff --git a/src/app/util/attribute-size-util.cpp b/examples/lit-icd-app/linux/main.cpp
similarity index 56%
rename from src/app/util/attribute-size-util.cpp
rename to examples/lit-icd-app/linux/main.cpp
index f8cf9507f11b53..1f4031af407d42 100644
--- a/src/app/util/attribute-size-util.cpp
+++ b/examples/lit-icd-app/linux/main.cpp
@@ -1,6 +1,7 @@
-/**
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,25 +16,25 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
-#include <app-common/zap-generated/attribute-type.h>
+#include "AppMain.h"
+#include <app-common/zap-generated/ids/Clusters.h>
 
 using namespace chip;
+using namespace chip::app;
 
-static const uint8_t attributeSizes[] = {
-#include <app-common/zap-generated/attribute-size.h>
-};
+void ApplicationInit() {}
 
-uint8_t emberAfGetDataSize(uint8_t dataType)
-{
-    for (unsigned i = 0; (i + 1) < sizeof(attributeSizes); i += 2)
-    {
-        if (attributeSizes[i] == dataType)
-        {
-            return attributeSizes[i + 1];
-        }
-    }
+void ApplicationShutdown() {}
 
+int main(int argc, char * argv[])
+{
+    VerifyOrDie(ChipLinuxAppInit(argc, argv) == 0);
+    ChipLinuxAppMainLoop();
     return 0;
 }
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    // TODO: Watch ICDM Cluster changes
+}
diff --git a/examples/resource-monitoring-app/linux/third_party/connectedhomeip b/examples/lit-icd-app/linux/third_party/connectedhomeip
similarity index 100%
rename from examples/resource-monitoring-app/linux/third_party/connectedhomeip
rename to examples/lit-icd-app/linux/third_party/connectedhomeip
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/BUILD.gn b/examples/lit-icd-app/lit-icd-common/BUILD.gn
similarity index 72%
rename from examples/resource-monitoring-app/resource-monitoring-common/BUILD.gn
rename to examples/lit-icd-app/lit-icd-common/BUILD.gn
index 0d33513378e9c7..a20d519c1cd7fa 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/BUILD.gn
+++ b/examples/lit-icd-app/lit-icd-common/BUILD.gn
@@ -15,18 +15,10 @@
 import("//build_overrides/chip.gni")
 import("${chip_root}/src/app/chip_data_model.gni")
 
-config("config") {
-  include_dirs = [ "include" ]
-}
-
-source_set("delegates") {
-  public_configs = [ ":config" ]
-}
-
-chip_data_model("resource-monitoring-common") {
-  zap_file = "resource-monitoring-app.zap"
+chip_data_model("lit-icd-common") {
+  zap_file = "lit-icd-server-app.zap"
 
   zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/resource-monitoring-app/zap-generated"
+      "${chip_root}/zzz_generated/lit-icd-server-app/zap-generated"
   is_server = true
 }
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
similarity index 65%
rename from examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
rename to examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index 262f2a2d2dc120..851919351de21f 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -38,86 +40,13 @@ server cluster Identify = 3 {
     int16u identifyTime = 0;
   }
 
-  request struct TriggerEffectRequest {
-    EffectIdentifierEnum effectIdentifier = 0;
-    EffectVariantEnum effectVariant = 1;
-  }
-
   command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-/** Attributes and commands for group configuration and manipulation. */
-server cluster Groups = 4 {
-  bitmap Feature : bitmap32 {
-    kGroupNames = 0x1;
-  }
-
-  bitmap NameSupportBitmap : bitmap8 {
-    kGroupNames = 0x80;
-  }
-
-  readonly attribute NameSupportBitmap nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupID = 0;
-    char_string<16> groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupID = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupID = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupID = 0;
-    char_string<16> groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    enum8 status = 0;
-    group_id groupID = 1;
-  }
-
-  response struct ViewGroupResponse = 1 {
-    enum8 status = 0;
-    group_id groupID = 1;
-    char_string<16> groupName = 2;
-  }
-
-  response struct GetGroupMembershipResponse = 2 {
-    nullable int8u capacity = 0;
-    group_id groupList[] = 1;
-  }
-
-  response struct RemoveGroupResponse = 3 {
-    enum8 status = 0;
-    group_id groupID = 1;
-  }
-
-  fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +80,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +154,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -292,14 +225,9 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<64> hardwareVersionString = 8;
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +238,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +314,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -458,52 +390,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 }
 
 /** Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing common languages, units of measurements, and numerical formatting
-      standards. As such, Nodes that visually or audibly convey information need a mechanism by which
-      they can be configured to use a user’s preferred language, units, etc */
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute char_string supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+      may have differing preferences for the units in which values are conveyed in communication to a
+      user. As such, Nodes that visually or audibly convey measurable values to the user need a
+      mechanism by which they can be configured to use a user’s preferred unit. */
+server cluster UnitLocalization = 45 {
+  revision 1;
 
-/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
-      or audibly convey time information need a mechanism by which they can be configured to use a
-      user’s preferred format. */
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : enum8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormatEnum : enum8 {
-    k12hr = 0;
-    k24hr = 1;
+  enum TempUnitEnum : enum8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
   bitmap Feature : bitmap32 {
-    kCalendarFormat = 0x1;
+    kTemperatureUnit = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
-  readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -514,6 +416,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -552,13 +456,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -578,6 +482,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -607,6 +513,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +530,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -674,6 +584,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -708,6 +621,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -724,45 +639,10 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-/** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
-server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : enum8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum StatusEnum : enum8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum TransferProtocolEnum : enum8 {
-    kResponsePayload = 0;
-    kBDX = 1;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    IntentEnum intent = 0;
-    TransferProtocolEnum requestedProtocol = 1;
-    optional char_string<32> transferFileDesignator = 2;
-  }
-
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -844,12 +724,6 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
-  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -863,45 +737,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
-  command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
-server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : bitmap32 {
-    kWatermarks = 0x1;
-  }
-
-  struct ThreadMetricsStruct {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    int64u id = 0;
-    optional char_string name = 1;
-    optional octet_string faultRecording = 2;
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
   }
 
-  readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -996,59 +844,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
   readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
   readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
@@ -1059,12 +861,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1106,7 +908,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1119,26 +921,18 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute nullable WiFiVersionEnum wiFiVersion = 2;
   readonly attribute nullable int16u channelNumber = 3;
   readonly attribute nullable int8s rssi = 4;
-  readonly attribute nullable int32u beaconLostCount = 5;
-  readonly attribute nullable int32u beaconRxCount = 6;
-  readonly attribute nullable int32u packetMulticastRxCount = 7;
-  readonly attribute nullable int32u packetMulticastTxCount = 8;
-  readonly attribute nullable int32u packetUnicastRxCount = 9;
-  readonly attribute nullable int32u packetUnicastTxCount = 10;
-  readonly attribute nullable int64u currentMaxRate = 11;
-  readonly attribute nullable int64u overrunCount = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1176,60 +970,10 @@ server cluster EthernetNetworkDiagnostics = 55 {
   command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
-/** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
-Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
-Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
-server cluster Switch = 59 {
-  bitmap Feature : bitmap32 {
-    kLatchingSwitch = 0x1;
-    kMomentarySwitch = 0x2;
-    kMomentarySwitchRelease = 0x4;
-    kMomentarySwitchLongPress = 0x8;
-    kMomentarySwitchMultiPress = 0x10;
-  }
-
-  info event SwitchLatched = 0 {
-    int8u newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    int8u newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    int8u newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    int8u previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    int8u previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    int8u newPosition = 0;
-    int8u currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    int8u previousPosition = 0;
-    int8u totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1264,17 +1008,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1391,6 +1132,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1464,6 +1207,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1480,6 +1225,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1494,92 +1241,50 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** Attributes and commands for monitoring HEPA filters in a device */
-server cluster HepaFilterMonitoring = 113 {
-  enum ChangeIndicationEnum : enum8 {
-    kOK = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum DegradationDirectionEnum : enum8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum ProductIdentifierTypeEnum : enum8 {
-    kUPC = 0;
-    kGTIN8 = 1;
-    kEAN = 2;
-    kGTIN14 = 3;
-    kOEM = 4;
-  }
+/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
+server cluster IcdManagement = 70 {
+  revision 2;
 
   bitmap Feature : bitmap32 {
-    kCondition = 0x1;
-    kWarning = 0x2;
-    kReplacementProductList = 0x4;
-  }
-
-  struct ReplacementProductStruct {
-    ProductIdentifierTypeEnum productIdentifierType = 0;
-    char_string<20> productIdentifierValue = 1;
-  }
-
-  readonly attribute percent condition = 0;
-  readonly attribute DegradationDirectionEnum degradationDirection = 1;
-  readonly attribute ChangeIndicationEnum changeIndication = 2;
-  readonly attribute boolean inPlaceIndicator = 3;
-  attribute nullable epoch_s lastChangedTime = 4;
-  readonly attribute ReplacementProductStruct replacementProductList[] = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCondition(): DefaultSuccess = 0;
-}
-
-/** Attributes and commands for monitoring activated carbon filters in a device */
-server cluster ActivatedCarbonFilterMonitoring = 114 {
-  enum ChangeIndicationEnum : enum8 {
-    kOK = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum DegradationDirectionEnum : enum8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum ProductIdentifierTypeEnum : enum8 {
-    kUPC = 0;
-    kGTIN8 = 1;
-    kEAN = 2;
-    kGTIN14 = 3;
-    kOEM = 4;
-  }
-
-  bitmap Feature : bitmap32 {
-    kCondition = 0x1;
-    kWarning = 0x2;
-    kReplacementProductList = 0x4;
-  }
-
-  struct ReplacementProductStruct {
-    ProductIdentifierTypeEnum productIdentifierType = 0;
-    char_string<20> productIdentifierValue = 1;
+    kCheckInProtocolSupport = 0x1;
+    kUserActiveModeTrigger = 0x2;
+    kLongIdleTimeSupport = 0x4;
+  }
+
+  bitmap UserActiveModeTriggerBitmap : bitmap32 {
+    kPowerCycle = 0x1;
+    kSettingsMenu = 0x2;
+    kCustomInstruction = 0x4;
+    kDeviceManual = 0x8;
+    kActuateSensor = 0x10;
+    kActuateSensorSeconds = 0x20;
+    kActuateSensorTimes = 0x40;
+    kActuateSensorLightsBlink = 0x80;
+    kResetButton = 0x100;
+    kResetButtonLightsBlink = 0x200;
+    kResetButtonSeconds = 0x400;
+    kResetButtonTimes = 0x800;
+    kSetupButton = 0x1000;
+    kSetupButtonSeconds = 0x2000;
+    kSetupButtonLightsBlink = 0x4000;
+    kSetupButtonTimes = 0x8000;
+    kAppDefinedButton = 0x10000;
+  }
+
+  fabric_scoped struct MonitoringRegistrationStruct {
+    fabric_sensitive node_id checkInNodeID = 1;
+    fabric_sensitive int64u monitoredSubject = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute percent condition = 0;
-  readonly attribute DegradationDirectionEnum degradationDirection = 1;
-  readonly attribute ChangeIndicationEnum changeIndication = 2;
-  readonly attribute boolean inPlaceIndicator = 3;
-  attribute nullable epoch_s lastChangedTime = 4;
-  readonly attribute ReplacementProductStruct replacementProductList[] = 5;
+  readonly attribute int32u idleModeDuration = 0;
+  readonly attribute int32u activeModeDuration = 1;
+  readonly attribute int16u activeModeThreshold = 2;
+  readonly attribute access(read: administer) MonitoringRegistrationStruct registeredClients[] = 3;
+  readonly attribute access(read: administer) int32u ICDCounter = 4;
+  readonly attribute int16u clientsSupportedPerFabric = 5;
+  readonly attribute UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
+  readonly attribute char_string<128> userActiveModeTriggerInstruction = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1587,92 +1292,44 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCondition(): DefaultSuccess = 0;
-}
-
-/** An interface for controlling a fan in a heating/cooling system. */
-provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : enum8 {
-    kForward = 0;
-    kReverse = 1;
+  request struct RegisterClientRequest {
+    node_id checkInNodeID = 0;
+    int64u monitoredSubject = 1;
+    octet_string<16> key = 2;
+    optional octet_string<16> verificationKey = 3;
   }
 
-  enum FanModeEnum : enum8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
+  request struct UnregisterClientRequest {
+    node_id checkInNodeID = 0;
+    optional octet_string<16> verificationKey = 1;
   }
 
-  enum FanModeSequenceEnum : enum8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+  response struct RegisterClientResponse = 1 {
+    int32u ICDCounter = 0;
   }
 
-  enum StepDirectionEnum : enum8 {
-    kIncrease = 0;
-    kDecrease = 1;
+  response struct StayActiveResponse = 4 {
+    int32u promisedActiveDuration = 0;
   }
 
-  bitmap Feature : bitmap32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
-    kStep = 0x10;
-    kAirflowDirection = 0x20;
-  }
-
-  bitmap RockBitmap : bitmap8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
-  }
-
-  bitmap WindBitmap : bitmap8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
-  }
-
-  attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
-  attribute nullable percent percentSetting = 2;
-  readonly attribute percent percentCurrent = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
+  fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
+  command access(invoke: manage) StayActiveRequest(): StayActiveResponse = 3;
 }
 
 endpoint 0 {
   device type ma_rootdevice = 22, version 1;
+  device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
 
-  server cluster Groups {
-    ram      attribute nameSupport;
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x0;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 4;
 
-    handle command AddGroup;
-    handle command AddGroupResponse;
-    handle command ViewGroup;
-    handle command ViewGroupResponse;
-    handle command GetGroupMembership;
-    handle command GetGroupMembershipResponse;
-    handle command RemoveGroup;
-    handle command RemoveGroupResponse;
-    handle command RemoveAllGroups;
-    handle command AddGroupIfIdentifying;
+    handle command Identify;
   }
 
   server cluster Descriptor {
@@ -1680,18 +1337,24 @@ endpoint 0 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
   }
 
   server cluster AccessControl {
     emits event AccessControlEntryChanged;
-    emits event AccessControlExtensionChanged;
     callback attribute acl;
     callback attribute extension;
     callback attribute subjectsPerAccessControlEntry default = 4;
     callback attribute targetsPerAccessControlEntry default = 3;
     callback attribute accessControlEntriesPerFabric default = 4;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
@@ -1699,8 +1362,6 @@ endpoint 0 {
 
   server cluster BasicInformation {
     emits event StartUp;
-    emits event ShutDown;
-    emits event Leave;
     callback attribute dataModelRevision default = 10;
     callback attribute vendorName;
     callback attribute vendorID;
@@ -1712,16 +1373,15 @@ endpoint 0 {
     callback attribute hardwareVersionString;
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
-    callback attribute manufacturingDate default = "20210614123456ZZ";
-    callback attribute partNumber;
-    callback attribute productURL;
-    callback attribute productLabel;
-    callback attribute serialNumber;
-    persist  attribute localConfigDisabled default = 0;
-    callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1738,17 +1398,11 @@ endpoint 0 {
     handle command AnnounceOTAProvider;
   }
 
-  server cluster LocalizationConfiguration {
-    persist  attribute activeLocale default = "en-US";
-    callback attribute supportedLocales;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster TimeFormatLocalization {
-    persist  attribute hourFormat default = 0;
-    persist  attribute activeCalendarType default = 0;
-    callback attribute supportedCalendarTypes;
+  server cluster UnitLocalization {
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
   }
@@ -1759,6 +1413,10 @@ endpoint 0 {
     callback attribute regulatoryConfig default = 0;
     callback attribute locationCapability default = 0;
     callback attribute supportsConcurrentConnection default = 1;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
 
@@ -1779,6 +1437,10 @@ endpoint 0 {
     ram      attribute lastNetworkingStatus;
     ram      attribute lastNetworkID;
     ram      attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 2;
     ram      attribute clusterRevision default = 1;
 
@@ -1793,42 +1455,20 @@ endpoint 0 {
     handle command ReorderNetwork;
   }
 
-  server cluster DiagnosticLogs {
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-
-    handle command RetrieveLogsRequest;
-  }
-
   server cluster GeneralDiagnostics {
-    emits event HardwareFaultChange;
-    emits event RadioFaultChange;
-    emits event NetworkFaultChange;
-    emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
-    callback attribute upTime default = 0x0000000000000000;
-    callback attribute totalOperationalHours default = 0x00000000;
-    callback attribute bootReason;
-    callback attribute activeHardwareFaults;
-    callback attribute activeRadioFaults;
-    callback attribute activeNetworkFaults;
-    callback attribute testEventTriggersEnabled default = false;
+    callback attribute testEventTriggersEnabled;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
 
     handle command TestEventTrigger;
-  }
-
-  server cluster SoftwareDiagnostics {
-    callback attribute threadMetrics;
-    callback attribute currentHeapFree default = 0x0000000000000000;
-    callback attribute currentHeapUsed default = 0x0000000000000000;
-    callback attribute currentHeapHighWatermark default = 0x0000000000000000;
-    callback attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 1;
-
-    handle command ResetWatermarks;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
@@ -1838,7 +1478,6 @@ endpoint 0 {
     callback attribute panId default = 0x0000;
     callback attribute extendedPanId default = 0x0000000000000000;
     callback attribute meshLocalPrefix;
-    callback attribute overrunCount default = 0x0000000000000000;
     callback attribute neighborTable;
     callback attribute routeTable;
     callback attribute partitionId;
@@ -1846,82 +1485,22 @@ endpoint 0 {
     callback attribute dataVersion;
     callback attribute stableDataVersion;
     callback attribute leaderRouterId;
-    callback attribute detachedRoleCount default = 0x0000;
-    callback attribute childRoleCount default = 0x0000;
-    callback attribute routerRoleCount default = 0x0000;
-    callback attribute leaderRoleCount default = 0x0000;
-    callback attribute attachAttemptCount default = 0x0000;
-    callback attribute partitionIdChangeCount default = 0x0000;
-    callback attribute betterPartitionAttachAttemptCount default = 0x0000;
-    callback attribute parentChangeCount default = 0x0000;
-    callback attribute txTotalCount default = 0x0000;
-    callback attribute txUnicastCount default = 0x0000;
-    callback attribute txBroadcastCount default = 0x0000;
-    callback attribute txAckRequestedCount default = 0x0000;
-    callback attribute txAckedCount default = 0x0000;
-    callback attribute txNoAckRequestedCount default = 0x0000;
-    callback attribute txDataCount default = 0x0000;
-    callback attribute txDataPollCount default = 0x0000;
-    callback attribute txBeaconCount default = 0x0000;
-    callback attribute txBeaconRequestCount default = 0x0000;
-    callback attribute txOtherCount default = 0x0000;
-    callback attribute txRetryCount default = 0x0000;
-    callback attribute txDirectMaxRetryExpiryCount default = 0x0000;
-    callback attribute txIndirectMaxRetryExpiryCount default = 0x0000;
-    callback attribute txErrCcaCount default = 0x0000;
-    callback attribute txErrAbortCount default = 0x0000;
-    callback attribute txErrBusyChannelCount default = 0x0000;
-    callback attribute rxTotalCount default = 0x0000;
-    callback attribute rxUnicastCount default = 0x0000;
-    callback attribute rxBroadcastCount default = 0x0000;
-    callback attribute rxDataCount default = 0x0000;
-    callback attribute rxDataPollCount default = 0x0000;
-    callback attribute rxBeaconCount default = 0x0000;
-    callback attribute rxBeaconRequestCount default = 0x0000;
-    callback attribute rxOtherCount default = 0x0000;
-    callback attribute rxAddressFilteredCount default = 0x0000;
-    callback attribute rxDestAddrFilteredCount default = 0x0000;
-    callback attribute rxDuplicatedCount default = 0x0000;
-    callback attribute rxErrNoFrameCount default = 0x0000;
-    callback attribute rxErrUnknownNeighborCount default = 0x0000;
-    callback attribute rxErrInvalidSrcAddrCount default = 0x0000;
-    callback attribute rxErrSecCount default = 0x0000;
-    callback attribute rxErrFcsCount default = 0x0000;
-    callback attribute rxErrOtherCount default = 0x0000;
-    callback attribute activeTimestamp default = 0x0000000000000000;
-    callback attribute pendingTimestamp default = 0x0000000000000000;
-    callback attribute delay default = 0x0000;
     callback attribute securityPolicy;
     callback attribute channelPage0Mask default = "0x0000";
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
-    ram      attribute featureMap default = 0x000F;
+    ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
-
-    handle command ResetCounts;
   }
 
   server cluster WiFiNetworkDiagnostics {
-    emits event Disconnection;
-    emits event AssociationFailure;
-    emits event ConnectionStatus;
     callback attribute bssid;
     callback attribute securityType;
     callback attribute wiFiVersion;
     callback attribute channelNumber default = 0x0000;
     callback attribute rssi default = 0x00;
-    callback attribute beaconLostCount default = 0x00000000;
-    callback attribute beaconRxCount default = 0x00000000;
-    callback attribute packetMulticastRxCount default = 0x00000000;
-    callback attribute packetMulticastTxCount default = 0x00000000;
-    callback attribute packetUnicastRxCount default = 0x00000000;
-    callback attribute packetUnicastTxCount default = 0x00000000;
-    callback attribute currentMaxRate default = 0x0000000000000000;
-    callback attribute overrunCount default = 0x0000000000000000;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
-
-    handle command ResetCounts;
   }
 
   server cluster EthernetNetworkDiagnostics {
@@ -1940,22 +1519,18 @@ endpoint 0 {
     handle command ResetCounts;
   }
 
-  server cluster Switch {
-    ram      attribute numberOfPositions default = 2;
-    ram      attribute currentPosition;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster AdministratorCommissioning {
     callback attribute windowStatus default = 0;
     callback attribute adminFabricIndex default = 1;
     callback attribute adminVendorId default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -1966,6 +1541,10 @@ endpoint 0 {
     callback attribute commissionedFabrics;
     callback attribute trustedRootCertificates;
     callback attribute currentFabricIndex;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
 
@@ -1988,6 +1567,10 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     callback attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
 
@@ -2010,98 +1593,28 @@ endpoint 0 {
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
   }
-}
-endpoint 1 {
-  device type ma_fan = 43, version 1;
 
-
-  server cluster Identify {
-    ram      attribute identifyTime default = 0x0;
-    ram      attribute identifyType default = 0x0;
+  server cluster IcdManagement {
+    callback attribute idleModeDuration default = 1;
+    callback attribute activeModeDuration default = 300;
+    callback attribute activeModeThreshold default = 300;
+    callback attribute registeredClients;
+    callback attribute ICDCounter default = 0;
+    callback attribute clientsSupportedPerFabric default = 2;
+    callback attribute userActiveModeTriggerHint default = 5;
+    callback attribute userActiveModeTriggerInstruction default = "This is a test";
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
+    callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
-
-    handle command Identify;
-    handle command TriggerEffect;
-  }
-
-  server cluster Groups {
-    ram      attribute nameSupport;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
-
-    handle command AddGroup;
-    handle command AddGroupResponse;
-    handle command ViewGroup;
-    handle command ViewGroupResponse;
-    handle command GetGroupMembership;
-    handle command GetGroupMembershipResponse;
-    handle command RemoveGroup;
-    handle command RemoveGroupResponse;
-    handle command RemoveAllGroups;
-    handle command AddGroupIfIdentifying;
-  }
-
-  server cluster Descriptor {
-    callback attribute deviceTypeList;
-    callback attribute serverList;
-    callback attribute clientList;
-    callback attribute partsList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    callback attribute clusterRevision default = 1;
-  }
-
-  server cluster HepaFilterMonitoring {
-    callback attribute condition;
-    callback attribute degradationDirection;
-    callback attribute changeIndication default = 0;
-    callback attribute inPlaceIndicator;
-    callback attribute lastChangedTime;
-    callback attribute replacementProductList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    callback attribute featureMap default = 7;
-    ram      attribute clusterRevision default = 1;
-
-    handle command ResetCondition;
-  }
-
-  server cluster ActivatedCarbonFilterMonitoring {
-    callback attribute condition;
-    callback attribute degradationDirection;
-    callback attribute changeIndication default = 0;
-    callback attribute inPlaceIndicator;
-    callback attribute lastChangedTime;
-    callback attribute replacementProductList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    callback attribute featureMap default = 7;
-    ram      attribute clusterRevision default = 1;
-
-    handle command ResetCondition;
-  }
+    ram      attribute featureMap default = 0x0007;
+    ram      attribute clusterRevision default = 2;
 
-  server cluster FanControl {
-    ram      attribute fanMode default = 0;
-    ram      attribute fanModeSequence default = 2;
-    ram      attribute percentSetting default = 0;
-    ram      attribute percentCurrent default = 0;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    handle command RegisterClient;
+    handle command RegisterClientResponse;
+    handle command UnregisterClient;
+    handle command StayActiveRequest;
+    handle command StayActiveResponse;
   }
 }
 
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
similarity index 65%
rename from examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
rename to examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
index f9ec6ae993d322..21f90987583de4 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
@@ -37,12 +37,18 @@
       "id": 1,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
-        "code": 22,
+        "code": 17,
         "profileId": 259,
-        "label": "MA-rootdevice",
-        "name": "MA-rootdevice"
+        "label": "MA-powersource",
+        "name": "MA-powersource"
       },
       "deviceTypes": [
+        {
+          "code": 17,
+          "profileId": 259,
+          "label": "MA-powersource",
+          "name": "MA-powersource"
+        },
         {
           "code": 22,
           "profileId": 259,
@@ -51,116 +57,62 @@
         }
       ],
       "deviceVersions": [
+        1,
         1
       ],
       "deviceIdentifiers": [
+        17,
         22
       ],
-      "deviceTypeName": "MA-rootdevice",
-      "deviceTypeCode": 22,
+      "deviceTypeName": "MA-powersource",
+      "deviceTypeCode": 17,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
-          "name": "Groups",
-          "code": 4,
+          "name": "Identify",
+          "code": 3,
           "mfgCode": null,
-          "define": "GROUPS_CLUSTER",
+          "define": "IDENTIFY_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [
             {
-              "name": "AddGroup",
+              "name": "Identify",
               "code": 0,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
-            },
+            }
+          ],
+          "attributes": [
             {
-              "name": "AddGroupResponse",
+              "name": "IdentifyTime",
               "code": 0,
               "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "ViewGroup",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
             },
             {
-              "name": "ViewGroupResponse",
+              "name": "IdentifyType",
               "code": 1,
               "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetGroupMembership",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetGroupMembershipResponse",
-              "code": 2,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveGroup",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveGroupResponse",
-              "code": 3,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveAllGroups",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddGroupIfIdentifying",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "NameSupport",
-              "code": 0,
-              "mfgCode": null,
               "side": "server",
-              "type": "NameSupportBitmap",
+              "type": "IdentifyTypeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0x0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -220,8 +172,8 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
@@ -236,8 +188,8 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
@@ -252,8 +204,8 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
@@ -268,6 +220,70 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -300,8 +316,8 @@
               "bounded": 0,
               "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             }
           ]
@@ -326,7 +342,7 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
+              "minInterval": 0,
               "maxInterval": 65534,
               "reportableChange": 0
             },
@@ -342,7 +358,7 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
+              "minInterval": 0,
               "maxInterval": 65534,
               "reportableChange": 0
             },
@@ -394,6 +410,54 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -450,13 +514,6 @@
               "mfgCode": null,
               "side": "server",
               "included": 1
-            },
-            {
-              "name": "AccessControlExtensionChanged",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
             }
           ]
         },
@@ -645,126 +702,110 @@
               "reportableChange": 0
             },
             {
-              "name": "ManufacturingDate",
-              "code": 11,
+              "name": "CapabilityMinima",
+              "code": 19,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "CapabilityMinimaStruct",
               "included": 1,
               "storageOption": "External",
-              "singleton": 1,
+              "singleton": 0,
               "bounded": 0,
-              "defaultValue": "20210614123456ZZ",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "PartNumber",
-              "code": 12,
+              "name": "SpecificationVersion",
+              "code": 21,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "int32u",
               "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ProductURL",
-              "code": 13,
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
               "mfgCode": null,
               "side": "server",
-              "type": "long_char_string",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ProductLabel",
-              "code": 14,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
             },
             {
-              "name": "SerialNumber",
-              "code": 15,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "LocalConfigDisabled",
-              "code": 16,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "NVM",
-              "singleton": 1,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "UniqueID",
-              "code": 18,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "CapabilityMinima",
-              "code": 19,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "CapabilityMinimaStruct",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
-              "singleton": 0,
+              "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
@@ -798,7 +839,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -812,20 +853,6 @@
               "mfgCode": null,
               "side": "server",
               "included": 1
-            },
-            {
-              "name": "ShutDown",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "Leave",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
             }
           ]
         },
@@ -845,14 +872,6 @@
               "isIncoming": 0,
               "isEnabled": 1
             },
-            {
-              "name": "QueryImageResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "ApplyUpdateRequest",
               "code": 2,
@@ -1037,32 +1056,16 @@
           ]
         },
         {
-          "name": "Localization Configuration",
-          "code": 43,
+          "name": "Unit Localization",
+          "code": 45,
           "mfgCode": null,
-          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "define": "UNIT_LOCALIZATION_CLUSTER",
           "side": "server",
           "enabled": 1,
           "attributes": [
             {
-              "name": "ActiveLocale",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "char_string",
-              "included": 1,
-              "storageOption": "NVM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "en-US",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SupportedLocales",
-              "code": 1,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1077,82 +1080,40 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Time Format Localization",
-          "code": 44,
-          "mfgCode": null,
-          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "HourFormat",
-              "code": 0,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "HourFormatEnum",
+              "type": "array",
               "included": 1,
-              "storageOption": "NVM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ActiveCalendarType",
-              "code": 1,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
-              "type": "CalendarTypeEnum",
+              "type": "array",
               "included": 1,
-              "storageOption": "NVM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "SupportedCalendarTypes",
-              "code": 2,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1338,6 +1299,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1583,89 +1608,101 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Diagnostic Logs",
-          "code": 50,
-          "mfgCode": null,
-          "define": "DIAGNOSTIC_LOGS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "RetrieveLogsRequest",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
+            },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
           ]
         },
         {
@@ -1683,6 +1720,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1719,43 +1772,11 @@
               "reportableChange": 0
             },
             {
-              "name": "UpTime",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "TotalOperationalHours",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "BootReason",
-              "code": 4,
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
               "mfgCode": null,
               "side": "server",
-              "type": "BootReasonEnum",
+              "type": "boolean",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1767,8 +1788,8 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveHardwareFaults",
-              "code": 5,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1783,8 +1804,8 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveRadioFaults",
-              "code": 6,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1799,8 +1820,8 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
-              "code": 7,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1815,106 +1836,8 @@
               "reportableChange": 0
             },
             {
-              "name": "TestEventTriggersEnabled",
-              "code": 8,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "false",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ],
-          "events": [
-            {
-              "name": "HardwareFaultChange",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "RadioFaultChange",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "NetworkFaultChange",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "BootReason",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            }
-          ]
-        },
-        {
-          "name": "Software Diagnostics",
-          "code": 52,
-          "mfgCode": null,
-          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetWatermarks",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "ThreadMetrics",
-              "code": 0,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1928,54 +1851,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "CurrentHeapFree",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentHeapUsed",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentHeapHighWatermark",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1983,10 +1858,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2017,16 +1892,6 @@
           "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetCounts",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
           "attributes": [
             {
               "name": "Channel",
@@ -2124,22 +1989,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "OverrunCount",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NeighborTable",
               "code": 7,
@@ -2193,7 +2042,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2209,7 +2058,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2225,7 +2074,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2253,43 +2102,27 @@
               "reportableChange": 0
             },
             {
-              "name": "DetachedRoleCount",
-              "code": 14,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ChildRoleCount",
-              "code": 15,
+              "name": "SecurityPolicy",
+              "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "RouterRoleCount",
-              "code": 16,
+              "name": "ChannelPage0Mask",
+              "code": 60,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "octet_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2301,123 +2134,133 @@
               "reportableChange": 0
             },
             {
-              "name": "LeaderRoleCount",
-              "code": 17,
+              "name": "OperationalDatasetComponents",
+              "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "AttachAttemptCount",
-              "code": 18,
+              "name": "ActiveNetworkFaultsList",
+              "code": 62,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "PartitionIdChangeCount",
-              "code": 19,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "BetterPartitionAttachAttemptCount",
-              "code": 20,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
             {
-              "name": "ParentChangeCount",
-              "code": 21,
+              "name": "BSSID",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "octet_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxTotalCount",
-              "code": 22,
+              "name": "SecurityType",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "SecurityTypeEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxUnicastCount",
-              "code": 23,
+              "name": "WiFiVersion",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "WiFiVersionEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxBroadcastCount",
-              "code": 24,
+              "name": "ChannelNumber",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2429,1863 +2272,261 @@
               "reportableChange": 0
             },
             {
-              "name": "TxAckRequestedCount",
-              "code": 25,
+              "name": "RSSI",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int8s",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxAckedCount",
-              "code": 26,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TxNoAckRequestedCount",
-              "code": 27,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
             {
-              "name": "TxDataCount",
-              "code": 28,
+              "name": "ResetCounts",
+              "code": 0,
               "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
             {
-              "name": "TxDataPollCount",
-              "code": 29,
+              "name": "PHYRate",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TxBeaconCount",
-              "code": 30,
+              "name": "FullDuplex",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "boolean",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TxBeaconRequestCount",
-              "code": 31,
+              "name": "PacketRxCount",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxOtherCount",
-              "code": 32,
+              "name": "PacketTxCount",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxRetryCount",
-              "code": 33,
+              "name": "TxErrCount",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxDirectMaxRetryExpiryCount",
-              "code": 34,
+              "name": "CollisionCount",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxIndirectMaxRetryExpiryCount",
-              "code": 35,
+              "name": "OverrunCount",
+              "code": 6,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "TxErrCcaCount",
-              "code": 36,
+              "name": "CarrierDetect",
+              "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "boolean",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TxErrAbortCount",
-              "code": 37,
+              "name": "TimeSinceReset",
+              "code": 8,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x0000000000000000",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TxErrBusyChannelCount",
-              "code": 38,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "3",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "RxTotalCount",
-              "code": 39,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxUnicastCount",
-              "code": 40,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxBroadcastCount",
-              "code": 41,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxDataCount",
-              "code": 42,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxDataPollCount",
-              "code": 43,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxBeaconCount",
-              "code": 44,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxBeaconRequestCount",
-              "code": 45,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxOtherCount",
-              "code": 46,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxAddressFilteredCount",
-              "code": 47,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxDestAddrFilteredCount",
-              "code": 48,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxDuplicatedCount",
-              "code": 49,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrNoFrameCount",
-              "code": 50,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrUnknownNeighborCount",
-              "code": 51,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrInvalidSrcAddrCount",
-              "code": 52,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrSecCount",
-              "code": 53,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrFcsCount",
-              "code": 54,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RxErrOtherCount",
-              "code": 55,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveTimestamp",
-              "code": 56,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PendingTimestamp",
-              "code": 57,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "Delay",
-              "code": 58,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SecurityPolicy",
-              "code": 59,
-              "mfgCode": null,
-              "side": "server",
-              "type": "SecurityPolicy",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ChannelPage0Mask",
-              "code": 60,
-              "mfgCode": null,
-              "side": "server",
-              "type": "octet_string",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "OperationalDatasetComponents",
-              "code": 61,
-              "mfgCode": null,
-              "side": "server",
-              "type": "OperationalDatasetComponents",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveNetworkFaultsList",
-              "code": 62,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x000F",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "WiFi Network Diagnostics",
-          "code": 54,
-          "mfgCode": null,
-          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetCounts",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "BSSID",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "octet_string",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SecurityType",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "SecurityTypeEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiFiVersion",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "WiFiVersionEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ChannelNumber",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RSSI",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8s",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "BeaconLostCount",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "BeaconRxCount",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketMulticastRxCount",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketMulticastTxCount",
-              "code": 8,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketUnicastRxCount",
-              "code": 9,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketUnicastTxCount",
-              "code": 10,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentMaxRate",
-              "code": 11,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "OverrunCount",
-              "code": 12,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "3",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ],
-          "events": [
-            {
-              "name": "Disconnection",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "AssociationFailure",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "ConnectionStatus",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            }
-          ]
-        },
-        {
-          "name": "Ethernet Network Diagnostics",
-          "code": 55,
-          "mfgCode": null,
-          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetCounts",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "PHYRate",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "PHYRateEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FullDuplex",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketRxCount",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "PacketTxCount",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "TxErrCount",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CollisionCount",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "OverrunCount",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CarrierDetect",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "TimeSinceReset",
-              "code": 8,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000000000000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "3",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Switch",
-          "code": 59,
-          "mfgCode": null,
-          "define": "SWITCH_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "NumberOfPositions",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentPosition",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Administrator Commissioning",
-          "code": 60,
-          "mfgCode": null,
-          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "OpenCommissioningWindow",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RevokeCommissioning",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "WindowStatus",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "CommissioningWindowStatusEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AdminFabricIndex",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "fabric_idx",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AdminVendorId",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "vendor_id",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Operational Credentials",
-          "code": 62,
-          "mfgCode": null,
-          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "AttestationRequest",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AttestationResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CertificateChainRequest",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "CertificateChainResponse",
-              "code": 3,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CSRRequest",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "CSRResponse",
-              "code": 5,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddNOC",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "UpdateNOC",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "NOCResponse",
-              "code": 8,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "UpdateFabricLabel",
-              "code": 9,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveFabric",
-              "code": 10,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddTrustedRootCertificate",
-              "code": 11,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "NOCs",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "Fabrics",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SupportedFabrics",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CommissionedFabrics",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "TrustedRootCertificates",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentFabricIndex",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Group Key Management",
-          "code": 63,
-          "mfgCode": null,
-          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "KeySetWrite",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetRead",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadResponse",
-              "code": 2,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetRemove",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadAllIndices",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadAllIndicesResponse",
-              "code": 5,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "GroupKeyMap",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GroupTable",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MaxGroupsPerFabric",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MaxGroupKeysPerFabric",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Fixed Label",
-          "code": 64,
-          "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": 2,
-      "name": "Anonymous Endpoint Type",
-      "deviceTypeRef": {
-        "code": 43,
-        "profileId": 259,
-        "label": "MA-fan",
-        "name": "MA-fan"
-      },
-      "deviceTypes": [
-        {
-          "code": 43,
-          "profileId": 259,
-          "label": "MA-fan",
-          "name": "MA-fan"
-        }
-      ],
-      "deviceVersions": [
-        1
-      ],
-      "deviceIdentifiers": [
-        43
-      ],
-      "deviceTypeName": "MA-fan",
-      "deviceTypeCode": 43,
-      "deviceTypeProfileId": 259,
-      "clusters": [
+              "reportableChange": 0
+            }
+          ]
+        },
         {
-          "name": "Identify",
-          "code": 3,
+          "name": "Administrator Commissioning",
+          "code": 60,
           "mfgCode": null,
-          "define": "IDENTIFY_CLUSTER",
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [
             {
-              "name": "Identify",
+              "name": "OpenCommissioningWindow",
               "code": 0,
               "mfgCode": null,
               "source": "client",
@@ -4293,8 +2534,8 @@
               "isEnabled": 1
             },
             {
-              "name": "TriggerEffect",
-              "code": 64,
+              "name": "RevokeCommissioning",
+              "code": 2,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
@@ -4303,32 +2544,48 @@
           ],
           "attributes": [
             {
-              "name": "IdentifyTime",
+              "name": "WindowStatus",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "IdentifyType",
+              "name": "AdminFabricIndex",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "IdentifyTypeEnum",
+              "type": "fabric_idx",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0",
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4366,6 +2623,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -4408,24 +2681,24 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "4",
+              "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             }
           ]
         },
         {
-          "name": "Groups",
-          "code": 4,
+          "name": "Operational Credentials",
+          "code": 62,
           "mfgCode": null,
-          "define": "GROUPS_CLUSTER",
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [
             {
-              "name": "AddGroup",
+              "name": "AttestationRequest",
               "code": 0,
               "mfgCode": null,
               "source": "client",
@@ -4433,72 +2706,88 @@
               "isEnabled": 1
             },
             {
-              "name": "AddGroupResponse",
-              "code": 0,
+              "name": "AttestationResponse",
+              "code": 1,
               "mfgCode": null,
               "source": "server",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
-              "name": "ViewGroup",
-              "code": 1,
+              "name": "CertificateChainRequest",
+              "code": 2,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
             },
             {
-              "name": "ViewGroupResponse",
-              "code": 1,
+              "name": "CertificateChainResponse",
+              "code": 3,
               "mfgCode": null,
               "source": "server",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
-              "name": "GetGroupMembership",
-              "code": 2,
+              "name": "CSRRequest",
+              "code": 4,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
             },
             {
-              "name": "GetGroupMembershipResponse",
-              "code": 2,
+              "name": "CSRResponse",
+              "code": 5,
               "mfgCode": null,
               "source": "server",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
-              "name": "RemoveGroup",
-              "code": 3,
+              "name": "AddNOC",
+              "code": 6,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
             },
             {
-              "name": "RemoveGroupResponse",
-              "code": 3,
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
               "mfgCode": null,
               "source": "server",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
-              "name": "RemoveAllGroups",
-              "code": 4,
+              "name": "UpdateFabricLabel",
+              "code": 9,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
             },
             {
-              "name": "AddGroupIfIdentifying",
-              "code": 5,
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
@@ -4507,26 +2796,10 @@
           ],
           "attributes": [
             {
-              "name": "NameSupport",
+              "name": "NOCs",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "NameSupportBitmap",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
               "type": "array",
               "included": 1,
               "storageOption": "External",
@@ -4539,8 +2812,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "Fabrics",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4550,87 +2823,45 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "AttributeList",
-              "code": 65531,
+              "name": "SupportedFabrics",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "4",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Descriptor",
-          "code": 29,
-          "mfgCode": null,
-          "define": "DESCRIPTOR_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "DeviceTypeList",
-              "code": 0,
+              "name": "CommissionedFabrics",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "ServerList",
-              "code": 1,
+              "name": "TrustedRootCertificates",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4640,16 +2871,16 @@
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "ClientList",
-              "code": 2,
+              "name": "CurrentFabricIndex",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4661,8 +2892,8 @@
               "reportableChange": 0
             },
             {
-              "name": "PartsList",
-              "code": 3,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4677,8 +2908,8 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4693,8 +2924,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4747,89 +2978,129 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             }
           ]
         },
         {
-          "name": "HEPA Filter Monitoring",
-          "code": 113,
+          "name": "Group Key Management",
+          "code": 63,
           "mfgCode": null,
-          "define": "HEPA_FILTER_MONITORING_CLUSTER",
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [
             {
-              "name": "ResetCondition",
-              "code": 0,
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
             {
-              "name": "Condition",
+              "name": "GroupKeyMap",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "percent",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "DegradationDirection",
+              "name": "GroupTable",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "DegradationDirectionEnum",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "ChangeIndication",
+              "name": "MaxGroupsPerFabric",
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "ChangeIndicationEnum",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "InPlaceIndicator",
+              "name": "MaxGroupKeysPerFabric",
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4841,24 +3112,8 @@
               "reportableChange": 0
             },
             {
-              "name": "LastChangedTime",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "epoch_s",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ReplacementProductList",
-              "code": 5,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4866,15 +3121,15 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4889,8 +3144,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -4930,7 +3185,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4943,41 +3198,31 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             }
           ]
         },
         {
-          "name": "Activated Carbon Filter Monitoring",
-          "code": 114,
+          "name": "Fixed Label",
+          "code": 64,
           "mfgCode": null,
-          "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER",
+          "define": "FIXED_LABEL_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetCondition",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
           "attributes": [
             {
-              "name": "Condition",
+              "name": "LabelList",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "percent",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4989,43 +3234,53 @@
               "reportableChange": 0
             },
             {
-              "name": "DegradationDirection",
-              "code": 1,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "DegradationDirectionEnum",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ChangeIndication",
-              "code": 2,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "ChangeIndicationEnum",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
             {
-              "name": "InPlaceIndicator",
-              "code": 3,
+              "name": "LabelList",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5037,195 +3292,236 @@
               "reportableChange": 0
             },
             {
-              "name": "LastChangedTime",
-              "code": 4,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "epoch_s",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ReplacementProductList",
-              "code": 5,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "ICD Management",
+          "code": 70,
+          "mfgCode": null,
+          "define": "ICD_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "RegisterClient",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "RegisterClientResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UnregisterClient",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "StayActiveRequest",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "StayActiveResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdleModeDuration",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int32u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "ActiveModeDuration",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int32u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "300",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "AttributeList",
-              "code": 65531,
+              "name": "ActiveModeThreshold",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "300",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "RegisteredClients",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "ICDCounter",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Fan Control",
-          "code": 514,
-          "mfgCode": null,
-          "define": "FAN_CONTROL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "apiMaturity": "provisional",
-          "attributes": [
+            },
             {
-              "name": "FanMode",
-              "code": 0,
+              "name": "ClientsSupportedPerFabric",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "FanModeEnum",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "FanModeSequence",
-              "code": 1,
+              "name": "UserActiveModeTriggerHint",
+              "code": 6,
               "mfgCode": null,
               "side": "server",
-              "type": "FanModeSequenceEnum",
+              "type": "UserActiveModeTriggerBitmap",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "5",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "PercentSetting",
-              "code": 2,
+              "name": "UserActiveModeTriggerInstruction",
+              "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "percent",
+              "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "This is a test",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "PercentCurrent",
-              "code": 3,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "percent",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -5240,8 +3536,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "EventList",
+              "code": 65530,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -5281,7 +3577,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "0x0007",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5297,7 +3593,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5315,13 +3611,6 @@
       "profileId": 259,
       "endpointId": 0,
       "networkId": 0
-    },
-    {
-      "endpointTypeName": "Anonymous Endpoint Type",
-      "endpointTypeIndex": 1,
-      "profileId": 259,
-      "endpointId": 1,
-      "networkId": 0
     }
   ],
   "log": []
diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md
index 01e2f1a189d839..7b056d2cab29b5 100644
--- a/examples/lock-app/cc13x2x7_26x2x7/README.md
+++ b/examples/lock-app/cc13x2x7_26x2x7/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -106,7 +106,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
index 45c3a1c67309cd..a230fbb8bd5fdd 100644
--- a/examples/lock-app/cc13x4_26x4/README.md
+++ b/examples/lock-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -106,7 +106,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt
index a6aded6af0065c..7efc567f107ffd 100644
--- a/examples/lock-app/esp32/main/CMakeLists.txt
+++ b/examples/lock-app/esp32/main/CMakeLists.txt
@@ -57,7 +57,6 @@ idf_component_register(INCLUDE_DIRS
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/descriptor"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fixed-label-server"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
@@ -173,7 +172,6 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fixed-label-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wifi-network-diagnostics-server"
@@ -182,7 +180,6 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
index 14d5aba533d2b1..ea8ae2417e55b7 100644
--- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
@@ -253,22 +253,6 @@ void AppTask::lockMgr_Init()
         appError(err);
     }
 
-    // Initialise WSTK buttons PB0 and PB1 (including debounce).
-    ButtonHandler::Init();
-
-    // Create FreeRTOS sw timer for Function Selection.
-    sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
-                                  1,                // == default timer period (mS)
-                                  false,            // no timer reload (==one-shot)
-                                  (void *) this,    // init timer id = app task obj context
-                                  TimerEventHandler // timer callback handler
-    );
-    if (sFunctionTimer == NULL)
-    {
-        P6_LOG("funct timer create failed");
-        appError(APP_ERROR_CREATE_TIMER_FAILED);
-    }
-
     LockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Initialize LEDs
@@ -301,6 +285,22 @@ void AppTask::Init()
         appError(CHIP_ERROR_WELL_UNINITIALIZED);
     }
 #endif
+    // Initialise WSTK buttons PB0 and PB1 (including debounce).
+    ButtonHandler::Init();
+
+    // Create FreeRTOS sw timer for Function Selection.
+    sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
+                                  1,                // == default timer period (mS)
+                                  false,            // no timer reload (==one-shot)
+                                  (void *) this,    // init timer id = app task obj context
+                                  TimerEventHandler // timer callback handler
+    );
+    if (sFunctionTimer == NULL)
+    {
+        P6_LOG("funct timer create failed");
+        appError(APP_ERROR_CREATE_TIMER_FAILED);
+    }
+
     // Register the callback to init the MDNS server when connectivity is available
     PlatformMgr().AddEventHandler(
         [](const ChipDeviceEvent * event, intptr_t arg) {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 540c85ee5f71ba..22e1b16b9cca0c 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -47,57 +49,10 @@ server cluster Identify = 3 {
   command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
-/** Attributes and commands for switching devices between 'On' and 'Off' states. */
-server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : enum8 {
-    kDelayedOffFastFade = 0;
-    kNoFade = 1;
-    kDelayedOffSlowFade = 2;
-  }
-
-  enum DyingLightEffectVariantEnum : enum8 {
-    kDyingLightFadeOff = 0;
-  }
-
-  enum EffectIdentifierEnum : enum8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum StartUpOnOffEnum : enum8 {
-    kOff = 0;
-    kOn = 1;
-    kToggle = 2;
-  }
-
-  bitmap Feature : bitmap32 {
-    kLighting = 0x1;
-    kDeadFrontBehavior = 0x2;
-  }
-
-  bitmap OnOffControlBitmap : bitmap8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
-
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
-
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -131,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -203,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -280,6 +239,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -290,6 +251,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -364,6 +327,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -442,48 +407,10 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute char_string supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  revision 1; // NOTE: Default/not specifically set
 
-/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
-      or audibly convey time information need a mechanism by which they can be configured to use a
-      user’s preferred format. */
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : enum8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormatEnum : enum8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  bitmap Feature : bitmap32 {
-    kCalendarFormat = 0x1;
-  }
-
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
-  readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
+  readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -497,6 +424,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -517,6 +446,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -735,11 +666,13 @@ server cluster PowerSource = 47 {
   readonly attribute PowerSourceStatusEnum status = 0;
   readonly attribute int8u order = 1;
   readonly attribute char_string<60> description = 2;
+  readonly attribute WiredCurrentTypeEnum wiredCurrentType = 5;
   readonly attribute nullable int32u wiredAssessedCurrent = 6;
   readonly attribute BatChargeLevelEnum batChargeLevel = 14;
   readonly attribute boolean batReplacementNeeded = 15;
   readonly attribute BatReplaceabilityEnum batReplaceability = 16;
   readonly attribute char_string<60> batReplacementDescription = 19;
+  readonly attribute int8u batQuantity = 25;
   readonly attribute endpoint_no endpointList[] = 31;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -751,6 +684,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -789,13 +724,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -815,6 +750,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -844,6 +781,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -860,11 +798,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -911,6 +852,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -945,6 +889,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -963,6 +909,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1000,6 +948,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1100,11 +1050,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1139,6 +1097,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1237,9 +1197,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1297,11 +1257,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1343,7 +1305,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1376,6 +1338,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1415,6 +1379,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1449,17 +1415,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1576,6 +1539,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1649,6 +1614,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1665,6 +1632,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1681,6 +1650,8 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
@@ -1726,6 +1697,8 @@ server cluster IcdManagement = 70 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -2373,12 +2346,14 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2406,18 +2381,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster TimeFormatLocalization {
-    persist  attribute hourFormat default = 0;
-    persist  attribute activeCalendarType default = 0;
-    callback attribute supportedCalendarTypes;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute eventList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster UnitLocalization {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
@@ -2432,6 +2395,7 @@ endpoint 0 {
     ram      attribute status default = 1;
     ram      attribute order default = 0;
     ram      attribute description default = "USB";
+    ram      attribute wiredCurrentType default = 0;
     ram      attribute wiredAssessedCurrent;
     callback attribute endpointList;
     callback attribute generatedCommandList;
@@ -2516,9 +2480,11 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2653,7 +2619,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -2744,20 +2709,6 @@ endpoint 1 {
     handle command TriggerEffect;
   }
 
-  server cluster OnOff {
-    ram      attribute onOff default = 0x00;
-    ram      attribute globalSceneControl default = 1;
-    ram      attribute onTime default = 0;
-    ram      attribute offWaitTime default = 0;
-    ram      attribute startUpOnOff;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 5;
-
-    handle command Off;
-    handle command On;
-    handle command Toggle;
-  }
-
   server cluster Descriptor {
     callback attribute deviceTypeList;
     callback attribute serverList;
@@ -2779,6 +2730,7 @@ endpoint 1 {
     ram      attribute batReplacementNeeded;
     ram      attribute batReplaceability;
     ram      attribute batReplacementDescription;
+    ram      attribute batQuantity default = 1;
     callback attribute endpointList;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index e079f41ed81adf..dfbfb05d175301 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -752,6 +752,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -842,7 +874,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1218,160 +1250,6 @@
             }
           ]
         },
-        {
-          "name": "Time Format Localization",
-          "code": 44,
-          "mfgCode": null,
-          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "HourFormat",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "HourFormatEnum",
-              "included": 1,
-              "storageOption": "NVM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveCalendarType",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "CalendarTypeEnum",
-              "included": 1,
-              "storageOption": "NVM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SupportedCalendarTypes",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Unit Localization",
           "code": 45,
@@ -1534,6 +1412,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiredCurrentTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "WiredAssessedCurrent",
               "code": 6,
@@ -2284,6 +2178,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2521,7 +2431,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2858,7 +2768,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2874,7 +2784,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2890,7 +2800,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4230,14 +4140,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -5313,154 +5215,6 @@
             }
           ]
         },
-        {
-          "name": "On/Off",
-          "code": 6,
-          "mfgCode": null,
-          "define": "ON_OFF_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "Off",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "On",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "Toggle",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "OnOff",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "GlobalSceneControl",
-              "code": 16384,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "OnTime",
-              "code": 16385,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "OffWaitTime",
-              "code": 16386,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "StartUpOnOff",
-              "code": 16387,
-              "mfgCode": null,
-              "side": "server",
-              "type": "StartUpOnOffEnum",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "5",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Descriptor",
           "code": 29,
@@ -5751,6 +5505,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "BatQuantity",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "EndpointList",
               "code": 31,
diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt
index daa594239e89b7..38e99561b3bbce 100644
--- a/examples/lock-app/nrfconnect/CMakeLists.txt
+++ b/examples/lock-app/nrfconnect/CMakeLists.txt
@@ -69,5 +69,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md
index cad3b52b0847bb..654f6988c8056f 100644
--- a/examples/lock-app/nrfconnect/README.md
+++ b/examples/lock-app/nrfconnect/README.md
@@ -253,93 +253,63 @@ NFC.
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
-
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-        $ docker pull nordicsemi/nrfconnect-chip
+### Install Command Line Tools
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+### Install Toolchain Manager
 
-    In this command:
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
+To install the Toolchain Manager app, complete the following steps:
 
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the CHIP and the nRF Connect
-    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
-    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
-    Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -347,8 +317,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 7042eb46be3fad..77aa955f0d277c 100644
--- a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,12 +14,19 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
+
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/examples/lock-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay b/examples/lock-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
index 3063fbbcdee779..2ccc13adb1ddc0 100644
--- a/examples/lock-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
+++ b/examples/lock-app/nrfconnect/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
index 624bac3c73e5aa..99ea77ee21adb9 100644
--- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
+++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
@@ -128,7 +128,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
 
     // Set FeatureMap to (kUser|kPinCredential), default is:
     // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
-    logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map");
+    logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x181), "feature map");
 
     AppTask::Instance().UpdateClusterState(BoltLockMgr().GetState(), BoltLockManager::OperationSource::kUnspecified);
 }
diff --git a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
index 7f6a313e145f87..4baa186190f638 100644
--- a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -26,7 +26,3 @@
  */
 
 #pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/lock-app/nrfconnect/prj.conf b/examples/lock-app/nrfconnect/prj.conf
index 3216fbc3190af9..a12cb1e6594024 100644
--- a/examples/lock-app/nrfconnect/prj.conf
+++ b/examples/lock-app/nrfconnect/prj.conf
@@ -38,3 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/lock-app/nrfconnect/prj_release.conf b/examples/lock-app/nrfconnect/prj_release.conf
index 6f0c11ba41dd18..24fc9cd1cbdef8 100644
--- a/examples/lock-app/nrfconnect/prj_release.conf
+++ b/examples/lock-app/nrfconnect/prj_release.conf
@@ -51,3 +51,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 9b030c237fb074..8f0ad8c10e4efa 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -153,6 +159,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -223,6 +231,8 @@ server cluster BasicInformation = 40 {
   readonly attribute int32u softwareVersion = 9;
   readonly attribute char_string<64> softwareVersionString = 10;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -233,6 +243,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -271,13 +283,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -297,6 +309,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -326,6 +340,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -342,11 +357,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -421,6 +439,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -438,6 +458,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -519,6 +541,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -532,11 +555,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -571,6 +602,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -669,9 +702,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -726,11 +759,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -771,6 +806,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -887,6 +924,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -959,6 +998,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -1468,8 +1509,10 @@ endpoint 0 {
     callback attribute softwareVersion default = 0;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1515,11 +1558,14 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index 103c17087eccfd..3d68942b6f24b0 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -504,6 +504,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -530,7 +562,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -984,6 +1016,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1019,6 +1067,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1061,7 +1125,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1377,7 +1441,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1393,7 +1457,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1409,7 +1473,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/lock-app/qpg/args.gni b/examples/lock-app/qpg/args.gni
index 9a51da863c921f..d5dcdfe217c635 100644
--- a/examples/lock-app/qpg/args.gni
+++ b/examples/lock-app/qpg/args.gni
@@ -22,6 +22,7 @@ qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_ota_requestor = true
 chip_openthread_ftd = false
 enable_sleepy_device = true
+chip_enable_icd_server = true
 
 # Disable lock tracking, since our FreeRTOS configuration does not set
 # INCLUDE_xSemaphoreGetMutexHolder
@@ -29,8 +30,6 @@ chip_stack_lock_tracking = "none"
 
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8006"
-matter_device_software_version = "0x0001"
-matter_device_software_version_string = "1.0"
 
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
diff --git a/examples/lock-app/qpg/include/AppConfig.h b/examples/lock-app/qpg/include/AppConfig.h
index 2f2cb7cd385cf3..b5947d8641bad6 100644
--- a/examples/lock-app/qpg/include/AppConfig.h
+++ b/examples/lock-app/qpg/include/AppConfig.h
@@ -23,6 +23,7 @@
 #define APP_TASK_NAME "APP"
 #define APP_LOCK_BUTTON BTN_SW4
 #define APP_FUNCTION_BUTTON BTN_SW5
+#define APP_LOCK_JAMMED_BUTTON BTN_SW1
 
 #define SYSTEM_STATE_LED LED_GREEN
 #define LOCK_STATE_LED LED_WHITE
diff --git a/examples/lock-app/qpg/include/AppTask.h b/examples/lock-app/qpg/include/AppTask.h
index 3219c5676036f9..3734eeadeef816 100644
--- a/examples/lock-app/qpg/include/AppTask.h
+++ b/examples/lock-app/qpg/include/AppTask.h
@@ -66,6 +66,7 @@ class AppTask
     static void FunctionTimerEventHandler(AppEvent * aEvent);
     static void FunctionHandler(AppEvent * aEvent);
     static void LockActionEventHandler(AppEvent * aEvent);
+    static void JammedLockEventHandler(AppEvent * aEvent);
     static void TimerEventHandler(chip::System::Layer * aLayer, void * aAppState);
 
     static void MatterEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
@@ -86,6 +87,7 @@ class AppTask
     Function_t mFunction;
     bool mFunctionTimerActive;
     bool mSyncClusterToButtonAction;
+    bool mNotifyState;
 
     chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
 
diff --git a/examples/lock-app/qpg/include/BoltLockManager.h b/examples/lock-app/qpg/include/BoltLockManager.h
index c80e3555fc8d3d..0afef972db93b4 100644
--- a/examples/lock-app/qpg/include/BoltLockManager.h
+++ b/examples/lock-app/qpg/include/BoltLockManager.h
@@ -65,8 +65,6 @@ class BoltLockManager
 
     CHIP_ERROR Init();
     bool IsUnlocked();
-    void EnableAutoRelock(bool aOn);
-    void SetAutoLockDuration(uint32_t aDurationInSecs);
     bool IsActionInProgress();
     bool InitiateAction(int32_t aActor, Action_t aAction);
 
@@ -92,15 +90,10 @@ class BoltLockManager
     Callback_fn_initiated mActionInitiated_CB;
     Callback_fn_completed mActionCompleted_CB;
 
-    bool mAutoRelock;
-    uint32_t mAutoLockDuration;
-    bool mAutoLockTimerArmed;
-
     void CancelTimer(void);
     void StartTimer(uint32_t aTimeoutMs);
 
     static void TimerEventHandler(TimerHandle_t xTimer);
-    static void AutoReLockTimerEventHandler(AppEvent * aEvent);
     static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
 
     static BoltLockManager sLock;
diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp
index 3466d8c4a4c395..8bbd6b7ce19a8a 100644
--- a/examples/lock-app/qpg/src/AppTask.cpp
+++ b/examples/lock-app/qpg/src/AppTask.cpp
@@ -260,6 +260,23 @@ void AppTask::AppTaskMain(void * pvParameter)
     }
 }
 
+void AppTask::JammedLockEventHandler(AppEvent * aEvent)
+{
+    SystemLayer().ScheduleLambda([] {
+        bool retVal;
+
+        retVal = DoorLockServer::Instance().SendLockAlarmEvent(QPG_LOCK_ENDPOINT_ID, AlarmCodeEnum::kLockJammed);
+        if (!retVal)
+        {
+            ChipLogProgress(NotSpecified, "[BTN] Lock jammed event send failed");
+        }
+        else
+        {
+            ChipLogProgress(NotSpecified, "[BTN] Lock jammed event sent");
+        }
+    });
+}
+
 void AppTask::LockActionEventHandler(AppEvent * aEvent)
 {
     bool initiated = false;
@@ -302,7 +319,7 @@ void AppTask::LockActionEventHandler(AppEvent * aEvent)
 
 void AppTask::ButtonEventHandler(uint8_t btnIdx, bool btnPressed)
 {
-    if (btnIdx != APP_LOCK_BUTTON && btnIdx != APP_FUNCTION_BUTTON)
+    if (btnIdx != APP_LOCK_BUTTON && btnIdx != APP_FUNCTION_BUTTON && btnIdx != APP_LOCK_JAMMED_BUTTON)
     {
         return;
     }
@@ -316,6 +333,10 @@ void AppTask::ButtonEventHandler(uint8_t btnIdx, bool btnPressed)
     {
         button_event.Handler = LockActionEventHandler;
     }
+    else if (btnIdx == APP_LOCK_JAMMED_BUTTON && btnPressed == true)
+    {
+        button_event.Handler = JammedLockEventHandler;
+    }
     else if (btnIdx == APP_FUNCTION_BUTTON)
     {
         // Hand off to Functionality handler - depends on duration of press
@@ -511,6 +532,11 @@ void AppTask::ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
         sAppTask.mSyncClusterToButtonAction = true;
     }
 
+    if (aActor == AppEvent::kEventType_Lock)
+    {
+        sAppTask.mNotifyState = true;
+    }
+
     qvIO_LedBlink(LOCK_STATE_LED, 50, 50);
 }
 
@@ -532,10 +558,11 @@ void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
         qvIO_LedSet(LOCK_STATE_LED, false);
     }
 
-    if (sAppTask.mSyncClusterToButtonAction)
+    if (sAppTask.mSyncClusterToButtonAction || sAppTask.mNotifyState)
     {
         sAppTask.UpdateClusterState();
         sAppTask.mSyncClusterToButtonAction = false;
+        sAppTask.mNotifyState               = false;
     }
 }
 
@@ -585,6 +612,7 @@ void AppTask::UpdateClusterState(void)
     auto newValue = BoltLockMgr().IsUnlocked() ? DoorLock::DlLockState::kUnlocked : DoorLock::DlLockState::kLocked;
 
     SystemLayer().ScheduleLambda([newValue] {
+        bool retVal = true;
         chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> currentLockState;
         chip::app::Clusters::DoorLock::Attributes::LockState::Get(QPG_LOCK_ENDPOINT_ID, currentLockState);
 
@@ -599,7 +627,17 @@ void AppTask::UpdateClusterState(void)
         else
         {
             ChipLogProgress(NotSpecified, "Updating LockState attribute");
-            if (!DoorLockServer::Instance().SetLockState(QPG_LOCK_ENDPOINT_ID, newValue))
+            if (sAppTask.mSyncClusterToButtonAction)
+            {
+                retVal = DoorLockServer::Instance().SetLockState(QPG_LOCK_ENDPOINT_ID, newValue, OperationSourceEnum::kManual);
+            }
+
+            if (retVal && sAppTask.mNotifyState)
+            {
+                retVal = DoorLockServer::Instance().SetLockState(QPG_LOCK_ENDPOINT_ID, newValue, OperationSourceEnum::kRemote);
+            }
+
+            if (!retVal)
             {
                 ChipLogError(NotSpecified, "ERR: updating DoorLock");
             }
diff --git a/examples/lock-app/qpg/src/BoltLockManager.cpp b/examples/lock-app/qpg/src/BoltLockManager.cpp
index 44bb81abaebdc8..e06c34535238c7 100644
--- a/examples/lock-app/qpg/src/BoltLockManager.cpp
+++ b/examples/lock-app/qpg/src/BoltLockManager.cpp
@@ -58,10 +58,7 @@ CHIP_ERROR BoltLockManager::Init()
         return APP_ERROR_CREATE_TIMER_FAILED;
     }
 
-    mState              = kState_LockingCompleted;
-    mAutoLockTimerArmed = false;
-    mAutoRelock         = false;
-    mAutoLockDuration   = 0;
+    mState = kState_LockingCompleted;
 
     return CHIP_NO_ERROR;
 }
@@ -82,16 +79,6 @@ bool BoltLockManager::IsUnlocked()
     return (mState == kState_UnlockingCompleted);
 }
 
-void BoltLockManager::EnableAutoRelock(bool aOn)
-{
-    mAutoRelock = aOn;
-}
-
-void BoltLockManager::SetAutoLockDuration(uint32_t aDurationInSecs)
-{
-    mAutoLockDuration = aDurationInSecs;
-}
-
 bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const
 {
     user = mUsers[userIndex - 1];
@@ -224,15 +211,6 @@ bool BoltLockManager::InitiateAction(int32_t aActor, Action_t aAction)
 
     if (action_initiated)
     {
-        if (mAutoLockTimerArmed && new_state == kState_LockingInitiated)
-        {
-            // If auto lock timer has been armed and someone initiates locking,
-            // cancel the timer and continue as normal.
-            mAutoLockTimerArmed = false;
-
-            CancelTimer();
-        }
-
         StartTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
 
         // Since the timer started successfully, update the state and trigger callback
@@ -285,35 +263,10 @@ void BoltLockManager::TimerEventHandler(TimerHandle_t xTimer)
     AppEvent event;
     event.Type               = AppEvent::kEventType_Timer;
     event.TimerEvent.Context = lock;
-    if (lock->mAutoLockTimerArmed)
-    {
-        event.Handler = AutoReLockTimerEventHandler;
-    }
-    else
-    {
-        event.Handler = ActuatorMovementTimerEventHandler;
-    }
+    event.Handler            = ActuatorMovementTimerEventHandler;
     GetAppTask().PostEvent(&event);
 }
 
-void BoltLockManager::AutoReLockTimerEventHandler(AppEvent * aEvent)
-{
-    BoltLockManager * lock = static_cast<BoltLockManager *>(aEvent->TimerEvent.Context);
-    int32_t actor          = 0;
-
-    // Make sure auto lock timer is still armed.
-    if (!lock->mAutoLockTimerArmed)
-    {
-        return;
-    }
-
-    lock->mAutoLockTimerArmed = false;
-
-    ChipLogProgress(NotSpecified, "Auto Re-Lock has been triggered!");
-
-    lock->InitiateAction(actor, LOCK_ACTION);
-}
-
 void BoltLockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
 {
     Action_t actionCompleted = INVALID_ACTION;
@@ -337,16 +290,5 @@ void BoltLockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
         {
             lock->mActionCompleted_CB(actionCompleted);
         }
-
-        if (lock->mAutoRelock && actionCompleted == UNLOCK_ACTION)
-        {
-            // Start the timer for auto relock
-            lock->StartTimer(lock->mAutoLockDuration * 1000);
-
-            lock->mAutoLockTimerArmed = true;
-
-            ChipLogProgress(NotSpecified, "Auto Re-lock enabled. Will be triggered in %" PRIu32 " seconds",
-                            lock->mAutoLockDuration);
-        }
     }
 }
diff --git a/examples/lock-app/qpg/src/ZclCallbacks.cpp b/examples/lock-app/qpg/src/ZclCallbacks.cpp
index 25a06b533c5cad..51751c43ed4058 100644
--- a/examples/lock-app/qpg/src/ZclCallbacks.cpp
+++ b/examples/lock-app/qpg/src/ZclCallbacks.cpp
@@ -40,10 +40,10 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
     switch (*value)
     {
     case to_underlying(DlLockState::kLocked):
-        BoltLockMgr().InitiateAction(0, BoltLockManager::LOCK_ACTION);
+        // BoltLockMgr().InitiateAction(0, BoltLockManager::LOCK_ACTION);
         break;
     case to_underlying(DlLockState::kUnlocked):
-        BoltLockMgr().InitiateAction(0, BoltLockManager::UNLOCK_ACTION);
+        // BoltLockMgr().InitiateAction(0, BoltLockManager::UNLOCK_ACTION);
         break;
     default:
         break;
@@ -82,9 +82,11 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const N
 {
     bool returnValue = false;
 
+    ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
+
     if (BoltLockMgr().ValidatePIN(pinCode, err))
     {
-        BoltLockMgr().InitiateAction(0, BoltLockManager::LOCK_ACTION);
+        BoltLockMgr().InitiateAction(AppEvent::kEventType_Lock, BoltLockManager::LOCK_ACTION);
         returnValue = true;
     }
 
@@ -97,9 +99,11 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const
 {
     bool returnValue = false;
 
+    ChipLogProgress(Zcl, "Door Lock App: UnLock Command endpoint=%d", endpointId);
+
     if (BoltLockMgr().ValidatePIN(pinCode, err))
     {
-        BoltLockMgr().InitiateAction(0, BoltLockManager::UNLOCK_ACTION);
+        BoltLockMgr().InitiateAction(AppEvent::kEventType_Lock, BoltLockManager::UNLOCK_ACTION);
         returnValue = true;
     }
 
@@ -123,3 +127,9 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER),
                  "number of credentials per user");
 }
+
+void emberAfPluginDoorLockOnAutoRelock(chip::EndpointId endpointId)
+{
+    // Apply the relock state in the application control
+    BoltLockMgr().InitiateAction(AppEvent::kEventType_Timer, BoltLockManager::LOCK_ACTION);
+}
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index 5b67875cce9279..e0c6c561c59bff 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +398,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -459,6 +475,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -497,13 +515,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -523,6 +541,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -552,6 +572,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -568,11 +589,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -647,6 +671,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -664,6 +690,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -708,6 +736,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -790,7 +820,6 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
   readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
   readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
   readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
@@ -808,11 +837,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -847,6 +884,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -945,9 +984,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1002,11 +1041,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1052,6 +1093,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1168,6 +1211,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1241,6 +1286,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1257,6 +1304,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1271,8 +1320,57 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
+server cluster IcdManagement = 70 {
+  revision 2;
+
+  bitmap Feature : bitmap32 {
+    kCheckInProtocolSupport = 0x1;
+    kUserActiveModeTrigger = 0x2;
+    kLongIdleTimeSupport = 0x4;
+  }
+
+  bitmap UserActiveModeTriggerBitmap : bitmap32 {
+    kPowerCycle = 0x1;
+    kSettingsMenu = 0x2;
+    kCustomInstruction = 0x4;
+    kDeviceManual = 0x8;
+    kActuateSensor = 0x10;
+    kActuateSensorSeconds = 0x20;
+    kActuateSensorTimes = 0x40;
+    kActuateSensorLightsBlink = 0x80;
+    kResetButton = 0x100;
+    kResetButtonLightsBlink = 0x200;
+    kResetButtonSeconds = 0x400;
+    kResetButtonTimes = 0x800;
+    kSetupButton = 0x1000;
+    kSetupButtonSeconds = 0x2000;
+    kSetupButtonLightsBlink = 0x4000;
+    kSetupButtonTimes = 0x8000;
+    kAppDefinedButton = 0x10000;
+  }
+
+  fabric_scoped struct MonitoringRegistrationStruct {
+    fabric_sensitive node_id checkInNodeID = 1;
+    fabric_sensitive int64u monitoredSubject = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute int32u idleModeDuration = 0;
+  readonly attribute int32u activeModeDuration = 1;
+  readonly attribute int16u activeModeThreshold = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -1813,11 +1911,13 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1901,7 +2001,6 @@ endpoint 0 {
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
     callback attribute upTime default = 0x0000000000000000;
-    callback attribute totalOperationalHours default = 0x00000000;
     callback attribute bootReason;
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
@@ -1911,9 +2010,11 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2078,6 +2179,18 @@ endpoint 0 {
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
   }
+
+  server cluster IcdManagement {
+    callback attribute idleModeDuration default = 1;
+    callback attribute activeModeDuration default = 300;
+    callback attribute activeModeThreshold default = 300;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x0001;
+    ram      attribute clusterRevision default = 2;
+  }
 }
 endpoint 1 {
   device type ma_doorlock = 10, version 1;
@@ -2128,24 +2241,6 @@ endpoint 1 {
     callback attribute clusterRevision default = 1;
   }
 
-  server cluster FixedLabel {
-    callback attribute labelList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster UserLabel {
-    callback attribute labelList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster DoorLock {
     emits event DoorLockAlarm;
     emits event DoorStateChange;
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index e66ddc5a32eac5..42c88a01cd0502 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -712,6 +712,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -786,7 +818,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1715,6 +1747,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1766,22 +1814,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "TotalOperationalHours",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00000000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "BootReason",
               "code": 4,
@@ -1936,7 +1968,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2321,7 +2353,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2337,7 +2369,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2353,7 +2385,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4061,6 +4093,160 @@
               "reportableChange": 0
             }
           ]
+        },
+        {
+          "name": "ICD Management",
+          "code": 70,
+          "mfgCode": null,
+          "define": "ICD_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "IdleModeDuration",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveModeDuration",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "300",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveModeThreshold",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "300",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
         }
       ]
     },
@@ -4573,218 +4759,6 @@
             }
           ]
         },
-        {
-          "name": "Fixed Label",
-          "code": 64,
-          "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Door Lock",
           "code": 257,
diff --git a/examples/lock-app/telink/CMakeLists.txt b/examples/lock-app/telink/CMakeLists.txt
index 10771bd371c76e..70ac496507afe7 100755
--- a/examples/lock-app/telink/CMakeLists.txt
+++ b/examples/lock-app/telink/CMakeLists.txt
@@ -76,7 +76,8 @@ add_definitions(
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/ZclCallbacks.cpp
-               src/BoltLockManager.cpp
+               src/LockManager.cpp
+               src/LockSettingsStorage.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
diff --git a/examples/lock-app/telink/include/AppConfig.h b/examples/lock-app/telink/include/AppConfig.h
index 5c5eb8819cdd68..f4b55ec79564af 100644
--- a/examples/lock-app/telink/include/AppConfig.h
+++ b/examples/lock-app/telink/include/AppConfig.h
@@ -20,6 +20,15 @@
 
 // ---- Lock Example App Config ----
 
+#define LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE 1
+#define LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS 2000
+
+#define APP_DEFAULT_USERS_COUNT 5
+#define APP_DEFAULT_CREDENTIAL_COUNT 5
+#define APP_DEFAULT_WEEKDAY_SCHEDULE_PER_USER_COUNT 5
+#define APP_DEFAULT_YEARDAY_SCHEDULE_PER_USER_COUNT 5
+#define APP_DEFAULT_HOLYDAY_SCHEDULE_PER_USER_COUNT 5
+
 #define APP_USE_EXAMPLE_START_BUTTON 1
 #define APP_USE_BLE_START_BUTTON 0
 #define APP_USE_THREAD_START_BUTTON 0
diff --git a/examples/lock-app/telink/include/AppTask.h b/examples/lock-app/telink/include/AppTask.h
index c63643ca89ca6d..d5244bb7b7728f 100644
--- a/examples/lock-app/telink/include/AppTask.h
+++ b/examples/lock-app/telink/include/AppTask.h
@@ -18,14 +18,20 @@
 
 #pragma once
 
+#include "AppConfig.h"
 #include "AppTaskCommon.h"
-#include "BoltLockManager.h"
+#include "LockManager.h"
+
+#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
+#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
+#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
+#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
+#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
+#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
+#define APP_ERROR_ALLOCATION_FAILED CHIP_APPLICATION_ERROR(0x07)
 
 class AppTask : public AppTaskCommon
 {
-public:
-    void UpdateClusterState(BoltLockManager::State state, BoltLockManager::OperationSource source);
-
 private:
     friend AppTask & GetAppTask(void);
     friend class AppTaskCommon;
@@ -33,7 +39,7 @@ class AppTask : public AppTaskCommon
     CHIP_ERROR Init(void);
 
     static void LockActionEventHandler(AppEvent * event);
-    static void LockStateChanged(BoltLockManager::State state, BoltLockManager::OperationSource source);
+    static void LockStateChanged(LockManager::State_t state);
 
     static AppTask sAppTask;
 };
diff --git a/examples/lock-app/telink/include/BoltLockManager.h b/examples/lock-app/telink/include/BoltLockManager.h
deleted file mode 100644
index 28176c9efee3b6..00000000000000
--- a/examples/lock-app/telink/include/BoltLockManager.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app/clusters/door-lock-server/door-lock-server.h>
-#include <lib/core/ClusterEnums.h>
-#include <lib/support/ScopedBuffer.h>
-
-#include <zephyr/kernel.h>
-
-#include <cstdint>
-#include <vector>
-
-// Maximum number of credentials per user supported by lock
-#define CONFIG_LOCK_NUM_CREDENTIALS_PER_USER (2)
-// Maximum number of users supported by lock
-#define CONFIG_LOCK_NUM_USERS (5)
-// Maximum number of credentials supported by lock
-#define CONFIG_LOCK_NUM_CREDENTIALS (10)
-
-struct LockCredentialInfo;
-
-#define CONFIG_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE (20)
-#define CONFIG_LOCK_CREDENTIAL_INFO_MAX_TYPES (6)
-
-class AppEvent;
-
-class BoltLockManager
-{
-public:
-    BoltLockManager() :
-        mCredentials(CONFIG_LOCK_CREDENTIAL_INFO_MAX_TYPES, std::vector<LockCredentialInfo>(CONFIG_LOCK_NUM_CREDENTIALS + 1))
-    {}
-    static constexpr size_t kMaxCredentialLength = 128;
-
-    enum class State : uint8_t
-    {
-        kLockingInitiated = 0,
-        kLockingCompleted,
-        kUnlockingInitiated,
-        kUnlockingCompleted,
-    };
-
-    struct UserData
-    {
-        char mName[DOOR_LOCK_USER_NAME_BUFFER_SIZE];
-        CredentialStruct mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER];
-    };
-
-    struct CredentialData
-    {
-        chip::Platform::ScopedMemoryBuffer<uint8_t> mSecret;
-    };
-
-    using OperationSource     = chip::app::Clusters::DoorLock::OperationSourceEnum;
-    using StateChangeCallback = void (*)(State, OperationSource);
-
-    static constexpr uint32_t kActuatorMovementTimeMs = 2000;
-
-    void Init(StateChangeCallback callback);
-
-    State GetState() const { return mState; }
-    bool IsLocked() const { return mState == State::kLockingCompleted; }
-
-    bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
-    bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, CredentialRuleEnum credentialRule,
-                 const CredentialStruct * credentials, size_t totalCredentials);
-
-    bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                       EmberAfPluginDoorLockCredentialInfo & credential) const;
-    bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                       const chip::ByteSpan & credentialData);
-
-    bool ValidatePIN(const Optional<chip::ByteSpan> & pinCode, OperationErrorEnum & err) const;
-
-    void Lock(OperationSource source);
-    void Unlock(OperationSource source);
-
-private:
-    void SetState(State state, OperationSource source);
-
-    static void ActuatorTimerEventHandler(k_timer * timer);
-    static void ActuatorAppEventHandler(const AppEvent & aEvent);
-    friend BoltLockManager & BoltLockMgr();
-
-    State mState                             = State::kLockingCompleted;
-    StateChangeCallback mStateChangeCallback = nullptr;
-    OperationSource mActuatorOperationSource = OperationSource::kButton;
-    k_timer mActuatorTimer                   = {};
-
-    UserData mUserData[CONFIG_LOCK_NUM_USERS];
-    EmberAfPluginDoorLockUserInfo mUsers[CONFIG_LOCK_NUM_USERS] = {};
-
-    struct LockCredentialInfo
-    {
-        DlCredentialStatus status;
-        CredentialTypeEnum credentialType;
-        chip::FabricIndex createdBy;
-        chip::FabricIndex modifiedBy;
-        uint8_t credentialData[CONFIG_LOCK_CREDENTIAL_INFO_MAX_TYPES];
-        size_t credentialDataSize;
-    };
-    std::vector<std::vector<LockCredentialInfo>> mCredentials;
-
-    static BoltLockManager sLock;
-};
-
-inline BoltLockManager & BoltLockMgr()
-{
-    return BoltLockManager::sLock;
-}
diff --git a/examples/lock-app/telink/include/LockManager.h b/examples/lock-app/telink/include/LockManager.h
new file mode 100644
index 00000000000000..72fbcc648216cd
--- /dev/null
+++ b/examples/lock-app/telink/include/LockManager.h
@@ -0,0 +1,228 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+#include <app/clusters/door-lock-server/door-lock-server.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <zephyr/kernel.h>
+
+#include <AppConfig.h>
+#include <AppEventCommon.h>
+
+#include <lib/core/CHIPError.h>
+
+struct WeekDaysScheduleInfo
+{
+    DlScheduleStatus status;
+    EmberAfPluginDoorLockWeekDaySchedule schedule;
+};
+
+struct YearDayScheduleInfo
+{
+    DlScheduleStatus status;
+    EmberAfPluginDoorLockYearDaySchedule schedule;
+};
+
+struct HolidayScheduleInfo
+{
+    DlScheduleStatus status;
+    EmberAfPluginDoorLockHolidaySchedule schedule;
+};
+
+namespace TelinkDoorLock {
+namespace ResourceRanges {
+// Used to size arrays
+static constexpr uint16_t kMaxUsers                  = 10;
+static constexpr uint8_t kMaxCredentialsPerUser      = 10;
+static constexpr uint8_t kMaxWeekdaySchedulesPerUser = 10;
+static constexpr uint8_t kMaxYeardaySchedulesPerUser = 10;
+static constexpr uint8_t kMaxHolidaySchedules        = 10;
+static constexpr uint8_t kMaxCredentialSize          = 20;
+static constexpr uint8_t kNumCredentialTypes         = 6;
+
+static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
+
+} // namespace ResourceRanges
+
+namespace LockInitParams {
+
+struct LockParam
+{
+    // Read from zap attributes
+    uint16_t numberOfUsers                  = 0;
+    uint8_t numberOfCredentialsPerUser      = 0;
+    uint8_t numberOfWeekdaySchedulesPerUser = 0;
+    uint8_t numberOfYeardaySchedulesPerUser = 0;
+    uint8_t numberOfHolidaySchedules        = 0;
+};
+
+class ParamBuilder
+{
+public:
+    ParamBuilder & SetNumberOfUsers(uint16_t numberOfUsers)
+    {
+        lockParam_.numberOfUsers = numberOfUsers;
+        return *this;
+    }
+    ParamBuilder & SetNumberOfCredentialsPerUser(uint8_t numberOfCredentialsPerUser)
+    {
+        lockParam_.numberOfCredentialsPerUser = numberOfCredentialsPerUser;
+        return *this;
+    }
+    ParamBuilder & SetNumberOfWeekdaySchedulesPerUser(uint8_t numberOfWeekdaySchedulesPerUser)
+    {
+        lockParam_.numberOfWeekdaySchedulesPerUser = numberOfWeekdaySchedulesPerUser;
+        return *this;
+    }
+    ParamBuilder & SetNumberOfYeardaySchedulesPerUser(uint8_t numberOfYeardaySchedulesPerUser)
+    {
+        lockParam_.numberOfYeardaySchedulesPerUser = numberOfYeardaySchedulesPerUser;
+        return *this;
+    }
+    ParamBuilder & SetNumberOfHolidaySchedules(uint8_t numberOfHolidaySchedules)
+    {
+        lockParam_.numberOfHolidaySchedules = numberOfHolidaySchedules;
+        return *this;
+    }
+    LockParam GetLockParam() { return lockParam_; }
+
+private:
+    LockParam lockParam_;
+};
+
+} // namespace LockInitParams
+} // namespace TelinkDoorLock
+
+using namespace ::chip;
+using namespace TelinkDoorLock::ResourceRanges;
+
+class LockManager
+{
+public:
+    enum Action_t
+    {
+        LOCK_ACTION = 0,
+        UNLOCK_ACTION,
+        UNBOLT_ACTION,
+
+        INVALID_ACTION
+    } Action;
+
+    enum State_t
+    {
+        kState_LockInitiated = 0,
+        kState_LockCompleted,
+        kState_UnlockInitiated,
+        kState_UnlockCompleted,
+        kState_UnlatchInitiated,
+        kState_UnlatchCompleted,
+        kState_NotFulyLocked
+    } State;
+
+    using StateChangeCallback = void (*)(State_t);
+    using OperationSource     = chip::app::Clusters::DoorLock::OperationSourceEnum;
+
+    CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
+                    TelinkDoorLock::LockInitParams::LockParam lockParam, StateChangeCallback callback);
+
+    bool LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId);
+
+    bool LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId,
+                    OperationErrorEnum & err, const Nullable<chip::FabricIndex> & fabricIdx = NullNullable,
+                    const Nullable<chip::NodeId> & nodeId = NullNullable, const Optional<chip::ByteSpan> & pinCode = NullNullable);
+
+    bool IsLocked() const { return mState == State_t::kState_LockCompleted; }
+
+    State_t getLockState() { return mState; }
+
+    bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
+    bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
+
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
+                       EmberAfPluginDoorLockCredentialInfo & credential);
+
+    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
+
+    DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                EmberAfPluginDoorLockWeekDaySchedule & schedule);
+
+    DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
+                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+
+    DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                EmberAfPluginDoorLockYearDaySchedule & schedule);
+
+    DlStatus SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
+                                uint32_t localStartTime, uint32_t localEndTime);
+
+    DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
+
+    DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
+                                uint32_t localEndTime, OperatingModeEnum operatingMode);
+
+    bool IsValidUserIndex(uint16_t userIndex);
+    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
+    bool IsValidCredentialType(CredentialTypeEnum type);
+    bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
+    bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
+    bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
+
+    const char * lockStateToString(DlLockState lockState) const;
+
+private:
+    friend LockManager & LockMgr();
+    State_t mState                           = kState_NotFulyLocked;
+    StateChangeCallback mStateChangeCallback = nullptr;
+    OperationSource mActuatorOperationSource = OperationSource::kButton;
+    k_timer mActuatorTimer                   = {};
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    bool ReadConfigValues();
+#endif
+
+    bool setLockState(chip::EndpointId endpointId, DlLockState lockState, OperationSource source, OperationErrorEnum & err,
+                      const Nullable<chip::FabricIndex> & fabricIdx, const Nullable<chip::NodeId> & nodeId,
+                      const Optional<chip::ByteSpan> & pin);
+
+    static void ActuatorTimerEventHandler(k_timer * timer);
+    static void ActuatorAppEventHandler(const AppEvent & event);
+
+    EmberAfPluginDoorLockUserInfo mLockUsers[kMaxUsers];
+    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kNumCredentialTypes][kMaxCredentials];
+    WeekDaysScheduleInfo mWeekdaySchedule[kMaxUsers][kMaxWeekdaySchedulesPerUser];
+    YearDayScheduleInfo mYeardaySchedule[kMaxUsers][kMaxYeardaySchedulesPerUser];
+    HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
+
+    char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
+    uint8_t mCredentialData[kNumCredentialTypes][kMaxCredentials][kMaxCredentialSize];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentials];
+
+    static LockManager sLock;
+    TelinkDoorLock::LockInitParams::LockParam LockParams;
+};
+
+inline LockManager & LockMgr()
+{
+    return LockManager::sLock;
+}
diff --git a/examples/lock-app/telink/include/LockSettingsStorage.h b/examples/lock-app/telink/include/LockSettingsStorage.h
new file mode 100644
index 00000000000000..5cb1773eea4040
--- /dev/null
+++ b/examples/lock-app/telink/include/LockSettingsStorage.h
@@ -0,0 +1,43 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <../Zephyr/ZephyrConfig.h>
+#include <AppConfig.h>
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+class LockSettingsStorage : ZephyrConfig
+{
+public:
+    static const ZephyrConfig::Key kConfigKey_LockUser;
+    static const ZephyrConfig::Key kConfigKey_Credential;
+    static const ZephyrConfig::Key kConfigKey_LockUserName;
+    static const ZephyrConfig::Key kConfigKey_CredentialData;
+    static const ZephyrConfig::Key kConfigKey_UserCredentials;
+    static const ZephyrConfig::Key kConfigKey_WeekDaySchedules;
+    static const ZephyrConfig::Key kConfigKey_YearDaySchedules;
+    static const ZephyrConfig::Key kConfigKey_HolidaySchedules;
+};
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
+
+#endif
diff --git a/examples/lock-app/telink/prj.conf b/examples/lock-app/telink/prj.conf
index 7b160ed7259367..738b4090c8be80 100755
--- a/examples/lock-app/telink/prj.conf
+++ b/examples/lock-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/lock-app/telink/src/AppTask.cpp b/examples/lock-app/telink/src/AppTask.cpp
index bf7fc3311cd0e8..11f8499bd5bd41 100644
--- a/examples/lock-app/telink/src/AppTask.cpp
+++ b/examples/lock-app/telink/src/AppTask.cpp
@@ -17,13 +17,20 @@
  */
 
 #include "AppTask.h"
-#include "BoltLockManager.h"
-
+#include <LockManager.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/data-model/Nullable.h>
+#include <app/server/Server.h>
+#include <credentials/FabricTable.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 using namespace ::chip::app::Clusters::DoorLock;
+using namespace chip;
+using namespace chip::app;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::DeviceLayer::Internal;
+using namespace TelinkDoorLock::LockInitParams;
 
 namespace {
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
@@ -42,10 +49,82 @@ CHIP_ERROR AppTask::Init(void)
 
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
     sLockLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios));
-    sLockLED.Set(BoltLockMgr().IsLocked());
+    sLockLED.Set(LockMgr().IsLocked());
 #endif
 
-    BoltLockMgr().Init(LockStateChanged);
+    chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;
+    chip::EndpointId endpointId{ kExampleEndpointId };
+    chip::DeviceLayer::PlatformMgr().LockChipStack();
+    chip::app::Clusters::DoorLock::Attributes::LockState::Get(endpointId, state);
+
+    uint8_t numberOfCredentialsPerUser = 0;
+    if (!DoorLockServer::Instance().GetNumberOfCredentialsSupportedPerUser(endpointId, numberOfCredentialsPerUser))
+    {
+        ChipLogError(Zcl,
+                     "Unable to get number of credentials supported per user when initializing lock endpoint, defaulting to %d "
+                     "[endpointId=%d]",
+                     APP_DEFAULT_CREDENTIAL_COUNT, endpointId);
+        numberOfCredentialsPerUser = APP_DEFAULT_CREDENTIAL_COUNT;
+    }
+
+    uint16_t numberOfUsers = 0;
+    if (!DoorLockServer::Instance().GetNumberOfUserSupported(endpointId, numberOfUsers))
+    {
+        ChipLogError(Zcl,
+                     "Unable to get number of supported users when initializing lock endpoint, defaulting to %d [endpointId=%d]",
+                     APP_DEFAULT_USERS_COUNT, endpointId);
+        numberOfUsers = APP_DEFAULT_USERS_COUNT;
+    }
+
+    uint8_t numberOfWeekdaySchedulesPerUser = 0;
+    if (!DoorLockServer::Instance().GetNumberOfWeekDaySchedulesPerUserSupported(endpointId, numberOfWeekdaySchedulesPerUser))
+    {
+        ChipLogError(
+            Zcl,
+            "Unable to get number of supported weekday schedules when initializing lock endpoint, defaulting to %d [endpointId=%d]",
+            APP_DEFAULT_WEEKDAY_SCHEDULE_PER_USER_COUNT, endpointId);
+        numberOfWeekdaySchedulesPerUser = APP_DEFAULT_WEEKDAY_SCHEDULE_PER_USER_COUNT;
+    }
+
+    uint8_t numberOfYeardaySchedulesPerUser = 0;
+    if (!DoorLockServer::Instance().GetNumberOfYearDaySchedulesPerUserSupported(endpointId, numberOfYeardaySchedulesPerUser))
+    {
+        ChipLogError(
+            Zcl,
+            "Unable to get number of supported yearday schedules when initializing lock endpoint, defaulting to %d [endpointId=%d]",
+            APP_DEFAULT_YEARDAY_SCHEDULE_PER_USER_COUNT, endpointId);
+        numberOfYeardaySchedulesPerUser = APP_DEFAULT_YEARDAY_SCHEDULE_PER_USER_COUNT;
+    }
+
+    uint8_t numberOfHolidaySchedules = 0;
+    if (!DoorLockServer::Instance().GetNumberOfHolidaySchedulesSupported(endpointId, numberOfHolidaySchedules))
+    {
+        ChipLogError(
+            Zcl,
+            "Unable to get number of supported holiday schedules when initializing lock endpoint, defaulting to %d [endpointId=%d]",
+            APP_DEFAULT_HOLYDAY_SCHEDULE_PER_USER_COUNT, endpointId);
+        numberOfHolidaySchedules = APP_DEFAULT_HOLYDAY_SCHEDULE_PER_USER_COUNT;
+    }
+
+    chip::DeviceLayer::PlatformMgr().UnlockChipStack();
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    err = LockMgr().Init(state,
+                         ParamBuilder()
+                             .SetNumberOfUsers(numberOfUsers)
+                             .SetNumberOfCredentialsPerUser(numberOfCredentialsPerUser)
+                             .SetNumberOfWeekdaySchedulesPerUser(numberOfWeekdaySchedulesPerUser)
+                             .SetNumberOfYeardaySchedulesPerUser(numberOfYeardaySchedulesPerUser)
+                             .SetNumberOfHolidaySchedules(numberOfHolidaySchedules)
+                             .GetLockParam(),
+                         LockStateChanged);
+
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("LockMgr().Init() failed");
+        return err;
+    }
 
     // Disable auto-relock time feature.
     DoorLockServer::Instance().SetAutoRelockTime(kExampleEndpointId, 0);
@@ -53,86 +132,71 @@ CHIP_ERROR AppTask::Init(void)
     return CHIP_NO_ERROR;
 }
 
+/* This is a button handler only */
 void AppTask::LockActionEventHandler(AppEvent * aEvent)
 {
-    if (BoltLockMgr().IsLocked())
+    switch (LockMgr().getLockState())
     {
-        BoltLockMgr().Unlock(BoltLockManager::OperationSource::kButton);
-    }
-    else
-    {
-        BoltLockMgr().Lock(BoltLockManager::OperationSource::kButton);
+    case LockManager::kState_NotFulyLocked:
+    case LockManager::kState_LockCompleted:
+        LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::UNLOCK_ACTION, LockManager::OperationSource::kButton,
+                             kExampleEndpointId);
+        break;
+    case LockManager::kState_UnlockCompleted:
+        LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::LOCK_ACTION, LockManager::OperationSource::kButton,
+                             kExampleEndpointId);
+        break;
+    default:
+        LOG_INF("Lock is in intermediate state, ignoring button");
+        break;
     }
 }
 
-void AppTask::LockStateChanged(BoltLockManager::State state, BoltLockManager::OperationSource source)
+void AppTask::LockStateChanged(LockManager::State_t state)
 {
     switch (state)
     {
-    case BoltLockManager::State::kLockingInitiated:
-        LOG_INF("Lock action initiated");
+    case LockManager::State_t::kState_LockInitiated:
+        LOG_INF("Callback: Lock action initiated");
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
         sLockLED.Blink(50, 50);
 #endif
         break;
-    case BoltLockManager::State::kLockingCompleted:
-        LOG_INF("Lock action completed");
+    case LockManager::State_t::kState_LockCompleted:
+        LOG_INF("Callback: Lock action completed");
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
         sLockLED.Set(true);
 #endif
         break;
-    case BoltLockManager::State::kUnlockingInitiated:
-        LOG_INF("Unlock action initiated");
+    case LockManager::State_t::kState_UnlockInitiated:
+        LOG_INF("Callback: Unlock action initiated");
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
         sLockLED.Blink(50, 50);
 #endif
         break;
-    case BoltLockManager::State::kUnlockingCompleted:
-        LOG_INF("Unlock action completed");
+    case LockManager::State_t::kState_UnlockCompleted:
+        LOG_INF("Callback: Unlock action completed");
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
         sLockLED.Set(false);
 #endif
         break;
-    }
-
-    // Handle changing attribute state in the application
-    sAppTask.UpdateClusterState(state, source);
-}
-
-void AppTask::UpdateClusterState(BoltLockManager::State state, BoltLockManager::OperationSource source)
-{
-    DlLockState newLockState;
-
-    switch (state)
-    {
-    case BoltLockManager::State::kLockingCompleted:
-        newLockState = DlLockState::kLocked;
+    case LockManager::State_t::kState_UnlatchInitiated:
+        LOG_INF("Callback: Unbolt action initiated");
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+        sLockLED.Blink(75, 25);
+#endif
         break;
-    case BoltLockManager::State::kUnlockingCompleted:
-        newLockState = DlLockState::kUnlocked;
+    case LockManager::State_t::kState_UnlatchCompleted:
+        LOG_INF("Callback: Unbolt action completed");
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+        sLockLED.Blink(25, 75);
+#endif
         break;
-    default:
-        newLockState = DlLockState::kNotFullyLocked;
+    case LockManager::State_t::kState_NotFulyLocked:
+        LOG_INF("Callback: Lock not fully locked. Unexpected state");
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+        sLockLED.Blink(10, 90);
+#endif
         break;
     }
-
-    SystemLayer().ScheduleLambda([newLockState, source] {
-        chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> currentLockState;
-        chip::app::Clusters::DoorLock::Attributes::LockState::Get(kExampleEndpointId, currentLockState);
-
-        if (currentLockState.IsNull())
-        {
-            // Initialize lock state with start value, but not invoke lock/unlock.
-            chip::app::Clusters::DoorLock::Attributes::LockState::Set(kExampleEndpointId, newLockState);
-        }
-        else
-        {
-            LOG_INF("Updating LockState attribute");
-
-            if (!DoorLockServer::Instance().SetLockState(kExampleEndpointId, newLockState, source))
-            {
-                LOG_ERR("Failed to update LockState attribute");
-            }
-        }
-    });
 }
diff --git a/examples/lock-app/telink/src/BoltLockManager.cpp b/examples/lock-app/telink/src/BoltLockManager.cpp
deleted file mode 100644
index 721fb11e427d72..00000000000000
--- a/examples/lock-app/telink/src/BoltLockManager.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "BoltLockManager.h"
-
-#include "AppConfig.h"
-#include "AppEventCommon.h"
-#include "AppTask.h"
-#include <cstring>
-
-using namespace chip;
-using chip::to_underlying;
-
-BoltLockManager BoltLockManager::sLock;
-
-void BoltLockManager::Init(StateChangeCallback callback)
-{
-    mStateChangeCallback = callback;
-
-    k_timer_init(&mActuatorTimer, &BoltLockManager::ActuatorTimerEventHandler, nullptr);
-    k_timer_user_data_set(&mActuatorTimer, this);
-}
-
-bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const
-{
-    // userIndex is guaranteed by the caller to be between 1 and CONFIG_LOCK_NUM_USERS
-    user = mUsers[userIndex - 1];
-
-    ChipLogProgress(Zcl, "Getting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    user.userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
-
-    return true;
-}
-
-bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricIndex modifier, const CharSpan & userName,
-                              uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
-                              CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
-{
-    // userIndex is guaranteed by the caller to be between 1 and CONFIG_LOCK_NUM_USERS
-    UserData & userData = mUserData[userIndex - 1];
-    auto & user         = mUsers[userIndex - 1];
-
-    VerifyOrReturnError(userName.size() <= DOOR_LOCK_MAX_USER_NAME_SIZE, false);
-    VerifyOrReturnError(totalCredentials <= CONFIG_LOCK_NUM_CREDENTIALS_PER_USER, false);
-
-    Platform::CopyString(userData.mName, userName);
-    memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(CredentialStruct));
-
-    user.userName           = CharSpan(userData.mName, userName.size());
-    user.credentials        = Span<const CredentialStruct>(userData.mCredentials, totalCredentials);
-    user.userUniqueId       = uniqueId;
-    user.userStatus         = userStatus;
-    user.userType           = userType;
-    user.credentialRule     = credentialRule;
-    user.creationSource     = DlAssetSource::kMatterIM;
-    user.createdBy          = creator;
-    user.modificationSource = DlAssetSource::kMatterIM;
-    user.lastModifiedBy     = modifier;
-
-    ChipLogProgress(Zcl, "Setting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
-
-    return true;
-}
-
-bool BoltLockManager::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                                    EmberAfPluginDoorLockCredentialInfo & credential) const
-{
-    ChipLogProgress(Zcl, "Lock App: LockEndpoint::GetCredential [credentialIndex=%u,credentialType=%u]", credentialIndex,
-                    to_underlying(credentialType));
-
-    if (to_underlying(credentialType) >= mCredentials.size())
-    {
-        ChipLogError(Zcl, "Cannot get the credential - index out of range [index=%d]", credentialIndex);
-        return false;
-    }
-
-    if (credentialIndex >= mCredentials.at(to_underlying(credentialType)).size() ||
-        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
-    {
-        ChipLogError(Zcl, "Cannot get the credential - index out of range [index=%d]", credentialIndex);
-        return false;
-    }
-
-    const auto & credentialInStorage = mCredentials[to_underlying(credentialType)][credentialIndex];
-
-    credential.status = credentialInStorage.status;
-    if (DlCredentialStatus::kAvailable == credential.status)
-    {
-        ChipLogDetail(Zcl, "Found unoccupied credential [index=%u]", credentialIndex);
-        return true;
-    }
-    credential.credentialType = credentialInStorage.credentialType;
-    credential.credentialData = chip::ByteSpan(credentialInStorage.credentialData, credentialInStorage.credentialDataSize);
-    // So far there's no way to actually create the credential outside the matter, so here we always set the creation/modification
-    // source to Matter
-    credential.creationSource     = DlAssetSource::kMatterIM;
-    credential.createdBy          = credentialInStorage.createdBy;
-    credential.modificationSource = DlAssetSource::kMatterIM;
-    credential.lastModifiedBy     = credentialInStorage.modifiedBy;
-
-    ChipLogDetail(Zcl, "Found occupied credential [index=%u,type=%u,dataSize=%u,createdBy=%u,modifiedBy=%u]", credentialIndex,
-                  to_underlying(credential.credentialType), static_cast<unsigned int>(credential.credentialData.size()),
-                  credential.createdBy, credential.lastModifiedBy);
-
-    return true;
-}
-
-bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                    DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                                    const ByteSpan & credentialData)
-{
-    ChipLogProgress(Zcl,
-                    "Lock App: LockEndpoint::SetCredential "
-                    "[credentialIndex=%u,credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%u,modifier=%u]",
-                    credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType),
-                    static_cast<unsigned int>(credentialData.size()), creator, modifier);
-
-    if (to_underlying(credentialType) >= mCredentials.capacity())
-    {
-        ChipLogError(Zcl, "Cannot set the credential - type out of range [type=%d]", to_underlying(credentialType));
-        return false;
-    }
-
-    if (credentialIndex >= mCredentials.at(to_underlying(credentialType)).size() ||
-        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
-    {
-        ChipLogError(Zcl, "Cannot set the credential - index out of range [index=%d]", credentialIndex);
-        return false;
-    }
-
-    auto & credentialInStorage = mCredentials[to_underlying(credentialType)][credentialIndex];
-    if (credentialData.size() > CONFIG_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE)
-    {
-        ChipLogError(Zcl,
-                     "Cannot get the credential - data size exceeds limit "
-                     "index=%d,dataSize=%u,maxDataSize=%u]",
-                     credentialIndex, static_cast<unsigned int>(credentialData.size()),
-                     static_cast<unsigned int>(CONFIG_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE));
-        return false;
-    }
-    credentialInStorage.status         = credentialStatus;
-    credentialInStorage.credentialType = credentialType;
-    credentialInStorage.createdBy      = creator;
-    credentialInStorage.modifiedBy     = modifier;
-    std::memcpy(credentialInStorage.credentialData, credentialData.data(), credentialData.size());
-    credentialInStorage.credentialDataSize = credentialData.size();
-
-    ChipLogProgress(Zcl, "Successfully set the credential [index=%d,credentialType=%u,creator=%u,modifier=%u]", credentialIndex,
-                    to_underlying(credentialType), credentialInStorage.createdBy, credentialInStorage.modifiedBy);
-
-    return true;
-}
-
-bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, OperationErrorEnum & err) const
-{
-    // Optionality of the PIN code is validated by the caller, so assume it is OK not to provide the PIN code.
-    if (!pinCode.HasValue())
-    {
-        return true;
-    }
-
-    // Find the credential so we can make sure it is not absent right away
-    auto & pinCredentials = mCredentials[to_underlying(CredentialTypeEnum::kPin)];
-    auto credential       = std::find_if(pinCredentials.begin(), pinCredentials.end(), [&pinCode](const LockCredentialInfo & c) {
-        return (c.status != DlCredentialStatus::kAvailable) &&
-            chip::ByteSpan{ c.credentialData, c.credentialDataSize }.data_equal(pinCode.Value());
-    });
-
-    if (credential == pinCredentials.end())
-    {
-        ChipLogDetail(Zcl, "Lock App: specified PIN code was not found in the database");
-
-        err = OperationErrorEnum::kInvalidCredential;
-        return false;
-    }
-
-    ChipLogDetail(Zcl, "Invalid lock PIN code provided");
-    err = OperationErrorEnum::kInvalidCredential;
-
-    return false;
-}
-
-void BoltLockManager::Lock(OperationSource source)
-{
-    VerifyOrReturn(mState != State::kLockingCompleted);
-    SetState(State::kLockingInitiated, source);
-
-    mActuatorOperationSource = source;
-    k_timer_start(&mActuatorTimer, K_MSEC(kActuatorMovementTimeMs), K_NO_WAIT);
-}
-
-void BoltLockManager::Unlock(OperationSource source)
-{
-    VerifyOrReturn(mState != State::kUnlockingCompleted);
-    SetState(State::kUnlockingInitiated, source);
-
-    mActuatorOperationSource = source;
-    k_timer_start(&mActuatorTimer, K_MSEC(kActuatorMovementTimeMs), K_NO_WAIT);
-}
-
-void BoltLockManager::ActuatorTimerEventHandler(k_timer * timer)
-{
-    // The timer event handler is called in the context of the system clock ISR.
-    // Post an event to the application task queue to process the event in the
-    // context of the application thread.
-
-    AppEvent event;
-    event.Type               = AppEvent::kEventType_Timer;
-    event.TimerEvent.Context = static_cast<BoltLockManager *>(k_timer_user_data_get(timer));
-    event.Handler            = (EventHandler) BoltLockManager::ActuatorAppEventHandler;
-    GetAppTask().PostEvent(&event);
-}
-
-void BoltLockManager::ActuatorAppEventHandler(const AppEvent & event)
-{
-    BoltLockManager * lock = static_cast<BoltLockManager *>(event.TimerEvent.Context);
-
-    if (!lock)
-    {
-        return;
-    }
-
-    switch (lock->mState)
-    {
-    case State::kLockingInitiated:
-        lock->SetState(State::kLockingCompleted, lock->mActuatorOperationSource);
-        break;
-    case State::kUnlockingInitiated:
-        lock->SetState(State::kUnlockingCompleted, lock->mActuatorOperationSource);
-        break;
-    default:
-        break;
-    }
-}
-
-void BoltLockManager::SetState(State state, OperationSource source)
-{
-    mState = state;
-
-    if (mStateChangeCallback != nullptr)
-    {
-        mStateChangeCallback(state, source);
-    }
-}
diff --git a/examples/lock-app/telink/src/LockManager.cpp b/examples/lock-app/telink/src/LockManager.cpp
new file mode 100644
index 00000000000000..4a7ee03c1a6bb6
--- /dev/null
+++ b/examples/lock-app/telink/src/LockManager.cpp
@@ -0,0 +1,979 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <LockManager.h>
+
+#include <AppConfig.h>
+#include <AppTask.h>
+#include <LockSettingsStorage.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <cstring>
+#include <lib/support/logging/CHIPLogging.h>
+
+LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
+
+LockManager LockManager::sLock;
+
+using namespace ::chip::DeviceLayer::Internal;
+using namespace TelinkDoorLock::LockInitParams;
+
+CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state, LockParam lockParam,
+                             StateChangeCallback callback)
+{
+    LockParams           = lockParam;
+    mStateChangeCallback = callback;
+
+    if (LockParams.numberOfUsers > kMaxUsers)
+    {
+        ChipLogError(Zcl,
+                     "Max number of users %d is greater than %d, the maximum amount of users currently supported on this platform",
+                     LockParams.numberOfUsers, kMaxUsers);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
+    if (LockParams.numberOfCredentialsPerUser > kMaxCredentialsPerUser)
+    {
+        ChipLogError(
+            Zcl,
+            "Max number of credentials per user %d is greater than %d, the maximum amount of users currently supported on this "
+            "platform",
+            LockParams.numberOfCredentialsPerUser, kMaxCredentialsPerUser);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
+    if (LockParams.numberOfWeekdaySchedulesPerUser > kMaxWeekdaySchedulesPerUser)
+    {
+        ChipLogError(
+            Zcl,
+            "Max number of schedules %d is greater than %d, the maximum amount of schedules currently supported on this platform",
+            LockParams.numberOfWeekdaySchedulesPerUser, kMaxWeekdaySchedulesPerUser);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
+    if (LockParams.numberOfYeardaySchedulesPerUser > kMaxYeardaySchedulesPerUser)
+    {
+        ChipLogError(
+            Zcl,
+            "Max number of schedules %d is greater than %d, the maximum amount of schedules currently supported on this platform",
+            LockParams.numberOfYeardaySchedulesPerUser, kMaxYeardaySchedulesPerUser);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
+    if (LockParams.numberOfHolidaySchedules > kMaxHolidaySchedules)
+    {
+        ChipLogError(
+            Zcl,
+            "Max number of schedules %d is greater than %d, the maximum amount of schedules currently supported on this platform",
+            LockParams.numberOfHolidaySchedules, kMaxHolidaySchedules);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    ReadConfigValues();
+#endif
+
+    k_timer_init(&mActuatorTimer, &LockManager::ActuatorTimerEventHandler, nullptr);
+    k_timer_user_data_set(&mActuatorTimer, this);
+
+    return CHIP_NO_ERROR;
+}
+
+/* Action related to mechanical operation. Called from button */
+bool LockManager::LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId)
+{
+    bool status = false;
+    switch (aAction)
+    {
+    case LOCK_ACTION:
+        if (mState != kState_LockCompleted)
+        {
+            mState = kState_LockInitiated;
+            status = DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, source, NullNullable, NullNullable,
+                                                             NullNullable, NullNullable);
+            if (status)
+            {
+                LOG_INF("Lock Action: Lock action initiated successfully. Waiting for actuator");
+                k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+            }
+            else
+            {
+                LOG_INF("Lock Action: Lock action failed to initiate. No action performed");
+                mState = kState_NotFulyLocked;
+            }
+            if (mStateChangeCallback)
+                mStateChangeCallback(mState);
+        }
+        else
+        {
+            LOG_INF("Lock Action: Lock is already locked. No action performed");
+        }
+        break;
+    case UNLOCK_ACTION:
+        if (mState != kState_UnlockCompleted)
+        {
+            if (DoorLockServer::Instance().SupportsUnbolt(kExampleEndpointId))
+            {
+                status = DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlatched, source, NullNullable,
+                                                                 NullNullable, NullNullable, NullNullable);
+                if (status)
+                {
+                    LOG_INF("Unlock Action: Step 1: Unbolt completed");
+                    mState = kState_UnlatchInitiated;
+                    if (mStateChangeCallback)
+                        mStateChangeCallback(mState);
+                    status = DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlocked, source, NullNullable,
+                                                                     NullNullable, NullNullable, NullNullable);
+                    if (status)
+                    {
+                        LOG_INF("Unlock Action: Step 2: Unlock completed");
+                        mState = kState_UnlockInitiated;
+                        if (mStateChangeCallback)
+                            mStateChangeCallback(mState);
+                        k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+                    }
+                    else
+                    {
+                        LOG_INF("Unlock Action: Step 2: Unlock failed. no action performed");
+                        mState = kState_NotFulyLocked;
+                    }
+                }
+                else
+                {
+                    LOG_INF("Unlock Action: Step 1: Unbolt failed. no action performed");
+                    mState = kState_NotFulyLocked;
+                }
+                if (mStateChangeCallback)
+                    mStateChangeCallback(mState);
+            }
+            else
+            {
+                status = DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlocked, source, NullNullable,
+                                                                 NullNullable, NullNullable, NullNullable);
+                if (status)
+                {
+                    LOG_INF("Unlock Action: Unlock initiated");
+                    mState = kState_UnlockInitiated;
+                    k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+                }
+                else
+                {
+                    LOG_INF("Unlock Action: Unlock failed. no action performed");
+                    mState = kState_NotFulyLocked;
+                }
+                if (mStateChangeCallback)
+                    mStateChangeCallback(mState);
+            }
+        }
+        else
+        {
+            LOG_INF("Unlock Action: Lock is already unlocked. no action performed");
+        }
+        break;
+    case UNBOLT_ACTION:
+        if (mState != kState_UnlatchCompleted)
+        {
+            status = DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlatched, source, NullNullable,
+                                                             NullNullable, NullNullable, NullNullable);
+            if (status)
+            {
+                LOG_INF("Unbolt Action: Unbolt initiated");
+                mState = kState_UnlatchInitiated;
+                k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+            }
+            else
+            {
+                LOG_INF("Unbolt Action: Unbolt failed. no action performed");
+                mState = kState_NotFulyLocked;
+            }
+            if (mStateChangeCallback)
+                mStateChangeCallback(mState);
+        }
+        else
+        {
+            LOG_INF("Unbolt Action: Lock is already in unbolt state. no action performed");
+        }
+        break;
+    default:
+        LOG_INF("Unknown lock state. no action performed");
+        mState = kState_NotFulyLocked;
+        break;
+    }
+    return status;
+}
+
+/* Action related to mechanical operation. Called from ZCL */
+bool LockManager::LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId,
+                             OperationErrorEnum & err, const Nullable<chip::FabricIndex> & fabricIdx,
+                             const Nullable<chip::NodeId> & nodeId, const Optional<chip::ByteSpan> & pinCode)
+{
+    bool status = false;
+    switch (aAction)
+    {
+    case LOCK_ACTION:
+        if (mState != kState_LockCompleted)
+        {
+            mState = kState_LockInitiated;
+            status = setLockState(kExampleEndpointId, DlLockState::kLocked, source, err, fabricIdx, nodeId, pinCode);
+            if (status)
+            {
+                LOG_INF("Lock Action: Lock action initiated successfully. Waiting for actuator");
+                k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+            }
+            else
+            {
+                LOG_INF("Lock Action: Lock action failed to initiate. No action performed");
+                mState = kState_NotFulyLocked;
+            }
+            if (mStateChangeCallback)
+                mStateChangeCallback(mState);
+        }
+        else
+        {
+            LOG_INF("Lock Action: Lock is already locked. No action performed");
+        }
+        break;
+    case UNLOCK_ACTION:
+        if (mState != kState_UnlockCompleted)
+        {
+            if (DoorLockServer::Instance().SupportsUnbolt(kExampleEndpointId))
+            {
+                status = setLockState(kExampleEndpointId, DlLockState::kUnlatched, source, err, fabricIdx, nodeId, pinCode);
+                if (status)
+                {
+                    LOG_INF("Unlock Action: Step 1: Unbolt completed");
+                    mState = kState_UnlatchInitiated;
+                    if (mStateChangeCallback)
+                        mStateChangeCallback(mState);
+                    status = setLockState(kExampleEndpointId, DlLockState::kUnlocked, source, err, fabricIdx, nodeId, pinCode);
+                    if (status)
+                    {
+                        LOG_INF("Unlock Action: Step 2: Unlock completed");
+                        mState = kState_UnlockInitiated;
+                        if (mStateChangeCallback)
+                            mStateChangeCallback(mState);
+                        k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+                    }
+                    else
+                    {
+                        LOG_INF("Unlock Action: Step 2: Unlock failed. no action performed");
+                        mState = kState_NotFulyLocked;
+                    }
+                }
+                else
+                {
+                    LOG_INF("Unlock Action: Step 1: Unbolt failed. no action performed");
+                    mState = kState_NotFulyLocked;
+                }
+                if (mStateChangeCallback)
+                    mStateChangeCallback(mState);
+            }
+            else
+            {
+                status = setLockState(kExampleEndpointId, DlLockState::kUnlocked, source, err, fabricIdx, nodeId, pinCode);
+                if (status)
+                {
+                    LOG_INF("Unlock Action: Unlock initiated");
+                    mState = kState_UnlockInitiated;
+                    k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+                }
+                else
+                {
+                    LOG_INF("Unlock Action: Unlock failed. no action performed");
+                    mState = kState_NotFulyLocked;
+                }
+                if (mStateChangeCallback)
+                    mStateChangeCallback(mState);
+            }
+        }
+        else
+        {
+            LOG_INF("Unlock Action: Lock is already unlocked. no action performed");
+        }
+        break;
+    case UNBOLT_ACTION:
+        if (mState != kState_UnlatchCompleted)
+        {
+            status = setLockState(kExampleEndpointId, DlLockState::kUnlatched, source, err, fabricIdx, nodeId, pinCode);
+            if (status)
+            {
+                LOG_INF("Unbolt Action: Unbolt initiated");
+                mState = kState_UnlatchInitiated;
+                k_timer_start(&mActuatorTimer, K_MSEC(LOCK_MANAGER_ACTUATOR_MOVEMENT_TIME_MS), K_NO_WAIT);
+            }
+            else
+            {
+                LOG_INF("Unbolt Action: Unbolt failed. no action performed");
+                mState = kState_NotFulyLocked;
+            }
+            if (mStateChangeCallback)
+                mStateChangeCallback(mState);
+        }
+        else
+        {
+            LOG_INF("Unbolt Action: Lock is already in unbolt state. no action performed");
+        }
+        break;
+    default:
+        LOG_INF("Unknown lock state. no action performed");
+        mState = kState_NotFulyLocked;
+        break;
+    }
+    return status;
+}
+
+void LockManager::ActuatorTimerEventHandler(k_timer * timer)
+{
+    // The timer event handler is called in the context of the system clock ISR.
+    // Post an event to the application task queue to process the event in the
+    // context of the application thread.
+
+    AppEvent event;
+    event.Type               = AppEvent::kEventType_Timer;
+    event.TimerEvent.Context = static_cast<LockManager *>(k_timer_user_data_get(timer));
+    event.Handler            = (EventHandler) LockManager::ActuatorAppEventHandler;
+    GetAppTask().PostEvent(&event);
+}
+
+void LockManager::ActuatorAppEventHandler(const AppEvent & event)
+{
+    LockManager * lock = static_cast<LockManager *>(event.TimerEvent.Context);
+
+    if (!lock)
+    {
+        return;
+    }
+
+    switch (lock->mState)
+    {
+    case kState_LockInitiated:
+        LOG_INF("Lock action completed");
+        lock->mState = kState_LockCompleted;
+        if (lock->mStateChangeCallback)
+            lock->mStateChangeCallback(lock->mState);
+        break;
+    case kState_UnlockInitiated:
+        LOG_INF("Unlock action completed");
+        lock->mState = kState_UnlockCompleted;
+        if (lock->mStateChangeCallback)
+            lock->mStateChangeCallback(lock->mState);
+        break;
+    case kState_UnlatchInitiated:
+        LOG_INF("Unbolt action completed");
+        lock->mState = kState_UnlatchCompleted;
+        if (lock->mStateChangeCallback)
+            lock->mStateChangeCallback(lock->mState);
+        break;
+
+    default:
+        LOG_INF("Unexpected action occures");
+        break;
+    }
+}
+
+bool LockManager::IsValidUserIndex(uint16_t userIndex)
+{
+    return (userIndex < kMaxUsers);
+}
+
+bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
+{
+    if (CredentialTypeEnum::kProgrammingPIN == type)
+    {
+        return (0 == credentialIndex); // 0 is required index for Programming PIN
+    }
+    return (credentialIndex < kMaxCredentialsPerUser);
+}
+
+bool LockManager::IsValidCredentialType(CredentialTypeEnum type)
+{
+    return (to_underlying(type) < kNumCredentialTypes);
+}
+
+bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
+{
+    return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
+}
+
+bool LockManager::IsValidYeardayScheduleIndex(uint8_t scheduleIndex)
+{
+    return (scheduleIndex < kMaxYeardaySchedulesPerUser);
+}
+
+bool LockManager::IsValidHolidayScheduleIndex(uint8_t scheduleIndex)
+{
+    return (scheduleIndex < kMaxHolidaySchedules);
+}
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+bool LockManager::ReadConfigValues()
+{
+    size_t outLen;
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUsers),
+                                     sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), outLen);
+
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
+                                     sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes, outLen);
+
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_LockUserName, reinterpret_cast<uint8_t *>(mUserNames),
+                                     sizeof(mUserNames), outLen);
+
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_CredentialData, reinterpret_cast<uint8_t *>(mCredentialData),
+                                     sizeof(mCredentialData), outLen);
+
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
+                                     sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
+                                     outLen);
+
+    ZephyrConfig::ReadConfigValueBin(
+        LockSettingsStorage::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
+        sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser * LockParams.numberOfUsers,
+        outLen);
+
+    ZephyrConfig::ReadConfigValueBin(
+        LockSettingsStorage::kConfigKey_YearDaySchedules, reinterpret_cast<uint8_t *>(mYeardaySchedule),
+        sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser * LockParams.numberOfUsers,
+        outLen);
+
+    ZephyrConfig::ReadConfigValueBin(LockSettingsStorage::kConfigKey_HolidaySchedules,
+                                     reinterpret_cast<uint8_t *>(&(mHolidaySchedule)),
+                                     sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules, outLen);
+
+    return true;
+}
+#endif
+
+bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
+{
+    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
+
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
+
+    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", endpointId, userIndex);
+
+    const auto & userInDb = mLockUsers[userIndex];
+
+    user.userStatus = userInDb.userStatus;
+    if (UserStatusEnum::kAvailable == user.userStatus)
+    {
+        ChipLogProgress(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
+        return true;
+    }
+
+    user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
+    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
+    user.userUniqueId   = userInDb.userUniqueId;
+    user.userType       = userInDb.userType;
+    user.credentialRule = userInDb.credentialRule;
+    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
+    // source to Matter
+    user.creationSource     = DlAssetSource::kMatterIM;
+    user.createdBy          = userInDb.createdBy;
+    user.modificationSource = DlAssetSource::kMatterIM;
+    user.lastModifiedBy     = userInDb.lastModifiedBy;
+
+    ChipLogProgress(Zcl,
+                    "Found occupied user "
+                    "[endpoint=%d,name=\"%.*s\",credentialsCount=%u,uniqueId=%x,type=%u,credentialRule=%u,"
+                    "createdBy=%d,lastModifiedBy=%d]",
+                    endpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
+                    user.userUniqueId, to_underlying(user.userType), to_underlying(user.credentialRule), user.createdBy,
+                    user.lastModifiedBy);
+
+    return true;
+}
+
+bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
+{
+    ChipLogProgress(Zcl,
+                    "Door Lock App: LockManager::SetUser "
+                    "[endpoint=%d,userIndex=%d,creator=%d,modifier=%d,userName=%s,uniqueId=%u "
+                    "userStatus=%u,userType=%u,credentialRule=%u,credentials=%p,totalCredentials=%u]",
+                    endpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
+                    to_underlying(usertype), to_underlying(credentialRule), credentials, totalCredentials);
+
+    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
+
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
+
+    auto & userInStorage = mLockUsers[userIndex];
+
+    if (userName.size() > DOOR_LOCK_MAX_USER_NAME_SIZE)
+    {
+        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", endpointId, userIndex);
+        return false;
+    }
+
+    if (totalCredentials > LockParams.numberOfCredentialsPerUser)
+    {
+        ChipLogError(Zcl, "Cannot set user - total number of credentials is too big [endpoint=%d,index=%d,totalCredentials=%u]",
+                     endpointId, userIndex, totalCredentials);
+        return false;
+    }
+
+    chip::Platform::CopyString(mUserNames[userIndex], userName);
+    userInStorage.userName       = chip::CharSpan(mUserNames[userIndex], userName.size());
+    userInStorage.userUniqueId   = uniqueId;
+    userInStorage.userStatus     = userStatus;
+    userInStorage.userType       = usertype;
+    userInStorage.credentialRule = credentialRule;
+    userInStorage.lastModifiedBy = modifier;
+    userInStorage.createdBy      = creator;
+
+    for (size_t i = 0; i < totalCredentials; ++i)
+    {
+        mCredentials[userIndex][i] = credentials[i];
+    }
+
+    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    // Save user information in NVM flash
+    CHIP_ERROR err =
+        ZephyrConfig::WriteConfigValueBin(LockSettingsStorage::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
+                                          sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(Zcl,
+                     "Failed to write kConfigKey_LockUser. User data will be resetted during reboot. Not enough storage space \n");
+
+    err = ZephyrConfig::WriteConfigValueBin(
+        LockSettingsStorage::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
+        sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl,
+            "Failed to write kConfigKey_UserCredentials. User data will be resetted during reboot. Not enough storage space \n");
+
+    ZephyrConfig::WriteConfigValueBin(LockSettingsStorage::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
+                                      sizeof(mUserNames));
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl, "Failed to write kConfigKey_LockUserName. User data will be resetted during reboot. Not enough storage space \n");
+#endif
+
+    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", endpointId, userIndex);
+
+    return true;
+}
+
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
+                                EmberAfPluginDoorLockCredentialInfo & credential)
+{
+
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
+                            false); // programming pin index is only index allowed to contain 0
+    }
+    else
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
+    }
+
+    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
+                    to_underlying(credentialType), credentialIndex);
+
+    const auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex];
+
+    credential.status = credentialInStorage.status;
+    ChipLogProgress(Zcl, "CredentialStatus: %d, CredentialIndex: %d ", (int) credential.status, credentialIndex);
+
+    if (DlCredentialStatus::kAvailable == credential.status)
+    {
+        ChipLogProgress(Zcl, "Found unoccupied credential ");
+        return true;
+    }
+    credential.credentialType = credentialInStorage.credentialType;
+    credential.credentialData = credentialInStorage.credentialData;
+    credential.createdBy      = credentialInStorage.createdBy;
+    credential.lastModifiedBy = credentialInStorage.lastModifiedBy;
+    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
+    // source to Matter
+    credential.creationSource     = DlAssetSource::kMatterIM;
+    credential.modificationSource = DlAssetSource::kMatterIM;
+
+    ChipLogProgress(Zcl, "Found occupied credential [type=%u,dataSize=%u]", to_underlying(credential.credentialType),
+                    credential.credentialData.size());
+
+    return true;
+}
+
+bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                                const chip::ByteSpan & credentialData)
+{
+
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
+                            false); // programming pin index is only index allowed to contain 0
+    }
+    else
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
+    }
+
+    ChipLogProgress(Zcl,
+                    "Door Lock App: LockManager::SetCredential "
+                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%d,modifier=%d]",
+                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size(), creator, modifier);
+
+    auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex];
+
+    credentialInStorage.status         = credentialStatus;
+    credentialInStorage.credentialType = credentialType;
+    credentialInStorage.createdBy      = creator;
+    credentialInStorage.lastModifiedBy = modifier;
+
+    memcpy(mCredentialData[to_underlying(credentialType)][credentialIndex], credentialData.data(), credentialData.size());
+    credentialInStorage.credentialData =
+        chip::ByteSpan{ mCredentialData[to_underlying(credentialType)][credentialIndex], credentialData.size() };
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    // Save credential information in NVM flash
+    CHIP_ERROR err = ZephyrConfig::WriteConfigValueBin(
+        LockSettingsStorage::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&mLockCredentials),
+        sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl, "Failed to write kConfigKey_Credential. User data will be resetted during reboot. Not enough storage space \n");
+
+    err = ZephyrConfig::WriteConfigValueBin(LockSettingsStorage::kConfigKey_CredentialData,
+                                            reinterpret_cast<const uint8_t *>(&mCredentialData), sizeof(mCredentialData));
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl,
+            "Failed to write kConfigKey_CredentialData. User data will be resetted during reboot. Not enough storage space \n");
+#endif
+
+    ChipLogProgress(Zcl, "Successfully set the credential [credentialType=%u]", to_underlying(credentialType));
+
+    return true;
+}
+
+DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                         EmberAfPluginDoorLockWeekDaySchedule & schedule)
+{
+
+    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
+
+    weekdayIndex--;
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
+
+    const auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
+    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
+    {
+        return DlStatus::kNotFound;
+    }
+
+    schedule = scheduleInStorage.schedule;
+
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                         uint8_t endHour, uint8_t endMinute)
+{
+
+    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
+
+    weekdayIndex--;
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
+
+    auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
+
+    scheduleInStorage.schedule.daysMask    = daysMask;
+    scheduleInStorage.schedule.startHour   = startHour;
+    scheduleInStorage.schedule.startMinute = startMinute;
+    scheduleInStorage.schedule.endHour     = endHour;
+    scheduleInStorage.schedule.endMinute   = endMinute;
+    scheduleInStorage.status               = status;
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    // Save schedule information in NVM flash
+    CHIP_ERROR err = ZephyrConfig::WriteConfigValueBin(
+        LockSettingsStorage::kConfigKey_WeekDaySchedules, reinterpret_cast<const uint8_t *>(mWeekdaySchedule),
+        sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser * LockParams.numberOfUsers);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl,
+            "Failed to write kConfigKey_WeekDaySchedules. User data will be resetted during reboot. Not enough storage space \n");
+#endif
+
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockManager::GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                         EmberAfPluginDoorLockYearDaySchedule & schedule)
+{
+    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
+
+    yearDayIndex--;
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
+
+    const auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
+    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
+    {
+        return DlStatus::kNotFound;
+    }
+
+    schedule = scheduleInStorage.schedule;
+
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockManager::SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                         DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
+{
+    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
+
+    yearDayIndex--;
+    userIndex--;
+
+    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
+    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
+
+    auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
+
+    scheduleInStorage.schedule.localStartTime = localStartTime;
+    scheduleInStorage.schedule.localEndTime   = localEndTime;
+    scheduleInStorage.status                  = status;
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    // Save schedule information in NVM flash
+    CHIP_ERROR err = ZephyrConfig::WriteConfigValueBin(
+        LockSettingsStorage::kConfigKey_YearDaySchedules, reinterpret_cast<const uint8_t *>(mYeardaySchedule),
+        sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser * LockParams.numberOfUsers);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl,
+            "Failed to write kConfigKey_YearDaySchedules. User data will be resetted during reboot. Not enough storage space \n");
+#endif
+
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
+                                         EmberAfPluginDoorLockHolidaySchedule & schedule)
+{
+    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+
+    holidayIndex--;
+
+    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
+
+    const auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
+    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
+    {
+        return DlStatus::kNotFound;
+    }
+
+    schedule = scheduleInStorage.schedule;
+
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
+{
+    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
+
+    holidayIndex--;
+
+    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
+
+    auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
+
+    scheduleInStorage.schedule.localStartTime = localStartTime;
+    scheduleInStorage.schedule.localEndTime   = localEndTime;
+    scheduleInStorage.schedule.operatingMode  = operatingMode;
+    scheduleInStorage.status                  = status;
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+    // Save schedule information in NVM flash
+    CHIP_ERROR err = ZephyrConfig::WriteConfigValueBin(
+        LockSettingsStorage::kConfigKey_HolidaySchedules, reinterpret_cast<const uint8_t *>(&(mHolidaySchedule)),
+        sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules);
+    if (err != CHIP_NO_ERROR)
+        ChipLogError(
+            Zcl,
+            "Failed to write kConfigKey_YearDaySchedules. User data will be resetted during reboot. Not enough storage space \n");
+#endif
+
+    return DlStatus::kSuccess;
+}
+
+const char * LockManager::lockStateToString(DlLockState lockState) const
+{
+    switch (lockState)
+    {
+    case DlLockState::kNotFullyLocked:
+        return "Not Fully Locked";
+    case DlLockState::kLocked:
+        return "Locked";
+    case DlLockState::kUnlocked:
+        return "Unlocked";
+    case DlLockState::kUnlatched:
+        return "Unlatched";
+    case DlLockState::kUnknownEnumValue:
+        break;
+    }
+
+    return "Unknown";
+}
+
+bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, OperationSource source, OperationErrorEnum & err,
+                               const Nullable<chip::FabricIndex> & fabricIdx, const Nullable<chip::NodeId> & nodeId,
+                               const Optional<chip::ByteSpan> & pin)
+{
+    // Assume pin is required until told otherwise
+    bool requirePin          = true;
+    uint16_t userIndex       = 0;
+    uint16_t credentialIndex = 0;
+    chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::Get(endpointId, &requirePin);
+
+    // If a pin code is not given
+    if (!pin.HasValue())
+    {
+        ChipLogProgress(Zcl, "Door Lock App: PIN code is not specified [endpointId=%d]", endpointId);
+
+        // If a pin code is not required
+        if (!requirePin)
+        {
+            ChipLogProgress(Zcl, "Door Lock App: setting door lock state to \"%s\" [endpointId=%d]", lockStateToString(lockState),
+                            endpointId);
+
+            DoorLockServer::Instance().SetLockState(endpointId, lockState, source, NullNullable, NullNullable, fabricIdx, nodeId);
+
+            return true;
+        }
+
+        ChipLogError(Zcl, "Door Lock App: PIN code is not specified, but it is required [endpointId=%d]", endpointId);
+        err = OperationErrorEnum::kRestricted;
+        return false;
+    }
+    // Check the PIN code
+    for (const auto & currentCredential : mLockCredentials[to_underlying(CredentialTypeEnum::kPin)])
+    {
+        if (currentCredential.status == DlCredentialStatus::kAvailable)
+        {
+            continue;
+        }
+
+        if (currentCredential.credentialData.data_equal(pin.Value()))
+        {
+
+            for (uint16_t i = 1; i <= kMaxUsers; ++i)
+            {
+                EmberAfPluginDoorLockUserInfo user;
+                if (!emberAfPluginDoorLockGetUser(endpointId, i, user))
+                {
+                    ChipLogError(Zcl, "[setLockState] Unable to get user: app error [userIndex=%d]", i);
+                    err = OperationErrorEnum::kInvalidCredential;
+                    return false;
+                }
+
+                // Go through occupied users only
+                if (UserStatusEnum::kAvailable == user.userStatus)
+                {
+                    continue;
+                }
+
+                for (const auto & credential : user.credentials)
+                {
+                    if (credential.credentialType != CredentialTypeEnum::kPin)
+                    {
+                        continue;
+                    }
+
+                    EmberAfPluginDoorLockCredentialInfo credentialInfo;
+                    if (!emberAfPluginDoorLockGetCredential(endpointId, credential.credentialIndex, CredentialTypeEnum::kPin,
+                                                            credentialInfo))
+                    {
+                        ChipLogError(Zcl,
+                                     "[setLockState] Unable to get credential: app error "
+                                     "[userIndex=%d,credentialIndex=%d,credentialType=%u]",
+                                     i, credential.credentialIndex, to_underlying(CredentialTypeEnum::kPin));
+                        err = OperationErrorEnum::kInvalidCredential;
+                        return false;
+                    }
+
+                    if (credentialInfo.status != DlCredentialStatus::kOccupied)
+                    {
+                        ChipLogError(Zcl,
+                                     "[setLockState] Users/Credentials database error: credential index attached to user is "
+                                     "not occupied "
+                                     "[userIndex=%d,credentialIndex=%d,credentialType=%u]",
+                                     i, credential.credentialIndex, to_underlying(CredentialTypeEnum::kPin));
+                        err = OperationErrorEnum::kInvalidCredential;
+                        return false;
+                    }
+
+                    if (credentialInfo.credentialData.data_equal(currentCredential.credentialData))
+                    {
+                        userIndex       = i;
+                        credentialIndex = credential.credentialIndex;
+                        ChipLogProgress(
+                            Zcl,
+                            "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
+                            lockStateToString(lockState), endpointId);
+
+                        LockOpCredentials userCredential[] = { { CredentialTypeEnum::kPin, credentialIndex } };
+                        auto userCredentials = chip::app::DataModel::MakeNullable<List<const LockOpCredentials>>(userCredential);
+
+                        DoorLockServer::Instance().SetLockState(
+                            endpointId, lockState, source, chip::app::DataModel::MakeNullable(static_cast<uint16_t>(userIndex)),
+                            userCredentials, fabricIdx, nodeId);
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+
+    ChipLogProgress(Zcl,
+                    "Door Lock App: specified PIN code was not found in the database, ignoring command to set lock state to \"%s\" "
+                    "[endpointId=%d]",
+                    lockStateToString(lockState), endpointId);
+
+    err = OperationErrorEnum::kInvalidCredential;
+    return false;
+}
diff --git a/examples/lock-app/telink/src/LockSettingsStorage.cpp b/examples/lock-app/telink/src/LockSettingsStorage.cpp
new file mode 100644
index 00000000000000..abe83ced65357e
--- /dev/null
+++ b/examples/lock-app/telink/src/LockSettingsStorage.cpp
@@ -0,0 +1,49 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <LockSettingsStorage.h>
+#include <lib/core/CHIPConfig.h>
+
+#include <zephyr/settings/settings.h>
+
+#if LOCK_MANAGER_CONFIG_USE_NVM_CREDENTIAL_STORAGE
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+#define CONFIG_KEY(key)                                                                                                            \
+    (key);                                                                                                                         \
+    static_assert(sizeof(key) <= SETTINGS_MAX_NAME_LEN, "Config key too long: " key)
+
+#define NAMESPACE_CONFIG CHIP_DEVICE_CONFIG_SETTINGS_KEY "/cfg/"
+
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_LockUser         = CONFIG_KEY(NAMESPACE_CONFIG "lock-user");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_Credential       = CONFIG_KEY(NAMESPACE_CONFIG "credential");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_LockUserName     = CONFIG_KEY(NAMESPACE_CONFIG "lock-user-name");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_CredentialData   = CONFIG_KEY(NAMESPACE_CONFIG "credential-data");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_UserCredentials  = CONFIG_KEY(NAMESPACE_CONFIG "user-credentials");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_WeekDaySchedules = CONFIG_KEY(NAMESPACE_CONFIG "week-day-schedules");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_YearDaySchedules = CONFIG_KEY(NAMESPACE_CONFIG "year-day-schedules");
+const ZephyrConfig::Key LockSettingsStorage::kConfigKey_HolidaySchedules = CONFIG_KEY(NAMESPACE_CONFIG "holiday-schedules");
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
+#endif
diff --git a/examples/lock-app/telink/src/ZclCallbacks.cpp b/examples/lock-app/telink/src/ZclCallbacks.cpp
index 327db43125a035..7eaf0b303fd697 100644
--- a/examples/lock-app/telink/src/ZclCallbacks.cpp
+++ b/examples/lock-app/telink/src/ZclCallbacks.cpp
@@ -16,119 +16,159 @@
  *    limitations under the License.
  */
 
-#include "AppTask.h"
-#include "BoltLockManager.h"
+/**
+ * @file
+ *   This file implements the handler for data model messages.
+ */
+
+#include "AppConfig.h"
+#include "LockManager.h"
+#include <platform/CHIPDeviceLayer.h>
 
-#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/data-model/Nullable.h>
 #include <lib/core/DataModelTypes.h>
-#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#ifdef DIC_ENABLE
+#include "dic.h"
+#endif // DIC_ENABLE
 
-using namespace ::chip;
 using namespace ::chip::app::Clusters;
-using namespace ::chip::app::Clusters::DoorLock;
+using namespace ::chip::DeviceLayer::Internal;
 using ::chip::app::DataModel::Nullable;
 
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {
-    VerifyOrReturn(attributePath.mClusterId == DoorLock::Id && attributePath.mAttributeId == DoorLock::Attributes::LockState::Id);
+    ClusterId clusterId     = attributePath.mClusterId;
+    AttributeId attributeId = attributePath.mAttributeId;
+    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
 
-    switch (*value)
+    if (clusterId == DoorLock::Id && attributeId == DoorLock::Attributes::LockState::Id)
     {
-    case to_underlying(DlLockState::kLocked):
-        BoltLockMgr().Lock(BoltLockManager::OperationSource::kRemote);
-        break;
-    case to_underlying(DlLockState::kUnlocked):
-        BoltLockMgr().Unlock(BoltLockManager::OperationSource::kRemote);
-        break;
-    default:
-        break;
+        DoorLock::DlLockState lockState = *(reinterpret_cast<DoorLock::DlLockState *>(value));
+        ChipLogProgress(Zcl, "Door lock cluster: " ChipLogFormatMEI " state %d", ChipLogValueMEI(clusterId),
+                        to_underlying(lockState));
+#ifdef DIC_ENABLE
+        dic_sendmsg("lock/state", (const char *) (lockState == DoorLock::DlLockState::kLocked ? "lock" : "unlock"));
+#endif // DIC_ENABLE
     }
 }
 
-bool emberAfPluginDoorLockGetUser(EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
+/** @brief DoorLock Cluster Init
+ *
+ * This function is called when a specific cluster is initialized. It gives the
+ * application an opportunity to take care of cluster initialization procedures.
+ * It is called exactly once for each endpoint where cluster is present.
+ *
+ * @param endpoint   Ver.: always
+ *
+ */
+void emberAfDoorLockClusterInitCallback(EndpointId endpoint) {}
+
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
+                                            const Nullable<chip::NodeId> & nodeId, const Optional<chip::ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
-    return BoltLockMgr().GetUser(userIndex, user);
+    ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
+
+    return LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::LOCK_ACTION, LockManager::OperationSource::kRemote,
+                                endpointId, err, fabricIdx, nodeId, pinCode);
 }
 
-bool emberAfPluginDoorLockSetUser(EndpointId endpointId, uint16_t userIndex, FabricIndex creator, FabricIndex modifier,
-                                  const CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
-                                  CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
+bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
+                                              const Nullable<chip::NodeId> & nodeId, const Optional<chip::ByteSpan> & pinCode,
+                                              OperationErrorEnum & err)
+{
+    ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
+
+    return LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::UNLOCK_ACTION, LockManager::OperationSource::kRemote,
+                                endpointId, err, fabricIdx, nodeId, pinCode);
+}
+
+// TODO : Add helper function to call from the Unlock command if we establish Unbolt doesn't need a different behaviour than Unlock
+bool emberAfPluginDoorLockOnDoorUnboltCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
+                                              const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
+                                              OperationErrorEnum & err)
 {
-    return BoltLockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, userType, credentialRule,
-                                 credentials, totalCredentials);
+    ChipLogProgress(Zcl, "Door Lock App: Unbolt Command endpoint=%d", endpointId);
+
+    return LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::UNBOLT_ACTION, LockManager::OperationSource::kRemote,
+                                endpointId, err, fabricIdx, nodeId, pinCode);
 }
 
-bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
-    return BoltLockMgr().GetCredential(credentialIndex, credentialType, credential);
+    return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
 }
 
-bool emberAfPluginDoorLockSetCredential(EndpointId endpointId, uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                        DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                                        const ByteSpan & secret)
+bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
+                                        chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
-    return BoltLockMgr().SetCredential(credentialIndex, creator, modifier, credentialStatus, credentialType, secret);
+    return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
+                                   credentialData);
 }
 
-bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                            const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                            OperationErrorEnum & err)
+bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
 {
-    bool result = BoltLockMgr().ValidatePIN(pinCode, err);
+    return LockMgr().GetUser(endpointId, userIndex, user);
+}
 
-    /* Handle changing attribute state on command reception */
-    if (result)
-    {
-        BoltLockMgr().Lock(BoltLockManager::OperationSource::kRemote);
-    }
+bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
+                                  chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
+{
 
-    return result;
+    return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
+                             credentials, totalCredentials);
 }
 
-bool emberAfPluginDoorLockOnDoorUnlockCommand(EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                              const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                              OperationErrorEnum & err)
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                          EmberAfPluginDoorLockWeekDaySchedule & schedule)
 {
-    bool result = BoltLockMgr().ValidatePIN(pinCode, err);
+    return LockMgr().GetWeekdaySchedule(endpointId, weekdayIndex, userIndex, schedule);
+}
 
-    /* Handle changing attribute state on command reception */
-    if (result)
-    {
-        BoltLockMgr().Unlock(BoltLockManager::OperationSource::kRemote);
-    }
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                          EmberAfPluginDoorLockYearDaySchedule & schedule)
+{
+    return LockMgr().GetYeardaySchedule(endpointId, yearDayIndex, userIndex, schedule);
+}
 
-    return result;
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
+                                          EmberAfPluginDoorLockHolidaySchedule & holidaySchedule)
+{
+    return LockMgr().GetHolidaySchedule(endpointId, holidayIndex, holidaySchedule);
+}
+
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          uint8_t endHour, uint8_t endMinute)
+{
+    return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
+                                        endMinute);
+}
+
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                          DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
+{
+    return LockMgr().SetYeardaySchedule(endpointId, yearDayIndex, userIndex, status, localStartTime, localEndTime);
+}
+
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
+{
+    return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
 
-void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
+void emberAfPluginDoorLockOnAutoRelock(chip::EndpointId endpointId)
 {
-    DoorLockServer::Instance().InitServer(endpoint);
-
-    const auto logOnFailure = [](EmberAfStatus status, const char * attributeName) {
-        if (status != EMBER_ZCL_STATUS_SUCCESS)
-        {
-            ChipLogError(Zcl, "Failed to set DoorLock %s: %x", attributeName, status);
-        }
-    };
-
-    logOnFailure(DoorLock::Attributes::LockType::Set(endpoint, DlLockType::kDeadBolt), "type");
-    logOnFailure(DoorLock::Attributes::NumberOfTotalUsersSupported::Set(endpoint, CONFIG_LOCK_NUM_USERS), "number of users");
-    logOnFailure(DoorLock::Attributes::NumberOfPINUsersSupported::Set(endpoint, CONFIG_LOCK_NUM_USERS), "number of PIN users");
-    logOnFailure(DoorLock::Attributes::NumberOfRFIDUsersSupported::Set(endpoint, 0), "number of RFID users");
-    logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER),
-                 "number of credentials per user");
-
-    // Set FeatureMap to (kUser|kPinCredential), default is:
-    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
-    logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map");
-
-    GetAppTask().UpdateClusterState(BoltLockMgr().GetState(), BoltLockManager::OperationSource::kUnspecified);
+    // Apply the relock state in the application control
+    LockMgr().LockAction(AppEvent::kEventType_Lock, LockManager::LOCK_ACTION, LockManager::OperationSource::kRemote, endpointId);
 }
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index 207575f2e08c50..4459a659b2cee0 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -6,6 +6,8 @@
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -76,6 +78,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -112,13 +116,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -138,6 +142,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -167,6 +173,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -183,11 +190,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -226,6 +236,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -260,6 +273,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -278,6 +293,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -322,6 +339,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index f06772b7d23f79..182fab3bd3232b 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -3,6 +3,8 @@
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -36,6 +38,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -109,6 +113,8 @@ client cluster AccessControl = 31 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -181,6 +187,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -258,6 +266,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -268,6 +278,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -342,7 +354,9 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -357,6 +371,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -381,8 +397,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -394,6 +410,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -432,13 +450,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -458,6 +476,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -487,6 +507,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -503,11 +524,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -554,6 +578,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -588,6 +615,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -606,6 +635,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -706,11 +737,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -756,6 +795,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -872,6 +913,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -945,6 +988,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -961,6 +1006,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1028,8 +1075,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateProvider {
@@ -1110,9 +1159,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
index 3776092d0b62dd..7618bf4feab2f9 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -706,6 +706,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -732,7 +764,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1442,6 +1474,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1615,7 +1663,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md
index 2ce04fc328ceed..327a987dd2df5e 100644
--- a/examples/ota-requestor-app/ameba/README.md
+++ b/examples/ota-requestor-app/ameba/README.md
@@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities.
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
 
 -   Setup build environment:
 
diff --git a/examples/ota-requestor-app/linux/main.cpp b/examples/ota-requestor-app/linux/main.cpp
index 50cf24191a5a98..0cc7271618b400 100644
--- a/examples/ota-requestor-app/linux/main.cpp
+++ b/examples/ota-requestor-app/linux/main.cpp
@@ -55,6 +55,9 @@ class CustomOTARequestorDriver : public DeviceLayer::ExtendedOTARequestorDriver
 public:
     bool CanConsent() override;
     void UpdateDownloaded() override;
+    void UpdateConfirmed(System::Clock::Seconds32 delay) override;
+    static void AppliedNotifyUpdateTimer(System::Layer * systemLayer, void * appState);
+    void SendNotifyUpdateApplied();
 };
 
 DefaultOTARequestor gRequestorCore;
@@ -74,6 +77,7 @@ constexpr uint16_t kOptionOtaDownloadPath      = 'f';
 constexpr uint16_t kOptionPeriodicQueryTimeout = 'p';
 constexpr uint16_t kOptionUserConsentState     = 'u';
 constexpr uint16_t kOptionWatchdogTimeout      = 'w';
+constexpr uint16_t kSkipExecImageFile          = 's';
 constexpr size_t kMaxFilePathSize              = 256;
 
 uint32_t gPeriodicQueryTimeoutSec = 0;
@@ -82,6 +86,7 @@ chip::Optional<bool> gRequestorCanConsent;
 static char gOtaDownloadPath[kMaxFilePathSize] = "/tmp/test.bin";
 bool gAutoApplyImage                           = false;
 bool gSendNotifyUpdateApplied                  = true;
+bool gSkipExecImageFile                        = false;
 
 OptionDef cmdLineOptionsDef[] = {
     { "autoApplyImage", chip::ArgParser::kNoArgument, kOptionAutoApplyImage },
@@ -91,6 +96,7 @@ OptionDef cmdLineOptionsDef[] = {
     { "periodicQueryTimeout", chip::ArgParser::kArgumentRequired, kOptionPeriodicQueryTimeout },
     { "userConsentState", chip::ArgParser::kArgumentRequired, kOptionUserConsentState },
     { "watchdogTimeout", chip::ArgParser::kArgumentRequired, kOptionWatchdogTimeout },
+    { "skipExecImageFile", chip::ArgParser::kNoArgument, kSkipExecImageFile },
     {},
 };
 
@@ -123,6 +129,8 @@ OptionSet cmdLineOptions = {
     "  -w, --watchdogTimeout <time in seconds>\n"
     "       Maximum amount of time allowed for an OTA download before the process is cancelled and state reset to idle.\n"
     "       If none or zero is supplied, the timeout is determined by the driver.\n"
+    "  -s, --skipExecImageFile\n"
+    "       To only check Notify Update Applied Command, skip the Image File execution.\n"
 };
 
 OptionSet * allOptions[] = { &cmdLineOptions, nullptr };
@@ -139,7 +147,7 @@ bool CustomOTARequestorDriver::CanConsent()
 
 void CustomOTARequestorDriver::UpdateDownloaded()
 {
-    if (gAutoApplyImage)
+    if (gAutoApplyImage || gSkipExecImageFile)
     {
         // Let the default driver take further action to apply the image.
         // All member variables will be implicitly reset upon loading into the new image.
@@ -155,6 +163,39 @@ void CustomOTARequestorDriver::UpdateDownloaded()
     }
 }
 
+void CustomOTARequestorDriver::UpdateConfirmed(System::Clock::Seconds32 delay)
+{
+    if (gSkipExecImageFile)
+    {
+        // Just waiting delay time
+        VerifyOrDie(SystemLayer().StartTimer(std::chrono::duration_cast<System::Clock::Timeout>(delay), AppliedNotifyUpdateTimer,
+                                             this) == CHIP_NO_ERROR);
+    }
+    else
+    {
+        // Let the default driver take further action to apply the image.
+        // All member variables will be implicitly reset upon loading into the new image.
+        DefaultOTARequestorDriver::UpdateConfirmed(delay);
+    }
+}
+
+void CustomOTARequestorDriver::AppliedNotifyUpdateTimer(System::Layer * systemLayer, void * appState)
+{
+    CustomOTARequestorDriver * driver = reinterpret_cast<CustomOTARequestorDriver *>(appState);
+    driver->SendNotifyUpdateApplied();
+}
+
+void CustomOTARequestorDriver::SendNotifyUpdateApplied()
+{
+    VerifyOrDie(mRequestor != nullptr);
+    mRequestor->NotifyUpdateApplied();
+    // After sending Noficy Update Applied command, so reset provider retry counter.
+    mProviderRetryCount = 0;
+
+    // Reset to put the state back to idle to allow the next OTA update to occur
+    gRequestorCore.Reset();
+}
+
 static void InitOTARequestor(void)
 {
     // Set the global instance of the OTA requestor core component
@@ -240,6 +281,9 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
         // By default, NotifyUpdateApplied should always be sent. In the presence of this option, disable sending of the command.
         gSendNotifyUpdateApplied = false;
         break;
+    case kSkipExecImageFile:
+        gSkipExecImageFile = true;
+        break;
     default:
         ChipLogError(SoftwareUpdate, "%s: INTERNAL ERROR: Unhandled option: %s\n", aProgram, aName);
         retval = false;
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index ca6913b32da943..96b2a8d2da9ad7 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -142,6 +148,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +169,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,6 +188,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -214,6 +223,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -286,6 +297,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -363,6 +376,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -373,6 +388,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -447,6 +464,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -525,7 +544,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -540,6 +561,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -564,8 +587,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -577,6 +600,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -615,13 +640,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -641,6 +666,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -670,6 +697,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -686,11 +714,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -737,6 +768,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -771,6 +805,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -789,6 +825,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -889,11 +927,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -939,6 +985,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1055,6 +1103,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1128,6 +1178,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1144,6 +1196,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1208,8 +1262,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1293,9 +1349,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
index e36f3b95848231..ba49e2d5405cf7 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1491,6 +1523,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1664,7 +1712,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
index 82f29519af3bcb..9538841fbc7230 100755
--- a/examples/ota-requestor-app/telink/prj.conf
+++ b/examples/ota-requestor-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
index fc06023b7edb83..87e4add6701eca 100644
--- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md
+++ b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
@@ -140,13 +140,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.10.0
+    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2
     $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\""
     $ ninja -C out/debug
 
diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index d294295bc5f0e5..e997d895b40030 100644
--- a/examples/pigweed-app/ameba/README.md
+++ b/examples/pigweed-app/ameba/README.md
@@ -31,11 +31,11 @@ following features are available:
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:26
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
 
 -   Setup build environment:
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 056976a11f7684..6eca51cf360d29 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -97,6 +101,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -166,6 +172,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -173,8 +185,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -187,13 +199,18 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -288,6 +305,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -312,6 +331,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -332,7 +352,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -357,6 +377,8 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -381,6 +403,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -401,7 +424,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -420,12 +443,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 client cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -436,7 +461,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -448,7 +473,7 @@ client cluster LevelControl = 8 {
   readonly attribute optional int16u currentFrequency = 4;
   readonly attribute optional int16u minFrequency = 5;
   readonly attribute optional int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute optional int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute optional nullable int16u onTransitionTime = 18;
@@ -465,55 +490,55 @@ client cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToClosestFrequencyRequest {
@@ -543,12 +568,14 @@ client cluster LevelControl = 8 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -559,7 +586,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -571,7 +598,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -588,55 +615,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -651,6 +678,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -684,6 +713,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -754,6 +785,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -841,6 +874,8 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -932,7 +967,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 client cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -947,7 +984,9 @@ client cluster LocalizationConfiguration = 43 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -962,6 +1001,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -986,8 +1027,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1002,6 +1043,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 client cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -1012,7 +1055,7 @@ client cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute optional TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) optional TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1026,6 +1069,8 @@ client cluster UnitLocalization = 45 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -1036,7 +1081,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1047,6 +1092,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1304,6 +1351,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1342,12 +1391,12 @@ client cluster GeneralCommissioning = 48 {
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
@@ -1371,6 +1420,8 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1409,13 +1460,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1435,6 +1486,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1464,6 +1517,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1480,11 +1534,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1531,6 +1588,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1565,6 +1625,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1583,6 +1645,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1683,11 +1747,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1722,6 +1794,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1820,9 +1894,9 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute optional int16u detachedRoleCount = 14;
   readonly attribute optional int16u childRoleCount = 15;
@@ -1881,11 +1955,13 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int16u clusterRevision = 65533;
 
   /** Reception of this command SHALL reset the OverrunCount attributes to 0 */
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1984,9 +2060,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -2044,11 +2120,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -2090,7 +2168,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -2123,6 +2201,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -2165,6 +2245,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 server cluster BridgedDeviceBasicInformation = 57 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -2245,6 +2327,8 @@ server cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2298,6 +2382,8 @@ client cluster Switch = 59 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2349,6 +2435,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -2394,6 +2482,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2518,6 +2608,8 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2634,6 +2726,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -2707,6 +2801,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 client cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2724,6 +2820,8 @@ client cluster FixedLabel = 64 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2740,6 +2838,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2756,6 +2856,8 @@ server cluster UserLabel = 65 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -2771,6 +2873,8 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2809,6 +2913,8 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2845,6 +2951,8 @@ server cluster ModeSelect = 80 {
 
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -3465,6 +3573,8 @@ client cluster DoorLock = 257 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -3965,6 +4075,8 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -4105,6 +4217,8 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -4227,6 +4341,8 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -4384,6 +4500,8 @@ client cluster Thermostat = 513 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -4507,9 +4625,30 @@ server cluster Thermostat = 513 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) optional enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) optional ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4520,9 +4659,30 @@ client cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4533,6 +4693,8 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -4851,6 +5013,8 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -5150,6 +5314,8 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -5170,9 +5336,11 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute optional int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -5184,9 +5352,11 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -5198,6 +5368,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -5221,6 +5393,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5235,6 +5409,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 client cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5249,6 +5425,8 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5263,6 +5441,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -5302,16 +5482,18 @@ server cluster OccupancySensing = 1030 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -5347,7 +5529,7 @@ client cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5370,16 +5552,18 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -5430,7 +5614,9 @@ server cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5438,7 +5624,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5456,7 +5642,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5466,7 +5652,9 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5474,7 +5662,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5489,14 +5677,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -5505,6 +5686,15 @@ client cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -5538,7 +5728,7 @@ client cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5572,14 +5762,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -5588,6 +5771,15 @@ server cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -5625,7 +5817,7 @@ server cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5644,6 +5836,8 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -5700,6 +5894,8 @@ client cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -5752,6 +5948,8 @@ server cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 client cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5765,7 +5963,9 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5854,7 +6054,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5874,11 +6074,11 @@ client cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -5887,7 +6087,9 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5976,7 +6178,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5998,11 +6200,7 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -6026,12 +6224,18 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6043,13 +6247,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -6058,13 +6262,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -6073,7 +6277,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   readonly attribute optional char_string acceptHeader[] = 0;
-  attribute optional bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute optional SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6094,7 +6298,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6106,11 +6310,7 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -6134,12 +6334,18 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6151,13 +6357,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -6166,13 +6372,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -6181,7 +6387,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   readonly attribute char_string acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6202,7 +6408,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6212,6 +6418,8 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -6257,6 +6465,8 @@ client cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -6300,7 +6510,9 @@ server cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -6321,7 +6533,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute optional int16u catalogList[] = 0;
-  attribute optional nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute optional nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6343,7 +6555,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -6357,7 +6569,9 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -6378,7 +6592,7 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute int16u catalogList[] = 0;
-  attribute nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6389,6 +6603,8 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -6419,6 +6635,8 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -6449,6 +6667,8 @@ server cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 client cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6470,15 +6690,17 @@ client cluster AccountLogin = 1294 {
   }
 
   /** Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. */
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
   /** Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. */
-  timed command Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
   /** The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. */
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 server cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6499,9 +6721,9 @@ server cluster AccountLogin = 1294 {
     char_string setupPIN = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
@@ -6734,9 +6956,11 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -7374,17 +7598,13 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index c1166d993338fd..0dbe7077a0b98e 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -2599,6 +2599,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2836,7 +2852,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3178,7 +3194,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3194,7 +3210,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3210,7 +3226,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -8744,7 +8760,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8760,7 +8776,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8776,7 +8792,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9030,7 +9046,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9046,7 +9062,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9062,7 +9078,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10672,7 +10688,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11893,76 +11909,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11990,16 +11942,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12063,7 +12015,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12698,7 +12650,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 76bf39117b7fb4..d7b0e66b4c88f9 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -97,6 +101,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -166,6 +172,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -173,8 +185,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -187,13 +199,18 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -288,6 +305,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -312,6 +331,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -332,7 +352,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -357,6 +377,8 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -381,6 +403,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -401,7 +424,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -420,12 +443,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 client cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -436,7 +461,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -448,7 +473,7 @@ client cluster LevelControl = 8 {
   readonly attribute optional int16u currentFrequency = 4;
   readonly attribute optional int16u minFrequency = 5;
   readonly attribute optional int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute optional int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute optional nullable int16u onTransitionTime = 18;
@@ -465,55 +490,55 @@ client cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToClosestFrequencyRequest {
@@ -543,12 +568,14 @@ client cluster LevelControl = 8 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -559,7 +586,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -570,7 +597,7 @@ server cluster LevelControl = 8 {
   readonly attribute int8u maxLevel = 3;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -586,55 +613,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -649,6 +676,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -682,6 +711,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -752,6 +783,8 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -839,6 +872,8 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -930,7 +965,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -945,6 +982,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -969,8 +1008,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -985,6 +1024,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -995,7 +1036,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1006,6 +1047,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1263,6 +1306,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1301,12 +1346,12 @@ client cluster GeneralCommissioning = 48 {
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
@@ -1330,6 +1375,8 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1368,13 +1415,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1394,6 +1441,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1423,6 +1472,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1439,11 +1489,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1490,6 +1543,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1524,6 +1580,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1542,6 +1600,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1642,11 +1702,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1681,6 +1749,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1779,9 +1849,9 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute optional int16u detachedRoleCount = 14;
   readonly attribute optional int16u childRoleCount = 15;
@@ -1840,11 +1910,13 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int16u clusterRevision = 65533;
 
   /** Reception of this command SHALL reset the OverrunCount attributes to 0 */
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1943,9 +2015,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -2003,11 +2075,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -2049,7 +2123,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -2082,6 +2156,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -2124,6 +2200,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 server cluster BridgedDeviceBasicInformation = 57 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -2204,6 +2282,8 @@ server cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2257,6 +2337,8 @@ client cluster Switch = 59 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2308,6 +2390,8 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -2353,6 +2437,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2477,6 +2563,8 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2593,6 +2681,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -2666,6 +2756,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 client cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2683,6 +2775,8 @@ client cluster FixedLabel = 64 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2699,6 +2793,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2715,6 +2811,8 @@ server cluster UserLabel = 65 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 server cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -2730,6 +2828,8 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2768,6 +2868,8 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2804,6 +2906,8 @@ server cluster ModeSelect = 80 {
 
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -3424,6 +3528,8 @@ client cluster DoorLock = 257 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -3924,6 +4030,8 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -4064,6 +4172,8 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -4186,6 +4296,8 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -4343,6 +4455,8 @@ client cluster Thermostat = 513 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -4466,9 +4580,30 @@ server cluster Thermostat = 513 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) optional enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) optional ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4479,9 +4614,30 @@ client cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4492,6 +4648,8 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -4810,6 +4968,8 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -5109,6 +5269,8 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -5129,9 +5291,11 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute optional int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -5143,9 +5307,11 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -5157,6 +5323,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -5180,6 +5348,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5194,6 +5364,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 client cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5208,6 +5380,8 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5222,6 +5396,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -5261,16 +5437,18 @@ server cluster OccupancySensing = 1030 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -5306,7 +5484,7 @@ client cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5329,16 +5507,18 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -5389,7 +5569,9 @@ server cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5397,7 +5579,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5415,7 +5597,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5425,7 +5607,9 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5433,7 +5617,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5448,14 +5632,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -5464,6 +5641,15 @@ client cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -5497,7 +5683,7 @@ client cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5531,14 +5717,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -5547,6 +5726,15 @@ server cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -5584,7 +5772,7 @@ server cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5603,6 +5791,8 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -5659,6 +5849,8 @@ client cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -5711,6 +5903,8 @@ server cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 client cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5724,7 +5918,9 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5813,7 +6009,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5833,11 +6029,11 @@ client cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -5846,7 +6042,9 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5935,7 +6133,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5957,11 +6155,7 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -5985,12 +6179,18 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6002,13 +6202,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -6017,13 +6217,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -6032,7 +6232,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   readonly attribute optional char_string acceptHeader[] = 0;
-  attribute optional bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute optional SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6053,7 +6253,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6065,11 +6265,7 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -6093,12 +6289,18 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6110,13 +6312,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -6125,13 +6327,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -6140,7 +6342,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   readonly attribute char_string acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6161,7 +6363,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6171,6 +6373,8 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -6216,6 +6420,8 @@ client cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -6259,7 +6465,9 @@ server cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -6280,7 +6488,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute optional int16u catalogList[] = 0;
-  attribute optional nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute optional nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6302,7 +6510,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -6316,7 +6524,9 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -6337,7 +6547,7 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute int16u catalogList[] = 0;
-  attribute nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6348,6 +6558,8 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -6378,6 +6590,8 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -6408,6 +6622,8 @@ server cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 client cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6429,15 +6645,17 @@ client cluster AccountLogin = 1294 {
   }
 
   /** Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. */
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
   /** Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. */
-  timed command Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
   /** The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. */
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 server cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6458,9 +6676,9 @@ server cluster AccountLogin = 1294 {
     char_string setupPIN = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
@@ -6694,9 +6912,11 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -7338,17 +7558,13 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 88191b28ef9110..725e63e1c64cdc 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -2615,6 +2615,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2852,7 +2868,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3194,7 +3210,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3210,7 +3226,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3226,7 +3242,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -8818,7 +8834,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8834,7 +8850,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8850,7 +8866,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9104,7 +9120,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9120,7 +9136,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9136,7 +9152,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10754,7 +10770,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11975,76 +11991,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -12072,16 +12024,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12145,7 +12097,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12764,7 +12716,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp
index 38a560e388f991..14a1087d230a4d 100644
--- a/examples/placeholder/linux/static-supported-temperature-levels.cpp
+++ b/examples/placeholder/linux/static-supported-temperature-levels.cpp
@@ -27,8 +27,7 @@ using namespace chip::app::Clusters::TemperatureControl;
 using chip::Protocols::InteractionModel::Status;
 
 // TODO: Configure your options for each endpoint
-CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { CharSpan("Hot", 3), CharSpan("Warm", 4),
-                                                                              CharSpan("Cold", 4) };
+CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { "Hot"_span, "Warm"_span, "Cold"_span };
 
 const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints
     [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {
diff --git a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
index 2326ff96bbec4d..32cf15e2ea7cb3 100644
--- a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
+++ b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #include <FreeRTOS.h>
 
diff --git a/examples/platform/bouffalolab/common/plat/platform.cpp b/examples/platform/bouffalolab/common/plat/platform.cpp
index ea6548327847b1..329e3eee49f262 100644
--- a/examples/platform/bouffalolab/common/plat/platform.cpp
+++ b/examples/platform/bouffalolab/common/plat/platform.cpp
@@ -165,6 +165,18 @@ void ChipEventHandler(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+#endif
+
 CHIP_ERROR PlatformManagerImpl::PlatformInit(void)
 {
     chip::RendezvousInformationFlags rendezvousMode(chip::RendezvousInformationFlag::kOnNetwork);
@@ -235,6 +247,14 @@ CHIP_ERROR PlatformManagerImpl::PlatformInit(void)
     static CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
+#endif
+
     ReturnLogErrorOnFailure(chip::Server::GetInstance().Init(initParams));
 
     gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
diff --git a/examples/platform/esp32/shell_extension/openthread_cli_register.cpp b/examples/platform/esp32/shell_extension/openthread_cli_register.cpp
new file mode 100644
index 00000000000000..bc8ccae7e2af00
--- /dev/null
+++ b/examples/platform/esp32/shell_extension/openthread_cli_register.cpp
@@ -0,0 +1,68 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include "sdkconfig.h"
+#if CONFIG_OPENTHREAD_CLI
+#include "esp_check.h"
+#include "esp_err.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "openthread_cli_register.h"
+#include "platform/ESP32/OpenthreadLauncher.h"
+#include <lib/shell/Engine.h>
+#include <memory>
+
+#define CLI_INPUT_BUFF_LENGTH 256u
+namespace chip {
+
+static CHIP_ERROR OtcliHandler(int argc, char * argv[])
+{
+    /* the beginning of command "matter otcli" has already been removed */
+    std::unique_ptr<char[]> cli_str(new char[CLI_INPUT_BUFF_LENGTH]);
+    memset(cli_str.get(), 0, CLI_INPUT_BUFF_LENGTH);
+    uint8_t len = 0;
+    for (size_t i = 0; i < (size_t) argc; ++i)
+    {
+        len = len + strlen(argv[i]) + 1;
+        if (len > CLI_INPUT_BUFF_LENGTH - 1)
+        {
+            return CHIP_ERROR_INTERNAL;
+        }
+        strcat(cli_str.get(), argv[i]);
+        strcat(cli_str.get(), " ");
+    }
+
+    if (cli_transmit_task_post(std::move(cli_str)) != CHIP_NO_ERROR)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+    return CHIP_NO_ERROR;
+}
+
+void RegisterOpenThreadCliCommands()
+{
+    static const chip::Shell::shell_command_t cmds[] = {
+        {
+            .cmd_func = OtcliHandler,
+            .cmd_name = "otcli",
+            .cmd_help = "OpenThread cli commands",
+        },
+    };
+    int cmds_num = sizeof(cmds) / sizeof(chip::Shell::shell_command_t);
+    chip::Shell::Engine::Root().RegisterCommands(cmds, cmds_num);
+}
+} // namespace chip
+#endif // CONFIG_OPENTHREAD_CLI
diff --git a/examples/resource-monitoring-app/telink/include/AppConfig.h b/examples/platform/esp32/shell_extension/openthread_cli_register.h
similarity index 64%
rename from examples/resource-monitoring-app/telink/include/AppConfig.h
rename to examples/platform/esp32/shell_extension/openthread_cli_register.h
index f0149868a699b9..4811146415c593 100644
--- a/examples/resource-monitoring-app/telink/include/AppConfig.h
+++ b/examples/platform/esp32/shell_extension/openthread_cli_register.h
@@ -1,7 +1,6 @@
 /*
  *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
+ *    Copyright (c) 2021 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,11 +17,8 @@
 
 #pragma once
 
-// ---- Air Quality Example App Config ----
+namespace chip {
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
-#define APP_SET_DEVICE_INFO_PROVIDER 1
-#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#define APP_USE_IDENTIFY_PWM 1
+void RegisterOpenThreadCliCommands();
+
+} // namespace chip
diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
index 56e6edd44687f2..79e3e08edce718 100644
--- a/examples/platform/linux/AppMain.cpp
+++ b/examples/platform/linux/AppMain.cpp
@@ -20,6 +20,7 @@
 #include <platform/PlatformManager.h>
 
 #include "app/clusters/network-commissioning/network-commissioning.h"
+#include <app/server/Dnssd.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/endpoint-config-api.h>
@@ -238,15 +239,15 @@ void InitNetworkCommissioning()
 using chip::Shell::Engine;
 #endif
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
 /*
  * The device shall check every kWiFiStartCheckTimeUsec whether Wi-Fi management
  * has been fully initialized. If after kWiFiStartCheckAttempts Wi-Fi management
  * still hasn't been initialized, the device configuration is reset, and device
  * needs to be paired again.
  */
-static constexpr useconds_t kWiFiStartCheckTimeUsec = 100 * 1000; // 100 ms
-static constexpr uint8_t kWiFiStartCheckAttempts    = 5;
+static constexpr useconds_t kWiFiStartCheckTimeUsec = WIFI_START_CHECK_TIME_USEC;
+static constexpr uint8_t kWiFiStartCheckAttempts    = WIFI_START_CHECK_ATTEMPTS;
 #endif
 
 namespace {
@@ -264,6 +265,11 @@ void EventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
     {
         ChipLogProgress(DeviceLayer, "Receive kCHIPoBLEConnectionEstablished");
     }
+    else if ((event->Type == chip::DeviceLayer::DeviceEventType::kInternetConnectivityChange))
+    {
+        // Restart the server on connectivity change
+        app::DnssdServer::Instance().StartServer();
+    }
 }
 
 void Cleanup()
@@ -298,7 +304,7 @@ void StopSignalHandler(int signal)
 
 } // namespace
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
 static bool EnsureWiFiIsStarted()
 {
     for (int cnt = 0; cnt < kWiFiStartCheckAttempts; cnt++)
@@ -425,7 +431,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     }
 
 #if defined(PW_RPC_ENABLED)
-    rpc::Init();
+    rpc::Init(LinuxDeviceOptions::GetInstance().rpcServerPort);
     ChipLogProgress(NotSpecified, "PW_RPC initialized.");
 #endif // defined(PW_RPC_ENABLED)
 
@@ -462,9 +468,10 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
 #endif
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
     if (LinuxDeviceOptions::GetInstance().mWiFi)
     {
+        // Start WiFi management in Concurrent mode
         DeviceLayer::ConnectivityMgrImpl().StartWiFiManagement();
         if (!EnsureWiFiIsStarted())
         {
diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp
index d97566213a579e..c340f662df3269 100644
--- a/examples/platform/linux/Options.cpp
+++ b/examples/platform/linux/Options.cpp
@@ -84,6 +84,9 @@ enum
     kCommissionerOption_FabricID                        = 0x1020,
     kTraceTo                                            = 0x1021,
     kOptionSimulateNoInternalTime                       = 0x1022,
+#if defined(PW_RPC_ENABLED)
+    kOptionRpcServerPort = 0x1023,
+#endif
 };
 
 constexpr unsigned kAppUsageLength = 64;
@@ -138,6 +141,9 @@ OptionDef sDeviceOptionDefs[] = {
     { "trace-to", kArgumentRequired, kTraceTo },
 #endif
     { "simulate-no-internal-time", kNoArgument, kOptionSimulateNoInternalTime },
+#if defined(PW_RPC_ENABLED)
+    { "rpc-server-port", kArgumentRequired, kOptionRpcServerPort },
+#endif
     {}
 };
 
@@ -254,6 +260,10 @@ const char * sDeviceOptionHelp =
 #endif
     "  --simulate-no-internal-time\n"
     "       Time cluster does not use internal platform time\n"
+#if defined(PW_RPC_ENABLED)
+    "  --rpc-server-port\n"
+    "       Start RPC server on specified port\n"
+#endif
     "\n";
 
 bool Base64ArgToVector(const char * arg, size_t maxSize, std::vector<uint8_t> & outVector)
@@ -507,6 +517,11 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
     case kOptionSimulateNoInternalTime:
         LinuxDeviceOptions::GetInstance().mSimulateNoInternalTime = true;
         break;
+#if defined(PW_RPC_ENABLED)
+    case kOptionRpcServerPort:
+        LinuxDeviceOptions::GetInstance().rpcServerPort = static_cast<uint16_t>(atoi(aValue));
+        break;
+#endif
     default:
         PrintArgError("%s: INTERNAL ERROR: Unhandled option: %s\n", aProgram, aName);
         retval = false;
diff --git a/examples/platform/linux/Options.h b/examples/platform/linux/Options.h
index 8a080680cefbcf..0aedffb57dc76e 100644
--- a/examples/platform/linux/Options.h
+++ b/examples/platform/linux/Options.h
@@ -68,7 +68,9 @@ struct LinuxDeviceOptions
     chip::FabricId commissionerFabricId   = chip::kUndefinedFabricId;
     std::vector<std::string> traceTo;
     bool mSimulateNoInternalTime = false;
-
+#if defined(PW_RPC_ENABLED)
+    uint16_t rpcServerPort = 33000;
+#endif
     static LinuxDeviceOptions & GetInstance();
 };
 
diff --git a/examples/platform/linux/Rpc.cpp b/examples/platform/linux/Rpc.cpp
index 3f81f0514fc17f..f45df32d750a81 100644
--- a/examples/platform/linux/Rpc.cpp
+++ b/examples/platform/linux/Rpc.cpp
@@ -18,6 +18,7 @@
 
 #include "pw_rpc/server.h"
 #include "pw_rpc_system_server/rpc_server.h"
+#include "pw_rpc_system_server/socket.h"
 
 #include <thread>
 
@@ -116,9 +117,10 @@ void RunRpcService()
     pw::rpc::system_server::Start();
 }
 
-int Init()
+int Init(uint16_t rpcServerPort)
 {
     int err = 0;
+    pw::rpc::system_server::set_socket_port(rpcServerPort);
     std::thread rpc_service(RunRpcService);
     rpc_service.detach();
     return err;
diff --git a/examples/platform/linux/Rpc.h b/examples/platform/linux/Rpc.h
index 85495b2bf8fbaf..fbcfc6ed63f4f2 100644
--- a/examples/platform/linux/Rpc.h
+++ b/examples/platform/linux/Rpc.h
@@ -21,7 +21,7 @@
 namespace chip {
 namespace rpc {
 
-int Init();
+int Init(uint16_t rpcServerPort);
 
 } // namespace rpc
 } // namespace chip
diff --git a/examples/platform/linux/system_rpc_server.cc b/examples/platform/linux/system_rpc_server.cc
index 3a24525d0514ec..fc44cb30478ee0 100644
--- a/examples/platform/linux/system_rpc_server.cc
+++ b/examples/platform/linux/system_rpc_server.cc
@@ -51,11 +51,6 @@ void set_socket_port(uint16_t new_socket_port)
     socket_port = new_socket_port;
 }
 
-int GetServerSocketFd()
-{
-    return socket_stream.connection_fd();
-}
-
 void Init()
 {
     log_basic::SetOutput([](std::string_view log) {
diff --git a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
index 7c9f3429d12727..1eaffe9ac8bcb6 100644
--- a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
+++ b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
@@ -20,7 +20,7 @@
 #include "pw_sys_io/sys_io.h"
 #include <cassert>
 #include <zephyr/console/console.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef CONFIG_USB
 #include <zephyr/usb/usb_device.h>
diff --git a/examples/platform/nrfconnect/util/DFUOverSMP.cpp b/examples/platform/nrfconnect/util/DFUOverSMP.cpp
index ac59171598127f..7d8eb38945ad50 100644
--- a/examples/platform/nrfconnect/util/DFUOverSMP.cpp
+++ b/examples/platform/nrfconnect/util/DFUOverSMP.cpp
@@ -28,6 +28,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 
 #include <zephyr/dfu/mcuboot.h>
+#include <zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h>
 #include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
 #include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
 
@@ -41,7 +42,8 @@ constexpr uint16_t kAdvertisingIntervalMax = 500;
 constexpr uint8_t kAdvertisingFlags        = BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR;
 
 namespace {
-int32_t UploadConfirmHandler(uint32_t event, int32_t rc, bool * abort_more, void * data, size_t data_size)
+enum mgmt_cb_return UploadConfirmHandler(uint32_t event, enum mgmt_cb_return prev_status, int32_t * rc, uint16_t * group,
+                                         bool * abort_more, void * data, size_t data_size)
 {
     const img_mgmt_upload_check & imgData = *static_cast<img_mgmt_upload_check *>(data);
     IgnoreUnusedVariable(imgData);
@@ -49,10 +51,11 @@ int32_t UploadConfirmHandler(uint32_t event, int32_t rc, bool * abort_more, void
     ChipLogProgress(SoftwareUpdate, "DFU over SMP progress: %u/%u B of image %u", static_cast<unsigned>(imgData.req->off),
                     static_cast<unsigned>(imgData.action->size), static_cast<unsigned>(imgData.req->image));
 
-    return MGMT_ERR_EOK;
+    return MGMT_CB_OK;
 }
 
-int32_t CommandHandler(uint32_t event, int32_t rc, bool * abort_more, void * data, size_t data_size)
+enum mgmt_cb_return CommandHandler(uint32_t event, enum mgmt_cb_return prev_status, int32_t * rc, uint16_t * group,
+                                   bool * abort_more, void * data, size_t data_size)
 {
     if (event == MGMT_EVT_OP_CMD_RECV)
     {
@@ -63,7 +66,7 @@ int32_t CommandHandler(uint32_t event, int32_t rc, bool * abort_more, void * dat
         GetFlashHandler().DoAction(ExternalFlashManager::Action::SLEEP);
     }
 
-    return MGMT_ERR_EOK;
+    return MGMT_CB_OK;
 }
 
 mgmt_callback sUploadCallback = {
diff --git a/examples/platform/qpg/project_include/OpenThreadConfig.h b/examples/platform/qpg/project_include/OpenThreadConfig.h
index 9de2b7969a70f5..9c69f7033c2c47 100644
--- a/examples/platform/qpg/project_include/OpenThreadConfig.h
+++ b/examples/platform/qpg/project_include/OpenThreadConfig.h
@@ -76,6 +76,7 @@
 
 #define OPENTHREAD_ENABLE_VENDOR_EXTENSION 0
 #define OPENTHREAD_EXAMPLES_SIMULATION 0
+#define OPENTHREAD_CONFIG_PLATFORM_BOOTLOADER_MODE_ENABLE 0
 
 // Use the Qorvo-supplied default platform configuration for remainder
 // of OpenThread config options.
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index 83bd592c77132e..36a5aef1a860c1 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -17,10 +17,9 @@ import("//build_overrides/efr32_sdk.gni")
 import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/device.gni")
+import("${chip_root}/src/platform/silabs/wifi_args.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
 import("${efr32_sdk_build_root}/SiWx917_sdk.gni")
-silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
-wifi_sdk_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
 
 declare_args() {
   enable_heap_monitoring = false
@@ -52,13 +51,12 @@ declare_args() {
   silabs_test_event_trigger_enable_key = "00112233445566778899aabbccddeeff"
 }
 
-import("${chip_root}/src/platform/silabs/wifi_args.gni")
-import("${silabs_common_plat_dir}/args.gni")
-
 # Sanity check
 assert(chip_enable_wifi)
 
 silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
+silabs_plat_si91x_wifi_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
+import("${silabs_common_plat_dir}/args.gni")
 
 config("chip_examples_project_config") {
   include_dirs = [ "project_include" ]
@@ -207,7 +205,7 @@ source_set("siwx917-common") {
   include_dirs = [
     ".",
     "SiWx917/",
-    "${wifi_sdk_dir}",
+    "${silabs_plat_si91x_wifi_dir}",
   ]
 
   sources = [
@@ -218,10 +216,10 @@ source_set("siwx917-common") {
     "${silabs_common_plat_dir}/heap_4_silabs.c",
     "${silabs_common_plat_dir}/silabs_utils.cpp",
     "${silabs_common_plat_dir}/syscalls_stubs.cpp",
-    "${wifi_sdk_dir}/dhcp_client.cpp",
-    "${wifi_sdk_dir}/ethernetif.cpp",
-    "${wifi_sdk_dir}/lwip_netif.cpp",
-    "${wifi_sdk_dir}/wfx_notify.cpp",
+    "${silabs_plat_si91x_wifi_dir}/dhcp_client.cpp",
+    "${silabs_plat_si91x_wifi_dir}/ethernetif.cpp",
+    "${silabs_plat_si91x_wifi_dir}/lwip_netif.cpp",
+    "${silabs_plat_si91x_wifi_dir}/wfx_notify.cpp",
     "SiWx917/sl_wifi_if.c",
     "SiWx917/wfx_rsi_host.c",
   ]
diff --git a/examples/platform/silabs/SiWx917/uart.cpp b/examples/platform/silabs/SiWx917/uart.cpp
index ac7bb8af3e774a..333c12a30e244d 100644
--- a/examples/platform/silabs/SiWx917/uart.cpp
+++ b/examples/platform/silabs/SiWx917/uart.cpp
@@ -20,6 +20,7 @@
 #include "matter_shell.h"
 #include "rsi_rom_egpio.h"
 #include "silabs_utils.h"
+#include "sl_si91x_usart.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,43 +30,27 @@ extern "C" {
 #include <stddef.h>
 #include <string.h>
 
-extern ARM_DRIVER_USART Driver_USART0;
-static ARM_DRIVER_USART * UARTdrv = &Driver_USART0;
+#define USART_BAUDRATE 115200 // Baud rate <9600-7372800>
+#define UART_CONSOLE_ERR -1   // Negative value in case of UART Console action failed. Triggers a failure for PW_RPC
 
-ARM_USART_CAPABILITIES drv_capabilities;
+sl_usart_handle_t usart_handle;
 
-#define BAUD_VALUE 115200
-#define UART_CONSOLE_ERR -1 // Negative value in case of UART Console action failed. Triggers a failure for PW_RPC
+void callback_event(uint32_t event);
 
-void ARM_USART_SignalEvent(uint32_t event);
-
-void Read_Capabilities(void)
-{
-    drv_capabilities = UARTdrv->GetCapabilities();
-}
-
-void ARM_USART_SignalEvent(uint32_t event)
+/*******************************************************************************
+ * Callback function triggered on data Transfer and reception
+ ******************************************************************************/
+void callback_event(uint32_t event)
 {
     switch (event)
     {
-    case ARM_USART_EVENT_SEND_COMPLETE:
+    case SL_USART_EVENT_SEND_COMPLETE:
         break;
-    case ARM_USART_EVENT_RECEIVE_COMPLETE:
+    case SL_USART_EVENT_RECEIVE_COMPLETE:
 #ifdef ENABLE_CHIP_SHELL
         chip::NotifyShellProcessFromISR();
-#endif
-    case ARM_USART_EVENT_TRANSFER_COMPLETE:
-    case ARM_USART_EVENT_TX_COMPLETE:
-    case ARM_USART_EVENT_TX_UNDERFLOW:
-    case ARM_USART_EVENT_RX_OVERFLOW:
-    case ARM_USART_EVENT_RX_TIMEOUT:
-    case ARM_USART_EVENT_RX_BREAK:
-    case ARM_USART_EVENT_RX_FRAMING_ERROR:
-    case ARM_USART_EVENT_RX_PARITY_ERROR:
-    case ARM_USART_EVENT_CTS:
-    case ARM_USART_EVENT_DSR:
-    case ARM_USART_EVENT_DCD:
-    case ARM_USART_EVENT_RI:
+#endif;
+    case SL_USART_EVENT_TRANSFER_COMPLETE:
         break;
     }
 }
@@ -73,71 +58,45 @@ void ARM_USART_SignalEvent(uint32_t event)
 void uartConsoleInit(void)
 {
     int32_t status = 0;
-    Read_Capabilities();
 
-    status = UARTdrv->Initialize(ARM_USART_SignalEvent);
-    // Setting the GPIO 30 of the radio board (TX)
-    // Setting the GPIO 29 of the radio board (RX)
-    RSI_EGPIO_HostPadsGpioModeEnable(30);
-    RSI_EGPIO_HostPadsGpioModeEnable(29);
+    sl_si91x_usart_control_config_t usart_config;
+    usart_config.baudrate      = USART_BAUDRATE;
+    usart_config.mode          = SL_USART_MODE_ASYNCHRONOUS;
+    usart_config.parity        = SL_USART_NO_PARITY;
+    usart_config.stopbits      = SL_USART_STOP_BITS_1;
+    usart_config.hwflowcontrol = SL_USART_FLOW_CONTROL_NONE;
+    usart_config.databits      = SL_USART_DATA_BITS_8;
+    usart_config.misc_control  = SL_USART_MISC_CONTROL_NONE;
+    usart_config.usart_module  = USART_0;
+    usart_config.config_enable = ENABLE;
+    usart_config.synch_mode    = DISABLE;
+    sl_si91x_usart_control_config_t get_config;
 
     // Initialized board UART
     DEBUGINIT();
-    if (status != ARM_DRIVER_OK)
-    {
-        DEBUGOUT("\r\n UART Initialization Failed, Error Code : %d\r\n", status);
-    }
-    else
-    {
-        DEBUGOUT("\r\n UART Initialization Success\r\n");
-    }
-
-    // Power up the UART peripheral
-    status = UARTdrv->PowerControl(ARM_POWER_FULL);
-    if (status != ARM_DRIVER_OK)
-    {
-        DEBUGOUT("\r\n Failed to Set Power to UART, Error Code : %d\r\n", status);
-    }
-    else
-    {
-        DEBUGOUT("\r\n Configured Power to UART \r\n");
-    }
 
-    // Enable Receiver and Transmitter lines
-    status = UARTdrv->Control(ARM_USART_CONTROL_TX, 1);
-    if (status != ARM_DRIVER_OK)
+    // Initialize the UART
+    status = sl_si91x_usart_init((usart_peripheral_t) usart_config.usart_module, &usart_handle);
+    if (status != SL_STATUS_OK)
     {
-        DEBUGOUT("\r\n Failed to Set  Transmitter lines to UART, Error Code : %d\r\n", status);
-    }
-    else
-    {
-        DEBUGOUT("\r\n Set  Transmitter lines to UART is sucess \r\n");
+        DEBUGOUT("sl_si91x_usart_initialize: Error Code : %lu \n", status);
     }
 
-    status = UARTdrv->Control(ARM_USART_CONTROL_RX, 1);
-    if (status != ARM_DRIVER_OK)
+    // Configure the USART configurations
+    status = sl_si91x_usart_set_configuration(usart_handle, &usart_config);
+    if (status != SL_STATUS_OK)
     {
-        DEBUGOUT("\r\n Failed to Set  Receiver lines to UART, Error Code : %d \r\n", status);
-    }
-    else
-    {
-        DEBUGOUT("\r\n Set  Receiver lines to UART\r\n");
+        DEBUGOUT("sl_si91x_usart_set_configuration: Error Code : %lu \n", status);
     }
 
-    UARTdrv->Control(ARM_USART_MODE_ASYNCHRONOUS | ARM_USART_DATA_BITS_8 | ARM_USART_PARITY_NONE | ARM_USART_STOP_BITS_1 |
-                         ARM_USART_FLOW_CONTROL_NONE,
-                     BAUD_VALUE);
-    if (status != ARM_DRIVER_OK)
-    {
-        DEBUGOUT("\r\n Failed to Receive data , Error Code : %d \r\n", status);
-    }
-    else
+    // Register user callback function
+    status = sl_si91x_usart_register_event_callback(callback_event);
+    if (status != SL_STATUS_OK)
     {
-        DEBUGOUT("\r\n Receives data success  \r\n");
+        DEBUGOUT("sl_si91x_usart_register_event_callback: Error Code : %lu \n", status);
     }
 
     NVIC_EnableIRQ(USART0_IRQn);
-
     NVIC_SetPriority(USART0_IRQn, 7);
 }
 
@@ -154,8 +113,8 @@ int16_t uartConsoleWrite(const char * Buf, uint16_t BufLength)
         return UART_CONSOLE_ERR;
     }
 
-    status = UARTdrv->Send(Buf, BufLength);
-    if (status != ARM_DRIVER_OK)
+    status = sl_si91x_usart_send_data(usart_handle, Buf, BufLength);
+    if (status != SL_STATUS_OK)
     {
         return status;
     }
@@ -174,8 +133,9 @@ int16_t uartConsoleRead(char * Buf, uint16_t NbBytesToRead)
     {
         return UART_CONSOLE_ERR;
     }
-    status = UARTdrv->Receive(Buf, NbBytesToRead);
-    if (status != ARM_DRIVER_OK)
+
+    status = sl_si91x_usart_receive_data(usart_handle, Buf, NbBytesToRead);
+    if (status != SL_STATUS_OK)
     {
         return status;
     }
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
index 477ecf1214b0bf..a4fb8f1ac684dc 100644
--- a/examples/platform/silabs/efr32/BUILD.gn
+++ b/examples/platform/silabs/efr32/BUILD.gn
@@ -63,11 +63,8 @@ if (chip_enable_wifi) {
   import("${chip_root}/src/platform/silabs/wifi_args.gni")
 
   if (use_rs9116) {
-    wiseconnect_sdk_root =
-        "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
     import("rs911x/rs911x.gni")
   } else if (use_SiWx917) {
-    wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk"
     import("rs911x/rs9117.gni")
   }
   if (use_wf200) {
diff --git a/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h b/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h
index e563f31d638b40..e906e48ab02684 100644
--- a/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h
+++ b/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h
@@ -86,7 +86,7 @@
 #define OPENTHREAD_CONFIG_JOINER_ENABLE 0
 #define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
 #define OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE 0
-#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
+#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER
 #define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
 #define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
 #define OPENTHREAD_CONFIG_TCP_ENABLE 0
diff --git a/examples/platform/silabs/efr32/rs911x/rs9117.gni b/examples/platform/silabs/efr32/rs911x/rs9117.gni
index 3aa5e3e775b999..a753a66153bec4 100644
--- a/examples/platform/silabs/efr32/rs911x/rs9117.gni
+++ b/examples/platform/silabs/efr32/rs911x/rs9117.gni
@@ -1,15 +1,13 @@
 import("//build_overrides/chip.gni")
-
-examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
-wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
-wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk"
+import("//build_overrides/efr32_sdk.gni")
+import("${efr32_sdk_build_root}/efr32_sdk.gni")
 
 rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/sl_wifi_if.c",
   "${examples_plat_dir}/rs911x/wfx_rsi_host.c",
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_interrupt.c",
   "${examples_plat_dir}/rs911x/hal/efx_spi.c",
-  "${wifi_sdk_dir}/wfx_notify.cpp",
+  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
 ]
 
 rs911x_inc_plat = [
diff --git a/examples/platform/silabs/efr32/rs911x/rs911x.gni b/examples/platform/silabs/efr32/rs911x/rs911x.gni
index 0c305ce810abd1..6b52ff1b99c676 100644
--- a/examples/platform/silabs/efr32/rs911x/rs911x.gni
+++ b/examples/platform/silabs/efr32/rs911x/rs911x.gni
@@ -1,8 +1,6 @@
 import("//build_overrides/chip.gni")
-
-examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
-wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
-wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
+import("//build_overrides/efr32_sdk.gni")
+import("${efr32_sdk_build_root}/efr32_sdk.gni")
 
 rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/rsi_if.c",
@@ -11,7 +9,7 @@ rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_ioports.c",
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_timer.c",
   "${examples_plat_dir}/rs911x/hal/efx_spi.c",
-  "${wifi_sdk_dir}/wfx_notify.cpp",
+  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
 ]
 
 #
diff --git a/examples/platform/silabs/efr32/wf200/wf200.gni b/examples/platform/silabs/efr32/wf200/wf200.gni
index 4cd2943b12f8fb..7e3b4ae6f18d75 100644
--- a/examples/platform/silabs/efr32/wf200/wf200.gni
+++ b/examples/platform/silabs/efr32/wf200/wf200.gni
@@ -1,11 +1,10 @@
 import("//build_overrides/chip.gni")
-
-examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
-wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
+import("//build_overrides/efr32_sdk.gni")
+import("${efr32_sdk_build_root}/efr32_sdk.gni")
 
 wf200_plat_incs = [ "${examples_plat_dir}/wf200" ]
 wf200_plat_src = [
-  "${wifi_sdk_dir}/wfx_notify.cpp",
+  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
   "${examples_plat_dir}/wf200/sl_wfx_task.c",
   "${examples_plat_dir}/wf200/wf200_init.c",
   "${examples_plat_dir}/wf200/efr_spi.c",
diff --git a/examples/platform/telink/common/include/AppEventCommon.h b/examples/platform/telink/common/include/AppEventCommon.h
index 0110cd3c840e63..b9fa40ece20bc5 100644
--- a/examples/platform/telink/common/include/AppEventCommon.h
+++ b/examples/platform/telink/common/include/AppEventCommon.h
@@ -39,6 +39,7 @@ struct AppEvent
         kEventType_Install,
         kEventType_Contact,
         kEventType_Start,
+        kEventType_Lock
     };
 
     uint16_t Type;
diff --git a/examples/platform/telink/common/include/AppTaskCommon.h b/examples/platform/telink/common/include/AppTaskCommon.h
index 6652a55210f601..8cb25d4e8cbede 100644
--- a/examples/platform/telink/common/include/AppTaskCommon.h
+++ b/examples/platform/telink/common/include/AppTaskCommon.h
@@ -29,6 +29,10 @@
 #include "PWMDevice.h"
 #endif
 
+#ifdef CONFIG_WS2812_STRIP
+#include "WS2812Device.h"
+#endif
+
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
@@ -103,7 +107,7 @@ class AppTaskCommon
     static void StartBleAdvHandler(AppEvent * aEvent);
 #endif
 
-#if APP_USE_THREAD_START_BUTTON
+#if APP_USE_THREAD_START_BUTTON || !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
     static void StartThreadButtonEventHandler(void);
     static void StartThreadHandler(AppEvent * aEvent);
 #endif
diff --git a/examples/temperature-measurement-app/telink/include/SensorManager.h b/examples/platform/telink/common/include/SensorManagerCommon.h
similarity index 59%
rename from examples/temperature-measurement-app/telink/include/SensorManager.h
rename to examples/platform/telink/common/include/SensorManagerCommon.h
index df1ffcf9378657..7181f8212a944c 100644
--- a/examples/temperature-measurement-app/telink/include/SensorManager.h
+++ b/examples/platform/telink/common/include/SensorManagerCommon.h
@@ -21,29 +21,42 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "AppEventCommon.h"
+#include "AppTaskCommon.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <lib/core/CHIPError.h>
 
+#if defined(CONFIG_CHIP_USE_MARS_SENSOR) && defined(CONFIG_WS2812_STRIP) && !defined(CONFIG_PM)
+#define USE_COLOR_TEMPERATURE_LIGHT
+#endif
+
 class SensorManager
 {
 public:
     CHIP_ERROR Init();
+    CHIP_ERROR GetTempAndHumMeasurValue(int16_t * pTempMeasured, uint16_t * pHumMeasured);
 
-    int16_t GetMeasuredValue();
-    int16_t GetMinMeasuredValue();
-    int16_t GetMaxMeasuredValue();
+    int16_t GetMinMeasuredTempValue();
+    int16_t GetMaxMeasuredTempValue();
 
 private:
     friend SensorManager & SensorMgr();
 
-    // Reads new generated sensor value, stores it, and updates local temperature attribute
-    static int16_t SensorEventHandler();
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+    static void SensorBanForNextMeasurTimerTimeoutCallback(k_timer * timer);
+
+#ifdef USE_COLOR_TEMPERATURE_LIGHT
+    WS2812Device mWS2812Device;
+    void SetColorTemperatureLight(int8_t temp);
+#endif // USE_COLOR_TEMPERATURE_LIGHT
 
-    int16_t mMeasuredTempCelsius;
+    // SHT30 operating range −40…125°C
+    int16_t mMinMeasuredTempCelsius = -40;
+    int16_t mMaxMeasuredTempCelsius = 125;
+#else
     int16_t mMinMeasuredTempCelsius = -40;
     int16_t mMaxMeasuredTempCelsius = 120;
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
 
     static SensorManager sSensorManager;
 };
diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
index 0731410dfe07da..d2aa42bfdeb258 100644
--- a/examples/platform/telink/common/src/AppTaskCommon.cpp
+++ b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -73,7 +73,7 @@ constexpr uint32_t kIdentifyFinishOffRateMs     = 50;
 constexpr uint32_t kIdentifyChannelChangeRateMs = 1000;
 constexpr uint32_t kIdentifyBreatheRateMs       = 1000;
 
-const struct pwm_dt_spec sPwmIdentifySpecGreenLed = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led3));
+const struct pwm_dt_spec sPwmIdentifySpecGreenLed = PWM_DT_SPEC_GET_OR(DT_ALIAS(pwm_led3), {});
 #endif
 
 #if APP_SET_NETWORK_COMM_ENDPOINT_SEC
@@ -140,11 +140,13 @@ class AppCallbacks : public AppDelegate
     void OnCommissioningSessionStarted() override { isComissioningStarted = true; }
     void OnCommissioningSessionStopped() override { isComissioningStarted = false; }
     void OnCommissioningSessionEstablishmentError(CHIP_ERROR err) override { sIsCommissioningFailed = true; }
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
     void OnCommissioningWindowClosed() override
     {
         if (!isComissioningStarted)
             chip::DeviceLayer::Internal::BLEMgr().Shutdown();
     }
+#endif
 };
 
 AppCallbacks sCallbacks;
@@ -240,6 +242,10 @@ CHIP_ERROR AppTaskCommon::StartApp(void)
 
     AppEvent event = {};
 
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+    StartThreadButtonEventHandler();
+#endif
+
     while (true)
     {
         GetEvent(&event);
@@ -255,7 +261,7 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     // Initialize status LED
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
     LEDWidget::SetStateUpdateCallback(LEDStateUpdateHandler);
-    sStatusLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(system_state_led), gpios));
+    sStatusLED.Init(GPIO_DT_SPEC_GET_OR(DT_ALIAS(system_state_led), gpios, {}));
 
     UpdateStatusLED();
 #endif
@@ -611,7 +617,7 @@ void AppTaskCommon::FactoryResetTimerEventHandler(AppEvent * aEvent)
     LOG_INF("Factory Reset Trigger Counter is cleared");
 }
 
-#if APP_USE_THREAD_START_BUTTON
+#if APP_USE_THREAD_START_BUTTON || !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 void AppTaskCommon::StartThreadButtonEventHandler(void)
 {
     AppEvent event;
@@ -628,8 +634,13 @@ void AppTaskCommon::StartThreadHandler(AppEvent * aEvent)
     if (!chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned())
     {
         // Switch context from BLE to Thread
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
         Internal::BLEManagerImpl sInstance;
         sInstance.SwitchToIeee802154();
+#else
+        ThreadStackMgrImpl().SetRadioBlocked(false);
+        ThreadStackMgrImpl().SetThreadEnabled(true);
+#endif
         StartDefaultThreadNetwork();
     }
     else
diff --git a/examples/platform/telink/common/src/SensorManagerCommon.cpp b/examples/platform/telink/common/src/SensorManagerCommon.cpp
new file mode 100644
index 00000000000000..1c4d5f9990a0cb
--- /dev/null
+++ b/examples/platform/telink/common/src/SensorManagerCommon.cpp
@@ -0,0 +1,251 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "SensorManagerCommon.h"
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+#include <zephyr/drivers/sensor.h>
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
+
+LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
+
+using namespace chip;
+using namespace ::chip::DeviceLayer;
+
+constexpr float kMinTempDelta = 0.5; // 0.5 degree Celsius
+
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+k_timer sSensorBanForNextMeasurTimer;
+volatile bool mSensorBanForNextMeasurFlag         = false;
+constexpr uint16_t kSensorBanForNextMeasurTimeout = 1000; // 1s timeout
+
+const struct device * const sht3xd_dev = DEVICE_DT_GET_ONE(sensirion_sht3xd);
+
+#ifdef USE_COLOR_TEMPERATURE_LIGHT
+const struct device * const ws2812_dev = DEVICE_DT_GET(DT_ALIAS(led_strip));
+
+#define TEMP_LOW_LIM 0   // °C
+#define TEMP_HIGH_LIM 40 // °C
+#endif                   // USE_COLOR_TEMPERATURE_LIGHT
+#else
+constexpr float kSimulatedHum                 = 55.5; // percents
+constexpr uint16_t kSimulatedReadingFrequency = 4;    // change simulated number
+static float mSimulatedTemp[]                 = { 23.01, 24.02, 28.03, 25.50, 22.05, 21.25, 21.07, 26.08, 18.09, 27.11 };
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
+
+SensorManager SensorManager::sSensorManager;
+
+CHIP_ERROR SensorManager::Init()
+{
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+    if (!device_is_ready(sht3xd_dev))
+    {
+        LOG_ERR("Device %s is not ready", sht3xd_dev->name);
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+#ifdef USE_COLOR_TEMPERATURE_LIGHT
+    RgbColor_t rgb = { 0 };
+
+    CHIP_ERROR err = sSensorManager.mWS2812Device.Init(ws2812_dev, STRIP_NUM_PIXELS(led_strip));
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("WS2812 Device Init fail");
+        return err;
+    }
+
+    sSensorManager.mWS2812Device.SetLevel(&rgb);
+    sSensorManager.mWS2812Device.Set(SET_RGB_TURN_ON);
+#endif // USE_COLOR_TEMPERATURE_LIGHT
+
+    // Initialise the timer to ban sensor measurement
+    k_timer_init(&sSensorBanForNextMeasurTimer, &SensorManager::SensorBanForNextMeasurTimerTimeoutCallback, nullptr);
+    k_timer_user_data_set(&sSensorBanForNextMeasurTimer, this);
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR SensorManager::GetTempAndHumMeasurValue(int16_t * pTempMeasured, uint16_t * pHumMeasured)
+{
+    static float lastTemp = 0.0;
+    float temp            = 0.0;
+    float hum             = 0.0;
+
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+    static struct sensor_value sensorTemp = { 0 };
+    static struct sensor_value sensorHum  = { 0 };
+
+    if (!mSensorBanForNextMeasurFlag)
+    {
+        int status = sensor_sample_fetch(sht3xd_dev);
+        if (status)
+        {
+            LOG_ERR("Device %s is not ready to fetch the sensor samples (status: %d)", sht3xd_dev->name, status);
+            return System::MapErrorZephyr(status);
+        }
+
+        status = sensor_channel_get(sht3xd_dev, SENSOR_CHAN_AMBIENT_TEMP, &sensorTemp);
+        if (status)
+        {
+            LOG_ERR("Device %s is not ready to temperature measurement (status: %d)", sht3xd_dev->name, status);
+            return System::MapErrorZephyr(status);
+        }
+
+        status = sensor_channel_get(sht3xd_dev, SENSOR_CHAN_HUMIDITY, &sensorHum);
+        if (status)
+        {
+            LOG_ERR("Device %s is not ready to humidity measurement (status: %d)", sht3xd_dev->name, status);
+            return System::MapErrorZephyr(status);
+        }
+
+        mSensorBanForNextMeasurFlag = true;
+
+        // Start next timer to measurement the air quality sensor
+        k_timer_start(&sSensorBanForNextMeasurTimer, K_MSEC(kSensorBanForNextMeasurTimeout), K_NO_WAIT);
+    }
+
+    temp = (float) sensor_value_to_double(&sensorTemp);
+    hum  = (float) sensor_value_to_double(&sensorHum);
+
+#ifdef USE_COLOR_TEMPERATURE_LIGHT
+    SetColorTemperatureLight(temp);
+#endif // USE_COLOR_TEMPERATURE_LIGHT
+#else
+    /* Temperature simulation is used */
+    static uint8_t nbOfRepetition = 0;
+    static uint8_t simulatedIndex = 0;
+    if (simulatedIndex >= ArraySize(mSimulatedTemp))
+    {
+        simulatedIndex = 0;
+    }
+    temp = mSimulatedTemp[simulatedIndex];
+
+    nbOfRepetition++;
+
+    if (nbOfRepetition >= kSimulatedReadingFrequency)
+    {
+        simulatedIndex++;
+        nbOfRepetition = 0;
+    }
+
+    /* Humidity simulation is used */
+    hum = kSimulatedHum;
+
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
+
+    if ((temp >= (lastTemp + kMinTempDelta)) || temp <= (lastTemp - kMinTempDelta))
+    {
+        lastTemp = temp;
+    }
+    else
+    {
+        temp = lastTemp;
+    }
+
+    if (pTempMeasured != NULL)
+    {
+        // Per spec Application Clusters 2.3.4.1. : MeasuredValue = 100 x temperature [°C]
+        *pTempMeasured = (int16_t) 100 * temp;
+    }
+
+    if (pHumMeasured != NULL)
+    {
+        *pHumMeasured = (uint16_t) hum;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+int16_t SensorManager::GetMinMeasuredTempValue()
+{
+    return mMinMeasuredTempCelsius;
+}
+
+int16_t SensorManager::GetMaxMeasuredTempValue()
+{
+    return mMaxMeasuredTempCelsius;
+}
+
+#ifdef CONFIG_CHIP_USE_MARS_SENSOR
+void SensorManager::SensorBanForNextMeasurTimerTimeoutCallback(k_timer * timer)
+{
+    if (!timer)
+    {
+        return;
+    }
+
+    mSensorBanForNextMeasurFlag = false;
+}
+
+#ifdef USE_COLOR_TEMPERATURE_LIGHT
+void SensorManager::SetColorTemperatureLight(int8_t temp)
+{
+    RgbColor_t rgb = { 0 };
+
+    if (temp >= mMinMeasuredTempCelsius && temp <= TEMP_LOW_LIM)
+    {
+        /* Set Color Temperature Light in range -40...0°C */
+        rgb.b = RGB_MAX_VALUE * (1 - ((float) temp - TEMP_LOW_LIM) / (mMinMeasuredTempCelsius - TEMP_LOW_LIM));
+    }
+    else if (temp >= TEMP_HIGH_LIM && temp <= mMaxMeasuredTempCelsius)
+    {
+        /* Set Color Temperature Light in range 40...125°C */
+        rgb.r = RGB_MAX_VALUE * (1 - ((float) temp - TEMP_HIGH_LIM) / (mMaxMeasuredTempCelsius - TEMP_HIGH_LIM));
+    }
+    else if (temp > TEMP_LOW_LIM && temp < TEMP_HIGH_LIM)
+    {
+        uint8_t steps_in_part = (TEMP_HIGH_LIM - TEMP_LOW_LIM) / 4;
+        uint8_t step_num      = temp % steps_in_part;
+        float step_val        = (float) RGB_MAX_VALUE / steps_in_part;
+
+        if (temp < steps_in_part)
+        {
+            /* Set Color Temperature Light in range 1...9°C */
+            rgb.b = RGB_MAX_VALUE;
+            rgb.g = step_num * step_val;
+        }
+        else if (temp < 2 * steps_in_part)
+        {
+            /* Set Color Temperature Light in range 10...19°C */
+            rgb.b = RGB_MAX_VALUE;
+            rgb.g = RGB_MAX_VALUE;
+            rgb.r = step_num * step_val;
+        }
+        else if (temp < 3 * steps_in_part)
+        {
+            /* Set Color Temperature Light in range 20...29°C */
+            rgb.r = RGB_MAX_VALUE;
+            rgb.g = RGB_MAX_VALUE;
+            rgb.b = RGB_MAX_VALUE - (step_num * step_val);
+        }
+        else
+        {
+            /* Set Color Temperature Light in range 30...39°C */
+            rgb.r = RGB_MAX_VALUE;
+            rgb.g = RGB_MAX_VALUE - (step_num * step_val);
+        }
+    }
+    else
+    {
+        LOG_ERR("Couldn't set the Color Temperature Light");
+    }
+
+    sSensorManager.mWS2812Device.SetLevel(&rgb);
+}
+#endif // USE_COLOR_TEMPERATURE_LIGHT
+#endif // CONFIG_CHIP_USE_MARS_SENSOR
diff --git a/examples/platform/telink/util/include/WS2812Device.h b/examples/platform/telink/util/include/WS2812Device.h
new file mode 100644
index 00000000000000..261802bde5f5be
--- /dev/null
+++ b/examples/platform/telink/util/include/WS2812Device.h
@@ -0,0 +1,57 @@
+/*
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <ColorFormat.h>
+
+#include <zephyr/drivers/led_strip.h>
+
+#include <system/SystemError.h>
+
+#define STRIP_NUM_PIXELS(LED_STRIP) DT_PROP(DT_ALIAS(LED_STRIP), chain_length)
+#define RGB_MIN_VALUE 0
+#define RGB_MAX_VALUE 255
+
+#define SET_RGB_TURN_OFF 0
+#define SET_RGB_TURN_ON 1
+
+class WS2812Device
+{
+public:
+    CHIP_ERROR Init(const struct device * ws2812Device, uint32_t aChainLength);
+    void SetLevel(RgbColor_t * pRgb);
+    void Set(bool aTurnOn);
+    bool IsTurnedOn(void);
+    uint8_t GetBlueLevel(void) const { return mLedRgb.b; }
+    uint8_t GetGreenLevel(void) const { return mLedRgb.g; }
+    uint8_t GetRedLevel(void) const { return mLedRgb.r; }
+
+private:
+    enum WS2812State_t : uint8_t
+    {
+        kRgbState_On = 0,
+        kRgbState_Off,
+    };
+
+    void UpdateRgbLight();
+
+    const struct device * mWs2812Device;
+    uint32_t mChainLength;
+    RgbColor_t mLedRgb;
+    WS2812State_t mState;
+};
diff --git a/examples/platform/telink/util/src/LEDWidget.cpp b/examples/platform/telink/util/src/LEDWidget.cpp
index 0ea31d5d1b9eee..9db20104b6a69b 100644
--- a/examples/platform/telink/util/src/LEDWidget.cpp
+++ b/examples/platform/telink/util/src/LEDWidget.cpp
@@ -38,10 +38,17 @@ void LEDWidget::Init(gpio_dt_spec gpio)
     mGPIO           = gpio;
     mState          = false;
 
-    int ret = gpio_pin_configure_dt(&mGPIO, GPIO_OUTPUT_ACTIVE);
-    if (ret < 0)
+    if (!gpio_is_ready_dt(&mGPIO))
+    {
+        LOG_ERR("GPIO device not ready");
+    }
+    else
     {
-        LOG_ERR("GPIO pin %d configure - fail. Status%d\n", mGPIO.pin, ret);
+        int ret = gpio_pin_configure_dt(&mGPIO, GPIO_OUTPUT_ACTIVE);
+        if (ret < 0)
+        {
+            LOG_ERR("GPIO pin %d configure - fail. Status%d\n", mGPIO.pin, ret);
+        }
     }
 
     k_timer_init(&mLedTimer, &LEDWidget::LedStateTimerHandler, nullptr);
@@ -88,6 +95,10 @@ void LEDWidget::ScheduleStateChange()
 
 void LEDWidget::DoSet(bool state)
 {
+    if (!gpio_is_ready_dt(&mGPIO))
+    {
+        return;
+    }
     mState  = state;
     int ret = gpio_pin_set_dt(&mGPIO, state);
     if (ret < 0)
diff --git a/examples/platform/telink/util/src/PWMDevice.cpp b/examples/platform/telink/util/src/PWMDevice.cpp
index 3bdc8509cb0afa..8456d5482a3e6e 100644
--- a/examples/platform/telink/util/src/PWMDevice.cpp
+++ b/examples/platform/telink/util/src/PWMDevice.cpp
@@ -25,7 +25,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
-LOG_MODULE_DECLARE(app);
+LOG_MODULE_REGISTER(PWMDevice);
 
 constexpr uint32_t kBreatheStepTimeMS = 10;
 
@@ -44,8 +44,7 @@ CHIP_ERROR PWMDevice::Init(const pwm_dt_spec * pwmDevice, uint8_t aMinLevel, uin
 
     if (!device_is_ready(mPwmDevice->dev))
     {
-        LOG_ERR("PWM device %s is not ready", mPwmDevice->dev->name);
-        return CHIP_ERROR_INCORRECT_STATE;
+        LOG_ERR("PWM device %s is not ready", mPwmDevice->dev ? mPwmDevice->dev->name : "N/A");
     }
 
     k_timer_init(&mPwmLedTimer, &PWMDevice::PwmLedTimerHandler, nullptr);
@@ -134,6 +133,10 @@ void PWMDevice::Set(bool aOn)
 
 void PWMDevice::UpdateLight(void)
 {
+    if (!device_is_ready(mPwmDevice->dev))
+    {
+        return;
+    }
     constexpr uint32_t kPwmWidthUs  = 20000u;
     const uint8_t maxEffectiveLevel = mMaxLevel - mMinLevel;
     const uint8_t effectiveLevel    = mState == kState_On ? chip::min<uint8_t>(mLevel - mMinLevel, maxEffectiveLevel) : 0;
diff --git a/examples/platform/telink/util/src/WS2812Device.cpp b/examples/platform/telink/util/src/WS2812Device.cpp
new file mode 100644
index 00000000000000..06b70373f8ff29
--- /dev/null
+++ b/examples/platform/telink/util/src/WS2812Device.cpp
@@ -0,0 +1,85 @@
+/*
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "WS2812Device.h"
+
+#include <lib/support/CodeUtils.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(WS2812Device);
+
+using namespace chip;
+
+CHIP_ERROR WS2812Device::Init(const struct device * ws2812Device, uint32_t aChainLength)
+{
+    mWs2812Device = ws2812Device;
+    mChainLength  = aChainLength;
+    mState        = kRgbState_Off;
+    memset(&mLedRgb, RGB_MAX_VALUE, sizeof(RgbColor_t));
+
+    if (!device_is_ready(mWs2812Device))
+    {
+        LOG_ERR("Device %s is not ready", mWs2812Device->name);
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    UpdateRgbLight();
+
+    return CHIP_NO_ERROR;
+}
+
+void WS2812Device::UpdateRgbLight()
+{
+    int status;
+    led_rgb setRgb = { 0 };
+
+    if (mState == kRgbState_On)
+    {
+        setRgb.r = mLedRgb.r;
+        setRgb.g = mLedRgb.g;
+        setRgb.b = mLedRgb.b;
+    }
+
+    status = led_strip_update_rgb(mWs2812Device, &setRgb, mChainLength);
+    if (status)
+    {
+        LOG_ERR("Couldn't update strip: %d", status);
+    }
+}
+
+void WS2812Device::SetLevel(RgbColor_t * pRgb)
+{
+    if (pRgb != NULL)
+    {
+        memcpy(&mLedRgb, pRgb, sizeof(RgbColor_t));
+    }
+
+    UpdateRgbLight();
+}
+
+void WS2812Device::Set(bool aTurnOn)
+{
+    mState = aTurnOn ? kRgbState_On : kRgbState_Off;
+    UpdateRgbLight();
+}
+
+bool WS2812Device::IsTurnedOn()
+{
+    return mState == kRgbState_On;
+}
diff --git a/examples/platform/tizen/OptionsProxy.cpp b/examples/platform/tizen/OptionsProxy.cpp
index f970887ba140b1..c00ac172e6627d 100644
--- a/examples/platform/tizen/OptionsProxy.cpp
+++ b/examples/platform/tizen/OptionsProxy.cpp
@@ -22,8 +22,8 @@
 
 #include <app_control.h>
 
-#include <core/CHIPBuildConfig.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 namespace {
 
diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md
index d3d53d87e7634b..6bfb8feee4665f 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/README.md
+++ b/examples/pump-app/cc13x2x7_26x2x7/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,7 +87,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -95,7 +95,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -104,7 +104,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
index 08385526ae14d9..7ad0521fef77de 100644
--- a/examples/pump-app/cc13x4_26x4/README.md
+++ b/examples/pump-app/cc13x4_26x4/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,7 +87,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -95,7 +95,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -104,7 +104,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-app/nrfconnect/CMakeLists.txt b/examples/pump-app/nrfconnect/CMakeLists.txt
index 94ae9180fb6392..7682c0ca663ffd 100644
--- a/examples/pump-app/nrfconnect/CMakeLists.txt
+++ b/examples/pump-app/nrfconnect/CMakeLists.txt
@@ -68,5 +68,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
diff --git a/examples/pump-app/nrfconnect/README.md b/examples/pump-app/nrfconnect/README.md
index eab5c9bc72df33..50e8a1b0e6d0a0 100644
--- a/examples/pump-app/nrfconnect/README.md
+++ b/examples/pump-app/nrfconnect/README.md
@@ -211,93 +211,63 @@ NFC.
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
-
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-        $ docker pull nordicsemi/nrfconnect-chip
+### Install Command Line Tools
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+### Install Toolchain Manager
 
-    In this command:
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the Matter
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
+To install the Toolchain Manager app, complete the following steps:
 
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the Matter and the nRF
-    Connect SDK build scripts. Replace _nrfconnect-dir_ with the path to your
-    nRF Connect SDK installation directory, and _toolchain-dir_ with the path to
-    GNU Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -305,8 +275,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index ca5ebd2d034af0..f36333ff359b87 100644
--- a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/pump-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/pump-app/nrfconnect/main/include/CHIPProjectConfig.h
index 7f6a313e145f87..4baa186190f638 100644
--- a/examples/pump-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/pump-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -26,7 +26,3 @@
  */
 
 #pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/pump-app/nrfconnect/prj.conf b/examples/pump-app/nrfconnect/prj.conf
index 008a66be940be3..8940955d52b403 100644
--- a/examples/pump-app/nrfconnect/prj.conf
+++ b/examples/pump-app/nrfconnect/prj.conf
@@ -38,3 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/pump-app/nrfconnect/prj_release.conf b/examples/pump-app/nrfconnect/prj_release.conf
index fbcfe2fe16545e..ac2b6e09ade94d 100644
--- a/examples/pump-app/nrfconnect/prj_release.conf
+++ b/examples/pump-app/nrfconnect/prj_release.conf
@@ -51,3 +51,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index b73ddb2d490f40..a0199d54baf41f 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -67,6 +71,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -88,12 +93,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -104,7 +111,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -112,7 +119,7 @@ server cluster LevelControl = 8 {
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -124,55 +131,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -187,6 +194,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -217,6 +226,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -239,6 +250,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -311,6 +324,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -386,6 +401,8 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -396,6 +413,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -470,6 +489,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -545,6 +566,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -583,13 +606,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -609,6 +632,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -638,6 +663,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -654,11 +680,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -733,6 +762,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -750,6 +781,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -831,6 +864,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -844,11 +878,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -946,9 +988,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
@@ -961,11 +1003,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1011,6 +1055,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1127,6 +1173,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1199,6 +1247,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1321,9 +1371,11 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1335,6 +1387,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1358,6 +1412,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1372,6 +1428,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1462,11 +1520,13 @@ endpoint 0 {
     callback attribute productLabel;
     callback attribute serialNumber;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1535,14 +1595,17 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 6e21cc9d3de2cf..8b75e480002c3c 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -680,6 +680,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -754,7 +786,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1575,6 +1607,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1610,6 +1658,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1700,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1884,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1900,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1916,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3161,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4001,7 +4065,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4017,7 +4081,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4033,7 +4097,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index 1738d10a837777..8a3fff69bc1624 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -67,6 +71,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -88,12 +93,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -104,7 +111,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -112,7 +119,7 @@ server cluster LevelControl = 8 {
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -124,55 +131,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -187,6 +194,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -217,6 +226,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -239,6 +250,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -311,6 +324,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -386,6 +401,8 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -396,6 +413,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -470,6 +489,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -545,6 +566,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -583,13 +606,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -609,6 +632,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -638,6 +663,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -654,11 +680,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -733,6 +762,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -750,6 +781,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -831,6 +864,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -844,11 +878,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -946,9 +988,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
@@ -961,11 +1003,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1011,6 +1055,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1127,6 +1173,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1199,6 +1247,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1321,9 +1371,11 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1335,6 +1387,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1358,6 +1412,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1372,6 +1428,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1462,11 +1520,13 @@ endpoint 0 {
     callback attribute productLabel;
     callback attribute serialNumber;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1535,14 +1595,17 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap
index 30e326a3bf068c..495fff6f0fbb6d 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -680,6 +680,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -754,7 +786,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1575,6 +1607,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1610,6 +1658,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1700,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1884,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1900,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1916,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3161,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4001,7 +4065,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4017,7 +4081,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4033,7 +4097,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index 1738d10a837777..8a3fff69bc1624 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -67,6 +71,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -88,12 +93,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -104,7 +111,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -112,7 +119,7 @@ server cluster LevelControl = 8 {
   readonly attribute nullable int8u currentLevel = 0;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute nullable int8u onLevel = 17;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -124,55 +131,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -187,6 +194,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -217,6 +226,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -239,6 +250,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -311,6 +324,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -386,6 +401,8 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -396,6 +413,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -470,6 +489,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -545,6 +566,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -583,13 +606,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -609,6 +632,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -638,6 +663,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -654,11 +680,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -733,6 +762,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -750,6 +781,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -831,6 +864,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -844,11 +878,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -946,9 +988,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
@@ -961,11 +1003,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1011,6 +1055,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1127,6 +1173,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1199,6 +1247,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1321,9 +1371,11 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1335,6 +1387,8 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1358,6 +1412,8 @@ server cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 server cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1372,6 +1428,8 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -1462,11 +1520,13 @@ endpoint 0 {
     callback attribute productLabel;
     callback attribute serialNumber;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1535,14 +1595,17 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
index 30e326a3bf068c..495fff6f0fbb6d 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
@@ -680,6 +680,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -754,7 +786,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1575,6 +1607,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1610,6 +1658,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1700,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1884,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1900,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1916,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3161,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4001,7 +4065,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4017,7 +4081,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4033,7 +4097,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/pump-app/telink/prj.conf b/examples/pump-app/telink/prj.conf
index 3c0fd17786ef74..13eb622c61a548 100755
--- a/examples/pump-app/telink/prj.conf
+++ b/examples/pump-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
index 90df4c9c7bd521..f20a3151e912a2 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
index dc917f93c5544e..15894f7d596323 100644
--- a/examples/pump-controller-app/cc13x4_26x4/README.md
+++ b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-controller-app/nrfconnect/CMakeLists.txt b/examples/pump-controller-app/nrfconnect/CMakeLists.txt
index 8a5b8f4193b245..52ece075e286ee 100644
--- a/examples/pump-controller-app/nrfconnect/CMakeLists.txt
+++ b/examples/pump-controller-app/nrfconnect/CMakeLists.txt
@@ -68,5 +68,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
diff --git a/examples/pump-controller-app/nrfconnect/README.md b/examples/pump-controller-app/nrfconnect/README.md
index 0b601a5d5c778d..948aa20f54d0d8 100644
--- a/examples/pump-controller-app/nrfconnect/README.md
+++ b/examples/pump-controller-app/nrfconnect/README.md
@@ -208,96 +208,66 @@ information from the CHIP device in a data payload that can be shared using NFC.
 
 ## Setting up the environment
 
-Before building the example, check out the CHIP repository and sync submodules
+Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
-
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-        $ docker pull nordicsemi/nrfconnect-chip
+### Install Command Line Tools
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+### Install Toolchain Manager
 
-    In this command:
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
+To install the Toolchain Manager app, complete the following steps:
 
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
-
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the CHIP and the nRF Connect
-    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
-    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
-    Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _chip-dir_ with the path to CHIP repository
-    directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd chip-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -305,8 +275,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index ca5ebd2d034af0..f36333ff359b87 100644
--- a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,8 +14,15 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/examples/pump-controller-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/pump-controller-app/nrfconnect/main/include/CHIPProjectConfig.h
index 7f6a313e145f87..4baa186190f638 100644
--- a/examples/pump-controller-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/pump-controller-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -26,7 +26,3 @@
  */
 
 #pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/pump-controller-app/nrfconnect/prj.conf b/examples/pump-controller-app/nrfconnect/prj.conf
index f8774b9f2f0f4b..857ad459b83707 100644
--- a/examples/pump-controller-app/nrfconnect/prj.conf
+++ b/examples/pump-controller-app/nrfconnect/prj.conf
@@ -38,3 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/pump-controller-app/nrfconnect/prj_release.conf b/examples/pump-controller-app/nrfconnect/prj_release.conf
index bd9e21dae49b03..6826b31ca3679b 100644
--- a/examples/pump-controller-app/nrfconnect/prj_release.conf
+++ b/examples/pump-controller-app/nrfconnect/prj_release.conf
@@ -52,3 +52,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index 0f95bb9b2ac941..a67089b8fa06b1 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -67,6 +71,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -87,7 +92,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -112,6 +117,8 @@ client cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -142,6 +149,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -164,6 +173,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -236,6 +247,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -311,6 +324,8 @@ server cluster BasicInformation = 40 {
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -321,6 +336,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -395,6 +412,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -470,6 +489,8 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -508,13 +529,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -534,6 +555,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -563,6 +586,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -579,11 +603,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -658,6 +685,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -675,6 +704,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -756,6 +787,7 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterface networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -769,11 +801,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -871,9 +911,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute nullable SecurityPolicy securityPolicy = 59;
   readonly attribute nullable octet_string<4> channelPage0Mask = 60;
@@ -886,11 +926,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -936,6 +978,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1052,6 +1096,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1124,6 +1170,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 client cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -1246,9 +1294,11 @@ client cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute optional int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1260,6 +1310,8 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 client cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -1283,6 +1335,8 @@ client cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 client cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1348,11 +1402,13 @@ endpoint 0 {
     callback attribute productLabel;
     callback attribute serialNumber;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1421,14 +1477,17 @@ endpoint 0 {
     emits event BootReason;
     callback attribute networkInterfaces;
     callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
     callback attribute testEventTriggersEnabled default = false;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index cb7f4b298c5fbb..b49eda85d62b1c 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -680,6 +680,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -754,7 +786,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1575,6 +1607,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1610,6 +1658,22 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "TestEventTriggersEnabled",
               "code": 8,
@@ -1700,7 +1764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1884,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1900,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1916,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/pump-controller-app/telink/prj.conf b/examples/pump-controller-app/telink/prj.conf
index 2d4670fa37ebd8..3b647100515c62 100755
--- a/examples/pump-controller-app/telink/prj.conf
+++ b/examples/pump-controller-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
index 90aec364488d93..afa708a1ae8320 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -3,6 +3,8 @@
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -37,6 +39,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -109,6 +113,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -187,6 +193,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -200,7 +208,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -215,6 +225,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -239,7 +251,7 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -253,6 +265,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -263,7 +277,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -274,6 +288,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -312,13 +328,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -338,6 +354,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -367,6 +385,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -383,11 +402,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -434,6 +456,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -468,6 +493,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -486,6 +513,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -586,11 +615,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -632,7 +669,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -665,6 +702,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -699,17 +738,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -826,6 +862,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -898,6 +936,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
@@ -976,11 +1016,13 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList default = 0;
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -1075,9 +1117,11 @@ endpoint 0 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
@@ -1114,7 +1158,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
index b772acad198770..1b693aa645ec51 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
@@ -728,6 +728,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -802,7 +834,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1694,6 +1726,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1915,7 +1963,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2252,14 +2300,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
diff --git a/examples/resource-monitoring-app/linux/BUILD.gn b/examples/resource-monitoring-app/linux/BUILD.gn
deleted file mode 100644
index b9a1e41f92b053..00000000000000
--- a/examples/resource-monitoring-app/linux/BUILD.gn
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/build/chip/tools.gni")
-import("${chip_root}/src/app/common_flags.gni")
-
-assert(chip_build_tools)
-
-import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
-
-config("includes") {
-  include_dirs = [
-    ".",
-    "include",
-  ]
-}
-
-executable("chip-resource-monitoring-app") {
-  sources = [
-    "${chip_root}/examples/resource-monitoring-app/resource-monitoring-common/src/ReplacementProductListManager.cpp",
-    "${chip_root}/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/ActivatedCarbonFilterMonitoring.cpp",
-    "${chip_root}/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/HepaFilterMonitoring.cpp",
-    "include/CHIPProjectAppConfig.h",
-    "src/main.cpp",
-  ]
-
-  deps = [
-    "${chip_root}/examples/platform/linux:app-main",
-    "${chip_root}/examples/resource-monitoring-app/resource-monitoring-common",
-    "${chip_root}/examples/resource-monitoring-app/resource-monitoring-common:delegates",
-    "${chip_root}/src/lib",
-  ]
-
-  include_dirs = [ "include" ]
-
-  # The system_rpc_server.cc file is in pigweed and doesn't compile with
-  # -Wconversion, remove check for RPC build only.
-  cflags = [ "-Wconversion" ]
-
-  output_dir = root_out_dir
-}
-
-group("linux") {
-  deps = [ ":chip-resource-monitoring-app" ]
-}
-
-group("default") {
-  deps = [ ":linux" ]
-}
diff --git a/examples/resource-monitoring-app/linux/README.md b/examples/resource-monitoring-app/linux/README.md
deleted file mode 100644
index ae025e1be261dc..00000000000000
--- a/examples/resource-monitoring-app/linux/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# CHIP Linux Resource Monitoring Example
-
-This is a example app showing the use of the resource monitoring clusters (HEPA
-Filter Monitoring and Activated Carbon Filter Monitoring).
-
-## Building
-
-The application could be build in the same manner as `all-clusters-app`:
-
-```
-? scripts/examples/gn_build_example.sh examples/resource-monitoring-app/linux out/resource-monitoring-app
-```
diff --git a/examples/resource-monitoring-app/linux/entrypoint.sh b/examples/resource-monitoring-app/linux/entrypoint.sh
deleted file mode 100755
index 0fc9527c0cfb6d..00000000000000
--- a/examples/resource-monitoring-app/linux/entrypoint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-service dbus start
-sleep 1
-service avahi-daemon start
-/usr/sbin/otbr-agent -I wpan0 spinel+hdlc+uart:///dev/ttyUSB0 &
-sleep 1
-ot-ctl panid 0x1234
-ot-ctl ifconfig up
-ot-ctl thread start
-
-chip-resource-monitoring-app --thread
diff --git a/examples/resource-monitoring-app/linux/src/main.cpp b/examples/resource-monitoring-app/linux/src/main.cpp
deleted file mode 100644
index b6059739ced19f..00000000000000
--- a/examples/resource-monitoring-app/linux/src/main.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <AppMain.h>
-#include <StaticReplacementProductListManager.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <bitset>
-#include <delegates/ActivatedCarbonFilterMonitoring.h>
-#include <delegates/HepaFilterMonitoring.h>
-#include <stdint.h>
-
-using namespace chip;
-using namespace chip::app;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::ResourceMonitoring;
-
-constexpr std::bitset<4> gHepaFilterFeatureMap{ static_cast<uint32_t>(Feature::kCondition) |
-                                                static_cast<uint32_t>(Feature::kWarning) |
-                                                static_cast<uint32_t>(Feature::kReplacementProductList) };
-constexpr std::bitset<4> gActivatedCarbonFeatureMap{ static_cast<uint32_t>(Feature::kCondition) |
-                                                     static_cast<uint32_t>(Feature::kWarning) |
-                                                     static_cast<uint32_t>(Feature::kReplacementProductList) };
-
-static HepaFilterMonitoringDelegate gHepaFilterDelegate;
-static ResourceMonitoring::Instance gHepaFilterInstance(&gHepaFilterDelegate, 0x1, HepaFilterMonitoring::Id,
-                                                        static_cast<uint32_t>(gHepaFilterFeatureMap.to_ulong()),
-                                                        Clusters::ResourceMonitoring::DegradationDirectionEnum::kDown, true);
-
-static ActivatedCarbonFilterMonitoringDelegate gActivatedCarbonFilterDelegate;
-static ResourceMonitoring::Instance gActivatedCarbonFilterInstance(&gActivatedCarbonFilterDelegate, 0x1,
-                                                                   ActivatedCarbonFilterMonitoring::Id,
-                                                                   static_cast<uint32_t>(gActivatedCarbonFeatureMap.to_ulong()),
-                                                                   Clusters::ResourceMonitoring::DegradationDirectionEnum::kDown,
-                                                                   true);
-
-void ApplicationInit()
-{
-    gHepaFilterInstance.Init();
-    gActivatedCarbonFilterInstance.Init();
-}
-
-void ApplicationShutdown() {}
-
-int main(int argc, char * argv[])
-{
-    if (ChipLinuxAppInit(argc, argv) != 0)
-    {
-        return -1;
-    }
-
-    ChipLinuxAppMainLoop();
-
-    return 0;
-}
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/include/ImmutableReplacementProductListManager.h b/examples/resource-monitoring-app/resource-monitoring-common/include/ImmutableReplacementProductListManager.h
deleted file mode 100644
index 2dcbff41372866..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/include/ImmutableReplacementProductListManager.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app/clusters/resource-monitoring-server/replacement-product-list-manager.h>
-#include <app/util/af.h>
-#include <app/util/config.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ResourceMonitoring {
-
-/**
- * This implementation returns an immutable list of replacement products.
- * It holds ReplacementProductListManager::kReplacementProductListMaxSize products in the list.
- */
-
-class ImmutableReplacementProductListManager : public ReplacementProductListManager
-{
-public:
-    CHIP_ERROR Next(ReplacementProductStruct & item) override;
-};
-
-} // namespace ResourceMonitoring
-} // namespace Clusters
-} // namespace app
-} // namespace chip
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/include/StaticReplacementProductListManager.h b/examples/resource-monitoring-app/resource-monitoring-common/include/StaticReplacementProductListManager.h
deleted file mode 100644
index 26601a235fcb1d..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/include/StaticReplacementProductListManager.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app/clusters/resource-monitoring-server/replacement-product-list-manager.h>
-#include <app/util/af.h>
-#include <app/util/config.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ResourceMonitoring {
-
-/**
- * This implementation statically defines the options.
- */
-
-class StaticReplacementProductListManager : public ReplacementProductListManager
-{
-public:
-    CHIP_ERROR Next(ReplacementProductStruct & item) override;
-
-    ~StaticReplacementProductListManager() {}
-    StaticReplacementProductListManager(ReplacementProductStruct * aReplacementProductsList, uint8_t aReplacementProductListSize)
-    {
-        mReplacementProductsList    = aReplacementProductsList;
-        mReplacementProductListSize = aReplacementProductListSize;
-    }
-
-private:
-    ReplacementProductStruct * mReplacementProductsList;
-    uint8_t mReplacementProductListSize;
-};
-
-} // namespace ResourceMonitoring
-} // namespace Clusters
-} // namespace app
-} // namespace chip
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/ActivatedCarbonFilterMonitoring.h b/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/ActivatedCarbonFilterMonitoring.h
deleted file mode 100644
index 9b064f8526906e..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/ActivatedCarbonFilterMonitoring.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-server.h>
-#include <lib/core/CHIPError.h>
-#include <lib/core/DataModelTypes.h>
-#include <protocols/interaction_model/StatusCode.h>
-#include <stdint.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-
-namespace ResourceMonitoring {
-
-/// This is an application level delegate to handle ActivatedCarbonFilterMonitoringDelegate commands according to the specific
-/// business logic.
-class ActivatedCarbonFilterMonitoringDelegate : public ResourceMonitoring::Delegate
-{
-private:
-    CHIP_ERROR Init() override;
-    chip::Protocols::InteractionModel::Status PreResetCondition() override;
-    chip::Protocols::InteractionModel::Status PostResetCondition() override;
-
-public:
-    ~ActivatedCarbonFilterMonitoringDelegate() override = default;
-};
-
-} // namespace ResourceMonitoring
-} // namespace Clusters
-} // namespace app
-} // namespace chip
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/HepaFilterMonitoring.h b/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/HepaFilterMonitoring.h
deleted file mode 100644
index ea7b4f76da973e..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/include/delegates/HepaFilterMonitoring.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-server.h>
-#include <lib/core/CHIPError.h>
-#include <lib/core/DataModelTypes.h>
-#include <protocols/interaction_model/StatusCode.h>
-#include <stdint.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-
-namespace ResourceMonitoring {
-
-/// This is an application level delegate to handle HepaFilterMonitoringDelegate commands according to the specific business logic.
-class HepaFilterMonitoringDelegate : public ResourceMonitoring::Delegate
-{
-private:
-    CHIP_ERROR Init() override;
-    chip::Protocols::InteractionModel::Status PreResetCondition() override;
-    chip::Protocols::InteractionModel::Status PostResetCondition() override;
-
-public:
-    ~HepaFilterMonitoringDelegate() override = default;
-};
-
-} // namespace ResourceMonitoring
-} // namespace Clusters
-} // namespace app
-} // namespace chip
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/src/ReplacementProductListManager.cpp b/examples/resource-monitoring-app/resource-monitoring-common/src/ReplacementProductListManager.cpp
deleted file mode 100644
index f450df6f380ef3..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/src/ReplacementProductListManager.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <ImmutableReplacementProductListManager.h>
-#include <StaticReplacementProductListManager.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <lib/core/CHIPError.h>
-
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::ResourceMonitoring;
-
-CHIP_ERROR StaticReplacementProductListManager::Next(ReplacementProductStruct & item)
-{
-    if (mIndex < mReplacementProductListSize)
-    {
-        item = mReplacementProductsList[mIndex];
-        mIndex++;
-        return CHIP_NO_ERROR;
-    }
-
-    return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
-}
-
-CHIP_ERROR ImmutableReplacementProductListManager::Next(ReplacementProductStruct & item)
-{
-    if (mIndex >= kReplacementProductListMaxSize)
-    {
-        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
-    }
-
-    switch (mIndex)
-    {
-    case 0: {
-        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kUpc);
-        item.SetProductIdentifierValue(CharSpan::fromCharString("111112222233"));
-        break;
-    case 1:
-        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kGtin8);
-        item.SetProductIdentifierValue(CharSpan::fromCharString("gtin8xxx"));
-        break;
-    case 2:
-        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kEan);
-        item.SetProductIdentifierValue(CharSpan::fromCharString("4444455555666"));
-        break;
-    case 3:
-        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kGtin14);
-        item.SetProductIdentifierValue(CharSpan::fromCharString("gtin14xxxxxxxx"));
-        break;
-    case 4:
-        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kOem);
-        item.SetProductIdentifierValue(CharSpan::fromCharString("oem20xxxxxxxxxxxxxxx"));
-        break;
-    default:
-        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
-        break;
-    }
-    }
-    mIndex++;
-    return CHIP_NO_ERROR;
-}
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/ActivatedCarbonFilterMonitoring.cpp b/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/ActivatedCarbonFilterMonitoring.cpp
deleted file mode 100644
index 2c00ee8b80a115..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/ActivatedCarbonFilterMonitoring.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <StaticReplacementProductListManager.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <app/data-model/Nullable.h>
-#include <app/util/config.h>
-#include <app/util/endpoint-config-api.h>
-#include <delegates/ActivatedCarbonFilterMonitoring.h>
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-#include <protocols/interaction_model/StatusCode.h>
-
-using namespace chip;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::ActivatedCarbonFilterMonitoring;
-using namespace chip::app::Clusters::ResourceMonitoring;
-using namespace chip::app::Clusters::ResourceMonitoring::Attributes;
-using chip::Protocols::InteractionModel::Status;
-
-static ReplacementProductStruct sActivatedCarbonFilterReplacementProductsList[] = {
-    { ResourceMonitoring::ProductIdentifierTypeEnum::kUpc, CharSpan::fromCharString("111112222233") },
-    { ResourceMonitoring::ProductIdentifierTypeEnum::kGtin8, CharSpan::fromCharString("gtin8xca") },
-    { ResourceMonitoring::ProductIdentifierTypeEnum::kEan, CharSpan::fromCharString("4444455555666") },
-    { ResourceMonitoring::ProductIdentifierTypeEnum::kGtin14, CharSpan::fromCharString("gtin14xcarbonx") },
-    { ResourceMonitoring::ProductIdentifierTypeEnum::kOem, CharSpan::fromCharString("oem20xcarbonxxxxxxxx") },
-};
-StaticReplacementProductListManager
-    sActivatedCarbonFilterReplacementProductListManager(&sActivatedCarbonFilterReplacementProductsList[0],
-                                                        ArraySize(sActivatedCarbonFilterReplacementProductsList));
-
-//-- Activated carbon filter Monitoring Delegate methods
-CHIP_ERROR ActivatedCarbonFilterMonitoringDelegate::Init()
-{
-    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::Init()");
-
-    GetInstance()->SetReplacementProductListManagerInstance(&sActivatedCarbonFilterReplacementProductListManager);
-
-    return CHIP_NO_ERROR;
-}
-
-Status ActivatedCarbonFilterMonitoringDelegate::PreResetCondition()
-{
-    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::PreResetCondition()");
-    return Status::Success;
-}
-
-Status ActivatedCarbonFilterMonitoringDelegate::PostResetCondition()
-{
-    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::PostResetCondition()");
-    return Status::Success;
-}
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/HepaFilterMonitoring.cpp b/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/HepaFilterMonitoring.cpp
deleted file mode 100644
index 31a7a478093d99..00000000000000
--- a/examples/resource-monitoring-app/resource-monitoring-common/src/delegates/HepaFilterMonitoring.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <ImmutableReplacementProductListManager.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <app/data-model/Nullable.h>
-#include <app/util/config.h>
-#include <app/util/endpoint-config-api.h>
-#include <delegates/HepaFilterMonitoring.h>
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-#include <protocols/interaction_model/StatusCode.h>
-
-using namespace chip;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::ResourceMonitoring;
-using namespace chip::app::Clusters::ResourceMonitoring::Attributes;
-using chip::Protocols::InteractionModel::Status;
-
-static ImmutableReplacementProductListManager sHepaFilterReplacementProductListManager;
-
-//-- Hepa filter Monitoring Delegate methods
-CHIP_ERROR HepaFilterMonitoringDelegate::Init()
-{
-    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::Init()");
-
-    GetInstance()->SetReplacementProductListManagerInstance(&sHepaFilterReplacementProductListManager);
-
-    return CHIP_NO_ERROR;
-}
-
-Status HepaFilterMonitoringDelegate::PreResetCondition()
-{
-    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::PreResetCondition()");
-    return Status::Success;
-}
-
-Status HepaFilterMonitoringDelegate::PostResetCondition()
-{
-    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::PostResetCondition()");
-    return Status::Success;
-}
diff --git a/examples/resource-monitoring-app/telink/.gitignore b/examples/resource-monitoring-app/telink/.gitignore
deleted file mode 100644
index 84c048a73cc2e5..00000000000000
--- a/examples/resource-monitoring-app/telink/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/examples/resource-monitoring-app/telink/CMakeLists.txt b/examples/resource-monitoring-app/telink/CMakeLists.txt
deleted file mode 100644
index dde35e61e378b8..00000000000000
--- a/examples/resource-monitoring-app/telink/CMakeLists.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-#    Copyright (c) 2023 Project CHIP Authors
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-cmake_minimum_required(VERSION 3.13.1)
-
-get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
-get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
-get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-resource-monitoring-example)
-
-include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
-include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
-
-target_compile_options(app PRIVATE -fpermissive)
-
-target_include_directories(app PRIVATE
-                           include
-                           ${GEN_DIR}/app-common
-                           ${GEN_DIR}/resource-monitoring-app
-                           ${TELINK_COMMON}/common/include
-                           ${TELINK_COMMON}/util/include
-                           ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/include
-                           ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/include/delegates
-                           )
-
-add_definitions(
-    "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
-)
-
-target_sources(app PRIVATE
-               src/AppTask.cpp
-               src/ZclCallbacks.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/src/ReplacementProductListManager.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/src/delegates/ActivatedCarbonFilterMonitoring.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/src/delegates/HepaFilterMonitoring.cpp
-               ${TELINK_COMMON}/common/src/mainCommon.cpp
-               ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
-               ${TELINK_COMMON}/util/src/ButtonManager.cpp
-               ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
-              )
-
-chip_configure_data_model(app
-    INCLUDE_SERVER
-    ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../resource-monitoring-common/resource-monitoring-app.zap
-)
diff --git a/examples/resource-monitoring-app/telink/README.md b/examples/resource-monitoring-app/telink/README.md
deleted file mode 100644
index e418ad345911d1..00000000000000
--- a/examples/resource-monitoring-app/telink/README.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Matter Telink Resource Monitoring Example Application
-
-You can use this example as a reference for creating your own application.
-
-![Telink B91 EVK](http://wiki.telink-semi.cn/wiki/assets/Hardware/B91_Generic_Starter_Kit_Hardware_Guide/connection_chart.png)
-
-## Build and flash
-
-1. Run the Docker container:
-
-    ```bash
-    $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}')
-    ```
-
-    Compatible docker image version can be found in next file:
-
-    ```bash
-    $ .github/workflows/examples-telink.yaml
-    ```
-
-2. Activate the build environment:
-
-    ```bash
-    $ source ./scripts/activate.sh -p all,telink
-    ```
-
-3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
-
-    ```bash
-    $ west build -b <build_target>
-    ```
-
-    Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
-
-    ```bash
-    $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
-    ```
-
-4. Flash binary:
-
-    ```
-    $ west flash --erase
-    ```
-
-## Usage
-
-### UART
-
-To get output from device, connect UART to following pins:
-
-| Name | Pin                           |
-| :--: | :---------------------------- |
-|  RX  | PB3 (pin 17 of J34 connector) |
-|  TX  | PB2 (pin 16 of J34 connector) |
-| GND  | GND                           |
-
-### Buttons
-
-The following buttons are available on **tlsr9518adk80d** board:
-
-| Name     | Function               | Description                                                                                            |
-| :------- | :--------------------- | :----------------------------------------------------------------------------------------------------- |
-| Button 1 | Factory reset          | Perform factory reset to forget currently commissioned Thread network and back to uncommissioned state |
-| Button 2 | NA                     | NA                                                                                                     |
-| Button 3 | Thread start           | Commission thread with static credentials and enables the Thread on device                             |
-| Button 4 | Open commission window | The button is opening commissioning window to perform commissioning over BLE                           |
-
-### LEDs
-
-#### Indicate current state of Thread network
-
-**Red** LED indicates current state of Thread network. It is able to be in
-following states:
-
-| State                       | Description                                                                  |
-| :-------------------------- | :--------------------------------------------------------------------------- |
-| Blinks with short pulses    | Device is not commissioned to Thread, Thread is disabled                     |
-| Blinks with frequent pulses | Device is commissioned, Thread enabled. Device trying to JOIN thread network |
-| Blinks with wide pulses     | Device commissioned and joined to thread network as CHILD                    |
-
-#### Indicate identify of device
-
-**Green** LED used to identify the device. The LED starts blinking when the
-Identify command of the Identify cluster is received. The command's argument can
-be used to specify the the effect. It is able to be in following effects:
-
-| Effect                          | Description                                                                  |
-| :------------------------------ | :--------------------------------------------------------------------------- |
-| Blinks (200 ms on/200 ms off)   | Blink (`Clusters::Identify::EffectIdentifierEnum::kBlink`)                   |
-| Breathe (during 1000 ms)        | Breathe (`Clusters::Identify::EffectIdentifierEnum::kBreathe`)               |
-| Blinks (50 ms on/950 ms off)    | Okay (`Clusters::Identify::EffectIdentifierEnum::kOkay`)                     |
-| Blinks (1000 ms on/1000 ms off) | Channel Change ( `Clusters::Identify::EffectIdentifierEnum::kChannelChange`) |
-| Blinks (950 ms on/50 ms off)    | Finish ( `Clusters::Identify::EffectIdentifierEnum::kFinishEffect`)          |
-| LED off                         | Stop (`Clusters::Identify::EffectIdentifierEnum::kStopEffect`)               |
-
-### CHIP tool commands
-
-1. Build
-   [chip-tool cli](https://github.com/project-chip/connectedhomeip/blob/master/examples/chip-tool/README.md)
-
-2. Pair with device
-
-    ```
-    ${CHIP_TOOL_DIR}/chip-tool pairing ble-thread ${NODE_ID} hex:${DATASET} ${PIN_CODE} ${DISCRIMINATOR}
-    ```
-
-    Example:
-
-    ```
-    ./chip-tool pairing ble-thread 1234 hex:0e080000000000010000000300000f35060004001fffe0020811111111222222220708fd61f77bd3df233e051000112233445566778899aabbccddeeff030e4f70656e54687265616444656d6f010212340410445f2b5ca6f2a93a55ce570a70efeecb0c0402a0fff8 20202021 3840
-    ```
-
-### OTA with Linux OTA Provider
-
-OTA feature enabled by default only for ota-requestor-app example. To enable OTA
-feature for another Telink example:
-
--   set CONFIG_CHIP_OTA_REQUESTOR=y in corresponding "prj.conf" configuration
-    file.
-
-After build application with enabled OTA feature, use next binary files:
-
--   zephyr.bin - main binary to flash PCB (Use at least 2MB PCB).
--   zephyr-ota.bin - binary for OTA Provider
-
-All binaries has the same SW version. To test OTA “zephyr-ota.bin” should have
-higher SW version than base SW. Set CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2 in
-corresponding “prj.conf” configuration file.
-
-Usage of OTA:
-
--   Build the [Linux OTA Provider](../../ota-provider-app/linux)
-
-    ```
-    ./scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/ota-provider-app chip_config_network_layer_ble=false
-    ```
-
--   Run the Linux OTA Provider with OTA image.
-
-    ```
-    ./chip-ota-provider-app -f zephyr-ota.bin
-    ```
-
--   Provision the Linux OTA Provider using chip-tool
-
-    ```
-    ./chip-tool pairing onnetwork ${OTA_PROVIDER_NODE_ID} 20202021
-    ```
-
-    here:
-
-    -   \${OTA_PROVIDER_NODE_ID} is the node id of Linux OTA Provider
-
--   Configure the ACL of the ota-provider-app to allow access
-
-    ```
-    ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' ${OTA_PROVIDER_NODE_ID} 0
-    ```
-
-    here:
-
-    -   \${OTA_PROVIDER_NODE_ID} is the node id of Linux OTA Provider
-
--   Use the chip-tool to announce the ota-provider-app to start the OTA process
-
-    ```
-    ./chip-tool otasoftwareupdaterequestor announce-otaprovider ${OTA_PROVIDER_NODE_ID} 0 0 0 ${DEVICE_NODE_ID} 0
-    ```
-
-    here:
-
-    -   \${OTA_PROVIDER_NODE_ID} is the node id of Linux OTA Provider
-    -   \${DEVICE_NODE_ID} is the node id of paired device
-
-Once the transfer is complete, OTA requestor sends ApplyUpdateRequest command to
-OTA provider for applying the image. Device will restart on successful
-application of OTA image.
diff --git a/examples/resource-monitoring-app/telink/prj.conf b/examples/resource-monitoring-app/telink/prj.conf
deleted file mode 100644
index 3996237b452b6b..00000000000000
--- a/examples/resource-monitoring-app/telink/prj.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#    Copyright (c) 2023 Project CHIP Authors
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-# This sample uses sample-defaults.conf to set options common for all
-# samples. This file should contain only options specific for this sample
-# or overrides of default values.
-
-# Enable CHIP
-CONFIG_CHIP=y
-CONFIG_STD_CPP17=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
-# CHIP PID: 32769 == 0x8001 (all-clusters-app)
-CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-
-# Bluetooth Low Energy configuration
-CONFIG_BT_DEVICE_NAME="TelinkResMon"
-
-# Disable Matter OTA DFU
-CONFIG_CHIP_OTA_REQUESTOR=n
-CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
-
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
-# Disable CHIP shell support
-CONFIG_CHIP_LIB_SHELL=n
-
-# Disable factory data support.
-CONFIG_CHIP_FACTORY_DATA=n
-CONFIG_CHIP_FACTORY_DATA_BUILD=n
-CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
-CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
-
-# Enable Power Management
-CONFIG_PM=y
diff --git a/examples/resource-monitoring-app/telink/src/AppTask.cpp b/examples/resource-monitoring-app/telink/src/AppTask.cpp
deleted file mode 100644
index 634de778321475..00000000000000
--- a/examples/resource-monitoring-app/telink/src/AppTask.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-
-#include <StaticReplacementProductListManager.h>
-#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
-#include <app/server/Server.h>
-#include <bitset>
-#include <delegates/ActivatedCarbonFilterMonitoring.h>
-#include <delegates/HepaFilterMonitoring.h>
-#include <stdint.h>
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-using namespace chip;
-using namespace chip::app;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::ResourceMonitoring;
-
-AppTask AppTask::sAppTask;
-
-constexpr std::bitset<4> gHepaFilterFeatureMap{ static_cast<uint32_t>(Feature::kCondition) |
-                                                static_cast<uint32_t>(Feature::kWarning) |
-                                                static_cast<uint32_t>(Feature::kReplacementProductList) };
-constexpr std::bitset<4> gActivatedCarbonFeatureMap{ static_cast<uint32_t>(Feature::kCondition) |
-                                                     static_cast<uint32_t>(Feature::kWarning) |
-                                                     static_cast<uint32_t>(Feature::kReplacementProductList) };
-
-static HepaFilterMonitoringDelegate gHepaFilterDelegate;
-static ResourceMonitoring::Instance gHepaFilterInstance(&gHepaFilterDelegate, 0x1, HepaFilterMonitoring::Id,
-                                                        static_cast<uint32_t>(gHepaFilterFeatureMap.to_ulong()),
-                                                        Clusters::ResourceMonitoring::DegradationDirectionEnum::kDown, true);
-
-static ActivatedCarbonFilterMonitoringDelegate gActivatedCarbonFilterDelegate;
-static ResourceMonitoring::Instance gActivatedCarbonFilterInstance(&gActivatedCarbonFilterDelegate, 0x1,
-                                                                   ActivatedCarbonFilterMonitoring::Id,
-                                                                   static_cast<uint32_t>(gActivatedCarbonFeatureMap.to_ulong()),
-                                                                   Clusters::ResourceMonitoring::DegradationDirectionEnum::kDown,
-                                                                   true);
-
-CHIP_ERROR AppTask::Init(void)
-{
-    InitCommonParts();
-
-    gHepaFilterInstance.Init();
-    gActivatedCarbonFilterInstance.Init();
-
-    return CHIP_NO_ERROR;
-}
diff --git a/examples/resource-monitoring-app/telink/src/ZclCallbacks.cpp b/examples/resource-monitoring-app/telink/src/ZclCallbacks.cpp
deleted file mode 100644
index d622dcbe664407..00000000000000
--- a/examples/resource-monitoring-app/telink/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-
-    if (clusterId == HepaFilterMonitoring::Id && attributeId == HepaFilterMonitoring::Attributes::DegradationDirection::Id)
-    {
-        static_assert(sizeof(HepaFilterMonitoring::DegradationDirectionEnum) == 1, "Wrong size");
-        HepaFilterMonitoring::DegradationDirectionEnum HepaFilterState =
-            *(reinterpret_cast<HepaFilterMonitoring::DegradationDirectionEnum *>(value));
-        ChipLogProgress(Zcl, "Hepa Filter Monitoring cluster: " ChipLogFormatMEI " state %d", ChipLogValueMEI(clusterId),
-                        to_underlying(HepaFilterState));
-    }
-    else if (clusterId == ActivatedCarbonFilterMonitoring::Id &&
-             attributeId == ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id)
-    {
-        static_assert(sizeof(ActivatedCarbonFilterMonitoring::DegradationDirectionEnum) == 1, "Wrong size");
-        ActivatedCarbonFilterMonitoring::DegradationDirectionEnum CarbonFilterState =
-            *(reinterpret_cast<ActivatedCarbonFilterMonitoring::DegradationDirectionEnum *>(value));
-        ChipLogProgress(Zcl, "Activated Carbon Filter cluster: " ChipLogFormatMEI " state %d", ChipLogValueMEI(clusterId),
-                        to_underlying(CarbonFilterState));
-    }
-}
-
-/** @brief Hepa Filter Monitoring Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfHepaFilterMonitoringClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
-
-/** @brief Activated Carbon Filter Monitoring Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfActivatedCarbonFilterMonitoringClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
diff --git a/examples/resource-monitoring-app/telink/third_party/connectedhomeip b/examples/resource-monitoring-app/telink/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/resource-monitoring-app/telink/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 4822febc1d0239..2c565deef1c480 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -82,6 +86,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -154,6 +160,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -231,6 +239,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -241,6 +251,8 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -279,13 +291,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -305,6 +317,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -334,6 +348,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -350,11 +365,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -401,6 +419,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -435,6 +456,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -453,6 +476,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -490,6 +515,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -590,11 +617,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -629,17 +664,14 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -756,6 +788,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -828,6 +862,8 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
@@ -882,6 +918,8 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
@@ -930,6 +968,8 @@ server cluster RvcCleanMode = 85 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
@@ -1037,8 +1077,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster GeneralCommissioning {
@@ -1100,9 +1142,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 0x0001;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster AdministratorCommissioning {
@@ -1113,7 +1157,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 0x0001;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -1169,7 +1212,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 4;
 
     handle command Identify;
     handle command TriggerEffect;
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index a9f67c56bd7bc8..e81e19248c72bb 100644
--- a/examples/rvc-app/rvc-common/rvc-app.zap
+++ b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1172,6 +1204,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1345,7 +1393,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1378,14 +1426,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -2047,7 +2087,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md
index 478e3dc8821bd7..69fdf781446afd 100644
--- a/examples/shell/cc13x2x7_26x2x7/README.md
+++ b/examples/shell/cc13x2x7_26x2x7/README.md
@@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -45,7 +45,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -54,7 +54,7 @@ Ninja to build the executable.
     OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
 
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -63,7 +63,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
index 9145e19f58ad07..08be886e6fb86e 100644
--- a/examples/shell/cc13x4_26x4/README.md
+++ b/examples/shell/cc13x4_26x4/README.md
@@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -45,7 +45,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -53,7 +53,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15"
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2"
     $ ninja -C out/debug
 
     ```
@@ -62,7 +62,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/shell/nrfconnect/CHIPProjectConfig.h b/examples/shell/nrfconnect/CHIPProjectConfig.h
index b372ea7f0fda73..e7641bf17df441 100644
--- a/examples/shell/nrfconnect/CHIPProjectConfig.h
+++ b/examples/shell/nrfconnect/CHIPProjectConfig.h
@@ -27,10 +27,6 @@
 
 #pragma once
 
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
 
diff --git a/examples/shell/shell_common/cmd_server.cpp b/examples/shell/shell_common/cmd_server.cpp
index d18eb88cf7a1b0..cb6b5e558627ce 100644
--- a/examples/shell/shell_common/cmd_server.cpp
+++ b/examples/shell/shell_common/cmd_server.cpp
@@ -119,17 +119,18 @@ static bool PrintServerSession(void * context, SessionHandle & session)
     case Session::SessionType::kSecure: {
         SecureSession * secureSession         = session->AsSecureSession();
         SecureSession::Type secureSessionType = secureSession->GetSecureSessionType();
-        streamer_printf(
-            streamer_get(), "session type=SECURE %s id=0x%04x peerSessionId=0x%04x peerNodeId=0x%016" PRIx64 " fabricIdx=%d\r\n",
-            secureSessionType == SecureSession::Type::kCASE ? "CASE" : "PASE", secureSession->GetLocalSessionId(),
-            secureSession->AsSecureSession()->GetPeerSessionId(), secureSession->GetPeerNodeId(), secureSession->GetFabricIndex());
+        streamer_printf(streamer_get(),
+                        "session type=SECURE %s id=0x%04x peerSessionId=0x%04x peerNodeId=0x" ChipLogFormatX64 " fabricIdx=%d\r\n",
+                        secureSessionType == SecureSession::Type::kCASE ? "CASE" : "PASE", secureSession->GetLocalSessionId(),
+                        secureSession->AsSecureSession()->GetPeerSessionId(), ChipLogValueX64(secureSession->GetPeerNodeId()),
+                        secureSession->GetFabricIndex());
         break;
     }
 
     case Session::SessionType::kUnauthenticated: {
         UnauthenticatedSession * unsecuredSession = session->AsUnauthenticatedSession();
-        streamer_printf(streamer_get(), "session type=UNSECURED id=0x0000 peerNodeId=0x%016" PRIx64 "\r\n",
-                        unsecuredSession->GetPeerNodeId());
+        streamer_printf(streamer_get(), "session type=UNSECURED id=0x0000 peerNodeId=0x" ChipLogFormatX64 "\r\n",
+                        ChipLogValueX64(unsecuredSession->GetPeerNodeId()));
         break;
     }
 
diff --git a/examples/shell/telink/prj.conf b/examples/shell/telink/prj.conf
index 88846b63b4aa15..ef57656abeeb61 100755
--- a/examples/shell/telink/prj.conf
+++ b/examples/shell/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 3b8db712aa8871..88bcba64554ddc 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +398,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -462,7 +478,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,6 +495,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -501,8 +521,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -514,6 +534,8 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -746,6 +768,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -784,13 +808,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -810,6 +834,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -839,6 +865,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -855,11 +882,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -906,6 +936,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -940,6 +973,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -958,6 +993,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -995,6 +1032,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1095,11 +1134,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1134,6 +1181,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1232,9 +1281,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1292,11 +1341,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1342,6 +1393,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1458,6 +1511,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1531,6 +1586,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1547,6 +1604,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1563,6 +1622,8 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
@@ -1626,11 +1687,13 @@ server cluster IcdManagement = 70 {
 
   fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
   fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
-  command access(invoke: manage) StayActiveRequest(): DefaultSuccess = 3;
+  command access(invoke: manage) StayActiveRequest(): StayActiveResponse = 3;
 }
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
+  revision 1;
+
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
@@ -1783,8 +1846,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1871,9 +1936,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
index b5fe6c12387788..e5caa73950857c 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
@@ -616,6 +616,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -642,7 +674,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1481,6 +1513,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1654,7 +1702,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1961,7 +2009,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1977,7 +2025,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1993,7 +2041,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/smoke-co-alarm-app/telink/prj.conf b/examples/smoke-co-alarm-app/telink/prj.conf
index 299d79337065fe..36f00385d93d53 100755
--- a/examples/smoke-co-alarm-app/telink/prj.conf
+++ b/examples/smoke-co-alarm-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
index 06b274e8d4bade..b48d05d8949b88 100644
--- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
+++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
@@ -50,6 +50,7 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
 )
diff --git a/examples/temperature-measurement-app/telink/CMakeLists.txt b/examples/temperature-measurement-app/telink/CMakeLists.txt
index fd8a6e33132970..e409b2e2bc59de 100644
--- a/examples/temperature-measurement-app/telink/CMakeLists.txt
+++ b/examples/temperature-measurement-app/telink/CMakeLists.txt
@@ -19,6 +19,21 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
+if(${TLNK_MARS_BOARD} MATCHES y)
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+  else()
+    unset(MARS_DTC_OVERLAY_FILE)
+  endif()
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+  else()
+    unset(MARS_CONF_OVERLAY_FILE)
+  endif()
+else()
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
   set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
 else()
@@ -41,14 +56,14 @@ endif()
 
 if(DTC_OVERLAY_FILE)
   set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
+    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
     CACHE STRING "" FORCE
   )
 else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
+  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
 endif()
 
-set(CONF_FILE prj.conf)
+set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
 
 # Load NCS/Zephyr build system
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
@@ -76,14 +91,14 @@ add_definitions(
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/SensorManager.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
+               ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
                ${TELINK_COMMON}/util/src/PWMDevice.cpp
-               )
+               ${TELINK_COMMON}/util/src/WS2812Device.cpp)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/temperature-measurement-app/telink/include/AppTask.h b/examples/temperature-measurement-app/telink/include/AppTask.h
index f681fa37fa2378..1aac92dc45aa7d 100644
--- a/examples/temperature-measurement-app/telink/include/AppTask.h
+++ b/examples/temperature-measurement-app/telink/include/AppTask.h
@@ -28,8 +28,8 @@ class AppTask : public AppTaskCommon
 
     CHIP_ERROR Init(void);
 
-    static void TemperatureMeasurementTimerTimeoutCallback(k_timer * timer);
-    static void TemperatureMeasurementTimerEventHandler(AppEvent * aEvent);
+    static void TemperatureMeasurementUpdateTimerTimeoutCallback(k_timer * timer);
+    static void TemperatureMeasurementUpdateTimerEventHandler(AppEvent * aEvent);
 
     static AppTask sAppTask;
 };
diff --git a/examples/temperature-measurement-app/telink/prj.conf b/examples/temperature-measurement-app/telink/prj.conf
index 9aabed07aa7a4a..01222e4cb6ec07 100644
--- a/examples/temperature-measurement-app/telink/prj.conf
+++ b/examples/temperature-measurement-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/temperature-measurement-app/telink/src/AppTask.cpp b/examples/temperature-measurement-app/telink/src/AppTask.cpp
index 023381e5225db2..df1c5f6dc20e2d 100644
--- a/examples/temperature-measurement-app/telink/src/AppTask.cpp
+++ b/examples/temperature-measurement-app/telink/src/AppTask.cpp
@@ -17,43 +17,46 @@
  */
 
 #include "AppTask.h"
-#include "SensorManager.h"
+#include "SensorManagerCommon.h"
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 namespace {
-k_timer sTemperatureMeasurementTimer;
-constexpr uint16_t kSensorTimerPeriodMs = 5000; // 5s timer period
+k_timer sTemperatureMeasurementUpdateTimer;
+constexpr uint16_t kTemperatureMeasurementUpdateTimerPeriodMs = 5000; // 5s timer period
 } // namespace
 
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-    InitCommonParts();
+    CHIP_ERROR err;
 
-    // Initialize temperature measurement timer
-    k_timer_init(&sTemperatureMeasurementTimer, &AppTask::TemperatureMeasurementTimerTimeoutCallback, nullptr);
-    k_timer_user_data_set(&sTemperatureMeasurementTimer, this);
-    k_timer_start(&sTemperatureMeasurementTimer, K_MSEC(kSensorTimerPeriodMs), K_NO_WAIT);
+    InitCommonParts();
 
-    // Init Temperature Sensor
-    CHIP_ERROR err = SensorMgr().Init();
+    err = SensorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {
-        LOG_ERR("SensorMgr Init fail");
+        LOG_ERR("Init of the Sensor Manager failed");
         return err;
     }
 
+    // Initialize temperature measurement update timer
+    k_timer_init(&sTemperatureMeasurementUpdateTimer, &AppTask::TemperatureMeasurementUpdateTimerTimeoutCallback, nullptr);
+    k_timer_user_data_set(&sTemperatureMeasurementUpdateTimer, this);
+    k_timer_start(&sTemperatureMeasurementUpdateTimer, K_MSEC(kTemperatureMeasurementUpdateTimerPeriodMs), K_NO_WAIT);
+
     PlatformMgr().LockChipStack();
-    app::Clusters::TemperatureMeasurement::Attributes::MinMeasuredValue::Set(kExampleEndpointId, SensorMgr().GetMinMeasuredValue());
-    app::Clusters::TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(kExampleEndpointId, SensorMgr().GetMaxMeasuredValue());
+    app::Clusters::TemperatureMeasurement::Attributes::MinMeasuredValue::Set(kExampleEndpointId,
+                                                                             SensorMgr().GetMinMeasuredTempValue());
+    app::Clusters::TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(kExampleEndpointId,
+                                                                             SensorMgr().GetMaxMeasuredTempValue());
     PlatformMgr().UnlockChipStack();
 
     return CHIP_NO_ERROR;
 }
 
-void AppTask::TemperatureMeasurementTimerTimeoutCallback(k_timer * timer)
+void AppTask::TemperatureMeasurementUpdateTimerTimeoutCallback(k_timer * timer)
 {
     if (!timer)
     {
@@ -62,23 +65,33 @@ void AppTask::TemperatureMeasurementTimerTimeoutCallback(k_timer * timer)
 
     AppEvent event;
     event.Type    = AppEvent::kEventType_Timer;
-    event.Handler = TemperatureMeasurementTimerEventHandler;
+    event.Handler = TemperatureMeasurementUpdateTimerEventHandler;
     sAppTask.PostEvent(&event);
 }
 
-void AppTask::TemperatureMeasurementTimerEventHandler(AppEvent * aEvent)
+void AppTask::TemperatureMeasurementUpdateTimerEventHandler(AppEvent * aEvent)
 {
+    CHIP_ERROR ret;
+    int16_t temperature;
+
     if (aEvent->Type != AppEvent::kEventType_Timer)
     {
         return;
     }
 
+    ret = SensorMgr().GetTempAndHumMeasurValue(&temperature, NULL);
+    if (ret != CHIP_NO_ERROR)
+    {
+        LOG_ERR("Update of the Temperature clusters failed");
+        return;
+    }
+
+    LOG_INF("Current temperature is (%d*0.01)°C", temperature);
+
     PlatformMgr().LockChipStack();
-    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(kExampleEndpointId, SensorMgr().GetMeasuredValue());
+    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(kExampleEndpointId, temperature);
     PlatformMgr().UnlockChipStack();
 
-    LOG_INF("Current temperature is (%d*0.01)°C", SensorMgr().GetMeasuredValue());
-
     // Start next timer to handle temp sensor.
-    k_timer_start(&sTemperatureMeasurementTimer, K_MSEC(kSensorTimerPeriodMs), K_NO_WAIT);
+    k_timer_start(&sTemperatureMeasurementUpdateTimer, K_MSEC(kTemperatureMeasurementUpdateTimerPeriodMs), K_NO_WAIT);
 }
diff --git a/examples/temperature-measurement-app/telink/src/SensorManager.cpp b/examples/temperature-measurement-app/telink/src/SensorManager.cpp
deleted file mode 100644
index 22d9bb1c57ef19..00000000000000
--- a/examples/temperature-measurement-app/telink/src/SensorManager.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "SensorManager.h"
-#include "AppConfig.h"
-#include "AppTask.h"
-
-#define TEMPERATURE_SIMULATION_IS_USED
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-using namespace chip;
-using namespace ::chip::DeviceLayer;
-
-constexpr float kMinTemperatureDelta          = 0.5; // 0.5 degree Celsius
-constexpr uint16_t kSimulatedReadingFrequency = 5;   // Change Simulated number
-static float mSimulatedTemp[]                 = { 23.01, 24.02, 28.03, 25.50, 22.05, 21.25, 21.07, 26.08, 18.09, 27.11 };
-
-k_timer sSensorTimer;
-
-SensorManager SensorManager::sSensorManager;
-
-CHIP_ERROR SensorManager::Init()
-{
-    // TODO: Initialize temp sensor
-    return CHIP_NO_ERROR;
-}
-
-int16_t SensorManager::SensorEventHandler()
-{
-    float temperature            = 0.0;
-    static float lastTemperature = 0.0;
-
-#ifdef TEMPERATURE_SIMULATION_IS_USED
-    static uint8_t nbOfRepetition = 0;
-    static uint8_t simulatedIndex = 0;
-    if (simulatedIndex >= ArraySize(mSimulatedTemp))
-    {
-        simulatedIndex = 0;
-    }
-    temperature = mSimulatedTemp[simulatedIndex];
-
-    nbOfRepetition++;
-
-    if (nbOfRepetition >= kSimulatedReadingFrequency)
-    {
-        simulatedIndex++;
-        nbOfRepetition = 0;
-    }
-
-    if ((temperature >= (lastTemperature + kMinTemperatureDelta)) || temperature <= (lastTemperature - kMinTemperatureDelta))
-    {
-        lastTemperature = temperature;
-        // Per spec Application Clusters 2.3.4.1. : MeasuredValue = 100 x temperature [°C]
-        sSensorManager.mMeasuredTempCelsius = (int16_t) 100 * temperature;
-    }
-#else
-    // TODO: provide REAL sensor implementation
-    sSensorManager.mMeasuredTempCelsius = (int16_t) 100 * GetRealSensorTemperature();
-#endif // TEMPERATURE_SIMULATION_IS_USED
-    return sSensorManager.mMeasuredTempCelsius;
-}
-
-int16_t SensorManager::GetMeasuredValue()
-{
-    return SensorEventHandler();
-}
-
-int16_t SensorManager::GetMinMeasuredValue()
-{
-    return mMinMeasuredTempCelsius;
-}
-
-int16_t SensorManager::GetMaxMeasuredValue()
-{
-    return mMaxMeasuredTempCelsius;
-}
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index 8e7aabd8121a09..b143f6f1eeae04 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -3,6 +3,8 @@
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -36,6 +38,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -108,6 +112,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -185,12 +191,167 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Provides an interface for providing OTA software updates */
+client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum ApplyUpdateActionEnum : enum8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
+  }
+
+  enum DownloadProtocolEnum : enum8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHTTPS = 2;
+    kVendorSpecific = 3;
+  }
+
+  enum StatusEnum : enum8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
+  }
+
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorID = 0;
+    int16u productID = 1;
+    int32u softwareVersion = 2;
+    DownloadProtocolEnum protocolsSupported[] = 3;
+    optional int16u hardwareVersion = 4;
+    optional char_string<2> location = 5;
+    optional boolean requestorCanConsent = 6;
+    optional octet_string<512> metadataForProvider = 7;
+  }
+
+  response struct QueryImageResponse = 1 {
+    StatusEnum status = 0;
+    optional int32u delayedActionTime = 1;
+    optional char_string<256> imageURI = 2;
+    optional int32u softwareVersion = 3;
+    optional char_string<64> softwareVersionString = 4;
+    optional octet_string<32> updateToken = 5;
+    optional boolean userConsentNeeded = 6;
+    optional octet_string<512> metadataForRequestor = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    octet_string<32> updateToken = 0;
+    int32u newVersion = 1;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    ApplyUpdateActionEnum action = 0;
+    int32u delayedActionTime = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    octet_string<32> updateToken = 0;
+    int32u softwareVersion = 1;
+  }
+
+  /** Determine availability of a new Software Image */
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  /** Determine next action to take for a downloaded Software Image */
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  /** Notify OTA Provider that an update was applied */
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
+
+/** Provides an interface for downloading and applying OTA software updates */
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum AnnouncementReasonEnum : enum8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
+  }
+
+  enum ChangeReasonEnum : enum8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum UpdateStateEnum : enum8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  fabric_scoped struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    UpdateStateEnum previousState = 0;
+    UpdateStateEnum newState = 1;
+    ChangeReasonEnum reason = 2;
+    nullable int32u targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    int32u softwareVersion = 0;
+    int16u productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    int32u softwareVersion = 0;
+    int64u bytesDownloaded = 1;
+    nullable int8u progressPercent = 2;
+    nullable int64s platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOTAProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute UpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOTAProviderRequest {
+    node_id providerNodeID = 0;
+    vendor_id vendorID = 1;
+    AnnouncementReasonEnum announcementReason = 2;
+    optional octet_string<512> metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
 }
 
 /** Nodes should be expected to be deployed to any and all regions of the world. These global regions
@@ -198,7 +359,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -213,6 +376,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -237,8 +402,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -253,6 +418,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -263,7 +430,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -274,6 +441,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -312,13 +481,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -338,6 +507,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -367,6 +538,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -383,11 +555,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -434,6 +609,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct RemoveNetworkRequest {
@@ -463,6 +641,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -480,6 +660,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -517,6 +699,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -617,11 +801,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -651,6 +843,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -692,7 +886,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -723,6 +917,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -762,6 +958,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -807,6 +1005,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -923,6 +1123,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -996,6 +1198,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1012,6 +1216,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1028,9 +1234,11 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1042,6 +1250,7 @@ server cluster TemperatureMeasurement = 1026 {
 endpoint 0 {
   device type ma_rootdevice = 22, version 1;
 
+  binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Descriptor {
     callback attribute deviceTypeList;
@@ -1088,8 +1297,24 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster OtaSoftwareUpdateRequestor {
+    emits event StateTransition;
+    emits event VersionApplied;
+    emits event DownloadError;
+    callback attribute defaultOTAProviders default = 0;
+    ram      attribute updatePossible default = 1;
+    ram      attribute updateState default = 0;
+    ram      attribute updateStateProgress default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 1;
+
+    handle command AnnounceOTAProvider;
   }
 
   server cluster LocalizationConfiguration {
@@ -1171,9 +1396,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
index 7845ed393315aa..61eac32389a438 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -632,6 +632,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -658,7 +690,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -689,6 +721,213 @@
             }
           ]
         },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "QueryImage",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "QueryImageResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ApplyUpdateRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ApplyUpdateResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NotifyUpdateApplied",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AnnounceOTAProvider",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "DefaultOTAProviders",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdatePossible",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateState",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "UpdateStateEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateStateProgress",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "StateTransition",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "VersionApplied",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "DownloadError",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
         {
           "name": "Localization Configuration",
           "code": 43,
@@ -1386,6 +1625,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1559,7 +1814,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2875,7 +3130,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -2891,7 +3146,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -2907,7 +3162,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 2a03d768498c38..e41f8fc45f88c9 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -91,6 +95,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -160,6 +166,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -167,8 +179,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -181,13 +193,18 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -282,6 +299,8 @@ provisional server cluster Scenes = 5 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -312,6 +331,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -334,6 +355,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -406,6 +429,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -484,6 +509,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -494,6 +521,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -568,6 +597,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -646,7 +677,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -661,6 +694,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -685,8 +720,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -701,6 +736,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -711,7 +748,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -722,6 +759,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -952,6 +991,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -990,13 +1031,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1016,6 +1057,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1045,6 +1088,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1061,11 +1105,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1112,6 +1159,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1146,6 +1196,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1164,6 +1216,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1264,11 +1318,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1367,9 +1429,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1427,11 +1489,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1477,6 +1541,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1593,6 +1659,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1666,6 +1734,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1682,6 +1752,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1698,6 +1770,8 @@ server cluster UserLabel = 65 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1853,8 +1927,10 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1941,9 +2017,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster ThreadNetworkDiagnostics {
@@ -2103,14 +2181,10 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
     ram      attribute sceneTableSize;
-    callback attribute remainingCapacity;
-    ram      attribute featureMap default = 0;
+    callback attribute fabricSceneInfo;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 4;
 
     handle command AddScene;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
index ec8baf4d992228..cd687ebbd28424 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -732,6 +732,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -758,7 +790,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1626,6 +1658,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1799,7 +1847,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1999,7 +2047,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2015,7 +2063,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2031,7 +2079,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3836,76 +3884,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3933,13 +3917,13 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3958,7 +3942,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index 2e9f1fd042d551..95fd9225885c95 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -91,6 +95,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -160,6 +166,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -167,8 +179,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -181,13 +193,18 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -282,6 +299,8 @@ provisional server cluster Scenes = 5 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -312,6 +331,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -334,6 +355,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -406,6 +429,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -484,6 +509,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -494,6 +521,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -568,6 +597,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -646,7 +677,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -661,6 +694,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -685,8 +720,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -701,6 +736,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -711,7 +748,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -722,6 +759,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -952,6 +991,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -990,13 +1031,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -1016,6 +1057,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1045,6 +1088,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1061,11 +1105,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1112,6 +1159,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1146,6 +1196,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1164,6 +1216,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1264,11 +1318,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1310,7 +1372,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1341,6 +1403,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1386,6 +1450,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1502,6 +1568,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1575,6 +1643,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1591,6 +1661,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1607,6 +1679,8 @@ server cluster UserLabel = 65 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1762,8 +1836,10 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1850,9 +1926,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster WiFiNetworkDiagnostics {
@@ -1957,14 +2035,10 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
     ram      attribute sceneTableSize;
-    callback attribute remainingCapacity;
-    ram      attribute featureMap default = 0;
+    callback attribute fabricSceneInfo;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 4;
 
     handle command AddScene;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
index fcc14df85255d3..c5a2a9ce6af5b0 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -732,6 +732,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -758,7 +790,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1626,6 +1658,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1799,7 +1847,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2978,76 +3026,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3075,13 +3059,13 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3100,7 +3084,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/thermostat/silabs/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp
index 22d0bb3010b9ab..b58ad0a288a99e 100644
--- a/examples/thermostat/silabs/src/AppTask.cpp
+++ b/examples/thermostat/silabs/src/AppTask.cpp
@@ -38,7 +38,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
diff --git a/examples/thermostat/telink/CMakeLists.txt b/examples/thermostat/telink/CMakeLists.txt
index f1588efa2c48e7..71f14895b28a55 100755
--- a/examples/thermostat/telink/CMakeLists.txt
+++ b/examples/thermostat/telink/CMakeLists.txt
@@ -19,6 +19,21 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
+if(${TLNK_MARS_BOARD} MATCHES y)
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+  else()
+    unset(MARS_DTC_OVERLAY_FILE)
+  endif()
+  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+  else()
+    unset(MARS_CONF_OVERLAY_FILE)
+  endif()
+else()
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
   set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
 else()
@@ -41,14 +56,14 @@ endif()
 
 if(DTC_OVERLAY_FILE)
   set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
+    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
     CACHE STRING "" FORCE
   )
 else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
+  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
 endif()
 
-set(CONF_FILE prj.conf)
+set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
 
 # Load NCS/Zephyr build system
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
@@ -75,15 +90,16 @@ add_definitions(
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/SensorManager.cpp
                src/TemperatureManager.cpp
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
+               ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMDevice.cpp
+               ${TELINK_COMMON}/util/src/WS2812Device.cpp)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/thermostat/telink/include/AppTask.h b/examples/thermostat/telink/include/AppTask.h
index 8babf015ba4817..40cd86f2f551ea 100755
--- a/examples/thermostat/telink/include/AppTask.h
+++ b/examples/thermostat/telink/include/AppTask.h
@@ -19,13 +19,12 @@
 #pragma once
 
 #include "AppTaskCommon.h"
-#include "SensorManager.h"
+#include "SensorManagerCommon.h"
 #include "TemperatureManager.h"
 
 class AppTask : public AppTaskCommon
 {
 public:
-    void UpdateClusterState(void);
     void UpdateThermoStatUI(void);
 
 private:
@@ -34,6 +33,9 @@ class AppTask : public AppTaskCommon
 
     CHIP_ERROR Init(void);
 
+    static void ThermostatUpdateTimerTimeoutCallback(k_timer * timer);
+    static void ThermostatUpdateTimerEventHandler(AppEvent * aEvent);
+
     static AppTask sAppTask;
 };
 
diff --git a/examples/thermostat/telink/include/SensorManager.h b/examples/thermostat/telink/include/SensorManager.h
deleted file mode 100644
index 2d2cdb9dd44fc6..00000000000000
--- a/examples/thermostat/telink/include/SensorManager.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEventCommon.h"
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <lib/core/CHIPError.h>
-
-class SensorManager
-{
-public:
-    CHIP_ERROR Init();
-
-private:
-    friend SensorManager & SensorMgr();
-
-    // Reads new generated sensor value, stores it, and updates local temperature attribute
-    static void TimerEventHandler(k_timer * timer);
-    static void SensorTimerEventHandler(AppEvent * aEvent);
-
-    static SensorManager sSensorManager;
-};
-
-inline SensorManager & SensorMgr()
-{
-    return SensorManager::sSensorManager;
-}
diff --git a/examples/thermostat/telink/prj.conf b/examples/thermostat/telink/prj.conf
index 70cb272b0da9c8..bc7cd3bd75cb38 100755
--- a/examples/thermostat/telink/prj.conf
+++ b/examples/thermostat/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/examples/thermostat/telink/src/AppTask.cpp b/examples/thermostat/telink/src/AppTask.cpp
index d9b7a2c2883844..101d1a9f0fda4d 100644
--- a/examples/thermostat/telink/src/AppTask.cpp
+++ b/examples/thermostat/telink/src/AppTask.cpp
@@ -20,18 +20,26 @@
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
+namespace {
+k_timer sThermostatUpdateTimer;
+constexpr uint16_t kThermostatUpdateTimerPeriodMs = 30000; // 30s timer period
+} // namespace
+
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
+    CHIP_ERROR err;
+
     InitCommonParts();
 
-    CHIP_ERROR err = SensorMgr().Init();
+    err = SensorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {
-        LOG_ERR("SensorMgr Init fail");
+        LOG_ERR("Init of the Sensor Manager failed");
         return err;
     }
+
     err = TempMgr().Init();
     if (err != CHIP_NO_ERROR)
     {
@@ -39,13 +47,56 @@ CHIP_ERROR AppTask::Init(void)
         return err;
     }
 
+    // Initialize temperature measurement timer
+    k_timer_init(&sThermostatUpdateTimer, &AppTask::ThermostatUpdateTimerTimeoutCallback, nullptr);
+    k_timer_user_data_set(&sThermostatUpdateTimer, this);
+    k_timer_start(&sThermostatUpdateTimer, K_MSEC(kThermostatUpdateTimerPeriodMs), K_NO_WAIT);
+
     return CHIP_NO_ERROR;
 }
 
+void AppTask::ThermostatUpdateTimerTimeoutCallback(k_timer * timer)
+{
+    if (!timer)
+    {
+        return;
+    }
+
+    AppEvent event;
+    event.Type    = AppEvent::kEventType_Timer;
+    event.Handler = ThermostatUpdateTimerEventHandler;
+    sAppTask.PostEvent(&event);
+}
+
+void AppTask::ThermostatUpdateTimerEventHandler(AppEvent * aEvent)
+{
+    CHIP_ERROR ret;
+    int16_t temperature;
+
+    if (aEvent->Type != AppEvent::kEventType_Timer)
+    {
+        return;
+    }
+
+    ret = SensorMgr().GetTempAndHumMeasurValue(&temperature, NULL);
+    if (ret != CHIP_NO_ERROR)
+    {
+        LOG_ERR("Update of the Temperature clusters failed");
+        return;
+    }
+
+    LOG_INF("Current temperature is (%d*0.01)°C", temperature);
+
+    PlatformMgr().LockChipStack();
+    app::Clusters::Thermostat::Attributes::LocalTemperature::Set(kExampleEndpointId, temperature);
+    PlatformMgr().UnlockChipStack();
+
+    // Start next timer to handle temp sensor.
+    k_timer_start(&sThermostatUpdateTimer, K_MSEC(kThermostatUpdateTimerPeriodMs), K_NO_WAIT);
+}
+
 void AppTask::UpdateThermoStatUI(void)
 {
     LOG_INF("Thermostat Status - M:%d T:%d'C H:%d'C C:%d'C", TempMgr().GetMode(), TempMgr().GetCurrentTemp(),
             TempMgr().GetHeatingSetPoint(), TempMgr().GetCoolingSetPoint());
 }
-
-void AppTask::UpdateClusterState() {}
diff --git a/examples/thermostat/telink/src/SensorManager.cpp b/examples/thermostat/telink/src/SensorManager.cpp
deleted file mode 100644
index 981447c8a12bd6..00000000000000
--- a/examples/thermostat/telink/src/SensorManager.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "SensorManager.h"
-#include "AppConfig.h"
-#include "AppTask.h"
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-using namespace chip;
-using namespace ::chip::DeviceLayer;
-
-constexpr EndpointId kThermostatEndpoint = 1;
-constexpr uint16_t kSensorTimerPeriodMs  = 30000; // 30s timer period
-constexpr uint16_t kMinTemperatureDelta  = 50;    // 0.5 degree Celsius
-
-k_timer sSensorTimer;
-
-SensorManager SensorManager::sSensorManager;
-
-constexpr uint16_t kSimulatedReadingFrequency = (60000 / kSensorTimerPeriodMs); // Change Simulated number at each minutes
-static int16_t mSimulatedTemp[]               = { 2300, 2400, 2800, 2550, 2200, 2125, 2100, 2600, 1800, 2700 };
-
-CHIP_ERROR SensorManager::Init()
-{
-    // Initialize temp sensor timer
-    k_timer_init(&sSensorTimer, &TimerEventHandler, nullptr);
-    k_timer_user_data_set(&sSensorTimer, this);
-    k_timer_start(&sSensorTimer, K_MSEC(kSensorTimerPeriodMs), K_NO_WAIT);
-
-    return CHIP_NO_ERROR;
-}
-
-void SensorManager::TimerEventHandler(k_timer * timer)
-{
-    AppEvent event;
-    event.Type               = AppEvent::kEventType_Thermostat;
-    event.TimerEvent.Context = k_timer_user_data_get(timer);
-    event.Handler            = SensorTimerEventHandler;
-    GetAppTask().PostEvent(&event);
-}
-
-void SensorManager::SensorTimerEventHandler(AppEvent * aEvent)
-{
-    int16_t temperature            = 0;
-    static int16_t lastTemperature = 0;
-
-    static uint8_t nbOfRepetition = 0;
-    static uint8_t simulatedIndex = 0;
-    if (simulatedIndex >= ArraySize(mSimulatedTemp))
-    {
-        simulatedIndex = 0;
-    }
-    temperature = mSimulatedTemp[simulatedIndex];
-
-    nbOfRepetition++;
-    if (nbOfRepetition >= kSimulatedReadingFrequency)
-    {
-        simulatedIndex++;
-        nbOfRepetition = 0;
-    }
-
-    LOG_INF("Sensor Temp is : %d", temperature);
-
-    if ((temperature >= (lastTemperature + kMinTemperatureDelta)) || temperature <= (lastTemperature - kMinTemperatureDelta))
-    {
-        lastTemperature = temperature;
-        PlatformMgr().LockChipStack();
-        app::Clusters::Thermostat::Attributes::LocalTemperature::Set(kThermostatEndpoint, temperature);
-        PlatformMgr().UnlockChipStack();
-    }
-
-    // Start next timer to handle temp sensor.
-    k_timer_start(&sSensorTimer, K_MSEC(kSensorTimerPeriodMs), K_NO_WAIT);
-}
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 170c970d2b0e7d..6db895f284557e 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -97,6 +101,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -166,6 +172,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -196,6 +204,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -218,6 +228,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -290,6 +302,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -367,6 +381,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -377,6 +393,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -451,6 +469,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -529,7 +549,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -544,6 +566,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -568,8 +592,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -584,6 +608,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -594,7 +620,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -605,6 +631,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -643,13 +671,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -669,6 +697,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -698,6 +728,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -714,11 +745,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -765,6 +799,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -799,6 +836,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -817,6 +856,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -854,6 +895,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -954,11 +997,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -991,6 +1042,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1089,9 +1142,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1149,11 +1202,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1195,7 +1250,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1228,6 +1283,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1265,6 +1322,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1310,6 +1369,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1426,6 +1487,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1499,6 +1562,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1515,6 +1580,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1531,6 +1598,8 @@ server cluster UserLabel = 65 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -1627,8 +1696,29 @@ server cluster Thermostat = 513 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1701,8 +1791,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -1799,9 +1891,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 74262e2093f6b1..fef78b92cbb186 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -758,6 +758,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -784,7 +816,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1727,6 +1759,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1900,7 +1948,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2206,7 +2254,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2222,7 +2270,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2238,7 +2286,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4916,7 +4964,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4932,7 +4980,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp
index cfc840ce1c83d3..c915856f48fd4d 100644
--- a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp
+++ b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp
@@ -45,7 +45,7 @@ void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherR
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -58,7 +58,7 @@ void ApplicationLauncherManager::HandleStopApp(CommandResponseHelper<LauncherRes
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -71,6 +71,6 @@ void ApplicationLauncherManager::HandleHideApp(CommandResponseHelper<LauncherRes
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
index 930d61e1d6492a..61e8af0193fa9e 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -62,7 +62,7 @@ void AppContentLauncherManager::HandleLaunchContent(CommandResponseHelper<Launch
     LaunchResponseType response;
     // TODO: Insert code here
     response.data   = chip::MakeOptional(CharSpan::fromCharString("exampleData"));
-    response.status = ContentLauncher::ContentLaunchStatusEnum::kSuccess;
+    response.status = ContentLauncher::StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -77,7 +77,7 @@ void AppContentLauncherManager::HandleLaunchUrl(CommandResponseHelper<LaunchResp
     // TODO: Insert code here
     LaunchResponseType response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("Success"));
-    response.status = ContentLauncher::ContentLaunchStatusEnum::kSuccess;
+    response.status = ContentLauncher::StatusEnum::kSuccess;
     helper.Success(response);
 }
 
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
index 564779a62affd8..0fe5e9d63d4f6f 100644
--- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
+++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -165,7 +165,7 @@ Commands::PlaybackResponse::Type AppMediaPlaybackManager::HandleMediaRequest(Med
     // Ideally should not come here
     ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequest");
     Commands::PlaybackResponse::Type response;
-    response.status = MediaPlaybackStatusEnum::kInvalidStateForCommand;
+    response.status = StatusEnum::kInvalidStateForCommand;
     return response;
 }
 
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
index 5950ec32198819..f917beb6552ee1 100644
--- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
+++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
@@ -134,13 +134,13 @@ void TargetNavigatorManager::HandleNavigateTarget(CommandResponseHelper<Navigate
     if (target == kNoCurrentTarget || target > mTargets.size())
     {
         response.data   = chip::MakeOptional(CharSpan::fromCharString("error"));
-        response.status = TargetNavigatorStatusEnum::kTargetNotFound;
+        response.status = StatusEnum::kTargetNotFound;
         helper.Success(response);
         return;
     }
     mCurrentTarget = static_cast<uint8_t>(target);
 
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = TargetNavigatorStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/android/java/AppImpl.h b/examples/tv-app/android/java/AppImpl.h
index 0b2e95da0c21c2..657d7e92c0299a 100644
--- a/examples/tv-app/android/java/AppImpl.h
+++ b/examples/tv-app/android/java/AppImpl.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
 #include <app/app-platform/ContentApp.h>
 #include <app/app-platform/ContentAppPlatform.h>
 #include <app/util/attribute-storage.h>
@@ -76,7 +75,7 @@ using ContentLauncherDelegate     = app::Clusters::ContentLauncher::Delegate;
 using KeypadInputDelegate         = app::Clusters::KeypadInput::Delegate;
 using MediaPlaybackDelegate       = app::Clusters::MediaPlayback::Delegate;
 using TargetNavigatorDelegate     = app::Clusters::TargetNavigator::Delegate;
-using SupportedStreamingProtocol  = app::Clusters::ContentLauncher::SupportedStreamingProtocol;
+using SupportedProtocolsBitmap    = app::Clusters::ContentLauncher::SupportedProtocolsBitmap;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
 using ContentAppCommandDelegate   = chip::AppPlatform::ContentAppCommandDelegate;
 
@@ -95,8 +94,7 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
                                   szApplicationVersion),
         mAccountLoginDelegate(commandDelegate, setupPIN),
         mContentLauncherDelegate(attributeDelegate, { "image/*", "video/*" },
-                                 to_underlying(SupportedStreamingProtocol::kDash) |
-                                     to_underlying(SupportedStreamingProtocol::kHls)),
+                                 to_underlying(SupportedProtocolsBitmap::kDash) | to_underlying(SupportedProtocolsBitmap::kHls)),
         mMediaPlaybackDelegate(attributeDelegate),
         mTargetNavigatorDelegate(attributeDelegate, { "home", "search", "info", "guide", "menu" }, 0){};
     virtual ~ContentAppImpl() {}
diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
index 4a8c3524431fd3..098b9af180c7a7 100644
--- a/examples/tv-app/android/java/ChannelManager.cpp
+++ b/examples/tv-app/android/java/ChannelManager.cpp
@@ -286,7 +286,7 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper<ChangeChannelResp
 
         jfieldID getStatusField = env->GetFieldID(channelClass, "status", "I");
         jint jstatus            = env->GetIntField(channelObject, getStatusField);
-        response.status         = static_cast<app::Clusters::Channel::ChannelStatusEnum>(jstatus);
+        response.status         = static_cast<app::Clusters::Channel::StatusEnum>(jstatus);
 
         jfieldID getNameField = env->GetFieldID(channelClass, "name", "Ljava/lang/String;");
         jstring jname         = static_cast<jstring>(env->GetObjectField(channelObject, getNameField));
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index 1ad6ef2fa40311..23437ee4f2b6be 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -253,7 +253,7 @@ LaunchResponseType ContentAppCommandDelegate::FormatContentLauncherResponse(Json
     }
     else
     {
-        launchResponse.status = static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
+        launchResponse.status = static_cast<app::Clusters::ContentLauncher::StatusEnum>(value[statusFieldId].asInt());
         std::string dataFieldId =
             std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kData));
         if (!value[dataFieldId].empty())
@@ -277,8 +277,7 @@ NavigateTargetResponseType ContentAppCommandDelegate::FormatNavigateTargetRespon
     }
     else
     {
-        navigateTargetResponse.status =
-            static_cast<app::Clusters::TargetNavigator::TargetNavigatorStatusEnum>(value[statusFieldId].asInt());
+        navigateTargetResponse.status = static_cast<app::Clusters::TargetNavigator::StatusEnum>(value[statusFieldId].asInt());
         std::string dataFieldId =
             std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData));
         if (!value[dataFieldId].empty())
@@ -302,7 +301,7 @@ PlaybackResponseType ContentAppCommandDelegate::FormatMediaPlaybackResponse(Json
     }
     else
     {
-        playbackResponse.status = static_cast<app::Clusters::MediaPlayback::MediaPlaybackStatusEnum>(value[statusFieldId].asInt());
+        playbackResponse.status = static_cast<app::Clusters::MediaPlayback::StatusEnum>(value[statusFieldId].asInt());
         std::string dataFieldId =
             std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData));
         if (!value[dataFieldId].empty())
diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp
index c91d86424008c3..e57ad4c3a76270 100644
--- a/examples/tv-app/android/java/ContentLauncherManager.cpp
+++ b/examples/tv-app/android/java/ContentLauncherManager.cpp
@@ -86,7 +86,7 @@ void ContentLauncherManager::HandleLaunchContent(CommandResponseHelper<LaunchRes
         jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid);
         JniUtfString dataStr(env, jdataStr);
 
-        response.status = static_cast<chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(status);
+        response.status = static_cast<chip::app::Clusters::ContentLauncher::StatusEnum>(status);
         response.data   = chip::Optional<CharSpan>(dataStr.charSpan());
 
         err = helper.Success(response);
@@ -141,7 +141,7 @@ void ContentLauncherManager::HandleLaunchUrl(CommandResponseHelper<LaunchRespons
         jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid);
         JniUtfString dataStr(env, jdataStr);
 
-        response.status = static_cast<chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(status);
+        response.status = static_cast<chip::app::Clusters::ContentLauncher::StatusEnum>(status);
         response.data   = chip::Optional<CharSpan>(dataStr.charSpan());
 
         err = helper.Success(response);
diff --git a/examples/tv-app/android/java/KeypadInputManager.cpp b/examples/tv-app/android/java/KeypadInputManager.cpp
index ceea8305b585c6..5267f1ec70c9db 100644
--- a/examples/tv-app/android/java/KeypadInputManager.cpp
+++ b/examples/tv-app/android/java/KeypadInputManager.cpp
@@ -41,7 +41,7 @@ void KeypadInputManager::NewManager(jint endpoint, jobject manager)
     chip::app::Clusters::KeypadInput::SetDefaultDelegate(static_cast<EndpointId>(endpoint), mgr);
 }
 
-void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCode & keyCode)
+void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CECKeyCodeEnum & keyCode)
 {
     Commands::SendKeyResponse::Type response;
 
@@ -61,11 +61,11 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kInvalidKeyInCurrentState;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kInvalidKeyInCurrentState;
     }
     else
     {
-        response.status = static_cast<chip::app::Clusters::KeypadInput::KeypadInputStatusEnum>(ret);
+        response.status = static_cast<chip::app::Clusters::KeypadInput::StatusEnum>(ret);
     }
     helper.Success(response);
 }
diff --git a/examples/tv-app/android/java/KeypadInputManager.h b/examples/tv-app/android/java/KeypadInputManager.h
index 8c43cc043d67ec..77d58a8255830b 100644
--- a/examples/tv-app/android/java/KeypadInputManager.h
+++ b/examples/tv-app/android/java/KeypadInputManager.h
@@ -32,7 +32,7 @@ class KeypadInputManager : public KeypadInputDelegate
     void InitializeWithObjects(jobject managerObject);
 
     void HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper,
-                       const chip::app::Clusters::KeypadInput::CecKeyCode & keyCode) override;
+                       const chip::app::Clusters::KeypadInput::CECKeyCodeEnum & keyCode) override;
 
     uint32_t GetFeatureMap(chip::EndpointId endpoint) override;
 
diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp
index c1e92fe51b9aa3..53a7066551cd22 100644
--- a/examples/tv-app/android/java/MediaPlaybackManager.cpp
+++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp
@@ -277,14 +277,14 @@ Commands::PlaybackResponse::Type MediaPlaybackManager::HandleMediaRequest(MediaP
         ChipLogError(AppServer, "Java exception in MediaPlaybackManager::Request %d", mediaPlaybackRequest);
         env->ExceptionDescribe();
         env->ExceptionClear();
-        response.status = MediaPlaybackStatusEnum::kInvalidStateForCommand;
+        response.status = StatusEnum::kInvalidStateForCommand;
     }
-    response.status = static_cast<MediaPlaybackStatusEnum>(ret);
+    response.status = static_cast<StatusEnum>(ret);
 
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        response.status = MediaPlaybackStatusEnum::kInvalidStateForCommand;
+        response.status = StatusEnum::kInvalidStateForCommand;
         ChipLogError(Zcl, "MediaPlaybackManager::HandleMediaRequest status error: %s", err.AsString());
     }
 
diff --git a/examples/tv-app/linux/args.gni b/examples/tv-app/linux/args.gni
index aa476d37b80c30..4861f23ac068dc 100644
--- a/examples/tv-app/linux/args.gni
+++ b/examples/tv-app/linux/args.gni
@@ -31,3 +31,6 @@ chip_enable_additional_data_advertising = true
 chip_enable_rotating_device_id = true
 
 matter_enable_tracing_support = true
+
+# Thread devices do not support WakeOnLan because their mac address is >48bit
+chip_enable_openthread = false
diff --git a/examples/tv-app/tv-common/clusters/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/tv-common/clusters/application-launcher/ApplicationLauncherManager.cpp
index cfc840ce1c83d3..c915856f48fd4d 100644
--- a/examples/tv-app/tv-common/clusters/application-launcher/ApplicationLauncherManager.cpp
+++ b/examples/tv-app/tv-common/clusters/application-launcher/ApplicationLauncherManager.cpp
@@ -45,7 +45,7 @@ void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherR
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -58,7 +58,7 @@ void ApplicationLauncherManager::HandleStopApp(CommandResponseHelper<LauncherRes
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -71,6 +71,6 @@ void ApplicationLauncherManager::HandleHideApp(CommandResponseHelper<LauncherRes
     LauncherResponseType response;
     const char * buf = "data";
     response.data.SetValue(ByteSpan(from_const_char(buf), strlen(buf)));
-    response.status = ApplicationLauncherStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
index 9d7c2556e4ece9..d057a631ea372d 100644
--- a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
+++ b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
@@ -131,18 +131,18 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper<ChangeChannelResp
     // Error: Found multiple matches
     if (matchedChannels.size() > 1)
     {
-        response.status = chip::app::Clusters::Channel::ChannelStatusEnum::kMultipleMatches;
+        response.status = chip::app::Clusters::Channel::StatusEnum::kMultipleMatches;
         helper.Success(response);
     }
     else if (matchedChannels.size() == 0)
     {
         // Error: Found no match
-        response.status = chip::app::Clusters::Channel::ChannelStatusEnum::kNoMatches;
+        response.status = chip::app::Clusters::Channel::StatusEnum::kNoMatches;
         helper.Success(response);
     }
     else
     {
-        response.status      = chip::app::Clusters::Channel::ChannelStatusEnum::kSuccess;
+        response.status      = chip::app::Clusters::Channel::StatusEnum::kSuccess;
         response.data        = chip::MakeOptional(CharSpan::fromCharString("data response"));
         mCurrentChannel      = matchedChannels[0];
         mCurrentChannelIndex = index;
diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
index 60d38f5549e4b1..5ad2dfa0c11f2b 100644
--- a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
+++ b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
@@ -135,7 +135,7 @@ void ContentLauncherManager::HandleLaunchContent(CommandResponseHelper<LaunchRes
     LaunchResponseType response;
     // TODO: Insert code here
     response.data   = chip::MakeOptional(CharSpan::fromCharString("exampleData"));
-    response.status = ContentLauncher::ContentLaunchStatusEnum::kSuccess;
+    response.status = ContentLauncher::StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -155,16 +155,16 @@ void ContentLauncherManager::HandleLaunchUrl(CommandResponseHelper<LaunchRespons
     // TODO: Insert code here
     LaunchResponseType response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("exampleData"));
-    response.status = ContentLauncher::ContentLaunchStatusEnum::kSuccess;
+    response.status = ContentLauncher::StatusEnum::kSuccess;
 
     // Handle test cases
     if (contentUrlString == "https://badurl")
     {
-        response.status = ContentLauncher::ContentLaunchStatusEnum::kUrlNotAvailable;
+        response.status = ContentLauncher::StatusEnum::kURLNotAvailable;
     }
     else if (contentUrlString == "https://csa-iot.org/badauth")
     {
-        response.status = ContentLauncher::ContentLaunchStatusEnum::kAuthFailed;
+        response.status = ContentLauncher::StatusEnum::kAuthFailed;
     }
 
     helper.Success(response);
diff --git a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp
index 5548174821a45d..17c372accea7a9 100644
--- a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp
+++ b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp
@@ -31,67 +31,67 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType
     switch (keycCode)
     {
     case CecKeyCodeType::kUp:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kDown:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kLeft:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kRight:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kSelect:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kBackward:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kExit:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kRootMenu:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kSetupMenu:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kEnter:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumber0OrNumber10:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers1:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers2:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers3:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers4:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers5:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers6:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers7:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers8:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     case CecKeyCodeType::kNumbers9:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kSuccess;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
         break;
     default:
-        response.status = chip::app::Clusters::KeypadInput::KeypadInputStatusEnum::kUnsupportedKey;
+        response.status = chip::app::Clusters::KeypadInput::StatusEnum::kUnsupportedKey;
     }
 
     helper.Success(response);
diff --git a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h
index 79a83b3e65017f..66d43ed7ec8c6f 100644
--- a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h
+++ b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h
@@ -23,7 +23,7 @@
 using chip::app::CommandResponseHelper;
 using KeypadInputDelegate = chip::app::Clusters::KeypadInput::Delegate;
 using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Type;
-using CecKeyCodeType      = chip::app::Clusters::KeypadInput::CecKeyCode;
+using CecKeyCodeType      = chip::app::Clusters::KeypadInput::CECKeyCodeEnum;
 
 class KeypadInputManager : public KeypadInputDelegate
 {
diff --git a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
index 4fffd610ddde6f..6d018d6522ede8 100644
--- a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
+++ b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
@@ -68,7 +68,7 @@ void MediaPlaybackManager::HandlePlay(CommandResponseHelper<Commands::PlaybackRe
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -80,7 +80,7 @@ void MediaPlaybackManager::HandlePause(CommandResponseHelper<Commands::PlaybackR
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -93,7 +93,7 @@ void MediaPlaybackManager::HandleStop(CommandResponseHelper<Commands::PlaybackRe
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -105,7 +105,7 @@ void MediaPlaybackManager::HandleFastForward(CommandResponseHelper<Commands::Pla
         // if already at max speed, return error
         Commands::PlaybackResponse::Type response;
         response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-        response.status = MediaPlaybackStatusEnum::kSpeedOutOfRange;
+        response.status = StatusEnum::kSpeedOutOfRange;
         helper.Success(response);
         return;
     }
@@ -120,7 +120,7 @@ void MediaPlaybackManager::HandleFastForward(CommandResponseHelper<Commands::Pla
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -133,7 +133,7 @@ void MediaPlaybackManager::HandlePrevious(CommandResponseHelper<Commands::Playba
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -145,7 +145,7 @@ void MediaPlaybackManager::HandleRewind(CommandResponseHelper<Commands::Playback
         // if already at max speed in reverse, return error
         Commands::PlaybackResponse::Type response;
         response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-        response.status = MediaPlaybackStatusEnum::kSpeedOutOfRange;
+        response.status = StatusEnum::kSpeedOutOfRange;
         helper.Success(response);
         return;
     }
@@ -160,7 +160,7 @@ void MediaPlaybackManager::HandleRewind(CommandResponseHelper<Commands::Playback
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -175,7 +175,7 @@ void MediaPlaybackManager::HandleSkipBackward(CommandResponseHelper<Commands::Pl
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -189,7 +189,7 @@ void MediaPlaybackManager::HandleSkipForward(CommandResponseHelper<Commands::Pla
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -201,7 +201,7 @@ void MediaPlaybackManager::HandleSeek(CommandResponseHelper<Commands::PlaybackRe
     {
         Commands::PlaybackResponse::Type response;
         response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-        response.status = MediaPlaybackStatusEnum::kSeekOutOfRange;
+        response.status = StatusEnum::kSeekOutOfRange;
         helper.Success(response);
     }
     else
@@ -210,7 +210,7 @@ void MediaPlaybackManager::HandleSeek(CommandResponseHelper<Commands::PlaybackRe
 
         Commands::PlaybackResponse::Type response;
         response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-        response.status = MediaPlaybackStatusEnum::kSuccess;
+        response.status = StatusEnum::kSuccess;
         helper.Success(response);
     }
 }
@@ -224,7 +224,7 @@ void MediaPlaybackManager::HandleNext(CommandResponseHelper<Commands::PlaybackRe
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
@@ -235,7 +235,7 @@ void MediaPlaybackManager::HandleStartOver(CommandResponseHelper<Commands::Playb
 
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = MediaPlaybackStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
index ba52adace6955d..9c0599eb6df7b0 100644
--- a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
+++ b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
@@ -56,13 +56,13 @@ void TargetNavigatorManager::HandleNavigateTarget(CommandResponseHelper<Navigate
     if (target == kNoCurrentTarget || target > mTargets.size())
     {
         response.data   = chip::MakeOptional(CharSpan::fromCharString("error"));
-        response.status = TargetNavigatorStatusEnum::kTargetNotFound;
+        response.status = StatusEnum::kTargetNotFound;
         helper.Success(response);
         return;
     }
     mCurrentTarget = static_cast<uint8_t>(target);
 
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
-    response.status = TargetNavigatorStatusEnum::kSuccess;
+    response.status = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/tv-common/clusters/wake-on-lan/WakeOnLanManager.cpp b/examples/tv-app/tv-common/clusters/wake-on-lan/WakeOnLanManager.cpp
index c851e0674d6697..e6fb5e38e61969 100644
--- a/examples/tv-app/tv-common/clusters/wake-on-lan/WakeOnLanManager.cpp
+++ b/examples/tv-app/tv-common/clusters/wake-on-lan/WakeOnLanManager.cpp
@@ -23,6 +23,8 @@
 #include <platform/ConfigurationManager.h>
 #include <string>
 
+constexpr const char * kNullHexMACAddress = "000000000000";
+
 using namespace chip;
 using namespace chip::app::Clusters::WakeOnLan;
 
@@ -33,7 +35,7 @@ std::string getMacAddress()
     if (chip::DeviceLayer::ConfigurationMgr().GetPrimaryMACAddress(mac) != CHIP_NO_ERROR)
     {
         ChipLogProgress(Zcl, "WakeOnLanManager::getMacAddress no primary MAC configured by DeviceLayer");
-        return "0000000000";
+        return kNullHexMACAddress;
     }
 
     char macStr[chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength * 2 + 1] = { 0 }; // added null char
@@ -41,7 +43,7 @@ std::string getMacAddress()
         CHIP_NO_ERROR)
     {
         ChipLogProgress(Zcl, "WakeOnLanManager::getMacAddress hex conversion failed");
-        return "0000000000";
+        return kNullHexMACAddress;
     }
 
     return std::string(macStr);
@@ -51,5 +53,13 @@ CHIP_ERROR WakeOnLanManager::HandleGetMacAddress(chip::app::AttributeValueEncode
 {
     ChipLogProgress(Zcl, "WakeOnLanManager::HandleGetMacAddress");
 
+    // Spec REQUIRES 48-bit mac addresses. This means at least Thread devices will
+    // fail here.
+    if (chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength != 6)
+    {
+        ChipLogError(Zcl, "WakeOnLanManager: primary MAC address is not 48-bit");
+        return CHIP_ERROR_BUFFER_TOO_SMALL;
+    }
+
     return aEncoder.Encode(CharSpan::fromCharString(getMacAddress().c_str()));
 }
diff --git a/examples/tv-app/tv-common/include/AppTv.h b/examples/tv-app/tv-common/include/AppTv.h
index e63a4ff5d57e88..5f02536b3b86d0 100644
--- a/examples/tv-app/tv-common/include/AppTv.h
+++ b/examples/tv-app/tv-common/include/AppTv.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
 #include <app/app-platform/ContentApp.h>
 #include <app/app-platform/ContentAppPlatform.h>
 #include <app/util/attribute-storage.h>
@@ -61,7 +60,7 @@ using ContentLauncherDelegate     = app::Clusters::ContentLauncher::Delegate;
 using KeypadInputDelegate         = app::Clusters::KeypadInput::Delegate;
 using MediaPlaybackDelegate       = app::Clusters::MediaPlayback::Delegate;
 using TargetNavigatorDelegate     = app::Clusters::TargetNavigator::Delegate;
-using SupportedStreamingProtocol  = app::Clusters::ContentLauncher::SupportedStreamingProtocol;
+using SupportedProtocolsBitmap    = app::Clusters::ContentLauncher::SupportedProtocolsBitmap;
 
 static const int kCatalogVendorId = CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID;
 
@@ -75,9 +74,9 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
                    const char * szApplicationVersion, const char * setupPIN) :
         mApplicationBasicDelegate(kCatalogVendorId, BuildAppId(vendorId), szVendorName, vendorId, szApplicationName, productId,
                                   szApplicationVersion),
-        mAccountLoginDelegate(setupPIN), mContentLauncherDelegate({ "image/*", "video/*" },
-                                                                  to_underlying(SupportedStreamingProtocol::kDash) |
-                                                                      to_underlying(SupportedStreamingProtocol::kHls)),
+        mAccountLoginDelegate(setupPIN),
+        mContentLauncherDelegate({ "image/*", "video/*" },
+                                 to_underlying(SupportedProtocolsBitmap::kDash) | to_underlying(SupportedProtocolsBitmap::kHls)),
         mTargetNavigatorDelegate({ "home", "search", "info", "guide", "menu" }, 0){};
     virtual ~ContentAppImpl() {}
 
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 61b84eadc08409..75462f51dced59 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -27,6 +29,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -48,12 +51,14 @@ server cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 server cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -64,7 +69,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -76,7 +81,7 @@ server cluster LevelControl = 8 {
   readonly attribute int16u currentFrequency = 4;
   readonly attribute int16u minFrequency = 5;
   readonly attribute int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute nullable int16u onTransitionTime = 18;
@@ -93,55 +98,55 @@ server cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -156,6 +161,8 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -186,6 +193,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -205,6 +214,8 @@ client cluster Binding = 30 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -227,6 +238,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -299,6 +312,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -376,6 +391,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -386,6 +403,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -460,7 +479,9 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -475,6 +496,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -499,8 +522,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -515,6 +538,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -525,7 +550,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -536,6 +561,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -574,12 +601,12 @@ client cluster GeneralCommissioning = 48 {
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
@@ -603,6 +630,8 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -641,13 +670,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -667,6 +696,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 client cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -696,6 +727,7 @@ client cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -712,11 +744,14 @@ client cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -773,6 +808,9 @@ client cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -789,6 +827,8 @@ client cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   request struct ConnectNetworkRequest {
@@ -808,6 +848,16 @@ client cluster NetworkCommissioning = 49 {
     optional int64u breadcrumb = 2;
   }
 
+  request struct QueryIdentityRequest {
+    OCTET_STRING<20> keyIdentifier = 0;
+    optional OCTET_STRING<32> possessionNonce = 1;
+  }
+
+  response struct QueryIdentityResponse = 10 {
+    OCTET_STRING<140> identity = 0;
+    optional OCTET_STRING<64> possessionSignature = 1;
+  }
+
   /** Detemine the set of networks the device sees as available. */
   command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
   /** Add or update the credentials for a given Wi-Fi network. */
@@ -820,10 +870,14 @@ client cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
   /** Modify the order in which networks will be presented in the Networks attribute. */
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  /** Retrieve details about and optionally proof of possession of a network client identity. */
+  command access(invoke: administer) QueryIdentity(QueryIdentityRequest): QueryIdentityResponse = 9;
 }
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -853,6 +907,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -869,11 +924,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -920,6 +978,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -954,6 +1015,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -972,6 +1035,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1009,6 +1074,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1109,11 +1176,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1146,6 +1221,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1244,9 +1321,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1307,6 +1384,8 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1348,7 +1427,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1379,6 +1458,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1418,6 +1499,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1463,6 +1546,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1587,6 +1672,8 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1703,6 +1790,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1776,6 +1865,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1792,6 +1883,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1808,6 +1901,8 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 server cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -1821,7 +1916,9 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 server cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute char_string<12> MACAddress = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1832,16 +1929,18 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -1886,7 +1985,7 @@ server cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1897,7 +1996,9 @@ server cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1905,7 +2006,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1923,7 +2024,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1932,14 +2033,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -1948,6 +2042,15 @@ server cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -1985,7 +2088,7 @@ server cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -2004,6 +2107,8 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -2056,6 +2161,8 @@ server cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 server cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2068,7 +2175,9 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -2157,7 +2266,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -2177,11 +2286,11 @@ server cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -2189,11 +2298,7 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -2217,12 +2322,18 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -2234,13 +2345,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -2249,13 +2360,13 @@ server cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -2264,7 +2375,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   readonly attribute char_string acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2285,7 +2396,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -2295,6 +2406,8 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -2338,7 +2451,9 @@ server cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -2359,7 +2474,7 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute int16u catalogList[] = 0;
-  attribute nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2381,7 +2496,7 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -2392,6 +2507,8 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -2422,6 +2539,8 @@ server cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 server cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2442,9 +2561,9 @@ server cluster AccountLogin = 1294 {
     char_string setupPIN = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
@@ -2506,8 +2625,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateProvider {
@@ -2601,9 +2722,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 58a0b469101460..0dbf91850f33cc 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -716,6 +716,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -742,7 +774,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1754,6 +1786,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1927,7 +1975,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2232,7 +2280,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2248,7 +2296,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2264,7 +2312,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5484,7 +5532,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6081,7 +6129,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7126,7 +7174,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
index 3d35e0d29a49c9..fd99ae61a5763f 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
@@ -372,7 +372,7 @@ jobject SupportedStreamingProtocolsSuccessHandlerJNI::ConvertToJObject(
     chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo::DecodableArgType responseData)
 {
     ChipLogProgress(AppServer, "SupportedStreamingProtocolsSuccessHandlerJNI::ConvertToJObject called");
-    return ConvertToIntegerJObject(responseData);
+    return ConvertToIntegerJObject(responseData.Raw());
 }
 
 // APPLICATION BASIC
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
index 983b7848a04dbf..b4d9b37a422028 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
@@ -609,7 +609,7 @@ JNI_METHOD(jboolean, levelControl_1step)
                  ChipLogError(AppServer, "MatterCallbackHandlerJNI.SetUp failed %" CHIP_ERROR_FORMAT, err.Format()));
 
     err = CastingServer::GetInstance()->LevelControl_Step(
-        &endpoint, static_cast<chip::app::Clusters::LevelControl::StepMode>(stepMode), static_cast<uint8_t>(stepSize),
+        &endpoint, static_cast<chip::app::Clusters::LevelControl::StepModeEnum>(stepMode), static_cast<uint8_t>(stepSize),
         static_cast<uint16_t>(transitionTime), static_cast<uint8_t>(optionMask), static_cast<uint8_t>(optionOverride),
         [](CHIP_ERROR err) { TvCastingAppJNIMgr().getMediaCommandResponseHandler(LevelControl_Step).Handle(err); });
     VerifyOrExit(CHIP_NO_ERROR == err,
@@ -1663,7 +1663,7 @@ JNI_METHOD(jboolean, keypadInput_1sendKey)
                  ChipLogError(AppServer, "MatterCallbackHandlerJNI.SetUp failed %" CHIP_ERROR_FORMAT, err.Format()));
 
     err = CastingServer::GetInstance()->KeypadInput_SendKey(
-        &endpoint, static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(keyCode),
+        &endpoint, static_cast<chip::app::Clusters::KeypadInput::CECKeyCodeEnum>(keyCode),
         [](CHIP_ERROR err) { TvCastingAppJNIMgr().getMediaCommandResponseHandler(KeypadInput_SendKey).Handle(err); });
     VerifyOrExit(CHIP_NO_ERROR == err,
                  ChipLogError(AppServer, "CastingServer.KeypadInput_SendKey failed %" CHIP_ERROR_FORMAT, err.Format()));
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
index 3f4dbce0700bb7..b19d72097f7ecc 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
@@ -1076,7 +1076,7 @@ - (void)contentLauncher_subscribeSupportedStreamingProtocols:(ContentApp * _Nonn
                                              void (^callback)(uint32_t) =
                                                  [[CastingServerBridge getSharedInstance].subscriptionReadSuccessCallbacks
                                                      objectForKey:@"contentLauncher_subscribeSupportedStreamingProtocols"];
-                                             callback(supportedStreamingProtocols);
+                                             callback(supportedStreamingProtocols.Raw());
                                          },
                                          [](void * context, CHIP_ERROR err) {
                                              void (^callback)(MatterError *) =
@@ -1121,7 +1121,7 @@ - (void)levelControl_step:(ContentApp * _Nonnull)contentApp
                                      [ConversionUtils convertToCppTargetEndpointInfoFrom:contentApp outTargetEndpointInfo:endpoint];
 
                                      return castingServer->LevelControl_Step(&endpoint,
-                                         static_cast<chip::app::Clusters::LevelControl::StepMode>(stepMode), stepSize,
+                                         static_cast<chip::app::Clusters::LevelControl::StepModeEnum>(stepMode), stepSize,
                                          transitionTime, optionMask, optionOverride, responseFunction);
                                  }];
 }
@@ -2154,7 +2154,7 @@ - (void)keypadInput_sendKey:(ContentApp * _Nonnull)contentApp
                                      [ConversionUtils convertToCppTargetEndpointInfoFrom:contentApp outTargetEndpointInfo:endpoint];
 
                                      return castingServer->KeypadInput_SendKey(&endpoint,
-                                         static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(keyCode), responseFunction);
+                                         static_cast<chip::app::Clusters::KeypadInput::CECKeyCodeEnum>(keyCode), responseFunction);
                                  }];
 }
 
diff --git a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
index 7eb9894a106fd9..e86942e39ac2b0 100644
--- a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
+++ b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
@@ -18,7 +18,7 @@
 
 #include <commands/common/CHIPCommand.h>
 
-#include <core/CHIPBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ScopedBuffer.h>
diff --git a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
index 3f18d88fe9f954..349edaefb31a79 100644
--- a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
+++ b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
@@ -148,7 +148,7 @@ class CastingServer : public AppDelegate
     /**
      * @brief Level Control cluster
      */
-    CHIP_ERROR LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepMode stepMode,
+    CHIP_ERROR LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepModeEnum stepMode,
                                  uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride,
                                  std::function<void(CHIP_ERROR)> responseCallback);
     CHIP_ERROR LevelControl_MoveToLevel(TargetEndpointInfo * endpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask,
@@ -303,7 +303,7 @@ class CastingServer : public AppDelegate
     /**
      * @brief Keypad Input cluster
      */
-    CHIP_ERROR KeypadInput_SendKey(TargetEndpointInfo * endpoint, const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
+    CHIP_ERROR KeypadInput_SendKey(TargetEndpointInfo * endpoint, const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
                                    std::function<void(CHIP_ERROR)> responseCallback);
 
     /**
diff --git a/examples/tv-casting-app/tv-casting-common/include/KeypadInput.h b/examples/tv-casting-app/tv-casting-common/include/KeypadInput.h
index a4e7a43338e9d6..0f4dce699b1a6f 100644
--- a/examples/tv-casting-app/tv-casting-common/include/KeypadInput.h
+++ b/examples/tv-casting-app/tv-casting-common/include/KeypadInput.h
@@ -29,5 +29,6 @@ class SendKeyCommand : public MediaCommandBase<chip::app::Clusters::KeypadInput:
 public:
     SendKeyCommand() : MediaCommandBase(chip::app::Clusters::KeypadInput::Id) {}
 
-    CHIP_ERROR Invoke(const chip::app::Clusters::KeypadInput::CecKeyCode keyCode, std::function<void(CHIP_ERROR)> responseCallback);
+    CHIP_ERROR Invoke(const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
+                      std::function<void(CHIP_ERROR)> responseCallback);
 };
diff --git a/examples/tv-casting-app/tv-casting-common/include/LevelControl.h b/examples/tv-casting-app/tv-casting-common/include/LevelControl.h
index 1f2271f5af1b22..5bb05b4ab4fadb 100644
--- a/examples/tv-casting-app/tv-casting-common/include/LevelControl.h
+++ b/examples/tv-casting-app/tv-casting-common/include/LevelControl.h
@@ -31,10 +31,10 @@ class StepCommand
 public:
     StepCommand() : MediaCommandBase(chip::app::Clusters::LevelControl::Id) {}
 
-    CHIP_ERROR Invoke(chip::app::Clusters::LevelControl::StepMode stepMode, uint8_t stepSize,
+    CHIP_ERROR Invoke(chip::app::Clusters::LevelControl::StepModeEnum stepMode, uint8_t stepSize,
                       chip::app::DataModel::Nullable<uint16_t> transitionTime,
-                      chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> optionMask,
-                      chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> optionOverride,
+                      chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> optionMask,
+                      chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> optionOverride,
                       std::function<void(CHIP_ERROR)> responseCallback);
 };
 
@@ -45,8 +45,8 @@ class MoveToLevelCommand
     MoveToLevelCommand() : MediaCommandBase(chip::app::Clusters::LevelControl::Id) {}
 
     CHIP_ERROR Invoke(uint8_t level, chip::app::DataModel::Nullable<uint16_t> transitionTime,
-                      chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> optionMask,
-                      chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> optionOverride,
+                      chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> optionMask,
+                      chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> optionOverride,
                       std::function<void(CHIP_ERROR)> responseCallback);
 };
 
diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
index c328eb888b8f45..fbbb9d32d8f030 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -789,7 +789,7 @@ CastingServer::ContentLauncher_SubscribeToSupportedStreamingProtocols(
 /**
  * @brief Level Control cluster
  */
-CHIP_ERROR CastingServer::LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepMode stepMode,
+CHIP_ERROR CastingServer::LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepModeEnum stepMode,
                                             uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride,
                                             std::function<void(CHIP_ERROR)> responseCallback)
 {
@@ -1100,7 +1100,7 @@ CHIP_ERROR CastingServer::TargetNavigator_SubscribeToCurrentTarget(
  * @brief Keypad Input cluster
  */
 CHIP_ERROR CastingServer::KeypadInput_SendKey(TargetEndpointInfo * endpoint,
-                                              const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
+                                              const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
                                               std::function<void(CHIP_ERROR)> responseCallback)
 {
     ReturnErrorOnFailure(mSendKeyCommand.SetTarget(mActiveTargetVideoPlayerInfo, endpoint->GetEndpointId()));
diff --git a/examples/tv-casting-app/tv-casting-common/src/KeypadInput.cpp b/examples/tv-casting-app/tv-casting-common/src/KeypadInput.cpp
index d9469603b292a4..52a03390b70520 100644
--- a/examples/tv-casting-app/tv-casting-common/src/KeypadInput.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/KeypadInput.cpp
@@ -21,7 +21,7 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 
-CHIP_ERROR SendKeyCommand::Invoke(const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
+CHIP_ERROR SendKeyCommand::Invoke(const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
                                   std::function<void(CHIP_ERROR)> responseCallback)
 {
     KeypadInput::Commands::SendKey::Type request;
diff --git a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
index 2f0c1b4a7fc15e..d0053d83817414 100644
--- a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
@@ -21,9 +21,9 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 
-CHIP_ERROR StepCommand::Invoke(LevelControl::StepMode stepMode, uint8_t stepSize, app::DataModel::Nullable<uint16_t> transitionTime,
-                               BitMask<LevelControl::LevelControlOptions> optionMask,
-                               BitMask<LevelControl::LevelControlOptions> optionOverride,
+CHIP_ERROR StepCommand::Invoke(LevelControl::StepModeEnum stepMode, uint8_t stepSize,
+                               app::DataModel::Nullable<uint16_t> transitionTime, BitMask<LevelControl::OptionsBitmap> optionMask,
+                               BitMask<LevelControl::OptionsBitmap> optionOverride,
                                std::function<void(CHIP_ERROR)> responseCallback)
 {
     LevelControl::Commands::Step::Type request;
@@ -36,8 +36,8 @@ CHIP_ERROR StepCommand::Invoke(LevelControl::StepMode stepMode, uint8_t stepSize
 }
 
 CHIP_ERROR MoveToLevelCommand::Invoke(uint8_t level, app::DataModel::Nullable<uint16_t> transitionTime,
-                                      BitMask<LevelControl::LevelControlOptions> optionMask,
-                                      BitMask<LevelControl::LevelControlOptions> optionOverride,
+                                      BitMask<LevelControl::OptionsBitmap> optionMask,
+                                      BitMask<LevelControl::OptionsBitmap> optionOverride,
                                       std::function<void(CHIP_ERROR)> responseCallback)
 {
     LevelControl::Commands::MoveToLevel::Type request;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index b3e17599c19657..fadcb2ca00ce4e 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -43,6 +45,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -112,6 +116,8 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -136,6 +142,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -156,7 +163,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -181,12 +188,14 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 client cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -197,7 +206,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -209,7 +218,7 @@ client cluster LevelControl = 8 {
   readonly attribute optional int16u currentFrequency = 4;
   readonly attribute optional int16u minFrequency = 5;
   readonly attribute optional int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute optional int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute optional nullable int16u onTransitionTime = 18;
@@ -226,55 +235,55 @@ client cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToClosestFrequencyRequest {
@@ -304,6 +313,8 @@ client cluster LevelControl = 8 {
 
 /** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
 server cluster BinaryInputBasic = 15 {
+  revision 1; // NOTE: Default/not specifically set
+
   attribute boolean outOfService = 81;
   attribute boolean presentValue = 85;
   readonly attribute bitmap8 statusFlags = 111;
@@ -317,6 +328,8 @@ server cluster BinaryInputBasic = 15 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 client cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -348,6 +361,8 @@ client cluster Descriptor = 29 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -378,6 +393,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -400,6 +417,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -472,6 +491,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -549,6 +570,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -562,7 +585,9 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -577,6 +602,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -601,8 +628,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -617,6 +644,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -627,7 +656,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -638,6 +667,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -676,13 +707,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -702,6 +733,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -731,6 +764,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -747,11 +781,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -798,6 +835,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -832,6 +872,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -850,6 +892,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -950,11 +994,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -987,6 +1039,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1028,7 +1082,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1059,6 +1113,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1098,6 +1154,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1143,6 +1201,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1259,6 +1319,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1324,6 +1386,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1340,7 +1404,10 @@ server cluster FixedLabel = 64 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 client cluster WakeOnLan = 1283 {
-  readonly attribute optional char_string<32> MACAddress = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute optional char_string<12> MACAddress = 0;
+  readonly attribute optional octet_string<16> linkLocalAddress = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1351,16 +1418,18 @@ client cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -1396,7 +1465,7 @@ client cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1419,7 +1488,9 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1427,7 +1498,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1445,7 +1516,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1455,14 +1526,7 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -1471,6 +1535,15 @@ client cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -1504,7 +1577,7 @@ client cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1538,6 +1611,8 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -1594,6 +1669,8 @@ client cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 client cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1607,7 +1684,9 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -1696,7 +1775,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -1716,11 +1795,11 @@ client cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -1729,11 +1808,7 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -1757,12 +1832,18 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -1774,13 +1855,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -1789,13 +1870,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -1804,7 +1885,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   readonly attribute optional char_string acceptHeader[] = 0;
-  attribute optional bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute optional SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1825,7 +1906,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1837,6 +1918,8 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -1882,7 +1965,9 @@ client cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -1903,7 +1988,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute optional int16u catalogList[] = 0;
-  attribute optional nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute optional nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1925,7 +2010,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -1939,6 +2024,8 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -1969,6 +2056,8 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 client cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1990,11 +2079,11 @@ client cluster AccountLogin = 1294 {
   }
 
   /** Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. */
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
   /** Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. */
-  timed command Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
   /** The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. */
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
@@ -2052,8 +2141,10 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster LocalizationConfiguration {
@@ -2129,9 +2220,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index b231ccb0ec904f..47b9613daf8d37 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -690,6 +690,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -716,7 +748,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1400,6 +1432,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1573,7 +1621,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
diff --git a/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepository.kt b/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepository.kt
index cdc7e380a94699..1896289d5fda5b 100644
--- a/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepository.kt
+++ b/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepository.kt
@@ -1,11 +1,12 @@
 package com.matter.virtual.device.app.core.data.repository.cluster
 
+import com.matter.virtual.device.app.core.model.matter.LockState
 import kotlinx.coroutines.flow.StateFlow
 
 interface DoorLockManagerRepository {
-  fun getLockStateFlow(): StateFlow<Boolean>
+  fun getLockStateFlow(): StateFlow<LockState>
 
-  suspend fun setLockState(value: Boolean)
+  suspend fun setLockState(lockState: LockState)
 
   suspend fun sendLockAlarmEvent()
 }
diff --git a/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepositoryImpl.kt b/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepositoryImpl.kt
index 4dfa15a01717e3..e6bf968ad2cd11 100644
--- a/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepositoryImpl.kt
+++ b/examples/virtual-device-app/android/App/core/data/src/main/java/com/matter/virtual/device/app/core/data/repository/cluster/DoorLockManagerRepositoryImpl.kt
@@ -1,6 +1,7 @@
 package com.matter.virtual.device.app.core.data.repository.cluster
 
 import com.matter.virtual.device.app.core.matter.manager.DoorLockManagerStub
+import com.matter.virtual.device.app.core.model.matter.LockState
 import javax.inject.Inject
 import kotlinx.coroutines.flow.StateFlow
 import timber.log.Timber
@@ -9,13 +10,13 @@ internal class DoorLockManagerRepositoryImpl
 @Inject
 constructor(private val doorLockManagerStub: DoorLockManagerStub) : DoorLockManagerRepository {
 
-  override fun getLockStateFlow(): StateFlow<Boolean> {
+  override fun getLockStateFlow(): StateFlow<LockState> {
     return doorLockManagerStub.lockState
   }
 
-  override suspend fun setLockState(value: Boolean) {
-    Timber.d("setLockState():$value")
-    doorLockManagerStub.setLockState(value)
+  override suspend fun setLockState(lockState: LockState) {
+    Timber.d("setLockState():$lockState")
+    doorLockManagerStub.setLockState(lockState)
   }
 
   override suspend fun sendLockAlarmEvent() {
diff --git a/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/GetLockStateFlowUseCase.kt b/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/GetLockStateFlowUseCase.kt
index b167997c0294e2..d8fd4cf8bbbb5a 100644
--- a/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/GetLockStateFlowUseCase.kt
+++ b/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/GetLockStateFlowUseCase.kt
@@ -1,6 +1,7 @@
 package com.matter.virtual.device.app.core.domain.usecase.matter.cluster.doorlock
 
 import com.matter.virtual.device.app.core.data.repository.cluster.DoorLockManagerRepository
+import com.matter.virtual.device.app.core.model.matter.LockState
 import javax.inject.Inject
 import kotlinx.coroutines.flow.StateFlow
 
@@ -8,5 +9,5 @@ class GetLockStateFlowUseCase
 @Inject
 constructor(private val doorLockManagerRepository: DoorLockManagerRepository) {
 
-  operator fun invoke(): StateFlow<Boolean> = doorLockManagerRepository.getLockStateFlow()
+  operator fun invoke(): StateFlow<LockState> = doorLockManagerRepository.getLockStateFlow()
 }
diff --git a/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/SetLockStateUseCase.kt b/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/SetLockStateUseCase.kt
index 3bec41f20a59f8..02e5cdb3c16b72 100644
--- a/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/SetLockStateUseCase.kt
+++ b/examples/virtual-device-app/android/App/core/domain/src/main/java/com/matter/virtual/device/app/core/domain/usecase/matter/cluster/doorlock/SetLockStateUseCase.kt
@@ -3,6 +3,7 @@ package com.matter.virtual.device.app.core.domain.usecase.matter.cluster.doorloc
 import com.matter.virtual.device.app.core.common.di.IoDispatcher
 import com.matter.virtual.device.app.core.data.repository.cluster.DoorLockManagerRepository
 import com.matter.virtual.device.app.core.domain.CoroutineUseCase
+import com.matter.virtual.device.app.core.model.matter.LockState
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 
@@ -11,9 +12,9 @@ class SetLockStateUseCase
 constructor(
   private val doorLockManagerRepository: DoorLockManagerRepository,
   @IoDispatcher dispatcher: CoroutineDispatcher
-) : CoroutineUseCase<Boolean, Unit>(dispatcher) {
+) : CoroutineUseCase<LockState, Unit>(dispatcher) {
 
-  override suspend fun execute(param: Boolean) {
+  override suspend fun execute(param: LockState) {
     doorLockManagerRepository.setLockState(param)
   }
 }
diff --git a/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/manager/DoorLockManagerStub.kt b/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/manager/DoorLockManagerStub.kt
index 11320142e1d89d..a1d050eb4fa570 100644
--- a/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/manager/DoorLockManagerStub.kt
+++ b/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/manager/DoorLockManagerStub.kt
@@ -3,6 +3,7 @@ package com.matter.virtual.device.app.core.matter.manager
 import com.matter.virtual.device.app.DeviceApp
 import com.matter.virtual.device.app.DoorLockManager
 import com.matter.virtual.device.app.core.common.MatterConstants
+import com.matter.virtual.device.app.core.model.matter.LockState
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -12,14 +13,14 @@ import timber.log.Timber
 @Singleton
 class DoorLockManagerStub @Inject constructor(private val deviceApp: DeviceApp) : DoorLockManager {
 
-  private val _lockState = MutableStateFlow(false)
-  val lockState: StateFlow<Boolean>
+  private val _lockState = MutableStateFlow(LockState.LOCKED)
+  val lockState: StateFlow<LockState>
     get() = _lockState
 
   override fun initAttributeValue() {
     Timber.d("initAttributeValue()")
     deviceApp.setLockType(MatterConstants.DEFAULT_ENDPOINT, DoorLockManager.DlLockType_kMagnetic)
-    deviceApp.setLockState(MatterConstants.DEFAULT_ENDPOINT, lockState.value.asLockState())
+    deviceApp.setLockState(MatterConstants.DEFAULT_ENDPOINT, DoorLockManager.DlLockState_kLocked)
     deviceApp.setActuatorEnabled(MatterConstants.DEFAULT_ENDPOINT, true)
     deviceApp.setOperatingMode(
       MatterConstants.DEFAULT_ENDPOINT,
@@ -33,12 +34,12 @@ class DoorLockManagerStub @Inject constructor(private val deviceApp: DeviceApp)
 
   override fun handleLockStateChanged(value: Int) {
     Timber.d("handleLockStateChanged():$value")
-    _lockState.value = value.asBooleanLockState()
+    _lockState.value = value.asLockStateEnum()
   }
 
-  fun setLockState(value: Boolean) {
-    Timber.d("setLockState():$value")
-    deviceApp.setLockState(MatterConstants.DEFAULT_ENDPOINT, value.asLockState())
+  fun setLockState(lockState: LockState) {
+    Timber.d("setLockState():$lockState")
+    deviceApp.setLockState(MatterConstants.DEFAULT_ENDPOINT, lockState.asLockState())
   }
 
   fun sendLockAlarmEvent() {
@@ -46,16 +47,21 @@ class DoorLockManagerStub @Inject constructor(private val deviceApp: DeviceApp)
     deviceApp.sendLockAlarmEvent(MatterConstants.DEFAULT_ENDPOINT)
   }
 
-  private fun Boolean.asLockState() =
+  private fun LockState.asLockState() =
     when (this) {
-      true -> DoorLockManager.DlLockState_kUnlocked
-      false -> DoorLockManager.DlLockState_kLocked
+      LockState.NOT_FULLY_LOCKED -> DoorLockManager.DlLockState_kNotFullyLocked
+      LockState.LOCKED -> DoorLockManager.DlLockState_kLocked
+      LockState.UNLOCKED -> DoorLockManager.DlLockState_kUnlocked
+      LockState.UNLATCHED -> DoorLockManager.DlLockState_kUnlatched
+      else -> DoorLockManager.DlLockState_kUnknownEnumValue
     }
 
-  private fun Int.asBooleanLockState() =
+  private fun Int.asLockStateEnum() =
     when (this) {
-      DoorLockManager.DlLockState_kUnlocked -> true
-      DoorLockManager.DlLockState_kLocked -> false
-      else -> false
+      DoorLockManager.DlLockState_kNotFullyLocked -> LockState.NOT_FULLY_LOCKED
+      DoorLockManager.DlLockState_kLocked -> LockState.LOCKED
+      DoorLockManager.DlLockState_kUnlocked -> LockState.UNLOCKED
+      DoorLockManager.DlLockState_kUnlatched -> LockState.UNLATCHED
+      else -> LockState.UNKNOWN_ENUM_VALUE
     }
 }
diff --git a/examples/virtual-device-app/android/App/core/model/src/main/java/com/matter/virtual/device/app/core/model/matter/LockState.kt b/examples/virtual-device-app/android/App/core/model/src/main/java/com/matter/virtual/device/app/core/model/matter/LockState.kt
new file mode 100644
index 00000000000000..b9ce0a8dbe77b2
--- /dev/null
+++ b/examples/virtual-device-app/android/App/core/model/src/main/java/com/matter/virtual/device/app/core/model/matter/LockState.kt
@@ -0,0 +1,9 @@
+package com.matter.virtual.device.app.core.model.matter
+
+enum class LockState {
+  NOT_FULLY_LOCKED,
+  LOCKED,
+  UNLOCKED,
+  UNLATCHED,
+  UNKNOWN_ENUM_VALUE
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/.gitignore b/examples/virtual-device-app/android/App/feature/closure/.gitignore
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts
new file mode 100644
index 00000000000000..044d998e28535a
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts
@@ -0,0 +1,72 @@
+import com.matter.buildsrc.Deps
+import com.matter.buildsrc.Versions
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.dagger.hilt.android")
+    id("androidx.navigation.safeargs.kotlin")
+    kotlin("kapt")
+}
+
+android {
+    namespace = "com.matter.virtual.device.app.feature.closure"
+    compileSdk = Versions.compileSdkVersion
+
+    defaultConfig {
+        minSdk = Versions.minSdkVersion
+        targetSdk = Versions.targetSdkVersion
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        viewBinding = true
+        dataBinding = true
+    }
+}
+
+dependencies {
+
+    implementation(project(":core:common"))
+    implementation(project(":core:domain"))
+    implementation(project(":core:model"))
+    implementation(project(":core:ui"))
+
+    implementation(Deps.AndroidX.core)
+    implementation(Deps.AndroidX.appcompat)
+    implementation(Deps.AndroidX.fragment)
+    implementation(Deps.AndroidX.Lifecycle.viewmodel)
+    implementation(Deps.AndroidX.Lifecycle.livedata)
+
+    implementation(Deps.Kotlin.serialization)
+
+    implementation(Deps.Navigation.fragment)
+    implementation(Deps.Navigation.ui)
+
+    implementation(Deps.Dagger.hiltAndroid)
+    kapt(Deps.Dagger.hiltAndroidCompiler)
+
+    implementation(Deps.timber)
+
+    testImplementation(Deps.Test.junit)
+    androidTestImplementation(Deps.Test.junitExt)
+    androidTestImplementation(Deps.Test.espresso)
+}
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro
new file mode 100644
index 00000000000000..481bb434814107
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000000000..5e4178d42aa18b
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    assertEquals("com.matter.virtual.device.app.feature.closure.test", appContext.packageName)
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000000..a5918e68abcdde
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt
new file mode 100644
index 00000000000000..8cfe6a403f53ed
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt
@@ -0,0 +1,41 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.navArgs
+import com.matter.virtual.device.app.core.ui.BaseFragment
+import com.matter.virtual.device.app.core.ui.databinding.LayoutAppbarBinding
+import com.matter.virtual.device.app.feature.closure.databinding.FragmentDoorLockBinding
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import timber.log.Timber
+
+@AndroidEntryPoint
+class DoorLockFragment :
+  BaseFragment<FragmentDoorLockBinding, DoorLockViewModel>(R.layout.fragment_door_lock) {
+
+  override val viewModel: DoorLockViewModel by viewModels()
+
+  @OptIn(ExperimentalSerializationApi::class)
+  override fun setupNavArgs() {
+    val args: DoorLockFragmentArgs by navArgs()
+    matterSettings = Json.decodeFromString(args.setting)
+  }
+
+  override fun setupAppbar(): LayoutAppbarBinding = binding.appbar
+
+  override fun setupUi() {}
+
+  override fun setupObservers() {}
+
+  override fun onResume() {
+    Timber.d("onResume()")
+    super.onResume()
+  }
+
+  override fun onDestroy() {
+    Timber.d("onDestroy()")
+    super.onDestroy()
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt
new file mode 100644
index 00000000000000..4f9b0b3a48ce55
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt
@@ -0,0 +1,100 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
+import com.matter.virtual.device.app.core.common.successOr
+import com.matter.virtual.device.app.core.domain.usecase.matter.IsFabricRemovedUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.StartMatterAppServiceUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.cluster.doorlock.GetLockStateFlowUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.cluster.doorlock.SendLockAlarmEventUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.cluster.doorlock.SetLockStateUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.cluster.powersource.GetBatPercentRemainingUseCase
+import com.matter.virtual.device.app.core.domain.usecase.matter.cluster.powersource.SetBatPercentRemainingUseCase
+import com.matter.virtual.device.app.core.model.matter.LockState
+import com.matter.virtual.device.app.core.ui.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class DoorLockViewModel
+@Inject
+constructor(
+  getLockStateFlowUseCase: GetLockStateFlowUseCase,
+  getBatPercentRemainingUseCase: GetBatPercentRemainingUseCase,
+  private val setLockStateUseCase: SetLockStateUseCase,
+  private val sendLockAlarmEventUseCase: SendLockAlarmEventUseCase,
+  private val setBatPercentRemainingUseCase: SetBatPercentRemainingUseCase,
+  private val startMatterAppServiceUseCase: StartMatterAppServiceUseCase,
+  private val isFabricRemovedUseCase: IsFabricRemovedUseCase,
+  savedStateHandle: SavedStateHandle
+) : BaseViewModel(savedStateHandle) {
+
+  private val _lockState: StateFlow<LockState> = getLockStateFlowUseCase()
+  val lockState: LiveData<LockState>
+    get() = _lockState.asLiveData()
+
+  private val _batteryRemainingPercentage: MutableStateFlow<Int> =
+    getBatPercentRemainingUseCase() as MutableStateFlow<Int>
+  val batteryRemainingPercentage: LiveData<Int>
+    get() = _batteryRemainingPercentage.asLiveData()
+
+  init {
+    viewModelScope.launch { startMatterAppServiceUseCase(matterSettings) }
+
+    viewModelScope.launch {
+      val isFabricRemoved = isFabricRemovedUseCase().successOr(false)
+      if (isFabricRemoved) {
+        Timber.d("Fabric Removed")
+        onFabricRemoved()
+      }
+    }
+  }
+
+  override fun onCleared() {
+    Timber.d("onCleared()")
+    super.onCleared()
+  }
+
+  fun onClickButton() {
+    Timber.d("onClickButton()")
+    viewModelScope.launch {
+      Timber.d("current lockState value = ${_lockState.value}")
+      if (_lockState.value == LockState.LOCKED) {
+        Timber.d("set value = unlocked")
+        setLockStateUseCase(LockState.UNLOCKED)
+      } else {
+        Timber.d("set value = locked")
+        setLockStateUseCase(LockState.LOCKED)
+      }
+    }
+  }
+
+  fun onClickSendLockAlarmEventButton() {
+    Timber.d("onClickSendLockAlarmEventButton()")
+    viewModelScope.launch {
+      if (_lockState.value == LockState.LOCKED) {
+        // if lockState == locked, send alarm event and change the lockState to unlocked
+        sendLockAlarmEventUseCase()
+        setLockStateUseCase(LockState.UNLOCKED)
+      }
+    }
+  }
+
+  fun updateBatterySeekbarProgress(progress: Int) {
+    _batteryRemainingPercentage.value = progress
+  }
+
+  fun updateBatteryStatusToCluster(progress: Int) {
+    Timber.d("progress:$progress")
+    viewModelScope.launch {
+      updateBatterySeekbarProgress(progress)
+      setBatPercentRemainingUseCase(progress)
+    }
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml
new file mode 100644
index 00000000000000..d726e82e616348
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- appbar -->
+        <include
+            android:id="@+id/appbar"
+            layout="@layout/layout_appbar" />
+        <!-- appbar -->
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="?attr/actionBarSize">
+
+        </ScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml
new file mode 100644
index 00000000000000..d56b030dc252a8
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/closure_nav_graph">
+    <fragment
+        android:id="@+id/doorLockFragment"
+        android:name="com.matter.virtual.device.app.feature.closure.DoorLockFragment"
+        android:label="DoorLockFragment"
+        tools:layout="@layout/fragment_door_lock">
+        <argument
+            android:name="setting"
+            app:argType="string" />
+        <deepLink app:uri="android-app://com.matter.virtual.device.app.feature.closure/doorLockFragment/{setting}" />
+    </fragment>
+</navigation>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt
new file mode 100644
index 00000000000000..13c92b81c9b741
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.matter.virtual.device.app.feature.closure
+
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+  @Test
+  fun addition_isCorrect() {
+    assertEquals(4, 2 + 2)
+  }
+}
diff --git a/examples/virtual-device-app/android/App/settings.gradle.kts b/examples/virtual-device-app/android/App/settings.gradle.kts
index a1bded5ee3a6b0..5bdf9465c3abb8 100644
--- a/examples/virtual-device-app/android/App/settings.gradle.kts
+++ b/examples/virtual-device-app/android/App/settings.gradle.kts
@@ -21,6 +21,7 @@ include(":core:matter")
 include(":core:model")
 include(":core:ui")
 include(":feature:control")
+include(":feature:closure")
 include(":feature:main")
 include(":feature:qrcode")
 include(":feature:setup")
diff --git a/examples/virtual-device-app/android/java/src/com/matter/virtual/device/app/DoorLockManager.java b/examples/virtual-device-app/android/java/src/com/matter/virtual/device/app/DoorLockManager.java
index 6e0366791c082a..3dacb3ff452db4 100644
--- a/examples/virtual-device-app/android/java/src/com/matter/virtual/device/app/DoorLockManager.java
+++ b/examples/virtual-device-app/android/java/src/com/matter/virtual/device/app/DoorLockManager.java
@@ -6,6 +6,7 @@ public interface DoorLockManager {
   int DlLockState_kLocked = 1;
   int DlLockState_kUnlocked = 2;
   int DlLockState_kUnlatched = 3;
+  int DlLockState_kUnknownEnumValue = 4;
 
   int DlLockType_kDeadBolt = 0;
   int DlLockType_kMagnetic = 1;
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
index 9e8e1e6774acee..5453bdcd574f55 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,12 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -125,8 +135,8 @@ provisional server cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -139,13 +149,18 @@ provisional server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -240,6 +255,8 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -264,6 +281,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -284,7 +302,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -303,6 +321,8 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -333,6 +353,8 @@ server cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 server cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -355,6 +377,8 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -427,6 +451,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -505,6 +531,8 @@ server cluster BasicInformation = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -515,6 +543,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -589,7 +619,9 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -604,6 +636,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -628,8 +662,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -644,6 +678,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -654,7 +690,7 @@ server cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -665,6 +701,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -895,6 +933,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -933,13 +973,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -959,6 +999,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -988,6 +1030,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1004,11 +1047,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1055,6 +1101,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1089,6 +1138,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -1107,6 +1158,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1144,6 +1197,8 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1244,11 +1299,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1281,6 +1344,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1379,9 +1444,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1442,6 +1507,8 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1483,7 +1550,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1514,6 +1581,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1553,6 +1622,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1598,6 +1669,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1714,6 +1787,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1787,6 +1862,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1803,6 +1880,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1819,6 +1898,8 @@ server cluster UserLabel = 65 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -2377,6 +2458,8 @@ server cluster DoorLock = 257 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -2565,8 +2648,10 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateProvider {
@@ -2660,9 +2745,11 @@ endpoint 0 {
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
@@ -2881,18 +2968,14 @@ endpoint 1 {
   }
 
   server cluster Scenes {
-    callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    ram      attribute featureMap default = 15;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
index ea5776de0b3587..35997c63e72573 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
@@ -706,6 +706,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -732,7 +764,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1552,6 +1584,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1725,7 +1773,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2030,7 +2078,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2046,7 +2094,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2062,7 +2110,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4440,76 +4488,12 @@
             }
           ],
           "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentScene",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentGroup",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "group_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneValid",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NameSupport",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4537,16 +4521,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4626,7 +4610,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 6f3d6f8e2112c4..09ab8c4dae19a0 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -49,6 +51,8 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -118,6 +122,8 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -151,6 +157,8 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -223,6 +231,8 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -300,6 +310,8 @@ server cluster BasicInformation = 40 {
   attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -310,6 +322,8 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -384,6 +398,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -462,7 +478,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,6 +495,8 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -501,8 +521,8 @@ server cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) CalendarTypeEnum activeCalendarType = 1;
   readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -517,6 +537,8 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -537,6 +559,8 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -772,6 +796,8 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -810,13 +836,13 @@ server cluster GeneralCommissioning = 48 {
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   response struct SetRegulatoryConfigResponse = 3 {
@@ -836,6 +862,8 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -865,6 +893,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -881,11 +910,14 @@ server cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -932,6 +964,9 @@ server cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -966,6 +1001,8 @@ server cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   response struct ConnectNetworkResponse = 7 {
@@ -984,6 +1021,8 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1084,11 +1123,19 @@ server cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1123,6 +1170,8 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1221,9 +1270,9 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
@@ -1281,11 +1330,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -1327,7 +1378,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -1360,6 +1411,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -1397,6 +1450,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -1442,6 +1497,8 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -1558,6 +1615,8 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -1631,6 +1690,8 @@ server cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 server cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1647,6 +1708,8 @@ server cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 server cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -1663,6 +1726,8 @@ server cluster UserLabel = 65 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -1863,12 +1928,14 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute specificationVersion;
+    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
@@ -2000,9 +2067,11 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 0x0002;
 
     handle command TestEventTrigger;
+    handle command TimeSnapshot;
+    handle command TimeSnapshotResponse;
   }
 
   server cluster SoftwareDiagnostics {
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index a5dcb3b1a3bc2e..6864330578b014 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -752,6 +752,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SpecificationVersion",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPathsPerInvoke",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -842,7 +874,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2303,6 +2335,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshot",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TimeSnapshotResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2540,7 +2588,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "0x0002",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2856,7 +2904,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2872,7 +2920,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2888,7 +2936,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/window-app/nrfconnect/CMakeLists.txt b/examples/window-app/nrfconnect/CMakeLists.txt
index 74b2b9e13a0c6f..21eee307f1f388 100644
--- a/examples/window-app/nrfconnect/CMakeLists.txt
+++ b/examples/window-app/nrfconnect/CMakeLists.txt
@@ -71,5 +71,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)
 endif()
 
 if(CONFIG_MCUMGR_TRANSPORT_BT)
+    zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
     target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUOverSMP.cpp)
 endif()
diff --git a/examples/window-app/nrfconnect/README.md b/examples/window-app/nrfconnect/README.md
index 79df0d3a57cbc0..b61f05dddfb15e 100644
--- a/examples/window-app/nrfconnect/README.md
+++ b/examples/window-app/nrfconnect/README.md
@@ -227,93 +227,63 @@ NFC.
 Before building the example, check out the Matter repository and sync submodules
 using the following command:
 
-        $ git submodule update --init
+        $ python3 scripts/checkout_submodules.py --shallow --platform nrfconnect
 
-The example requires a specific revision of the nRF Connect SDK. You can either
-install it along with the related tools directly on your system or use a Docker
-image that has the tools pre-installed.
-
-If you are a macOS user, you won't be able to use the Docker container to flash
-the application onto a Nordic development kit due to
-[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
-Use the [native shell](#using-native-shell-for-setup) for building instead.
-
-### Using Docker container for setup
-
-To use the Docker container for setup, complete the following steps:
-
-1.  If you do not have the nRF Connect SDK installed yet, create a directory for
-    it by running the following command:
-
-        $ mkdir ~/nrfconnect
-
-2.  Download the latest version of the nRF Connect SDK Docker image by running
-    the following command:
-
-        $ docker pull nordicsemi/nrfconnect-chip
+> **Note**:
+>
+> For Linux operating system install
+> [SEGGER J-Link Software](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack).
 
-3.  Start Docker with the downloaded image by running the following command,
-    customized to your needs as described below:
+### Install Command Line Tools
 
-         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
-             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+With admin permissions enabled, download and install the
+[nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nrf-command-line-tools).
 
-    In this command:
+### Install Toolchain Manager
 
-    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
-        SDK source directory.
-    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
-        source directory.
-    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
-        parameters can be omitted if you are not planning to flash the example
-        onto hardware. These parameters give the container access to USB devices
-        connected to your computer such as the nRF52840 DK.
-    -   _--rm_ can be omitted if you do not want the container to be
-        auto-removed when you exit the container shell session.
-    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
-        current user instead of root.
+Toolchain Manager is available from
+[nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop),
+a cross-platform tool that provides different applications that simplify
+installing the nRF Connect SDK. Both the tool and the application are available
+for Windows, Linux, and macOS.
 
-4.  Update the nRF Connect SDK to the most recent supported revision, by running
-    the following command:
+To install the Toolchain Manager app, complete the following steps:
 
-         $ cd /var/chip
-         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+1.  [Download nRF Connect for Desktop](https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop/download#infotabs)
+    for your operating system.
 
-Now you can proceed with the [Building](#building) instruction.
+2.  Install and run the tool on your machine.
 
-### Using native shell for setup
+3.  In the **APPS** section, click **Install** button on the Toolchain Manager
+    tab.
 
-To use the native shell for setup, complete the following steps:
+### Install nRF Connect SDK
 
-1.  Download and install the following additional software:
+Complete the following steps to install the nRF Connect SDK:
 
-    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+1.  Open Toolchain Manager in nRF Connect for Desktop.
 
-2.  If you do not have the nRF Connect SDK installed, follow the
-    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
-    in the nRF Connect SDK documentation to install the latest stable nRF
-    Connect SDK version. Since command-line tools will be used for building the
-    example, installing SEGGER Embedded Studio is not required.
+2.  Click the **Install** button next to the
+    [recommended](../../../config/nrfconnect/.nrfconnect-recommended-revision)
+    version of the nRF Connect SDK.
 
-    If you have the SDK already installed, continue to the next step and update
-    the nRF Connect SDK after initializing environment variables.
+3.  A pop-up window will inform you about the current installation directory. If
+    you want to change the directory, click the **Change directory** button.
+    Otherwise, click the **Continue installation** button.
 
-3.  Initialize environment variables referred to by the CHIP and the nRF Connect
-    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
-    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
-    Arm Embedded Toolchain.
+4.  When the nRF Connect SDK is installed on your machine, the **Install**
+    button changes to the **Open VS Code** button.
 
-         $ source nrfconnect-dir/zephyr/zephyr-env.sh
-         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+5.  Click the dropdown menu next to the **Open VS Code** button for the
+    installed nRF Connect SDK version, and select **Open terminal**.
 
-4.  Update the nRF Connect SDK to the most recent supported revision by running
-    the following command (replace _matter-dir_ with the path to Matter
-    repository directory):
+6.  Make sure that the nRF Connect SDK version is compatible with the Matter SDK
+    version:
 
-         $ cd matter-dir
+    ```
+         $ cd {connectedhomeip directory}
          $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+    ```
 
 Now you can proceed with the [Building](#building) instruction.
 
@@ -321,8 +291,7 @@ Now you can proceed with the [Building](#building) instruction.
 
 ## Building
 
-Complete the following steps, regardless of the method used for setting up the
-environment:
+Complete the following steps to build the sample:
 
 1.  Navigate to the example's directory:
 
diff --git a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index dad630c7c9aad9..57481eaa83de08 100644
--- a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -14,6 +14,8 @@
  *    limitations under the License.
  */
 
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
@@ -39,6 +41,11 @@
 	};
 };
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+    zephyr,priority = <0 PRIO_COOP>;
+};
+
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
index d4a1c541c93bbc..63b9b10d32b852 100644
--- a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
+++ b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
@@ -79,3 +79,58 @@ void MatterWindowCoveringClusterServerAttributeChangedCallback(const app::Concre
         };
     }
 }
+
+void emberAfWindowCoveringClusterInitCallback(chip::EndpointId endpoint)
+{
+    const auto logOnFailure = [](EmberAfStatus status, const char * attributeName) {
+        if (status != EMBER_ZCL_STATUS_SUCCESS)
+        {
+            ChipLogError(Zcl, "Failed to set WindowCovering %s: %x", attributeName, status);
+        }
+    };
+
+    app::DataModel::Nullable<chip::Percent100ths> currentPercent100ths;
+    app::DataModel::Nullable<chip::Percent100ths> targetPercent100ths;
+    app::DataModel::Nullable<chip::Percent> currentPercentage;
+    EmberAfStatus status;
+
+    status = Attributes::CurrentPositionLiftPercentage::Get(endpoint, currentPercentage);
+    if (currentPercentage.IsNull())
+    {
+        logOnFailure(Attributes::CurrentPositionLiftPercentage::Set(endpoint, 0), "current position lift percentage");
+    }
+
+    status = Attributes::CurrentPositionTiltPercentage::Get(endpoint, currentPercentage);
+    if (currentPercentage.IsNull())
+    {
+        logOnFailure(Attributes::CurrentPositionTiltPercentage::Set(endpoint, 0), "current position tilt percentage");
+    }
+
+    status = Attributes::CurrentPositionLiftPercent100ths::Get(endpoint, currentPercent100ths);
+    if (currentPercent100ths.IsNull())
+    {
+        currentPercent100ths.SetNonNull(0);
+        logOnFailure(Attributes::CurrentPositionLiftPercent100ths::Set(endpoint, 0), "current position lift percent 100ths");
+    }
+
+    status = Attributes::TargetPositionLiftPercent100ths::Get(endpoint, targetPercent100ths);
+    if (targetPercent100ths.IsNull())
+    {
+        logOnFailure(Attributes::TargetPositionLiftPercent100ths::Set(endpoint, currentPercent100ths),
+                     "target position lift percent 100ths");
+    }
+
+    status = Attributes::CurrentPositionTiltPercent100ths::Get(endpoint, currentPercent100ths);
+    if (currentPercent100ths.IsNull())
+    {
+        currentPercent100ths.SetNonNull(0);
+        logOnFailure(Attributes::CurrentPositionTiltPercent100ths::Set(endpoint, 0), "current position tilt percent 100ths");
+    }
+
+    status = Attributes::TargetPositionTiltPercent100ths::Get(endpoint, targetPercent100ths);
+    if (targetPercent100ths.IsNull())
+    {
+        logOnFailure(Attributes::TargetPositionTiltPercent100ths::Set(endpoint, currentPercent100ths),
+                     "target position tilt percent 100ths");
+    }
+}
diff --git a/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
index 9fea28ec9fde12..b55e719c553a9b 100644
--- a/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -25,7 +25,3 @@
  */
 
 #pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/window-app/nrfconnect/prj.conf b/examples/window-app/nrfconnect/prj.conf
index 48bc61f67d5a47..392e84ee268a54 100644
--- a/examples/window-app/nrfconnect/prj.conf
+++ b/examples/window-app/nrfconnect/prj.conf
@@ -49,3 +49,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/window-app/nrfconnect/prj_release.conf b/examples/window-app/nrfconnect/prj_release.conf
index 8143a5d60ad7e8..e7859efaa81de6 100644
--- a/examples/window-app/nrfconnect/prj_release.conf
+++ b/examples/window-app/nrfconnect/prj_release.conf
@@ -67,3 +67,8 @@ CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
 CONFIG_PRINTK_SYNC=n
 CONFIG_THREAD_NAME=n
+CONFIG_BOOT_BANNER=n
+
+# Enable Factory Data feature
+CONFIG_CHIP_FACTORY_DATA=y
+CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/window-app/silabs/include/LcdPainter.h b/examples/window-app/silabs/include/LcdPainter.h
index d0740167bdd06c..adc5775afa7c43 100644
--- a/examples/window-app/silabs/include/LcdPainter.h
+++ b/examples/window-app/silabs/include/LcdPainter.h
@@ -18,10 +18,7 @@
 
 #pragma once
 
-// clang-format off
-#include "app-common/zap-generated/enums.h"
 #include "app-common/zap-generated/cluster-enums.h"
-// clang-format on
 
 #include <lcd.h>
 
diff --git a/examples/window-app/telink/prj.conf b/examples/window-app/telink/prj.conf
index 23eba6ddd4aaec..8c44d9f0c8fe36 100644
--- a/examples/window-app/telink/prj.conf
+++ b/examples/window-app/telink/prj.conf
@@ -22,12 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PWM
-CONFIG_PWM=y
-
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index f2c73a5eb2cd17..f412e5e447ba4f 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -85,7 +85,7 @@ steps:
               --target k32w-shell
               build
               --create-archives /workspace/artifacts/
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -164,6 +164,7 @@ steps:
               --target qpg-qpg6105-shell
               --target telink-tlsr9518adk80d-light
               --target telink-tlsr9528a-light
+              --target telink-tlsr9528a_retention-light-switch
               --target tizen-arm-light
               build
               --create-archives /workspace/artifacts/
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index d0989a173705c7..89aed7276e411f 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 2700s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -27,7 +27,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index ef5e12328b7181..8619ae62bfd58f 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,12 +7,12 @@ steps:
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
           - "-c"
-          - source ./scripts/bootstrap.sh
+          - source ./scripts/bootstrap.sh -p all,nrfconnect
       id: Bootstrap
       waitFor:
           - Submodules
@@ -22,7 +22,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -43,7 +43,7 @@ steps:
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -64,7 +64,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -86,7 +86,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -139,7 +139,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:22"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index 70c0f8738d6b29..92e93e5d86dc45 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-22 : [Telink] Cleanup Docker image
+26 : [Telink] Update Docker image (Zephyr update)
diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
index b01028f4708310..86148668a86e0b 100644
--- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 # Compatible Nordic Connect SDK revision.
-ARG NCS_REVISION=v2.4.0
+ARG NCS_REVISION=v2.5.0
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 WORKDIR /opt/NordicSemiconductor/nRF5_tools
@@ -16,14 +16,14 @@ RUN set -x \
     | tar zxvf - \
     && tar xvf JLink_Linux_V780c_x86_64.tgz \
     && rm JLink_Linux_V780c_x86_64.* \
-    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
-    && tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
-    && zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
+    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+    && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+    && zephyr-sdk-0.16.1/setup.sh -t arm-zephyr-eabi \
     && : # last line
 
 WORKDIR /opt/NordicSemiconductor/nrfconnect
 RUN set -x \
-    && python3 -m pip install -U --no-cache-dir west==1.0.0 \
+    && python3 -m pip install -U --no-cache-dir west==1.1.0 \
     && west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
     && west config update.narrow true \
     && west config update.fetch smart \
@@ -63,6 +63,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
+ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.1
 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
index 1310e0a12f9add..8c1662607fdccb 100644
--- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr
-ARG ZEPHYR_REVISION=5e5f3cfde3fb5070b2e6cfb8ab08bc688b5aa3d4
+ARG ZEPHYR_REVISION=e0800ce0375563dfeea8ffc32ebc78d5aaf4f091
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install -U --no-cache-dir west \
diff --git a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
index 0cc77621bde754..4bc15b67f77164 100644
--- a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
@@ -12,9 +12,9 @@ RUN set -x \
 
 # Install Sysconfig
 RUN set -x \
-    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run \
-    && chmod +x sysconfig-1.15.0_2826-setup.run \
-    && ./sysconfig-1.15.0_2826-setup.run --mode unattended \
+    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run \
+    && chmod +x sysconfig-1.16.2_3028-setup.run \
+    && ./sysconfig-1.16.2_3028-setup.run --mode unattended \
     && : # last line
 
-ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0
+ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
index d824716800004e..8ca2f980f0cf6f 100644
--- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -52,7 +52,7 @@ COPY --from=k32w /opt/sdk /opt/k32w
 
 COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
 
-COPY --from=ti /opt/ti/sysconfig_1.15.0 /opt/ti/sysconfig_1.15.0
+COPY --from=ti /opt/ti/sysconfig_1.16.2 /opt/ti/sysconfig_1.16.2
 
 COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
 
@@ -120,9 +120,9 @@ ENV QEMU_ESP32_DIR=/opt/espressif/qemu
 ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
 ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
 ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
-ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0
+ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0
+ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1
 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
 
 ENV TIZEN_VERSION 7.0
diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml
index f9765e5eb11e3e..dd32886efa52d7 100644
--- a/kotlin-detect-config.yaml
+++ b/kotlin-detect-config.yaml
@@ -46,6 +46,7 @@ style:
             - "**/src/controller/java/tests/matter/tlv/TlvReaderTest.kt"
             - "**/src/controller/java/tests/matter/tlv/TlvReadWriteTest.kt"
             - "**/src/controller/java/tests/matter/tlv/TlvWriterTest.kt"
+            - "**/src/controller/java/generated/java/**/*"
     WildcardImport:
         excludes:
             - "**/examples/android/CHIPTest/app/src/androidTest/java/com/tcl/chip/chiptest/ExampleInstrumentedTest.kt"
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 2160af0d1e0322..476c045f27dc53 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -136,6 +136,8 @@ def BuildHostTarget():
         TargetPart('refrigerator', app=HostApp.REFRIGERATOR),
         TargetPart('rvc', app=HostApp.RVC),
         TargetPart('air-purifier', app=HostApp.AIR_PURIFIER),
+        TargetPart('lit-icd', app=HostApp.LIT_ICD),
+        TargetPart('air-quality-sensor', app=HostApp.AIR_QUALITY_SENSOR),
     ]
 
     if (HostBoard.NATIVE.PlatformName() == 'darwin'):
@@ -576,6 +578,8 @@ def BuildQorvoTarget():
         TargetPart('persistent-storage', app=QpgApp.PERSISTENT_STORAGE),
     ])
 
+    target.AppendModifier('updateimage', update_image=True)
+
     return target
 
 
@@ -700,6 +704,7 @@ def BuildTelinkTarget():
     target.AppendFixedTargets([
         TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D),
         TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A),
+        TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION),
     ])
 
     target.AppendFixedTargets([
@@ -714,7 +719,6 @@ def BuildTelinkTarget():
         TargetPart('ota-requestor', app=TelinkApp.OTA_REQUESTOR),
         TargetPart('pump', app=TelinkApp.PUMP),
         TargetPart('pump-controller', app=TelinkApp.PUMP_CONTROLLER),
-        TargetPart('resource-monitoring', app=TelinkApp.RESOURCE_MONITORING),
         TargetPart('shell', app=TelinkApp.SHELL),
         TargetPart('smoke-co-alarm', app=TelinkApp.SMOKE_CO_ALARM),
         TargetPart('temperature-measurement',
@@ -729,6 +733,7 @@ def BuildTelinkTarget():
     target.AppendModifier('rpc', enable_rpcs=True)
     target.AppendModifier('factory-data', enable_factory_data=True)
     target.AppendModifier('4mb', enable_4mb_flash=True)
+    target.AppendModifier('mars', mars_board_config=True)
 
     return target
 
diff --git a/scripts/build/build_darwin_framework.py b/scripts/build/build_darwin_framework.py
index 43b754fb900c5b..95f666a39fff29 100644
--- a/scripts/build/build_darwin_framework.py
+++ b/scripts/build/build_darwin_framework.py
@@ -97,8 +97,6 @@ def build_darwin_framework(args):
         command += ["{}={}".format(option, "YES" if options[option] else "NO")]
 
     defines = 'GCC_PREPROCESSOR_DEFINITIONS=${inherited} MTR_NO_AVAILABILITY=1'
-    if args.enable_provisional_framework_features:
-        defines += ' MTR_ENABLE_PROVISIONAL=1'
 
     command += [defines]
 
@@ -174,7 +172,6 @@ def build_darwin_framework(args):
     parser.add_argument('--ble', action=argparse.BooleanOptionalAction)
     parser.add_argument('--clang', action=argparse.BooleanOptionalAction)
     parser.add_argument('--enable-encoding-sentinel-enum-values', action=argparse.BooleanOptionalAction)
-    parser.add_argument('--enable-provisional-framework-features', action=argparse.BooleanOptionalAction)
 
     args = parser.parse_args()
     build_darwin_framework(args)
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
index b5d2f1834c5ddb..19080a52f90027 100644
--- a/scripts/build/builders/android.py
+++ b/scripts/build/builders/android.py
@@ -237,8 +237,8 @@ def copyToSrcAndroid(self):
             "CHIPController.jar": "src/controller/java/CHIPController.jar",
             "OnboardingPayload.jar": "src/controller/java/OnboardingPayload.jar",
             "AndroidPlatform.jar": "src/platform/android/AndroidPlatform.jar",
-            "libCHIPJson.jar": "src/controller/java/libCHIPJson.jar",
-            "libCHIPTlv.jar": "src/controller/java/libCHIPTlv.jar",
+            "libMatterJson.jar": "src/controller/java/libMatterJson.jar",
+            "libMatterTlv.jar": "src/controller/java/libMatterTlv.jar",
             "CHIPClusters.jar": "src/controller/java/CHIPClusters.jar",
             "CHIPClusterID.jar": "src/controller/java/CHIPClusterID.jar",
         }
@@ -568,8 +568,8 @@ def build_outputs(self):
                 "CHIPController.jar": os.path.join(
                     self.output_dir, "lib", "src/controller/java/CHIPController.jar"
                 ),
-                "libCHIPTlv.jar": os.path.join(
-                    self.output_dir, "lib", "src/controller/java/libCHIPTlv.jar"
+                "libMatterTlv.jar": os.path.join(
+                    self.output_dir, "lib", "src/controller/java/libMatterTlv.jar"
                 ),
                 "AndroidPlatform.jar": os.path.join(
                     self.output_dir, "lib", "src/platform/android/AndroidPlatform.jar"
diff --git a/scripts/build/builders/bouffalolab.py b/scripts/build/builders/bouffalolab.py
index c4d4fc10f12ccd..1b661bff045c07 100644
--- a/scripts/build/builders/bouffalolab.py
+++ b/scripts/build/builders/bouffalolab.py
@@ -166,6 +166,8 @@ def __init__(self,
         self.argsOpt.append(f'chip_inet_config_enable_ipv4={str(enable_ethernet or enable_wifi).lower()}')
 
         if enable_thread:
+            self.argsOpt.append('chip_system_config_use_open_thread_inet_endpoints=true')
+            self.argsOpt.append('chip_with_lwip=false')
             self.argsOpt.append(f'openthread_project_core_config_file="{bouffalo_chip}-openthread-core-bl-config.h"')
             if not use_matter_openthread:
                 self.argsOpt.append(
diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
index 990f44993eb55d..31df099d60b1cd 100644
--- a/scripts/build/builders/efr32.py
+++ b/scripts/build/builders/efr32.py
@@ -223,15 +223,21 @@ def __init__(self,
                 ['git', 'describe', '--always', '--dirty', '--exclude', '*']).decode('ascii').strip()
             branchName = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).decode('ascii').strip()
             self.extra_gn_options.append(
-                'sl_matter_version_str="v1.1-%s-%s"' % (branchName, shortCommitSha))
+                'sl_matter_version_str="v1.2-%s-%s"' % (branchName, shortCommitSha))
 
         if "GSDK_ROOT" in os.environ:
             # EFR32 SDK is very large. If the SDK path is already known (the
             # case for pre-installed images), use it directly.
             sdk_path = shlex.quote(os.environ['GSDK_ROOT'])
             self.extra_gn_options.append(f"efr32_sdk_root=\"{sdk_path}\"")
+
+        if "GSDK_ROOT" in os.environ and not enable_wifi:
             self.extra_gn_options.append(f"openthread_root=\"{sdk_path}/util/third_party/openthread\"")
 
+        if "WISECONNECT_SDK_ROOT" in os.environ and enable_rs911x:
+            wiseconnect_sdk_path = shlex.quote(os.environ['WISECONNECT_SDK_ROOT'])
+            self.extra_gn_options.append(f"wiseconnect_sdk_root=\"{wiseconnect_sdk_path}\"")
+
     def GnBuildArgs(self):
         return self.extra_gn_options
 
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
index 2a145906e54087..cb35dfa265aa96 100644
--- a/scripts/build/builders/host.py
+++ b/scripts/build/builders/host.py
@@ -73,6 +73,8 @@ class HostApp(Enum):
     REFRIGERATOR = auto()
     RVC = auto()
     AIR_PURIFIER = auto()
+    LIT_ICD = auto()
+    AIR_QUALITY_SENSOR = auto()
 
     def ExamplePath(self):
         if self == HostApp.ALL_CLUSTERS:
@@ -127,6 +129,10 @@ def ExamplePath(self):
             return 'rvc-app/linux'
         elif self == HostApp.AIR_PURIFIER:
             return 'air-purifier-app/linux'
+        elif self == HostApp.LIT_ICD:
+            return 'lit-icd-app/linux'
+        elif self == HostApp.AIR_QUALITY_SENSOR:
+            return 'air-quality-sensor-app/linux'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -221,6 +227,9 @@ def OutputNames(self):
         elif self == HostApp.AIR_PURIFIER:
             yield 'air-purifier-app'
             yield 'air-purifier-app.map'
+        elif self == HostApp.LIT_ICD:
+            yield 'lit-icd-app'
+            yield 'lit-icd-app.map'
         else:
             raise Exception('Unknown app type: %r' % self)
 
diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py
index d699d60ebd0148..9bc4f9596efc26 100644
--- a/scripts/build/builders/nrf.py
+++ b/scripts/build/builders/nrf.py
@@ -161,7 +161,7 @@ def generate(self):
                 zephyr_base = os.environ['ZEPHYR_BASE']
                 nrfconnect_sdk = os.path.dirname(zephyr_base)
                 zephyr_sdk_dir = os.environ.get('ZEPHYR_SDK_INSTALL_DIR') or os.path.join(
-                    os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.16.0')
+                    os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.16.1')
 
                 # NRF builds will both try to change .west/config in nrfconnect and
                 # overall perform a git fetch on that location
diff --git a/scripts/build/builders/qpg.py b/scripts/build/builders/qpg.py
index 2c4f3ebf2e4884..67f224b80a4657 100644
--- a/scripts/build/builders/qpg.py
+++ b/scripts/build/builders/qpg.py
@@ -81,18 +81,22 @@ def __init__(self,
                  runner,
                  app: QpgApp = QpgApp.LIGHT,
                  board: QpgBoard = QpgBoard.QPG6105,
-                 enable_rpcs: bool = False):
+                 enable_rpcs: bool = False,
+                 update_image: bool = False):
         super(QpgBuilder, self).__init__(
             root=app.BuildRoot(root),
             runner=runner)
         self.app = app
         self.board = board
         self.enable_rpcs = enable_rpcs
+        self.update_image = update_image
 
     def GnBuildArgs(self):
         args = ['qpg_target_ic=\"%s\"' % self.board.GnArgName()]
         if self.enable_rpcs:
             args.append('import("//with_pw_rpc.gni")')
+        if self.update_image:
+            args.append('matter_device_software_version_string=\"1.1_OTA_TEST\" matter_device_software_version=4')
         return args
 
     def build_outputs(self):
diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
index 0aa6ac68940eec..4eb7b3f1ff4005 100644
--- a/scripts/build/builders/telink.py
+++ b/scripts/build/builders/telink.py
@@ -32,7 +32,6 @@ class TelinkApp(Enum):
     OTA_REQUESTOR = auto()
     PUMP = auto()
     PUMP_CONTROLLER = auto()
-    RESOURCE_MONITORING = auto()
     SHELL = auto()
     SMOKE_CO_ALARM = auto()
     TEMPERATURE_MEASUREMENT = auto()
@@ -62,8 +61,6 @@ def ExampleName(self):
             return 'pump-app'
         elif self == TelinkApp.PUMP_CONTROLLER:
             return 'pump-controller-app'
-        elif self == TelinkApp.RESOURCE_MONITORING:
-            return 'resource-monitoring-app'
         elif self == TelinkApp.SHELL:
             return 'shell'
         elif self == TelinkApp.SMOKE_CO_ALARM:
@@ -119,12 +116,15 @@ def AppNamePrefix(self):
 class TelinkBoard(Enum):
     TLSR9518ADK80D = auto()
     TLSR9528A = auto()
+    TLSR9528A_RETENTION = auto()
 
     def GnArgName(self):
         if self == TelinkBoard.TLSR9518ADK80D:
             return 'tlsr9518adk80d'
         elif self == TelinkBoard.TLSR9528A:
             return 'tlsr9528a'
+        elif self == TelinkBoard.TLSR9528A_RETENTION:
+            return 'tlsr9528a_retention'
         else:
             raise Exception('Unknown board type: %r' % self)
 
@@ -141,7 +141,8 @@ def __init__(self,
                  enable_shell: bool = False,
                  enable_rpcs: bool = False,
                  enable_factory_data: bool = False,
-                 enable_4mb_flash: bool = False):
+                 enable_4mb_flash: bool = False,
+                 mars_board_config: bool = False):
         super(TelinkBuilder, self).__init__(root, runner)
         self.app = app
         self.board = board
@@ -151,6 +152,7 @@ def __init__(self,
         self.enable_rpcs = enable_rpcs
         self.enable_factory_data = enable_factory_data
         self.enable_4mb_flash = enable_4mb_flash
+        self.mars_board_config = mars_board_config
 
     def get_cmd_prefixes(self):
         if not self._runner.dry_run:
@@ -189,6 +191,9 @@ def generate(self):
         if self.enable_4mb_flash:
             flags.append("-DFLASH_SIZE=4m")
 
+        if self.mars_board_config:
+            flags.append("-DTLNK_MARS_BOARD=y")
+
         if self.options.pregen_dir:
             flags.append(f"-DCHIP_CODEGEN_PREGEN_DIR={shlex.quote(self.options.pregen_dir)}")
 
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index b5402ab140189a..5272047bf9c77f 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -10,7 +10,7 @@ efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,b
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]
 genio-lighting-app
 linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang]
-linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc,air-purifier}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
+linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc,air-purifier,lit-icd,air-quality-sensor}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
 linux-x64-efr32-test-runner[-clang]
 imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
 infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage]
@@ -19,8 +19,8 @@ mbed-cy8cproto_062_4343w-{lock,light,all-clusters,all-clusters-minimal,pigweed,o
 mw320-all-clusters-app
 nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,light-switch,shell,pump,pump-controller,window-covering}[-rpc]
 nrf-native-posix-64-tests
-qpg-qpg6105-{lock,light,shell,persistent-storage}
+qpg-qpg6105-{lock,light,shell,persistent-storage}[-updateimage]
 stm32-stm32wb5mm-dk-light
 tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-with-ui]
-telink-{tlsr9518adk80d,tlsr9528a}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,resource-monitoring,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb]
+telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars]
 openiotsdk-{shell,lock}[-mbedtls][-psa]
diff --git a/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt b/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
index c2810269aa0f57..8ff2afd8d8bb76 100644
--- a/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
+++ b/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
@@ -29,9 +29,9 @@ cp {out}/android-arm64-chip-tool/lib/src/controller/java/OnboardingPayload.jar {
 
 cp {out}/android-arm64-chip-tool/lib/src/platform/android/AndroidPlatform.jar {root}/examples/android/CHIPTool/app/libs/AndroidPlatform.jar
 
-cp {out}/android-arm64-chip-tool/lib/src/controller/java/libCHIPJson.jar {root}/examples/android/CHIPTool/app/libs/libCHIPJson.jar
+cp {out}/android-arm64-chip-tool/lib/src/controller/java/libMatterJson.jar {root}/examples/android/CHIPTool/app/libs/libMatterJson.jar
 
-cp {out}/android-arm64-chip-tool/lib/src/controller/java/libCHIPTlv.jar {root}/examples/android/CHIPTool/app/libs/libCHIPTlv.jar
+cp {out}/android-arm64-chip-tool/lib/src/controller/java/libMatterTlv.jar {root}/examples/android/CHIPTool/app/libs/libMatterTlv.jar
 
 cp {out}/android-arm64-chip-tool/lib/src/controller/java/CHIPClusters.jar {root}/examples/android/CHIPTool/app/libs/CHIPClusters.jar
 
diff --git a/scripts/build_python.sh b/scripts/build_python.sh
index 6965cecad3dd6f..14d381f33860ac 100755
--- a/scripts/build_python.sh
+++ b/scripts/build_python.sh
@@ -147,6 +147,20 @@ echo "Input values: chip_detail_logging = $chip_detail_logging , chip_mdns = \"$
 # Ensure we have a compilation environment
 source "$CHIP_ROOT/scripts/activate.sh"
 
+# This is to prevent python compiled for previous versions reporting 10.16 as a version
+# which breaks the ability to install python wheels.
+#
+# See https://eclecticlight.co/2020/08/13/macos-version-numbering-isnt-so-simple/ for
+# some explanation
+#
+# TLDR:
+#
+#   > import platform
+#   > print(platform.mac_ver()[0])
+#     11.7.3   // (example) if SYSTEM_VERSION_COMPAT is 0
+#     10.16    // SYSTEM_VERSION_COMPAT is unset or 1
+export SYSTEM_VERSION_COMPAT=0
+
 # Generates ninja files
 [[ -n "$chip_mdns" ]] && chip_mdns_arg="chip_mdns=\"$chip_mdns\"" || chip_mdns_arg=""
 [[ -n "$chip_case_retry_delta" ]] && chip_case_retry_arg="chip_case_retry_delta=$chip_case_retry_delta" || chip_case_retry_arg=""
diff --git a/scripts/checkout_submodules.py b/scripts/checkout_submodules.py
index e1c8eb888fcc99..ad9417212b3438 100755
--- a/scripts/checkout_submodules.py
+++ b/scripts/checkout_submodules.py
@@ -33,7 +33,7 @@
     'cc13xx_26xx',
     'cc32xx',
     'darwin',
-    'efr32',
+    'silabs',
     'esp32',
     'infineon',
     'k32w',
diff --git a/scripts/codepregen.py b/scripts/codepregen.py
index 6c0f24c60632eb..48bc98b34430cf 100755
--- a/scripts/codepregen.py
+++ b/scripts/codepregen.py
@@ -29,7 +29,7 @@
     from pregenerate import FindPregenerationTargets, TargetFilter
 
 from pregenerate.executors import DryRunner, ShellRunner
-from pregenerate.types import IdlFileType
+from pregenerate.type_definitions import IdlFileType
 
 try:
     import coloredlogs
diff --git a/scripts/configure b/scripts/configure
index f974f415493ad8..16d78f789e284f 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -93,6 +93,10 @@ function main() { # ...
         [[ -n "$PROJECT_PATH" && -r "${PROJECT_PATH}/.gn" ]] || fail "Invalid project '${PROJECT}' - missing .gn at '${PROJECT_PATH}'"
     fi
 
+    if [[ -n "$PW_ROOT" ]]; then
+        info "WARNING: A Pigweed environment appears to be active, this is usually a misconfiguration."
+    fi
+
     check_binary gn GN
     check_binary ninja NINJA
 
@@ -149,7 +153,7 @@ function create_empty_pw_env() {
             info "Creating empty $gni in source tree"
             echo "# ${CONFIGURE_MARKER}" >"${CHIP_ROOT}/${gni}"
         else
-            info "Warning: Leaving existing $gni in place, this might affect the build configuration."
+            info "WARNING: Leaving existing $gni in place, this might affect the build configuration."
         fi
     fi
 }
diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
index 174985b376d117..ae1d60e4eb69d7 100755
--- a/scripts/examples/gn_silabs_example.sh
+++ b/scripts/examples/gn_silabs_example.sh
@@ -92,7 +92,7 @@ if [ "$#" == "0" ]; then
             Build wifi example with extension board SiWx917. (Default false)
         use_wf200
             Build wifi example with extension board wf200. (Default false)
-        'import("//with_pw_rpc.gni")'
+        use_pw_rpc
             Use to build the example with pigweed RPC
         ota_periodic_query_timeout_sec
             Periodic query timeout variable for OTA in seconds
@@ -227,6 +227,8 @@ else
                 ;;
             --docker)
                 optArgs+="efr32_sdk_root=\"$GSDK_ROOT\" "
+                optArgs+="wiseconnect_sdk_root=\"$WISECONNECT_SDK_ROOT\" "
+                optArgs+="wifi_sdk_root=\"$WIFI_SDK_ROOT\" "
                 USE_DOCKER=true
                 shift
                 ;;
@@ -240,6 +242,10 @@ else
                 USE_SLC=true
                 shift
                 ;;
+            --use_pw_rpc)
+                optArgs+="import(\"//with_pw_rpc.gni\") "
+                shift
+                ;;
             --slc_reuse_files)
                 optArgs+="slc_reuse_files=true "
                 USE_SLC=true
@@ -279,7 +285,7 @@ else
     fi
 
     # 917 exception. TODO find a more generic way
-    if [ "$SILABS_BOARD" == "BRD4325B" ] || [ "$SILABS_BOARD" == "BRD4325C" ] || [ "$SILABS_BOARD" == "BRD4338A" ]; then
+    if [ "$SILABS_BOARD" == "BRD4325B" ] || [ "$SILABS_BOARD" == "BRD4325C" ] || [ "$SILABS_BOARD" == "BRD4338A" ] || [ "$SILABS_BOARD" == "BRD4325G" ]; then
         echo "Compiling for 917 WiFi SOC"
         USE_WIFI=true
         optArgs+="chip_device_platform =\"SiWx917\" "
@@ -289,7 +295,7 @@ else
         {
             ShortCommitSha=$(git describe --always --dirty --exclude '*')
             branchName=$(git rev-parse --abbrev-ref HEAD)
-            optArgs+="sl_matter_version_str=\"v1.1-$branchName-$ShortCommitSha\" "
+            optArgs+="sl_matter_version_str=\"v1.2-$branchName-$ShortCommitSha\" "
         } &>/dev/null
     fi
 
diff --git a/scripts/examples/nrfconnect_example.sh b/scripts/examples/nrfconnect_example.sh
index db1c850ff5e9a9..0a7c46d7e9baef 100755
--- a/scripts/examples/nrfconnect_example.sh
+++ b/scripts/examples/nrfconnect_example.sh
@@ -44,7 +44,7 @@ source "../scripts/activate.sh"
 export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 
 if [[ -z "$ZEPHYR_SDK_INSTALL_DIR" && -n "$NRF5_TOOLS_ROOT" ]]; then
-    export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.16.0
+    export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.16.1
 fi
 
 # Set ccache base directory to improve the cache hit ratio
diff --git a/scripts/flashing/esp32_firmware_utils.py b/scripts/flashing/esp32_firmware_utils.py
index a61e93097a174e..74c07cfa81a433 100755
--- a/scripts/flashing/esp32_firmware_utils.py
+++ b/scripts/flashing/esp32_firmware_utils.py
@@ -86,7 +86,7 @@
         # Tool configuration options.
         'esptool': {
             'help': 'File name of the esptool executable',
-            'default': None,
+            'default': 'esptool.py',
             'argparse': {
                 'metavar': 'FILE',
             },
@@ -103,9 +103,8 @@
                 """\
                 Unable to execute {esptool}.
 
-                Please ensure that this tool is installed and
-                that $IDF_PATH is set. See the ESP32 example
-                README for installation instructions.
+                Please ensure that the esptool Python package is available.
+                See the ESP32 setup guide for instructions.
                 """,
         },
         'parttool': {
@@ -308,7 +307,6 @@ def read_sdkconfig(self, filename):
         return result
 
     IDF_PATH_TOOLS = {
-        'esptool': 'components/esptool_py/esptool/esptool.py',
         'parttool': 'components/partition_table/parttool.py',
     }
 
diff --git a/scripts/flashing/efr32_firmware_utils.py b/scripts/flashing/silabs_firmware_utils.py
similarity index 93%
rename from scripts/flashing/efr32_firmware_utils.py
rename to scripts/flashing/silabs_firmware_utils.py
index 989cc97f19ca32..5e0a689f5a62f4 100755
--- a/scripts/flashing/efr32_firmware_utils.py
+++ b/scripts/flashing/silabs_firmware_utils.py
@@ -12,19 +12,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Flash an EFR32 device.
+"""Flash an SILABS device.
 
 This is layered so that a caller can perform individual operations
 through an `Flasher` instance, or operations according to a command line.
 For `Flasher`, see the class documentation. For the parse_command()
 interface or standalone execution:
 
-usage: efr32_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE]
+usage: silabs_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE]
                                [--verify_application] [--reset] [--skip_reset]
                                [--commander FILE] [--device DEVICE]
                                [--serialno SERIAL] [--ip ADDRESS]
 
-Flash EFR32 device
+Flash SILABS device
 
 optional arguments:
   -h, --help            show this help message and exit
@@ -55,7 +55,7 @@
 
 # Additional options that can be use to configure an `Flasher`
 # object (as dictionary keys) and/or passed as command line options.
-EFR32_OPTIONS = {
+SILABS_OPTIONS = {
     # Configuration options define properties used in flashing operations.
     'configuration': {
         # Tool configuration options.
@@ -71,7 +71,7 @@
                 Unable to execute {commander}.
 
                 Please ensure that this tool is installed and
-                available. See the EFR32 example README for
+                available. See the SILABS example README for
                 installation instructions.
 
                 """,
@@ -105,11 +105,11 @@
 
 
 class Flasher(firmware_utils.Flasher):
-    """Manage efr32 flashing."""
+    """Manage silabs flashing."""
 
     def __init__(self, **options):
-        super().__init__(platform='EFR32', module=__name__, **options)
-        self.define_options(EFR32_OPTIONS)
+        super().__init__(platform='SILABS', module=__name__, **options)
+        self.define_options(SILABS_OPTIONS)
 
     # Common command line arguments for commander device subcommands.
     DEVICE_ARGUMENTS = [{'optional': 'serialno'}, {
diff --git a/scripts/helpers/platforms/iwyu.imp b/scripts/helpers/platforms/iwyu.imp
index 5a863b3f3a6208..c3d2210b2886dd 100644
--- a/scripts/helpers/platforms/iwyu.imp
+++ b/scripts/helpers/platforms/iwyu.imp
@@ -11,6 +11,16 @@
     { symbol: [ 'declval', private, '<utility>', public ] },
     { symbol: [ 'tm', private, '<sys/time.h>', public ] },
 
+    ## GLib/GIO
+    { include: [ '"gio/gdbusinterface.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusinterfaceskeleton.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusobject.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusobjectmanager.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusobjectmanagerclient.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusobjectmanagerserver.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gio/gdbusobjectskeleton.h"', private, '<gio/gio.h>', public ] },
+    { include: [ '"gobject/gclosure.h"', private, '<glib-object.h>', public ] },
+
     ## ble/*
     { include: [ '"ble/CHIPBleServiceData.h"', private, '<ble/CHIPBleServiceData.h>', public ] },
     { include: [ '@"ble/Ble.*.h"', private, '<ble/Ble.h>', public ] },
diff --git a/scripts/pregenerate/__init__.py b/scripts/pregenerate/__init__.py
index a6f759bab67cf8..021967b4110f8f 100644
--- a/scripts/pregenerate/__init__.py
+++ b/scripts/pregenerate/__init__.py
@@ -19,7 +19,7 @@
 from dataclasses import dataclass, field
 from typing import Iterator, List, Optional
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 from .using_codegen import (CodegenCppAppPregenerator, CodegenCppClustersTLVMetaPregenerator,
                             CodegenCppProtocolsTLVMetaPregenerator, CodegenJavaClassPregenerator, CodegenJavaJNIPregenerator)
 from .using_zap import ZapApplicationPregenerator
diff --git a/scripts/pregenerate/types.py b/scripts/pregenerate/type_definitions.py
similarity index 100%
rename from scripts/pregenerate/types.py
rename to scripts/pregenerate/type_definitions.py
diff --git a/scripts/pregenerate/using_codegen.py b/scripts/pregenerate/using_codegen.py
index 15c2e4ceb26ebf..e188d1a82d5985 100644
--- a/scripts/pregenerate/using_codegen.py
+++ b/scripts/pregenerate/using_codegen.py
@@ -15,7 +15,7 @@
 import logging
 import os
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 
 CODEGEN_PY_PATH = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', 'codegen.py'))
diff --git a/scripts/pregenerate/using_zap.py b/scripts/pregenerate/using_zap.py
index 6af561b1a2921d..982cbc1fdfe711 100644
--- a/scripts/pregenerate/using_zap.py
+++ b/scripts/pregenerate/using_zap.py
@@ -16,7 +16,7 @@
 import os
 from enum import Enum, auto
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 
 ZAP_GENERATE_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'tools', 'zap', 'generate.py'))
 
diff --git a/scripts/py_matter_idl/BUILD.gn b/scripts/py_matter_idl/BUILD.gn
index 37b17477aabfbc..01983d0a890724 100644
--- a/scripts/py_matter_idl/BUILD.gn
+++ b/scripts/py_matter_idl/BUILD.gn
@@ -64,6 +64,7 @@ pw_python_package("matter_idl") {
 
   tests = [
     "matter_idl/test_backwards_compatibility.py",
+    "matter_idl/test_data_model_xml.py",
     "matter_idl/test_matter_idl_parser.py",
     "matter_idl/test_generators.py",
     "matter_idl/test_idl_generator.py",
diff --git a/scripts/py_matter_idl/files.gni b/scripts/py_matter_idl/files.gni
index dab10a26bffbdc..d0dba4c9393722 100644
--- a/scripts/py_matter_idl/files.gni
+++ b/scripts/py_matter_idl/files.gni
@@ -38,10 +38,10 @@ matter_idl_generator_sources = [
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/registry.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/types.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/type_definitions.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/lint/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/lint/types.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/lint/type_definitions.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_parser.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_types.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py",
diff --git a/scripts/py_matter_idl/matter_idl/README.md b/scripts/py_matter_idl/matter_idl/README.md
index 1cd4a28cc325bb..5bb8b40da087bc 100644
--- a/scripts/py_matter_idl/matter_idl/README.md
+++ b/scripts/py_matter_idl/matter_idl/README.md
@@ -39,6 +39,10 @@ struct LabelStruct {
 // Every cluster has an identifier that is defined by the matter spec (31 in this case)
 server cluster AccessControl = 31 {
 
+  // Revision of the cluster being described here
+  // If not specified, it is assumed to be 1
+  revision 3;
+
   // Enums and structs can be defined globally or be cluster specific.
   // IDL generation rules will take into account scoping (i.e. pick local defined
   // name first, things defined in one cluster are not visible in another).
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py
index ff4bd9ddc664c8..79ddb29974b568 100644
--- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py
@@ -13,10 +13,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+import dataclasses
 import logging
 from typing import Iterable, Optional, Protocol, TypeVar
 
-from matter_idl.matter_idl_types import Attribute, Bitmap, Cluster, Command, Enum, Event, Idl, Struct
+from matter_idl.matter_idl_types import Attribute, AttributeQuality, Bitmap, Cluster, Command, Enum, Event, Idl, Struct
 
 from .context import Context, IdlPostProcessor
 from .parsing import NormalizeName
@@ -81,6 +82,9 @@ def merge_event_into(e: Event, cluster: Cluster):
 
 
 def merge_attribute_into(a: Attribute, cluster: Cluster):
+    """Pushes an attribute from a base cluster into an already
+       parsed cluster.
+    """
     existing: Optional[Attribute] = None
     for existing_a in cluster.attributes:
         if existing_a.definition.name == a.definition.name:
@@ -88,13 +92,24 @@ def merge_attribute_into(a: Attribute, cluster: Cluster):
             break
 
     if existing:
-        # Do not provide merging as it seems only conformance is changed from
-        # the base cluster
-        #
-        # This should fix the correct types
-        #
-        # LOGGER.error("TODO: Do not know how to merge attribute for %s::%s", cluster.name, existing.definition.name)
-        cluster.attributes.remove(existing)
+        # Merge examples:
+        #   UserLabelCluster::LabelList changes qualities (access, mandatory)
+        #   ModeDishwasher:
+        #      - changes the type of a list from sint32 to list[ModeOptionStruct]
+        #      - Sets the field as read-only
+
+        # Carry over data type and definitions, except quality and maturity
+        existing.definition = dataclasses.replace(
+            a.definition,
+            qualities=existing.definition.qualities,
+            api_maturity=existing.definition.api_maturity,
+        )
+
+        # Inherit attribute quality
+        if existing.qualities == AttributeQuality.NONE:
+            existing.qualities = a.qualities
+
+        return
 
     cluster.attributes.append(a)
 
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py
index 3adb852b846334..624bcb56b9dc01 100644
--- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py
@@ -18,7 +18,7 @@
 from typing import Optional
 from xml.sax.xmlreader import AttributesImpl
 
-from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType
+from matter_idl.generators.type_definitions import GetDataTypeSizeInBits, IsSignedDataType
 from matter_idl.matter_idl_types import AccessPrivilege, Attribute, Command, ConstantEntry, DataType, Event, EventPriority, Field
 
 LOGGER = logging.getLogger('data-model-xml-data-parsing')
@@ -92,10 +92,13 @@ def NormalizeDataType(t: str) -> str:
 
 # Handle oddities in current data model XML schema for nicer diffs
 _REF_NAME_MAPPING = {
-    "<<ref_DataTypeString>>": "char_string",
+    "<<ref_DataTypeEndpointNumber>>": "endpoint_no",
+    "<<ref_DataTypeEpochUs>>": "epoch_us",
+    "<<ref_DataTypeNodeId>>": "node_id",
     "<<ref_DataTypeOctstr>>": "octet_string",
+    "<<ref_DataTypeString>>": "char_string",
     "<<ref_DataTypeVendorId>>": "vendor_id",
-    "<<ref_DataTypeEndpointNumber>>": "endpoint_no",
+    "<<ref_FabricIdx>>": "fabric_idx",
 }
 
 
diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja b/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja
index 91e978a44c7b07..edfb2989668e84 100644
--- a/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja
@@ -36,53 +36,42 @@
 {% if cluster.description %}/** {{cluster.description}} */
 {% endif %}
 {{cluster.api_maturity | idltxt}}{{cluster.side | idltxt}} cluster {{cluster.name}} = {{cluster.code}} {
-  {%- for enum in cluster.enums %}
+  revision {{cluster.revision}};
 
+  {% for enum in cluster.enums %}
   enum {{enum.name}} : {{ enum.base_type}} {
     {% for entry in enum.entries %}
     {{entry.name}} = {{entry.code}};
     {% endfor %}
   }
+
   {% endfor %}
 
   {%- for bitmap in cluster.bitmaps %}
-
   bitmap {{bitmap.name}} : {{ bitmap.base_type}} {
     {% for entry in bitmap.entries %}
     {{entry.name}} = 0x{{"%X" | format(entry.code)}};
     {% endfor %}
   }
+
   {% endfor %}
 
   {%- for s in cluster.structs | rejectattr("tag") %}
-  {% if loop.first %}
-
-  {% endif %}
   {{render_struct(s)}}
-  {% if not loop.last %}
 
-  {% endif %}
   {% endfor %}
 
   {%- for e in cluster.events %}
-  {% if loop.first %}
-
-  {% endif %}
   {##}  {##}{% if e.qualities %}{{e.qualities | idltxt}} {% endif -%}
   {{e.priority | idltxt}} event {{e | event_access}}{{e.name}} = {{e.code}} {
     {% for field in e.fields %}
     {{render_field(field)}}
     {% endfor %}
   }
-  {% if not loop.last %}
 
-  {% endif %}
   {% endfor %}
 
   {%- for a in cluster.attributes %}
-  {% if loop.first %}
-
-  {% endif %}
   {{a.qualities | idltxt}}attribute {{a | attribute_access}}{{render_field(a.definition)}}
   {% endfor %}
 
diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py
index 9ac9085f0cc68b..8f924e3405187d 100644
--- a/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py
@@ -82,10 +82,10 @@ def human_text_string(value: Union[ClusterSide, StructTag, StructQuality, EventP
         return result
     elif type(value) is CommandQuality:
         result = ""
-        if CommandQuality.TIMED_INVOKE in value:
-            result += "timed "
         if CommandQuality.FABRIC_SCOPED in value:
             result += "fabric "
+        if CommandQuality.TIMED_INVOKE in value:
+            result += "timed "
         return result
     elif type(value) is ApiMaturity:
         if value == ApiMaturity.STABLE:
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipClusters_java.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipClusters_java.jinja
index 1137f582a1a3f9..45621c7e86469a 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/ChipClusters_java.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipClusters_java.jinja
@@ -37,6 +37,44 @@
   {%- endif -%}
 {%- endmacro -%}
 
+{%- macro encode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{variable}} != null ? {{encode_tlv(source, encodable.without_nullable(), variable, depth + 1)}} : new NullType()
+  {%- elif encodable.is_optional -%}
+    {{variable}}.<BaseTLVType>map(({{"nonOptional{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_optional(), "nonOptional{}".format(variable), depth + 1)}}).orElse(new EmptyType())
+  {%- elif encodable.is_list -%}
+    ArrayType.generateArrayType({{variable}}, ({{"element{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    {{variable}}.encodeTlv()
+  {%- else -%}
+    new {{encodable.java_tlv_type}}Type({{variable}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro decode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_optional -%}
+    Optional.of({{decode_tlv(source, encodable.without_optional(), variable, depth + 1)}})
+  {%- elif encodable.is_list -%}
+    {{variable}}.map(({{"element{}".format(variable)}}) -> {{decode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}.decodeTlv({{variable}})
+  {%- else -%}
+    {{variable}}.value({{encodable.boxed_java_type}}.class)
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro get_tlvType(encodable) -%}
+  {%- if encodable.is_list -%}
+    Array
+  {%- elif encodable.is_struct -%}
+    Struct
+  {%- else -%}
+    {{encodable.java_tlv_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
 /*
  *
  *    Copyright (c) 2023 Project CHIP Authors
@@ -56,68 +94,84 @@
 
 package chip.devicecontroller;
 
+import chip.devicecontroller.model.AttributeState;
+import chip.devicecontroller.model.AttributeWriteRequest;
+import chip.devicecontroller.model.ChipAttributePath;
+import chip.devicecontroller.model.ChipEventPath;
+import chip.devicecontroller.model.ClusterState;
+import chip.devicecontroller.model.EndpointState;
+import chip.devicecontroller.model.InvokeElement;
+import chip.devicecontroller.model.NodeState;
+
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipClusters {
 
-  public interface DefaultClusterCallback {
+  public interface BaseClusterCallback {
+    void onError(Exception error);
+  }
+
+  public interface DefaultClusterCallback extends BaseClusterCallback {
     void onSuccess();
+  }
+
+  public interface BaseAttributeCallback {
     void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface CharStringAttributeCallback {
+  public interface CharStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for a CHAR_STRING attribute. */
     void onSuccess(String value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface OctetStringAttributeCallback {
+  public interface OctetStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for an OCTET_STRING attribute. */
     void onSuccess(byte[] value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface IntegerAttributeCallback {
+  public interface IntegerAttributeCallback extends BaseAttributeCallback {
     void onSuccess(int value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface LongAttributeCallback {
+  public interface LongAttributeCallback extends BaseAttributeCallback {
     void onSuccess(long value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface BooleanAttributeCallback {
+  public interface BooleanAttributeCallback extends BaseAttributeCallback {
     void onSuccess(boolean value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface FloatAttributeCallback {
+  public interface FloatAttributeCallback extends BaseAttributeCallback {
     void onSuccess(float value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface DoubleAttributeCallback {
+  public interface DoubleAttributeCallback extends BaseAttributeCallback {
     void onSuccess(double value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
   public static abstract class BaseChipCluster {
     protected long chipClusterPtr;
 
-    public BaseChipCluster(long devicePtr, int endpointId) {
-      chipClusterPtr = initWithDevice(devicePtr, endpointId);
+    protected long devicePtr;
+    protected int endpointId;
+    protected long clusterId;
+
+    private Optional<Long> timeoutMillis = Optional.empty();
+
+    public BaseChipCluster(long devicePtr, int endpointId, long clusterId) {
+      this.devicePtr = devicePtr;
+      this.endpointId = endpointId;
+      this.clusterId = clusterId;
     }
 
     /**
@@ -126,22 +180,64 @@ public class ChipClusters {
      * empty optional, the default timeout will be used.
      */
     public void setCommandTimeout(Optional<Long> timeoutMillis) {
-      setCommandTimeout(chipClusterPtr, timeoutMillis);
+      this.timeoutMillis = timeoutMillis;
     }
 
-    private native void setCommandTimeout(long clusterPtr, Optional<Long> timeoutMillis);
-
     /** Returns the current timeout (in milliseconds) for commands sent through this cluster. */
     public Optional<Long> getCommandTimeout() {
-      Optional<Long> timeout = getCommandTimeout(chipClusterPtr);
-      return timeout == null ? Optional.empty() : timeout;
+      return timeoutMillis == null ? Optional.empty() : timeoutMillis;
     }
 
-    private native Optional<Long> getCommandTimeout(long clusterPtr);
-
+    @Deprecated
     public abstract long initWithDevice(long devicePtr, int endpointId);
 
-    public native void deleteCluster(long chipClusterPtr);
+    protected void readAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        boolean isFabricFiltered) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(null, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.read(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, isFabricFiltered, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void writeAttribute(
+        WriteAttributesCallbackImpl callback,
+        long attributeId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      WriteAttributesCallbackJni jniCallback = new WriteAttributesCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      AttributeWriteRequest writeRequest = AttributeWriteRequest.newInstance(endpointId, clusterId, attributeId, tlv);
+      ChipDeviceController.write(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(writeRequest), timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    protected void subscribeAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        int minInterval,
+        int maxInterval) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(callback, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.subscribe(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, minInterval, maxInterval, false, true, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void invoke(
+        InvokeCallbackImpl callback,
+        long commandId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      InvokeCallbackJni jniCallback = new InvokeCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      InvokeElement element = InvokeElement.newInstance(endpointId, clusterId, commandId, tlv, null);
+      ChipDeviceController.invoke(0, jniCallback.getCallbackHandle(), devicePtr, element, timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    private static native byte[] encodeToTlv(BaseTLVType value);
+
+    static native BaseTLVType decodeFromTlv(byte[] tlv);
+
+    @Deprecated
+    public void deleteCluster(long chipClusterPtr) {}
     
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
@@ -153,17 +249,132 @@ public class ChipClusters {
       }
     }
   }
+
+  abstract static class ReportCallbackImpl implements ReportCallback, SubscriptionEstablishedCallback {
+    private BaseAttributeCallback callback;
+    private ChipAttributePath path;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_ATTRIBUTE = 0x86;
+
+    ReportCallbackImpl(BaseAttributeCallback callback, ChipAttributePath path) {
+      this.callback = callback;
+      this.path = path;
+    }
+
+    @Override
+    public void onError(
+        @Nullable ChipAttributePath attributePath,
+        @Nullable ChipEventPath eventPath,
+        @Nonnull Exception e) {
+      callback.onError(e);
+    }
+
+    @Override
+    public void onReport(NodeState nodeState) {
+      if (nodeState == null) {
+        callback.onError(new ChipClusterException());
+        return;
+      }
+
+      EndpointState endpointState = nodeState.getEndpointState((int)path.getEndpointId().getId());
+      if (endpointState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      ClusterState clusterState = endpointState.getClusterState(path.getClusterId().getId());
+      if (clusterState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      AttributeState attributeState = clusterState.getAttributeState(path.getAttributeId().getId());
+      if (attributeState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      byte[] tlv = attributeState.getTlv();
+      if (tlv == null) {
+          callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+          return;
+      }
+
+      onSuccess(tlv);
+    }
+
+    @Override
+    public void onSubscriptionEstablished(long subscriptionId) {
+      callback.onSubscriptionEstablished(subscriptionId);
+    }
+
+    public abstract void onSuccess(byte[] tlv);
+  }
+
+  static class WriteAttributesCallbackImpl implements WriteAttributesCallback {
+    private DefaultClusterCallback callback;
+
+    WriteAttributesCallbackImpl(DefaultClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onResponse(ChipAttributePath attributePath) {
+      callback.onSuccess();
+    }
+
+    @Override
+    public void onError(@Nullable ChipAttributePath attributePath, Exception e) {
+      callback.onError(e);
+    }
+  }
+
+  abstract static class InvokeCallbackImpl implements InvokeCallback {
+    private BaseClusterCallback callback;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_COMMAND = 0x81;
+
+    InvokeCallbackImpl(BaseClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    public void onError(Exception e) {
+      callback.onError(e);
+    }
+
+    public void onResponse(InvokeElement invokeElement, long successCode) {
+      byte[] tlv = invokeElement.getTlvByteArray();
+      if (tlv == null) {
+        onResponse(null);
+        return;
+      }
+      BaseTLVType value = BaseChipCluster.decodeFromTlv(tlv);
+      if (value == null || value.type() != TLVType.Struct) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_COMMAND));
+        return;
+      }
+      onResponse((StructType)value);
+    }
+
+    public abstract void onResponse(StructType value);
+  }
 {% for cluster in clientClusters | sort(attribute='code') %}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
   public static class {{cluster.name}}Cluster extends BaseChipCluster {
     public static final long CLUSTER_ID = {{cluster.code}}L;
+{% for attribute in cluster.attributes | sort(attribute='code') %}
+    private static final long {{attribute.definition.name | constcase}}_ATTRIBUTE_ID = {{attribute.definition.code}}L;
+{%- endfor %}
 
     public {{cluster.name}}Cluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 {% for command in cluster.commands | sort(attribute='code') -%}
 {%- set callbackName = command | javaCommandCallbackName() -%}
 {%- if not command.is_timed_invoke %}
@@ -175,13 +386,13 @@ public class ChipClusters {
 {%- endfor -%}
 {%- endif -%}
     ) {
-      {{command.name | lowfirst_except_acronym}}(chipClusterPtr, callback
+      {{command.name | lowfirst_except_acronym}}(callback
 {%- if command.input_param -%}
 {%- for field in (cluster.structs | named(command.input_param)).fields -%}
     , {{field.name | lowfirst_except_acronym}}
 {%- endfor -%}
 {%- endif -%}
-    , null);
+    , 0);
     }
 {%- endif %}
 
@@ -193,32 +404,67 @@ public class ChipClusters {
 {%- endfor -%}
 {%- endif -%}
     , int timedInvokeTimeoutMs) {
-      {{command.name | lowfirst_except_acronym}}(chipClusterPtr, callback
+      final long commandId = {{command.code}}L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
 {%- if command.input_param -%}
 {%- for field in (cluster.structs | named(command.input_param)).fields -%}
-    , {{field.name | lowfirst_except_acronym}}
-{%- endfor -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+      final long {{field.name | lowfirst_except_acronym}}FieldID = {{field.code}}L;
+      BaseTLVType {{field.name | lowfirst_except_acronym}}tlvValue = {{encode_tlv(cluster, encodable, (field.name | lowfirst_except_acronym), 0)}};
+      elements.add(new StructElement({{field.name | lowfirst_except_acronym}}FieldID, {{field.name | lowfirst_except_acronym}}tlvValue));
+{% endfor -%}
+{%- endif %}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+{%- if command | isCommandNotDefaultCallback() %}
+{%- for field in (cluster.structs | named(command.output_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+{%- set encodable2 = field | asEncodable(typeLookup) %}
+          final long {{field.name | lowfirst_except_acronym}}FieldID = {{field.code}}L;
+          {{encode_value(cluster, encodable, 0)}} {{field.name | lowfirst_except_acronym}}
+{%- if encodable2.is_nullable -%}
+{{" = null"}}
+{%- elif encodable2.is_optional -%}
+{{" = Optional.empty()"}}
+{%- else -%}
+{{" = null"}}
 {%- endif -%}
-    , timedInvokeTimeoutMs);
-    }
-{% endfor %}
-{%- for command in cluster.commands | sort(attribute='code') -%}
-{%- set callbackName = command | javaCommandCallbackName() %}
-    private native void {{command.name | lowfirst_except_acronym}}(long chipClusterPtr, {{callbackName}}Callback callback
-{%- if command.input_param -%}
-{%- for field in (cluster.structs | named(command.input_param)).fields -%}
-{%- set encodable = field | asEncodable(typeLookup) -%}
-    , {{encode_value(cluster, encodable, 0)}} {{field.name | lowfirst_except_acronym}}
+;
+{%- endfor %}
+          for (StructElement element: invokeStructValue.value()) {
+{%- for field in (cluster.structs | named(command.output_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+            {% if loop.index0 > 0 -%}{{"} else "}}{%- endif -%}if (element.contextTagNum() == {{field.name | lowfirst_except_acronym}}FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.{{get_tlvType(encodable)}}) {
+                {{get_tlvType(encodable)}}Type castingValue = element.value({{get_tlvType(encodable)}}Type.class);
+                {{field.name | lowfirst_except_acronym}} = {{decode_tlv(cluster, encodable, "castingValue", 0)}};
+              }
 {%- endfor -%}
-{%- endif -%}
-    , @Nullable Integer timedInvokeTimeoutMs);
+{% raw %}
+            }
+{%- endraw %}
+          }
+          callback.onSuccess(
+{%- for field in (cluster.structs | named(command.output_param)).fields -%}
+      {{field.name | lowfirst_except_acronym}}
+      {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%}
+{%- endfor -%}
+            );
+{%- else %}
+          callback.onSuccess();
+{%- endif %}
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 {% endfor %}
 {%- set already_handled_command = [] -%}
 {%- for command in cluster.commands | sort(attribute='code') -%}
 {%- if command | isCommandNotDefaultCallback() -%}
 {%- set callbackName = command | javaCommandCallbackName() -%}
 {%- if callbackName not in already_handled_command %}
-    public interface {{callbackName}}Callback {
+    public interface {{callbackName}}Callback extends BaseClusterCallback {
       void onSuccess(
 {%- for field in (cluster.structs | named(command.output_param)).fields -%}
 {%- set encodable = field | asEncodable(typeLookup) -%}
@@ -226,7 +472,6 @@ public class ChipClusters {
       {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%}
 {%- endfor -%}
       );
-      void onError(Exception error);
     }
 {% if already_handled_command.append(callbackName) -%}
 {#- This block does nothing, it only exists to append to already_handled_command. -#}
@@ -239,65 +484,71 @@ public class ChipClusters {
 {%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
 {%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%}
 {%- if interfaceName not in already_handled_attribute %}
-    public interface {{interfaceName}} {
+    public interface {{interfaceName}} extends BaseAttributeCallback {
       void onSuccess({{encode_value_without_optional(cluster, encodable, 0)}} value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 {% if already_handled_attribute.append(interfaceName) -%}
 {#- This block does nothing, it only exists to append to already_handled_attribute. -#}
 {%- endif -%}
 {%- endif -%}
 {% endfor -%}
-{% for attribute in cluster.attributes | sort(attribute='code') %}
+{% for attribute in cluster.attributes | sort(attribute='code') -%}
+{%- if attribute | isFabricScopedList(typeLookup) %}
     public void read{{attribute.definition.name | upfirst}}Attribute(
         {{attribute | javaAttributeCallbackName(typeLookup) }} callback) {
-        read{{attribute.definition.name | upfirst}}Attribute(chipClusterPtr, callback
-{%- if attribute | isFabricScopedList(typeLookup) -%}
-, true
-{%- endif -%}
-      );
+      read{{attribute.definition.name | upfirst}}AttributeWithFabricFilter(callback, true);
     }
-{% if attribute | isFabricScopedList(typeLookup) %}
+
     public void read{{attribute.definition.name | upfirst}}AttributeWithFabricFilter(
         {{attribute | javaAttributeCallbackName(typeLookup) }} callback, boolean isFabricFiltered) {
-        read{{attribute.definition.name | upfirst}}Attribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+{%- else %}
+    public void read{{attribute.definition.name | upfirst}}Attribute(
+        {{attribute | javaAttributeCallbackName(typeLookup) }} callback) {
+{%- endif %}
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, {{attribute.definition.name | constcase}}_ATTRIBUTE_ID);
 
-{% endif -%}
-{%- if attribute.is_writable %}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            {%- set encodable = attribute.definition | asEncodable(typeLookup) %}
+            {{encode_value_without_optional(cluster, encodable, 0)}} value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, {{attribute.definition.name | constcase}}_ATTRIBUTE_ID, {% if attribute | isFabricScopedList(typeLookup) -%}isFabricFiltered{%- else -%}true{%- endif -%});
+    }
+{% if attribute.is_writable %}
 {%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
 {%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%}
+{%- set encodable3 = attribute.definition | asEncodable(typeLookup) -%}
 {%- if not attribute.requires_timed_write %}
     public void write{{attribute.definition.name | upfirst}}Attribute(DefaultClusterCallback callback, {{encode_value_without_optional_nullable(cluster, encodable, 0)}} value) {
-        write{{attribute.definition.name | upfirst}}Attribute(chipClusterPtr, callback, value, null);
+      write{{attribute.definition.name | upfirst}}Attribute(callback, value, 0);
     }
 {% endif %}
     public void write{{attribute.definition.name | upfirst}}Attribute(DefaultClusterCallback callback, {{encode_value_without_optional_nullable(cluster, encodable2, 0)}} value, int timedWriteTimeoutMs) {
-        write{{attribute.definition.name | upfirst}}Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      {%- if encodable3.is_optional %}
+      BaseTLVType tlvValue = {{encode_tlv(cluster, encodable3.without_optional(), "value", 0)}};
+      {%- else %}
+      BaseTLVType tlvValue = {{encode_tlv(cluster, encodable3, "value", 0)}};
+      {%- endif %}
+      writeAttribute(new WriteAttributesCallbackImpl(callback), {{attribute.definition.name | constcase}}_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 {% endif %}
 {%- if attribute.is_subscribable %}
     public void subscribe{{attribute.definition.name | upfirst}}Attribute(
         {{attribute | javaAttributeCallbackName(typeLookup) }} callback, int minInterval, int maxInterval) {
-        subscribe{{attribute.definition.name | upfirst}}Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, {{attribute.definition.name | constcase}}_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            {%- set encodable = attribute.definition | asEncodable(typeLookup) %}
+            {{encode_value_without_optional(cluster, encodable, 0)}} value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, {{attribute.definition.name | constcase}}_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 {% endif -%}
-{%- endfor %}
-{%- for attribute in cluster.attributes %}
-    private native void read{{attribute.definition.name | upfirst}}Attribute(long chipClusterPtr, {{attribute | javaAttributeCallbackName(typeLookup) }} callback
-{%- if attribute | isFabricScopedList(typeLookup) -%}
-    , boolean isFabricFiltered
-{%- endif -%}
-    );
-{% if attribute.is_writable -%}
-{%- set encodable = attribute.definition | asEncodable(typeLookup) %}
-    private native void write{{attribute.definition.name | upfirst}}Attribute(long chipClusterPtr, DefaultClusterCallback callback, {{encode_value_without_optional_nullable(cluster, encodable, 0)}} value, @Nullable Integer timedWriteTimeoutMs);
-{% endif -%}
-{% if attribute.is_subscribable %}
-    private native void subscribe{{attribute.definition.name | upfirst}}Attribute(long chipClusterPtr, {{attribute | javaAttributeCallbackName(typeLookup) }} callback, int minInterval, int maxInterval);
-{% endif -%}
-{% endfor -%}
+{%- endfor -%}
 {% raw %}  }
 {% endraw %}
 {%- endfor -%}
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs_java.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs_java.jinja
index aa1a2fed451cd3..95f733f9b986b1 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs_java.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs_java.jinja
@@ -12,6 +12,45 @@
     {{encodable.boxed_java_type}}
   {%- endif -%}
 {%- endmacro -%}
+
+{%- macro encode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{variable}} != null ? {{encode_tlv(source, encodable.without_nullable(), variable, depth + 1)}} : new NullType()
+  {%- elif encodable.is_optional -%}
+    {{variable}}.<BaseTLVType>map(({{"nonOptional{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_optional(), "nonOptional{}".format(variable), depth + 1)}}).orElse(new EmptyType())
+  {%- elif encodable.is_list -%}
+    ArrayType.generateArrayType({{variable}}, ({{"element{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    {{variable}}.encodeTlv()
+  {%- else -%}
+    new {{encodable.java_tlv_type}}Type({{variable}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro decode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_optional -%}
+    Optional.of({{decode_tlv(source, encodable.without_optional(), variable, depth + 1)}})
+  {%- elif encodable.is_list -%}
+    {{variable}}.map(({{"element{}".format(variable)}}) -> {{decode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}.decodeTlv({{variable}})
+  {%- else -%}
+    {{variable}}.value({{encodable.boxed_java_type}}.class)
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro get_tlvType(encodable) -%}
+  {%- if encodable.is_list -%}
+    Array
+  {%- elif encodable.is_struct -%}
+    Struct
+  {%- else -%}
+    {{encodable.java_tlv_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
 /*
  *
  *    Copyright (c) 2023 Project CHIP Authors
@@ -35,6 +74,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipEventStructs {
 {%- for cluster in clientClusters | sort(attribute='code') -%}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
@@ -45,6 +86,12 @@ public static class {{cluster.name}}Cluster{{event.name}}Event {
   {%- set encodable = field | asEncodable(typeLookup) %}
   public {{encode_value(cluster, encodable, 0)}} {{field.name}};
   {%- endfor %}
+
+  {%- for field in event.fields %}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  private static final long {{field.name | constcase}}_ID = {{field.code}}L;
+  {%- endfor %}
+
   public {{cluster.name}}Cluster{{event.name}}Event(
     {%- for field in event.fields %}
     {%- set encodable = field | asEncodable(typeLookup) %}
@@ -58,6 +105,54 @@ public static class {{cluster.name}}Cluster{{event.name}}Event {
     {%- endfor %}
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    {%- for field in event.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    values.add(new StructElement({{field.name | constcase}}_ID, {{encode_tlv(cluster, encodable, field.name, 0)}}));
+    {%- endfor %}
+
+    return new StructType(values);
+  }
+
+  public static {{cluster.name}}Cluster{{event.name}}Event decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+
+    {%- for field in event.fields %}
+{%- set encodable = field | asEncodable(typeLookup) %}
+{%- set encodable2 = field | asEncodable(typeLookup) %}
+    {{encode_value(cluster, encodable, 0)}} {{field.name | lowfirst_except_acronym}}
+{%- if encodable2.is_nullable -%}
+{{" = null"}}
+{%- elif encodable2.is_optional -%}
+{{" = Optional.empty()"}}
+{%- else -%}
+{{" = null"}}
+{%- endif -%}
+;
+{%- endfor %}
+    for (StructElement element: ((StructType)tlvValue).value()) {
+{%- for field in event.fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+      {% if loop.index0 > 0 -%}{{"} else "}}{%- endif -%}if (element.contextTagNum() == {{field.name | constcase}}_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.{{get_tlvType(encodable)}}) {
+          {{get_tlvType(encodable)}}Type castingValue = element.value({{get_tlvType(encodable)}}Type.class);
+          {{field.name | lowfirst_except_acronym}} = {{decode_tlv(cluster, encodable, "castingValue", 0)}};
+        }
+{%- endfor -%}
+{% raw %}
+      }
+{%- endraw %}
+    }
+    return new {{cluster.name}}Cluster{{event.name}}Event(
+  {%- for field in event.fields %}
+      {{field.name}}{%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif %}
+  {%- endfor %}
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs_java.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs_java.jinja
index 8001e95bfeb656..a19d6cd5766b12 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs_java.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs_java.jinja
@@ -12,6 +12,45 @@
     {{encodable.boxed_java_type}}
   {%- endif -%}
 {%- endmacro -%}
+
+{%- macro encode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{variable}} != null ? {{encode_tlv(source, encodable.without_nullable(), variable, depth + 1)}} : new NullType()
+  {%- elif encodable.is_optional -%}
+    {{variable}}.<BaseTLVType>map(({{"nonOptional{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_optional(), "nonOptional{}".format(variable), depth + 1)}}).orElse(new EmptyType())
+  {%- elif encodable.is_list -%}
+    ArrayType.generateArrayType({{variable}}, ({{"element{}".format(variable)}}) -> {{encode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    {{variable}}.encodeTlv()
+  {%- else -%}
+    new {{encodable.java_tlv_type}}Type({{variable}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro decode_tlv(source, encodable, variable, depth) -%}
+  {%- if encodable.is_optional -%}
+    Optional.of({{decode_tlv(source, encodable.without_optional(), variable, depth + 1)}})
+  {%- elif encodable.is_list -%}
+    {{variable}}.map(({{"element{}".format(variable)}}) -> {{decode_tlv(source, encodable.without_list(), "element{}".format(variable), depth + 1)}})
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}.decodeTlv({{variable}})
+  {%- else -%}
+    {{variable}}.value({{encodable.boxed_java_type}}.class)
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro get_tlvType(encodable) -%}
+  {%- if encodable.is_list -%}
+    Array
+  {%- elif encodable.is_struct -%}
+    Struct
+  {%- else -%}
+    {{encodable.java_tlv_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
 /*
  *
  *    Copyright (c) 2023 Project CHIP Authors
@@ -35,6 +74,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipStructs {
 {%- for cluster in clientClusters | sort(attribute='code') -%}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
@@ -45,6 +86,12 @@ public static class {{cluster.name}}Cluster{{struct.name}} {
   {%- set encodable = field | asEncodable(typeLookup) %}
   public {{encode_value(cluster, encodable, 0)}} {{field.name}};
   {%- endfor %}
+
+  {%- for field in struct.fields %}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  private static final long {{field.name | constcase}}_ID = {{field.code}}L;
+  {%- endfor %}
+
   public {{cluster.name}}Cluster{{struct.name}}(
     {%- for field in struct.fields %}
     {%- set encodable = field | asEncodable(typeLookup) %}
@@ -58,6 +105,54 @@ public static class {{cluster.name}}Cluster{{struct.name}} {
     {%- endfor %}
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    {%- for field in struct.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    values.add(new StructElement({{field.name | constcase}}_ID, {{encode_tlv(cluster, encodable, field.name, 0)}}));
+    {%- endfor %}
+
+    return new StructType(values);
+  }
+
+  public static {{cluster.name}}Cluster{{struct.name}} decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+
+    {%- for field in struct.fields %}
+{%- set encodable = field | asEncodable(typeLookup) %}
+{%- set encodable2 = field | asEncodable(typeLookup) %}
+    {{encode_value(cluster, encodable, 0)}} {{field.name | lowfirst_except_acronym}}
+{%- if encodable2.is_nullable -%}
+{{" = null"}}
+{%- elif encodable2.is_optional -%}
+{{" = Optional.empty()"}}
+{%- else -%}
+{{" = null"}}
+{%- endif -%}
+;
+{%- endfor %}
+    for (StructElement element: ((StructType)tlvValue).value()) {
+{%- for field in struct.fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+      {% if loop.index0 > 0 -%}{{"} else "}}{%- endif -%}if (element.contextTagNum() == {{field.name | constcase}}_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.{{get_tlvType(encodable)}}) {
+          {{get_tlvType(encodable)}}Type castingValue = element.value({{get_tlvType(encodable)}}Type.class);
+          {{field.name | lowfirst_except_acronym}} = {{decode_tlv(cluster, encodable, "castingValue", 0)}};
+        }
+{%- endfor -%}
+{% raw %}
+      }
+{%- endraw %}
+    }
+    return new {{cluster.name}}Cluster{{struct.name}}(
+  {%- for field in struct.fields %}
+      {{field.name}}{%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif %}
+  {%- endfor %}
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
index 244f77eb2725f9..7b1c80bb13bb1c 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
@@ -20,8 +20,8 @@
 from typing import List, Optional, Set
 
 from matter_idl.generators import CodeGenerator, GeneratorStorage
-from matter_idl.generators.types import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
-                                         ParseDataType, TypeLookupContext)
+from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
+                                                    ParseDataType, TypeLookupContext)
 from matter_idl.matter_idl_types import (Attribute, Cluster, ClusterSide, Command, DataType, Field, FieldQuality, Idl, Struct,
                                          StructQuality, StructTag)
 from stringcase import capitalcase
@@ -509,6 +509,37 @@ def boxed_java_type(self):
         else:
             return "Object"
 
+    @property
+    def java_tlv_type(self):
+        t = ParseDataType(self.data_type, self.context)
+
+        if isinstance(t, FundamentalType):
+            if t == FundamentalType.BOOL:
+                return "Boolean"
+            elif t == FundamentalType.FLOAT:
+                return "Float"
+            elif t == FundamentalType.DOUBLE:
+                return "Double"
+            else:
+                raise Exception("Unknown fundamental type")
+        elif isinstance(t, BasicInteger):
+            # the >= 3 will include int24_t to be considered "long"
+            if t.is_signed:
+                return "Int"
+            else:
+                return "UInt"
+        elif isinstance(t, BasicString):
+            if t.is_binary:
+                return "ByteArray"
+            else:
+                return "String"
+        elif isinstance(t, IdlEnumType):
+            return "UInt"
+        elif isinstance(t, IdlBitmapType):
+            return "UInt"
+        else:
+            return "Any"
+
     @property
     def kotlin_type(self):
         t = ParseDataType(self.data_type, self.context)
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
index 52dc2021b42189..29b3b9c5f26788 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
@@ -6,12 +6,12 @@
   {%- elif encodable.is_optional -%}
     {{encode_value(source, encodable.without_optional(), depth + 1)}}?
   {%- elif encodable.is_list -%}
-    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+    List<{{encode_value(source, encodable.without_list(), depth + 1)}}>
   {%- elif encodable.is_struct -%}
     {%- set struct = encodable.get_underlying_struct() -%}
-    ChipStructs.{{source.name}}Cluster{{struct.name}}
+    {{source.name}}Cluster{{struct.name}}
   {%- else -%}
-    {{encodable.boxed_java_type}}
+    {{encodable.kotlin_type}}
   {%- endif -%}
 {%- endmacro -%}
 
@@ -22,20 +22,20 @@
     List<{{encode_value_without_optional(source, encodable.without_list(), depth + 1)}}>
   {%- elif encodable.is_struct -%}
     {%- set struct = encodable.get_underlying_struct() -%}
-    ChipStructs.{{source.name}}Cluster{{struct.name}}
+    {{source.name}}Cluster{{struct.name}}
   {%- else -%}
-    {{encodable.boxed_java_type}}
+    {{encodable.kotlin_type}}
   {%- endif -%}
 {%- endmacro -%}
 
 {%- macro encode_value_without_optional_nullable(source, encodable, depth) -%}
   {%- if encodable.is_list -%}
-    ArrayList<{{encode_value_without_optional_nullable(source, encodable.without_list(), depth + 1)}}>
+    List<{{encode_value_without_optional_nullable(source, encodable.without_list(), depth + 1)}}>
   {%- elif encodable.is_struct -%}
     {%- set struct = encodable.get_underlying_struct() -%}
-    ChipStructs.{{source.name}}Cluster{{struct.name}}
+    {{source.name}}Cluster{{struct.name}}
   {%- else -%}
-    {{encodable.boxed_java_type}}
+    {{encodable.kotlin_type}}
   {%- endif -%}
 {%- endmacro -%}
 
@@ -58,111 +58,124 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 {% set typeLookup = idl | createLookupContext(cluster) %}
-class {{cluster.name}}Cluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = {{cluster.code}}u
-  }
-{% for command in cluster.commands | sort(attribute='code') -%}
-{%- set callbackName = command | javaCommandCallbackName() -%}
-{%- if not command.is_timed_invoke %}
-  fun {{command.name | lowfirst_except_acronym}}(callback: {{callbackName}}Callback
-{%- if command.input_param -%}
-{%- for field in (cluster.structs | named(command.input_param)).fields -%}
-  , {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
-{%- endfor -%}
-{%- endif -%}
-  ) {
-    // Implementation needs to be added here
-  }
-{%- endif %}
+class {{cluster.name}}Cluster(private val controller: MatterController, private val endpointId: UShort) {
 
-  fun {{command.name | lowfirst_except_acronym}}(callback: {{callbackName}}Callback
-{%- if command.input_param -%}
-{%- for field in (cluster.structs | named(command.input_param)).fields -%}
-  , {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
-{%- endfor -%}
-{%- endif -%}
-  , timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-{% endfor %}
 {%- set already_handled_command = [] -%}
 {%- for command in cluster.commands | sort(attribute='code') -%}
 {%- if command | isCommandNotDefaultCallback() -%}
 {%- set callbackName = command | javaCommandCallbackName() -%}
 {%- if callbackName not in already_handled_command %}
-  interface {{callbackName}}Callback {
-    fun onSuccess(
-{%- for field in (cluster.structs | named(command.output_param)).fields -%}
-    {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}{% if not loop.last %}, {% endif %}
-{%- endfor -%}
-    )
-    fun onError(error: Exception)
-  }
+  class {{callbackName}}(
+{%- for field in (cluster.structs | named(command.output_param)).fields %}
+    val {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
+{%- if not loop.last %}, {% endif %}
+{%- endfor %}
+  )
 {% if already_handled_command.append(callbackName) -%}
 {%- endif -%}
 {%- endif -%}
 {%- endif -%}
 {%- endfor %}
+
 {%- set already_handled_attribute = [] -%}
 {% for attribute in cluster.attributes | rejectattr('definition', 'is_field_global_name', typeLookup) %}
 {%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
 {%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%}
 {%- if interfaceName not in already_handled_attribute %}
-  interface {{interfaceName}} {
-    fun onSuccess(value: {{encode_value(cluster, encodable, 0)}})
-    fun onError(ex: Exception)
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class {{interfaceName}}(
+    val value: {{encode_value(cluster, encodable, 0)}}
+  )
 {% if already_handled_attribute.append(interfaceName) -%}
 {#- This block does nothing, it only exists to append to already_handled_attribute. -#}
 {%- endif -%}
 {%- endif -%}
 {% endfor -%}
+
+{% for command in cluster.commands | sort(attribute='code') -%}
+{%- set callbackName = command | javaCommandCallbackName() %}
+  suspend fun {{command.name | lowfirst_except_acronym}}(
+{%- if command.input_param -%}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+  {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
+{%- if not loop.last -%}, {% endif %}  
+{%- endfor -%}
+{%- if command.is_timed_invoke -%}
+  , timedInvokeTimeoutMs: Int)
+{%- else -%}
+  , timedInvokeTimeoutMs: Int? = null)
+{%- endif -%}
+{%- else -%}
+{%- if command.is_timed_invoke -%}
+  timedInvokeTimeoutMs: Int)
+{%- else -%}
+  timedInvokeTimeoutMs: Int? = null)
+{%- endif -%}
+{%- endif -%}
+{%- if command | hasResponse -%}
+    : {{callbackName}} {
+{%- else %} {
+{%- endif %}
+    val commandId = {{command.code}}L
+{% if command.is_timed_invoke %}
+    // Implementation needs to be added here
+{%- else %}
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }    
+{%- endif %}    
+  }
+{% endfor -%}
+
 {% for attribute in cluster.attributes | sort(attribute='code') %}
-  fun read{{ attribute.definition.name | upfirst }}Attribute(
-    callback: {{ attribute | javaAttributeCallbackName(typeLookup) }}
-  ) {
+{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) %}
+  suspend fun read{{ attribute.definition.name | upfirst }}Attribute(): {{interfaceName}} {
     // Implementation needs to be added here
   }
 {% if attribute | isFabricScopedList(typeLookup) %}
-  fun read{{ attribute.definition.name | upfirst }}AttributeWithFabricFilter(
-    callback: {{ attribute | javaAttributeCallbackName(typeLookup) }},
+  suspend fun read{{ attribute.definition.name | upfirst }}AttributeWithFabricFilter(
     isFabricFiltered: Boolean
-  ) {
+  ): {{interfaceName}} {
     // Implementation needs to be added here
   }
 
 {% endif -%}
 {%- if attribute.is_writable %}
 {%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
-{%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%}
-{%- if not attribute.requires_timed_write %}
-  fun write{{ attribute.definition.name | upfirst }}Attribute(
-    callback: DefaultClusterCallback,
-    value: {{ encode_value_without_optional_nullable(cluster, encodable, 0) }}
-  ) {
-    // Implementation needs to be added here
-  }
-{% endif %}
-  fun write{{ attribute.definition.name | upfirst }}Attribute(
-    callback: DefaultClusterCallback,
+{%- set encodable2 = attribute.definition | asEncodable(typeLookup) %}
+  suspend fun write{{ attribute.definition.name | upfirst }}Attribute(
     value: {{ encode_value_without_optional_nullable(cluster, encodable2, 0) }},
+{%- if attribute.requires_timed_write -%}
     timedWriteTimeoutMs: Int
+{%- else %}
+    timedWriteTimeoutMs: Int? = null
+{%- endif %}    
   ) {
+{%- if attribute.requires_timed_write %}
     // Implementation needs to be added here
+{%- else %}
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }    
+{%- endif %}    
   }
 {% endif %}
 {%- if attribute.is_subscribable %}
-  fun subscribe{{ attribute.definition.name | upfirst }}Attribute(
-    callback: {{ attribute | javaAttributeCallbackName(typeLookup) }},
+  suspend fun subscribe{{ attribute.definition.name | upfirst }}Attribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): {{interfaceName}} {
     // Implementation needs to be added here
   }
 {% endif -%}
-{%- endfor -%}
+{%- endfor %}
+  companion object {
+    const val CLUSTER_ID: UInt = {{cluster.code}}u
+  }
 }
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
new file mode 100644
index 00000000000000..e5b40bb8910301
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
@@ -0,0 +1,152 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{encode_value(source, encodable.without_nullable(), depth + 1)}}?
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    List<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.kotlin_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_tlv(encodable, tag, name, depth) %}
+  {%- if encodable.is_nullable -%}
+      if ({{name}} != null) {
+        {{encode_tlv(encodable.without_nullable(), tag, name, depth + 1)}}
+      } else {
+        putNull({{tag}})
+      }
+  {%- elif encodable.is_optional -%}
+      if ({{name}}.isPresent) {
+        val opt{{name}} = {{name}}.get()
+        {{encode_tlv(encodable.without_optional(), tag, "opt" + name, depth + 1)}}
+      }
+  {%- elif encodable.is_list -%}
+      startArray({{tag}})
+      for (item in {{name}}.iterator()) {
+        {{encode_tlv(encodable.without_list(), "AnonymousTag", "item", depth + 1)}}
+      }
+      endArray()
+  {%- elif encodable.is_struct -%}
+      {{name}}.toTlv({{tag}}, this)
+  {%- else -%}
+      put({{tag}}, {{name}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro decode_tlv(source, encodable, tag, depth) %}
+  {%- if encodable.is_nullable -%}
+      if (!tlvReader.isNull()) {
+        {{decode_tlv(source, encodable.without_nullable(), tag, depth + 1)}}
+      } else {
+        tlvReader.getNull({{tag}})
+        null
+      }
+  {%- elif encodable.is_optional -%}
+      if (tlvReader.isNextTag({{tag}})) {
+        Optional.of({{decode_tlv(source, encodable.without_optional(), tag, depth + 1)}})
+      } else {
+        Optional.empty()
+      }
+  {%- elif encodable.is_list -%}
+      {%- set encodablewithoutlist = encodable.without_list() -%}
+      buildList <{{encode_value(source, encodablewithoutlist, depth + 1)}}> {
+        tlvReader.enterArray({{tag}})
+        while(!tlvReader.isEndOfContainer()) {
+          this.add({{decode_tlv(source, encodablewithoutlist, "AnonymousTag", depth + 1)}})
+        }
+        tlvReader.exitContainer()
+      }
+  {%- elif encodable.is_struct -%}
+      {%- set struct = encodable.get_underlying_struct() -%}
+      matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
+  {%- else -%}
+      tlvReader.get{{encodable.kotlin_type}}({{tag}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro contextSpecificTag(field) -%}
+  ContextSpecificTag(TAG_{{field.name | constcase}})
+{%- endmacro -%}
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class {{cluster.name}}Cluster{{event.name}}Event(
+{%- for field in event.fields -%}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  val {{field.name}}: {{encode_value(cluster, encodable, 0)}}
+  {%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif -%}
+{%- endfor %}
+) {
+  override fun toString(): String = buildString {
+    append("{{cluster.name}}Cluster{{event.name}}Event {\n")
+    {%- for field in event.fields %}
+    append("\t{{field.name}} : ${{field.name}}\n")
+    {%- endfor %}
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      {% for field in event.fields %}
+        {%- set encodable = field | asEncodable(typeLookup) %}
+        {%- set tag = contextSpecificTag(field) -%}
+        {{encode_tlv(encodable, tag, field.name, 0)}}
+      {% endfor -%}
+      endStructure()
+    }
+  }
+
+  companion object {
+    {%- for field in event.fields %}
+    private const val TAG_{{field.name | constcase}} = {{field.code}}
+    {%- endfor %}
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{event.name}}Event {
+      tlvReader.enterStructure(tlvTag)
+      {% for field in event.fields %}
+        {%- set decodable = field | asEncodable(typeLookup) %}
+        {%- set tag = contextSpecificTag(field) -%}
+        val {{field.name}} = {{decode_tlv(cluster, decodable, tag, 0)}}
+      {% endfor %}
+      tlvReader.exitContainer()
+
+      return {{cluster.name}}Cluster{{event.name}}Event(
+        {%- for field in event.fields -%}
+          {%- set encodable = field | asEncodable(typeLookup) -%}
+          {{field.name}}
+          {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%}
+        {%- endfor -%}
+      )
+    }
+  }
+}
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
index b9fbf099f29eed..9094155de0d237 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
@@ -1,6 +1,28 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
+matter_structs_sources = [
+{%- for cluster in clientClusters | sort(attribute='name') %}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+{%- for struct in cluster.structs | sort(attribute='name') %}
+{%- if not struct.tag %}
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/{{cluster.name}}Cluster{{struct.name}}.kt",
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+]
+
+matter_eventstructs_sources = [
+{%- for cluster in clientClusters | sort(attribute='name') %}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+{%- for event in cluster.events | sort(attribute='name') %}
+{%- if event.fields %}
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/{{cluster.name}}Cluster{{event.name}}Event.kt",
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+]
+
 matter_clusters_sources = [
 {%- for cluster in clientClusters | sort(attribute='name') %}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
new file mode 100644
index 00000000000000..8a8769c0ceb95b
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
@@ -0,0 +1,152 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{encode_value(source, encodable.without_nullable(), depth + 1)}}?
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    List<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    {{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.kotlin_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_tlv(encodable, tag, name, depth) %}
+  {%- if encodable.is_nullable -%}
+      if ({{name}} != null) {
+        {{encode_tlv(encodable.without_nullable(), tag, name, depth + 1)}}
+      } else {
+        putNull({{tag}})
+      }
+  {%- elif encodable.is_optional -%}
+      if ({{name}}.isPresent) {
+        val opt{{name}} = {{name}}.get()
+        {{encode_tlv(encodable.without_optional(), tag, "opt" + name, depth + 1)}}
+      }
+  {%- elif encodable.is_list -%}
+      startArray({{tag}})
+      for (item in {{name}}.iterator()) {
+        {{encode_tlv(encodable.without_list(), "AnonymousTag", "item", depth + 1)}}
+      }
+      endArray()
+  {%- elif encodable.is_struct -%}
+      {{name}}.toTlv({{tag}}, this)
+  {%- else -%}
+      put({{tag}}, {{name}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro decode_tlv(source, encodable, tag, depth) %}
+  {%- if encodable.is_nullable -%}
+    if (!tlvReader.isNull()) {
+      {{decode_tlv(source, encodable.without_nullable(), tag, depth + 1)}}
+    } else {
+      tlvReader.getNull({{tag}})
+      null
+    }
+  {%- elif encodable.is_optional -%}
+    if (tlvReader.isNextTag({{tag}})) {
+      Optional.of({{decode_tlv(source, encodable.without_optional(), tag, depth + 1)}})
+    } else {
+      Optional.empty()
+    }
+  {%- elif encodable.is_list -%}
+    {%- set encodablewithoutlist = encodable.without_list() -%}
+    buildList<{{encode_value(source, encodablewithoutlist, depth + 1)}}> {
+      tlvReader.enterArray({{tag}})
+      while(!tlvReader.isEndOfContainer()) {
+        add({{decode_tlv(source, encodablewithoutlist, "AnonymousTag", depth + 1)}})
+      }
+      tlvReader.exitContainer()
+    }
+  {%- elif encodable.is_struct -%}
+      {%- set struct = encodable.get_underlying_struct() -%}
+      {{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
+  {%- else -%}
+      tlvReader.get{{encodable.kotlin_type}}({{tag}})
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro contextSpecificTag(field) -%}
+  ContextSpecificTag(TAG_{{field.name | constcase}})
+{%- endmacro -%}
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class {{cluster.name}}Cluster{{struct.name}}(
+{%- for field in struct.fields %}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  val {{field.name}}: {{encode_value(cluster, encodable, 0)}}
+  {%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif -%}
+{%- endfor %}
+) {
+  override fun toString(): String = buildString {
+    append("{{cluster.name}}Cluster{{struct.name}} {\n")
+    {%- for field in struct.fields %}
+    append("\t{{field.name}} : ${{field.name}}\n")
+    {%- endfor %}
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      {% for field in struct.fields %}
+        {%- set encodable = field | asEncodable(typeLookup) %}
+        {%- set tag = contextSpecificTag(field) -%}
+        {{encode_tlv(encodable, tag, field.name, 0)}}
+      {% endfor -%}
+      endStructure()
+    }
+  }
+
+  companion object {
+    {%- for field in struct.fields %}
+    private const val TAG_{{field.name | constcase}} = {{field.code}}
+    {%- endfor %}
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): {{cluster.name}}Cluster{{struct.name}} {
+      tlvReader.enterStructure(tlvTag)
+      {% for field in struct.fields %}
+        {%- set decodable = field | asEncodable(typeLookup) %}
+        {%- set tag = contextSpecificTag(field) -%}
+        val {{field.name}} = {{decode_tlv(cluster, decodable, tag, 0)}}
+      {% endfor %}
+      tlvReader.exitContainer()
+
+      return {{cluster.name}}Cluster{{struct.name}}(
+        {%- for field in struct.fields -%}
+          {%- set encodable = field | asEncodable(typeLookup) -%}
+          {{field.name}}
+          {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%}
+        {%- endfor -%}
+      )
+    }
+  }
+}
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
index 15e2f7c83a9b4b..8b1cd865ef105c 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
@@ -20,8 +20,8 @@
 from typing import List, Optional, Set
 
 from matter_idl.generators import CodeGenerator, GeneratorStorage
-from matter_idl.generators.types import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
-                                         ParseDataType, TypeLookupContext)
+from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
+                                                    ParseDataType, TypeLookupContext)
 from matter_idl.matter_idl_types import (Attribute, Cluster, ClusterSide, Command, DataType, Field, FieldQuality, Idl, Struct,
                                          StructQuality, StructTag)
 from stringcase import capitalcase
@@ -132,13 +132,25 @@ def FieldToGlobalName(field: Field, context: TypeLookupContext) -> Optional[str]
 
 
 def GlobalNameToJavaName(name: str) -> str:
-    if name in {'Int8u', 'Int8s', 'Int16u', 'Int16s'}:
-        return 'Integer'
-
-    if name.startswith('Int'):
+    if name == 'Int8s':
+        return 'Byte'
+    if name == 'Int8u':
+        return 'UByte'
+    if name == 'Int16s':
+        return 'Short'
+    if name == 'Int16u':
+        return 'UShort'
+
+    if name == 'Int32s':
+        return 'Int'
+    if name == 'Int32u':
+        return 'UInt'
+    if name == 'Int64s':
         return 'Long'
+    if name == 'Int64u':
+        return 'ULong'
 
-    # Double/Float/Booleans/CharString/OctetString
+    # Double/Float/Boolean/CharString/OctetString
     return name
 
 
@@ -212,9 +224,9 @@ def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> st
     global_name = FieldToGlobalName(attr.definition, context)
 
     if global_name:
-        return '{}AttributeCallback'.format(GlobalNameToJavaName(global_name))
+        return '{}'.format(GlobalNameToJavaName(global_name))
 
-    return '{}AttributeCallback'.format(capitalcase(attr.definition.name))
+    return '{}Attribute'.format(capitalcase(attr.definition.name))
 
 
 def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool:
@@ -404,43 +416,6 @@ def get_underlying_enum(self):
             raise Exception("Enum %s not found" % self.data_type.name)
         return e
 
-    @property
-    def boxed_java_type(self):
-        t = ParseDataType(self.data_type, self.context)
-
-        if isinstance(t, FundamentalType):
-            if t == FundamentalType.BOOL:
-                return "Boolean"
-            elif t == FundamentalType.FLOAT:
-                return "Float"
-            elif t == FundamentalType.DOUBLE:
-                return "Double"
-            else:
-                raise Exception("Unknown fundamental type")
-        elif isinstance(t, BasicInteger):
-            # the >= 3 will include int24_t to be considered "long"
-            if t.byte_count >= 3:
-                return "Long"
-            else:
-                return "Integer"
-        elif isinstance(t, BasicString):
-            if t.is_binary:
-                return "ByteArray"
-            else:
-                return "String"
-        elif isinstance(t, IdlEnumType):
-            if t.base_type.byte_count >= 3:
-                return "Long"
-            else:
-                return "Integer"
-        elif isinstance(t, IdlBitmapType):
-            if t.base_type.byte_count >= 3:
-                return "Long"
-            else:
-                return "Integer"
-        else:
-            return "Object"
-
     @property
     def kotlin_type(self):
         t = ParseDataType(self.data_type, self.context)
@@ -455,17 +430,22 @@ def kotlin_type(self):
             else:
                 raise Exception("Unknown fundamental type")
         elif isinstance(t, BasicInteger):
-            # the >= 3 will include int24_t to be considered "long"
             if t.is_signed:
-                if t.byte_count >= 3:
-                    return "Long"
-                else:
+                if t.byte_count <= 1:
+                    return "Byte"
+                if t.byte_count <= 2:
+                    return "Short"
+                if t.byte_count <= 4:
                     return "Int"
-            else:
-                if t.byte_count >= 3:
-                    return "ULong"
-                else:
+                return "Long"
+            else:  # unsigned
+                if t.byte_count <= 1:
+                    return "UByte"
+                if t.byte_count <= 2:
+                    return "UShort"
+                if t.byte_count <= 4:
                     return "UInt"
+                return "ULong"
         elif isinstance(t, BasicString):
             if t.is_binary:
                 return "ByteArray"
@@ -615,6 +595,11 @@ def IsFabricScopedList(attr: Attribute, lookup: TypeLookupContext) -> bool:
     return struct and struct.qualities == StructQuality.FABRIC_SCOPED
 
 
+def CommandHasResponse(command: Command) -> bool:
+    """Returns true if a command has a specific response."""
+    return command.output_param != "DefaultSuccess"
+
+
 def IsResponseStruct(s: Struct) -> bool:
     return s.tag == StructTag.RESPONSE
 
@@ -649,6 +634,7 @@ def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs):
         self.jinja_env.filters['createLookupContext'] = CreateLookupContext
         self.jinja_env.filters['canGenerateSubscribe'] = CanGenerateSubscribe
         self.jinja_env.filters['isFabricScopedList'] = IsFabricScopedList
+        self.jinja_env.filters['hasResponse'] = CommandHasResponse
 
         self.jinja_env.tests['is_response_struct'] = IsResponseStruct
         self.jinja_env.tests['is_using_global_callback'] = _IsUsingGlobalCallback
@@ -689,3 +675,43 @@ def internal_render_all(self):
                     'cluster': cluster,
                 }
             )
+
+        # Every cluster has its own impl, to avoid
+        # very large compilations (running out of RAM)
+        for cluster in self.idl.clusters:
+            if cluster.side != ClusterSide.CLIENT:
+                continue
+
+            for struct in cluster.structs:
+                if struct.tag:
+                    continue
+
+                output_name = "java/matter/devicecontroller/cluster/structs/{cluster_name}Cluster{struct_name}.kt"
+                self.internal_render_one_output(
+                    template_path="MatterStructs.jinja",
+                    output_file_name=output_name.format(
+                        cluster_name=cluster.name,
+                        struct_name=struct.name),
+                    vars={
+                        'cluster': cluster,
+                        'struct': struct,
+                        'typeLookup': TypeLookupContext(self.idl, cluster),
+                    }
+                )
+
+            for event in cluster.events:
+                if not event.fields:
+                    continue
+
+                output_name = "java/matter/devicecontroller/cluster/eventstructs/{cluster_name}Cluster{event_name}Event.kt"
+                self.internal_render_one_output(
+                    template_path="MatterEventStructs.jinja",
+                    output_file_name=output_name.format(
+                        cluster_name=cluster.name,
+                        event_name=event.name),
+                    vars={
+                        'cluster': cluster,
+                        'event': event,
+                        'typeLookup': TypeLookupContext(self.idl, cluster),
+                    }
+                )
diff --git a/scripts/py_matter_idl/matter_idl/generators/types.py b/scripts/py_matter_idl/matter_idl/generators/type_definitions.py
similarity index 100%
rename from scripts/py_matter_idl/matter_idl/generators/types.py
rename to scripts/py_matter_idl/matter_idl/generators/type_definitions.py
diff --git a/scripts/py_matter_idl/matter_idl/lint/lint_rules_grammar.lark b/scripts/py_matter_idl/matter_idl/lint/lint_rules_grammar.lark
index 90cfd6e8d441f7..63ffd17cd1c263 100644
--- a/scripts/py_matter_idl/matter_idl/lint/lint_rules_grammar.lark
+++ b/scripts/py_matter_idl/matter_idl/lint/lint_rules_grammar.lark
@@ -4,25 +4,33 @@ instruction: load_xml|all_endpoint_rule|specific_endpoint_rule
 
 load_xml: "load" ESCAPED_STRING ";"
 
-all_endpoint_rule: "all" "endpoints" "{" required_global_attribute* "}"
+all_endpoint_rule: "all" "endpoints" "{" (required_global_attribute|denylist_cluster_attribute)* "}"
 
 specific_endpoint_rule: "endpoint" integer "{" (required_server_cluster|rejected_server_cluster)* "}"
 
 required_global_attribute: "require" "global" "attribute" id "=" integer ";"
 
-required_server_cluster: "require" "server" "cluster" (id|POSITIVE_INTEGER|HEX_INTEGER) ";"
+required_server_cluster: "require" "server" "cluster" id_or_number ";"
 
-rejected_server_cluster: "reject" "server" "cluster" (id|POSITIVE_INTEGER|HEX_INTEGER) ";"
+rejected_server_cluster: "reject" "server" "cluster" id_or_number ";"
+
+// Allows deny like:
+//   deny cluster 234;                              // Deny an entire cluster
+//   deny cluster DescriptorCluster attribute 123;  // attribute deny (mix name and number)
+//   deny cluster 11 attribute 22;                  // attribute deny
+denylist_cluster_attribute: "deny" "cluster" id_or_number ["attribute" id_or_number] ";"
 
 integer: positive_integer | negative_integer
 
+?id_or_number: (id|positive_integer)
+
 positive_integer: POSITIVE_INTEGER | HEX_INTEGER
 negative_integer: "-" positive_integer
 
 id: ID
 
-POSITIVE_INTEGER: /\d+/ 
-HEX_INTEGER: /0x[A-Fa-f0-9]+/ 
+POSITIVE_INTEGER: /\d+/
+HEX_INTEGER: /0x[A-Fa-f0-9]+/
 ID: /[a-zA-Z_][a-zA-Z0-9_]*/
 
 %import common.ESCAPED_STRING
diff --git a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py
index 9499e360399230..3f9745850f6ca5 100755
--- a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py
+++ b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py
@@ -11,15 +11,15 @@
 from lark.visitors import Discard, Transformer, v_args
 
 try:
-    from .types import (AttributeRequirement, ClusterCommandRequirement, ClusterRequirement, ClusterValidationRule,
-                        RequiredAttributesRule, RequiredCommandsRule)
+    from matter_idl.lint.type_definitions import AttributeRequirement
 except ImportError:
     import sys
-
     sys.path.append(os.path.join(os.path.abspath(
         os.path.dirname(__file__)), "..", ".."))
-    from matter_idl.lint.types import (AttributeRequirement, ClusterCommandRequirement, ClusterRequirement, ClusterValidationRule,
-                                       RequiredAttributesRule, RequiredCommandsRule)
+    from matter_idl.lint.type_definitions import AttributeRequirement
+
+from matter_idl.lint.type_definitions import (ClusterAttributeDeny, ClusterCommandRequirement, ClusterRequirement,
+                                              ClusterValidationRule, RequiredAttributesRule, RequiredCommandsRule)
 
 
 class ElementNotFoundError(Exception):
@@ -167,6 +167,9 @@ def GetLinterRules(self):
     def RequireAttribute(self, r: AttributeRequirement):
         self._required_attributes_rule.RequireAttribute(r)
 
+    def Deny(self, what: ClusterAttributeDeny):
+        self._required_attributes_rule.Deny(what)
+
     def FindClusterCode(self, name: str) -> Optional[Tuple[str, int]]:
         if name not in self._cluster_codes:
             # Name may be a number. If this can be parsed as a number, accept it anyway
@@ -281,9 +284,14 @@ def start(self, instructions):
     def instruction(self, instruction):
         return Discard
 
-    def all_endpoint_rule(self, attributes):
-        for attribute in attributes:
-            self.context.RequireAttribute(attribute)
+    def all_endpoint_rule(self, rules: List[Union[AttributeRequirement, ClusterAttributeDeny]]):
+        for rule in rules:
+            if type(rule) is AttributeRequirement:
+                self.context.RequireAttribute(rule)
+            elif type(rule) is ClusterAttributeDeny:
+                self.context.Deny(rule)
+            else:
+                raise Exception("Unkown endpoint requirement: %r" % rule)
 
         return Discard
 
@@ -320,6 +328,10 @@ def required_server_cluster(self, id):
     def rejected_server_cluster(self, id):
         return ServerClusterRequirement(ClusterActionEnum.REJECT, id)
 
+    @v_args(inline=True)
+    def denylist_cluster_attribute(self, cluster_id, attribute_id):
+        return ClusterAttributeDeny(cluster_id, attribute_id)
+
 
 class Parser:
     def __init__(self, parser, file_name: str):
@@ -337,7 +349,7 @@ def CreateParser(file_name: str):
     Generates a parser that will process a ".matter" file into a IDL
     """
     return Parser(
-        Lark.open('lint_rules_grammar.lark', rel_to=__file__, parser='lalr', propagate_positions=True), file_name=file_name)
+        Lark.open('lint_rules_grammar.lark', rel_to=__file__, parser='lalr', propagate_positions=True, maybe_placeholders=True), file_name=file_name)
 
 
 if __name__ == '__main__':
diff --git a/scripts/py_matter_idl/matter_idl/lint/types.py b/scripts/py_matter_idl/matter_idl/lint/type_definitions.py
similarity index 86%
rename from scripts/py_matter_idl/matter_idl/lint/types.py
rename to scripts/py_matter_idl/matter_idl/lint/type_definitions.py
index 1b148ac430c47a..3fdbf3d2eb1ee2 100644
--- a/scripts/py_matter_idl/matter_idl/lint/types.py
+++ b/scripts/py_matter_idl/matter_idl/lint/type_definitions.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Project CHIP Authors
+# Copyright (c) 2022-2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from typing import List, MutableMapping, Optional
+from typing import List, MutableMapping, Optional, Union
 
 from matter_idl.matter_idl_types import ClusterSide, Idl, ParseMetaData
 
@@ -75,6 +75,12 @@ class AttributeRequirement:
     filter_cluster: Optional[int] = field(default=None)
 
 
+@dataclass
+class ClusterAttributeDeny:
+    cluster_id: Union[str, int]
+    attribute_id: Union[str, int]
+
+
 @dataclass
 class ClusterRequirement:
     endpoint_id: int
@@ -202,6 +208,7 @@ class RequiredAttributesRule(ErrorAccumulatingRule):
     def __init__(self, name):
         super().__init__(name)
         self._mandatory_attributes: List[AttributeRequirement] = []
+        self._deny_attributes: List[ClusterAttributeDeny] = []
 
     def __repr__(self):
         result = "RequiredAttributesRule{\n"
@@ -211,6 +218,11 @@ def __repr__(self):
             for attr in self._mandatory_attributes:
                 result += "    - %r\n" % attr
 
+        if self._deny_attributes:
+            result += "  deny_attributes:\n"
+            for attr in self._deny_attributes:
+                result += "    - %r\n" % attr
+
         result += "}"
         return result
 
@@ -218,6 +230,10 @@ def RequireAttribute(self, attr: AttributeRequirement):
         """Mark an attribute required"""
         self._mandatory_attributes.append(attr)
 
+    def Deny(self, what: ClusterAttributeDeny):
+        """Mark a cluster (or cluster/attribute) as denied"""
+        self._deny_attributes.append(what)
+
     def _ServerClusterDefinition(self, name: str, location: Optional[LocationInFile]):
         """Finds the server cluster definition with the given name.
 
@@ -275,7 +291,7 @@ def _LintImpl(self):
 
                     attribute_codes.add(name_to_code_map[attr.name])
 
-                # Linting codes now
+                # Linting required attributes
                 for check in self._mandatory_attributes:
                     if check.filter_cluster is not None and check.filter_cluster != cluster_definition.code:
                         continue
@@ -286,6 +302,27 @@ def _LintImpl(self):
                                             check.name, check.code),
                                            self._ParseLocation(cluster.parse_meta))
 
+                # Lint rejected attributes
+                for check in self._deny_attributes:
+                    if check.cluster_id not in [cluster_definition.name, cluster_definition.code]:
+                        continue  # different cluster
+
+                    if check.attribute_id is None:
+                        self._AddLintError(
+                            f"EP{endpoint.number}: cluster {cluster_definition.name}({cluster_definition.code}) is DENIED!",
+                            self._ParseLocation(cluster.parse_meta))
+                        continue
+
+                    # figure out every attribute that may be denied
+                    # We already know every attribute name and have codes
+                    for attr in cluster.attributes:
+                        if check.attribute_id in [attr.name, name_to_code_map[attr.name]]:
+                            cluster_str = f"{cluster_definition.name}({cluster_definition.code})"
+                            attribute_str = f"{attr.name}({name_to_code_map[attr.name]})"
+                            self._AddLintError(
+                                f"EP{endpoint.number}: attribute {cluster_str}::{attribute_str} is DENIED!",
+                                self._ParseLocation(cluster.parse_meta))
+
 
 @dataclass
 class ClusterCommandRequirement:
diff --git a/scripts/py_matter_idl/matter_idl/matter_grammar.lark b/scripts/py_matter_idl/matter_idl/matter_grammar.lark
index 35581dca4e6ea6..f498ce4f484fc2 100644
--- a/scripts/py_matter_idl/matter_idl/matter_grammar.lark
+++ b/scripts/py_matter_idl/matter_idl/matter_grammar.lark
@@ -61,11 +61,14 @@ command_with_access: "command"i command_access? id
 
 command: command_qualities command_with_access "(" id? ")" ":" id "=" positive_integer ";"
 
-cluster: [maturity] cluster_side "cluster"i id "=" positive_integer "{" cluster_content* "}"
+cluster_revision: "revision"i positive_integer ";"
+
+cluster: [maturity] cluster_side "cluster"i id "=" positive_integer "{" [cluster_revision] cluster_content* "}"
 ?cluster_side: "server"i -> server_cluster
              | "client"i -> client_cluster
 ?cluster_content: [maturity] (enum|bitmap|event|attribute|struct|request_struct|response_struct|command)
 
+
 endpoint: "endpoint"i positive_integer "{" endpoint_content* "}"
 ?endpoint_content: endpoint_cluster_binding | endpoint_server_cluster | endpoint_device_type
 
diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
index ba909cb8fd24a8..967eb6ecc19a37 100755
--- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
+++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
@@ -343,6 +343,10 @@ def event_with_access(self, args):
 
         return init_args
 
+    @v_args(inline=True)
+    def cluster_revision(self, revision):
+        return revision
+
     def event(self, args):
         return Event(qualities=args[0], priority=args[1], code=args[3], fields=args[4:], **args[2])
 
@@ -485,7 +489,7 @@ def cluster_content(self, api_maturity, element):
         return element
 
     @v_args(inline=True, meta=True)
-    def cluster(self, meta, api_maturity, side, name, code, *content):
+    def cluster(self, meta, api_maturity, side, name, code, revision, *content):
         meta = None if self.skip_meta else ParseMetaData(meta)
 
         # shift actual starting position where the doc comment would start
@@ -495,8 +499,11 @@ def cluster(self, meta, api_maturity, side, name, code, *content):
         if api_maturity is None:
             api_maturity = ApiMaturity.STABLE
 
+        if not revision:
+            revision = 1
+
         result = Cluster(parse_meta=meta, side=side, name=name,
-                         code=code, api_maturity=api_maturity)
+                         code=code, revision=revision, api_maturity=api_maturity)
 
         for item in content:
             if isinstance(item, Enum):
diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_types.py b/scripts/py_matter_idl/matter_idl/matter_idl_types.py
index 2067cc4c58dab6..4be2ff20b85880 100644
--- a/scripts/py_matter_idl/matter_idl/matter_idl_types.py
+++ b/scripts/py_matter_idl/matter_idl/matter_idl_types.py
@@ -232,6 +232,7 @@ class Cluster:
     side: ClusterSide
     name: str
     code: int
+    revision: int = 1
     enums: List[Enum] = field(default_factory=list)
     bitmaps: List[Bitmap] = field(default_factory=list)
     events: List[Event] = field(default_factory=list)
diff --git a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py
index 6117f35e9f1ad2..06418f894ffcd6 100755
--- a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py
+++ b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py
@@ -214,15 +214,13 @@ def testClusterDerivation(self):
                   ModeTagStruct modeTags[] = 2;
                }
 
+               readonly attribute ModeOptionStruct supportedModes[] = 0;
                readonly attribute attrib_id attributeList[] = 65531;
                readonly attribute event_id eventList[] = 65530;
                readonly attribute command_id acceptedCommandList[] = 65529;
                readonly attribute command_id generatedCommandList[] = 65528;
                readonly attribute bitmap32 featureMap = 65532;
                readonly attribute int16u clusterRevision = 65533;
-
-               // baseline inserted after, so to pass the test add this at the end
-               readonly attribute ModeOptionStruct supportedModes[] = 0;
            }
         ''')
 
diff --git a/scripts/py_matter_idl/matter_idl/test_idl_generator.py b/scripts/py_matter_idl/matter_idl/test_idl_generator.py
index ea1347fb0e7d4c..9f40b111bff96f 100755
--- a/scripts/py_matter_idl/matter_idl/test_idl_generator.py
+++ b/scripts/py_matter_idl/matter_idl/test_idl_generator.py
@@ -17,7 +17,8 @@
 import os
 import sys
 import unittest
-from typing import Optional
+from difflib import unified_diff
+from typing import List, Optional
 
 try:
     from matter_idl.matter_idl_parser import CreateParser
@@ -43,11 +44,12 @@ def get_existing_data(self, relative_path: str):
 
     def write_new_data(self, relative_path: str, content: str):
         if self.content:
-            raise Exception("Unexpected extra data: single file generation expected")
+            raise Exception(
+                "Unexpected extra data: single file generation expected")
         self.content = content
 
 
-def ReadMatterIdl(repo_path: str) -> Idl:
+def ReadMatterIdl(repo_path: str) -> str:
     path = os.path.join(os.path.dirname(__file__), "../../..", repo_path)
     with open(path, "rt") as stream:
         return stream.read()
@@ -60,19 +62,38 @@ def ParseMatterIdl(repo_path: str, skip_meta: bool) -> Idl:
 def RenderAsIdlTxt(idl: Idl) -> str:
     storage = TestCaseStorage()
     IdlGenerator(storage=storage, idl=idl).render(dry_run=False)
-    return storage.content
+    return storage.content or ""
 
 
-def SkipLeadingComments(txt: str) -> str:
+def SkipLeadingComments(txt: str, also_strip: List[str] = list()) -> str:
     """Skips leading lines starting with // in a file. """
     lines = txt.split("\n")
     idx = 0
     while lines[idx].startswith("//") or not lines[idx]:
         idx = idx + 1
-    return "\n".join(lines[idx:])
+
+    result = "\n".join(lines[idx:])
+
+    for s in also_strip:
+        result = result.replace(s, "")
+
+    return result
 
 
 class TestIdlRendering(unittest.TestCase):
+    def assertTextEqual(self, a: str, b: str):
+        if a == b:
+            # seems the same. This will just pass
+            self.assertEqual(a, b)
+            return
+
+        delta = unified_diff(a.splitlines(keepends=True),
+                             b.splitlines(keepends=True),
+                             fromfile='actual.matter',
+                             tofile='expected.matter',
+                             )
+        self.assertEqual(a, b, '\n' + ''.join(delta))
+
     def test_client_clusters(self):
         # IDL renderer was updated to have IDENTICAL output for client side
         # cluster rendering, so this diff will be verbatim
@@ -83,10 +104,12 @@ def test_client_clusters(self):
         path = "src/controller/data_model/controller-clusters.matter"
 
         # Files MUST be identical except the header comments which are different
-        original = SkipLeadingComments(ReadMatterIdl(path))
-        generated = SkipLeadingComments(RenderAsIdlTxt(ParseMatterIdl(path, skip_meta=False)))
+        original = SkipLeadingComments(ReadMatterIdl(path), also_strip=[
+                                       " // NOTE: Default/not specifically set"])
+        generated = SkipLeadingComments(RenderAsIdlTxt(
+            ParseMatterIdl(path, skip_meta=False)))
 
-        self.assertEqual(original, generated)
+        self.assertTextEqual(original, generated)
 
     def test_app_rendering(self):
         # When endpoints are involved, default value formatting is lost
diff --git a/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py
index 3196f191e19805..c94fcb299c78fd 100755
--- a/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py
+++ b/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py
@@ -774,6 +774,22 @@ def test_emits_events(self):
 
         self.assertEqual(actual, expected)
 
+    def test_revision(self):
+        actual = parseText("""
+            server cluster A = 1 { } // revision 1 implied
+            client cluster B = 2 { revision 1; }
+            client cluster C = 3 { revision 2; }
+            client cluster D = 4 { revision 123; }
+        """)
+
+        expected = Idl(clusters=[
+            Cluster(side=ClusterSide.SERVER, name="A", code=1, revision=1),
+            Cluster(side=ClusterSide.CLIENT, name="B", code=2, revision=1),
+            Cluster(side=ClusterSide.CLIENT, name="C", code=3, revision=2),
+            Cluster(side=ClusterSide.CLIENT, name="D", code=4, revision=123),
+        ])
+        self.assertEqual(actual, expected)
+
     def test_handle_commands(self):
         actual = parseText("""
             endpoint 1 {
diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter
index 11593ca49c55d9..6c1204d2f42b13 100644
--- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter
+++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter
@@ -3105,7 +3105,7 @@ server cluster WakeOnLan = 1283 {
 }
 
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum StatusEnum : ENUM8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
@@ -3250,7 +3250,7 @@ server cluster LowPower = 1288 {
 }
 
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CECKeyCodeEnum : ENUM8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -3355,7 +3355,7 @@ server cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
@@ -3398,7 +3398,7 @@ server cluster ContentLauncher = 1290 {
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedProtocolsBitmap : BITMAP32 {
     kDash = 0x1;
     kHls = 0x2;
   }
@@ -3472,7 +3472,7 @@ server cluster AudioOutput = 1291 {
 }
 
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum StatusEnum : ENUM8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipClusters.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipClusters.java
index 1523980cb4d985..94d8415d01ccee 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipClusters.java
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipClusters.java
@@ -17,68 +17,84 @@
 
 package chip.devicecontroller;
 
+import chip.devicecontroller.model.AttributeState;
+import chip.devicecontroller.model.AttributeWriteRequest;
+import chip.devicecontroller.model.ChipAttributePath;
+import chip.devicecontroller.model.ChipEventPath;
+import chip.devicecontroller.model.ClusterState;
+import chip.devicecontroller.model.EndpointState;
+import chip.devicecontroller.model.InvokeElement;
+import chip.devicecontroller.model.NodeState;
+
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipClusters {
 
-  public interface DefaultClusterCallback {
+  public interface BaseClusterCallback {
+    void onError(Exception error);
+  }
+
+  public interface DefaultClusterCallback extends BaseClusterCallback {
     void onSuccess();
+  }
+
+  public interface BaseAttributeCallback {
     void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface CharStringAttributeCallback {
+  public interface CharStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for a CHAR_STRING attribute. */
     void onSuccess(String value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface OctetStringAttributeCallback {
+  public interface OctetStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for an OCTET_STRING attribute. */
     void onSuccess(byte[] value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface IntegerAttributeCallback {
+  public interface IntegerAttributeCallback extends BaseAttributeCallback {
     void onSuccess(int value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface LongAttributeCallback {
+  public interface LongAttributeCallback extends BaseAttributeCallback {
     void onSuccess(long value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface BooleanAttributeCallback {
+  public interface BooleanAttributeCallback extends BaseAttributeCallback {
     void onSuccess(boolean value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface FloatAttributeCallback {
+  public interface FloatAttributeCallback extends BaseAttributeCallback {
     void onSuccess(float value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface DoubleAttributeCallback {
+  public interface DoubleAttributeCallback extends BaseAttributeCallback {
     void onSuccess(double value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
   public static abstract class BaseChipCluster {
     protected long chipClusterPtr;
 
-    public BaseChipCluster(long devicePtr, int endpointId) {
-      chipClusterPtr = initWithDevice(devicePtr, endpointId);
+    protected long devicePtr;
+    protected int endpointId;
+    protected long clusterId;
+
+    private Optional<Long> timeoutMillis = Optional.empty();
+
+    public BaseChipCluster(long devicePtr, int endpointId, long clusterId) {
+      this.devicePtr = devicePtr;
+      this.endpointId = endpointId;
+      this.clusterId = clusterId;
     }
 
     /**
@@ -87,22 +103,64 @@ public BaseChipCluster(long devicePtr, int endpointId) {
      * empty optional, the default timeout will be used.
      */
     public void setCommandTimeout(Optional<Long> timeoutMillis) {
-      setCommandTimeout(chipClusterPtr, timeoutMillis);
+      this.timeoutMillis = timeoutMillis;
     }
 
-    private native void setCommandTimeout(long clusterPtr, Optional<Long> timeoutMillis);
-
     /** Returns the current timeout (in milliseconds) for commands sent through this cluster. */
     public Optional<Long> getCommandTimeout() {
-      Optional<Long> timeout = getCommandTimeout(chipClusterPtr);
-      return timeout == null ? Optional.empty() : timeout;
+      return timeoutMillis == null ? Optional.empty() : timeoutMillis;
     }
 
-    private native Optional<Long> getCommandTimeout(long clusterPtr);
-
+    @Deprecated
     public abstract long initWithDevice(long devicePtr, int endpointId);
 
-    public native void deleteCluster(long chipClusterPtr);
+    protected void readAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        boolean isFabricFiltered) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(null, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.read(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, isFabricFiltered, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void writeAttribute(
+        WriteAttributesCallbackImpl callback,
+        long attributeId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      WriteAttributesCallbackJni jniCallback = new WriteAttributesCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      AttributeWriteRequest writeRequest = AttributeWriteRequest.newInstance(endpointId, clusterId, attributeId, tlv);
+      ChipDeviceController.write(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(writeRequest), timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    protected void subscribeAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        int minInterval,
+        int maxInterval) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(callback, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.subscribe(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, minInterval, maxInterval, false, true, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void invoke(
+        InvokeCallbackImpl callback,
+        long commandId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      InvokeCallbackJni jniCallback = new InvokeCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      InvokeElement element = InvokeElement.newInstance(endpointId, clusterId, commandId, tlv, null);
+      ChipDeviceController.invoke(0, jniCallback.getCallbackHandle(), devicePtr, element, timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    private static native byte[] encodeToTlv(BaseTLVType value);
+
+    static native BaseTLVType decodeFromTlv(byte[] tlv);
+
+    @Deprecated
+    public void deleteCluster(long chipClusterPtr) {}
     
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
@@ -115,148 +173,323 @@ protected void finalize() throws Throwable {
     }
   }
 
+  abstract static class ReportCallbackImpl implements ReportCallback, SubscriptionEstablishedCallback {
+    private BaseAttributeCallback callback;
+    private ChipAttributePath path;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_ATTRIBUTE = 0x86;
+
+    ReportCallbackImpl(BaseAttributeCallback callback, ChipAttributePath path) {
+      this.callback = callback;
+      this.path = path;
+    }
+
+    @Override
+    public void onError(
+        @Nullable ChipAttributePath attributePath,
+        @Nullable ChipEventPath eventPath,
+        @Nonnull Exception e) {
+      callback.onError(e);
+    }
+
+    @Override
+    public void onReport(NodeState nodeState) {
+      if (nodeState == null) {
+        callback.onError(new ChipClusterException());
+        return;
+      }
+
+      EndpointState endpointState = nodeState.getEndpointState((int)path.getEndpointId().getId());
+      if (endpointState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      ClusterState clusterState = endpointState.getClusterState(path.getClusterId().getId());
+      if (clusterState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      AttributeState attributeState = clusterState.getAttributeState(path.getAttributeId().getId());
+      if (attributeState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      byte[] tlv = attributeState.getTlv();
+      if (tlv == null) {
+          callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+          return;
+      }
+
+      onSuccess(tlv);
+    }
+
+    @Override
+    public void onSubscriptionEstablished(long subscriptionId) {
+      callback.onSubscriptionEstablished(subscriptionId);
+    }
+
+    public abstract void onSuccess(byte[] tlv);
+  }
+
+  static class WriteAttributesCallbackImpl implements WriteAttributesCallback {
+    private DefaultClusterCallback callback;
+
+    WriteAttributesCallbackImpl(DefaultClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onResponse(ChipAttributePath attributePath) {
+      callback.onSuccess();
+    }
+
+    @Override
+    public void onError(@Nullable ChipAttributePath attributePath, Exception e) {
+      callback.onError(e);
+    }
+  }
+
+  abstract static class InvokeCallbackImpl implements InvokeCallback {
+    private BaseClusterCallback callback;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_COMMAND = 0x81;
+
+    InvokeCallbackImpl(BaseClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    public void onError(Exception e) {
+      callback.onError(e);
+    }
+
+    public void onResponse(InvokeElement invokeElement, long successCode) {
+      byte[] tlv = invokeElement.getTlvByteArray();
+      if (tlv == null) {
+        onResponse(null);
+        return;
+      }
+      BaseTLVType value = BaseChipCluster.decodeFromTlv(tlv);
+      if (value == null || value.type() != TLVType.Struct) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_COMMAND));
+        return;
+      }
+      onResponse((StructType)value);
+    }
+
+    public abstract void onResponse(StructType value);
+  }
+
   public static class FirstCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1L;
 
+    private static final long SOME_INTEGER_ATTRIBUTE_ID = 1L;
+
     public FirstCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void readSomeIntegerAttribute(
         IntegerAttributeCallback callback) {
-        readSomeIntegerAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_INTEGER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOME_INTEGER_ATTRIBUTE_ID, true);
     }
 
     public void writeSomeIntegerAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSomeIntegerAttribute(chipClusterPtr, callback, value, null);
+      writeSomeIntegerAttribute(callback, value, 0);
     }
 
     public void writeSomeIntegerAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSomeIntegerAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SOME_INTEGER_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSomeIntegerAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSomeIntegerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_INTEGER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOME_INTEGER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
-
-    private native void readSomeIntegerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeSomeIntegerAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSomeIntegerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
   public static class SecondCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 2L;
 
+    private static final long FABRICS_ATTRIBUTE_ID = 0L;
+    private static final long SOME_BYTES_ATTRIBUTE_ID = 123L;
+
     public SecondCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface FabricsAttributeCallback {
+    public interface FabricsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.SecondClusterFabricDescriptorStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readFabricsAttribute(
         FabricsAttributeCallback callback) {
-        readFabricsAttribute(chipClusterPtr, callback, true);
+      readFabricsAttributeWithFabricFilter(callback, true);
     }
 
     public void readFabricsAttributeWithFabricFilter(
         FabricsAttributeCallback callback, boolean isFabricFiltered) {
-        readFabricsAttribute(chipClusterPtr, callback, isFabricFiltered);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRICS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.SecondClusterFabricDescriptorStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FABRICS_ATTRIBUTE_ID, isFabricFiltered);
     }
 
-
     public void subscribeFabricsAttribute(
         FabricsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRICS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.SecondClusterFabricDescriptorStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FABRICS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSomeBytesAttribute(
         OctetStringAttributeCallback callback) {
-        readSomeBytesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_BYTES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOME_BYTES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSomeBytesAttribute(
         OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSomeBytesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_BYTES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOME_BYTES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
-
-    private native void readFabricsAttribute(long chipClusterPtr, FabricsAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void subscribeFabricsAttribute(long chipClusterPtr, FabricsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSomeBytesAttribute(long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void subscribeSomeBytesAttribute(long chipClusterPtr, OctetStringAttributeCallback callback, int minInterval, int maxInterval);
   }
 
   public static class ThirdCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 3L;
 
+    private static final long SOME_ENUM_ATTRIBUTE_ID = 10L;
+    private static final long OPTIONS_ATTRIBUTE_ID = 20L;
+
     public ThirdCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void readSomeEnumAttribute(
         IntegerAttributeCallback callback) {
-        readSomeEnumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_ENUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOME_ENUM_ATTRIBUTE_ID, true);
     }
 
     public void writeSomeEnumAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSomeEnumAttribute(chipClusterPtr, callback, value, null);
+      writeSomeEnumAttribute(callback, value, 0);
     }
 
     public void writeSomeEnumAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSomeEnumAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SOME_ENUM_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSomeEnumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSomeEnumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOME_ENUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOME_ENUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOptionsAttribute(
         IntegerAttributeCallback callback) {
-        readOptionsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, true);
     }
 
     public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, null);
+      writeOptionsAttribute(callback, value, 0);
     }
 
     public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPTIONS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOptionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
-
-    private native void readSomeEnumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeSomeEnumAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSomeEnumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 }
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java
index 9124dfd27b2606..11814259543efe 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java
@@ -21,5 +21,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipEventStructs {
 }
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java
index 1ff18716d4c8ba..d3cf1f0c7dae79 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java
@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipStructs {
 public static class SecondClusterFabricDescriptorStruct {
   public byte[] rootPublicKey;
@@ -29,6 +31,13 @@ public static class SecondClusterFabricDescriptorStruct {
   public Long nodeID;
   public String label;
   public Integer fabricIndex;
+  private static final long ROOT_PUBLIC_KEY_ID = 1L;
+  private static final long VENDOR_I_D_ID = 2L;
+  private static final long FABRIC_I_D_ID = 3L;
+  private static final long NODE_I_D_ID = 4L;
+  private static final long LABEL_ID = 5L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public SecondClusterFabricDescriptorStruct(
     byte[] rootPublicKey,
     Integer vendorID,
@@ -45,6 +54,71 @@ public SecondClusterFabricDescriptorStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ROOT_PUBLIC_KEY_ID, new ByteArrayType(rootPublicKey)));
+    values.add(new StructElement(VENDOR_I_D_ID, new UIntType(vendorID)));
+    values.add(new StructElement(FABRIC_I_D_ID, new UIntType(fabricID)));
+    values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID)));
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static SecondClusterFabricDescriptorStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] rootPublicKey = null;
+    Integer vendorID = null;
+    Long fabricID = null;
+    Long nodeID = null;
+    String label = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ROOT_PUBLIC_KEY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          rootPublicKey = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == VENDOR_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          vendorID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SecondClusterFabricDescriptorStruct(
+      rootPublicKey,
+      vendorID,
+      fabricID,
+      nodeID,
+      label,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
diff --git a/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py
index e6620e0f01fdc6..5244e6574d8de1 100644
--- a/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py
+++ b/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py
@@ -14,7 +14,7 @@
 
 from typing import Optional
 
-from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType
+from matter_idl.generators.type_definitions import GetDataTypeSizeInBits, IsSignedDataType
 from matter_idl.matter_idl_types import AccessPrivilege, Attribute, AttributeQuality, DataType, Field, FieldQuality
 
 
diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py
index 6e9ab2a2e7224a..16f98bcf96d800 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/parser.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py
@@ -491,7 +491,7 @@ def _update_with_definition(self, container: dict, mapping_type):
                         # the the value type for the target field.
                         if is_typed_constraint(constraint):
                             value[key][constraint] = self._update_value_with_definition(
-                                constraint_value, mapping_type)
+                                constraint_value, mapping)
                 else:
                     # This key, value pair does not rely on cluster specifications.
                     pass
diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/discovery_commands.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/discovery_commands.py
index f7b9311dadb300..17fa4f31e96a48 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/discovery_commands.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/discovery_commands.py
@@ -74,6 +74,7 @@
         <arg name="mrpRetryIntervalIdle" type="int32u" optional="true"/>
         <arg name="mrpRetryIntervalActive" type="int32u" optional="true"/>
         <arg name="mrpRetryActiveThreshold" type="int16u" optional="true"/>
+        <arg name="isICDOperatingAsLIT" type="boolean" optional="true"/>
     </command>
 </cluster>
 </configurator>
diff --git a/scripts/py_matter_yamltests/matter_yamltests/runner.py b/scripts/py_matter_yamltests/matter_yamltests/runner.py
index a25183feb6a9a6..541a261a43b4b2 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/runner.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/runner.py
@@ -70,11 +70,15 @@ class TestRunnerConfig:
     hooks: A configurable set of hooks to be called at various steps while
            running. It may may allow the callers to gain insights about the
            current running state.
+
+    auto_start_stop: Indicates whether the run method should start and stop
+            the runner of if that will be handled outside of that method.
     """
     adapter: TestAdapter = None
     pseudo_clusters: PseudoClusters = PseudoClusters([])
     options: TestRunnerOptions = field(default_factory=TestRunnerOptions)
     hooks: TestRunnerHooks = TestRunnerHooks()
+    auto_start_stop: bool = True
 
 
 class TestRunnerBase(ABC):
@@ -109,7 +113,7 @@ async def execute(self, request):
         pass
 
     @abstractmethod
-    def run(self, config: TestRunnerConfig) -> bool:
+    def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: TestRunnerConfig) -> bool:
         """
         This method runs a test suite.
 
@@ -156,12 +160,14 @@ async def run(self, parser_builder_config: TestParserBuilderConfig, runner_confi
     async def _run_with_timeout(self, parser: TestParser, config: TestRunnerConfig):
         status = True
         try:
-            await self.start()
+            if config.auto_start_stop:
+                await self.start()
             status = await asyncio.wait_for(self._run(parser, config), parser.timeout)
         except (Exception, CancelledError) as exception:
             status = exception
         finally:
-            await self.stop()
+            if config.auto_start_stop:
+                await self.stop()
             return status
 
     async def _run(self, parser: TestParser, config: TestRunnerConfig):
diff --git a/scripts/py_matter_yamltests/matter_yamltests/websocket_runner.py b/scripts/py_matter_yamltests/matter_yamltests/websocket_runner.py
index c90c50d15a177f..c63554ecf064b0 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/websocket_runner.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/websocket_runner.py
@@ -46,6 +46,13 @@ def __init__(self, config: WebSocketRunnerConfig):
         self._server_startup_command = self._make_server_startup_command(
             config.server_path, config.server_arguments, config.server_port)
 
+    @property
+    def is_connected(self) -> bool:
+        if self._client is None:
+            return False
+
+        return self._client.state == websockets.protocol.State.OPEN
+
     async def start(self):
         self._server = await self._start_server(self._server_startup_command)
         self._client = await self._start_client(self._server_connection_url)
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index 3892736a0da7fa..55885086b0fa45 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -25,7 +25,10 @@ load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml";
@@ -39,6 +42,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml";
@@ -52,7 +56,9 @@ load "../src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml
 load "../src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml";
@@ -77,6 +83,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
@@ -103,6 +110,16 @@ all endpoints {
 
     require global attribute featureMap = 65532;
     require global attribute clusterRevision = 65533;
+
+    // Deny rules:
+    //   deny cluster Foo;  // denies entire cluster by name
+    //   deny cluster 123;  // denies entire cluster by id
+    //   deny cluster Foo attribute bar;  // denies specific attribute by name
+    //   deny cluster Foo attribute 123;  // denies specific attribute by id
+    //   deny cluster 234 attribute 567;  // Allows deny using ids only
+
+    // (previously AverageWearCount, see #30002/#29285 in GitHub)
+    deny cluster GeneralDiagnostics attribute 9;
 }
 
 endpoint 0 {
diff --git a/scripts/setup/bootstrap.sh b/scripts/setup/bootstrap.sh
index 57864b3b410e5e..1b813216222efe 100644
--- a/scripts/setup/bootstrap.sh
+++ b/scripts/setup/bootstrap.sh
@@ -66,7 +66,7 @@ _bootstrap_or_activate() {
     local _BOOTSTRAP_NAME="${_BOOTSTRAP_PATH##*/}"
     local _BOOTSTRAP_DIR="${_BOOTSTRAP_PATH%/*}"
     # Strip off the 'scripts[/setup]' directory, leaving the root of the repo.
-    _CHIP_ROOT="$(cd "${_BOOTSTRAP_DIR%/setup}/.." && pwd)"
+    _CHIP_ROOT="$(cd "${_BOOTSTRAP_DIR%/setup}/.." > /dev/null && pwd)"
 
     local _CONFIG_FILE="scripts/setup/environment.json"
 
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
index b9e8e18016cd31..691131f97e2109 100644
--- a/scripts/setup/zap.json
+++ b/scripts/setup/zap.json
@@ -8,13 +8,13 @@
                 "mac-amd64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2023.10.24-nightly.1"]
+            "tags": ["version:2@v2023.11.08-nightly.1"]
         },
         {
             "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
             "path": "fuchsia/third_party/zap/mac-amd64",
             "platforms": ["mac-arm64"],
-            "tags": ["version:2@v2023.10.24-nightly.1"]
+            "tags": ["version:2@v2023.11.08-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
index c26dc3f85a55d8..7bcbd806cdbdbd 100644
--- a/scripts/setup/zap.version
+++ b/scripts/setup/zap.version
@@ -1 +1 @@
-v2023.10.24-nightly
+v2023.11.08-nightly
diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py
index 1b3a767aa1c242..ab954f17a14fb7 100755
--- a/scripts/spec_xml/generate_spec_xml.py
+++ b/scripts/spec_xml/generate_spec_xml.py
@@ -16,6 +16,7 @@
 
 import glob
 import os
+import re
 import subprocess
 
 import click
@@ -24,6 +25,11 @@
 DEFAULT_OUTPUT_DIR = os.path.abspath(os.path.join(DEFAULT_CHIP_ROOT, 'data_model'))
 
 
+def get_xml_path(filename, output_dir):
+    xml = os.path.basename(filename).replace('.adoc', '.xml')
+    return os.path.abspath(os.path.join(output_dir, xml))
+
+
 @click.command()
 @click.option(
     '--scraper',
@@ -45,8 +51,14 @@
     is_flag=True,
     help='Flag for dry run')
 def main(scraper, spec_root, output_dir, dry_run):
-    # TODO: Add scrapers for device types
+    # Clusters need to be scraped first because the cluster directory is passed to the device type directory
+    scrape_clusters(scraper, spec_root, output_dir, dry_run)
+    scrape_device_types(scraper, spec_root, output_dir, dry_run)
+    if not dry_run:
+        dump_versions(scraper, spec_root, output_dir)
 
+
+def scrape_clusters(scraper, spec_root, output_dir, dry_run):
     src_dir = os.path.abspath(os.path.join(spec_root, 'src'))
     sdm_clusters_dir = os.path.abspath(os.path.join(src_dir, 'service_device_management'))
     app_clusters_dir = os.path.abspath(os.path.join(src_dir, 'app_clusters'))
@@ -54,7 +66,8 @@ def main(scraper, spec_root, output_dir, dry_run):
     media_clusters_dir = os.path.abspath(os.path.join(app_clusters_dir, 'media'))
     clusters_output_dir = os.path.abspath(os.path.join(output_dir, 'clusters'))
     dm_clusters_list = ['ACL-Cluster.adoc', 'Binding-Cluster.adoc', 'bridge-clusters.adoc',
-                        'Descriptor-Cluster.adoc', 'Group-Key-Management-Cluster.adoc', 'Label-Cluster.adoc']
+                        'Descriptor-Cluster.adoc', 'Group-Key-Management-Cluster.adoc', 'ICDManagement.adoc',
+                        'Label-Cluster.adoc']
     sdm_exclude_list = ['AdminAssistedCommissioningFlows.adoc', 'BulkDataExchange.adoc', 'CommissioningFlows.adoc',
                         'DeviceCommissioningFlows.adoc', 'DistributedComplianceLedger.adoc', 'OTAFileFormat.adoc']
     app_exclude_list = ['appliances.adoc', 'closures.adoc', 'general.adoc',
@@ -65,8 +78,7 @@ def main(scraper, spec_root, output_dir, dry_run):
         os.makedirs(clusters_output_dir)
 
     def scrape_cluster(filename: str) -> None:
-        xml = os.path.basename(filename).replace('.adoc', '.xml')
-        xml_path = os.path.abspath(os.path.join(clusters_output_dir, xml))
+        xml_path = get_xml_path(filename, clusters_output_dir)
         cmd = [scraper, 'cluster', filename, xml_path, '-nd']
         if dry_run:
             print(cmd)
@@ -86,13 +98,44 @@ def scrape_all_clusters(dir: str, exclude_list: list[str] = []) -> None:
         filename = f'{dm_clusters_dir}/{f}'
         scrape_cluster(filename)
 
-    # Put the current spec sha into the cluster dir
+
+def scrape_device_types(scraper, spec_root, output_dir, dry_run):
+    device_type_dir = os.path.abspath(os.path.join(spec_root, 'src', 'device_types'))
+    device_types_output_dir = os.path.abspath(os.path.join(output_dir, 'device_types'))
+    clusters_output_dir = os.path.abspath(os.path.join(output_dir, 'clusters'))
+
+    if not os.path.exists(device_types_output_dir):
+        os.makedirs(device_types_output_dir)
+
+    def scrape_device_type(filename: str) -> None:
+        xml_path = get_xml_path(filename, device_types_output_dir)
+        cmd = [scraper, 'devicetype', '-c', clusters_output_dir, '-nd', filename, xml_path]
+        if dry_run:
+            print(cmd)
+        else:
+            print(' '.join(cmd))
+            subprocess.run(cmd)
+
+    exclude_list = [r"section_*"]
+    for filename in glob.glob(f'{device_type_dir}/*.adoc'):
+        for exclude in exclude_list:
+            if not re.match(exclude, os.path.basename(filename)):
+                scrape_device_type(filename)
+
+
+def dump_versions(scraper, spec_root, output_dir):
     sha_file = os.path.abspath(os.path.join(output_dir, 'spec_sha'))
     out = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True, encoding="utf8", cwd=spec_root)
     sha = out.stdout
     with open(sha_file, 'wt', encoding='utf8') as output:
         output.write(sha)
 
+    scraper_file = os.path.abspath(os.path.join(output_dir, 'scraper_version'))
+    out = subprocess.run([scraper, '--version'], capture_output=True, encoding="utf8")
+    version = out.stdout
+    with open(scraper_file, "wt", encoding='utf8') as output:
+        output.write(version)
+
 
 if __name__ == '__main__':
     main()
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index b665402846255f..0ecd9313e27e91 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -188,6 +188,8 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
         "Test_TC_RVCRUNM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_RVCCLEANM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_TCCM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
+        "Test_TC_TCCM_3_2.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
+        "Test_TC_TCCM_3_3.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_TCTL_2_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         # chip-repl and chip-tool disagree on what the YAML here should look like: https://github.com/project-chip/connectedhomeip/issues/29110
         "TestClusterMultiFabric.yaml",
@@ -233,6 +235,8 @@ def target_for_name(name: str):
         return TestTarget.OTA
     if name.startswith("Test_TC_BRBINFO_") or name.startswith("Test_TC_ACT_"):
         return TestTarget.BRIDGE
+    if name.startswith("TestIcd") or name.startswith("Test_TC_ICDM_"):
+        return TestTarget.LIT_ICD
     return TestTarget.ALL_CLUSTERS
 
 
diff --git a/scripts/tests/chiptest/linux.py b/scripts/tests/chiptest/linux.py
index 73bbb93ca45050..9668e566671b3d 100644
--- a/scripts/tests/chiptest/linux.py
+++ b/scripts/tests/chiptest/linux.py
@@ -181,6 +181,7 @@ def PathsWithNetworkNamespaces(paths: ApplicationPaths) -> ApplicationPaths:
         ota_provider_app='ip netns exec app'.split() + paths.ota_provider_app,
         ota_requestor_app='ip netns exec app'.split() + paths.ota_requestor_app,
         tv_app='ip netns exec app'.split() + paths.tv_app,
+        lit_icd_app='ip netns exec app'.split() + paths.lit_icd_app,
         bridge_app='ip netns exec app'.split() + paths.bridge_app,
         chip_repl_yaml_tester_cmd='ip netns exec tool'.split() + paths.chip_repl_yaml_tester_cmd,
         chip_tool_with_python_cmd='ip netns exec tool'.split() + paths.chip_tool_with_python_cmd,
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
index b52e3ed9e03cae..bae92baff5d001 100644
--- a/scripts/tests/chiptest/test_definition.py
+++ b/scripts/tests/chiptest/test_definition.py
@@ -160,6 +160,7 @@ class TestTarget(Enum):
     LOCK = auto()
     OTA = auto()
     BRIDGE = auto()
+    LIT_ICD = auto()
 
 
 @dataclass
@@ -171,12 +172,13 @@ class ApplicationPaths:
     ota_requestor_app: typing.List[str]
     tv_app: typing.List[str]
     bridge_app: typing.List[str]
+    lit_icd_app: typing.List[str]
     chip_repl_yaml_tester_cmd: typing.List[str]
     chip_tool_with_python_cmd: typing.List[str]
 
     def items(self):
         return [self.chip_tool, self.all_clusters_app, self.lock_app, self.ota_provider_app, self.ota_requestor_app,
-                self.tv_app, self.bridge_app, self.chip_repl_yaml_tester_cmd, self.chip_tool_with_python_cmd]
+                self.tv_app, self.bridge_app, self.lit_icd_app, self.chip_repl_yaml_tester_cmd, self.chip_tool_with_python_cmd]
 
 
 @dataclass
@@ -284,6 +286,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str,
                 target_app = paths.ota_requestor_app
             elif self.target == TestTarget.BRIDGE:
                 target_app = paths.bridge_app
+            elif self.target == TestTarget.LIT_ICD:
+                target_app = paths.lit_icd_app
             else:
                 raise Exception("Unknown test target - "
                                 "don't know which application to run")
diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py
index 1bf166c7e72bf5..03773e4fb88f84 100755
--- a/scripts/tests/run_test_suite.py
+++ b/scripts/tests/run_test_suite.py
@@ -251,6 +251,9 @@ def cmd_list(context):
 @click.option(
     '--bridge-app',
     help='what bridge app to use')
+@click.option(
+    '--lit-icd-app',
+    help='what lit-icd app to use')
 @click.option(
     '--chip-repl-yaml-tester',
     help='what python script to use for running yaml tests using chip-repl as controller')
@@ -282,7 +285,7 @@ def cmd_list(context):
     help='Number of tests that are expected to fail in each iteration.  Overall test will pass if the number of failures matches this.  Nonzero values require --keep-going')
 @click.pass_context
 def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, ota_requestor_app,
-            tv_app, bridge_app, chip_repl_yaml_tester, chip_tool_with_python, pics_file, keep_going, test_timeout_seconds, expected_failures):
+            tv_app, bridge_app, lit_icd_app, chip_repl_yaml_tester, chip_tool_with_python, pics_file, keep_going, test_timeout_seconds, expected_failures):
     if expected_failures != 0 and not keep_going:
         logging.exception(f"'--expected-failures {expected_failures}' used without '--keep-going'")
         sys.exit(2)
@@ -309,6 +312,9 @@ def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, o
     if bridge_app is None:
         bridge_app = paths_finder.get('chip-bridge-app')
 
+    if lit_icd_app is None:
+        lit_icd_app = paths_finder.get('lit-icd-app')
+
     if chip_repl_yaml_tester is None:
         chip_repl_yaml_tester = paths_finder.get('yamltest_with_chip_repl_tester.py')
 
@@ -327,6 +333,7 @@ def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, o
         ota_requestor_app=[ota_requestor_app],
         tv_app=[tv_app],
         bridge_app=[bridge_app],
+        lit_icd_app=[lit_icd_app],
         chip_repl_yaml_tester_cmd=['python3'] + [chip_repl_yaml_tester],
         chip_tool_with_python_cmd=['python3'] + [chip_tool_with_python],
     )
diff --git a/scripts/tests/yaml/chiptool.py b/scripts/tests/yaml/chiptool.py
index f3a08aa8156d1a..99fc1d38a60a0a 100755
--- a/scripts/tests/yaml/chiptool.py
+++ b/scripts/tests/yaml/chiptool.py
@@ -19,9 +19,11 @@
 import sys
 from typing import List
 
+import chiptest
 import click
 from paths_finder import PathsFinder
 from runner import CONTEXT_SETTINGS, chiptool
+from tests_finder import TestsFinder
 from tests_tool import send_raw_command, send_yaml_command
 
 _DEFAULT_EXTENSIONS_DIR = 'scripts/tests/yaml/extensions'
@@ -31,11 +33,11 @@
 
 def chiptool_runner_options(f):
     f = click.option('--server_path', type=click.Path(exists=True), default=None,
-                     help='Path to an websocket server to run at launch.')(f)
+                     help='Path to a websocket server that will be executed to forward parsed command. Most likely you want to use chiptool.')(f)
     f = click.option('--server_name', type=str, default='chip-tool',
-                     help='Name of a websocket server to run at launch.')(f)
+                     help='If server_path is not provided, we use this argument to seach various directories within the SDK for a binary that matches this name.')(f)
     f = click.option('--server_arguments', type=str, default='interactive server',
-                     help='Optional arguments to pass to the websocket server at launch.')(f)
+                     help='Arguments to pass to the websocket server at launch.')(f)
     f = click.option('--show_adapter_logs', type=bool, default=False, show_default=True,
                      help='Show additional logs provided by the adapter.')(f)
     f = click.option('--trace_file', type=click.Path(), default=None,
@@ -89,7 +91,18 @@ def chiptool_py(ctx, commands: List[str], server_path: str, server_name: str, se
     server_arguments = maybe_update_server_arguments(ctx)
     maybe_update_stop_on_error(ctx)
 
-    if len(commands) > 1 and commands[0] == 'tests':
+    if len(commands) == 1 and commands[0] == 'list':
+        print('List of all individual tests that can be run:')
+        for test in chiptest.AllChipToolYamlTests():
+            print(f'   {test.name}')
+
+        tests_finder = TestsFinder()
+        tests_collections = tests_finder.get_collections()
+        if tests_collections:
+            print('\nList of all collections tests that can be run:')
+            for test in tests_collections:
+                print(f'   {test}')
+    elif len(commands) > 1 and commands[0] == 'tests':
         success = send_yaml_command(chiptool, commands[1], server_path, server_arguments, show_adapter_logs, specifications_paths, pics,
                                     additional_pseudo_clusters_directory, commands[2:])
     else:
diff --git a/scripts/tests/yaml/relative_importer.py b/scripts/tests/yaml/relative_importer.py
index 3893354bb806a9..7e3cb5aab97085 100644
--- a/scripts/tests/yaml/relative_importer.py
+++ b/scripts/tests/yaml/relative_importer.py
@@ -23,6 +23,11 @@
 EXAMPLES_PATH = os.path.join(DEFAULT_CHIP_ROOT, 'examples')
 REPL_PATH = os.path.join(DEFAULT_CHIP_ROOT, 'src', 'controller', 'python')
 
+try:
+    import chiptest  # noqa: F401
+except ModuleNotFoundError:
+    sys.path.append(os.path.join(SCRIPT_PATH, 'tests'))
+
 try:
     import matter_idl  # noqa: F401
 except ModuleNotFoundError:
diff --git a/scripts/tests/yaml/runner.py b/scripts/tests/yaml/runner.py
index 87a57c76f296c7..01fd27ca665b7c 100755
--- a/scripts/tests/yaml/runner.py
+++ b/scripts/tests/yaml/runner.py
@@ -144,7 +144,7 @@ class ParserGroup:
 class YamlTestParserGroup(click.Group):
     def format_options(self, ctx, formatter):
         """Writes all the options into the formatter if they exist."""
-        if ctx.custom_options:
+        if getattr(ctx, 'custom_options', None):
             params_copy = self.params
             non_custom_params = list(filter(lambda x: x.name not in ctx.custom_options, self.params))
             custom_params = list(filter(lambda x: x.name in ctx.custom_options, self.params))
diff --git a/scripts/tests/yaml/tests_finder.py b/scripts/tests/yaml/tests_finder.py
index 99ee4a1350a6c1..2c9d2758d91406 100755
--- a/scripts/tests/yaml/tests_finder.py
+++ b/scripts/tests/yaml/tests_finder.py
@@ -55,6 +55,9 @@ def get(self, test_name: str) -> List[str]:
 
         return self.__get_paths(test_names)
 
+    def get_collections(self) -> List[str]:
+        return self.__test_collections
+
     def __get_collections(self, configuration_directory: str, configuration_name: str) -> List[str]:
         if os.path.isfile(configuration_name):
             configuration_filepath = configuration_name
diff --git a/scripts/tools/build_fail_defs.yaml b/scripts/tools/build_fail_definitions.yaml
similarity index 100%
rename from scripts/tools/build_fail_defs.yaml
rename to scripts/tools/build_fail_definitions.yaml
diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py
index 6ee881d50689fe..37ef6beac3cfb3 100755
--- a/scripts/tools/generate_esp32_chip_factory_bin.py
+++ b/scripts/tools/generate_esp32_chip_factory_bin.py
@@ -27,6 +27,7 @@
 import cryptography.x509
 from bitarray import bitarray
 from bitarray.util import ba2int
+from esp_secure_cert.tlv_format import generate_partition_ds, generate_partition_no_ds, tlv_priv_key_t, tlv_priv_key_type_t
 
 CHIP_TOPDIR = os.path.dirname(os.path.realpath(__file__))[:-len(os.path.join('scripts', 'tools'))]
 sys.path.insert(0, os.path.join(CHIP_TOPDIR, 'scripts', 'tools', 'spake2p'))
@@ -51,6 +52,7 @@
 FACTORY_PARTITION_CSV = 'nvs_partition.csv'
 FACTORY_PARTITION_BIN = 'factory_partition.bin'
 NVS_KEY_PARTITION_BIN = 'nvs_key_partition.bin'
+ESP_SECURE_CERT_PARTITION_BIN = 'esp_secure_cert_partititon.bin'
 
 FACTORY_DATA = {
     # CommissionableDataProvider
@@ -315,17 +317,41 @@ def populate_factory_data(args, spake2p_params):
         FACTORY_DATA['iteration-count']['value'] = spake2p_params['Iteration Count']
         FACTORY_DATA['salt']['value'] = spake2p_params['Salt']
         FACTORY_DATA['verifier']['value'] = spake2p_params['Verifier']
+    if not args.dac_in_secure_cert:
+        if args.dac_cert:
+            FACTORY_DATA['dac-cert']['value'] = os.path.abspath(args.dac_cert)
+        if args.pai_cert:
+            FACTORY_DATA['pai-cert']['value'] = os.path.abspath(args.pai_cert)
+        if args.dac_key:
+            FACTORY_DATA['dac-key']['value'] = os.path.abspath('dac_raw_privkey.bin')
+            FACTORY_DATA['dac-pub-key']['value'] = os.path.abspath('dac_raw_pubkey.bin')
+    else:
+        # esp secure cert partition
+        secure_cert_partition_file_path = os.path.join(args.output_dir, ESP_SECURE_CERT_PARTITION_BIN)
+        if args.ds_peripheral:
+            if args.target != "esp32h2":
+                logging.error("DS peripheral is only supported for esp32h2 target")
+                exit(1)
+            if args.efuse_key_id == -1:
+                logging.error("--efuse-key-id <value> is required when -ds or --ds-peripheral option is used")
+                exit(1)
+            priv_key = tlv_priv_key_t(key_type=tlv_priv_key_type_t.ESP_SECURE_CERT_ECDSA_PERIPHERAL_KEY,
+                                      key_path=args.dac_key, key_pass=None)
+            # priv_key_len is in bits
+            priv_key.priv_key_len = 256
+            priv_key.efuse_key_id = args.efuse_key_id
+            generate_partition_ds(priv_key=priv_key, device_cert=args.dac_cert,
+                                  ca_cert=args.pai_cert, idf_target=args.target,
+                                  op_file=secure_cert_partition_file_path)
+        else:
+            priv_key = tlv_priv_key_t(key_type=tlv_priv_key_type_t.ESP_SECURE_CERT_DEFAULT_FORMAT_KEY,
+                                      key_path=args.dac_key, key_pass=None)
+            generate_partition_no_ds(priv_key=priv_key, device_cert=args.dac_cert,
+                                     ca_cert=args.pai_cert, idf_target=args.target,
+                                     op_file=secure_cert_partition_file_path)
 
-    if args.dac_cert:
-        FACTORY_DATA['dac-cert']['value'] = os.path.abspath(args.dac_cert)
-    if args.pai_cert:
-        FACTORY_DATA['pai-cert']['value'] = os.path.abspath(args.pai_cert)
     if args.cd:
         FACTORY_DATA['cert-dclrn']['value'] = os.path.abspath(args.cd)
-    if args.dac_key:
-        FACTORY_DATA['dac-key']['value'] = os.path.abspath('dac_raw_privkey.bin')
-        FACTORY_DATA['dac-pub-key']['value'] = os.path.abspath('dac_raw_pubkey.bin')
-
     if args.serial_num:
         FACTORY_DATA['serial-num']['value'] = args.serial_num
     if args.rd_id_uid:
@@ -486,9 +512,9 @@ def generate_nvs_csv(out_csv_filename):
     logging.info('Generated the factory partition csv file : {}'.format(os.path.abspath(out_csv_filename)))
 
 
-def generate_nvs_bin(encrypt, size, csv_filename, bin_filename):
+def generate_nvs_bin(encrypt, size, csv_filename, bin_filename, output_dir):
     nvs_args = SimpleNamespace(version=2,
-                               outdir=os.getcwd(),
+                               outdir=output_dir,
                                input=csv_filename,
                                output=bin_filename,
                                size=hex(size))
@@ -517,7 +543,8 @@ def clean_up():
         os.remove(FACTORY_DATA['dac-key']['value'])
 
 
-def main():
+def get_args():
+
     def any_base_int(s): return int(s, 0)
 
     parser = argparse.ArgumentParser(description='Chip Factory NVS binary generator tool')
@@ -534,6 +561,14 @@ def any_base_int(s): return int(s, 0)
     parser.add_argument('--pai-cert', help='The path to the PAI certificate in der format')
     parser.add_argument('--cd', help='The path to the certificate declaration der format')
 
+    # Options for esp_secure_cert_partition
+    parser.add_argument('--dac-in-secure-cert', action="store_true",
+                        help='Store DAC in secure cert partition. By default, DAC is stored in nvs factory partition.')
+    parser.add_argument('-ds', '--ds-peripheral', action="store_true",
+                        help='Use DS Peripheral in generating secure cert partition.')
+    parser.add_argument('--efuse-key-id', type=int, choices=range(0, 6), default=-1,
+                        help='Provide the efuse key_id which contains/will contain HMAC_KEY, default is 1')
+
     # These will be used by DeviceInstanceInfoProvider
     parser.add_argument('--vendor-id', type=any_base_int, help='Vendor id')
     parser.add_argument('--vendor-name', help='Vendor name')
@@ -559,13 +594,20 @@ def any_base_int(s): return int(s, 0)
 
     parser.add_argument('-s', '--size', type=any_base_int, default=0x6000,
                         help='The size of the partition.bin, default: 0x6000')
+    parser.add_argument('--target', default='esp32',
+                        help='The platform type of device. eg: one of esp32, esp32c3, etc.')
     parser.add_argument('-e', '--encrypt', action='store_true',
                         help='Encrypt the factory parititon NVS binary')
     parser.add_argument('--no-bin', action='store_false', dest='generate_bin',
                         help='Do not generate the factory partition binary')
+    parser.add_argument('--output_dir', type=str, default='bin', help='Created image output file path')
+
     parser.set_defaults(generate_bin=True)
 
-    args = parser.parse_args()
+    return parser.parse_args()
+
+
+def set_up_factory_data(args):
     validate_args(args)
 
     if args.passcode is not None:
@@ -575,18 +617,29 @@ def any_base_int(s): return int(s, 0)
 
     populate_factory_data(args, spake2p_params)
 
-    if args.dac_key:
+    if args.dac_key and not args.dac_in_secure_cert:
         gen_raw_ec_keypair_from_der(args.dac_key, FACTORY_DATA['dac-pub-key']['value'], FACTORY_DATA['dac-key']['value'])
 
-    generate_nvs_csv(FACTORY_PARTITION_CSV)
 
+def generate_factory_partiton_binary(args):
+    generate_nvs_csv(FACTORY_PARTITION_CSV)
     if args.generate_bin:
-        generate_nvs_bin(args.encrypt, args.size, FACTORY_PARTITION_CSV, FACTORY_PARTITION_BIN)
+        generate_nvs_bin(args.encrypt, args.size, FACTORY_PARTITION_CSV, FACTORY_PARTITION_BIN, args.output_dir)
         print_flashing_help(args.encrypt, FACTORY_PARTITION_BIN)
-
     clean_up()
 
 
+def set_up_out_dirs(args):
+    os.makedirs(args.output_dir, exist_ok=True)
+
+
+def main():
+    args = get_args()
+    set_up_out_dirs(args)
+    set_up_factory_data(args)
+    generate_factory_partiton_binary(args)
+
+
 if __name__ == "__main__":
     logging.basicConfig(format='[%(asctime)s] [%(levelname)7s] - %(message)s', level=logging.INFO)
     main()
diff --git a/scripts/tools/memory/README-GitHub-CI.md b/scripts/tools/memory/README-GitHub-CI.md
index e34af1f9f23566..d9ff7172ebe5a6 100644
--- a/scripts/tools/memory/README-GitHub-CI.md
+++ b/scripts/tools/memory/README-GitHub-CI.md
@@ -1,3 +1,7 @@
+---
+orphan: true
+---
+
 # Scripts for GitHub CI
 
 A set of `gh_*.py` scripts work together to produce size comparisons for PRs.
diff --git a/scripts/tools/memory/gh_sizes.py b/scripts/tools/memory/gh_sizes.py
index 88c3291f99cb96..9decc178e15d45 100755
--- a/scripts/tools/memory/gh_sizes.py
+++ b/scripts/tools/memory/gh_sizes.py
@@ -154,13 +154,17 @@ def main(argv):
         else:
             output = pathlib.Path(binary).parent / output_base
 
-        config = Config().init({
+        config_desc = {
             **memdf.util.config.CONFIG,
             **memdf.collect.CONFIG,
             **memdf.select.CONFIG,
             **memdf.report.OUTPUT_CONFIG,
             **CONFIG,
-        })
+        }
+        # In case there is no platform configuration file, default to using a popular set of section names.
+        config_desc['section.select']['default'] = ['.text', '.rodata', '.data', '.bss']
+
+        config = Config().init(config_desc)
         config.put('output.file', output)
         config.put('output.format', 'json_records')
         if config_file.is_file():
@@ -181,7 +185,7 @@ def main(argv):
 
         collected: DFs = memdf.collect.collect_files(config, [binary])
 
-        # Aggregate loaded segments, by writable (flash) or not (RAM).
+        # Aggregate loaded segments, by writable (RAM) or not (flash).
         segments = collected[SegmentDF.name]
         segments['segment'] = segments.index
         segments['wr'] = ((segments['flags'] & 2) != 0).convert_dtypes(
diff --git a/scripts/tools/memory/memdf/README.md b/scripts/tools/memory/memdf/README.md
index 83628c7676e25a..2ea3c2f7a4ffe3 100644
--- a/scripts/tools/memory/memdf/README.md
+++ b/scripts/tools/memory/memdf/README.md
@@ -1,3 +1,7 @@
+---
+orphan: true
+---
+
 This package contains routines to to collect, aggregate, and report memory
 usage, using Pandas `DataFrame` as the primary representation.
 
diff --git a/scripts/tools/memory/platform/README.md b/scripts/tools/memory/platform/README.md
index f90ba441f98b32..b3332d0ff4a34f 100644
--- a/scripts/tools/memory/platform/README.md
+++ b/scripts/tools/memory/platform/README.md
@@ -1,3 +1,7 @@
+---
+orphan: true
+---
+
 A config file is a Python (nested) dictionary used by
 `memdf.util.config.Config`.
 
diff --git a/scripts/tools/summarize_fail.py b/scripts/tools/summarize_fail.py
index 04b3b33077c4b6..556ddf823047d9 100644
--- a/scripts/tools/summarize_fail.py
+++ b/scripts/tools/summarize_fail.py
@@ -10,7 +10,7 @@
 
 yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime('%Y-%m-%d')
 
-with open("scripts/tools/build_fail_defs.yaml", "r") as fail_defs:
+with open("scripts/tools/build_fail_definitions.yaml", "r") as fail_defs:
     try:
         error_catalog = yaml.safe_load(fail_defs)
     except Exception:
diff --git a/scripts/tools/telink/update_zephyr.py b/scripts/tools/telink/update_zephyr.py
new file mode 100755
index 00000000000000..5c133f0f8fbdf7
--- /dev/null
+++ b/scripts/tools/telink/update_zephyr.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import argparse
+import os
+import subprocess
+import sys
+
+
+def main():
+
+    try:
+        zephyr_base = os.getenv("ZEPHYR_BASE")
+        if not zephyr_base:
+            zephyr_base = os.getenv("TELINK_ZEPHYR_BASE")
+            os.environ['ZEPHYR_BASE'] = zephyr_base
+        if not zephyr_base:
+            raise RuntimeError(
+                "No ZEPHYR_BASE environment variable found, please set ZEPHYR_BASE to a zephyr repository path.")
+
+        parser = argparse.ArgumentParser(
+            description='Script helping to update Telink Zephyr to specific revision.')
+        parser.add_argument("hash", help="Update Telink Zephyr to specific revision.")
+
+        args = parser.parse_args()
+
+        command = ['git', '-C', zephyr_base, 'reset', args.hash, '--hard']
+        subprocess.run(command, check=True)
+
+        command = ['west', 'update', '-o=--depth=1', '-n', '-f', 'smart']
+        subprocess.run(command, check=True)
+
+        command = ['west', 'blobs', 'fetch', 'hal_telink']
+        subprocess.run(command, check=True)
+
+    except (RuntimeError, subprocess.CalledProcessError) as e:
+        print(e)
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/tools/zap/run_zaptool.sh b/scripts/tools/zap/run_zaptool.sh
index 8885cddea10669..72c596270c7c95 100755
--- a/scripts/tools/zap/run_zaptool.sh
+++ b/scripts/tools/zap/run_zaptool.sh
@@ -31,6 +31,10 @@ SCRIPT_PATH="$(_get_fullpath "$0")"
 CHIP_ROOT="${SCRIPT_PATH%/scripts/tools/zap/run_zaptool.sh}"
 [[ -n "$1" ]] && ZAP_ARGS="-i \"$(_get_fullpath "$1")\"" || ZAP_ARGS=""
 
+if [[ -z "$ZAP_INSTALL_PATH" && -n "$PW_ZAP_CIPD_INSTALL_DIR" ]]; then
+    ZAP_INSTALL_PATH="$PW_ZAP_CIPD_INSTALL_DIR"
+fi
+
 if [ ! -z "$ZAP_DEVELOPMENT_PATH" ]; then
     WORKING_DIR=$ZAP_DEVELOPMENT_PATH
     ZAP_CMD="node src-script/zap-start.js"
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index 12d89a5da8d510..fbff9c8e36435b 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -3204,7 +3204,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3220,7 +3220,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3236,7 +3236,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6156,7 +6156,7 @@
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6184,16 +6184,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6273,7 +6273,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6798,7 +6798,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10346,7 +10346,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10362,7 +10362,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10378,7 +10378,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11586,7 +11586,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11602,7 +11602,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11618,7 +11618,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16s",
+              "type": "temperature",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -12666,7 +12666,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -15403,7 +15403,7 @@
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "NameSupportBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -15431,16 +15431,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -15520,7 +15520,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 7fbcb784bfd527..b75d476cbc1f17 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -2209,7 +2209,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2225,7 +2225,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2241,7 +2241,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4855,7 +4855,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
index 4a484b3f33fc9f..c1e762de1b2526 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -231,6 +231,10 @@
     0x00000028, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000028, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000028, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x0000002B, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    0x0000002C, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    0x0000002C, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+    0x0000002D, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
     0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -286,6 +290,10 @@
     0x00000005, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000006, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000010, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x00000000, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    0x00000000, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    0x00000001, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+    0x00000000, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -341,6 +349,10 @@
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -411,6 +423,7 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000035, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
@@ -466,6 +479,7 @@
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000000, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
@@ -521,6 +535,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index 4679085f1570dd..5c987480bc96ac 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -269,7 +269,7 @@
 #define GENERATED_DEFAULTS_COUNT (32)
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
-#define GENERATED_MIN_MAX_DEFAULT_COUNT 47
+#define GENERATED_MIN_MAX_DEFAULT_COUNT 46
 #define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
     {                                                                                                                              \
                                                                                                                                    \
@@ -317,7 +317,6 @@
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 },  /* FanMode */                                                     \
-            { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 },  /* FanModeSequence */                                             \
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */                                              \
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* SpeedSetting */                                                \
                                                                                                                                    \
@@ -556,11 +555,11 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */       \
             { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                       \
             { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                 \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LeaderRouterId */                          \
@@ -760,8 +759,8 @@
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* SceneValid */        \
             { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },                                  /* NameSupport */       \
             { ZAP_SIMPLE_DEFAULT(16), 0x00000006, 2, ZAP_TYPE(INT16U), 0 },                                /* SceneTableSize */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RemainingCapacity */ \
-            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
+            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FabricSceneInfo */   \
+            { ZAP_SIMPLE_DEFAULT(15), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                              /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
@@ -1037,14 +1036,13 @@
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
             { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanMode */                                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanModeSequence */                                  \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000002, 1, ZAP_TYPE(PERCENT),                                                    \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* FanMode */                                         \
+            { ZAP_SIMPLE_DEFAULT(0x02), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* FanModeSequence */                                 \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000002, 1, ZAP_TYPE(PERCENT),                                                    \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */    \
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(PERCENT), 0 },                             /* PercentCurrent */    \
             { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 },                                /* SpeedMax */          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000005, 1, ZAP_TYPE(INT8U),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000005, 1, ZAP_TYPE(INT8U),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */      \
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 },                               /* SpeedCurrent */      \
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 },                             /* RockSupport */       \
@@ -1055,11 +1053,11 @@
             { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */                                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(27), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */                                    \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(28), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(27), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* ScheduleProgrammingVisibility */                   \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
             { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
@@ -1094,25 +1092,25 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000028, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6X */          \
             { ZAP_EMPTY_DEFAULT(), 0x00000029, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6Y */          \
             { ZAP_EMPTY_DEFAULT(), 0x0000002A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary6Intensity */  \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(29), 0x00000030, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(28), 0x00000030, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointX */                                      \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(30), 0x00000031, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(29), 0x00000031, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointY */                                      \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(31), 0x00000032, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(30), 0x00000032, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(32), 0x00000033, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(31), 0x00000033, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRY */                                     \
             { ZAP_EMPTY_DEFAULT(), 0x00000034, 1, ZAP_TYPE(INT8U),                                                                 \
               ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointRIntensity */                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(33), 0x00000036, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(32), 0x00000036, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(34), 0x00000037, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(33), 0x00000037, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGY */                                     \
             { ZAP_EMPTY_DEFAULT(), 0x00000038, 1, ZAP_TYPE(INT8U),                                                                 \
               ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointGIntensity */                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(35), 0x0000003A, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(34), 0x0000003A, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(36), 0x0000003B, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(35), 0x0000003B, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBY */                                     \
             { ZAP_EMPTY_DEFAULT(), 0x0000003C, 1, ZAP_TYPE(INT8U),                                                                 \
               ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* ColorPointBIntensity */                         \
@@ -1127,7 +1125,7 @@
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */                   \
             { ZAP_SIMPLE_DEFAULT(0xFEFF), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */                   \
             { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 },        /* CoupleColorTempToLevelMinMireds */              \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(37), 0x00004010, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(36), 0x00004010, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* StartUpColorTemperatureMireds */                \
             { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                   \
@@ -1143,12 +1141,15 @@
             { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                           \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                                                                  \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                                                               \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                /* MaxMeasuredValue */                                \
+            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },     /* Tolerance */                                       \
+            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
+            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                              \
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
@@ -1181,7 +1182,7 @@
             { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 33, ZAP_TYPE(CHAR_STRING), 0 }, /* MACAddress */                                    \
+            { ZAP_EMPTY_DEFAULT(), 0x00000000, 13, ZAP_TYPE(CHAR_STRING), 0 }, /* MACAddress */                                    \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },   /* FeatureMap */                                    \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },     /* ClusterRevision */                               \
                                                                                                                                    \
@@ -1222,8 +1223,7 @@
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Content Launcher (server) */                                                                  \
             { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AcceptHeader */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(BITMAP32),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* SupportedStreamingProtocols */                     \
+            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(BITMAP32), 0 },   /* SupportedStreamingProtocols */                     \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -1314,13 +1314,13 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000024, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum_attr */                 \
             { ZAP_EMPTY_DEFAULT(), 0x00000025, 0, ZAP_TYPE(STRUCT),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* struct_attr */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00000026, 1, ZAP_TYPE(INT8U),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(37), 0x00000026, 1, ZAP_TYPE(INT8U),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8u */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000027, 1, ZAP_TYPE(INT8S),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00000027, 1, ZAP_TYPE(INT8S),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8s */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000028, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000028, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16u */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00000029, 2, ZAP_TYPE(INT16S),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000029, 2, ZAP_TYPE(INT16S),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16s */                          \
             { ZAP_EMPTY_DEFAULT(), 0x0000002A, 0, ZAP_TYPE(ARRAY),                                                                 \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_long_octet_string */                  \
@@ -1391,16 +1391,16 @@
             { ZAP_EMPTY_DEFAULT(), 0x00004025, 0, ZAP_TYPE(STRUCT),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_struct */                                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00004026, 1, ZAP_TYPE(INT8U),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00004026, 1, ZAP_TYPE(INT8U),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8u */                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00004027, 1, ZAP_TYPE(INT8S),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00004027, 1, ZAP_TYPE(INT8S),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8s */                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00004028, 2, ZAP_TYPE(INT16U),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00004028, 2, ZAP_TYPE(INT16U),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16u */                                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00004029, 2, ZAP_TYPE(INT16S),                                                     \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00004029, 2, ZAP_TYPE(INT16S),                                                     \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
                   ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16s */                                           \
             { ZAP_EMPTY_DEFAULT(), 0x0000402A, 1, ZAP_TYPE(INT8U),                                                                 \
@@ -1426,8 +1426,8 @@
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* SceneValid */        \
             { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },                                  /* NameSupport */       \
             { ZAP_SIMPLE_DEFAULT(16), 0x00000006, 2, ZAP_TYPE(INT16U), 0 },                                /* SceneTableSize */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RemainingCapacity */ \
-            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
+            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FabricSceneInfo */   \
+            { ZAP_SIMPLE_DEFAULT(15), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                              /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 2, Cluster: On/Off (server) */                                                                            \
@@ -1435,7 +1435,7 @@
             { ZAP_SIMPLE_DEFAULT(1), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                           /* GlobalSceneControl */     \
             { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */                 \
             { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(46), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                      \
+            { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                      \
               ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpOnOff */      \
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                          /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
@@ -1558,6 +1558,10 @@
         (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
         (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
     };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
+        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
+        (EmberAfGenericClusterFunction) MatterScenesClusterServerShutdownCallback,                                                 \
+    };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
         (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
         (EmberAfGenericClusterFunction) MatterOnOffClusterServerShutdownCallback,                                                  \
@@ -2358,8 +2362,8 @@
       .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 9, \
       .clusterSize = 13, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
+      .functions = chipFuncArrayScenesServer, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ), \
       .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ), \
       .eventList = nullptr, \
@@ -2721,7 +2725,7 @@
       .clusterId = 0x00000503, \
       .attributes = ZAP_ATTRIBUTE_INDEX(536), \
       .attributeCount = 3, \
-      .clusterSize = 39, \
+      .clusterSize = 19, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr, \
@@ -2930,8 +2934,8 @@
       .attributes = ZAP_ATTRIBUTE_INDEX(687), \
       .attributeCount = 9, \
       .clusterSize = 13, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
+      .functions = chipFuncArrayScenesServer, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 240 ), \
       .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 248 ), \
       .eventList = nullptr, \
@@ -3024,7 +3028,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 27, 345 }, { ZAP_CLUSTER_INDEX(27), 44, 3717 }, { ZAP_CLUSTER_INDEX(71), 7, 127 },                 \
+        { ZAP_CLUSTER_INDEX(0), 27, 345 }, { ZAP_CLUSTER_INDEX(27), 44, 3697 }, { ZAP_CLUSTER_INDEX(71), 7, 127 },                 \
             { ZAP_CLUSTER_INDEX(78), 2, 4 },                                                                                       \
     }
 
@@ -3037,7 +3041,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (4193)
+#define ATTRIBUTE_MAX_SIZE (4173)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (4)
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
index fc0a4d3df39f84..11f7d888fcbbd8 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
@@ -107,11 +107,11 @@
 // Scenes FeatureMap Attribute Toggle Scenes Name feature
 // App cluster specs 1.4.4
 #define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0007 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x000F & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 // Scenes FeatureMap Table Size feature used for the MATTER_SCENES_TABLE_SIZE define
 // App cluster specs 1.4.4.2
 #define MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT (0x0007 & MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK)
+#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT (0x000F & MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK)
 
 // Use this macro to check if the server side of the On/Off cluster is included
 #define ZCL_USING_ON_OFF_CLUSTER_SERVER
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
index a9a3acfe70e870..57fc3854355963 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
@@ -113,6 +113,9 @@
     0x00000028, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000028, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000028, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x0000002B, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    0x0000002C, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    0x0000002C, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
     0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -129,6 +132,9 @@
     0x00000005, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000006, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000010, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x00000000, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    0x00000000, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    0x00000001, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -145,6 +151,9 @@
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -173,6 +182,7 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000035, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
@@ -210,6 +220,7 @@
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000000, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
@@ -247,6 +258,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Thread Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index b321c516ab9b81..7093ce3c63732b 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -254,11 +254,11 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */       \
             { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 1, ZAP_TYPE(INT8U),                                                                 \
+            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                       \
             { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                 \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LeaderRouterId */                          \
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
index 60e861d28cd926..9d8a1bf3c0b495 100644
--- a/scripts/tools/zap/zap_execution.py
+++ b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.10.24'
+MIN_ZAP_VERSION = '2023.11.8'
 
 
 class ZapTool:
diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py
index a274ea84597a15..6650740c4b734a 100755
--- a/scripts/tools/zap_regen_all.py
+++ b/scripts/tools/zap_regen_all.py
@@ -433,6 +433,11 @@ def getCodegenTemplates():
         idl_path="src/controller/data_model/controller-clusters.matter",
         output_directory="src/controller/java/generated"))
 
+    targets.append(JinjaCodegenTarget(
+        generator="kotlin-class",
+        idl_path="src/controller/data_model/controller-clusters.matter",
+        output_directory="src/controller/java/generated"))
+
     return targets
 
 
diff --git a/src/app/AttributePathParams.h b/src/app/AttributePathParams.h
index fd97a9c083f414..ff1de58cbe91b0 100644
--- a/src/app/AttributePathParams.h
+++ b/src/app/AttributePathParams.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/DataVersionFilter.h>
 #include <app/util/basic-types.h>
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index a7a9baddf55cd8..987bfdcaf2521f 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -62,12 +62,22 @@ buildconfig_header("app_buildconfig") {
     "ICD_REPORT_ON_ENTER_ACTIVE_MODE=${chip_report_on_active_mode}",
     "ICD_MAX_NOTIFICATION_SUBSCRIBERS=${icd_max_notification_subscribers}",
   ]
+
+  visibility = [ ":app_config" ]
+}
+
+source_set("revision_info") {
+  sources = [
+    "DataModelRevision.h",
+    "InteractionModelRevision.h",
+    "SpecificationVersion.h",
+  ]
 }
 
 source_set("app_config") {
   sources = [ "AppConfig.h" ]
 
-  public_deps = [ ":app_buildconfig" ]
+  deps = [ ":app_buildconfig" ]
 }
 
 static_library("app") {
@@ -101,7 +111,6 @@ static_library("app") {
     "FailSafeContext.h",
     "GlobalAttributes.h",
     "InteractionModelEngine.cpp",
-    "InteractionModelRevision.h",
     "InteractionModelTimeout.h",
     "MessageDef/ArrayBuilder.cpp",
     "MessageDef/ArrayParser.cpp",
@@ -237,6 +246,7 @@ static_library("app") {
 
   public_deps = [
     ":app_config",
+    ":revision_info",
     "${chip_root}/src/access",
     "${chip_root}/src/app/icd:notifier",
     "${chip_root}/src/app/icd:observer",
diff --git a/src/app/BufferedReadCallback.h b/src/app/BufferedReadCallback.h
index f8faaaa1a0fd74..b24257884e1a77 100644
--- a/src/app/BufferedReadCallback.h
+++ b/src/app/BufferedReadCallback.h
@@ -21,7 +21,7 @@
 #include "lib/core/TLV.h"
 #include "system/SystemPacketBuffer.h"
 #include "system/TLVPacketBufferBackingStore.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/ReadClient.h>
 #include <vector>
diff --git a/src/app/CASESessionManager.h b/src/app/CASESessionManager.h
index 8b803a0a10f0a2..7094c88f42e104 100644
--- a/src/app/CASESessionManager.h
+++ b/src/app/CASESessionManager.h
@@ -28,8 +28,6 @@
 #include <transport/SessionDelegate.h>
 #include <transport/SessionUpdateDelegate.h>
 
-#include <lib/dnssd/ResolverProxy.h>
-
 namespace chip {
 
 class OperationalSessionSetupPoolDelegate;
diff --git a/src/app/ClusterStateCache.h b/src/app/ClusterStateCache.h
index 9955dee0104edc..4c663a2a5fc2f9 100644
--- a/src/app/ClusterStateCache.h
+++ b/src/app/ClusterStateCache.h
@@ -21,7 +21,7 @@
 #include "lib/core/CHIPError.h"
 #include "system/SystemPacketBuffer.h"
 #include "system/TLVPacketBufferBackingStore.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/BufferedReadCallback.h>
 #include <app/ReadClient.h>
diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp
index a447597cc97cea..8fd13bab7247f0 100644
--- a/src/app/CommandHandler.cpp
+++ b/src/app/CommandHandler.cpp
@@ -251,6 +251,8 @@ Status CommandHandler::ProcessCommandDataIB(CommandDataIB::Parser & aCommandElem
     ConcreteCommandPath concretePath(0, 0, 0);
     TLV::TLVReader commandDataReader;
 
+    SetGroupRequest(false);
+
     // NOTE: errors may occur before the concrete command path is even fully decoded.
 
     err = aCommandElement.GetPath(&commandPath);
@@ -352,6 +354,7 @@ Status CommandHandler::ProcessGroupCommandDataIB(CommandDataIB::Parser & aComman
     Credentials::GroupDataProvider::GroupEndpoint mapping;
     Credentials::GroupDataProvider * groupDataProvider = Credentials::GetGroupDataProvider();
     Credentials::GroupDataProvider::EndpointIterator * iterator;
+    SetGroupRequest(true);
 
     err = aCommandElement.GetPath(&commandPath);
     VerifyOrReturnError(err == CHIP_NO_ERROR, Status::InvalidAction);
@@ -462,7 +465,8 @@ CHIP_ERROR CommandHandler::AddStatusInternal(const ConcreteCommandPath & aComman
 void CommandHandler::AddStatus(const ConcreteCommandPath & aCommandPath, const Protocols::InteractionModel::Status aStatus,
                                const char * context)
 {
-
+    // Return prematurely in case of requests targeted to a group that should not add the status for response purposes.
+    VerifyOrReturn(!IsGroupRequest());
     VerifyOrDie(FallibleAddStatus(aCommandPath, aStatus, context) == CHIP_NO_ERROR);
 }
 
diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
index 3c9a86c97b6052..65542ef0587f55 100644
--- a/src/app/CommandHandler.h
+++ b/src/app/CommandHandler.h
@@ -406,6 +406,16 @@ class CommandHandler : public Messaging::ExchangeDelegate
         return FinishCommand(/* aEndDataStruct = */ false);
     }
 
+    /**
+     * Check whether the InvokeRequest we are handling is targeted to a group.
+     */
+    bool IsGroupRequest() { return mGroupRequest; }
+
+    /**
+     * Sets the state flag to keep the information that request we are handling is targeted to a group.
+     */
+    void SetGroupRequest(bool isGroupRequest) { mGroupRequest = isGroupRequest; }
+
     Messaging::ExchangeHolder mExchangeCtx;
     Callback * mpCallback = nullptr;
     InvokeResponseMessage::Builder mInvokeResponseBuilder;
@@ -416,7 +426,8 @@ class CommandHandler : public Messaging::ExchangeDelegate
 
     bool mSentStatusResponse = false;
 
-    State mState = State::Idle;
+    State mState       = State::Idle;
+    bool mGroupRequest = false;
     chip::System::PacketBufferTLVWriter mCommandMessageWriter;
     TLV::TLVWriter mBackupWriter;
     bool mBufferAllocated = false;
diff --git a/src/app/CompatEnumNames.h b/src/app/CompatEnumNames.h
index eb5a4aabfdc3cd..f370132e86b16e 100644
--- a/src/app/CompatEnumNames.h
+++ b/src/app/CompatEnumNames.h
@@ -19,7 +19,6 @@
  * is meant to be included at the end of cluster-enums.h, after all the normal
  * enum definitions are available.
  */
-
 #pragma once
 
 namespace chip {
@@ -34,6 +33,10 @@ using OTADownloadProtocol  = DownloadProtocolEnum;
 using OTAQueryStatus       = StatusEnum;
 } // namespace OtaSoftwareUpdateProvider
 
+namespace MediaPlayback {
+using MediaPlaybackStatusEnum = StatusEnum;
+}
+
 namespace OtaSoftwareUpdateRequestor {
 // https://github.com/project-chip/connectedhomeip/pull/29459 renamed these
 // enums to follow the spec names.
@@ -42,6 +45,41 @@ using OTAChangeReasonEnum   = ChangeReasonEnum;
 using OTAUpdateStateEnum    = UpdateStateEnum;
 } // namespace OtaSoftwareUpdateRequestor
 
+namespace ContentLauncher {
+// https://github.com/project-chip/connectedhomeip/pull/30176 renamed these
+// enums to follow the spec names.
+using SupportedStreamingProtocol = SupportedProtocolsBitmap;
+using ContentLaunchStatusEnum    = StatusEnum;
+} // namespace ContentLauncher
+
+namespace ApplicationLauncher {
+// https://github.com/project-chip/connectedhomeip/pull/30134 renamed this
+using ApplicationLauncherStatusEnum = StatusEnum;
+} // namespace ApplicationLauncher
+
+namespace KeypadInput {
+// https://github.com/project-chip/connectedhomeip/pull/30316 renamed this
+using KeypadInputStatusEnum = StatusEnum;
+// https://github.com/project-chip/connectedhomeip/pull/30497 renamed this
+using CecKeyCode = CECKeyCodeEnum;
+} // namespace KeypadInput
+
+namespace Channel {
+using ChannelStatusEnum = StatusEnum;
+} // namespace Channel
+
+namespace TargetNavigator {
+// https://github.com/project-chip/connectedhomeip/pull/30322 renamed this
+using TargetNavigatorStatusEnum = StatusEnum;
+} // namespace TargetNavigator
+
+namespace LevelControl {
+// https://github.com/project-chip/connectedhomeip/pull/30417 renamed/updated these
+using MoveMode            = MoveModeEnum;
+using StepMode            = StepModeEnum;
+using LevelControlOptions = OptionsBitmap;
+} // namespace LevelControl
+
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/ConcreteAttributePath.h b/src/app/ConcreteAttributePath.h
index 312311f848a900..b06a4b8a3b3acf 100644
--- a/src/app/ConcreteAttributePath.h
+++ b/src/app/ConcreteAttributePath.h
@@ -48,6 +48,8 @@ struct ConcreteAttributePath : public ConcreteClusterPath
         mExpanded = false;
     }
 
+    bool IsValid() const { return ConcreteClusterPath::HasValidIds() && IsValidAttributeId(mAttributeId); }
+
     bool operator==(const ConcreteAttributePath & aOther) const
     {
         return ConcreteClusterPath::operator==(aOther) && (mAttributeId == aOther.mAttributeId);
diff --git a/src/app/ConcreteClusterPath.h b/src/app/ConcreteClusterPath.h
index 6865fdb29a14c6..58b2f5b477f139 100644
--- a/src/app/ConcreteClusterPath.h
+++ b/src/app/ConcreteClusterPath.h
@@ -38,6 +38,8 @@ struct ConcreteClusterPath
 
     bool IsValidConcreteClusterPath() const { return !(mEndpointId == kInvalidEndpointId || mClusterId == kInvalidClusterId); }
 
+    bool HasValidIds() const { return IsValidEndpointId(mEndpointId) && IsValidClusterId(mClusterId); }
+
     bool operator==(const ConcreteClusterPath & aOther) const
     {
         return mEndpointId == aOther.mEndpointId && mClusterId == aOther.mClusterId;
diff --git a/src/app/FailSafeContext.cpp b/src/app/FailSafeContext.cpp
index 2d886b17b34bc0..647401e7f6b5d4 100644
--- a/src/app/FailSafeContext.cpp
+++ b/src/app/FailSafeContext.cpp
@@ -56,9 +56,7 @@ void FailSafeContext::SetFailSafeArmed(bool armed)
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     if (IsFailSafeArmed() != armed)
     {
-        ICDListener::KeepActiveFlags activeRequest = ICDListener::KeepActiveFlags::kFailSafeArmed;
-        armed ? ICDNotifier::GetInstance().BroadcastActiveRequestNotification(activeRequest)
-              : ICDNotifier::GetInstance().BroadcastActiveRequestWithdrawal(activeRequest);
+        ICDNotifier::GetInstance().BroadcastActiveRequest(ICDListener::KeepActiveFlag::kFailSafeArmed, armed);
     }
 #endif
     mFailSafeArmed = armed;
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
index 541b0902ce90c9..d202dc7d07c062 100644
--- a/src/app/InteractionModelEngine.cpp
+++ b/src/app/InteractionModelEngine.cpp
@@ -29,7 +29,7 @@
 
 #include "access/RequestPath.h"
 #include "access/SubjectDescriptor.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/RequiredPrivilege.h>
 #include <app/util/af-types.h>
 #include <app/util/endpoint-config-api.h>
diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
index 0ecf3f6c6b1ec0..ca1fa92f240c58 100644
--- a/src/app/InteractionModelEngine.h
+++ b/src/app/InteractionModelEngine.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include <access/AccessControl.h>
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/MessageDef/AttributeReportIBs.h>
 #include <app/MessageDef/ReportDataMessage.h>
 #include <lib/core/CHIPCore.h>
diff --git a/src/app/MessageDef/AttributeDataIB.h b/src/app/MessageDef/AttributeDataIB.h
index 9095616df2c2e2..abcff0b5b3c48d 100644
--- a/src/app/MessageDef/AttributeDataIB.h
+++ b/src/app/MessageDef/AttributeDataIB.h
@@ -22,7 +22,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/AttributeDataIBs.h b/src/app/MessageDef/AttributeDataIBs.h
index 16d606efd0bacd..b6c211edffca3f 100644
--- a/src/app/MessageDef/AttributeDataIBs.h
+++ b/src/app/MessageDef/AttributeDataIBs.h
@@ -27,7 +27,7 @@
 #include "ArrayParser.h"
 #include "AttributeDataIB.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/AttributePathIB.cpp b/src/app/MessageDef/AttributePathIB.cpp
index 635d9122ecc303..52e7c6b78660ec 100644
--- a/src/app/MessageDef/AttributePathIB.cpp
+++ b/src/app/MessageDef/AttributePathIB.cpp
@@ -66,7 +66,7 @@ CHIP_ERROR AttributePathIB::Parser::PrettyPrint() const
             {
                 NodeId node;
                 reader.Get(node);
-                PRETTY_PRINT("\tNode = 0x%" PRIx64 ",", node);
+                PRETTY_PRINT("\tNode = 0x" ChipLogFormatX64 ",", ChipLogValueX64(node));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -171,13 +171,17 @@ CHIP_ERROR AttributePathIB::Parser::GetListIndex(DataModel::Nullable<ListIndex>
     return GetNullableUnsignedInteger(to_underlying(Tag::kListIndex), apListIndex);
 }
 
-CHIP_ERROR AttributePathIB::Parser::GetGroupAttributePath(ConcreteDataAttributePath & aAttributePath) const
+CHIP_ERROR AttributePathIB::Parser::GetGroupAttributePath(ConcreteDataAttributePath & aAttributePath,
+                                                          ValidateIdRanges aValidateRanges) const
 {
     ReturnErrorOnFailure(GetCluster(&aAttributePath.mClusterId));
-    VerifyOrReturnError(IsValidClusterId(aAttributePath.mClusterId), CHIP_IM_GLOBAL_STATUS(InvalidAction));
-
     ReturnErrorOnFailure(GetAttribute(&aAttributePath.mAttributeId));
-    VerifyOrReturnError(IsValidAttributeId(aAttributePath.mAttributeId), CHIP_IM_GLOBAL_STATUS(InvalidAction));
+
+    if (aValidateRanges == ValidateIdRanges::kYes)
+    {
+        VerifyOrReturnError(IsValidClusterId(aAttributePath.mClusterId), CHIP_IM_GLOBAL_STATUS(InvalidAction));
+        VerifyOrReturnError(IsValidAttributeId(aAttributePath.mAttributeId), CHIP_IM_GLOBAL_STATUS(InvalidAction));
+    }
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     DataModel::Nullable<ListIndex> listIndex;
@@ -204,9 +208,10 @@ CHIP_ERROR AttributePathIB::Parser::GetGroupAttributePath(ConcreteDataAttributeP
     return err;
 }
 
-CHIP_ERROR AttributePathIB::Parser::GetConcreteAttributePath(ConcreteDataAttributePath & aAttributePath) const
+CHIP_ERROR AttributePathIB::Parser::GetConcreteAttributePath(ConcreteDataAttributePath & aAttributePath,
+                                                             ValidateIdRanges aValidateRanges) const
 {
-    ReturnErrorOnFailure(GetGroupAttributePath(aAttributePath));
+    ReturnErrorOnFailure(GetGroupAttributePath(aAttributePath, aValidateRanges));
 
     // And now read our endpoint.
     return GetEndpoint(&aAttributePath.mEndpointId);
diff --git a/src/app/MessageDef/AttributePathIB.h b/src/app/MessageDef/AttributePathIB.h
index 6441b18ec59eb9..e1740d305d5578 100644
--- a/src/app/MessageDef/AttributePathIB.h
+++ b/src/app/MessageDef/AttributePathIB.h
@@ -21,7 +21,7 @@
 #include "ListBuilder.h"
 #include "ListParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/data-model/Nullable.h>
@@ -45,6 +45,12 @@ enum class Tag : uint8_t
     kListIndex            = 5,
 };
 
+enum class ValidateIdRanges : uint8_t
+{
+    kYes,
+    kNo,
+};
+
 class Parser : public ListParser
 {
 public:
@@ -136,10 +142,13 @@ class Parser : public ListParser
      *        as ReplaceAll if that's appropriate to their context.
      *
      *  @param [in] aAttributePath    The attribute path object to write to.
+     *  @param [in] aValidateRanges   Whether to validate that the cluster/attribute
+     *                                IDs in the path are in the right ranges.
      *
      *  @return #CHIP_NO_ERROR on success
      */
-    CHIP_ERROR GetConcreteAttributePath(ConcreteDataAttributePath & aAttributePath) const;
+    CHIP_ERROR GetConcreteAttributePath(ConcreteDataAttributePath & aAttributePath,
+                                        ValidateIdRanges aValidateRanges = ValidateIdRanges::kYes) const;
 
     /**
      * @brief Get a group attribute path.  This will set the ListOp to
@@ -148,10 +157,13 @@ class Parser : public ListParser
      *        endpoint id of the resulting path might have any value.
      *
      *  @param [in] aAttributePath    The attribute path object to write to.
+     *  @param [in] aValidateRanges   Whether to validate that the cluster/attribute
+     *                                IDs in the path are in the right ranges.
      *
      *  @return #CHIP_NO_ERROR on success
      */
-    CHIP_ERROR GetGroupAttributePath(ConcreteDataAttributePath & aAttributePath) const;
+    CHIP_ERROR GetGroupAttributePath(ConcreteDataAttributePath & aAttributePath,
+                                     ValidateIdRanges aValidateRanges = ValidateIdRanges::kYes) const;
 
     // TODO(#14934) Add a function to get ConcreteDataAttributePath from AttributePathIB::Parser directly.
 
diff --git a/src/app/MessageDef/AttributePathIBs.h b/src/app/MessageDef/AttributePathIBs.h
index 7845e7d21e3ea6..c817825f719316 100644
--- a/src/app/MessageDef/AttributePathIBs.h
+++ b/src/app/MessageDef/AttributePathIBs.h
@@ -22,7 +22,7 @@
 #include "ArrayParser.h"
 #include "AttributePathIB.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/AttributeReportIB.h b/src/app/MessageDef/AttributeReportIB.h
index f5f8335bd4f4cf..7a9c56f85d4d67 100644
--- a/src/app/MessageDef/AttributeReportIB.h
+++ b/src/app/MessageDef/AttributeReportIB.h
@@ -22,7 +22,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/AttributeReportIBs.h b/src/app/MessageDef/AttributeReportIBs.h
index 422a639cce459b..0256f256954b0f 100644
--- a/src/app/MessageDef/AttributeReportIBs.h
+++ b/src/app/MessageDef/AttributeReportIBs.h
@@ -27,7 +27,7 @@
 #include "ArrayParser.h"
 #include "AttributeReportIB.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/util/basic-types.h>
diff --git a/src/app/MessageDef/AttributeStatusIB.h b/src/app/MessageDef/AttributeStatusIB.h
index cf959041b6c977..10f4851cd91a85 100644
--- a/src/app/MessageDef/AttributeStatusIB.h
+++ b/src/app/MessageDef/AttributeStatusIB.h
@@ -22,7 +22,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/AttributeStatusIBs.h b/src/app/MessageDef/AttributeStatusIBs.h
index 03b1d00653463d..edfeec41b2c8bf 100644
--- a/src/app/MessageDef/AttributeStatusIBs.h
+++ b/src/app/MessageDef/AttributeStatusIBs.h
@@ -22,7 +22,7 @@
 #include "ArrayParser.h"
 #include "AttributeStatusIB.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/ClusterPathIB.cpp b/src/app/MessageDef/ClusterPathIB.cpp
index 5f9ec4695b0b19..39b932b32ebb50 100644
--- a/src/app/MessageDef/ClusterPathIB.cpp
+++ b/src/app/MessageDef/ClusterPathIB.cpp
@@ -53,7 +53,7 @@ CHIP_ERROR ClusterPathIB::Parser::PrettyPrint() const
             {
                 NodeId node;
                 reader.Get(node);
-                PRETTY_PRINT("\tNode = 0x%" PRIx64 ",", node);
+                PRETTY_PRINT("\tNode = 0x" ChipLogFormatX64 ",", ChipLogValueX64(node));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
diff --git a/src/app/MessageDef/ClusterPathIB.h b/src/app/MessageDef/ClusterPathIB.h
index 8e78408e9d9c87..65969a0fd78c88 100644
--- a/src/app/MessageDef/ClusterPathIB.h
+++ b/src/app/MessageDef/ClusterPathIB.h
@@ -20,7 +20,7 @@
 #include "ListBuilder.h"
 #include "ListParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/NodeId.h>
diff --git a/src/app/MessageDef/CommandDataIB.cpp b/src/app/MessageDef/CommandDataIB.cpp
index 4222c4d919719b..ea9bc3390b1f61 100644
--- a/src/app/MessageDef/CommandDataIB.cpp
+++ b/src/app/MessageDef/CommandDataIB.cpp
@@ -64,6 +64,14 @@ CHIP_ERROR CommandDataIB::Parser::PrettyPrint() const
             ReturnErrorOnFailure(CheckIMPayload(reader, 0, "CommandFields"));
             PRETTY_PRINT_DECDEPTH();
             break;
+        case to_underlying(Tag::kRef):
+            VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+            {
+                uint16_t reference;
+                ReturnErrorOnFailure(reader.Get(reference));
+                PRETTY_PRINT("\tRef = 0x%x,", reference);
+            }
+            break;
         default:
             PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
             break;
@@ -96,12 +104,22 @@ CHIP_ERROR CommandDataIB::Parser::GetFields(TLV::TLVReader * const apReader) con
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR CommandDataIB::Parser::GetRef(uint16_t * const apRef) const
+{
+    return GetUnsignedInteger(to_underlying(Tag::kRef), apRef);
+}
+
 CommandPathIB::Builder & CommandDataIB::Builder::CreatePath()
 {
     mError = mPath.Init(mpWriter, to_underlying(Tag::kPath));
     return mPath;
 }
 
+CHIP_ERROR CommandDataIB::Builder::Ref(const uint16_t aRef)
+{
+    return mpWriter->Put(TLV::ContextTag(Tag::kRef), aRef);
+}
+
 CHIP_ERROR CommandDataIB::Builder::EndOfCommandDataIB()
 {
     EndOfContainer();
diff --git a/src/app/MessageDef/CommandDataIB.h b/src/app/MessageDef/CommandDataIB.h
index c3cce65f2e8511..9872f5e43584dc 100644
--- a/src/app/MessageDef/CommandDataIB.h
+++ b/src/app/MessageDef/CommandDataIB.h
@@ -23,7 +23,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
@@ -37,6 +37,7 @@ enum class Tag : uint8_t
 {
     kPath   = 0,
     kFields = 1,
+    kRef    = 2,
 };
 
 class Parser : public StructParser
@@ -66,6 +67,17 @@ class Parser : public StructParser
      *          #CHIP_END_OF_TLV if there is no such element
      */
     CHIP_ERROR GetFields(TLV::TLVReader * const apReader) const;
+
+    /**
+     *  @brief Get the provided command reference associated with the CommandData
+     *
+     *  @param [out] apRef    A pointer to apRef
+     *
+     *  @return #CHIP_NO_ERROR on success
+     *          #CHIP_ERROR_WRONG_TLV_TYPE if there is such element but it's not any of the defined unsigned integer types
+     *          #CHIP_END_OF_TLV if there is no such element
+     */
+    CHIP_ERROR GetRef(uint16_t * const apRef) const;
 };
 
 class Builder : public StructBuilder
@@ -78,6 +90,16 @@ class Builder : public StructBuilder
      */
     CommandPathIB::Builder & CreatePath();
 
+    /**
+     *  @brief Inject Command Ref into the TLV stream.
+     *
+     *  @param [in] aRef refer to the CommandRef to set in CommandDataIB.
+     *
+     *  TODO What are some more errors
+     *  @return #CHIP_NO_ERROR on success
+     */
+    CHIP_ERROR Ref(const uint16_t aRef);
+
     /**
      *  @brief Mark the end of this CommandDataIB
      *
diff --git a/src/app/MessageDef/CommandPathIB.h b/src/app/MessageDef/CommandPathIB.h
index 21aa1e521d2184..ac3ef9e63d23ac 100644
--- a/src/app/MessageDef/CommandPathIB.h
+++ b/src/app/MessageDef/CommandPathIB.h
@@ -21,7 +21,7 @@
 #include "ListBuilder.h"
 #include "ListParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/CommandPathParams.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/util/basic-types.h>
diff --git a/src/app/MessageDef/CommandStatusIB.cpp b/src/app/MessageDef/CommandStatusIB.cpp
index 4f38bb292e657e..566ea0a7d83058 100644
--- a/src/app/MessageDef/CommandStatusIB.cpp
+++ b/src/app/MessageDef/CommandStatusIB.cpp
@@ -75,6 +75,14 @@ CHIP_ERROR CommandStatusIB::Parser::PrettyPrint() const
                 PRETTY_PRINT_DECDEPTH();
             }
             break;
+        case to_underlying(Tag::kRef):
+            VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+            {
+                uint16_t reference;
+                ReturnErrorOnFailure(reader.Get(reference));
+                PRETTY_PRINT("\tRef = 0x%x,", reference);
+            }
+            break;
         default:
             PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
             break;
@@ -108,6 +116,11 @@ CHIP_ERROR CommandStatusIB::Parser::GetErrorStatus(StatusIB::Parser * const apEr
     return apErrorStatus->Init(reader);
 }
 
+CHIP_ERROR CommandStatusIB::Parser::GetRef(uint16_t * const apRef) const
+{
+    return GetUnsignedInteger(to_underlying(Tag::kRef), apRef);
+}
+
 CommandPathIB::Builder & CommandStatusIB::Builder::CreatePath()
 {
     if (mError == CHIP_NO_ERROR)
@@ -126,6 +139,11 @@ StatusIB::Builder & CommandStatusIB::Builder::CreateErrorStatus()
     return mErrorStatus;
 }
 
+CHIP_ERROR CommandStatusIB::Builder::Ref(const uint16_t aRef)
+{
+    return mpWriter->Put(TLV::ContextTag(Tag::kRef), aRef);
+}
+
 CHIP_ERROR CommandStatusIB::Builder::EndOfCommandStatusIB()
 {
     EndOfContainer();
diff --git a/src/app/MessageDef/CommandStatusIB.h b/src/app/MessageDef/CommandStatusIB.h
index 8574937291375d..a780e02683eec0 100644
--- a/src/app/MessageDef/CommandStatusIB.h
+++ b/src/app/MessageDef/CommandStatusIB.h
@@ -23,7 +23,7 @@
 #include "StatusIB.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
@@ -37,6 +37,7 @@ enum class Tag : uint8_t
 {
     kPath        = 0,
     kErrorStatus = 1,
+    kRef         = 2,
 };
 
 class Parser : public StructParser
@@ -67,6 +68,17 @@ class Parser : public StructParser
      *          #CHIP_END_OF_TLV if there is no such element
      */
     CHIP_ERROR GetErrorStatus(StatusIB::Parser * const apErrorStatus) const;
+
+    /**
+     *  @brief Get the provided command reference associated with the CommandStatus
+     *
+     *  @param [out] apRef    A pointer to apRef
+     *
+     *  @return #CHIP_NO_ERROR on success
+     *          #CHIP_ERROR_WRONG_TLV_TYPE if there is such element but it's not any of the defined unsigned integer types
+     *          #CHIP_END_OF_TLV if there is no such element
+     */
+    CHIP_ERROR GetRef(uint16_t * const apRef) const;
 };
 
 class Builder : public StructBuilder
@@ -86,6 +98,15 @@ class Builder : public StructBuilder
      */
     StatusIB::Builder & CreateErrorStatus();
 
+    /**
+     *  @brief Inject Command Ref into the TLV stream.
+     *
+     *  @param [in] aRef refer to the CommandRef to set in CommandStatusIB.
+     *
+     *  @return #CHIP_NO_ERROR on success
+     */
+    CHIP_ERROR Ref(const uint16_t aRef);
+
     /**
      *  @brief Mark the end of this CommandStatusIB
      *
diff --git a/src/app/MessageDef/DataVersionFilterIB.h b/src/app/MessageDef/DataVersionFilterIB.h
index 33988384482020..ba9c0b19cdbe4f 100644
--- a/src/app/MessageDef/DataVersionFilterIB.h
+++ b/src/app/MessageDef/DataVersionFilterIB.h
@@ -20,7 +20,7 @@
 #include "ClusterPathIB.h"
 #include "StructBuilder.h"
 #include "StructParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/DataVersionFilterIBs.h b/src/app/MessageDef/DataVersionFilterIBs.h
index 91be119d84452e..199a6686cb011f 100644
--- a/src/app/MessageDef/DataVersionFilterIBs.h
+++ b/src/app/MessageDef/DataVersionFilterIBs.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/EventDataIB.cpp b/src/app/MessageDef/EventDataIB.cpp
index 471ccfae07e54f..cb5a7458c9f19f 100644
--- a/src/app/MessageDef/EventDataIB.cpp
+++ b/src/app/MessageDef/EventDataIB.cpp
@@ -70,7 +70,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 EventNumber number;
                 ReturnErrorOnFailure(reader.Get(number));
-                PRETTY_PRINT("\tEventNumber = 0x%" PRIx64 ",", number);
+                PRETTY_PRINT("\tEventNumber = 0x" ChipLogFormatX64 ",", ChipLogValueX64(number));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -81,7 +81,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 uint64_t value;
                 ReturnErrorOnFailure(reader.Get(value));
-                PRETTY_PRINT("\tPriorityLevel = 0x%" PRIx64 ",", value);
+                PRETTY_PRINT("\tPriorityLevel = 0x" ChipLogFormatX64 ",", ChipLogValueX64(value));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -92,7 +92,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 uint64_t value;
                 ReturnErrorOnFailure(reader.Get(value));
-                PRETTY_PRINT("\tEpochTimestamp = 0x%" PRIx64 ",", value);
+                PRETTY_PRINT("\tEpochTimestamp = 0x" ChipLogFormatX64 ",", ChipLogValueX64(value));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -104,7 +104,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 uint64_t value;
                 ReturnErrorOnFailure(reader.Get(value));
-                PRETTY_PRINT("\tSystemTimestamp = 0x%" PRIx64 ",", value);
+                PRETTY_PRINT("\tSystemTimestamp = 0x" ChipLogFormatX64 ",", ChipLogValueX64(value));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -115,7 +115,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 uint64_t value;
                 ReturnErrorOnFailure(reader.Get(value));
-                PRETTY_PRINT("\tDeltaEpochTimestampstamp= 0x%" PRIx64 ",", value);
+                PRETTY_PRINT("\tDeltaEpochTimestampstamp= 0x" ChipLogFormatX64 ",", ChipLogValueX64(value));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -126,7 +126,7 @@ CHIP_ERROR EventDataIB::Parser::PrettyPrint() const
             {
                 uint64_t value;
                 ReturnErrorOnFailure(reader.Get(value));
-                PRETTY_PRINT("\tDeltaSystemTimestamp = 0x%" PRIx64 ",", value);
+                PRETTY_PRINT("\tDeltaSystemTimestamp = 0x" ChipLogFormatX64 ",", ChipLogValueX64(value));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
diff --git a/src/app/MessageDef/EventDataIB.h b/src/app/MessageDef/EventDataIB.h
index 1086a89634c45e..77dcfe77e214fe 100644
--- a/src/app/MessageDef/EventDataIB.h
+++ b/src/app/MessageDef/EventDataIB.h
@@ -26,7 +26,7 @@
 #include "EventPathIB.h"
 #include "StructBuilder.h"
 #include "StructParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/EventHeader.h>
 #include <app/EventLoggingTypes.h>
 #include <app/util/basic-types.h>
diff --git a/src/app/MessageDef/EventFilterIB.cpp b/src/app/MessageDef/EventFilterIB.cpp
index b4ad035a2b48b1..651bcc7a2ba7e8 100644
--- a/src/app/MessageDef/EventFilterIB.cpp
+++ b/src/app/MessageDef/EventFilterIB.cpp
@@ -57,7 +57,7 @@ CHIP_ERROR EventFilterIB::Parser::PrettyPrint() const
         {
             NodeId node;
             ReturnErrorOnFailure(reader.Get(node));
-            PRETTY_PRINT("\tNode = 0x%" PRIx64 ",", node);
+            PRETTY_PRINT("\tNode = 0x" ChipLogFormatX64 ",", ChipLogValueX64(node));
         }
 #endif // CHIP_DETAIL_LOGGING
         break;
@@ -66,7 +66,7 @@ CHIP_ERROR EventFilterIB::Parser::PrettyPrint() const
         {
             uint64_t eventMin;
             ReturnErrorOnFailure(reader.Get(eventMin));
-            PRETTY_PRINT("\tEventMin = 0x%" PRIx64 ",", eventMin);
+            PRETTY_PRINT("\tEventMin = 0x" ChipLogFormatX64 ",", ChipLogValueX64(eventMin));
         }
 #endif // CHIP_DETAIL_LOGGING
         break;
diff --git a/src/app/MessageDef/EventFilterIB.h b/src/app/MessageDef/EventFilterIB.h
index 914874684642a3..a2bd4d7f9a72cf 100644
--- a/src/app/MessageDef/EventFilterIB.h
+++ b/src/app/MessageDef/EventFilterIB.h
@@ -25,7 +25,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/NodeId.h>
diff --git a/src/app/MessageDef/EventFilterIBs.h b/src/app/MessageDef/EventFilterIBs.h
index e3b216c126f483..7c2d7604ff9a2c 100644
--- a/src/app/MessageDef/EventFilterIBs.h
+++ b/src/app/MessageDef/EventFilterIBs.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/EventPathIB.cpp b/src/app/MessageDef/EventPathIB.cpp
index a9bbfc4cb6dafc..1c21f346889511 100644
--- a/src/app/MessageDef/EventPathIB.cpp
+++ b/src/app/MessageDef/EventPathIB.cpp
@@ -57,7 +57,7 @@ CHIP_ERROR EventPathIB::Parser::PrettyPrint() const
             {
                 NodeId node;
                 reader.Get(node);
-                PRETTY_PRINT("\tNode = 0x%" PRIx64 ",", node);
+                PRETTY_PRINT("\tNode = 0x" ChipLogFormatX64 ",", ChipLogValueX64(node));
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
diff --git a/src/app/MessageDef/EventPathIB.h b/src/app/MessageDef/EventPathIB.h
index 2a136631d831a4..f1ce1cb719a370 100644
--- a/src/app/MessageDef/EventPathIB.h
+++ b/src/app/MessageDef/EventPathIB.h
@@ -21,7 +21,7 @@
 #include "ListBuilder.h"
 #include "ListParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/ConcreteEventPath.h>
 #include <app/EventPathParams.h>
 #include <app/util/basic-types.h>
diff --git a/src/app/MessageDef/EventPathIBs.h b/src/app/MessageDef/EventPathIBs.h
index 9ce2e308d0d5ee..5f5c85f85df083 100644
--- a/src/app/MessageDef/EventPathIBs.h
+++ b/src/app/MessageDef/EventPathIBs.h
@@ -23,7 +23,7 @@
 #include "EventPathIB.h"
 #include "EventPathIBs.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/EventReportIB.h b/src/app/MessageDef/EventReportIB.h
index efafdbef9bf065..3db9d782a6daa1 100644
--- a/src/app/MessageDef/EventReportIB.h
+++ b/src/app/MessageDef/EventReportIB.h
@@ -22,7 +22,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/EventReportIBs.h b/src/app/MessageDef/EventReportIBs.h
index ebaa12f4647c28..a52001fb7d1f0e 100644
--- a/src/app/MessageDef/EventReportIBs.h
+++ b/src/app/MessageDef/EventReportIBs.h
@@ -27,7 +27,7 @@
 #include "ArrayParser.h"
 #include "EventReportIB.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/EventStatusIB.h b/src/app/MessageDef/EventStatusIB.h
index 8abce827ad6ca8..f0e57a2ba38bac 100644
--- a/src/app/MessageDef/EventStatusIB.h
+++ b/src/app/MessageDef/EventStatusIB.h
@@ -22,7 +22,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/InvokeRequestMessage.h b/src/app/MessageDef/InvokeRequestMessage.h
index 36b32a4c15a5a7..0678e03ec10480 100644
--- a/src/app/MessageDef/InvokeRequestMessage.h
+++ b/src/app/MessageDef/InvokeRequestMessage.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/InvokeRequests.h b/src/app/MessageDef/InvokeRequests.h
index f82a8a8fa92625..71f9f74c328725 100644
--- a/src/app/MessageDef/InvokeRequests.h
+++ b/src/app/MessageDef/InvokeRequests.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/InvokeResponseIB.h b/src/app/MessageDef/InvokeResponseIB.h
index 14da578caa571f..17cc90ee6e3d3b 100644
--- a/src/app/MessageDef/InvokeResponseIB.h
+++ b/src/app/MessageDef/InvokeResponseIB.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/InvokeResponseIBs.h b/src/app/MessageDef/InvokeResponseIBs.h
index 1712c6fd22de8b..2531785fd6fa94 100644
--- a/src/app/MessageDef/InvokeResponseIBs.h
+++ b/src/app/MessageDef/InvokeResponseIBs.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/InvokeResponseMessage.h b/src/app/MessageDef/InvokeResponseMessage.h
index 1399f747a507b5..87cb7c14746646 100644
--- a/src/app/MessageDef/InvokeResponseMessage.h
+++ b/src/app/MessageDef/InvokeResponseMessage.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/MessageDefHelper.cpp b/src/app/MessageDef/MessageDefHelper.cpp
index cffadddff6aa5a..db24b2623dcc00 100644
--- a/src/app/MessageDef/MessageDefHelper.cpp
+++ b/src/app/MessageDef/MessageDefHelper.cpp
@@ -138,6 +138,8 @@ CHIP_ERROR CheckIMPayload(TLV::TLVReader & aReader, int aDepth, const char * aLa
 
         ReturnErrorOnFailure(aReader.Get(value_s64));
 
+        // TODO: Figure out how to not use PRId64 here, since it's not supported
+        // on all libcs.
         PRETTY_PRINT_SAMELINE("%" PRId64 ", ", value_s64);
         break;
     }
@@ -147,6 +149,8 @@ CHIP_ERROR CheckIMPayload(TLV::TLVReader & aReader, int aDepth, const char * aLa
 
         ReturnErrorOnFailure(aReader.Get(value_u64));
 
+        // TODO: Figure out how to not use PRIu64 here, since it's not supported
+        // on all libcs.
         PRETTY_PRINT_SAMELINE("%" PRIu64 ", ", value_u64);
         break;
     }
diff --git a/src/app/MessageDef/MessageDefHelper.h b/src/app/MessageDef/MessageDefHelper.h
index b19b41ce9c8eaf..890c5d39b7824d 100644
--- a/src/app/MessageDef/MessageDefHelper.h
+++ b/src/app/MessageDef/MessageDefHelper.h
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 
 // We need CHIPLogging.h to get the right value for CHIP_DETAIL_LOGGING here.
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/MessageDef/MessageParser.h b/src/app/MessageDef/MessageParser.h
index 6a2c3469f467a4..e307d5b905d965 100644
--- a/src/app/MessageDef/MessageParser.h
+++ b/src/app/MessageDef/MessageParser.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "StructParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/InteractionModelRevision.h>
 #include <app/util/basic-types.h>
 
diff --git a/src/app/MessageDef/ReadRequestMessage.h b/src/app/MessageDef/ReadRequestMessage.h
index 880ad9d8bd4d52..2b9391bc4f61ef 100644
--- a/src/app/MessageDef/ReadRequestMessage.h
+++ b/src/app/MessageDef/ReadRequestMessage.h
@@ -23,7 +23,7 @@
 #include "EventPathIBs.h"
 #include "MessageBuilder.h"
 #include "MessageParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/ReportDataMessage.h b/src/app/MessageDef/ReportDataMessage.h
index a515635ae8500a..57d531258f82e2 100644
--- a/src/app/MessageDef/ReportDataMessage.h
+++ b/src/app/MessageDef/ReportDataMessage.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/StatusIB.h b/src/app/MessageDef/StatusIB.h
index 6e7a88229f415b..0dadccc58ee527 100644
--- a/src/app/MessageDef/StatusIB.h
+++ b/src/app/MessageDef/StatusIB.h
@@ -26,7 +26,7 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/Optional.h>
diff --git a/src/app/MessageDef/StatusResponseMessage.h b/src/app/MessageDef/StatusResponseMessage.h
index c4e753eede0781..5440b49b22812f 100644
--- a/src/app/MessageDef/StatusResponseMessage.h
+++ b/src/app/MessageDef/StatusResponseMessage.h
@@ -18,7 +18,7 @@
 #pragma once
 #include "MessageBuilder.h"
 #include "MessageParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/SubscribeRequestMessage.h b/src/app/MessageDef/SubscribeRequestMessage.h
index 3eeb6686da7c8c..e09abf1bea75ba 100644
--- a/src/app/MessageDef/SubscribeRequestMessage.h
+++ b/src/app/MessageDef/SubscribeRequestMessage.h
@@ -23,7 +23,7 @@
 #include "EventPathIBs.h"
 #include "MessageBuilder.h"
 #include "MessageParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/SubscribeResponseMessage.h b/src/app/MessageDef/SubscribeResponseMessage.h
index 9d331f7d303020..fc1edc12ed22fd 100644
--- a/src/app/MessageDef/SubscribeResponseMessage.h
+++ b/src/app/MessageDef/SubscribeResponseMessage.h
@@ -19,7 +19,7 @@
 #include "EventPathIBs.h"
 #include "MessageBuilder.h"
 #include "MessageParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/MessageDef/TimedRequestMessage.h b/src/app/MessageDef/TimedRequestMessage.h
index 4a1d13f670e5f9..cc4b1c48a5628e 100644
--- a/src/app/MessageDef/TimedRequestMessage.h
+++ b/src/app/MessageDef/TimedRequestMessage.h
@@ -18,7 +18,7 @@
 #pragma once
 #include "MessageBuilder.h"
 #include "MessageParser.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
diff --git a/src/app/OperationalSessionSetup.cpp b/src/app/OperationalSessionSetup.cpp
index 7b5d70919f2a8a..2996cf2dd891d4 100644
--- a/src/app/OperationalSessionSetup.cpp
+++ b/src/app/OperationalSessionSetup.cpp
@@ -180,6 +180,13 @@ void OperationalSessionSetup::Connect(Callback::Callback<OnDeviceConnected> * on
 
 void OperationalSessionSetup::UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+    // Make sure to clear out our reason for trying the next result first thing,
+    // so it does not stick around in various error cases.
+    bool tryingNextResultDueToSessionEstablishmentError = mTryingNextResultDueToSessionEstablishmentError;
+    mTryingNextResultDueToSessionEstablishmentError     = false;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+
     if (mState == State::Uninitialized)
     {
         return;
@@ -228,19 +235,40 @@ void OperationalSessionSetup::UpdateDeviceData(const Transport::PeerAddress & ad
     {
         // We expect to get a callback via OnSessionEstablished or OnSessionEstablishmentError to continue
         // the state machine forward.
+#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+        if (tryingNextResultDueToSessionEstablishmentError)
+        {
+            // Our retry has already been kicked off, so claim 0 delay until it
+            // starts.  We only reach this from OnSessionEstablishmentError when
+            // the error is CHIP_ERROR_TIMEOUT.
+            NotifyRetryHandlers(CHIP_ERROR_TIMEOUT, config, System::Clock::kZero);
+        }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
         return;
     }
 
     // Move to the ResolvingAddress state, in case we have more results,
-    // since we expect to receive results in that state.
+    // since we expect to receive results in that state.  Pretend like we moved
+    // on directly to this address from whatever triggered us to try this result
+    // (so restore mTryingNextResultDueToSessionEstablishmentError to the value
+    // it had at the start of this function).
     MoveToState(State::ResolvingAddress);
+#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+    mTryingNextResultDueToSessionEstablishmentError = tryingNextResultDueToSessionEstablishmentError;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
     if (CHIP_NO_ERROR == Resolver::Instance().TryNextResult(mAddressLookupHandle))
     {
-        // No need to NotifyRetryHandlers, since we never actually
-        // spent any time trying the previous result.
+        // No need to NotifyRetryHandlers, since we never actually spent any
+        // time trying the previous result.  Whatever work we need to do has
+        // been handled by our recursive OnNodeAddressResolved callback.  Make
+        // sure not to touch `this` under here, because it might have been
+        // deleted by OnNodeAddressResolved.
         return;
     }
 
+    // No need to reset mTryingNextResultDueToSessionEstablishmentError here,
+    // because we're about to delete ourselves.
+
     DequeueConnectionCallbacks(err);
     // Do not touch `this` instance anymore; it has been destroyed in DequeueConnectionCallbacks.
 }
@@ -360,25 +388,35 @@ void OperationalSessionSetup::OnSessionEstablishmentError(CHIP_ERROR error)
     VerifyOrReturn(mState == State::Connecting,
                    ChipLogError(Discovery, "OnSessionEstablishmentError was called while we were not connecting"));
 
+    // If this condition ever changes, we may need to store the error in a
+    // member instead of having a boolean
+    // mTryingNextResultDueToSessionEstablishmentError, so we can recover the
+    // error in UpdateDeviceData.
     if (CHIP_ERROR_TIMEOUT == error)
     {
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
         // Make a copy of the ReliableMessageProtocolConfig, since our
         // mCaseClient is about to go away once we change state.
         ReliableMessageProtocolConfig remoteMprConfig = mCASEClient->GetRemoteMRPIntervals();
-#endif
+#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
 
         // Move to the ResolvingAddress state, in case we have more results,
         // since we expect to receive results in that state.
         MoveToState(State::ResolvingAddress);
-        if (CHIP_NO_ERROR == Resolver::Instance().TryNextResult(mAddressLookupHandle))
-        {
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
-            // Our retry has already been kicked off.
-            NotifyRetryHandlers(error, remoteMprConfig, System::Clock::kZero);
+        mTryingNextResultDueToSessionEstablishmentError = true;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+        if (CHIP_NO_ERROR == Resolver::Instance().TryNextResult(mAddressLookupHandle))
+        {
+            // Whatever work we needed to do has been handled by our
+            // OnNodeAddressResolved callback.  Make sure not to touch `this`
+            // under here, because it might have been deleted by
+            // OnNodeAddressResolved.
             return;
         }
+#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+        mTryingNextResultDueToSessionEstablishmentError = false;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
 
         // Moving back to the Connecting state would be a bit of a lie, since we
         // don't have an mCASEClient.  Just go back to NeedsAddress, since
@@ -541,7 +579,7 @@ void OperationalSessionSetup::OnNodeAddressResolutionFailed(const PeerId & peerI
 
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
     // If we're in a mode where we would generally retry CASE, retry operational
-    // discovery once.  That allows us to more-gracefully handle broken networks
+    // discovery if we're allowed to.  That allows us to more-gracefully handle broken networks
     // where multicast DNS does not actually work and hence only the initial
     // unicast DNS-SD queries get a response.
     //
@@ -702,10 +740,43 @@ void OperationalSessionSetup::NotifyRetryHandlers(CHIP_ERROR error, const Reliab
 
 void OperationalSessionSetup::NotifyRetryHandlers(CHIP_ERROR error, System::Clock::Seconds16 timeoutEstimate)
 {
-    for (auto * item = mConnectionRetry.First(); item && item != &mConnectionRetry; item = item->mNext)
+    // We have to be very careful here: Calling into these handlers might in
+    // theory destroy the Callback objects involved, but unlike the
+    // succcess/failure cases we don't want to just clear the handlers from our
+    // list when we are calling them, because we might need to call a given
+    // handler more than once.
+    //
+    // To handle this we:
+    //
+    // 1) Snapshot the list of handlers up front, so if any of the handlers
+    //    triggers an AddRetryHandler with some other handler that does not
+    //    affect the list we plan to notify here.
+    //
+    // 2) When planning to notify a handler move it to a new list that contains
+    //    just that handler.  This way if it gets canceled as part of the
+    //    notification we can tell it has been canceled.
+    //
+    // 3) If notifying the handler does not cancel it, add it back to our list
+    //    of handlers so we will notify it on future retries.
+
+    Cancelable retryHandlerListSnapshot;
+    mConnectionRetry.DequeueAll(retryHandlerListSnapshot);
+
+    while (retryHandlerListSnapshot.mNext != &retryHandlerListSnapshot)
     {
-        auto cb = Callback::Callback<OnDeviceConnectionRetry>::FromCancelable(item);
+        auto * cb = Callback::Callback<OnDeviceConnectionRetry>::FromCancelable(retryHandlerListSnapshot.mNext);
+
+        Callback::CallbackDeque currentCallbackHolder;
+        currentCallbackHolder.Enqueue(cb->Cancel());
+
         cb->mCall(cb->mContext, mPeerId, error, timeoutEstimate);
+
+        if (currentCallbackHolder.mNext != &currentCallbackHolder)
+        {
+            // Callback has not been canceled as part of the call, so is still
+            // supposed to be registered with us.
+            AddRetryHandler(cb);
+        }
     }
 }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
diff --git a/src/app/OperationalSessionSetup.h b/src/app/OperationalSessionSetup.h
index bfa76fbc41d730..2925259066e6db 100644
--- a/src/app/OperationalSessionSetup.h
+++ b/src/app/OperationalSessionSetup.h
@@ -275,6 +275,14 @@ class DLL_EXPORT OperationalSessionSetup : public SessionEstablishmentDelegate,
     bool mPerformingAddressUpdate = false;
 
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
+    // When we TryNextResult on the resolver, it will synchronously call back
+    // into our OnNodeAddressResolved when it succeeds.  We need to track
+    // whether the OnNodeAddressResolved is coming from handling a session
+    // establishment error or whether it's happening because we didn't even
+    // manage to start a session establishment at all.  Use this member to keep
+    // track of that.
+    bool mTryingNextResultDueToSessionEstablishmentError = false;
+
     uint8_t mRemainingAttempts = 0;
     uint8_t mAttemptsDone      = 0;
 
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
index 373d2051d3457f..bbc1c68a4b87b8 100644
--- a/src/app/ReadClient.cpp
+++ b/src/app/ReadClient.cpp
@@ -641,9 +641,12 @@ void ReadClient::OnResponseTimeout(Messaging::ExchangeContext * apExchangeContex
 CHIP_ERROR ReadClient::ProcessAttributePath(AttributePathIB::Parser & aAttributePathParser,
                                             ConcreteDataAttributePath & aAttributePath)
 {
+    // The ReportData must contain a concrete attribute path.  Don't validate ID
+    // ranges here, so we can tell apart "malformed data" and "out of range
+    // IDs".
     CHIP_ERROR err = CHIP_NO_ERROR;
     // The ReportData must contain a concrete attribute path
-    err = aAttributePathParser.GetConcreteAttributePath(aAttributePath);
+    err = aAttributePathParser.GetConcreteAttributePath(aAttributePath, AttributePathIB::ValidateIdRanges::kNo);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     return CHIP_NO_ERROR;
 }
@@ -679,6 +682,17 @@ CHIP_ERROR ReadClient::ProcessAttributeReportIBs(TLV::TLVReader & aAttributeRepo
             StatusIB::Parser errorStatus;
             ReturnErrorOnFailure(status.GetPath(&path));
             ReturnErrorOnFailure(ProcessAttributePath(path, attributePath));
+            if (!attributePath.IsValid())
+            {
+                // Don't fail the entire read or subscription when there is an
+                // out-of-range ID.  Just skip that one AttributeReportIB.
+                ChipLogError(DataManagement,
+                             "Skipping AttributeStatusIB with out-of-range IDs: (%d, " ChipLogFormatMEI ", " ChipLogFormatMEI ") ",
+                             attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId),
+                             ChipLogValueMEI(attributePath.mAttributeId));
+                continue;
+            }
+
             ReturnErrorOnFailure(status.GetErrorStatus(&errorStatus));
             ReturnErrorOnFailure(errorStatus.DecodeStatusIB(statusIB));
             NoteReportingData();
@@ -689,6 +703,17 @@ CHIP_ERROR ReadClient::ProcessAttributeReportIBs(TLV::TLVReader & aAttributeRepo
             ReturnErrorOnFailure(report.GetAttributeData(&data));
             ReturnErrorOnFailure(data.GetPath(&path));
             ReturnErrorOnFailure(ProcessAttributePath(path, attributePath));
+            if (!attributePath.IsValid())
+            {
+                // Don't fail the entire read or subscription when there is an
+                // out-of-range ID.  Just skip that one AttributeReportIB.
+                ChipLogError(DataManagement,
+                             "Skipping AttributeDataIB  with out-of-range IDs: (%d, " ChipLogFormatMEI ", " ChipLogFormatMEI ") ",
+                             attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId),
+                             ChipLogValueMEI(attributePath.mAttributeId));
+                continue;
+            }
+
             DataVersion version = 0;
             ReturnErrorOnFailure(data.GetDataVersion(&version));
             attributePath.mDataVersion.SetValue(version);
diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
index 2ecf84454f3e9d..3d66f5deab02cb 100644
--- a/src/app/ReadClient.h
+++ b/src/app/ReadClient.h
@@ -24,7 +24,7 @@
 
 #pragma once
 #include "system/SystemClock.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/EventHeader.h>
diff --git a/examples/resource-monitoring-app/telink/include/AppTask.h b/src/app/SpecificationVersion.h
similarity index 63%
rename from examples/resource-monitoring-app/telink/include/AppTask.h
rename to src/app/SpecificationVersion.h
index c0e6c9080143e6..b0570dad14c4ce 100644
--- a/examples/resource-monitoring-app/telink/include/AppTask.h
+++ b/src/app/SpecificationVersion.h
@@ -1,7 +1,6 @@
 /*
  *
  *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,20 +17,15 @@
 
 #pragma once
 
-#include "AppTaskCommon.h"
-
-class AppTask : public AppTaskCommon
-{
-private:
-    friend AppTask & GetAppTask(void);
-    friend class AppTaskCommon;
-
-    CHIP_ERROR Init(void);
-
-    static AppTask sAppTask;
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
+/**
+ * CHIP_DEVICE_SPECIFICATION_VERSION
+ *
+ * A number identifying the specification version against which the
+ * Node is certified.
+ *
+ * See section 11.1.5.22. "SpecificationVersion Attribute" in "Service and
+ * Device Management" chapter of the core Matter specification.
+ */
+#ifndef CHIP_DEVICE_SPECIFICATION_VERSION
+#define CHIP_DEVICE_SPECIFICATION_VERSION 0x01030000
+#endif
diff --git a/src/app/app-platform/ContentApp.h b/src/app/app-platform/ContentApp.h
index bfb45f08b49942..e5eb99a5a701bd 100644
--- a/src/app/app-platform/ContentApp.h
+++ b/src/app/app-platform/ContentApp.h
@@ -23,7 +23,6 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/clusters/account-login-server/account-login-delegate.h>
 #include <app/clusters/application-basic-server/application-basic-delegate.h>
 #include <app/clusters/application-launcher-server/application-launcher-delegate.h>
diff --git a/src/app/app-platform/ContentAppPlatform.h b/src/app/app-platform/ContentAppPlatform.h
index 593ec0706a5a15..f05a94ceda7613 100644
--- a/src/app/app-platform/ContentAppPlatform.h
+++ b/src/app/app-platform/ContentAppPlatform.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
 #include <app/OperationalSessionSetup.h>
 #include <app/app-platform/ContentApp.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
index 89cbee6a4cca8c..069a41c8a5143b 100644
--- a/src/app/chip_data_model.cmake
+++ b/src/app/chip_data_model.cmake
@@ -135,7 +135,6 @@ function(chip_configure_data_model APP_TARGET)
     target_sources(${APP_TARGET} ${SCOPE}
         ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
         ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
-        ${CHIP_APP_BASE_DIR}/util/attribute-size-util.cpp
         ${CHIP_APP_BASE_DIR}/util/attribute-storage.cpp
         ${CHIP_APP_BASE_DIR}/util/attribute-table.cpp
         ${CHIP_APP_BASE_DIR}/util/binding-table.cpp
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index 85cc2025a586dd..67baca6fdf3dff 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -163,6 +163,7 @@ template("chip_data_model") {
       "${_app_root}/clusters/on-off-server/on-off-server.h",
       "${_app_root}/clusters/scenes-server/ExtensionFieldSets.h",
       "${_app_root}/clusters/scenes-server/ExtensionFieldSetsImpl.h",
+      "${_app_root}/clusters/scenes-server/SceneHandlerImpl.h",
       "${_app_root}/clusters/scenes-server/SceneTable.h",
       "${_app_root}/clusters/scenes-server/SceneTableImpl.h",
       "${_app_root}/clusters/scenes-server/scenes-server.h",
@@ -177,7 +178,6 @@ template("chip_data_model") {
     if (!chip_build_controller_dynamic_server) {
       sources += [
         "${_app_root}/util/DataModelHandler.cpp",
-        "${_app_root}/util/attribute-size-util.cpp",
         "${_app_root}/util/attribute-storage.cpp",
         "${_app_root}/util/attribute-table.cpp",
         "${_app_root}/util/ember-compatibility-functions.cpp",
@@ -278,6 +278,7 @@ template("chip_data_model") {
         sources += [
           "${_app_root}/clusters/${cluster}/${cluster}.cpp",
           "${_app_root}/clusters/scenes-server/ExtensionFieldSetsImpl.cpp",
+          "${_app_root}/clusters/scenes-server/SceneHandlerImpl.cpp",
           "${_app_root}/clusters/scenes-server/SceneTableImpl.cpp",
         ]
       } else if (cluster == "operational-state-server") {
diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp
index 81e3f5f1b92157..a5f49cb7c39aa1 100644
--- a/src/app/clusters/access-control-server/access-control-server.cpp
+++ b/src/app/clusters/access-control-server/access-control-server.cpp
@@ -18,7 +18,6 @@
 #include <access/AccessControl.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
index c44935472850e4..18442de56e5dcc 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp
+++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -258,7 +258,7 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * co
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not found");
                 LauncherResponseType response;
-                response.status = ApplicationLauncherStatusEnum::kAppNotAvailable;
+                response.status = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }
@@ -293,7 +293,7 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * co
         {
             ChipLogError(Zcl, "ApplicationLauncher target app not found");
             LauncherResponseType response;
-            response.status = ApplicationLauncherStatusEnum::kAppNotAvailable;
+            response.status = StatusEnum::kAppNotAvailable;
             responder.Success(response);
             return true;
         }
@@ -352,7 +352,7 @@ bool emberAfApplicationLauncherClusterStopAppCallback(app::CommandHandler * comm
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not loaded");
                 LauncherResponseType response;
-                response.status = ApplicationLauncherStatusEnum::kAppNotAvailable;
+                response.status = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }
@@ -441,7 +441,7 @@ bool emberAfApplicationLauncherClusterHideAppCallback(app::CommandHandler * comm
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not loaded");
                 LauncherResponseType response;
-                response.status = ApplicationLauncherStatusEnum::kAppNotAvailable;
+                response.status = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }
diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
index 6cd4998d8aba4a..8d1cedce012ec5 100644
--- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp
+++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
@@ -38,6 +38,33 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::BarrierControl;
 using chip::Protocols::InteractionModel::Status;
 
+// this is NOT in any spec (CHIP spec does not currently have BarrierControl)
+// and XMLs do not attach these enums to clusters.
+//
+// This directly defines some constants. These could be replaced with real
+// constants if we ever have some BarrierControl in the matter specification.
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace BarrierControl {
+
+namespace Position {
+static constexpr uint8_t kClosed  = 0;
+static constexpr uint8_t kOpen    = 100;
+static constexpr uint8_t kUnknown = 255;
+} // namespace Position
+
+namespace MovingState {
+static constexpr uint8_t kStopped = 0;
+static constexpr uint8_t kClosing = 1;
+static constexpr uint8_t kOpening = 2;
+} // namespace MovingState
+
+} // namespace BarrierControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
+
 typedef struct
 {
     uint8_t currentPosition;
@@ -220,9 +247,8 @@ static uint8_t getCurrentPosition(EndpointId endpoint)
     // way of knowing the position of the barrier. Let's guess that the barrier is
     // open so that we don't leave the barrier open when it should be closed.
     uint8_t currentPositionFromAttribute = emAfPluginBarrierControlServerGetBarrierPosition(endpoint);
-    return ((currentPositionFromAttribute == EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN)
-                ? static_cast<uint8_t>(EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN)
-                : currentPositionFromAttribute);
+    return ((currentPositionFromAttribute == BarrierControl::Position::kUnknown) ? BarrierControl::Position::kOpen
+                                                                                 : currentPositionFromAttribute);
 }
 
 static uint32_t calculateDelayMs(EndpointId endpoint, uint8_t targetPosition, bool * opening)
@@ -249,7 +275,7 @@ void emberAfBarrierControlClusterServerTickCallback(EndpointId endpoint)
     if (state.currentPosition == state.targetPosition)
     {
         emAfPluginBarrierControlServerSetBarrierPosition(endpoint, state.currentPosition);
-        setMovingState(endpoint, EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED);
+        setMovingState(endpoint, BarrierControl::MovingState::kStopped);
         cancelEndpointTimerCallback(endpoint);
     }
     else
@@ -270,14 +296,13 @@ void emberAfBarrierControlClusterServerTickCallback(EndpointId endpoint)
                 emAfPluginBarrierControlServerIncrementEvents(endpoint, false, false);
             }
         }
-        emAfPluginBarrierControlServerSetBarrierPosition(
-            endpoint,
-            (emAfPluginBarrierControlServerIsPartialBarrierSupported(endpoint)
-                 ? state.currentPosition
-                 : static_cast<uint8_t>(EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN)));
-        setMovingState(
-            endpoint,
-            (state.increasing ? EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING : EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING));
+        emAfPluginBarrierControlServerSetBarrierPosition(endpoint,
+                                                         (emAfPluginBarrierControlServerIsPartialBarrierSupported(endpoint)
+                                                              ? state.currentPosition
+                                                              : BarrierControl::Position::kUnknown));
+        setMovingState(endpoint,
+                       (state.increasing ? BarrierControl::MovingState::kOpening : BarrierControl::MovingState::kClosing));
+
         scheduleTimerCallbackMs(endpoint, state.delayMs);
     }
 }
@@ -307,8 +332,7 @@ bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(
     }
     else if (percentOpen > 100 // "100" means "100%", so greater than that is invalid
              || (!emAfPluginBarrierControlServerIsPartialBarrierSupported(endpoint) &&
-                 percentOpen != EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED &&
-                 percentOpen != EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN))
+                 percentOpen != BarrierControl::Position::kClosed && percentOpen != BarrierControl::Position::kOpen))
     {
         status = Status::ConstraintError;
     }
@@ -342,7 +366,7 @@ bool emberAfBarrierControlClusterBarrierControlStopCallback(app::CommandHandler
 {
     EndpointId endpoint = commandPath.mEndpointId;
     cancelEndpointTimerCallback(endpoint);
-    setMovingState(endpoint, EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED);
+    setMovingState(endpoint, BarrierControl::MovingState::kStopped);
     sendDefaultResponse(commandObj, commandPath, Status::Success);
     return true;
 }
diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
index 1e0b1b0d9c0e91..510e4991b25bae 100644
--- a/src/app/clusters/basic-information/basic-information.cpp
+++ b/src/app/clusters/basic-information/basic-information.cpp
@@ -23,7 +23,9 @@
 #include <app/DataModelRevision.h>
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
+#include <app/SpecificationVersion.h>
 #include <app/util/attribute-storage.h>
+#include <lib/core/CHIPConfig.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/DeviceInstanceInfoProvider.h>
@@ -59,6 +61,8 @@ class BasicAttrAccess : public AttributeAccessInterface
     CHIP_ERROR ReadLocation(AttributeValueEncoder & aEncoder);
     CHIP_ERROR WriteLocation(AttributeValueDecoder & aDecoder);
     CHIP_ERROR ReadProductAppearance(AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadSpecificationVersion(AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadMaxPathsPerInvoke(AttributeValueEncoder & aEncoder);
 };
 
 BasicAttrAccess gAttrAccess;
@@ -287,6 +291,16 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         break;
     }
 
+    case SpecificationVersion::Id: {
+        status = ReadSpecificationVersion(aEncoder);
+        break;
+    }
+
+    case MaxPathsPerInvoke::Id: {
+        status = ReadMaxPathsPerInvoke(aEncoder);
+        break;
+    }
+
     default:
         // We did not find a processing path, the caller will delegate elsewhere.
         break;
@@ -380,6 +394,18 @@ CHIP_ERROR BasicAttrAccess::ReadProductAppearance(AttributeValueEncoder & aEncod
     return aEncoder.Encode(productAppearance);
 }
 
+CHIP_ERROR BasicAttrAccess::ReadSpecificationVersion(AttributeValueEncoder & aEncoder)
+{
+    uint32_t specification_version = CHIP_DEVICE_SPECIFICATION_VERSION;
+    return aEncoder.Encode(specification_version);
+}
+
+CHIP_ERROR BasicAttrAccess::ReadMaxPathsPerInvoke(AttributeValueEncoder & aEncoder)
+{
+    uint16_t max_path_per_invoke = CHIP_CONFIG_MAX_PATHS_PER_INVOKE;
+    return aEncoder.Encode(max_path_per_invoke);
+}
+
 class PlatformMgrDelegate : public DeviceLayer::PlatformManagerDelegate
 {
     void OnStartUp(uint32_t softwareVersion) override
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 39fc5f9cdcc710..3dbba76be8491a 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -34,7 +34,32 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ColorControl;
 using chip::Protocols::InteractionModel::Status;
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+// These constants are NOT currently spec compliant
+// These should be changed once we have real specification enumeration
+// names.
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ColorControl {
+
+namespace EnhancedColorMode {
+constexpr uint8_t kCurrentHueAndCurrentSaturation = ColorControlServer::EnhancedColorMode::kCurrentHueAndCurrentSaturation;
+constexpr uint8_t kCurrentXAndCurrentY            = ColorControlServer::EnhancedColorMode::kCurrentXAndCurrentY;
+constexpr uint8_t kColorTemperature               = ColorControlServer::EnhancedColorMode::kColorTemperature;
+constexpr uint8_t kEnhancedCurrentHueAndCurrentSaturation =
+    ColorControlServer::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation;
+} // namespace EnhancedColorMode
+
+namespace Options {
+constexpr uint8_t kExecuteIfOff = 1;
+} // namespace Options
+
+} // namespace ColorControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
+
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
 {
 public:
@@ -151,7 +176,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
         uint8_t modeValue;
         if (EMBER_ZCL_STATUS_SUCCESS != Attributes::EnhancedColorMode::Get(endpoint, &modeValue))
         {
-            modeValue = ColorControlServer::ColorMode::COLOR_MODE_CIE_XY; // Default mode value according to spec
+            modeValue = ColorControl::EnhancedColorMode::kCurrentXAndCurrentY; // Default mode value according to spec
         }
         AddAttributeValuePair(pairs, Attributes::EnhancedColorMode::Id, modeValue, attributeCount);
 
@@ -210,7 +235,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
             switch (decodePair.attributeID)
             {
             case Attributes::CurrentX::Id:
-                if (SupportsColorMode(endpoint, EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y))
+                if (SupportsColorMode(endpoint, ColorControl::EnhancedColorMode::kCurrentXAndCurrentY))
                 {
                     if (decodePair.attributeValue)
                         colorXTransitionState->finalValue =
@@ -218,20 +243,20 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
                 }
                 break;
             case Attributes::CurrentY::Id:
-                if (SupportsColorMode(endpoint, EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y))
+                if (SupportsColorMode(endpoint, ColorControl::EnhancedColorMode::kCurrentXAndCurrentY))
                 {
                     colorYTransitionState->finalValue =
                         std::min(static_cast<uint16_t>(decodePair.attributeValue), colorYTransitionState->highLimit);
                 }
                 break;
             case Attributes::EnhancedCurrentHue::Id:
-                if (SupportsColorMode(endpoint, EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION))
+                if (SupportsColorMode(endpoint, ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation))
                 {
                     colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(decodePair.attributeValue);
                 }
                 break;
             case Attributes::CurrentSaturation::Id:
-                if (SupportsColorMode(endpoint, EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION))
+                if (SupportsColorMode(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation))
                 {
                     colorSaturationTransitionState->finalValue =
                         std::min(static_cast<uint16_t>(decodePair.attributeValue), colorSaturationTransitionState->highLimit);
@@ -247,14 +272,15 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
                 loopTimeValue = static_cast<uint16_t>(decodePair.attributeValue);
                 break;
             case Attributes::ColorTemperatureMireds::Id:
-                if (SupportsColorMode(endpoint, EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE))
+                if (SupportsColorMode(endpoint, ColorControl::EnhancedColorMode::kColorTemperature))
                 {
                     colorTempTransitionState->finalValue =
                         std::min(static_cast<uint16_t>(decodePair.attributeValue), colorTempTransitionState->highLimit);
                 }
                 break;
             case Attributes::EnhancedColorMode::Id:
-                if (decodePair.attributeValue <= static_cast<uint8_t>(ColorControlServer::ColorMode::COLOR_MODE_EHSV))
+                if (decodePair.attributeValue <=
+                    static_cast<uint8_t>(ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation))
                 {
                     targetColorMode = static_cast<uint8_t>(decodePair.attributeValue);
                 }
@@ -291,25 +317,25 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
             // Execute movement to value depending on the mode in the saved scene
             switch (targetColorMode)
             {
-            case ColorControlServer::ColorMode::COLOR_MODE_HSV:
+            case ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation:
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
                 ColorControlServer::Instance().moveToSaturation(static_cast<uint8_t>(colorSaturationTransitionState->finalValue),
                                                                 transitionTime10th, endpoint);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
                 break;
-            case ColorControlServer::ColorMode::COLOR_MODE_CIE_XY:
+            case ColorControl::EnhancedColorMode::kCurrentXAndCurrentY:
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
                 ColorControlServer::Instance().moveToColor(colorXTransitionState->finalValue, colorYTransitionState->finalValue,
                                                            transitionTime10th, endpoint);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
                 break;
-            case ColorControlServer::ColorMode::COLOR_MODE_TEMPERATURE:
+            case ColorControl::EnhancedColorMode::kColorTemperature:
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
                 ColorControlServer::Instance().moveToColorTemp(
                     endpoint, static_cast<uint16_t>(colorTempTransitionState->finalValue), transitionTime10th);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
                 break;
-            case ColorControlServer::ColorMode::COLOR_MODE_EHSV:
+            case ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation:
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
                 ColorControlServer::Instance().moveToHueAndSaturation(
                     colorHueTransitionState->finalEnhancedHue, static_cast<uint8_t>(colorSaturationTransitionState->finalValue),
@@ -328,16 +354,16 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
     {
         switch (mode)
         {
-        case EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION:
+        case ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation:
             return ColorControlServer::Instance().HasFeature(endpoint, ColorControlServer::Feature::kHueAndSaturation);
             break;
-        case EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y:
+        case ColorControl::EnhancedColorMode::kCurrentXAndCurrentY:
             return ColorControlServer::Instance().HasFeature(endpoint, ColorControlServer::Feature::kXy);
             break;
-        case EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE:
+        case ColorControl::EnhancedColorMode::kColorTemperature:
             return ColorControlServer::Instance().HasFeature(endpoint, ColorControlServer::Feature::kColorTemperature);
             break;
-        case EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION:
+        case ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation:
             return ColorControlServer::Instance().HasFeature(endpoint, ColorControlServer::Feature::kEnhancedHue);
             break;
         default:
@@ -354,7 +380,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
     }
 };
 static DefaultColorControlSceneHandler sColorControlSceneHandler;
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 
 /**********************************************************
  * Matter timer scheduling glue logic
@@ -408,11 +434,11 @@ ColorControlServer & ColorControlServer::Instance()
 chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler()
 {
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sColorControlSceneHandler;
 #else
     return nullptr;
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
 
 bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature)
@@ -508,18 +534,18 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, uint8_t optionM
         // 0xFF are the default values passed to the command handler when
         // the payload is not present - in that case there is use of option
         // attribute to decide execution of the command
-        return READBITS(options, EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF);
+        return READBITS(options, ColorControl::Options::kExecuteIfOff);
     }
     // ---------- The above is to distinguish if the payload is present or not
 
-    if (READBITS(optionMask, EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF))
+    if (READBITS(optionMask, ColorControl::Options::kExecuteIfOff))
     {
         // Mask is present and set in the command payload, this indicates
         // use the override as temporary option
-        return READBITS(optionOverride, EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF);
+        return READBITS(optionOverride, ColorControl::Options::kExecuteIfOff);
     }
     // if we are here - use the option attribute bits
-    return (READBITS(options, EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF));
+    return (READBITS(options, ColorControl::Options::kExecuteIfOff));
 }
 
 /**
@@ -546,10 +572,11 @@ void ColorControlServer::handleModeSwitch(EndpointId endpoint, uint8_t newColorM
     }
 
     Attributes::EnhancedColorMode::Set(endpoint, newColorMode);
-    if (newColorMode == ColorControlServer::ColorMode::COLOR_MODE_EHSV)
+    if (newColorMode == ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation)
     {
-        // Transpose COLOR_MODE_EHSV to COLOR_MODE_HSV after setting EnhancedColorMode
-        newColorMode = ColorControlServer::ColorMode::COLOR_MODE_HSV;
+        // Transpose COLOR_MODE_EHSV to ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation after setting
+        // EnhancedColorMode
+        newColorMode = ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation;
     }
     Attributes::ColorMode::Set(endpoint, newColorMode);
 
@@ -1204,7 +1231,7 @@ Status ColorControlServer::moveToSaturation(uint8_t saturation, uint16_t transit
     stopAllColorTransitions(endpoint);
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_HSV);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
 
     // now, kick off the state machine.
     initSaturationTransitionState(endpoint, colorSaturationTransitionState);
@@ -1255,11 +1282,11 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
     // Handle color mode transition, if necessary.
     if (isEnhanced)
     {
-        handleModeSwitch(endpoint, ColorMode::COLOR_MODE_EHSV);
+        handleModeSwitch(endpoint, EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation);
     }
     else
     {
-        handleModeSwitch(endpoint, ColorMode::COLOR_MODE_HSV);
+        handleModeSwitch(endpoint, EnhancedColorMode::kCurrentHueAndCurrentSaturation);
     }
 
     // now, kick off the state machine.
@@ -1363,11 +1390,11 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
     // Handle color mode transition, if necessary.
     if (isEnhanced)
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_EHSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation);
     }
     else
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_HSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
     }
 
     if (moveMode == HueMoveMode::kUp)
@@ -1510,11 +1537,11 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
     // Handle color mode transition, if necessary.
     if (isEnhanced)
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_EHSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation);
     }
     else
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_HSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
     }
 
     // now, kick off the state machine.
@@ -1581,7 +1608,7 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com
     }
     Status status = moveToHueAndSaturation(hue, saturation, transitionTime, isEnhanced, commandPath.mEndpointId);
 #ifdef EMBER_AF_PLUGIN_SCENES
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(commandPath.mEndpointId);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId);
 #endif // EMBER_AF_PLUGIN_SCENES
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -1631,11 +1658,11 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
     // Handle color mode transition, if necessary.
     if (isEnhanced)
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_EHSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation);
     }
     else
     {
-        handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_HSV);
+        handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
     }
 
     // now, kick off the state machine.
@@ -1729,7 +1756,7 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     }
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_HSV);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
 
     if (moveMode == SaturationMoveMode::kUp)
     {
@@ -1786,7 +1813,7 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb
     }
     Status status = moveToSaturation(commandData.saturation, commandData.transitionTime, commandPath.mEndpointId);
 #ifdef EMBER_AF_PLUGIN_SCENES
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(commandPath.mEndpointId);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId);
 #endif // EMBER_AF_PLUGIN_SCENES
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -1824,7 +1851,7 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
     stopAllColorTransitions(endpoint);
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_HSV);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation);
 
     // now, kick off the state machine.
     initSaturationTransitionState(endpoint, colorSaturationTransitionState);
@@ -1970,7 +1997,7 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
 
 exit:
 #ifdef EMBER_AF_PLUGIN_SCENES
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(endpoint);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint);
 #endif // EMBER_AF_PLUGIN_SCENES
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -2137,7 +2164,7 @@ Status ColorControlServer::moveToColor(uint16_t colorX, uint16_t colorY, uint16_
     stopAllColorTransitions(endpoint);
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, ColorMode::COLOR_MODE_CIE_XY);
+    handleModeSwitch(endpoint, EnhancedColorMode::kCurrentXAndCurrentY);
 
     // now, kick off the state machine.
     Attributes::CurrentX::Get(endpoint, &(colorXTransitionState->initialValue));
@@ -2179,7 +2206,7 @@ bool ColorControlServer::moveToColorCommand(app::CommandHandler * commandObj, co
 
     Status status = moveToColor(commandData.colorX, commandData.colorY, commandData.transitionTime, commandPath.mEndpointId);
 #ifdef EMBER_AF_PLUGIN_SCENES
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(commandPath.mEndpointId);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId);
 #endif // EMBER_AF_PLUGIN_SCENES
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -2220,7 +2247,7 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
     }
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_CIE_XY);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentXAndCurrentY);
 
     // now, kick off the state machine.
     Attributes::CurrentX::Get(endpoint, &(colorXTransitionState->initialValue));
@@ -2318,7 +2345,7 @@ bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, cons
     stopAllColorTransitions(endpoint);
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_CIE_XY);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentXAndCurrentY);
 
     // now, kick off the state machine.
     colorXTransitionState->initialValue   = currentColorX;
@@ -2434,7 +2461,7 @@ Status ColorControlServer::moveToColorTemp(EndpointId aEndpoint, uint16_t colorT
     stopAllColorTransitions(endpoint);
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_TEMPERATURE);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kColorTemperature);
 
     if (colorTemperature < temperatureMin)
     {
@@ -2542,10 +2569,10 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
                 if (status == EMBER_ZCL_STATUS_SUCCESS)
                 {
                     // Set ColorMode attributes to reflect ColorTemperature.
-                    uint8_t updateColorMode = EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE;
+                    uint8_t updateColorMode = ColorControl::EnhancedColorMode::kColorTemperature;
                     Attributes::ColorMode::Set(endpoint, updateColorMode);
 
-                    updateColorMode = EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE;
+                    updateColorMode = ColorControl::EnhancedColorMode::kColorTemperature;
                     Attributes::EnhancedColorMode::Set(endpoint, updateColorMode);
                 }
             }
@@ -2648,7 +2675,7 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
     }
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_TEMPERATURE);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kColorTemperature);
 
     // now, kick off the state machine.
     colorTempTransitionState->initialValue = 0;
@@ -2706,7 +2733,7 @@ bool ColorControlServer::moveToColorTempCommand(app::CommandHandler * commandObj
 
     Status status = moveToColorTemp(commandPath.mEndpointId, commandData.colorTemperatureMireds, commandData.transitionTime);
 #ifdef EMBER_AF_PLUGIN_SCENES
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(commandPath.mEndpointId);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId);
 #endif // EMBER_AF_PLUGIN_SCENES
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -2759,7 +2786,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
     }
 
     // Handle color mode transition, if necessary.
-    handleModeSwitch(endpoint, COLOR_MODE_TEMPERATURE);
+    handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kColorTemperature);
 
     // now, kick off the state machine.
     colorTempTransitionState->initialValue = 0;
@@ -2848,7 +2875,7 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
     uint8_t colorMode = 0;
     Attributes::ColorMode::Get(endpoint, &colorMode);
 
-    if (colorMode == COLOR_MODE_TEMPERATURE)
+    if (colorMode == ColorControl::EnhancedColorMode::kColorTemperature)
     {
         app::DataModel::Nullable<uint8_t> currentLevel;
         EmberAfStatus status = LevelControl::Attributes::CurrentLevel::Get(endpoint, currentLevel);
@@ -3057,11 +3084,11 @@ void emberAfColorControlClusterServerInitCallback(EndpointId endpoint)
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
     ColorControlServer::Instance().startUpColorTempCommand(endpoint);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     // Registers Scene handlers for the color control cluster on the server
     app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint,
                                                                          ColorControlServer::Instance().GetSceneHandler());
-#endif
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
 
 void MatterColorControlClusterServerShutdownCallback(EndpointId endpoint)
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
index 2ec0f5e63b4a3f..56110a33373f8d 100644
--- a/src/app/clusters/color-control-server/color-control-server.h
+++ b/src/app/clusters/color-control-server/color-control-server.h
@@ -71,12 +71,12 @@ class ColorControlServer
     using HueDirection = chip::app::Clusters::ColorControl::HueDirection;
     using Feature      = chip::app::Clusters::ColorControl::Feature;
 
-    enum ColorMode
+    enum EnhancedColorMode : uint8_t
     {
-        COLOR_MODE_HSV         = 0x00,
-        COLOR_MODE_CIE_XY      = 0x01,
-        COLOR_MODE_TEMPERATURE = 0x02,
-        COLOR_MODE_EHSV        = 0x03
+        kCurrentHueAndCurrentSaturation         = 0,
+        kCurrentXAndCurrentY                    = 1,
+        kColorTemperature                       = 2,
+        kEnhancedCurrentHueAndCurrentSaturation = 3,
     };
 
     enum Conversion
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
index 3912b022f90065..2e825934187738 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -211,7 +211,7 @@ void DoorLockServer::HandleLocalLockOperationError(chip::EndpointId endpointId,
 
     HandleWrongCodeEntry(endpointId);
 
-    ChipLogProgress(Zcl, "Handling a local Lock Operation Error: [endpoint=%d, user=%d]", endpointId, userId.Value());
+    ChipLogProgress(Zcl, "Handling a local Lock Operation Error: [endpoint=%d]", endpointId);
 }
 
 bool DoorLockServer::HandleWrongCodeEntry(chip::EndpointId endpointId)
@@ -1985,7 +1985,7 @@ Status DoorLockServer::clearUser(chip::EndpointId endpointId, chip::FabricIndex
     }
 
     // Remove the user entry
-    if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, chip::CharSpan(""), 0,
+    if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, ""_span, 0,
                                       UserStatusEnum::kAvailable, UserTypeEnum::kUnrestrictedUser, CredentialRuleEnum::kSingle,
                                       nullptr, 0))
     {
@@ -3144,8 +3144,10 @@ bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, LockD
     }
     ChipLogProgress(Zcl,
                     "[RemoteLockUserChange] Sent lock user change event "
-                    "[endpointId=%d,eventNumber=%" PRIu64 ",dataType=%u,operation=%u,nodeId=%" PRIu64 ",fabricIndex=%d]",
-                    endpointId, eventNumber, to_underlying(dataType), to_underlying(operation), nodeId, fabricIndex);
+                    "[endpointId=%d,eventNumber=0x" ChipLogFormatX64 ",dataType=%u,operation=%u,nodeId=0x" ChipLogFormatX64
+                    ",fabricIndex=%d]",
+                    endpointId, ChipLogValueX64(eventNumber), to_underlying(dataType), to_underlying(operation),
+                    ChipLogValueX64(nodeId), fabricIndex);
     return true;
 }
 
diff --git a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
index c978a56704397e..5d73f36ca12b8c 100644
--- a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
+++ b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
@@ -74,12 +74,13 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (DiagnosticD
 CHIP_ERROR EthernetDiagosticsAttrAccess::ReadPHYRate(AttributeValueEncoder & aEncoder)
 {
     Attributes::PHYRate::TypeInfo::Type pHYRate;
-    auto value = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
+    auto value = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10M;
 
     if (DeviceLayer::GetDiagnosticDataProvider().GetEthPHYRate(value) == CHIP_NO_ERROR)
     {
         pHYRate.SetNonNull(value);
-        ChipLogProgress(Zcl, "The current nominal, usable speed at the top of the physical layer of the Node: %d", value);
+        ChipLogProgress(Zcl, "The current nominal, usable speed at the top of the physical layer of the Node: %d",
+                        chip::to_underlying(value));
     }
     else
     {
diff --git a/src/app/clusters/fan-control-server/fan-control-server.h b/src/app/clusters/fan-control-server/fan-control-server.h
index ff5fcb549d4086..5721e34b4eba90 100644
--- a/src/app/clusters/fan-control-server/fan-control-server.h
+++ b/src/app/clusters/fan-control-server/fan-control-server.h
@@ -19,7 +19,6 @@
 
 #include "fan-control-delegate.h"
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/util/af-types.h>
 
 namespace chip {
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index 994104abf22a75..108cc0b7d7357f 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -204,9 +204,7 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & a
         bool isTestEventTriggersEnabled = IsTestEventTriggerEnabled();
         return aEncoder.Encode(isTestEventTriggersEnabled);
     }
-    case AverageWearCount::Id: {
-        return ReadIfSupported(&DiagnosticDataProvider::GetAverageWearCount, aEncoder);
-    }
+    // Note: Attribute ID 0x0009 was removed (#30002).
     default: {
         break;
     }
@@ -384,6 +382,15 @@ bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(CommandHandler * c
     return true;
 }
 
+bool emberAfGeneralDiagnosticsClusterTimeSnapshotCallback(CommandHandler * commandObj, ConcreteCommandPath const & commandPath,
+                                                          Commands::TimeSnapshot::DecodableType const & commandData)
+{
+    // TODO(#30096): Command needs to be implemented.
+    ChipLogError(Zcl, "TimeSnapshot not yet supported!");
+    commandObj->AddStatus(commandPath, Status::InvalidCommand);
+    return true;
+}
+
 void MatterGeneralDiagnosticsPluginServerInitCallback()
 {
     BootReasonEnum bootReason;
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
index 059d0e915b44b4..5bec758330daa1 100644
--- a/src/app/clusters/icd-management-server/icd-management-server.cpp
+++ b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -169,6 +169,7 @@ class IcdManagementFabricDelegate : public chip::FabricTable::Delegate
         ICDMonitoringTable table(Server::GetInstance().GetPersistentStorage(), fabricIndex, supported_clients,
                                  Server::GetInstance().GetSessionKeystore());
         table.RemoveAll();
+        ICDManagementServer::GetInstance().TriggerICDMTableUpdatedEvent();
     }
 };
 
diff --git a/src/app/clusters/keypad-input-server/keypad-input-delegate.h b/src/app/clusters/keypad-input-server/keypad-input-delegate.h
index 608b45f0b896e4..24c0a3fd7f4ac9 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-delegate.h
+++ b/src/app/clusters/keypad-input-server/keypad-input-delegate.h
@@ -34,7 +34,7 @@ namespace KeypadInput {
 class Delegate
 {
 public:
-    virtual void HandleSendKey(CommandResponseHelper<Commands::SendKeyResponse::Type> & helper, const CecKeyCode & keyCode) = 0;
+    virtual void HandleSendKey(CommandResponseHelper<Commands::SendKeyResponse::Type> & helper, const CECKeyCodeEnum & keyCode) = 0;
 
     bool HasFeature(chip::EndpointId endpoint, Feature feature);
 
diff --git a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
index 156d181a15931e..a22e86ffe2e108 100644
--- a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
+++ b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
@@ -24,7 +24,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index c7e376aa5a99f3..ad394d1fc248b3 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -104,26 +104,23 @@ static EmberAfLevelControlState * getState(EndpointId endpoint);
 
 static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level,
                                  app::DataModel::Nullable<uint16_t> transitionTimeDs,
-                                 chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                                 chip::Optional<BitMask<LevelControlOptions>> optionsOverride, uint16_t storedLevel);
-static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t moveMode,
-                        app::DataModel::Nullable<uint8_t> rate, chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride);
-static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t stepMode,
+                                 chip::Optional<BitMask<OptionsBitmap>> optionsMask,
+                                 chip::Optional<BitMask<OptionsBitmap>> optionsOverride, uint16_t storedLevel);
+static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum moveMode,
+                        app::DataModel::Nullable<uint8_t> rate, chip::Optional<BitMask<OptionsBitmap>> optionsMask,
+                        chip::Optional<BitMask<OptionsBitmap>> optionsOverride);
+static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode,
                         uint8_t stepSize, app::DataModel::Nullable<uint16_t> transitionTimeDs,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride);
+                        chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride);
 static void stopHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride);
+                        chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride);
 
 static void setOnOffValue(EndpointId endpoint, bool onOff);
 static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs);
-static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId,
-                               chip::Optional<chip::BitMask<LevelControlOptions>> optionsMask,
-                               chip::Optional<chip::BitMask<LevelControlOptions>> optionsOverride);
+static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional<chip::BitMask<OptionsBitmap>> optionsMask,
+                               chip::Optional<chip::BitMask<OptionsBitmap>> optionsOverride);
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
 {
 public:
@@ -241,17 +238,15 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
 
         // TODO : Implement action on frequency when frequency not provisional anymore
         // if(LevelControlHasFeature(endpoint, LevelControl::Feature::kFrequency)){}
-        Status status;
-        CommandId command = LevelControlHasFeature(endpoint, LevelControl::Feature::kOnOff) ? Commands::MoveToLevelWithOnOff::Id
-                                                                                            : Commands::MoveToLevel::Id;
-
-        status = moveToLevelHandler(endpoint, command, level, app::DataModel::MakeNullable(static_cast<uint16_t>(timeMs / 100)),
-                                    chip::Optional<BitMask<LevelControlOptions>>(), chip::Optional<BitMask<LevelControlOptions>>(),
-                                    INVALID_STORED_LEVEL);
 
-        if (status != Status::Success)
+        if (!chip::app::NumericAttributeTraits<uint8_t>::IsNullValue(level))
         {
-            return CHIP_ERROR_READ_FAILED;
+            CommandId command = LevelControlHasFeature(endpoint, LevelControl::Feature::kOnOff) ? Commands::MoveToLevelWithOnOff::Id
+                                                                                                : Commands::MoveToLevel::Id;
+
+            moveToLevelHandler(endpoint, command, level, app::DataModel::MakeNullable(static_cast<uint16_t>(timeMs / 100)),
+                               chip::Optional<BitMask<OptionsBitmap>>(), chip::Optional<BitMask<OptionsBitmap>>(),
+                               INVALID_STORED_LEVEL);
         }
 
         return CHIP_NO_ERROR;
@@ -259,7 +254,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
 };
 static DefaultLevelControlSceneHandler sLevelControlSceneHandler;
 
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 
 #if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP)
 static void reallyUpdateCoupledColorTemp(EndpointId endpoint);
@@ -351,7 +346,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint)
 
     if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperatureMireds::Id))
     {
-        if (options.Has(LevelControlOptions::kCoupleColorTempToLevel))
+        if (options.Has(OptionsBitmap::kCoupleColorTempToLevel))
         {
             emberAfPluginLevelControlCoupledColorTempChangeCallback(endpoint);
         }
@@ -494,9 +489,8 @@ static void setOnOffValue(EndpointId endpoint, bool onOff)
 #endif // EMBER_AF_PLUGIN_ON_OFF
 }
 
-static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId,
-                               chip::Optional<chip::BitMask<LevelControlOptions>> optionsMask,
-                               chip::Optional<chip::BitMask<LevelControlOptions>> optionsOverride)
+static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional<chip::BitMask<OptionsBitmap>> optionsMask,
+                               chip::Optional<chip::BitMask<OptionsBitmap>> optionsOverride)
 {
 #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS
     if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::Options::Id))
@@ -561,18 +555,18 @@ static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId,
         {
             // in case optionMask or optionOverride is not set, use of option
             // attribute to decide execution of the command
-            return options.Has(LevelControlOptions::kExecuteIfOff);
+            return options.Has(OptionsBitmap::kExecuteIfOff);
         }
         // ---------- The above is to distinguish if the payload is present or not
 
-        if (optionsMask.Value().Has(LevelControlOptions::kExecuteIfOff))
+        if (optionsMask.Value().Has(OptionsBitmap::kExecuteIfOff))
         {
             // Mask is present and set in the command payload, this indicates
             // use the over ride as temporary option
-            return optionsOverride.Value().Has(LevelControlOptions::kExecuteIfOff);
+            return optionsOverride.Value().Has(OptionsBitmap::kExecuteIfOff);
         }
         // if we are here - use the option bits
-        return options.Has(LevelControlOptions::kExecuteIfOff);
+        return options.Has(OptionsBitmap::kExecuteIfOff);
     }
 
 #endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS
@@ -608,18 +602,17 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable
     }
 
     return moveToLevelHandler(endpointId, Commands::MoveToLevel::Id, level, transitionTime,
-                              Optional<BitMask<LevelControlOptions>>(optionsMask),
-                              Optional<BitMask<LevelControlOptions>>(optionsOverride),
+                              Optional<BitMask<OptionsBitmap>>(optionsMask), Optional<BitMask<OptionsBitmap>>(optionsOverride),
                               INVALID_STORED_LEVEL); // Don't revert to the stored level
 }
 
 chip::scenes::SceneHandler * GetSceneHandler()
 {
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sLevelControlSceneHandler;
 #else
     return nullptr;
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
 
 } // namespace LevelControlServer
@@ -644,10 +637,10 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(app::CommandHandler
                         optionsMask.Raw(), optionsOverride.Raw());
     }
 
-    Status status = moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime,
-                                       Optional<BitMask<LevelControlOptions>>(optionsMask),
-                                       Optional<BitMask<LevelControlOptions>>(optionsOverride),
-                                       INVALID_STORED_LEVEL); // Don't revert to the stored level
+    Status status =
+        moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime,
+                           Optional<BitMask<OptionsBitmap>>(optionsMask), Optional<BitMask<OptionsBitmap>>(optionsOverride),
+                           INVALID_STORED_LEVEL); // Don't revert to the stored level
 
     commandObj->AddStatus(commandPath, status);
 
@@ -664,16 +657,17 @@ bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, co
 
     if (rate.IsNull())
     {
-        ChipLogProgress(Zcl, "%s MOVE %x null %x %x", "RX level-control:", moveMode, optionsMask.Raw(), optionsOverride.Raw());
+        ChipLogProgress(Zcl, "%s MOVE %x null %x %x", "RX level-control:", to_underlying(moveMode), optionsMask.Raw(),
+                        optionsOverride.Raw());
     }
     else
     {
-        ChipLogProgress(Zcl, "%s MOVE %x %u %x %x", "RX level-control:", moveMode, rate.Value(), optionsMask.Raw(),
+        ChipLogProgress(Zcl, "%s MOVE %x %u %x %x", "RX level-control:", to_underlying(moveMode), rate.Value(), optionsMask.Raw(),
                         optionsOverride.Raw());
     }
 
-    moveHandler(commandObj, commandPath, moveMode, rate, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    moveHandler(commandObj, commandPath, moveMode, rate, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
@@ -687,17 +681,17 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * comma
 
     if (rate.IsNull())
     {
-        ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %x null %x %x", "RX level-control:", moveMode, optionsMask.Raw(),
+        ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %x null %x %x", "RX level-control:", to_underlying(moveMode), optionsMask.Raw(),
                         optionsOverride.Raw());
     }
     else
     {
-        ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %u %2x %x %x", "RX level-control:", moveMode, rate.Value(), optionsMask.Raw(),
-                        optionsOverride.Raw());
+        ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %u %2x %x %x", "RX level-control:", to_underlying(moveMode), rate.Value(),
+                        optionsMask.Raw(), optionsOverride.Raw());
     }
 
-    moveHandler(commandObj, commandPath, moveMode, rate, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    moveHandler(commandObj, commandPath, moveMode, rate, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
@@ -712,17 +706,17 @@ bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, co
 
     if (transitionTime.IsNull())
     {
-        ChipLogProgress(Zcl, "%s STEP %x %x null %x %x", "RX level-control:", stepMode, stepSize, optionsMask.Raw(),
+        ChipLogProgress(Zcl, "%s STEP %x %x null %x %x", "RX level-control:", to_underlying(stepMode), stepSize, optionsMask.Raw(),
                         optionsOverride.Raw());
     }
     else
     {
-        ChipLogProgress(Zcl, "%s STEP %x %x %2x %x %x", "RX level-control:", stepMode, stepSize, transitionTime.Value(),
-                        optionsMask.Raw(), optionsOverride.Raw());
+        ChipLogProgress(Zcl, "%s STEP %x %x %2x %x %x", "RX level-control:", to_underlying(stepMode), stepSize,
+                        transitionTime.Value(), optionsMask.Raw(), optionsOverride.Raw());
     }
 
-    stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
@@ -737,17 +731,17 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * comma
 
     if (transitionTime.IsNull())
     {
-        ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x null %x %x", "RX level-control:", stepMode, stepSize, optionsMask.Raw(),
-                        optionsOverride.Raw());
+        ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x null %x %x", "RX level-control:", to_underlying(stepMode), stepSize,
+                        optionsMask.Raw(), optionsOverride.Raw());
     }
     else
     {
-        ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x %2x %x %x", "RX level-control:", stepMode, stepSize, transitionTime.Value(),
-                        optionsMask.Raw(), optionsOverride.Raw());
+        ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x %2x %x %x", "RX level-control:", to_underlying(stepMode), stepSize,
+                        transitionTime.Value(), optionsMask.Raw(), optionsOverride.Raw());
     }
 
-    stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
@@ -758,8 +752,8 @@ bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, co
     auto & optionsOverride = commandData.optionsOverride;
 
     ChipLogProgress(Zcl, "%s STOP", "RX level-control:");
-    stopHandler(commandObj, commandPath, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    stopHandler(commandObj, commandPath, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
@@ -769,15 +763,15 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * comma
     auto & optionsMask     = commandData.optionsMask;
     auto & optionsOverride = commandData.optionsOverride;
     ChipLogProgress(Zcl, "%s STOP_WITH_ON_OFF", "RX level-control:");
-    stopHandler(commandObj, commandPath, Optional<BitMask<LevelControlOptions>>(optionsMask),
-                Optional<BitMask<LevelControlOptions>>(optionsOverride));
+    stopHandler(commandObj, commandPath, Optional<BitMask<OptionsBitmap>>(optionsMask),
+                Optional<BitMask<OptionsBitmap>>(optionsOverride));
     return true;
 }
 
 static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level,
                                  app::DataModel::Nullable<uint16_t> transitionTimeDs,
-                                 chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                                 chip::Optional<BitMask<LevelControlOptions>> optionsOverride, uint16_t storedLevel)
+                                 chip::Optional<BitMask<OptionsBitmap>> optionsMask,
+                                 chip::Optional<BitMask<OptionsBitmap>> optionsOverride, uint16_t storedLevel)
 {
     EmberAfLevelControlState * state = getState(endpoint);
     app::DataModel::Nullable<uint8_t> currentLevel;
@@ -914,7 +908,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
     // The level has changed, the scene is no longer valid.
     if (emberAfContainsServer(endpoint, Scenes::Id))
     {
-        Scenes::ScenesServer::Instance().MakeSceneInvalid(endpoint);
+        Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint);
     }
 #endif // EMBER_AF_PLUGIN_SCENES
 
@@ -933,9 +927,9 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
     return Status::Success;
 }
 
-static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t moveMode,
-                        app::DataModel::Nullable<uint8_t> rate, chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride)
+static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum moveMode,
+                        app::DataModel::Nullable<uint8_t> rate, chip::Optional<BitMask<OptionsBitmap>> optionsMask,
+                        chip::Optional<BitMask<OptionsBitmap>> optionsOverride)
 {
     EndpointId endpoint = commandPath.mEndpointId;
     CommandId commandId = commandPath.mCommandId;
@@ -981,12 +975,12 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
     // the maximum or minimum level at the specified rate.
     switch (moveMode)
     {
-    case EMBER_ZCL_MOVE_MODE_UP:
+    case MoveModeEnum::kUp:
         state->increasing  = true;
         state->moveToLevel = state->maxLevel;
         difference         = static_cast<uint8_t>(state->maxLevel - currentLevel.Value());
         break;
-    case EMBER_ZCL_MOVE_MODE_DOWN:
+    case MoveModeEnum::kDown:
         state->increasing  = false;
         state->moveToLevel = state->minLevel;
         difference         = static_cast<uint8_t>(currentLevel.Value() - state->minLevel);
@@ -1063,10 +1057,9 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
     commandObj->AddStatus(commandPath, status);
 }
 
-static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t stepMode,
+static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode,
                         uint8_t stepSize, app::DataModel::Nullable<uint16_t> transitionTimeDs,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride)
+                        chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride)
 {
     EndpointId endpoint = commandPath.mEndpointId;
     CommandId commandId = commandPath.mCommandId;
@@ -1112,7 +1105,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
     // level over the specified transition time.
     switch (stepMode)
     {
-    case EMBER_ZCL_STEP_MODE_UP:
+    case StepModeEnum::kUp:
         state->increasing = true;
         if (state->maxLevel - currentLevel.Value() < stepSize)
         {
@@ -1124,7 +1117,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
             state->moveToLevel = static_cast<uint8_t>(currentLevel.Value() + stepSize);
         }
         break;
-    case EMBER_ZCL_STEP_MODE_DOWN:
+    case StepModeEnum::kDown:
         state->increasing = false;
         if (currentLevel.Value() - state->minLevel < stepSize)
         {
@@ -1204,8 +1197,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
 }
 
 static void stopHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsMask,
-                        chip::Optional<BitMask<LevelControlOptions>> optionsOverride)
+                        chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride)
 {
     EndpointId endpoint = commandPath.mEndpointId;
     CommandId commandId = commandPath.mCommandId;
@@ -1452,10 +1444,10 @@ void emberAfLevelControlClusterServerInitCallback(EndpointId endpoint)
         }
     }
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     // Registers Scene handlers for the level control cluster on the server
     app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, LevelControlServer::GetSceneHandler());
-#endif
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 
     emberAfPluginLevelControlClusterServerPostInitCallback(endpoint);
 }
diff --git a/src/app/clusters/mode-base-server/mode-base-server.cpp b/src/app/clusters/mode-base-server/mode-base-server.cpp
index 2b9cc232f87e8d..2a86f1e1ba4dbf 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.cpp
+++ b/src/app/clusters/mode-base-server/mode-base-server.cpp
@@ -51,6 +51,15 @@ Instance::Instance(Delegate * aDelegate, EndpointId aEndpointId, ClusterId aClus
 
 Instance::~Instance()
 {
+    Shutdown();
+}
+
+void Instance::Shutdown()
+{
+    if (!IsInList())
+    {
+        return;
+    }
     UnregisterThisInstance();
     chip::app::InteractionModelEngine::GetInstance()->UnregisterCommandHandler(this);
     unregisterAttributeAccessOverride(this);
@@ -289,21 +298,6 @@ void Instance::InvokeCommand(HandlerContext & handlerContext)
     }
 }
 
-// List the commands supported by this instance.
-CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
-                                               CommandHandlerInterface::CommandIdCallback callback, void * context)
-{
-    callback(ModeBase::Commands::ChangeToMode::Id, context);
-    return CHIP_NO_ERROR;
-}
-
-// List the commands generated by this instance.
-CHIP_ERROR Instance::EnumerateGeneratedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context)
-{
-    callback(ModeBase::Commands::ChangeToModeResponse::Id, context);
-    return CHIP_NO_ERROR;
-}
-
 // Implements the read functionality for complex attributes.
 CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
diff --git a/src/app/clusters/mode-base-server/mode-base-server.h b/src/app/clusters/mode-base-server/mode-base-server.h
index ef88ee8269dd46..256670d09341a3 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.h
+++ b/src/app/clusters/mode-base-server/mode-base-server.h
@@ -121,6 +121,9 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface
      */
     bool IsSupportedMode(uint8_t mode);
 
+    // Unregisters this instance if already registered.
+    void Shutdown();
+
 private:
     Delegate * mDelegate;
 
@@ -139,8 +142,6 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface
 
     // CommandHandlerInterface
     void InvokeCommand(HandlerContext & ctx) override;
-    CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context) override;
-    CHIP_ERROR EnumerateGeneratedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context) override;
 
     // AttributeAccessInterface
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
index 1026105160ffbb..19ddd5025a7346 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.cpp
+++ b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -23,32 +23,44 @@
 #include <app/CommandHandlerInterface.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/general-commissioning-server/general-commissioning-server.h>
+#include <app/data-model/Nullable.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <credentials/CHIPCert.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/support/SafeInt.h>
 #include <lib/support/SortUtils.h>
 #include <lib/support/ThreadOperationalDataset.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/DeviceControlServer.h>
 #include <platform/PlatformManager.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 #include <tracing/macros.h>
 
-using namespace chip;
-using namespace chip::app;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::NetworkCommissioning;
+#include <array>
+#include <utility>
 
 namespace chip {
 namespace app {
 namespace Clusters {
 namespace NetworkCommissioning {
 
+using namespace Credentials;
+using namespace DataModel;
 using namespace DeviceLayer::NetworkCommissioning;
 
 namespace {
-// For WiFi and Thread scan results, each item will cose ~60 bytes in TLV, thus 15 is a safe upper bound of scan results.
+
+// For WiFi and Thread scan results, each item will cost ~60 bytes in TLV, thus 15 is a safe upper bound of scan results.
 constexpr size_t kMaxNetworksInScanResponse = 15;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+constexpr size_t kPossessionNonceSize = 32;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+
+// Note: CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE can be 0, this disables debug text
+using DebugTextStorage = std::array<char, CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE>;
+
 enum ValidWiFiCredentialLength
 {
     kOpen      = 0,
@@ -58,11 +70,53 @@ enum ValidWiFiCredentialLength
     kWPAPSKHex = 64,
 };
 
+template <typename T, typename Func>
+static void EnumerateAndRelease(Iterator<T> * iterator, Func func)
+{
+    if (iterator != nullptr)
+    {
+        T element;
+        while (iterator->Next(element) && func(element) == Loop::Continue)
+        {
+            /* continue */
+        }
+        iterator->Release();
+    }
+}
+
+BitFlags<Feature> WiFiFeatures(WiFiDriver * driver)
+{
+    BitFlags<Feature> features = Feature::kWiFiNetworkInterface;
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    features.Set(Feature::kPerDeviceCredentials, driver->SupportsPerDeviceCredentials());
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    return features;
+}
+
 } // namespace
 
+Instance::Instance(EndpointId aEndpointId, WiFiDriver * apDelegate) :
+    CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id), AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id),
+    mFeatureFlags(WiFiFeatures(apDelegate)), mpWirelessDriver(apDelegate), mpBaseDriver(apDelegate)
+{
+    mpDriver.Set<WiFiDriver *>(apDelegate);
+}
+
+Instance::Instance(EndpointId aEndpointId, ThreadDriver * apDelegate) :
+    CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id), AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id),
+    mFeatureFlags(Feature::kThreadNetworkInterface), mpWirelessDriver(apDelegate), mpBaseDriver(apDelegate)
+{
+    mpDriver.Set<ThreadDriver *>(apDelegate);
+}
+
+Instance::Instance(EndpointId aEndpointId, EthernetDriver * apDelegate) :
+    CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id), AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id),
+    mFeatureFlags(Feature::kEthernetNetworkInterface), mpWirelessDriver(nullptr), mpBaseDriver(apDelegate)
+{}
+
 CHIP_ERROR Instance::Init()
 {
-    ReturnErrorOnFailure(chip::app::InteractionModelEngine::GetInstance()->RegisterCommandHandler(this));
+    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->RegisterCommandHandler(this));
     VerifyOrReturnError(registerAttributeAccessOverride(this), CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorOnFailure(DeviceLayer::PlatformMgrImpl().AddEventHandler(OnPlatformEventHandler, reinterpret_cast<intptr_t>(this)));
     ReturnErrorOnFailure(mpBaseDriver->Init(this));
@@ -117,17 +171,31 @@ void Instance::InvokeCommand(HandlerContext & ctxt)
             ctxt, [this](HandlerContext & ctx, const auto & req) { HandleRemoveNetwork(ctx, req); });
         return;
 
-    case Commands::ConnectNetwork::Id:
+    case Commands::ConnectNetwork::Id: {
         VerifyOrReturn(mFeatureFlags.Has(Feature::kWiFiNetworkInterface) || mFeatureFlags.Has(Feature::kThreadNetworkInterface));
+#if CONFIG_NETWORK_LAYER_BLE && !CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
+        // If commissionee does not support Concurrent Connections, request the BLE to be stopped.
+        // Start the ConnectNetwork, but this will not complete until the BLE is off.
+        ChipLogProgress(NetworkProvisioning, "Closing BLE connections due to non-concurrent mode");
+        DeviceLayer::DeviceControlServer::DeviceControlSvr().PostCloseAllBLEConnectionsToOperationalNetworkEvent();
+#endif
         HandleCommand<Commands::ConnectNetwork::DecodableType>(
             ctxt, [this](HandlerContext & ctx, const auto & req) { HandleConnectNetwork(ctx, req); });
         return;
+    }
 
     case Commands::ReorderNetwork::Id:
         VerifyOrReturn(mFeatureFlags.Has(Feature::kWiFiNetworkInterface) || mFeatureFlags.Has(Feature::kThreadNetworkInterface));
         HandleCommand<Commands::ReorderNetwork::DecodableType>(
             ctxt, [this](HandlerContext & ctx, const auto & req) { HandleReorderNetwork(ctx, req); });
         return;
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    case Commands::QueryIdentity::Id:
+        VerifyOrReturn(mFeatureFlags.Has(Feature::kPerDeviceCredentials));
+        HandleCommand<Commands::QueryIdentity::DecodableType>(
+            ctxt, [this](HandlerContext & ctx, const auto & req) { HandleQueryIdentity(ctx, req); });
+        return;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
     }
 }
 
@@ -140,22 +208,25 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
 
     case Attributes::Networks::Id:
         return aEncoder.EncodeList([this](const auto & encoder) {
-            auto networks  = mpBaseDriver->GetNetworks();
             CHIP_ERROR err = CHIP_NO_ERROR;
             Structs::NetworkInfoStruct::Type networkForEncode;
-            NetworkCommissioning::Network network;
-            for (; networks != nullptr && networks->Next(network);)
-            {
+            EnumerateAndRelease(mpBaseDriver->GetNetworks(), [&](const Network & network) {
                 networkForEncode.networkID = ByteSpan(network.networkID, network.networkIDLen);
                 networkForEncode.connected = network.connected;
-                SuccessOrExit(err = encoder.Encode(networkForEncode));
-            }
-        exit:
-            if (networks != nullptr)
-            {
-                networks->Release();
-            }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+                // These fields are both optional and nullable in NetworkInfoStruct.
+                // If PDC is supported, the fields are always present but may be null.
+                if (mFeatureFlags.Has(Feature::kPerDeviceCredentials))
+                {
+                    networkForEncode.networkIdentifier = MakeOptional(Nullable<ByteSpan>(network.networkIdentifier));
+                    networkForEncode.clientIdentifier  = MakeOptional(Nullable<ByteSpan>(network.clientIdentifier));
+                }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+
+                err = encoder.Encode(networkForEncode);
+                return (err == CHIP_NO_ERROR) ? Loop::Continue : Loop::Break;
+            });
             return err;
         });
 
@@ -195,6 +266,21 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
     case Attributes::FeatureMap::Id:
         return aEncoder.Encode(mFeatureFlags);
 
+    case Attributes::SupportedWiFiBands::Id:
+        VerifyOrReturnError(mFeatureFlags.Has(Feature::kWiFiNetworkInterface), CHIP_NO_ERROR);
+        VerifyOrReturnError(mpDriver.Valid(), CHIP_NO_ERROR);
+        return aEncoder.Encode(mpDriver.Get<WiFiDriver *>()->GetSupportedWiFiBands());
+
+    case Attributes::SupportedThreadFeatures::Id:
+        VerifyOrReturnError(mFeatureFlags.Has(Feature::kThreadNetworkInterface), CHIP_NO_ERROR);
+        VerifyOrReturnError(mpDriver.Valid(), CHIP_NO_ERROR);
+        return aEncoder.Encode(mpDriver.Get<ThreadDriver *>()->GetSupportedThreadFeatures());
+
+    case Attributes::ThreadVersion::Id:
+        VerifyOrReturnError(mFeatureFlags.Has(Feature::kThreadNetworkInterface), CHIP_NO_ERROR);
+        VerifyOrReturnError(mpDriver.Valid(), CHIP_NO_ERROR);
+        return aEncoder.Encode(mpDriver.Get<ThreadDriver *>()->GetThreadVersion());
+
     default:
         return CHIP_NO_ERROR;
     }
@@ -213,8 +299,7 @@ CHIP_ERROR Instance::Write(const ConcreteDataAttributePath & aPath, AttributeVal
     }
 }
 
-void Instance::OnNetworkingStatusChange(NetworkCommissioning::Status aCommissioningError, Optional<ByteSpan> aNetworkId,
-                                        Optional<int32_t> aConnectStatus)
+void Instance::OnNetworkingStatusChange(Status aCommissioningError, Optional<ByteSpan> aNetworkId, Optional<int32_t> aConnectStatus)
 {
     if (aNetworkId.HasValue() && aNetworkId.Value().size() > kMaxNetworkIDLen)
     {
@@ -285,14 +370,13 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw
 }
 
 namespace {
-
 void FillDebugTextAndNetworkIndex(Commands::NetworkConfigResponse::Type & response, MutableCharSpan debugText, uint8_t networkIndex)
 {
     if (!debugText.empty())
     {
-        response.debugText.SetValue(CharSpan(debugText.data(), debugText.size()));
+        response.debugText.SetValue(debugText);
     }
-    if (response.networkingStatus == NetworkCommissioningStatusEnum::kSuccess)
+    if (response.networkingStatus == Status::kSuccess)
     {
         response.networkIndex.SetValue(networkIndex);
     }
@@ -319,6 +403,26 @@ void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands
 
     VerifyOrReturn(CheckFailSafeArmed(ctx));
 
+    if (req.ssid.empty() || req.ssid.size() > DeviceLayer::Internal::kMaxWiFiSSIDLength)
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "ssid");
+        return;
+    }
+
+    // Presence of a Network Identity indicates we're configuring for Per-Device Credentials
+    if (req.networkIdentity.HasValue())
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+        if (mFeatureFlags.Has(Feature::kWiFiNetworkInterface))
+        {
+            HandleAddOrUpdateWiFiNetworkWithPDC(ctx, req);
+            return;
+        }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
+        return;
+    }
+
     // Spec 11.8.8.4
     // Valid Credentials length are:
     // - 0 bytes: Unsecured (open) connection
@@ -355,22 +459,124 @@ void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands
     }
 
     Commands::NetworkConfigResponse::Type response;
-    MutableCharSpan debugText;
-#if CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE
-    char debugTextBuffer[CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE];
-    debugText = MutableCharSpan(debugTextBuffer);
-#endif
+    DebugTextStorage debugTextBuffer;
+    MutableCharSpan debugText(debugTextBuffer);
     uint8_t outNetworkIndex = 0;
     response.networkingStatus =
         mpDriver.Get<WiFiDriver *>()->AddOrUpdateNetwork(req.ssid, req.credentials, debugText, outNetworkIndex);
     FillDebugTextAndNetworkIndex(response, debugText, outNetworkIndex);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
-    if (response.networkingStatus == NetworkCommissioningStatusEnum::kSuccess)
+    if (response.networkingStatus == Status::kSuccess)
     {
         UpdateBreadcrumb(req.breadcrumb);
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+void Instance::HandleAddOrUpdateWiFiNetworkWithPDC(HandlerContext & ctx,
+                                                   const Commands::AddOrUpdateWiFiNetwork::DecodableType & req)
+{
+    // Credentials must be empty when configuring for PDC, it's only present to keep the command shape compatible.
+    if (!req.credentials.empty())
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "credentials");
+        return;
+    }
+
+    auto && networkIdentity = req.networkIdentity.Value(); // presence checked by caller
+    if (networkIdentity.size() > kMaxCHIPCompactNetworkIdentityLength ||
+        Credentials::ValidateChipNetworkIdentity(networkIdentity) != CHIP_NO_ERROR)
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "networkIdentity");
+        return;
+    }
+
+    if (req.clientIdentifier.HasValue() && req.clientIdentifier.Value().size() != CertificateKeyId::size())
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "clientIdentifier");
+        return;
+    }
+
+    bool provePossession = req.possessionNonce.HasValue();
+    if (provePossession && req.possessionNonce.Value().size() != kPossessionNonceSize)
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "possessionNonce");
+        return;
+    }
+
+    auto err = CHIP_NO_ERROR;
+    {
+        auto driver = mpDriver.Get<WiFiDriver *>();
+
+        // If the client is requesting re-use of a Client Identity, find the existing network it belongs to
+        Optional<uint8_t> clientIdentityNetworkIndex;
+        if (req.clientIdentifier.HasValue())
+        {
+            CertificateKeyId clientIdentifier(req.clientIdentifier.Value().data());
+            uint8_t networkIndex = 0;
+            EnumerateAndRelease(driver->GetNetworks(), [&](const Network & network) {
+                if (network.clientIdentifier.HasValue() && clientIdentifier.data_equal(network.clientIdentifier.Value()))
+                {
+                    clientIdentityNetworkIndex.SetValue(networkIndex);
+                    return Loop::Break;
+                }
+                networkIndex++;
+                return Loop::Continue;
+            });
+            if (!clientIdentityNetworkIndex.HasValue())
+            {
+                ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::NotFound, "clientIdentifier");
+                return;
+            }
+        }
+
+        // Allocate a buffer to hold the client identity, and leave enough room to append the possession nonce if needed.
+        chip::Platform::ScopedMemoryBuffer<uint8_t> identityBuffer;
+        size_t identityBufferSize = kMaxCHIPCompactNetworkIdentityLength + (provePossession ? kPossessionNonceSize : 0);
+        VerifyOrExit(identityBuffer.Alloc(identityBufferSize), /**/);
+
+        // Add/Update the network at the driver level
+        MutableByteSpan clientIdentity(identityBuffer.Get(), kMaxCHIPCompactNetworkIdentityLength);
+        Optional<P256ECDSASignature> possessionSignature;
+        Status status = Status::kUnknownError;
+        DebugTextStorage debugTextBuffer;
+        MutableCharSpan debugText(debugTextBuffer);
+        uint8_t networkIndex;
+        SuccessOrExit(err = driver->AddOrUpdateNetworkWithPDC(req.ssid, networkIdentity, clientIdentityNetworkIndex, status,
+                                                              debugText, clientIdentity, networkIndex));
+
+        Commands::NetworkConfigResponse::Type response;
+        response.networkingStatus = status;
+        FillDebugTextAndNetworkIndex(response, debugText, networkIndex);
+
+        if (status == Status::kSuccess)
+        {
+            response.clientIdentity.SetValue(clientIdentity);
+
+            if (provePossession)
+            {
+                // PossessionSignature TBS message = (NetworkClientIdentity || PossessionNonce)
+                memcpy(clientIdentity.end(), req.possessionNonce.Value().data(), kPossessionNonceSize);
+                ByteSpan tbsMessage(clientIdentity.data(), clientIdentity.size() + kPossessionNonceSize);
+                SuccessOrExit(err = driver->SignWithClientIdentity(networkIndex, tbsMessage, possessionSignature.Emplace()));
+                response.possessionSignature.SetValue(possessionSignature.Value().Span());
+            }
+
+            UpdateBreadcrumb(req.breadcrumb);
+        }
+
+        ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "AddOrUpdateWiFiNetwork with PDC failed: %" CHIP_ERROR_FORMAT, err.Format());
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::Failure);
+    }
+}
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+
 void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Commands::AddOrUpdateThreadNetwork::DecodableType & req)
 {
     MATTER_TRACE_SCOPE("HandleAddOrUpdateThreadNetwork", "NetworkCommissioning");
@@ -378,17 +584,14 @@ void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Comman
     VerifyOrReturn(CheckFailSafeArmed(ctx));
 
     Commands::NetworkConfigResponse::Type response;
-    MutableCharSpan debugText;
-#if CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE
-    char debugTextBuffer[CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE];
-    debugText = MutableCharSpan(debugTextBuffer);
-#endif
+    DebugTextStorage debugTextBuffer;
+    MutableCharSpan debugText(debugTextBuffer);
     uint8_t outNetworkIndex = 0;
     response.networkingStatus =
         mpDriver.Get<ThreadDriver *>()->AddOrUpdateNetwork(req.operationalDataset, debugText, outNetworkIndex);
     FillDebugTextAndNetworkIndex(response, debugText, outNetworkIndex);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
-    if (response.networkingStatus == NetworkCommissioningStatusEnum::kSuccess)
+    if (response.networkingStatus == Status::kSuccess)
     {
         UpdateBreadcrumb(req.breadcrumb);
     }
@@ -415,16 +618,13 @@ void Instance::HandleRemoveNetwork(HandlerContext & ctx, const Commands::RemoveN
     VerifyOrReturn(CheckFailSafeArmed(ctx));
 
     Commands::NetworkConfigResponse::Type response;
-    MutableCharSpan debugText;
-#if CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE
-    char debugTextBuffer[CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE];
-    debugText = MutableCharSpan(debugTextBuffer);
-#endif
+    DebugTextStorage debugTextBuffer;
+    MutableCharSpan debugText(debugTextBuffer);
     uint8_t outNetworkIndex   = 0;
     response.networkingStatus = mpWirelessDriver->RemoveNetwork(req.networkID, debugText, outNetworkIndex);
     FillDebugTextAndNetworkIndex(response, debugText, outNetworkIndex);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
-    if (response.networkingStatus == NetworkCommissioningStatusEnum::kSuccess)
+    if (response.networkingStatus == Status::kSuccess)
     {
         UpdateBreadcrumb(req.breadcrumb);
     }
@@ -433,7 +633,7 @@ void Instance::HandleRemoveNetwork(HandlerContext & ctx, const Commands::RemoveN
 void Instance::HandleConnectNetwork(HandlerContext & ctx, const Commands::ConnectNetwork::DecodableType & req)
 {
     MATTER_TRACE_SCOPE("HandleConnectNetwork", "NetworkCommissioning");
-    if (req.networkID.size() > DeviceLayer::NetworkCommissioning::kMaxNetworkIDLen)
+    if (req.networkID.size() > kMaxNetworkIDLen)
     {
         ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidValue);
         return;
@@ -445,27 +645,122 @@ void Instance::HandleConnectNetwork(HandlerContext & ctx, const Commands::Connec
     memcpy(mConnectingNetworkID, req.networkID.data(), mConnectingNetworkIDLen);
     mAsyncCommandHandle         = CommandHandler::Handle(&ctx.mCommandHandler);
     mCurrentOperationBreadcrumb = req.breadcrumb;
+
+    // In Non-concurrent mode postpone the final execution of ConnectNetwork until the operational
+    // network has been fully brought up and kWiFiDeviceAvailable is delivered.
+    // mConnectingNetworkIDLen and mConnectingNetworkID contains the received SSID
+#if CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
     mpWirelessDriver->ConnectNetwork(req.networkID, this);
+#endif
+}
+
+void Instance::HandleNonConcurrentConnectNetwork()
+{
+    ByteSpan nonConcurrentNetworkID = ByteSpan(mConnectingNetworkID, mConnectingNetworkIDLen);
+    ChipLogProgress(NetworkProvisioning, "HandleNonConcurrentConnectNetwork() SSID=%s", mConnectingNetworkID);
+    mpWirelessDriver->ConnectNetwork(nonConcurrentNetworkID, this);
 }
 
 void Instance::HandleReorderNetwork(HandlerContext & ctx, const Commands::ReorderNetwork::DecodableType & req)
 {
     MATTER_TRACE_SCOPE("HandleReorderNetwork", "NetworkCommissioning");
     Commands::NetworkConfigResponse::Type response;
-    MutableCharSpan debugText;
-#if CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE
-    char debugTextBuffer[CHIP_CONFIG_NETWORK_COMMISSIONING_DEBUG_TEXT_BUFFER_SIZE];
-    debugText = MutableCharSpan(debugTextBuffer);
-#endif
+    DebugTextStorage debugTextBuffer;
+    MutableCharSpan debugText(debugTextBuffer);
     response.networkingStatus = mpWirelessDriver->ReorderNetwork(req.networkID, req.networkIndex, debugText);
     FillDebugTextAndNetworkIndex(response, debugText, req.networkIndex);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
-    if (response.networkingStatus == NetworkCommissioningStatusEnum::kSuccess)
+    if (response.networkingStatus == Status::kSuccess)
     {
         UpdateBreadcrumb(req.breadcrumb);
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+void Instance::HandleQueryIdentity(HandlerContext & ctx, const Commands::QueryIdentity::DecodableType & req)
+{
+    MATTER_TRACE_SCOPE("HandleQueryIdentity", "NetworkCommissioning");
+
+    if (req.keyIdentifier.size() != CertificateKeyId::size())
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "keyIdentifier");
+        return;
+    }
+    CertificateKeyId keyIdentifier(req.keyIdentifier.data());
+
+    bool provePossession = req.possessionNonce.HasValue();
+    if (provePossession && req.possessionNonce.Value().size() != kPossessionNonceSize)
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand, "possessionNonce");
+        return;
+    }
+
+    auto err      = CHIP_NO_ERROR;
+    auto status   = Protocols::InteractionModel::Status::Success;
+    auto driver   = mpDriver.Get<WiFiDriver *>();
+    auto networks = driver->GetNetworks();
+    VerifyOrExit(networks != nullptr && networks->Count() > 0, status = Protocols::InteractionModel::Status::NotFound);
+
+    {
+        // Allocate a buffer to hold the identity, and leave enough room to append the possession nonce if needed.
+        chip::Platform::ScopedMemoryBuffer<uint8_t> identityBuffer;
+        size_t identityBufferSize = kMaxCHIPCompactNetworkIdentityLength + (provePossession ? kPossessionNonceSize : 0);
+        VerifyOrExit(identityBuffer.Alloc(identityBufferSize), /**/);
+
+        MutableByteSpan identity(identityBuffer.Get(), kMaxCHIPCompactNetworkIdentityLength);
+        Optional<P256ECDSASignature> possessionSignature;
+
+        Network network;
+        for (uint8_t networkIndex = 0;; networkIndex++)
+        {
+            VerifyOrExit(networks->Next(network), status = Protocols::InteractionModel::Status::NotFound);
+
+            if (network.clientIdentifier.HasValue() && keyIdentifier.data_equal(network.clientIdentifier.Value()))
+            {
+                SuccessOrExit(err = driver->GetClientIdentity(networkIndex, identity));
+                if (provePossession)
+                {
+                    // PossessionSignature TBS message = (NetworkClientIdentity || PossessionNonce)
+                    memcpy(identity.end(), req.possessionNonce.Value().data(), kPossessionNonceSize);
+                    ByteSpan tbsMessage(identity.data(), identity.size() + kPossessionNonceSize);
+                    SuccessOrExit(err = driver->SignWithClientIdentity(networkIndex, tbsMessage, possessionSignature.Emplace()));
+                }
+                break;
+            }
+            if (!provePossession && // Proof-of-possession is not possible for network identities
+                network.networkIdentifier.HasValue() && keyIdentifier.data_equal(network.networkIdentifier.Value()))
+            {
+                SuccessOrExit(err = driver->GetNetworkIdentity(networkIndex, identity));
+                break;
+            }
+        }
+
+        Commands::QueryIdentityResponse::Type response;
+        response.identity = identity;
+        if (possessionSignature.HasValue())
+        {
+            response.possessionSignature.SetValue(possessionSignature.Value().Span());
+        }
+        ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
+    }
+
+exit:
+    if (networks != nullptr)
+    {
+        networks->Release();
+    }
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "QueryIdentity failed: %" CHIP_ERROR_FORMAT, err.Format());
+        status = Protocols::InteractionModel::Status::Failure;
+    }
+    if (status != Protocols::InteractionModel::Status::Success)
+    {
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
+    }
+}
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+
 void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t interfaceStatus)
 {
     auto commandHandleRef = std::move(mAsyncCommandHandle);
@@ -499,8 +794,14 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i
     memcpy(mLastNetworkID, mConnectingNetworkID, mLastNetworkIDLen);
     mLastNetworkingStatusValue.SetNonNull(commissioningError);
 
+#if CONFIG_NETWORK_LAYER_BLE && !CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
+    ChipLogProgress(NetworkProvisioning, "Non-concurrent mode, ConnectNetworkResponse will NOT be sent");
+    // Do not send the ConnectNetworkResponse if in non-concurrent mode
+    // Issue #30576 raised to modify CommandHandler to notify it if no response required
+#else
     commandHandle->AddResponse(mPath, response);
-    if (commissioningError == NetworkCommissioningStatusEnum::kSuccess)
+#endif
+    if (commissioningError == Status::kSuccess)
     {
         CommitSavedBreadcrumb();
     }
@@ -525,7 +826,7 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
     TLV::TLVWriter * writer;
     TLV::TLVType listContainerType;
     ThreadScanResponse scanResponse;
-    chip::Platform::ScopedMemoryBuffer<ThreadScanResponse> scanResponseArray;
+    Platform::ScopedMemoryBuffer<ThreadScanResponse> scanResponseArray;
     size_t scanResponseArrayLength = 0;
     uint8_t extendedAddressBuffer[Thread::kSizeExtendedPanId];
 
@@ -611,9 +912,9 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(Zcl, "Failed to encode response: %s", err.AsString());
+        ChipLogError(Zcl, "Failed to encode response: %" CHIP_ERROR_FORMAT, err.Format());
     }
-    if (status == NetworkCommissioningStatusEnum::kSuccess)
+    if (status == Status::kSuccess)
     {
         CommitSavedBreadcrumb();
     }
@@ -672,9 +973,9 @@ void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIte
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(Zcl, "Failed to encode response: %s", err.AsString());
+        ChipLogError(Zcl, "Failed to encode response: %" CHIP_ERROR_FORMAT, err.Format());
     }
-    if (status == NetworkCommissioningStatusEnum::kSuccess)
+    if (status == Status::kSuccess)
     {
         CommitSavedBreadcrumb();
     }
@@ -696,6 +997,10 @@ void Instance::OnPlatformEventHandler(const DeviceLayer::ChipDeviceEvent * event
     {
         this_->OnFailSafeTimerExpired();
     }
+    else if (event->Type == DeviceLayer::DeviceEventType::kWiFiDeviceAvailable)
+    {
+        this_->HandleNonConcurrentConnectNetwork();
+    }
 }
 
 void Instance::OnCommissioningComplete()
@@ -719,39 +1024,39 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 {
     using namespace Clusters::NetworkCommissioning::Commands;
 
-    constexpr CommandId acceptedCommandsListWiFi[] = {
-        ScanNetworks::Id, AddOrUpdateWiFiNetwork::Id, RemoveNetwork::Id, ConnectNetwork::Id, ReorderNetwork::Id,
-    };
-    constexpr CommandId acceptedCommandsListThread[] = {
-        ScanNetworks::Id, AddOrUpdateThreadNetwork::Id, RemoveNetwork::Id, ConnectNetwork::Id, ReorderNetwork::Id,
-    };
-
     if (mFeatureFlags.Has(Feature::kThreadNetworkInterface))
     {
-        for (const auto & cmd : acceptedCommandsListThread)
+        for (auto && cmd : {
+                 ScanNetworks::Id,
+                 AddOrUpdateThreadNetwork::Id,
+                 RemoveNetwork::Id,
+                 ConnectNetwork::Id,
+                 ReorderNetwork::Id,
+             })
         {
-            if (callback(cmd, context) != Loop::Continue)
-            {
-                break;
-            }
+            VerifyOrExit(callback(cmd, context) == Loop::Continue, /**/);
         }
-
-        return CHIP_NO_ERROR;
     }
-
-    if (mFeatureFlags.Has(Feature::kWiFiNetworkInterface))
+    else if (mFeatureFlags.Has(Feature::kWiFiNetworkInterface))
     {
-        for (const auto & cmd : acceptedCommandsListWiFi)
+        for (auto && cmd : {
+                 ScanNetworks::Id,
+                 AddOrUpdateWiFiNetwork::Id,
+                 RemoveNetwork::Id,
+                 ConnectNetwork::Id,
+                 ReorderNetwork::Id,
+             })
         {
-            if (callback(cmd, context) != Loop::Continue)
-            {
-                break;
-            }
+            VerifyOrExit(callback(cmd, context) == Loop::Continue, /**/);
         }
+    }
 
-        return CHIP_NO_ERROR;
+    if (mFeatureFlags.Has(Feature::kPerDeviceCredentials))
+    {
+        VerifyOrExit(callback(QueryIdentity::Id, context) == Loop::Continue, /**/);
     }
 
+exit:
     return CHIP_NO_ERROR;
 }
 
@@ -759,20 +1064,20 @@ CHIP_ERROR Instance::EnumerateGeneratedCommands(const ConcreteClusterPath & clus
 {
     using namespace Clusters::NetworkCommissioning::Commands;
 
-    constexpr CommandId generatedCommandsListWireless[] = { ScanNetworksResponse::Id, NetworkConfigResponse::Id,
-                                                            ConnectNetworkResponse::Id };
-
     if (mFeatureFlags.HasAny(Feature::kWiFiNetworkInterface, Feature::kThreadNetworkInterface))
     {
-        for (const auto & cmd : generatedCommandsListWireless)
+        for (auto && cmd : { ScanNetworksResponse::Id, NetworkConfigResponse::Id, ConnectNetworkResponse::Id })
         {
-            if (callback(cmd, context) != Loop::Continue)
-            {
-                break;
-            }
+            VerifyOrExit(callback(cmd, context) == Loop::Continue, /**/);
         }
     }
 
+    if (mFeatureFlags.Has(Feature::kPerDeviceCredentials))
+    {
+        VerifyOrExit(callback(QueryIdentityResponse::Id, context) == Loop::Continue, /**/);
+    }
+
+exit:
     return CHIP_NO_ERROR;
 }
 
@@ -788,7 +1093,7 @@ uint8_t NullNetworkDriver::GetMaxNetworks()
     return 1;
 }
 
-DeviceLayer::NetworkCommissioning::NetworkIterator * NullNetworkDriver::GetNetworks()
+NetworkIterator * NullNetworkDriver::GetNetworks()
 {
     // Instance::Read accepts nullptr as an empty NetworkIterator.
     return nullptr;
diff --git a/src/app/clusters/network-commissioning/network-commissioning.h b/src/app/clusters/network-commissioning/network-commissioning.h
index c822a3f88881b1..03fa72f6bfbd26 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.h
+++ b/src/app/clusters/network-commissioning/network-commissioning.h
@@ -112,34 +112,18 @@ class Instance : public CommandHandlerInterface,
     // Actual handlers of the commands
     void HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetworks::DecodableType & req);
     void HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands::AddOrUpdateWiFiNetwork::DecodableType & req);
+    void HandleAddOrUpdateWiFiNetworkWithPDC(HandlerContext & ctx, const Commands::AddOrUpdateWiFiNetwork::DecodableType & req);
     void HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Commands::AddOrUpdateThreadNetwork::DecodableType & req);
     void HandleRemoveNetwork(HandlerContext & ctx, const Commands::RemoveNetwork::DecodableType & req);
     void HandleConnectNetwork(HandlerContext & ctx, const Commands::ConnectNetwork::DecodableType & req);
     void HandleReorderNetwork(HandlerContext & ctx, const Commands::ReorderNetwork::DecodableType & req);
+    void HandleNonConcurrentConnectNetwork(void);
+    void HandleQueryIdentity(HandlerContext & ctx, const Commands::QueryIdentity::DecodableType & req);
 
 public:
-    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::WiFiDriver * apDelegate) :
-        CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id),
-        AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id), mFeatureFlags(Feature::kWiFiNetworkInterface),
-        mpWirelessDriver(apDelegate), mpBaseDriver(apDelegate)
-    {
-        mpDriver.Set<DeviceLayer::NetworkCommissioning::WiFiDriver *>(apDelegate);
-    }
-
-    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::ThreadDriver * apDelegate) :
-        CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id),
-        AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id), mFeatureFlags(Feature::kThreadNetworkInterface),
-        mpWirelessDriver(apDelegate), mpBaseDriver(apDelegate)
-    {
-        mpDriver.Set<DeviceLayer::NetworkCommissioning::ThreadDriver *>(apDelegate);
-    }
-
-    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::EthernetDriver * apDelegate) :
-        CommandHandlerInterface(Optional<EndpointId>(aEndpointId), Id),
-        AttributeAccessInterface(Optional<EndpointId>(aEndpointId), Id), mFeatureFlags(Feature::kEthernetNetworkInterface),
-        mpWirelessDriver(nullptr), mpBaseDriver(apDelegate)
-    {}
-
+    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::WiFiDriver * apDelegate);
+    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::ThreadDriver * apDelegate);
+    Instance(EndpointId aEndpointId, DeviceLayer::NetworkCommissioning::EthernetDriver * apDelegate);
     virtual ~Instance() = default;
 };
 
diff --git a/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp b/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
index a64c749ae3070b..51cc04b0f4ec24 100644
--- a/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
+++ b/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
@@ -20,7 +20,6 @@
 #include <app/util/af.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/enums.h>
 
 #include "occupancy-hal.h"
 
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
index bbd35235e99555..0350c61c5b07d2 100644
--- a/src/app/clusters/on-off-server/on-off-server.cpp
+++ b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -103,102 +103,16 @@ static bool LevelControlWithOnOffFeaturePresent(EndpointId endpoint)
 static constexpr size_t kOnOffMaxEnpointCount =
     EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
 
-#ifdef EMBER_AF_PLUGIN_SCENES
-static EmberEventControl sceneHandlerEventControls[kOnOffMaxEnpointCount];
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 static void sceneOnOffCallback(EndpointId endpoint);
+using OnOffEndPointPair = scenes::DefaultSceneHandlerImpl::EndpointStatePair<bool>;
+using OnOffTransitionTimeInterface =
+    scenes::DefaultSceneHandlerImpl::TransitionTimeInterface<kOnOffMaxEnpointCount, EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT>;
 
 class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl
 {
 public:
-    /// @brief Struct to keep track of the desired state of the OnOff attribute between ApplyScene and
-    /// transition time expiration
-    struct EndpointStatePair
-    {
-        EndpointStatePair(EndpointId endpoint = kInvalidEndpointId, bool status = false) : mEndpoint(endpoint), mState(status) {}
-        EndpointId mEndpoint;
-        bool mState;
-    };
-
-    /// @brief Struct holding an array of EndpointStatePair. Handles insertion, get and removal by EndpointID.
-    /// TODO: Implement generic object to handle this boilerplate array manipulation
-    struct StatePairBuffer
-    {
-        bool IsEmpty() const { return (mPairCount == 0); }
-
-        CHIP_ERROR FindPair(const EndpointId endpoint, uint16_t & found_index) const
-        {
-            VerifyOrReturnError(!IsEmpty(), CHIP_ERROR_NOT_FOUND);
-            for (found_index = 0; found_index < mPairCount; found_index++)
-            {
-                if (endpoint == mStatePairBuffer[found_index].mEndpoint)
-                {
-                    return CHIP_NO_ERROR;
-                }
-            }
-
-            return CHIP_ERROR_NOT_FOUND;
-        }
-
-        CHIP_ERROR InsertPair(const EndpointStatePair & status)
-        {
-            uint16_t idx;
-            CHIP_ERROR err = FindPair(status.mEndpoint, idx);
-
-            if (CHIP_NO_ERROR == err)
-            {
-                mStatePairBuffer[idx] = status;
-            }
-            else if (mPairCount < MAX_ENDPOINT_COUNT)
-            {
-                // if not found, insert at the end
-                mStatePairBuffer[mPairCount] = status;
-                mPairCount++;
-            }
-            else
-            {
-                return CHIP_ERROR_NO_MEMORY;
-            }
-
-            return CHIP_NO_ERROR;
-        }
-
-        CHIP_ERROR GetPair(const EndpointId endpoint, EndpointStatePair & status) const
-        {
-            uint16_t idx;
-            ReturnErrorOnFailure(FindPair(endpoint, idx));
-
-            status = mStatePairBuffer[idx];
-            return CHIP_NO_ERROR;
-        }
-
-        /// @brief Removes Pair and decrements Pair count if the endpoint existed in the array
-        /// @param endpoint : endpoint id of the pair
-        CHIP_ERROR RemovePair(const EndpointId endpoint)
-        {
-            uint16_t position;
-            VerifyOrReturnValue(CHIP_NO_ERROR == FindPair(endpoint, position), CHIP_NO_ERROR);
-
-            uint16_t nextPos = static_cast<uint16_t>(position + 1);
-            uint16_t moveNum = static_cast<uint16_t>(mPairCount - nextPos);
-
-            // Compress array after removal, if the removed position is not the last
-            if (moveNum)
-            {
-                memmove(&mStatePairBuffer[position], &mStatePairBuffer[nextPos], sizeof(EndpointStatePair) * moveNum);
-            }
-
-            mPairCount--;
-            // Clear last occupied position
-            mStatePairBuffer[mPairCount].mEndpoint = kInvalidEndpointId;
-
-            return CHIP_NO_ERROR;
-        }
-
-        uint16_t mPairCount;
-        EndpointStatePair mStatePairBuffer[kOnOffMaxEnpointCount];
-    };
-
-    StatePairBuffer mSceneEndpointStatePairs;
+    DefaultSceneHandlerImpl::StatePairBuffer<bool, kOnOffMaxEnpointCount> mSceneEndpointStatePairs;
     // As per spec, 1 attribute is scenable in the on off cluster
     static constexpr uint8_t scenableAttributeCount = 1;
 
@@ -279,7 +193,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl
             auto & decodePair = pair_iterator.GetValue();
             VerifyOrReturnError(decodePair.attributeID == Attributes::OnOff::Id, CHIP_ERROR_INVALID_ARGUMENT);
             ReturnErrorOnFailure(
-                mSceneEndpointStatePairs.InsertPair(EndpointStatePair(endpoint, static_cast<bool>(decodePair.attributeValue))));
+                mSceneEndpointStatePairs.InsertPair(OnOffEndPointPair(endpoint, static_cast<bool>(decodePair.attributeValue))));
         }
         // Verify that the EFS was completely read
         CHIP_ERROR err = pair_iterator.GetStatus();
@@ -299,42 +213,26 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl
               Scenes::ScenesServer::Instance().IsHandlerRegistered(endpoint, LevelControlServer::GetSceneHandler())))
 #endif
         {
-            OnOffServer::Instance().scheduleTimerCallbackMs(sceneEventControl(endpoint), timeMs);
+            OnOffServer::Instance().scheduleTimerCallbackMs(mTransitionTimeInterface.sceneEventControl(endpoint), timeMs);
         }
 
         return CHIP_NO_ERROR;
     }
 
 private:
-    /**
-     * @brief Configures EventControl callback when setting On Off through scenes callback
-     *
-     * @param[in] endpoint endpoint to start timer for
-     * @return EmberEventControl* configured event control
-     */
-    EmberEventControl * sceneEventControl(EndpointId endpoint)
-    {
-        EmberEventControl * controller =
-            OnOffServer::Instance().getEventControl(endpoint, Span<EmberEventControl>(sceneHandlerEventControls));
-        VerifyOrReturnValue(controller != nullptr, nullptr);
-
-        controller->endpoint = endpoint;
-        controller->callback = &sceneOnOffCallback;
-
-        return controller;
-    }
+    OnOffTransitionTimeInterface mTransitionTimeInterface = OnOffTransitionTimeInterface(Attributes::OnOff::Id, sceneOnOffCallback);
 };
 static DefaultOnOffSceneHandler sOnOffSceneHandler;
 
 static void sceneOnOffCallback(EndpointId endpoint)
 {
-    DefaultOnOffSceneHandler::EndpointStatePair savedState;
+    OnOffEndPointPair savedState;
     ReturnOnFailure(sOnOffSceneHandler.mSceneEndpointStatePairs.GetPair(endpoint, savedState));
-    chip::CommandId command = (savedState.mState) ? Commands::On::Id : Commands::Off::Id;
+    CommandId command = (savedState.mValue) ? Commands::On::Id : Commands::Off::Id;
     OnOffServer::Instance().setOnOffValue(endpoint, command, false);
     ReturnOnFailure(sOnOffSceneHandler.mSceneEndpointStatePairs.RemovePair(endpoint));
 }
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 
 /**********************************************************
  * Attributes Definition
@@ -402,11 +300,11 @@ OnOffServer & OnOffServer::Instance()
 chip::scenes::SceneHandler * OnOffServer::GetSceneHandler()
 {
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sOnOffSceneHandler;
 #else
     return nullptr;
-#endif // EMBER_AF_PLUGIN_SCENES
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
 
 bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature)
@@ -562,7 +460,7 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman
     //  the current scene as described in the attribute table is invalid,
     //  so mark it as invalid (just writes the valid/invalid attribute)
 
-    Scenes::ScenesServer::Instance().MakeSceneInvalid(endpoint);
+    Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint);
 #endif // EMBER_AF_PLUGIN_SCENES
 
     // The returned status is based solely on the On/Off cluster.  Errors in the
@@ -601,10 +499,10 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint)
             status = setOnOffValue(endpoint, onOffValueForStartUp, true);
         }
 
-#ifdef EMBER_AF_PLUGIN_SCENES
+#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
         // Registers Scene handlers for the On/Off cluster on the server
         app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, OnOffServer::Instance().GetSceneHandler());
-#endif
+#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 
 #ifdef EMBER_AF_PLUGIN_MODE_SELECT
         // If OnMode is not a null value, then change the current mode to it.
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index 04a01371af92f3..4ed4f681d211d4 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -23,7 +23,6 @@
 #include <access/AccessControl.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/ota-provider/ota-provider-delegate.h b/src/app/clusters/ota-provider/ota-provider-delegate.h
index 3d7426ea4fd14e..3da8668908064c 100644
--- a/src/app/clusters/ota-provider/ota-provider-delegate.h
+++ b/src/app/clusters/ota-provider/ota-provider-delegate.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/DecodableList.h>
diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
index 5f02c4df3f3dd5..213d9d64b8b5a4 100644
--- a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
+++ b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
@@ -761,7 +761,7 @@ CHIP_ERROR DefaultOTARequestor::SendQueryImageRequest(Messaging::ExchangeManager
     else
     {
         // Country code unavailable or invalid, use default
-        args.location.SetValue(CharSpan("XX", strlen("XX")));
+        args.location.SetValue(CharSpan::fromCharString("XX"));
     }
 
     args.metadataForProvider = mMetadataForProvider;
diff --git a/src/app/clusters/scenes-server/BUILD.gn b/src/app/clusters/scenes-server/BUILD.gn
index 0e34919d8307b8..c92f3ce501535c 100644
--- a/src/app/clusters/scenes-server/BUILD.gn
+++ b/src/app/clusters/scenes-server/BUILD.gn
@@ -20,6 +20,8 @@ static_library("scenes") {
     "ExtensionFieldSets.h",
     "ExtensionFieldSetsImpl.cpp",
     "ExtensionFieldSetsImpl.h",
+    "SceneHandlerImpl.cpp",
+    "SceneHandlerImpl.h",
     "SceneTable.h",
     "SceneTableImpl.cpp",
     "SceneTableImpl.h",
diff --git a/src/app/clusters/scenes-server/SceneHandlerImpl.cpp b/src/app/clusters/scenes-server/SceneHandlerImpl.cpp
new file mode 100644
index 00000000000000..c29d1bbd5d27e8
--- /dev/null
+++ b/src/app/clusters/scenes-server/SceneHandlerImpl.cpp
@@ -0,0 +1,99 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app/clusters/scenes-server/SceneHandlerImpl.h>
+
+namespace chip {
+namespace scenes {
+
+CHIP_ERROR
+DefaultSceneHandlerImpl::EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes)
+{
+    TLV::TLVWriter writer;
+    writer.Init(serializedBytes);
+    ReturnErrorOnFailure(app::DataModel::Encode(writer, TLV::AnonymousTag(), aVlist));
+    serializedBytes.reduce_size(writer.GetLengthWritten());
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DefaultSceneHandlerImpl::DecodeAttributeValueList(const ByteSpan & serializedBytes,
+                                                             DecodableList<AttributeValuePairDecodableType> & aVlist)
+{
+    TLV::TLVReader reader;
+
+    reader.Init(serializedBytes);
+    ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Array, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(aVlist.Decode(reader));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DefaultSceneHandlerImpl::SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
+                                      MutableByteSpan & serializedBytes)
+{
+    AttributeValuePairType aVPairs[kMaxAvPair];
+
+    size_t pairTotal = 0;
+    // Verify size of list
+    ReturnErrorOnFailure(extensionFieldSet.attributeValueList.ComputeSize(&pairTotal));
+    VerifyOrReturnError(pairTotal <= ArraySize(aVPairs), CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    uint8_t pairCount  = 0;
+    auto pair_iterator = extensionFieldSet.attributeValueList.begin();
+    while (pair_iterator.Next())
+    {
+        aVPairs[pairCount] = pair_iterator.GetValue();
+        pairCount++;
+    }
+    ReturnErrorOnFailure(pair_iterator.GetStatus());
+    List<AttributeValuePairType> attributeValueList(aVPairs, pairCount);
+
+    return EncodeAttributeValueList(attributeValueList, serializedBytes);
+}
+
+CHIP_ERROR DefaultSceneHandlerImpl::Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
+                                                ExtensionFieldSetType & extensionFieldSet)
+{
+    DecodableList<AttributeValuePairDecodableType> attributeValueList;
+
+    ReturnErrorOnFailure(DecodeAttributeValueList(serializedBytes, attributeValueList));
+
+    // Verify size of list
+    size_t pairTotal = 0;
+    ReturnErrorOnFailure(attributeValueList.ComputeSize(&pairTotal));
+    VerifyOrReturnError(pairTotal <= ArraySize(mAVPairs), CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    uint8_t pairCount  = 0;
+    auto pair_iterator = attributeValueList.begin();
+    while (pair_iterator.Next())
+    {
+        mAVPairs[pairCount] = pair_iterator.GetValue();
+        pairCount++;
+    };
+    ReturnErrorOnFailure(pair_iterator.GetStatus());
+
+    extensionFieldSet.clusterID          = cluster;
+    extensionFieldSet.attributeValueList = mAVPairs;
+    extensionFieldSet.attributeValueList.reduce_size(pairCount);
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace scenes
+} // namespace chip
diff --git a/src/app/clusters/scenes-server/SceneHandlerImpl.h b/src/app/clusters/scenes-server/SceneHandlerImpl.h
new file mode 100644
index 00000000000000..19eef3975ebbc3
--- /dev/null
+++ b/src/app/clusters/scenes-server/SceneHandlerImpl.h
@@ -0,0 +1,230 @@
+/**
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app/clusters/scenes-server/SceneTable.h>
+#include <app/util/attribute-storage.h>
+#include <lib/core/DataModelTypes.h>
+
+namespace chip {
+namespace scenes {
+
+/// @brief Default implementation of handler, handle EFS from add scene and view scene commands for any cluster
+///        The implementation of SerializeSave and ApplyScene were omitted and must be implemented in a way that
+///        is compatible with the SerializeAdd output in order to function with the Default Scene Handler.
+///        It is worth noting that this implementation is very memory consuming. In the current worst case,
+///        (Color control cluster), the Extension Field Set's value pair list TLV occupies 99 bytes of memory
+class DefaultSceneHandlerImpl : public scenes::SceneHandler
+{
+    template <typename T>
+    using List = app::DataModel::List<T>;
+
+    template <typename T>
+    using DecodableList = app::DataModel::DecodableList<T>;
+
+    using AttributeValuePairType          = app::Clusters::Scenes::Structs::AttributeValuePair::Type;
+    using AttributeValuePairDecodableType = app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType;
+    using ExtensionFieldSetDecodableType  = app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType;
+    using ExtensionFieldSetType           = app::Clusters::Scenes::Structs::ExtensionFieldSet::Type;
+
+public:
+    /// @brief Struct meant to map the state of a cluster to a specific endpoint. Meant to be used to apply scenes using a timer for
+    /// transitioning
+    /// @tparam ValueType type of the value to map to the endpoint, must implement operator= and operator== for complex types
+    template <typename ValueType>
+    struct EndpointStatePair
+    {
+        EndpointStatePair(EndpointId endpoint = kInvalidEndpointId, ValueType value = ValueType{}) :
+            mEndpoint(endpoint), mValue(value)
+        {}
+        EndpointId mEndpoint;
+        ValueType mValue;
+    };
+
+    template <typename ValueType, size_t MaxEndpointCount>
+    struct StatePairBuffer
+    {
+        static_assert(std::is_trivial<ValueType>::value, "ValueType must be trivial");
+        static_assert(MaxEndpointCount < std::numeric_limits<uint16_t>::max(), "MaxEndpointCount must be less than 65535");
+
+        bool IsEmpty() const { return (mPairCount == 0); }
+
+        CHIP_ERROR FindPair(const EndpointId endpoint, uint16_t & found_index) const
+        {
+            VerifyOrReturnError(!IsEmpty(), CHIP_ERROR_NOT_FOUND);
+            for (found_index = 0; found_index < mPairCount; found_index++)
+            {
+                if (endpoint == mStatePairBuffer[found_index].mEndpoint)
+                {
+                    return CHIP_NO_ERROR;
+                }
+            }
+
+            return CHIP_ERROR_NOT_FOUND;
+        }
+
+        CHIP_ERROR InsertPair(const EndpointStatePair<ValueType> & status)
+        {
+            uint16_t idx;
+            CHIP_ERROR err = FindPair(status.mEndpoint, idx);
+
+            if (CHIP_NO_ERROR == err)
+            {
+                mStatePairBuffer[idx] = status;
+            }
+            else if (mPairCount < MaxEndpointCount)
+            {
+                // If not found, insert at the end
+                mStatePairBuffer[mPairCount] = status;
+                mPairCount++;
+            }
+            else
+            {
+                return CHIP_ERROR_NO_MEMORY;
+            }
+
+            return CHIP_NO_ERROR;
+        }
+
+        CHIP_ERROR GetPair(const EndpointId endpoint, EndpointStatePair<ValueType> & status) const
+        {
+            uint16_t idx;
+            ReturnErrorOnFailure(FindPair(endpoint, idx));
+
+            status = mStatePairBuffer[idx];
+            return CHIP_NO_ERROR;
+        }
+
+        /// @brief Removes Pair and decrements Pair count if the endpoint existed in the array
+        /// @param endpoint : endpoint id of the pair
+        CHIP_ERROR RemovePair(const EndpointId endpoint)
+        {
+            uint16_t position;
+            VerifyOrReturnValue(CHIP_NO_ERROR == FindPair(endpoint, position), CHIP_NO_ERROR);
+
+            uint16_t nextPos = static_cast<uint16_t>(position + 1);
+            uint16_t moveNum = static_cast<uint16_t>(mPairCount - nextPos);
+
+            // Compress array after removal, if the removed position is not the last
+            if (moveNum)
+            {
+                memmove(&mStatePairBuffer[position], &mStatePairBuffer[nextPos], sizeof(EndpointStatePair<ValueType>) * moveNum);
+            }
+
+            mPairCount--;
+            // Clear the last occupied position
+            mStatePairBuffer[mPairCount].mEndpoint = kInvalidEndpointId;
+
+            return CHIP_NO_ERROR;
+        }
+
+        uint16_t mPairCount = 0;
+        EndpointStatePair<ValueType> mStatePairBuffer[MaxEndpointCount];
+    };
+
+    /// @brief Helper struct that allows clusters that do not have an existing mechanism for doing
+    //         asynchronous work to perform scene transitions over some period of time.
+    /// @tparam MaxEndpointCount
+    template <size_t MaxEndpointCount, size_t FixedEndpointCount>
+    struct TransitionTimeInterface
+    {
+        EmberEventControl sceneHandlerEventControls[MaxEndpointCount];
+
+        TransitionTimeInterface(ClusterId clusterId, void (*callback)(EndpointId)) : mClusterId(clusterId), mCallback(callback) {}
+
+        /**
+         * @brief Configures EventControl callback
+         *
+         * @param[in] endpoint endpoint to start timer for
+         * @return EmberEventControl* configured event control
+         */
+        EmberEventControl * sceneEventControl(EndpointId endpoint)
+        {
+            EmberEventControl * controller = getEventControl(endpoint, Span<EmberEventControl>(sceneHandlerEventControls));
+            VerifyOrReturnValue(controller != nullptr, nullptr);
+
+            controller->endpoint = endpoint;
+            controller->callback = mCallback;
+
+            return controller;
+        }
+
+        ClusterId mClusterId;
+        void (*mCallback)(EndpointId);
+
+    private:
+        /**
+         * @brief event control object for an endpoint
+         *
+         * @param[in] endpoint target endpoint
+         * @param[in] eventControlArray Array where to find the event control
+         * @return EmberEventControl* configured event control
+         */
+        EmberEventControl * getEventControl(EndpointId endpoint, const Span<EmberEventControl> & eventControlArray)
+        {
+            uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, mClusterId, FixedEndpointCount);
+            if (index >= eventControlArray.size())
+            {
+                return nullptr;
+            }
+
+            return &eventControlArray[index];
+        }
+    };
+
+    static constexpr uint8_t kMaxAvPair = CHIP_CONFIG_SCENES_MAX_AV_PAIRS_EFS;
+
+    DefaultSceneHandlerImpl() = default;
+    ~DefaultSceneHandlerImpl() override{};
+
+    /// @brief Encodes an attribute value list into a TLV structure and resizes the buffer to the size of the encoded data
+    /// @param aVlist[in] Attribute value list to encode
+    /// @param serializedBytes[out] Buffer to fill from the Attribute value list in a TLV format
+    /// @return CHIP_ERROR
+    virtual CHIP_ERROR EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes);
+
+    /// @brief Decodes an attribute value list from a TLV structure and ensure it fits the member pair buffer
+    /// @param serializedBytes [in] Buffer to read from
+    /// @param aVlist [out] Attribute value list to fill from the TLV structure.  Only valid while the buffer backing
+    /// serializedBytes exists and its contents are not modified.
+    /// @return CHIP_ERROR
+    virtual CHIP_ERROR DecodeAttributeValueList(const ByteSpan & serializedBytes,
+                                                DecodableList<AttributeValuePairDecodableType> & aVlist);
+
+    /// @brief From command AddScene, allows handler to filter through clusters in command to serialize only the supported ones.
+    /// @param endpoint[in] Endpoint ID
+    /// @param extensionFieldSet[in] ExtensionFieldSets provided by the AddScene Command, pre initialized
+    /// @param serializedBytes[out] Buffer to fill from the ExtensionFieldSet in command
+    /// @return CHIP_NO_ERROR if successful, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not supported, CHIP_ERROR value
+    /// otherwise
+    virtual CHIP_ERROR SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
+                                    MutableByteSpan & serializedBytes) override;
+
+    /// @brief Simulates taking data from nvm and loading it in a command object if the cluster is supported by the endpoint
+    /// @param endpoint target endpoint
+    /// @param cluster  target cluster
+    /// @param serializedBytes data to deserialize into EFS
+    /// @return CHIP_NO_ERROR if Extension Field Set was successfully populated, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not
+    /// supported, specific CHIP_ERROR otherwise
+    virtual CHIP_ERROR Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
+                                   ExtensionFieldSetType & extensionFieldSet) override;
+
+private:
+    AttributeValuePairType mAVPairs[kMaxAvPair];
+};
+
+} // namespace scenes
+} // namespace chip
diff --git a/src/app/clusters/scenes-server/SceneTable.h b/src/app/clusters/scenes-server/SceneTable.h
index e7fb2328d9ed98..5ee97bf1da3fe3 100644
--- a/src/app/clusters/scenes-server/SceneTable.h
+++ b/src/app/clusters/scenes-server/SceneTable.h
@@ -186,6 +186,12 @@ class SceneTable
         }
         ~SceneData(){};
 
+        bool operator==(const SceneData & other) const
+        {
+            return ((CharSpan(mName, mNameLength).data_equal(CharSpan(other.mName, other.mNameLength))) &&
+                    (mSceneTransitionTimeMs == other.mSceneTransitionTimeMs) && (mExtensionFieldSets == other.mExtensionFieldSets));
+        }
+
         void SetName(const CharSpan & sceneName)
         {
             if (nullptr == sceneName.data())
@@ -204,17 +210,10 @@ class SceneTable
         void Clear()
         {
             SetName(CharSpan());
-
             mSceneTransitionTimeMs = 0;
             mExtensionFieldSets.Clear();
         }
 
-        bool operator==(const SceneData & other)
-        {
-            return (mNameLength == other.mNameLength && !memcmp(mName, other.mName, mNameLength) &&
-                    (mSceneTransitionTimeMs == other.mSceneTransitionTimeMs) && (mExtensionFieldSets == other.mExtensionFieldSets));
-        }
-
         void operator=(const SceneData & other)
         {
             SetName(CharSpan(other.mName, other.mNameLength));
@@ -285,7 +284,16 @@ class SceneTable
     virtual CHIP_ERROR SceneApplyEFS(const SceneTableEntry & scene) = 0;
 
     // Fabrics
+
+    /**
+     * @brief Removes all scenes associated with a fabric index and the stored FabricSceneData that maps them
+     * @param fabric_index Fabric index to remove
+     * @return CHIP_ERROR, CHIP_NO_ERROR if successful or if the Fabric was not found, specific CHIP_ERROR otherwise
+     * @note This function is meant to be used after a fabric is removed from the device, the implementation MUST ensure that it
+     * won't interact with the actual fabric table as it will be removed beforehand.
+     */
     virtual CHIP_ERROR RemoveFabric(FabricIndex fabric_index) = 0;
+    virtual CHIP_ERROR RemoveEndpoint()                       = 0;
 
     // Iterators
     using SceneEntryIterator = CommonIterator<SceneTableEntry>;
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp
index f1900416c4499b..19dd0dc79d1b18 100644
--- a/src/app/clusters/scenes-server/SceneTableImpl.cpp
+++ b/src/app/clusters/scenes-server/SceneTableImpl.cpp
@@ -22,81 +22,6 @@
 namespace chip {
 namespace scenes {
 
-CHIP_ERROR
-DefaultSceneHandlerImpl::EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes)
-{
-    TLV::TLVWriter writer;
-    writer.Init(serializedBytes);
-    ReturnErrorOnFailure(app::DataModel::Encode(writer, TLV::AnonymousTag(), aVlist));
-    serializedBytes.reduce_size(writer.GetLengthWritten());
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DefaultSceneHandlerImpl::DecodeAttributeValueList(const ByteSpan & serializedBytes,
-                                                             DecodableList<AttributeValuePairDecodableType> & aVlist)
-{
-    TLV::TLVReader reader;
-
-    reader.Init(serializedBytes);
-    ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Array, TLV::AnonymousTag()));
-    ReturnErrorOnFailure(aVlist.Decode(reader));
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR
-DefaultSceneHandlerImpl::SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
-                                      MutableByteSpan & serializedBytes)
-{
-    AttributeValuePairType aVPairs[kMaxAvPair];
-
-    size_t pairTotal = 0;
-    // Verify size of list
-    ReturnErrorOnFailure(extensionFieldSet.attributeValueList.ComputeSize(&pairTotal));
-    VerifyOrReturnError(pairTotal <= ArraySize(aVPairs), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    uint8_t pairCount  = 0;
-    auto pair_iterator = extensionFieldSet.attributeValueList.begin();
-    while (pair_iterator.Next())
-    {
-        aVPairs[pairCount] = pair_iterator.GetValue();
-        pairCount++;
-    }
-    ReturnErrorOnFailure(pair_iterator.GetStatus());
-    List<AttributeValuePairType> attributeValueList(aVPairs, pairCount);
-
-    return EncodeAttributeValueList(attributeValueList, serializedBytes);
-}
-
-CHIP_ERROR DefaultSceneHandlerImpl::Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
-                                                ExtensionFieldSetType & extensionFieldSet)
-{
-    DecodableList<AttributeValuePairDecodableType> attributeValueList;
-
-    ReturnErrorOnFailure(DecodeAttributeValueList(serializedBytes, attributeValueList));
-
-    // Verify size of list
-    size_t pairTotal = 0;
-    ReturnErrorOnFailure(attributeValueList.ComputeSize(&pairTotal));
-    VerifyOrReturnError(pairTotal <= ArraySize(mAVPairs), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    uint8_t pairCount  = 0;
-    auto pair_iterator = attributeValueList.begin();
-    while (pair_iterator.Next())
-    {
-        mAVPairs[pairCount] = pair_iterator.GetValue();
-        pairCount++;
-    };
-    ReturnErrorOnFailure(pair_iterator.GetStatus());
-
-    extensionFieldSet.clusterID          = cluster;
-    extensionFieldSet.attributeValueList = mAVPairs;
-    extensionFieldSet.attributeValueList.reduce_size(pairCount);
-
-    return CHIP_NO_ERROR;
-}
-
 /// @brief Tags Used to serialize Scenes so they can be stored in flash memory.
 /// kSceneCount: Number of scenes in a Fabric
 /// kStorageIDArray: Array of StorageID struct
@@ -178,7 +103,7 @@ struct EndpointSceneCount : public PersistentData<kPersistentBufferSceneCountByt
 // when using the OnOff, Level Control and Color Control as well as the maximal name length of 16 bytes. Putting 256 gives some
 // slack in case different clusters are used. Value obtained by using writer.GetLengthWritten at the end of the SceneTableData
 // Serialize method.
-static constexpr size_t kPersistentSceneBufferMax = 256;
+static constexpr size_t kPersistentSceneBufferMax = CHIP_CONFIG_SCENES_MAX_SERIALIZED_SCENE_SIZE_BYTES;
 
 struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneBufferMax>
 {
@@ -284,7 +209,7 @@ struct FabricSceneData : public PersistentData<kPersistentFabricBufferMax>
     uint8_t scene_count = 0;
     uint16_t max_scenes_per_fabric;
     uint16_t max_scenes_per_endpoint;
-    SceneStorageId scene_map[kMaxScenesPerFabric];
+    SceneStorageId scene_map[CHIP_CONFIG_MAX_SCENES_TABLE_SIZE];
 
     FabricSceneData(EndpointId endpoint = kInvalidEndpointId, FabricIndex fabric = kUndefinedFabricIndex,
                     uint16_t maxScenesPerFabric = kMaxScenesPerFabric, uint16_t maxScenesPerEndpoint = kMaxScenesPerEndpoint) :
@@ -817,12 +742,12 @@ CHIP_ERROR DefaultSceneTableImpl::SceneSaveEFS(SceneTableEntry & scene)
         // TODO : Once zap supports the scenable quality, implement a GetSceneableClusterCountFromEndpointType function to avoid
         // over-allocation
         uint8_t clusterCount = GetClusterCountFromEndpoint();
-        chip::Platform::ScopedMemoryBuffer<clusterId> cBuffer;
+        chip::Platform::ScopedMemoryBuffer<ClusterId> cBuffer;
         VerifyOrReturnError(cBuffer.Calloc(clusterCount), CHIP_ERROR_NO_MEMORY);
         clusterCount = GetClustersFromEndpoint(cBuffer.Get(), clusterCount);
 
-        Span<clusterId> cSpan(cBuffer.Get(), clusterCount);
-        for (clusterId cluster : cSpan)
+        Span<ClusterId> cSpan(cBuffer.Get(), clusterCount);
+        for (ClusterId cluster : cSpan)
         {
             ExtensionFieldSet EFS;
             MutableByteSpan EFSSpan = MutableByteSpan(EFS.mBytesBuffer, kMaxFieldBytesPerCluster);
@@ -905,6 +830,35 @@ CHIP_ERROR DefaultSceneTableImpl::RemoveFabric(FabricIndex fabric_index)
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DefaultSceneTableImpl::RemoveEndpoint()
+{
+    VerifyOrReturnError(IsInitialized(), CHIP_ERROR_INTERNAL);
+
+    for (FabricIndex fabric_index = kMinValidFabricIndex; fabric_index < kMaxValidFabricIndex; fabric_index++)
+    {
+        FabricSceneData fabric(mEndpointId, fabric_index);
+        CHIP_ERROR err = fabric.Load(mStorage);
+        VerifyOrReturnError(CHIP_NO_ERROR == err || CHIP_ERROR_NOT_FOUND == err, err);
+        if (CHIP_ERROR_NOT_FOUND == err)
+        {
+            continue;
+        }
+
+        SceneIndex idx = 0;
+        while (idx < mMaxScenesPerFabric)
+        {
+            err = RemoveSceneTableEntryAtPosition(mEndpointId, fabric_index, idx);
+            VerifyOrReturnError(CHIP_NO_ERROR == err || CHIP_ERROR_NOT_FOUND == err, err);
+            idx++;
+        };
+
+        // Remove fabric scenes on endpoint
+        ReturnErrorOnFailure(fabric.Delete(mStorage));
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 /// @brief wrapper function around emberAfGetClustersFromEndpoint to allow testing, shimmed in test configuration because
 /// emberAfGetClusterFromEndpoint relies on <app/util/attribute-storage.h>, which relies on zap generated files
 uint8_t DefaultSceneTableImpl::GetClustersFromEndpoint(ClusterId * clusterList, uint8_t listLen)
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h
index 60a378f43c3ce8..753799ec70c68e 100644
--- a/src/app/clusters/scenes-server/SceneTableImpl.h
+++ b/src/app/clusters/scenes-server/SceneTableImpl.h
@@ -17,6 +17,7 @@
 
 #pragma once
 #include <app/clusters/scenes-server/ExtensionFieldSetsImpl.h>
+#include <app/clusters/scenes-server/SceneHandlerImpl.h>
 #include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/DataModelTypes.h>
@@ -28,71 +29,18 @@
 namespace chip {
 namespace scenes {
 
-static constexpr uint16_t kMaxScenesPerFabric   = (MATTER_SCENES_TABLE_SIZE - 1) / 2;
+#ifdef MATTER_SCENES_TABLE_SIZE
 static constexpr uint16_t kMaxScenesPerEndpoint = MATTER_SCENES_TABLE_SIZE;
+#else
+static constexpr uint16_t kMaxScenesPerEndpoint = CHIP_CONFIG_MAX_SCENES_TABLE_SIZE;
+#endif
 
-using clusterId = chip::ClusterId;
-
-/// @brief Default implementation of handler, handle EFS from add scene and view scene commands for any cluster
-///        The implementation of SerializeSave and ApplyScene were omitted and must be implemented in a way that
-///        is compatible with the SerializeAdd output in order to function with the Default Scene Handler.
-///        It is worth noting that this implementation is very memory consuming. In the current worst case,
-///        (Color control cluster), the Extension Field Set's value pair list TLV occupies 99 bytes of memory
-class DefaultSceneHandlerImpl : public scenes::SceneHandler
-{
-
-    template <typename T>
-    using List = chip::app::DataModel::List<T>;
-
-    template <typename T>
-    using DecodableList = chip::app::DataModel::DecodableList<T>;
-
-    using AttributeValuePairType          = chip::app::Clusters::Scenes::Structs::AttributeValuePair::Type;
-    using AttributeValuePairDecodableType = chip::app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType;
-    using ExtensionFieldSetDecodableType  = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType;
-    using ExtensionFieldSetType           = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type;
-
-public:
-    static constexpr uint8_t kMaxAvPair = CHIP_CONFIG_SCENES_MAX_AV_PAIRS_EFS;
-
-    DefaultSceneHandlerImpl() = default;
-    ~DefaultSceneHandlerImpl() override{};
-
-    /// @brief Encodes an attribute value list into a TLV structure and resizes the buffer to the size of the encoded data
-    /// @param aVlist[in] Attribute value list to encode
-    /// @param serializedBytes[out] Buffer to fill from the Attribute value list in a TLV format
-    /// @return CHIP_ERROR
-    virtual CHIP_ERROR EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes);
-
-    /// @brief Decodes an attribute value list from a TLV structure and ensure it fits the member pair buffer
-    /// @param serializedBytes [in] Buffer to read from
-    /// @param aVlist [out] Attribute value list to fill from the TLV structure.  Only valid while the buffer backing
-    /// serializedBytes exists and its contents are not modified.
-    /// @return CHIP_ERROR
-    virtual CHIP_ERROR DecodeAttributeValueList(const ByteSpan & serializedBytes,
-                                                DecodableList<AttributeValuePairDecodableType> & aVlist);
-
-    /// @brief From command AddScene, allows handler to filter through clusters in command to serialize only the supported ones.
-    /// @param endpoint[in] Endpoint ID
-    /// @param extensionFieldSet[in] ExtensionFieldSets provided by the AddScene Command, pre initialized
-    /// @param serializedBytes[out] Buffer to fill from the ExtensionFieldSet in command
-    /// @return CHIP_NO_ERROR if successful, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not supported, CHIP_ERROR value
-    /// otherwise
-    virtual CHIP_ERROR SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
-                                    MutableByteSpan & serializedBytes) override;
-
-    /// @brief Simulates taking data from nvm and loading it in a command object if the cluster is supported by the endpoint
-    /// @param endpoint target endpoint
-    /// @param cluster  target cluster
-    /// @param serializedBytes data to deserialize into EFS
-    /// @return CHIP_NO_ERROR if Extension Field Set was successfully populated, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not
-    /// supported, specific CHIP_ERROR otherwise
-    virtual CHIP_ERROR Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
-                                   ExtensionFieldSetType & extensionFieldSet) override;
-
-private:
-    AttributeValuePairType mAVPairs[kMaxAvPair];
-};
+static_assert(kMaxScenesPerEndpoint <= CHIP_CONFIG_MAX_SCENES_TABLE_SIZE,
+              "CHIP_CONFIG_MAX_SCENES_TABLE_SIZE is smaller than the zap configuration, please increase "
+              "CHIP_CONFIG_MAX_SCENES_TABLE_SIZE in CHIPConfig.h if you really need more scenes");
+static_assert(kMaxScenesPerEndpoint >= 16, "Per spec, kMaxScenesPerEndpoint must be at least 16");
+static constexpr uint16_t kMaxScenesPerFabric = (kMaxScenesPerEndpoint - 1) / 2;
+static constexpr uint8_t kMaxFabrics          = CHIP_CONFIG_MAX_FABRICS;
 
 /**
  * @brief Implementation of a storage in nonvolatile storage of the scene table.
@@ -137,6 +85,7 @@ class DefaultSceneTableImpl : public SceneTable<scenes::ExtensionFieldSetsImpl>
 
     // Fabrics
     CHIP_ERROR RemoveFabric(FabricIndex fabric_index) override;
+    CHIP_ERROR RemoveEndpoint() override;
 
     // Iterators
     SceneEntryIterator * IterateSceneEntries(FabricIndex fabric_index) override;
diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
index 2386e2155d6722..cac001cdc2c49d 100644
--- a/src/app/clusters/scenes-server/scenes-server.cpp
+++ b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -47,6 +47,8 @@ namespace app {
 namespace Clusters {
 namespace Scenes {
 
+namespace {
+
 /// @brief Generate and add a response to a command handler context if err parameter is not CHIP_NO_ERROR
 /// @tparam ResponseType Type of response, depends on the command
 /// @param ctx Command Handler context where to add reponse
@@ -80,19 +82,220 @@ template <typename ResponseType>
 CHIP_ERROR UpdateLastConfiguredBy(HandlerContext & ctx, ResponseType resp)
 {
     Access::SubjectDescriptor descriptor = ctx.mCommandHandler.GetSubjectDescriptor();
+    EmberAfStatus status                 = EMBER_ZCL_STATUS_SUCCESS;
+
     if (AuthMode::kCase == descriptor.authMode)
     {
-        ReturnErrorOnFailure(
-            AddResponseOnError(ctx, resp, Attributes::LastConfiguredBy::Set(ctx.mRequestPath.mEndpointId, descriptor.subject)));
+        status = Attributes::LastConfiguredBy::Set(ctx.mRequestPath.mEndpointId, descriptor.subject);
+    }
+    else
+    {
+        status = Attributes::LastConfiguredBy::SetNull(ctx.mRequestPath.mEndpointId);
+    }
+
+    // LastConfiguredBy is optional, so we don't want to fail the command if it fails to update
+    VerifyOrReturnValue(!(EMBER_ZCL_STATUS_SUCCESS == status || EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE == status), CHIP_NO_ERROR);
+    return AddResponseOnError(ctx, resp, status);
+}
+
+/// @brief Helper function to update the FabricSceneInfo attribute for a given Endpoint and fabric
+/// @param endpoint Endpoint to update
+/// @param fabric Fabric to update
+/// @param group Group to update, if not provided, will be assigned 0 for a new SceneInfoStruct or keep previous value for an
+/// existing one
+/// @param scene Scene to update, if not provided, will be assigned 0 for a new SceneInfoStruct or keep previous value for an
+/// existing one
+/// @param sceneValid sceneValid status, if not provided, will be assigned false for a new SceneInfoStruct or keep previous
+/// value for an existing one
+/// @return
+CHIP_ERROR UpdateFabricSceneInfo(EndpointId endpoint, FabricIndex fabric, Optional<GroupId> group, Optional<SceneId> scene,
+                                 Optional<bool> sceneValid)
+{
+    VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(kUndefinedFabricIndex != fabric, CHIP_ERROR_INVALID_ARGUMENT);
+
+    SceneTable * sceneTable                    = scenes::GetSceneTableImpl(endpoint);
+    Structs::SceneInfoStruct::Type * sceneInfo = ScenesServer::Instance().GetSceneInfoStruct(endpoint, fabric);
+    if (nullptr != sceneInfo)
+    {
+        if (group.HasValue())
+        {
+            sceneInfo->currentGroup = group.Value();
+        }
+
+        if (scene.HasValue())
+        {
+            sceneInfo->currentScene = scene.Value();
+        }
+
+        if (sceneValid.HasValue())
+        {
+            sceneInfo->sceneValid = sceneValid.Value();
+        }
+
+        ReturnErrorOnFailure(sceneTable->GetFabricSceneCount(fabric, sceneInfo->sceneCount));
+        ReturnErrorOnFailure(sceneTable->GetRemainingCapacity(fabric, sceneInfo->remainingCapacity));
     }
     else
     {
-        ReturnErrorOnFailure(AddResponseOnError(ctx, resp, Attributes::LastConfiguredBy::SetNull(ctx.mRequestPath.mEndpointId)));
+        // If we couldn't find a SceneInfoStruct for the fabric, create one
+        Structs::SceneInfoStruct::Type newSceneInfo;
+        newSceneInfo.fabricIndex = fabric;
+
+        newSceneInfo.currentGroup = group.ValueOr(0);
+        newSceneInfo.currentScene = scene.ValueOr(0);
+        newSceneInfo.sceneValid   = sceneValid.ValueOr(false);
+
+        ReturnErrorOnFailure(sceneTable->GetFabricSceneCount(fabric, newSceneInfo.sceneCount));
+        ReturnErrorOnFailure(sceneTable->GetRemainingCapacity(fabric, newSceneInfo.remainingCapacity));
+        ReturnErrorOnFailure(ScenesServer::Instance().SetSceneInfoStruct(endpoint, fabric, newSceneInfo));
+    }
+
+    MatterReportingAttributeChangeCallback(endpoint, Id, Attributes::FabricSceneInfo::Id);
+    return CHIP_NO_ERROR;
+}
+
+} // namespace
+
+/// @brief Gets the SceneInfoStruct array associated to an endpoint
+/// @param endpoint target endpoint
+/// @param fabric target fabric
+/// @return Optional with no value not found, Span of SceneInfoStruct
+Span<Structs::SceneInfoStruct::Type> ScenesServer::FabricSceneInfo::GetFabricSceneInfo(EndpointId endpoint)
+{
+    size_t endpointIndex = 0;
+    Span<Structs::SceneInfoStruct::Type> fabricSceneInfoSpan;
+    CHIP_ERROR status = FindFabricSceneInfoIndex(endpoint, endpointIndex);
+    if (CHIP_NO_ERROR == status)
+    {
+        fabricSceneInfoSpan =
+            Span<Structs::SceneInfoStruct::Type>(&mSceneInfoStructs[endpointIndex][0], mSceneInfoStructsCount[endpointIndex]);
+    }
+    return fabricSceneInfoSpan;
+}
+
+/// @brief Gets the SceneInfoStruct for a specific fabric for a specific endpoint
+/// @param endpoint target endpoint
+/// @param fabric target fabric
+/// @param index
+/// @return Nullptr if not found, pointer to the SceneInfoStruct otherwise
+Structs::SceneInfoStruct::Type * ScenesServer::FabricSceneInfo::GetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric)
+{
+    size_t endpointIndex = 0;
+    VerifyOrReturnValue(CHIP_NO_ERROR == FindFabricSceneInfoIndex(endpoint, endpointIndex), nullptr);
+    uint8_t sceneInfoStructIndex = 0;
+    VerifyOrReturnValue(CHIP_NO_ERROR == FindSceneInfoStructIndex(fabric, endpointIndex, sceneInfoStructIndex), nullptr);
+
+    return &mSceneInfoStructs[endpointIndex][sceneInfoStructIndex];
+}
+
+/// @brief Sets the SceneInfoStruct for a specific fabric for a specific endpoint
+/// @param endpoint target endpoint
+/// @param fabric target fabric
+/// @param [in] sceneInfoStruct SceneInfoStruct to set
+/// @return CHIP_NO_ERROR, CHIP_ERROR_NOT_FOUND if the endpoint is not found, CHIP_ERROR_NO_MEMORY if the number of fabrics is
+/// exceeded, CHIP_ERROR_INVALID_ARGUMENT if invalid fabric or endpoint
+CHIP_ERROR ScenesServer::FabricSceneInfo::SetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric,
+                                                             Structs::SceneInfoStruct::Type & sceneInfoStruct)
+{
+    VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(kUndefinedFabricIndex != fabric, CHIP_ERROR_INVALID_ARGUMENT);
+
+    size_t endpointIndex = 0;
+    ReturnErrorOnFailure(FindFabricSceneInfoIndex(endpoint, endpointIndex));
+    uint8_t sceneInfoStructIndex = 0;
+    if (CHIP_ERROR_NOT_FOUND == FindSceneInfoStructIndex(fabric, endpointIndex, sceneInfoStructIndex))
+    {
+        VerifyOrReturnError(mSceneInfoStructsCount[endpointIndex] < ArraySize(mSceneInfoStructs[endpointIndex]),
+                            CHIP_ERROR_NO_MEMORY);
+        sceneInfoStructIndex = mSceneInfoStructsCount[endpointIndex];
+
+        // Increment number of populated ScenesInfoStructs
+        mSceneInfoStructsCount[endpointIndex]++;
     }
+    mSceneInfoStructs[endpointIndex][sceneInfoStructIndex] = sceneInfoStruct;
 
     return CHIP_NO_ERROR;
 }
 
+/// @brief Clears the SceneInfoStruct associated to a fabric and compresses the array to leave uninitialised structs at the end
+/// @param[in] endpoint target endpoint
+/// @param[in] fabric target fabric
+void ScenesServer::FabricSceneInfo::ClearSceneInfoStruct(EndpointId endpoint, FabricIndex fabric)
+{
+    size_t endpointIndex = 0;
+    ReturnOnFailure(FindFabricSceneInfoIndex(endpoint, endpointIndex));
+    uint8_t sceneInfoStructIndex = 0;
+    ReturnOnFailure(FindSceneInfoStructIndex(fabric, endpointIndex, sceneInfoStructIndex));
+
+    uint8_t nextIndex = static_cast<uint8_t>(sceneInfoStructIndex + 1);
+    uint8_t moveNum   = static_cast<uint8_t>(ArraySize(mSceneInfoStructs[endpointIndex]) - nextIndex);
+    // Compress the endpoint's SceneInfoStruct array
+    if (moveNum)
+    {
+        for (size_t i = 0; i < moveNum; ++i)
+        {
+            mSceneInfoStructs[endpointIndex][sceneInfoStructIndex + i] = mSceneInfoStructs[endpointIndex][nextIndex + i];
+        }
+    }
+
+    // Decrement the SceneInfoStruct count
+    mSceneInfoStructsCount[endpointIndex]--;
+
+    // Clear the last populated SceneInfoStruct
+    mSceneInfoStructs[endpointIndex][mSceneInfoStructsCount[endpointIndex]].fabricIndex       = kUndefinedFabricIndex;
+    mSceneInfoStructs[endpointIndex][mSceneInfoStructsCount[endpointIndex]].sceneCount        = 0;
+    mSceneInfoStructs[endpointIndex][mSceneInfoStructsCount[endpointIndex]].currentScene      = 0;
+    mSceneInfoStructs[endpointIndex][mSceneInfoStructsCount[endpointIndex]].currentGroup      = 0;
+    mSceneInfoStructs[endpointIndex][mSceneInfoStructsCount[endpointIndex]].remainingCapacity = 0;
+}
+
+/// @brief Returns the index of the FabricSceneInfo associated to an endpoint
+/// @param[in] endpoint target endpoint
+/// @param[out] endpointIndex index of the corresponding FabricSceneInfo for an endpoint, corresponds to a row in the
+/// mSceneInfoStructs array,
+/// @return CHIP_NO_ERROR or CHIP_ERROR_NOT_FOUND, CHIP_ERROR_INVALID_ARGUMENT if invalid endpoint
+CHIP_ERROR ScenesServer::FabricSceneInfo::FindFabricSceneInfoIndex(EndpointId endpoint, size_t & endpointIndex)
+{
+    VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT);
+
+    uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, Scenes::Id, EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT);
+
+    if (index < ArraySize(mSceneInfoStructs))
+    {
+        endpointIndex = index;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_NOT_FOUND;
+}
+
+/// @brief Returns the SceneInfoStruct associated to a fabric
+/// @param[in] fabric target fabric index
+/// @param[in] endpointIndex index of the corresponding FabricSceneInfo for an endpoint, corresponds to a row in the
+/// mSceneInfoStructs array
+/// @param[out] index index of the corresponding SceneInfoStruct if found, otherwise the index value will be invalid and
+/// should not be used. This is safe to store in a uint8_t because the index is guaranteed to be smaller than
+/// CHIP_CONFIG_MAX_FABRICS.
+/// @return CHIP_NO_ERROR or CHIP_ERROR_NOT_FOUND, CHIP_ERROR_INVALID_ARGUMENT if invalid fabric or endpointIndex are provided
+CHIP_ERROR ScenesServer::FabricSceneInfo::FindSceneInfoStructIndex(FabricIndex fabric, size_t endpointIndex, uint8_t & index)
+{
+    VerifyOrReturnError(endpointIndex < ArraySize(mSceneInfoStructs), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(kUndefinedFabricIndex != fabric, CHIP_ERROR_INVALID_ARGUMENT);
+
+    index = 0;
+
+    for (auto & info : mSceneInfoStructs[endpointIndex])
+    {
+        if (info.fabricIndex == fabric)
+        {
+            return CHIP_NO_ERROR;
+        }
+        index++;
+    }
+
+    return CHIP_ERROR_NOT_FOUND;
+}
+
 ScenesServer ScenesServer::mInstance;
 
 ScenesServer & ScenesServer::Instance()
@@ -101,6 +304,19 @@ ScenesServer & ScenesServer::Instance()
 }
 void ReportAttributeOnAllEndpoints(AttributeId attribute) {}
 
+class ScenesClusterFabricDelegate : public chip::FabricTable::Delegate
+{
+    void OnFabricRemoved(const FabricTable & fabricTable, FabricIndex fabricIndex) override
+    {
+        SceneTable * sceneTable = scenes::GetSceneTableImpl();
+        VerifyOrReturn(nullptr != sceneTable);
+        // The implementation of SceneTable::RemoveFabric() must not call back into the FabricTable
+        sceneTable->RemoveFabric(fabricIndex);
+    }
+};
+
+static ScenesClusterFabricDelegate gFabricDelegate;
+
 CHIP_ERROR ScenesServer::Init()
 {
     // Prevents re-initializing
@@ -112,44 +328,7 @@ CHIP_ERROR ScenesServer::Init()
 
     SceneTable * sceneTable = scenes::GetSceneTableImpl();
     ReturnErrorOnFailure(sceneTable->Init(&chip::Server::GetInstance().GetPersistentStorage()));
-
-    for (auto endpoint : EnabledEndpointsWithServerCluster(Id))
-    {
-        uint32_t featureMap  = 0;
-        EmberAfStatus status = Attributes::FeatureMap::Get(endpoint, &featureMap);
-        if (EMBER_ZCL_STATUS_SUCCESS == status)
-        {
-            // Setting NameSupport attribute value to 0x80 if the feature bit is set
-            //  The bit of 7 (0x80) the NameSupport attribute indicates whether or not scene names are supported
-            //
-            //  According to spec, bit 7 (Scene Names) MUST match feature bit 0 (Scene Names)
-            uint8_t nameSupport =
-                (featureMap & to_underlying(Feature::kSceneNames)) ? static_cast<uint8_t>(0x80) : static_cast<uint8_t>(0x00);
-            status = Attributes::NameSupport::Set(endpoint, nameSupport);
-            if (EMBER_ZCL_STATUS_SUCCESS != status)
-            {
-                ChipLogDetail(Zcl, "ERR: setting NameSupport on Endpoint %hu Status: %x", endpoint, status);
-            }
-        }
-        else
-        {
-            ChipLogDetail(Zcl, "ERR: getting the scenes FeatureMap on Endpoint %hu Status: %x", endpoint, status);
-        }
-
-        // Explicit AttributeValuePairs and TableSize features are mandatory for matter so we force-set them here
-        featureMap |= (to_underlying(Feature::kExplicit) | to_underlying(Feature::kTableSize));
-        status = Attributes::FeatureMap::Set(endpoint, featureMap);
-        if (EMBER_ZCL_STATUS_SUCCESS != status)
-        {
-            ChipLogDetail(Zcl, "ERR: setting the scenes FeatureMap on Endpoint %hu Status: %x", endpoint, status);
-        }
-
-        status = Attributes::LastConfiguredBy::SetNull(endpoint);
-        if (EMBER_ZCL_STATUS_SUCCESS != status)
-        {
-            ChipLogDetail(Zcl, "ERR: setting LastConfiguredBy on Endpoint %hu Status: %x", endpoint, status);
-        }
-    }
+    ReturnErrorOnFailure(chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&gFabricDelegate));
 
     mIsInitialized = true;
     return CHIP_NO_ERROR;
@@ -269,9 +448,11 @@ void AddSceneParse(CommandHandlerInterface::HandlerContext & ctx, const CommandD
     ReturnOnFailure(
         AddResponseOnError(ctx, response, sceneTable->SetSceneTableEntry(ctx.mCommandHandler.GetAccessingFabricIndex(), scene)));
 
-    // Update Attributes
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::SceneCount::Id);
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::RemainingCapacity::Id);
+    // Update FabricSceneInfo
+    ReturnOnFailure(
+        AddResponseOnError(ctx, response,
+                           UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
+                                                 Optional<GroupId>(), Optional<SceneId>(), Optional<bool>())));
 
     ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
 
@@ -362,6 +543,9 @@ void ViewSceneParse(HandlerContext & ctx, const CommandData & req, GroupDataProv
 CHIP_ERROR StoreSceneParse(const FabricIndex & fabricIdx, const EndpointId & endpointID, const GroupId & groupID,
                            const SceneId & sceneID, GroupDataProvider * groupProvider)
 {
+    // Make the current fabric's SceneValid false before storing a scene
+    ScenesServer::Instance().MakeSceneInvalid(endpointID, fabricIdx);
+
     uint16_t endpointTableSize = 0;
     ReturnErrorOnFailure(
         StatusIB(ToInteractionModelStatus(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize))).ToChipError());
@@ -409,12 +593,9 @@ CHIP_ERROR StoreSceneParse(const FabricIndex & fabricIdx, const EndpointId & end
     // Insert in Scene Table
     ReturnErrorOnFailure(sceneTable->SetSceneTableEntry(fabricIdx, scene));
 
-    // Update size attributes
-    MatterReportingAttributeChangeCallback(endpointID, Id, Attributes::SceneCount::Id);
-    MatterReportingAttributeChangeCallback(endpointID, Id, Attributes::RemainingCapacity::Id);
-
-    ReturnErrorOnFailure(StatusIB(ToInteractionModelStatus(Attributes::CurrentScene::Set(endpointID, sceneID))).ToChipError());
-    ReturnErrorOnFailure(StatusIB(ToInteractionModelStatus(Attributes::CurrentGroup::Set(endpointID, groupID))).ToChipError());
+    // Update SceneInfo Attribute
+    ReturnErrorOnFailure(UpdateFabricSceneInfo(endpointID, fabricIdx, MakeOptional(groupID), MakeOptional(sceneID),
+                                               MakeOptional(static_cast<bool>(true))));
 
     return CHIP_NO_ERROR;
 }
@@ -423,6 +604,9 @@ CHIP_ERROR RecallSceneParse(const FabricIndex & fabricIdx, const EndpointId & en
                             const SceneId & sceneID, const Optional<DataModel::Nullable<uint16_t>> & transitionTime,
                             GroupDataProvider * groupProvider)
 {
+    // Make SceneValid false for all fabrics before recalling a scene
+    ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpointID);
+
     uint16_t endpointTableSize = 0;
     ReturnErrorOnFailure(
         StatusIB(ToInteractionModelStatus(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize))).ToChipError());
@@ -455,9 +639,9 @@ CHIP_ERROR RecallSceneParse(const FabricIndex & fabricIdx, const EndpointId & en
 
     ReturnErrorOnFailure(sceneTable->SceneApplyEFS(scene));
 
-    ReturnErrorOnFailure(StatusIB(ToInteractionModelStatus(Attributes::CurrentScene::Set(endpointID, sceneID))).ToChipError());
-
-    ReturnErrorOnFailure(StatusIB(ToInteractionModelStatus(Attributes::CurrentGroup::Set(endpointID, groupID))).ToChipError());
+    // Update FabricSceneInfo, at this point the scene is considered valid
+    ReturnErrorOnFailure(
+        UpdateFabricSceneInfo(endpointID, fabricIdx, Optional<GroupId>(groupID), Optional<SceneId>(sceneID), Optional<bool>(true)));
 
     return CHIP_NO_ERROR;
 }
@@ -513,43 +697,50 @@ void ScenesServer::InvokeCommand(HandlerContext & ctxt)
 // AttributeAccessInterface
 CHIP_ERROR ScenesServer::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
-    uint8_t value              = 0;
-    uint16_t endpointTableSize = 0;
-    ReturnErrorOnFailure(
-        StatusIB(ToInteractionModelStatus(Attributes::SceneTableSize::Get(aPath.mEndpointId, &endpointTableSize))).ToChipError());
-
-    // Get Scene Table Instance
-    SceneTable * sceneTable;
-
     switch (aPath.mAttributeId)
     {
-    case Attributes::SceneCount::Id:
-        sceneTable = scenes::GetSceneTableImpl(aPath.mEndpointId, endpointTableSize);
-        ReturnErrorOnFailure(sceneTable->GetEndpointSceneCount(value));
-        return aEncoder.Encode(value);
-    case Attributes::RemainingCapacity::Id:
-        sceneTable = scenes::GetSceneTableImpl(aPath.mEndpointId, endpointTableSize);
-        ReturnErrorOnFailure(sceneTable->GetRemainingCapacity(aEncoder.AccessingFabricIndex(), value));
-        return aEncoder.Encode(value);
+    case Attributes::FabricSceneInfo::Id: {
+        return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR {
+            Span<Structs::SceneInfoStruct::Type> fabricSceneInfoSpan = mFabricSceneInfo.GetFabricSceneInfo(aPath.mEndpointId);
+            for (auto & info : fabricSceneInfoSpan)
+            {
+                ReturnErrorOnFailure(encoder.Encode(info));
+            }
+            return CHIP_NO_ERROR;
+        });
+    }
     default:
         return CHIP_NO_ERROR;
     }
 }
 
+Structs::SceneInfoStruct::Type * ScenesServer::GetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric)
+{
+    Structs::SceneInfoStruct::Type * sceneInfoStruct = mFabricSceneInfo.GetSceneInfoStruct(endpoint, fabric);
+    return sceneInfoStruct;
+}
+
+CHIP_ERROR ScenesServer::SetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric,
+                                            Structs::SceneInfoStruct::Type & sceneInfoStruct)
+{
+    ReturnErrorOnFailure(mFabricSceneInfo.SetSceneInfoStruct(endpoint, fabric, sceneInfoStruct));
+    return CHIP_NO_ERROR;
+}
+
 void ScenesServer::GroupWillBeRemoved(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId)
 {
     // Get Scene Table Instance
     SceneTable * sceneTable = scenes::GetSceneTableImpl(aEndpointId);
     VerifyOrReturn(nullptr != sceneTable);
 
-    chip::GroupId currentGroup;
-    Attributes::CurrentGroup::Get(aEndpointId, &currentGroup);
+    Structs::SceneInfoStruct::Type * sceneInfo = mFabricSceneInfo.GetSceneInfoStruct(aEndpointId, aFabricIx);
+    chip::GroupId currentGroup                 = (nullptr != sceneInfo) ? sceneInfo->currentGroup : 0x0000;
 
     // If currentGroup is what is being removed, we can't possibly still have a valid scene,
     // because the scene we have (if any) will also be removed.
     if (aGroupId == currentGroup)
     {
-        MakeSceneInvalid(aEndpointId);
+        MakeSceneInvalid(aEndpointId, aFabricIx);
     }
 
     VerifyOrReturn(nullptr != mGroupProvider);
@@ -561,28 +752,28 @@ void ScenesServer::GroupWillBeRemoved(FabricIndex aFabricIx, EndpointId aEndpoin
     sceneTable->DeleteAllScenesInGroup(aFabricIx, aGroupId);
 }
 
-void ScenesServer::MakeSceneInvalid(EndpointId aEndpointId)
+void ScenesServer::MakeSceneInvalid(EndpointId aEndpointId, FabricIndex aFabricIx)
 {
-    Attributes::SceneValid::Set(aEndpointId, false);
+    UpdateFabricSceneInfo(aEndpointId, aFabricIx, Optional<GroupId>(), Optional<SceneId>(), Optional<bool>(false));
 }
 
-void ScenesServer::StoreCurrentScene(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId, SceneId aSceneId)
+void ScenesServer::MakeSceneInvalidForAllFabrics(EndpointId aEndpointId)
 {
-    if (CHIP_NO_ERROR == StoreSceneParse(aFabricIx, aEndpointId, aGroupId, aSceneId, mGroupProvider))
+    for (auto & info : chip::Server::GetInstance().GetFabricTable())
     {
-        Attributes::SceneValid::Set(aEndpointId, true);
+        MakeSceneInvalid(aEndpointId, info.GetFabricIndex());
     }
 }
+
+void ScenesServer::StoreCurrentScene(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId, SceneId aSceneId)
+{
+    StoreSceneParse(aFabricIx, aEndpointId, aGroupId, aSceneId, mGroupProvider);
+}
 void ScenesServer::RecallScene(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId, SceneId aSceneId)
 {
-    VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == Attributes::SceneValid::Set(aEndpointId, false));
-
     Optional<DataModel::Nullable<uint16_t>> transitionTime;
 
-    if (CHIP_NO_ERROR == RecallSceneParse(aFabricIx, aEndpointId, aGroupId, aSceneId, transitionTime, mGroupProvider))
-    {
-        Attributes::SceneValid::Set(aEndpointId, true);
-    }
+    RecallSceneParse(aFabricIx, aEndpointId, aGroupId, aSceneId, transitionTime, mGroupProvider);
 }
 
 bool ScenesServer::IsHandlerRegistered(EndpointId aEndpointId, scenes::SceneHandler * handler)
@@ -611,6 +802,13 @@ void ScenesServer::UnregisterSceneHandler(EndpointId aEndpointId, scenes::SceneH
     }
 }
 
+void ScenesServer::RemoveFabric(EndpointId aEndpointId, FabricIndex aFabricIndex)
+{
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(aEndpointId);
+    sceneTable->RemoveFabric(aFabricIndex);
+    mFabricSceneInfo.ClearSceneInfoStruct(aEndpointId, aFabricIndex);
+}
+
 void ScenesServer::HandleAddScene(HandlerContext & ctx, const Commands::AddScene::DecodableType & req)
 {
     AddSceneParse<Commands::AddScene::DecodableType, Commands::AddSceneResponse::Type>(ctx, req, mGroupProvider);
@@ -657,11 +855,20 @@ void ScenesServer::HandleRemoveScene(HandlerContext & ctx, const Commands::Remov
     ReturnOnFailure(AddResponseOnError(
         ctx, response, sceneTable->RemoveSceneTableEntry(ctx.mCommandHandler.GetAccessingFabricIndex(), scene.mStorageId)));
 
-    // Update Attributes
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::SceneCount::Id);
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::RemainingCapacity::Id);
+    // Update SceneInfoStruct Attributes
+    Structs::SceneInfoStruct::Type * sceneInfo =
+        GetSceneInfoStruct(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex());
+    Optional<bool> sceneValid;
+    if (nullptr != sceneInfo && req.groupID == sceneInfo->currentGroup && req.sceneID == sceneInfo->currentScene)
+    {
+        sceneValid.Emplace(false);
+    }
 
     ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
+    ReturnOnFailure(
+        AddResponseOnError(ctx, response,
+                           UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
+                                                 Optional<GroupId>(), Optional<SceneId>(), sceneValid)));
 
     // Write response
     response.status = to_underlying(Protocols::InteractionModel::Status::Success);
@@ -696,8 +903,19 @@ void ScenesServer::HandleRemoveAllScenes(HandlerContext & ctx, const Commands::R
         ctx, response, sceneTable->DeleteAllScenesInGroup(ctx.mCommandHandler.GetAccessingFabricIndex(), req.groupID)));
 
     // Update Attributes
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::SceneCount::Id);
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::RemainingCapacity::Id);
+    Structs::SceneInfoStruct::Type * sceneInfo =
+        GetSceneInfoStruct(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex());
+
+    Optional<bool> sceneValid;
+    if (nullptr != sceneInfo && req.groupID == sceneInfo->currentGroup)
+    {
+        sceneValid.Emplace(false);
+    }
+
+    ReturnOnFailure(
+        AddResponseOnError(ctx, response,
+                           UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
+                                                 Optional<GroupId>(), Optional<SceneId>(), sceneValid)));
 
     ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
 
@@ -710,9 +928,6 @@ void ScenesServer::HandleStoreScene(HandlerContext & ctx, const Commands::StoreS
 {
     Commands::StoreSceneResponse::Type response;
 
-    // Scene Valid is false when this command begins
-    ReturnOnFailure(AddResponseOnError(ctx, response, Attributes::SceneValid::Set(ctx.mRequestPath.mEndpointId, false)));
-
     // Response data
     response.groupID = req.groupID;
     response.sceneID = req.sceneID;
@@ -722,8 +937,6 @@ void ScenesServer::HandleStoreScene(HandlerContext & ctx, const Commands::StoreS
 
     if (CHIP_NO_ERROR == err)
     {
-        ReturnOnFailure(AddResponseOnError(ctx, response, Attributes::SceneValid::Set(ctx.mRequestPath.mEndpointId, true)));
-
         ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
     }
 
@@ -733,21 +946,12 @@ void ScenesServer::HandleStoreScene(HandlerContext & ctx, const Commands::StoreS
 
 void ScenesServer::HandleRecallScene(HandlerContext & ctx, const Commands::RecallScene::DecodableType & req)
 {
-    // Scene Valid is false when this command begins
-    EmberAfStatus status = Attributes::SceneValid::Set(ctx.mRequestPath.mEndpointId, false);
-    if (EMBER_ZCL_STATUS_SUCCESS != status)
-    {
-        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, ToInteractionModelStatus(status));
-        return;
-    }
-
     CHIP_ERROR err = RecallSceneParse(ctx.mCommandHandler.GetAccessingFabricIndex(), ctx.mRequestPath.mEndpointId, req.groupID,
                                       req.sceneID, req.transitionTime, mGroupProvider);
 
     if (CHIP_NO_ERROR == err)
     {
-        status = Attributes::SceneValid::Set(ctx.mRequestPath.mEndpointId, true);
-        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, ToInteractionModelStatus(status));
+        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::Success);
         return;
     }
 
@@ -851,7 +1055,7 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
                                        sceneTable->GetRemainingCapacity(ctx.mCommandHandler.GetAccessingFabricIndex(), capacity)));
 
     // Checks if we copy a single scene or all of them
-    if (req.mode.GetField(app::Clusters::Scenes::ScenesCopyMode::kCopyAllScenes))
+    if (req.mode.GetField(app::Clusters::Scenes::CopyModeBitmap::kCopyAllScenes))
     {
         // Scene Table interface data
         SceneId scenesInGroup[scenes::kMaxScenesPerFabric];
@@ -883,9 +1087,11 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
                 ctx, response, sceneTable->SetSceneTableEntry(ctx.mCommandHandler.GetAccessingFabricIndex(), scene)));
         }
 
-        // Update Attributes
-        MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::SceneCount::Id);
-        MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::RemainingCapacity::Id);
+        // Update SceneInfoStruct Attributes
+        ReturnOnFailure(
+            AddResponseOnError(ctx, response,
+                               UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
+                                                     Optional<GroupId>(), Optional<SceneId>(), Optional<bool>())));
 
         ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
 
@@ -904,8 +1110,10 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
         AddResponseOnError(ctx, response, sceneTable->SetSceneTableEntry(ctx.mCommandHandler.GetAccessingFabricIndex(), scene)));
 
     // Update Attributes
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::SceneCount::Id);
-    MatterReportingAttributeChangeCallback(ctx.mRequestPath.mEndpointId, Id, Attributes::RemainingCapacity::Id);
+    ReturnOnFailure(
+        AddResponseOnError(ctx, response,
+                           UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
+                                                 Optional<GroupId>(), Optional<SceneId>(), Optional<bool>())));
 
     ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
 
@@ -918,6 +1126,63 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
 } // namespace app
 } // namespace chip
 
+using namespace chip;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::Scenes;
+
+void emberAfScenesClusterServerInitCallback(EndpointId endpoint)
+{
+    uint32_t featureMap  = 0;
+    EmberAfStatus status = Attributes::FeatureMap::Get(endpoint, &featureMap);
+    if (EMBER_ZCL_STATUS_SUCCESS == status)
+    {
+        // According to spec, bit 7 MUST match feature bit 0 (SceneNames)
+        BitMask<NameSupportBitmap> nameSupport = (featureMap & to_underlying(Feature::kSceneNames))
+            ? BitMask<NameSupportBitmap>(NameSupportBitmap::kSceneNames)
+            : BitMask<NameSupportBitmap>();
+        status                                 = Attributes::NameSupport::Set(endpoint, nameSupport);
+        if (EMBER_ZCL_STATUS_SUCCESS != status)
+        {
+            ChipLogDetail(Zcl, "ERR: setting NameSupport on Endpoint %hu Status: %x", endpoint, status);
+        }
+    }
+    else
+    {
+        ChipLogDetail(Zcl, "ERR: getting the scenes FeatureMap on Endpoint %hu Status: %x", endpoint, status);
+    }
+
+    // Explicit AttributeValuePairs and TableSize features are mandatory for matter so we force-set them here
+    featureMap |= (to_underlying(Feature::kExplicit) | to_underlying(Feature::kTableSize));
+    status = Attributes::FeatureMap::Set(endpoint, featureMap);
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        ChipLogDetail(Zcl, "ERR: setting the scenes FeatureMap on Endpoint %hu Status: %x", endpoint, status);
+    }
+
+    status = Attributes::LastConfiguredBy::SetNull(endpoint);
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        ChipLogDetail(Zcl, "ERR: setting LastConfiguredBy on Endpoint %hu Status: %x", endpoint, status);
+    }
+
+    // Initialize the FabricSceneInfo by getting the number of scenes and the remaining capacity for storing fabric scene data
+    for (auto & info : chip::Server::GetInstance().GetFabricTable())
+    {
+        auto fabric = info.GetFabricIndex();
+        UpdateFabricSceneInfo(endpoint, fabric, Optional<GroupId>(), Optional<SceneId>(), Optional<bool>());
+    }
+}
+
+void MatterScenesClusterServerShutdownCallback(EndpointId endpoint)
+{
+    uint16_t endpointTableSize = 0;
+    ReturnOnFailure(Attributes::SceneTableSize::Get(endpoint, &endpointTableSize));
+
+    // Get Scene Table Instance
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(endpoint, endpointTableSize);
+    sceneTable->RemoveEndpoint();
+}
+
 void MatterScenesPluginServerInitCallback()
 {
     CHIP_ERROR err = ScenesServer::Instance().Init();
diff --git a/src/app/clusters/scenes-server/scenes-server.h b/src/app/clusters/scenes-server/scenes-server.h
index a96d1dc29ce3ca..49bd1537de8734 100644
--- a/src/app/clusters/scenes-server/scenes-server.h
+++ b/src/app/clusters/scenes-server/scenes-server.h
@@ -34,6 +34,42 @@ namespace Scenes {
 class ScenesServer : public CommandHandlerInterface, public AttributeAccessInterface
 {
 public:
+    static constexpr size_t kScenesServerMaxEndpointCount =
+        EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
+    static_assert(kScenesServerMaxEndpointCount <= kEmberInvalidEndpointIndex, "Scenes endpoint count error");
+    static constexpr uint8_t kScenesServerMaxFabricCount = CHIP_CONFIG_MAX_FABRICS;
+
+    // FabricSceneInfo
+    class FabricSceneInfo
+    {
+    public:
+        Span<Structs::SceneInfoStruct::Type> GetFabricSceneInfo(EndpointId endpoint);
+        Structs::SceneInfoStruct::Type * GetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric);
+        CHIP_ERROR SetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric, Structs::SceneInfoStruct::Type & sceneInfoStruct);
+        void ClearSceneInfoStruct(EndpointId endpoint, FabricIndex fabric);
+
+    private:
+        /// @brief Returns the index of the FabricSceneInfo associated to an endpoint
+        /// @param[in] endpoint target endpoint
+        /// @param[out] endpointIndex index of the corresponding FabricSceneInfo for an endpoint, corresponds to a row in the
+        /// mSceneInfoStructs array,
+        /// @return CHIP_NO_ERROR or CHIP_ERROR_NOT_FOUND, CHIP_ERROR_INVALID_ARGUMENT if invalid endpoint
+        CHIP_ERROR FindFabricSceneInfoIndex(EndpointId endpoint, size_t & endpointIndex);
+
+        /// @brief Returns the SceneInfoStruct associated to a fabric
+        /// @param[in] fabric target fabric index
+        /// @param[in] endpointIndex index of the corresponding FabricSceneInfo for an endpoint, corresponds to a row in the
+        /// mSceneInfoStructs array
+        /// @param[out] index index of the corresponding SceneInfoStruct if found, otherwise the index value will be invalid and
+        /// should not be used. This is safe to store in a uint8_t because the index is guaranteed to be smaller than
+        /// CHIP_CONFIG_MAX_FABRICS.
+        /// @return CHIP_NO_ERROR or CHIP_ERROR_NOT_FOUND, CHIP_ERROR_INVALID_ARGUMENT if invalid fabric or endpoint
+        CHIP_ERROR FindSceneInfoStructIndex(FabricIndex fabric, size_t endpointIndex, uint8_t & index);
+
+        Structs::SceneInfoStruct::Type mSceneInfoStructs[kScenesServerMaxEndpointCount][kScenesServerMaxFabricCount];
+        uint8_t mSceneInfoStructsCount[kScenesServerMaxEndpointCount] = { 0 };
+    };
+
     static ScenesServer & Instance();
 
     CHIP_ERROR Init();
@@ -45,16 +81,25 @@ class ScenesServer : public CommandHandlerInterface, public AttributeAccessInter
     // AttributeAccessInterface
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
 
+    // SceneInfoStruct Accessors
+    Structs::SceneInfoStruct::Type * GetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric);
+    CHIP_ERROR SetSceneInfoStruct(EndpointId endpoint, FabricIndex fabric, Structs::SceneInfoStruct::Type & sceneInfoStruct);
+
     // Callbacks
     void GroupWillBeRemoved(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId);
-    void MakeSceneInvalid(EndpointId aEndpointId);
+    void MakeSceneInvalid(EndpointId aEndpointId, FabricIndex aFabricIx);
+    void MakeSceneInvalidForAllFabrics(EndpointId aEndpointId);
     void StoreCurrentScene(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId, SceneId aSceneId);
     void RecallScene(FabricIndex aFabricIx, EndpointId aEndpointId, GroupId aGroupId, SceneId aSceneId);
 
+    // Handlers for extension field sets
     bool IsHandlerRegistered(EndpointId aEndpointId, scenes::SceneHandler * handler);
     void RegisterSceneHandler(EndpointId aEndpointId, scenes::SceneHandler * handler);
     void UnregisterSceneHandler(EndpointId aEndpointId, scenes::SceneHandler * handler);
 
+    // Fabric
+    void RemoveFabric(EndpointId aEndpointId, FabricIndex aFabricIndex);
+
 private:
     ScenesServer() : CommandHandlerInterface(Optional<EndpointId>(), Id), AttributeAccessInterface(Optional<EndpointId>(), Id) {}
     ~ScenesServer() { Shutdown(); }
@@ -76,6 +121,9 @@ class ScenesServer : public CommandHandlerInterface, public AttributeAccessInter
     // Group Data Provider
     Credentials::GroupDataProvider * mGroupProvider = nullptr;
 
+    // FabricSceneInfo
+    FabricSceneInfo mFabricSceneInfo;
+
     // Instance
     static ScenesServer mInstance;
 };
diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
index 9a41c88f282831..37bd1f6bd11a83 100644
--- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
+++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
@@ -55,7 +55,7 @@ class SmokeCoAlarmServer
                                      const std::array<ExpressedStateEnum, kPriorityOrderLength> & priorityOrder);
 
     /**
-     * @brief Set the highest level of Expressed State according to priorityOrder
+     * @brief Request self-test when receiving local commands
      * @param endpointId ID of the endpoint
      * @return true on success, false on failure
      */
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index 85fa7c7a035322..6c3504c6bea270 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteAttributePath.h>
diff --git a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
index f4eb458a0a8313..8bc0b2a6416d03 100644
--- a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
+++ b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
@@ -52,44 +52,47 @@ class TimeFormatLocalizationAttrAccess : public AttributeAccessInterface
     CHIP_ERROR ReadSupportedCalendarTypes(AttributeValueEncoder & aEncoder);
 };
 
+class AutoReleaseIterator
+{
+public:
+    using Iterator = DeviceLayer::DeviceInfoProvider::SupportedCalendarTypesIterator;
+
+    AutoReleaseIterator(Iterator * value) : mIterator(value) {}
+    ~AutoReleaseIterator()
+    {
+        if (mIterator != nullptr)
+        {
+            mIterator->Release();
+        }
+    }
+
+    bool IsValid() const { return mIterator != nullptr; }
+    bool Next(CalendarTypeEnum & value) { return (mIterator == nullptr) ? false : mIterator->Next(value); }
+
+private:
+    Iterator * mIterator;
+};
+
 TimeFormatLocalizationAttrAccess gAttrAccess;
 
 CHIP_ERROR TimeFormatLocalizationAttrAccess::ReadSupportedCalendarTypes(AttributeValueEncoder & aEncoder)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
     DeviceLayer::DeviceInfoProvider * provider = DeviceLayer::GetDeviceInfoProvider();
+    VerifyOrReturnValue(provider != nullptr, aEncoder.EncodeEmptyList());
 
-    if (provider)
-    {
-        DeviceLayer::DeviceInfoProvider::SupportedCalendarTypesIterator * it = provider->IterateSupportedCalendarTypes();
-
-        if (it)
-        {
-            err = aEncoder.EncodeList([&it](const auto & encoder) -> CHIP_ERROR {
-                CalendarTypeEnum type;
-
-                while (it->Next(type))
-                {
-                    ReturnErrorOnFailure(encoder.Encode(type));
-                }
+    AutoReleaseIterator it(provider->IterateSupportedCalendarTypes());
+    VerifyOrReturnValue(it.IsValid(), aEncoder.EncodeEmptyList());
 
-                return CHIP_NO_ERROR;
-            });
+    return aEncoder.EncodeList([&it](const auto & encoder) -> CHIP_ERROR {
+        CalendarTypeEnum type;
 
-            it->Release();
-        }
-        else
+        while (it.Next(type))
         {
-            err = aEncoder.EncodeEmptyList();
+            ReturnErrorOnFailure(encoder.Encode(type));
         }
-    }
-    else
-    {
-        err = aEncoder.EncodeEmptyList();
-    }
 
-    return err;
+        return CHIP_NO_ERROR;
+    });
 }
 
 CHIP_ERROR TimeFormatLocalizationAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
@@ -114,27 +117,18 @@ bool IsSupportedCalendarType(CalendarTypeEnum newType, CalendarTypeEnum & validT
     validType = CalendarTypeEnum::kBuddhist;
 
     DeviceLayer::DeviceInfoProvider * provider = DeviceLayer::GetDeviceInfoProvider();
+    VerifyOrReturnValue(provider != nullptr, false);
 
-    if (provider)
-    {
-        DeviceLayer::DeviceInfoProvider::SupportedCalendarTypesIterator * it = provider->IterateSupportedCalendarTypes();
+    AutoReleaseIterator it(provider->IterateSupportedCalendarTypes());
+    VerifyOrReturnValue(it.IsValid(), false);
 
-        if (it)
+    CalendarTypeEnum type;
+    while (it.Next(type))
+    {
+        validType = type;
+        if (validType == newType)
         {
-            CalendarTypeEnum type;
-
-            while (it->Next(type))
-            {
-                validType = type;
-
-                if (validType == newType)
-                {
-                    it->Release();
-                    return true;
-                }
-            }
-
-            it->Release();
+            return true;
         }
     }
 
diff --git a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
index 6b00f661eea412..82164afc2427b2 100644
--- a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
+++ b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
@@ -44,8 +44,10 @@ bool DefaultTimeSyncDelegate::IsNTPAddressValid(chip::CharSpan ntp)
 
 bool DefaultTimeSyncDelegate::IsNTPAddressDomain(chip::CharSpan ntp)
 {
-    // placeholder implementation
-    return false;
+    // For now, assume anything that includes a . is a domain name.
+    // Delegates are free to evaluate this properly if they actually HAVE domain
+    // name resolution, rather than just implementing a dummy for testing.
+    return !IsNTPAddressValid(ntp) && (memchr(ntp.data(), '.', ntp.size()) != nullptr);
 }
 
 CHIP_ERROR DefaultTimeSyncDelegate::UpdateTimeFromPlatformSource(chip::Callback::Callback<OnTimeSyncCompletion> * callback)
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
index 39e00dd98dbe14..707abfb875045b 100644
--- a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
+++ b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -551,7 +551,7 @@ void TimeSynchronizationServer::InitTimeZone()
     for (auto & tzStore : mTimeZoneObj.timeZoneList)
     {
         memset(tzStore.name, 0, sizeof(tzStore.name));
-        tzStore.timeZone = { .offset = 0, .validAt = 0, .name = MakeOptional(CharSpan(tzStore.name, sizeof(tzStore.name))) };
+        tzStore.timeZone = { .offset = 0, .validAt = 0, .name = chip::NullOptional };
     }
 }
 
@@ -1284,24 +1284,19 @@ bool emberAfTimeSynchronizationClusterSetDefaultNTPCallback(
             commandObj->AddStatus(commandPath, Status::ConstraintError);
             return true;
         }
-        if (!GetDelegate()->IsNTPAddressValid(dNtpChar.Value()))
+        bool dnsResolve;
+        if (EMBER_ZCL_STATUS_SUCCESS != SupportsDNSResolve::Get(commandPath.mEndpointId, &dnsResolve))
         {
-            commandObj->AddStatus(commandPath, Status::InvalidCommand);
+            commandObj->AddStatus(commandPath, Status::Failure);
             return true;
         }
-        if (GetDelegate()->IsNTPAddressDomain(dNtpChar.Value()))
+        bool isDomain = GetDelegate()->IsNTPAddressDomain(dNtpChar.Value());
+        bool isIPv6   = GetDelegate()->IsNTPAddressValid(dNtpChar.Value());
+        bool useable  = isIPv6 || (isDomain && dnsResolve);
+        if (!useable)
         {
-            bool dnsResolve;
-            if (EMBER_ZCL_STATUS_SUCCESS != SupportsDNSResolve::Get(commandPath.mEndpointId, &dnsResolve))
-            {
-                commandObj->AddStatus(commandPath, Status::Failure);
-                return true;
-            }
-            if (!dnsResolve)
-            {
-                commandObj->AddStatus(commandPath, Status::InvalidCommand);
-                return true;
-            }
+            commandObj->AddStatus(commandPath, Status::InvalidCommand);
+            return true;
         }
     }
 
diff --git a/src/app/clusters/window-covering-server/window-covering-server.h b/src/app/clusters/window-covering-server/window-covering-server.h
index 1622de77a1de4a..d70fbe921a80e2 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.h
+++ b/src/app/clusters/window-covering-server/window-covering-server.h
@@ -19,7 +19,6 @@
 
 #include "window-covering-delegate.h"
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/util/af-types.h>
 #include <protocols/interaction_model/StatusCode.h>
 
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 4f8eb12c39e689..810decc84dfab8 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -1,14 +1,9 @@
-WeakEnums:
-    # Allow-list of enums that we generate as enums, not enum classes.
-    # The goal is to drive this down to 0.
-    - BarrierControlBarrierPosition
-    - BarrierControlMovingState
-    - ColorControlOptions
-    - ColorMode
-    - EnhancedColorMode
-    - MoveMode
-    - PHYRateEnum
-    - StepMode
+DarwinForceWritable:
+    # Work-around for not allowing changes from writable to read-only
+    # happened in https://github.com/project-chip/connectedhomeip/pull/30134
+    - ApplicationLauncher::CurrentApp
+    - ContentLauncher::SupportedStreamingProtocols
+    - FanControl::FanModeSequence
 
 EnumsNotUsedAsTypeInXML:
     # List of enums that are not used as a type in XML. By adding an enum
@@ -57,6 +52,7 @@ ClustersWithInitFunctions:
     - Thermostat
     - Mode Select
     - Sample MEI
+    - Scenes
 
 ClustersWithAttributeChangedFunctions:
     - Bridged Device Basic
@@ -73,6 +69,7 @@ ClustersWithShutdownFunctions:
     - Level Control
     - Color Control
     - Sample MEI
+    - Scenes
 
 ClustersWithPreAttributeChangeFunctions:
     - Door Lock
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
index de1817b98bce43..6d253d5e1b2d6f 100644
--- a/src/app/common/templates/templates.json
+++ b/src/app/common/templates/templates.json
@@ -31,11 +31,6 @@
         }
     ],
     "templates": [
-        {
-            "path": "../../zap-templates/templates/app/attribute-size.zapt",
-            "name": "ZCL attribute-size header",
-            "output": "attribute-size.h"
-        },
         {
             "path": "../../zap-templates/templates/app/attribute-type.zapt",
             "name": "ZCL attribute-type header",
@@ -46,11 +41,6 @@
             "name": "ZCL callback header",
             "output": "callback.h"
         },
-        {
-            "path": "../../zap-templates/templates/app/enums.zapt",
-            "name": "ZCL enums header",
-            "output": "enums.h"
-        },
         {
             "path": "../../zap-templates/templates/app/print-cluster.zapt",
             "name": "ZCL print-cluster header",
diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
index 0879e296865a04..99e8a23b0b699f 100644
--- a/src/app/icd/BUILD.gn
+++ b/src/app/icd/BUILD.gn
@@ -42,10 +42,26 @@ source_set("manager") {
     ":cluster",
     ":notifier",
     ":observer",
+    ":sender",
     "${chip_root}/src/credentials:credentials",
   ]
 }
 
+source_set("sender") {
+  sources = [
+    "ICDCheckInSender.cpp",
+    "ICDCheckInSender.h",
+  ]
+
+  public_deps = [
+    ":cluster",
+    ":notifier",
+    "${chip_root}/src/credentials:credentials",
+    "${chip_root}/src/lib/address_resolve:address_resolve",
+    "${chip_root}/src/protocols/secure_channel",
+  ]
+}
+
 # ICD management cluster source-set is broken out of the main source-set to enable unit tests
 # All sources and configurations used by the ICD management cluster need to go in this source-set
 source_set("cluster") {
@@ -56,6 +72,8 @@ source_set("cluster") {
     "ICDMonitoringTable.h",
   ]
 
+  deps = [ ":notifier" ]
+
   public_deps = [
     "${chip_root}/src/lib/core",
     "${chip_root}/src/platform:platform",
diff --git a/src/app/icd/ICDCheckInSender.cpp b/src/app/icd/ICDCheckInSender.cpp
new file mode 100644
index 00000000000000..8557967eceba1a
--- /dev/null
+++ b/src/app/icd/ICDCheckInSender.cpp
@@ -0,0 +1,107 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ICDCheckInSender.h"
+
+#include "ICDNotifier.h"
+
+#include <system/SystemPacketBuffer.h>
+
+#include <protocols/secure_channel/CheckinMessage.h>
+
+#include <lib/dnssd/Resolver.h>
+
+namespace chip {
+namespace app {
+
+using namespace Protocols::SecureChannel;
+
+ICDCheckInSender::ICDCheckInSender(Messaging::ExchangeManager * exchangeManager)
+{
+    VerifyOrDie(exchangeManager != nullptr);
+    mExchangeManager = exchangeManager;
+    mAddressLookupHandle.SetListener(this);
+}
+
+void ICDCheckInSender::OnNodeAddressResolved(const PeerId & peerId, const AddressResolve::ResolveResult & result)
+{
+    if (CHIP_NO_ERROR != SendCheckInMsg(result.address))
+    {
+        ChipLogError(AppServer, "Failed to send the ICD Check-In message");
+    }
+
+    ICDNotifier::GetInstance().BroadcastActiveRequestWithdrawal(ICDListener::KeepActiveFlag::kCheckInInProgress);
+}
+
+void ICDCheckInSender::OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason)
+{
+    ICDNotifier::GetInstance().BroadcastActiveRequestWithdrawal(ICDListener::KeepActiveFlag::kCheckInInProgress);
+    ChipLogProgress(AppServer, "Node Address resolution failed for ICD Check-In with Node ID " ChipLogFormatX64,
+                    ChipLogValueX64(peerId.GetNodeId()));
+}
+
+CHIP_ERROR ICDCheckInSender::SendCheckInMsg(const Transport::PeerAddress & addr)
+{
+    System::PacketBufferHandle buffer = MessagePacketBuffer::New(CheckinMessage::sMinPayloadSize);
+
+    VerifyOrReturnError(!buffer.IsNull(), CHIP_ERROR_NO_MEMORY);
+    MutableByteSpan output{ buffer->Start(), buffer->MaxDataLength() };
+
+    // TODO retrieve Check-in counter
+    CounterType counter = 0;
+
+    ReturnErrorOnFailure(CheckinMessage::GenerateCheckinMessagePayload(mKey, counter, ByteSpan(), output));
+    buffer->SetDataLength(static_cast<uint16_t>(output.size()));
+
+    VerifyOrReturnError(mExchangeManager->GetSessionManager() != nullptr, CHIP_ERROR_INTERNAL);
+
+    // Using default MRP since we are not doing MRP in this context
+    Optional<SessionHandle> session =
+        mExchangeManager->GetSessionManager()->CreateUnauthenticatedSession(addr, GetDefaultMRPConfig());
+    VerifyOrReturnError(session.HasValue(), CHIP_ERROR_NO_MEMORY);
+
+    Messaging::ExchangeContext * exchangeContext = mExchangeManager->NewContext(session.Value(), nullptr);
+
+    VerifyOrReturnError(exchangeContext != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    return exchangeContext->SendMessage(MsgType::ICD_CheckIn, std::move(buffer), Messaging::SendMessageFlags::kNoAutoRequestAck);
+}
+
+CHIP_ERROR ICDCheckInSender::RequestResolve(ICDMonitoringEntry & entry, FabricTable * fabricTable)
+{
+    VerifyOrReturnError(entry.IsValid(), CHIP_ERROR_INTERNAL);
+    VerifyOrReturnError(fabricTable != nullptr, CHIP_ERROR_INTERNAL);
+    const FabricInfo * fabricInfo = fabricTable->FindFabricWithIndex(entry.fabricIndex);
+    PeerId peerId(fabricInfo->GetCompressedFabricId(), entry.checkInNodeID);
+
+    AddressResolve::NodeLookupRequest request(peerId);
+
+    memcpy(mKey.AsMutable<Crypto::Aes128KeyByteArray>(), entry.key.As<Crypto::Aes128KeyByteArray>(),
+           sizeof(Crypto::Aes128KeyByteArray));
+
+    CHIP_ERROR err = AddressResolve::Resolver::Instance().LookupNode(request, mAddressLookupHandle);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        ICDNotifier::GetInstance().BroadcastActiveRequestNotification(ICDListener::KeepActiveFlag::kCheckInInProgress);
+    }
+
+    return err;
+}
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/icd/ICDCheckInSender.h b/src/app/icd/ICDCheckInSender.h
new file mode 100644
index 00000000000000..a06efeee419287
--- /dev/null
+++ b/src/app/icd/ICDCheckInSender.h
@@ -0,0 +1,57 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <app/icd/ICDMonitoringTable.h>
+#include <credentials/FabricTable.h>
+#include <lib/address_resolve/AddressResolve.h>
+
+#include <messaging/ExchangeMgr.h>
+
+namespace chip {
+namespace app {
+
+/**
+ * @brief ICD Check-In Sender is responsible for resolving the NodeId and sending the check-in message
+ */
+class ICDCheckInSender : public AddressResolve::NodeListener
+{
+public:
+    ICDCheckInSender(Messaging::ExchangeManager * exchangeManager);
+    ~ICDCheckInSender(){};
+
+    CHIP_ERROR RequestResolve(ICDMonitoringEntry & entry, FabricTable * fabricTable);
+
+    // AddressResolve::NodeListener - notifications when dnssd finds a node IP address
+    void OnNodeAddressResolved(const PeerId & peerId, const AddressResolve::ResolveResult & result) override;
+    void OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason) override;
+
+    bool mResolveInProgress = false;
+
+private:
+    CHIP_ERROR SendCheckInMsg(const Transport::PeerAddress & addr);
+
+    // This is used when a node address is required.
+    AddressResolve::NodeLookupHandle mAddressLookupHandle;
+
+    Messaging::ExchangeManager * mExchangeManager = nullptr;
+
+    Crypto::Aes128KeyHandle mKey = Crypto::Aes128KeyHandle();
+};
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/icd/ICDManagementServer.cpp b/src/app/icd/ICDManagementServer.cpp
index fe41617cfb3a71..3ededbcffe7cb4 100644
--- a/src/app/icd/ICDManagementServer.cpp
+++ b/src/app/icd/ICDManagementServer.cpp
@@ -1,4 +1,5 @@
 #include "ICDManagementServer.h"
+#include <app/icd/ICDNotifier.h>
 
 using namespace chip;
 using namespace chip::Protocols;
@@ -11,6 +12,7 @@ Status ICDManagementServer::RegisterClient(PersistentStorageDelegate & storage,
                                            uint64_t monitored_subject, chip::ByteSpan key,
                                            Optional<chip::ByteSpan> verification_key, bool is_admin)
 {
+    bool isFirstEntryForFabric = false;
     ICDMonitoringTable table(storage, fabric_index, GetClientsSupportedPerFabric(), mSymmetricKeystore);
 
     // Get current entry, if exists
@@ -29,6 +31,9 @@ Status ICDManagementServer::RegisterClient(PersistentStorageDelegate & storage,
     {
         // New entry
         VerifyOrReturnError(entry.index < table.Limit(), InteractionModel::Status::ResourceExhausted);
+
+        // Check if it's going to be the first entry for fabric
+        isFirstEntryForFabric = table.IsEmpty();
     }
     else
     {
@@ -58,6 +63,12 @@ Status ICDManagementServer::RegisterClient(PersistentStorageDelegate & storage,
     VerifyOrReturnError(CHIP_ERROR_INVALID_ARGUMENT != err, InteractionModel::Status::ConstraintError);
     VerifyOrReturnError(CHIP_NO_ERROR == err, InteractionModel::Status::Failure);
 
+    if (isFirstEntryForFabric)
+    {
+        // Notify subscribers that the first entry for the fabric was successfully added
+        TriggerICDMTableUpdatedEvent();
+    }
+
     return InteractionModel::Status::Success;
 }
 
@@ -82,13 +93,25 @@ Status ICDManagementServer::UnregisterClient(PersistentStorageDelegate & storage
     err = table.Remove(entry.index);
     VerifyOrReturnError(CHIP_NO_ERROR == err, InteractionModel::Status::Failure);
 
+    if (table.IsEmpty())
+    {
+        TriggerICDMTableUpdatedEvent();
+    }
+
     return InteractionModel::Status::Success;
 }
 
 Status ICDManagementServer::StayActiveRequest(FabricIndex fabric_index)
 {
     // TODO: Implementent stay awake logic for end device
+    // https://github.com/project-chip/connectedhomeip/issues/24259
+    app::ICDNotifier::GetInstance().BroadcastICDManagementEvent(app::ICDListener::ICDManagementEvents::kStayActiveRequestReceived);
     return InteractionModel::Status::UnsupportedCommand;
 }
 
+void ICDManagementServer::TriggerICDMTableUpdatedEvent()
+{
+    app::ICDNotifier::GetInstance().BroadcastICDManagementEvent(app::ICDListener::ICDManagementEvents::kTableUpdated);
+}
+
 } // namespace chip
diff --git a/src/app/icd/ICDManagementServer.h b/src/app/icd/ICDManagementServer.h
index 7bb97e39a33dfd..cf4a1c9cef920b 100644
--- a/src/app/icd/ICDManagementServer.h
+++ b/src/app/icd/ICDManagementServer.h
@@ -53,6 +53,12 @@ class ICDManagementServer
     Status UnregisterClient(PersistentStorageDelegate & storage, FabricIndex fabric_index, chip::NodeId node_id,
                             Optional<chip::ByteSpan> verificationKey, bool is_admin);
 
+    /**
+     * @brief Triggers table update events to notify subscribers that an entry was added or removed
+     *        from the ICDMonitoringTable.
+     */
+    void TriggerICDMTableUpdatedEvent();
+
     Status StayActiveRequest(FabricIndex fabric_index);
 
     static ICDManagementServer & GetInstance() { return mInstance; }
@@ -75,6 +81,8 @@ class ICDManagementServer
 
     uint16_t mActiveThreshold_ms = CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS;
 
+    // TODO : Implement ICD counter
+    // https://github.com/project-chip/connectedhomeip/issues/29184
     uint32_t mICDCounter = 0;
 
     static_assert((CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC) >= 1,
diff --git a/src/app/icd/ICDManager.cpp b/src/app/icd/ICDManager.cpp
index 456981b09780e1..fd744a25764402 100644
--- a/src/app/icd/ICDManager.cpp
+++ b/src/app/icd/ICDManager.cpp
@@ -40,21 +40,27 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::IcdManagement;
 
-uint8_t ICDManager::OpenExchangeContextCount = 0;
 static_assert(UINT8_MAX >= CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS,
-              "ICDManager::OpenExchangeContextCount cannot hold count for the max exchange count");
+              "ICDManager::mOpenExchangeContextCount cannot hold count for the max exchange count");
 
-void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, ICDStateObserver * stateObserver,
-                      Crypto::SymmetricKeystore * symmetricKeystore)
+void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeystore)
 {
     VerifyOrDie(storage != nullptr);
     VerifyOrDie(fabricTable != nullptr);
-    VerifyOrDie(stateObserver != nullptr);
     VerifyOrDie(symmetricKeystore != nullptr);
 
-    mStorage       = storage;
-    mFabricTable   = fabricTable;
-    mStateObserver = stateObserver;
+    bool supportLIT = SupportsFeature(Feature::kLongIdleTimeSupport);
+    VerifyOrDieWithMsg((supportLIT == false) || SupportsFeature(Feature::kCheckInProtocolSupport), AppServer,
+                       "The CheckIn protocol feature is required for LIT support");
+    VerifyOrDieWithMsg((supportLIT == false) || SupportsFeature(Feature::kUserActiveModeTrigger), AppServer,
+                       "The user ActiveMode trigger feature is required for LIT support");
+
+    // Disabling check until LIT support is compelte
+    // VerifyOrDieWithMsg((supportLIT == false) && (GetSlowPollingInterval() <= GetSITPollingThreshold()) , AppServer,
+    //                    "LIT support is required for slow polling intervals superior to 15 seconds");
+
+    mStorage     = storage;
+    mFabricTable = fabricTable;
     VerifyOrDie(ICDNotifier::GetInstance().Subscribe(this) == CHIP_NO_ERROR);
     mSymmetricKeystore = symmetricKeystore;
 
@@ -66,7 +72,7 @@ void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricT
     // VerifyOrDie(kFastPollingInterval.count() < activeModeDuration);
 
     UpdateICDMode();
-    UpdateOperationState(OperationalState::ActiveMode);
+    UpdateOperationState(OperationalState::IdleMode);
 }
 
 void ICDManager::Shutdown()
@@ -77,20 +83,22 @@ void ICDManager::Shutdown()
     DeviceLayer::SystemLayer().CancelTimer(OnActiveModeDone, this);
     DeviceLayer::SystemLayer().CancelTimer(OnTransitionToIdle, this);
     mICDMode          = ICDMode::SIT;
-    mOperationalState = OperationalState::IdleMode;
+    mOperationalState = OperationalState::ActiveMode;
     mStorage          = nullptr;
     mFabricTable      = nullptr;
+    mStateObserverPool.ReleaseAll();
 }
 
-bool ICDManager::SupportsCheckInProtocol()
+bool ICDManager::SupportsFeature(Feature feature)
 {
-    bool success        = false;
-    uint32_t featureMap = 0;
     // Can't use attribute accessors/Attributes::FeatureMap::Get in unit tests
-#ifndef CONFIG_BUILD_FOR_HOST_UNIT_TEST
-    success = (Attributes::FeatureMap::Get(kRootEndpointId, &featureMap) == EMBER_ZCL_STATUS_SUCCESS);
-#endif
-    return success ? ((featureMap & to_underlying(Feature::kCheckInProtocolSupport)) != 0) : false;
+#if !CONFIG_BUILD_FOR_HOST_UNIT_TEST
+    uint32_t featureMap = 0;
+    bool success        = (Attributes::FeatureMap::Get(kRootEndpointId, &featureMap) == EMBER_ZCL_STATUS_SUCCESS);
+    return success ? ((featureMap & to_underlying(feature)) != 0) : false;
+#else
+    return ((mFeatureMap & to_underlying(feature)) != 0);
+#endif // !CONFIG_BUILD_FOR_HOST_UNIT_TEST
 }
 
 void ICDManager::UpdateICDMode()
@@ -99,9 +107,8 @@ void ICDManager::UpdateICDMode()
 
     ICDMode tempMode = ICDMode::SIT;
 
-    // The Check In Protocol Feature is required and the slow polling interval shall also be greater than 15 seconds
-    // to run an ICD in LIT mode.
-    if (GetSlowPollingInterval() > GetSITPollingThreshold() && SupportsCheckInProtocol())
+    // Device can only switch to the LIT operating mode if LIT support is present
+    if (SupportsFeature(Feature::kLongIdleTimeSupport))
     {
         VerifyOrDie(mStorage != nullptr);
         VerifyOrDie(mFabricTable != nullptr);
@@ -117,7 +124,12 @@ void ICDManager::UpdateICDMode()
             }
         }
     }
-    mICDMode = tempMode;
+
+    if (mICDMode != tempMode)
+    {
+        mICDMode = tempMode;
+        postObserverEvent(ObserverEventType::ICDModeChange);
+    }
 
     // When in SIT mode, the slow poll interval SHOULDN'T be greater than the SIT mode polling threshold, per spec.
     if (mICDMode == ICDMode::SIT && GetSlowPollingInterval() > GetSITPollingThreshold())
@@ -157,7 +169,7 @@ void ICDManager::UpdateOperationState(OperationalState state)
         CHIP_ERROR err = DeviceLayer::ConnectivityMgr().SetPollingInterval(slowPollInterval);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(AppServer, "Failed to set Polling Interval: err %" CHIP_ERROR_FORMAT, err.Format());
+            ChipLogError(AppServer, "Failed to set Slow Polling Interval: err %" CHIP_ERROR_FORMAT, err.Format());
         }
     }
     else if (state == OperationalState::ActiveMode)
@@ -187,10 +199,10 @@ void ICDManager::UpdateOperationState(OperationalState state)
             CHIP_ERROR err = DeviceLayer::ConnectivityMgr().SetPollingInterval(GetFastPollingInterval());
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(AppServer, "Failed to set Polling Interval: err %" CHIP_ERROR_FORMAT, err.Format());
+                ChipLogError(AppServer, "Failed to set Fast Polling Interval: err %" CHIP_ERROR_FORMAT, err.Format());
             }
 
-            mStateObserver->OnEnterActiveMode();
+            postObserverEvent(ObserverEventType::EnterActiveMode);
         }
         else
         {
@@ -252,7 +264,7 @@ void ICDManager::OnTransitionToIdle(System::Layer * aLayer, void * appState)
     // OnTransitionToIdle will trigger a report message if reporting is needed, which should extend the active mode until the
     // ack for the report is received.
     pICDManager->mTransitionToIdleCalled = true;
-    pICDManager->mStateObserver->OnTransitionToIdle();
+    pICDManager->postObserverEvent(ObserverEventType::TransitionToIdle);
 }
 
 /* ICDListener functions. */
@@ -260,44 +272,70 @@ void ICDManager::OnKeepActiveRequest(KeepActiveFlags request)
 {
     assertChipStackLockedByCurrentThread();
 
-    if (request == KeepActiveFlags::kExchangeContextOpen)
+    VerifyOrReturn(request < KeepActiveFlagsValues::kInvalidFlag);
+
+    if (request.Has(KeepActiveFlag::kExchangeContextOpen))
     {
         // There can be multiple open exchange contexts at the same time.
         // Keep track of the requests count.
-        this->OpenExchangeContextCount++;
-        this->SetKeepActiveModeRequirements(request, true /* state */);
+        this->mOpenExchangeContextCount++;
     }
-    else /* !kExchangeContextOpen */
+
+    if (request.Has(KeepActiveFlag::kCheckInInProgress))
     {
-        // Only 1 request per type (kCommissioningWindowOpen, kFailSafeArmed)
-        // set requirement directly
-        this->SetKeepActiveModeRequirements(request, true /* state */);
+        // There can be multiple check-in at the same time.
+        // Keep track of the requests count.
+        this->mCheckInRequestCount++;
     }
+
+    this->SetKeepActiveModeRequirements(request, true /* state */);
 }
 
 void ICDManager::OnActiveRequestWithdrawal(KeepActiveFlags request)
 {
     assertChipStackLockedByCurrentThread();
 
-    if (request == KeepActiveFlags::kExchangeContextOpen)
+    VerifyOrReturn(request < KeepActiveFlagsValues::kInvalidFlag);
+
+    if (request.Has(KeepActiveFlag::kExchangeContextOpen))
     {
         // There can be multiple open exchange contexts at the same time.
         // Keep track of the requests count.
-        if (this->OpenExchangeContextCount > 0)
+        if (this->mOpenExchangeContextCount > 0)
         {
-            this->OpenExchangeContextCount--;
+            this->mOpenExchangeContextCount--;
         }
         else
         {
             ChipLogError(DeviceLayer, "The ICD Manager did not account for ExchangeContext closure");
         }
 
-        if (this->OpenExchangeContextCount == 0)
+        if (this->mOpenExchangeContextCount == 0)
+        {
+            this->SetKeepActiveModeRequirements(KeepActiveFlag::kExchangeContextOpen, false /* state */);
+        }
+    }
+
+    if (request.Has(KeepActiveFlag::kCheckInInProgress))
+    {
+        // There can be multiple open exchange contexts at the same time.
+        // Keep track of the requests count.
+        if (this->mCheckInRequestCount > 0)
         {
-            this->SetKeepActiveModeRequirements(request, false /* state */);
+            this->mCheckInRequestCount--;
+        }
+        else
+        {
+            ChipLogError(DeviceLayer, "The ICD Manager did not account for Check-In Sender start");
+        }
+
+        if (this->mCheckInRequestCount == 0)
+        {
+            this->SetKeepActiveModeRequirements(KeepActiveFlag::kCheckInInProgress, false /* state */);
         }
     }
-    else /* !kExchangeContextOpen */
+
+    if (request.Has(KeepActiveFlag::kCommissioningWindowOpen) || request.Has(KeepActiveFlag::kFailSafeArmed))
     {
         // Only 1 request per type (kCommissioningWindowOpen, kFailSafeArmed)
         // remove requirement directly
@@ -309,5 +347,78 @@ void ICDManager::OnNetworkActivity()
 {
     this->UpdateOperationState(OperationalState::ActiveMode);
 }
+
+void ICDManager::OnICDManagementServerEvent(ICDManagementEvents event)
+{
+    switch (event)
+    {
+    case ICDManagementEvents::kTableUpdated:
+        this->UpdateICDMode();
+        break;
+
+    case ICDManagementEvents::kStayActiveRequestReceived:
+        // TODO : Implement the StayActiveRequest
+        // https://github.com/project-chip/connectedhomeip/issues/24259
+        break;
+    default:
+        break;
+    }
+}
+
+System::Clock::Milliseconds32 ICDManager::GetSlowPollingInterval()
+{
+#if ICD_ENFORCE_SIT_SLOW_POLL_LIMIT
+    // When in SIT mode, the slow poll interval SHOULDN'T be greater than the SIT mode polling threshold, per spec.
+    // This is important for ICD device configured for LIT operation but currently operating as a SIT
+    // due to a lack of client registration
+    if (mICDMode == ICDMode::SIT && GetSlowPollingInterval() > GetSITPollingThreshold())
+    {
+        return GetSITPollingThreshold();
+    }
+#endif
+    return kSlowPollingInterval;
+}
+
+ICDManager::ObserverPointer * ICDManager::RegisterObserver(ICDStateObserver * observer)
+{
+    return mStateObserverPool.CreateObject(observer);
+}
+
+void ICDManager::ReleaseObserver(ICDStateObserver * observer)
+{
+    mStateObserverPool.ForEachActiveObject([this, observer](ObserverPointer * obs) {
+        if (obs->mObserver == observer)
+        {
+            mStateObserverPool.ReleaseObject(obs);
+            return Loop::Break;
+        }
+        return Loop::Continue;
+    });
+}
+
+void ICDManager::postObserverEvent(ObserverEventType event)
+{
+    mStateObserverPool.ForEachActiveObject([event](ObserverPointer * obs) {
+        switch (event)
+        {
+        case ObserverEventType::EnterActiveMode: {
+            obs->mObserver->OnEnterActiveMode();
+            return Loop::Continue;
+        }
+        case ObserverEventType::TransitionToIdle: {
+            obs->mObserver->OnTransitionToIdle();
+            return Loop::Continue;
+        }
+        case ObserverEventType::ICDModeChange: {
+            obs->mObserver->OnICDModeChange();
+            return Loop::Continue;
+        }
+        default: {
+            ChipLogError(DeviceLayer, "Invalid ICD Observer event type");
+            return Loop::Break;
+        }
+        }
+    });
+}
 } // namespace app
 } // namespace chip
diff --git a/src/app/icd/ICDManager.h b/src/app/icd/ICDManager.h
index e477e08c8fd24e..573a20011f7ffc 100644
--- a/src/app/icd/ICDManager.h
+++ b/src/app/icd/ICDManager.h
@@ -16,6 +16,7 @@
  */
 #pragma once
 
+#include <app-common/zap-generated/cluster-enums.h>
 #include <app/icd/ICDMonitoringTable.h>
 #include <app/icd/ICDNotifier.h>
 #include <app/icd/ICDStateObserver.h>
@@ -38,6 +39,14 @@ class TestICDManager;
 class ICDManager : public ICDListener
 {
 public:
+    // This structure is used for the creation an ObjectPool of ICDStateObserver pointers
+    struct ObserverPointer
+    {
+        ObserverPointer(ICDStateObserver * obs) : mObserver(obs) {}
+        ~ObserverPointer() { mObserver = nullptr; }
+        ICDStateObserver * mObserver;
+    };
+
     enum class OperationalState : uint8_t
     {
         IdleMode,
@@ -50,32 +59,66 @@ class ICDManager : public ICDListener
         LIT, // Long Interval Time ICD
     };
 
+    // This enum class represents to all ICDStateObserver callbacks available from the
+    // mStateObserverPool for the ICDManager.
+    enum class ObserverEventType : uint8_t
+    {
+        EnterActiveMode,
+        TransitionToIdle,
+        ICDModeChange,
+    };
+
     ICDManager() {}
-    void Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, ICDStateObserver * stateObserver,
-              Crypto::SymmetricKeystore * symmetricKeyStore);
+    void Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeyStore);
     void Shutdown();
     void UpdateICDMode();
     void UpdateOperationState(OperationalState state);
     void SetKeepActiveModeRequirements(KeepActiveFlags flag, bool state);
     bool IsKeepActive() { return mKeepActiveFlags.HasAny(); }
+    bool SupportsFeature(Clusters::IcdManagement::Feature feature);
+
+    /**
+     * @brief Adds the referenced observer in parameters to the mStateObserverPool
+     * A maximum of CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE observers can be concurrently registered
+     *
+     * @return The pointer to the pool object, or null if it could not be added.
+     */
+    ObserverPointer * RegisterObserver(ICDStateObserver * observer);
+
+    /**
+     * @brief Remove the referenced observer in parameters from the mStateObserverPool
+     */
+    void ReleaseObserver(ICDStateObserver * observer);
+
+    /**
+     * @brief Associates the ObserverEventType parameters to the correct
+     *  ICDStateObservers function and calls it for all observers in the mStateObserverPool
+     */
+    void postObserverEvent(ObserverEventType event);
     ICDMode GetICDMode() { return mICDMode; }
     OperationalState GetOperationalState() { return mOperationalState; }
 
     static System::Clock::Milliseconds32 GetSITPollingThreshold() { return kSITPollingThreshold; }
-    static System::Clock::Milliseconds32 GetSlowPollingInterval() { return kSlowPollingInterval; }
     static System::Clock::Milliseconds32 GetFastPollingInterval() { return kFastPollingInterval; }
+    static System::Clock::Milliseconds32 GetSlowPollingInterval();
+
+#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
+    void SetTestFeatureMapValue(uint32_t featureMap) { mFeatureMap = featureMap; };
+#endif
 
     // Implementation of ICDListener functions.
     // Callers must origin from the chip task context or be holding the ChipStack lock.
     void OnNetworkActivity() override;
     void OnKeepActiveRequest(KeepActiveFlags request) override;
     void OnActiveRequestWithdrawal(KeepActiveFlags request) override;
+    void OnICDManagementServerEvent(ICDManagementEvents event) override;
 
 protected:
     friend class TestICDManager;
 
     static void OnIdleModeDone(System::Layer * aLayer, void * appState);
     static void OnActiveModeDone(System::Layer * aLayer, void * appState);
+
     /**
      * @brief Callback function called shortly before the device enters idle mode to allow checks to be made. This is currently only
      * called once to prevent entering in a loop if some events re-trigger this check (for instance if a check for subscription
@@ -84,7 +127,8 @@ class ICDManager : public ICDListener
      */
     static void OnTransitionToIdle(System::Layer * aLayer, void * appState);
 
-    static uint8_t OpenExchangeContextCount;
+    uint8_t mOpenExchangeContextCount = 0;
+    uint8_t mCheckInRequestCount      = 0;
 
 private:
     // SIT ICDs should have a SlowPollingThreshold shorter than or equal to 15s (spec 9.16.1.5)
@@ -97,17 +141,21 @@ class ICDManager : public ICDListener
     static constexpr uint32_t kMinActiveModeDuration  = 300;
     static constexpr uint16_t kMinActiveModeThreshold = 300;
 
-    bool SupportsCheckInProtocol();
+    KeepActiveFlags mKeepActiveFlags{ 0 };
 
-    BitFlags<KeepActiveFlags> mKeepActiveFlags{ 0 };
-
-    OperationalState mOperationalState             = OperationalState::IdleMode;
+    // Initialize mOperationalState to ActiveMode so the init sequence at bootup triggers the IdleMode behaviour first.
+    OperationalState mOperationalState             = OperationalState::ActiveMode;
     ICDMode mICDMode                               = ICDMode::SIT;
     PersistentStorageDelegate * mStorage           = nullptr;
     FabricTable * mFabricTable                     = nullptr;
-    ICDStateObserver * mStateObserver              = nullptr;
     bool mTransitionToIdleCalled                   = false;
     Crypto::SymmetricKeystore * mSymmetricKeystore = nullptr;
+    ObjectPool<ObserverPointer, CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE> mStateObserverPool;
+
+#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
+    // feature map that can be changed at runtime for testing purposes
+    uint32_t mFeatureMap = 0;
+#endif
 };
 
 } // namespace app
diff --git a/src/app/icd/ICDMonitoringTable.cpp b/src/app/icd/ICDMonitoringTable.cpp
index f47da4187dda65..fe8c959983a714 100644
--- a/src/app/icd/ICDMonitoringTable.cpp
+++ b/src/app/icd/ICDMonitoringTable.cpp
@@ -161,6 +161,25 @@ bool ICDMonitoringEntry::IsKeyEquivalent(ByteSpan keyData)
     return (data == validation) ? true : false;
 }
 
+ICDMonitoringEntry & ICDMonitoringEntry::operator=(const ICDMonitoringEntry & icdMonitoringEntry)
+{
+    if (this == &icdMonitoringEntry)
+    {
+        return *this;
+    }
+
+    fabricIndex       = icdMonitoringEntry.fabricIndex;
+    checkInNodeID     = icdMonitoringEntry.checkInNodeID;
+    monitoredSubject  = icdMonitoringEntry.monitoredSubject;
+    index             = icdMonitoringEntry.index;
+    keyHandleValid    = icdMonitoringEntry.keyHandleValid;
+    symmetricKeystore = icdMonitoringEntry.symmetricKeystore;
+    memcpy(key.AsMutable<Crypto::Aes128KeyByteArray>(), icdMonitoringEntry.key.As<Crypto::Aes128KeyByteArray>(),
+           sizeof(Crypto::Aes128KeyByteArray));
+
+    return *this;
+}
+
 CHIP_ERROR ICDMonitoringTable::Get(uint16_t index, ICDMonitoringEntry & entry) const
 {
     entry.fabricIndex = this->mFabric;
diff --git a/src/app/icd/ICDMonitoringTable.h b/src/app/icd/ICDMonitoringTable.h
index cf5fa28b4f1138..c97703b226aa75 100644
--- a/src/app/icd/ICDMonitoringTable.h
+++ b/src/app/icd/ICDMonitoringTable.h
@@ -54,7 +54,6 @@ struct ICDMonitoringEntry : public PersistentData<kICDMonitoringBufferSize>
         this->symmetricKeystore = keyStore;
     }
 
-    bool IsValid() { return this->checkInNodeID != kUndefinedNodeId && this->fabricIndex != kUndefinedFabricIndex; }
     CHIP_ERROR UpdateKey(StorageKeyName & key) override;
     CHIP_ERROR Serialize(TLV::TLVWriter & writer) const override;
     CHIP_ERROR Deserialize(TLV::TLVReader & reader) override;
@@ -77,6 +76,13 @@ struct ICDMonitoringEntry : public PersistentData<kICDMonitoringBufferSize>
      */
     CHIP_ERROR SetKey(ByteSpan keyData);
     CHIP_ERROR DeleteKey(void);
+    inline bool IsValid()
+    {
+        return (symmetricKeystore != nullptr && keyHandleValid && fabricIndex != kUndefinedFabricIndex &&
+                checkInNodeID != kUndefinedNodeId);
+    }
+
+    ICDMonitoringEntry & operator=(const ICDMonitoringEntry & icdMonitoringEntry);
 
     /**
      * @brief Implement the key verification needed by the ICDManagement Server.
diff --git a/src/app/icd/ICDNotifier.cpp b/src/app/icd/ICDNotifier.cpp
index a3b4588004809a..6f2e537b0bd5c7 100644
--- a/src/app/icd/ICDNotifier.cpp
+++ b/src/app/icd/ICDNotifier.cpp
@@ -89,5 +89,16 @@ void ICDNotifier::BroadcastActiveRequestWithdrawal(ICDListener::KeepActiveFlags
     }
 }
 
+void ICDNotifier::BroadcastICDManagementEvent(ICDListener::ICDManagementEvents event)
+{
+    for (auto subscriber : mSubscribers)
+    {
+        if (subscriber != nullptr)
+        {
+            subscriber->OnICDManagementServerEvent(event);
+        }
+    }
+}
+
 } // namespace app
 } // namespace chip
diff --git a/src/app/icd/ICDNotifier.h b/src/app/icd/ICDNotifier.h
index fc2b8b744c8302..4344b72a1d3ac3 100644
--- a/src/app/icd/ICDNotifier.h
+++ b/src/app/icd/ICDNotifier.h
@@ -18,6 +18,7 @@
 
 #include <app/AppConfig.h>
 #include <lib/core/CHIPError.h>
+#include <lib/support/BitFlags.h>
 
 class ICDListener;
 
@@ -38,13 +39,24 @@ static_assert(ICD_MAX_NOTIFICATION_SUBSCRIBERS > 0, "At least 1 Subscriber is re
 class ICDListener
 {
 public:
-    enum class KeepActiveFlags : uint8_t
+    enum class KeepActiveFlagsValues : uint8_t
     {
         kCommissioningWindowOpen = 0x01,
         kFailSafeArmed           = 0x02,
-        kExchangeContextOpen     = 0x03,
+        kExchangeContextOpen     = 0x04,
+        kCheckInInProgress       = 0x08,
+        kInvalidFlag             = 0x10, // Move up when adding more flags
     };
 
+    enum class ICDManagementEvents : uint8_t
+    {
+        kTableUpdated              = 0x01,
+        kStayActiveRequestReceived = 0x02,
+    };
+
+    using KeepActiveFlags = BitFlags<KeepActiveFlagsValues>;
+    using KeepActiveFlag  = KeepActiveFlagsValues;
+
     virtual ~ICDListener() {}
 
     /**
@@ -68,6 +80,14 @@ class ICDListener
      * @param request : The request source
      */
     virtual void OnActiveRequestWithdrawal(KeepActiveFlags request) = 0;
+
+    /**
+     * @brief This function is called for all subscribers of the ICDNotifier when it calls BroadcastICDManagementEvent
+     * It informs the subscriber that an ICD Management action has happened and needs to be processed
+     *
+     * @param event : The event type
+     */
+    virtual void OnICDManagementServerEvent(ICDManagementEvents event){};
 };
 
 class ICDNotifier
@@ -85,6 +105,12 @@ class ICDNotifier
     void BroadcastNetworkActivityNotification();
     void BroadcastActiveRequestNotification(ICDListener::KeepActiveFlags request);
     void BroadcastActiveRequestWithdrawal(ICDListener::KeepActiveFlags request);
+    void BroadcastICDManagementEvent(ICDListener::ICDManagementEvents event);
+
+    inline void BroadcastActiveRequest(ICDListener::KeepActiveFlags request, bool notify)
+    {
+        (notify) ? BroadcastActiveRequestNotification(request) : BroadcastActiveRequestWithdrawal(request);
+    }
 
     static ICDNotifier & GetInstance() { return sICDNotifier; }
 
diff --git a/src/app/icd/ICDStateObserver.h b/src/app/icd/ICDStateObserver.h
index fb9d2c7dde8203..996dad0ec6608b 100644
--- a/src/app/icd/ICDStateObserver.h
+++ b/src/app/icd/ICDStateObserver.h
@@ -33,6 +33,7 @@ class ICDStateObserver
     virtual ~ICDStateObserver() {}
     virtual void OnEnterActiveMode()  = 0;
     virtual void OnTransitionToIdle() = 0;
+    virtual void OnICDModeChange()    = 0;
 };
 
 } // namespace app
diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp
index 0a3eedd4ad767c..96f2530cc59acc 100644
--- a/src/app/reporting/Engine.cpp
+++ b/src/app/reporting/Engine.cpp
@@ -120,8 +120,10 @@ CHIP_ERROR Engine::BuildSingleReportDataAttributeReportIBs(ReportDataMessage::Bu
         ConcreteAttributePath readPath;
 
         ChipLogDetail(DataManagement,
-                      "Building Reports for ReadHandler with LastReportGeneration = %" PRIu64 " DirtyGeneration = %" PRIu64,
-                      apReadHandler->mPreviousReportsBeginGeneration, apReadHandler->mDirtyGeneration);
+                      "Building Reports for ReadHandler with LastReportGeneration = 0x" ChipLogFormatX64
+                      " DirtyGeneration = 0x" ChipLogFormatX64,
+                      ChipLogValueX64(apReadHandler->mPreviousReportsBeginGeneration),
+                      ChipLogValueX64(apReadHandler->mDirtyGeneration));
 
         // This ReadHandler is not generating reports, so we reset the iterator for a clean start.
         if (!apReadHandler->IsReporting())
diff --git a/src/app/reporting/ReportSchedulerImpl.cpp b/src/app/reporting/ReportSchedulerImpl.cpp
index 5c061d1336bc84..1655fbc434bb04 100644
--- a/src/app/reporting/ReportSchedulerImpl.cpp
+++ b/src/app/reporting/ReportSchedulerImpl.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 
@@ -73,9 +73,9 @@ void ReportSchedulerImpl::OnSubscriptionEstablished(ReadHandler * aReadHandler)
     newNode = mNodesPool.CreateObject(aReadHandler, this, now);
 
     ChipLogProgress(DataManagement,
-                    "Registered a ReadHandler that will schedule a report between system Timestamp: %" PRIu64
-                    " and system Timestamp %" PRIu64 ".",
-                    newNode->GetMinTimestamp().count(), newNode->GetMaxTimestamp().count());
+                    "Registered a ReadHandler that will schedule a report between system Timestamp: 0x" ChipLogFormatX64
+                    " and system Timestamp 0x" ChipLogFormatX64 ".",
+                    ChipLogValueX64(newNode->GetMinTimestamp().count()), ChipLogValueX64(newNode->GetMaxTimestamp().count()));
 }
 
 /// @brief When a ReadHandler becomes reportable, schedule, recalculate and reschedule the report.
diff --git a/src/app/reporting/ReportSchedulerImpl.h b/src/app/reporting/ReportSchedulerImpl.h
index 33c70d39f53f21..a8304a824232e7 100644
--- a/src/app/reporting/ReportSchedulerImpl.h
+++ b/src/app/reporting/ReportSchedulerImpl.h
@@ -35,6 +35,8 @@ class ReportSchedulerImpl : public ReportScheduler
     // ICDStateObserver
     void OnEnterActiveMode() override;
     void OnTransitionToIdle() override;
+    // No action is needed by the ReportScheduler on ICD operation Mode changes
+    void OnICDModeChange() override{};
 
     // ReadHandlerObserver
     void OnSubscriptionEstablished(ReadHandler * aReadHandler) final;
diff --git a/src/app/reporting/SynchronizedReportSchedulerImpl.cpp b/src/app/reporting/SynchronizedReportSchedulerImpl.cpp
index 55992e35febd24..d10a7ea4d3fea3 100644
--- a/src/app/reporting/SynchronizedReportSchedulerImpl.cpp
+++ b/src/app/reporting/SynchronizedReportSchedulerImpl.cpp
@@ -193,8 +193,8 @@ void SynchronizedReportSchedulerImpl::TimerFired()
         if (node->IsReportableNow(now))
         {
             node->SetEngineRunScheduled(true);
-            ChipLogProgress(DataManagement, "Handler: %p with min: %" PRIu64 " and max: %" PRIu64 "", (node),
-                            node->GetMinTimestamp().count(), node->GetMaxTimestamp().count());
+            ChipLogProgress(DataManagement, "Handler: %p with min: 0x" ChipLogFormatX64 " and max: 0x" ChipLogFormatX64 "", (node),
+                            ChipLogValueX64(node->GetMinTimestamp().count()), ChipLogValueX64(node->GetMaxTimestamp().count()));
         }
 
         return Loop::Continue;
diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn
index 992b9454d11b04..e08d8a07d34fd7 100644
--- a/src/app/server/BUILD.gn
+++ b/src/app/server/BUILD.gn
@@ -51,6 +51,7 @@ static_library("server") {
   public_deps = [
     "${chip_root}/src/app",
     "${chip_root}/src/app/icd:notifier",
+    "${chip_root}/src/app/icd:observer",
     "${chip_root}/src/lib/address_resolve",
     "${chip_root}/src/lib/dnssd",
     "${chip_root}/src/messaging",
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
index 33eaeedb1eb619..c4257fe7e2ef02 100644
--- a/src/app/server/CommissioningWindowManager.cpp
+++ b/src/app/server/CommissioningWindowManager.cpp
@@ -64,7 +64,8 @@ void CommissioningWindowManager::OnPlatformEvent(const DeviceLayer::ChipDeviceEv
         Cleanup();
         mServer->GetSecureSessionManager().ExpireAllPASESessions();
         // That should have cleared out mPASESession.
-#if CONFIG_NETWORK_LAYER_BLE
+#if CONFIG_NETWORK_LAYER_BLE && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
+        // If in NonConcurrentConnection, this will already have been completed
         mServer->GetBleLayerObject()->CloseAllBleConnections();
 #endif
     }
@@ -82,6 +83,13 @@ void CommissioningWindowManager::OnPlatformEvent(const DeviceLayer::ChipDeviceEv
         app::DnssdServer::Instance().AdvertiseOperational();
         ChipLogProgress(AppServer, "Operational advertising enabled");
     }
+#if CONFIG_NETWORK_LAYER_BLE
+    else if (event->Type == DeviceLayer::DeviceEventType::kCloseAllBleConnections)
+    {
+        ChipLogProgress(AppServer, "Received kCloseAllBleConnections");
+        mServer->GetBleLayerObject()->CloseAllBleConnections();
+    }
+#endif
 }
 
 void CommissioningWindowManager::Shutdown()
@@ -544,7 +552,7 @@ void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnu
     {
         mWindowStatus = aNewStatus;
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-        app::ICDListener::KeepActiveFlags request = app::ICDListener::KeepActiveFlags::kCommissioningWindowOpen;
+        app::ICDListener::KeepActiveFlags request = app::ICDListener::KeepActiveFlag::kCommissioningWindowOpen;
         if (mWindowStatus != CommissioningWindowStatusEnum::kWindowNotOpen)
         {
             app::ICDNotifier::GetInstance().BroadcastActiveRequestNotification(request);
diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp
index 86a70a0a8c69e2..cb627af4348dea 100644
--- a/src/app/server/Dnssd.cpp
+++ b/src/app/server/Dnssd.cpp
@@ -17,8 +17,8 @@
 
 #include <app/server/Dnssd.h>
 
+#include <app-common/zap-generated/cluster-enums.h>
 #include <inttypes.h>
-
 #include <lib/core/Optional.h>
 #include <lib/dnssd/Advertiser.h>
 #include <lib/dnssd/ServiceNaming.h>
@@ -145,6 +145,19 @@ CHIP_ERROR DnssdServer::SetEphemeralDiscriminator(Optional<uint16_t> discriminat
     return CHIP_NO_ERROR;
 }
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+template <class AdvertisingParams>
+void DnssdServer::AddICDKeyToAdvertisement(AdvertisingParams & advParams)
+{
+    // Only advertise the ICD key if the device can operate as a LIT
+    if (Server::GetInstance().GetICDManager().SupportsFeature(Clusters::IcdManagement::Feature::kLongIdleTimeSupport))
+    {
+        advParams.SetICDOperatingAsLIT(
+            Optional<bool>(Server::GetInstance().GetICDManager().GetICDMode() == ICDManager::ICDMode::LIT));
+    }
+}
+#endif
+
 /// Set MDNS operational advertisement
 CHIP_ERROR DnssdServer::AdvertiseOperational()
 {
@@ -165,14 +178,18 @@ CHIP_ERROR DnssdServer::AdvertiseOperational()
             Crypto::DRBG_get_bytes(macBuffer, sizeof(macBuffer));
         }
 
-        const auto advertiseParameters = chip::Dnssd::OperationalAdvertisingParameters()
-                                             .SetPeerId(fabricInfo.GetPeerId())
-                                             .SetMac(mac)
-                                             .SetPort(GetSecuredPort())
-                                             .SetInterfaceId(GetInterfaceId())
-                                             .SetLocalMRPConfig(GetLocalMRPConfig())
-                                             .SetTcpSupported(Optional<bool>(INET_CONFIG_ENABLE_TCP_ENDPOINT))
-                                             .EnableIpV4(true);
+        auto advertiseParameters = chip::Dnssd::OperationalAdvertisingParameters()
+                                       .SetPeerId(fabricInfo.GetPeerId())
+                                       .SetMac(mac)
+                                       .SetPort(GetSecuredPort())
+                                       .SetInterfaceId(GetInterfaceId())
+                                       .SetLocalMRPConfig(GetLocalMRPConfig())
+                                       .SetTcpSupported(Optional<bool>(INET_CONFIG_ENABLE_TCP_ENDPOINT))
+                                       .EnableIpV4(true);
+
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+        AddICDKeyToAdvertisement(advertiseParameters);
+#endif
 
         auto & mdnsAdvertiser = chip::Dnssd::ServiceAdvertiser::Instance();
 
@@ -243,6 +260,10 @@ CHIP_ERROR DnssdServer::Advertise(bool commissionableNode, chip::Dnssd::Commissi
 
     advertiseParameters.SetLocalMRPConfig(GetLocalMRPConfig()).SetTcpSupported(Optional<bool>(INET_CONFIG_ENABLE_TCP_ENDPOINT));
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    AddICDKeyToAdvertisement(advertiseParameters);
+#endif
+
     if (commissionableNode)
     {
         uint16_t discriminator = 0;
@@ -468,5 +489,12 @@ CHIP_ERROR DnssdServer::GenerateRotatingDeviceId(char rotatingDeviceIdHexBuffer[
 }
 #endif
 
+void DnssdServer::OnICDModeChange()
+{
+    // ICDMode changed, restart DNS-SD advertising, because SII and ICD key are affected by this change.
+    // StartServer will take care of setting the operational and commissionable advertissements
+    StartServer();
+}
+
 } // namespace app
 } // namespace chip
diff --git a/src/app/server/Dnssd.h b/src/app/server/Dnssd.h
index 072af4b720ae05..be1ec4fc09ccbb 100644
--- a/src/app/server/Dnssd.h
+++ b/src/app/server/Dnssd.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <app/icd/ICDStateObserver.h>
 #include <app/server/CommissioningModeProvider.h>
 #include <credentials/FabricTable.h>
 #include <lib/core/CHIPError.h>
@@ -29,7 +30,7 @@
 namespace chip {
 namespace app {
 
-class DLL_EXPORT DnssdServer
+class DLL_EXPORT DnssdServer : public ICDStateObserver
 {
 public:
     static constexpr System::Clock::Timestamp kTimeoutCleared = System::Clock::kZero;
@@ -85,6 +86,10 @@ class DLL_EXPORT DnssdServer
     void OnExtendedDiscoveryExpiration(System::Layer * aSystemLayer, void * aAppState);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    template <class AdvertisingParams>
+    void AddICDKeyToAdvertisement(AdvertisingParams & advParams);
+#endif
     /// Start operational advertising
     CHIP_ERROR AdvertiseOperational();
 
@@ -115,6 +120,12 @@ class DLL_EXPORT DnssdServer
      */
     CHIP_ERROR SetEphemeralDiscriminator(Optional<uint16_t> discriminator);
 
+    // ICDStateObserver
+    // No action is needed by the DnssdServer on active or idle state entries
+    void OnEnterActiveMode() override{};
+    void OnTransitionToIdle() override{};
+    void OnICDModeChange() override;
+
 private:
     /// Overloaded utility method for commissioner and commissionable advertisement
     /// This method is used for both commissioner discovery and commissionable node discovery since
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index 20846078baa64a..65a45192728833 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -257,7 +257,11 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 
 // ICD Init needs to be after data model init
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    mICDManager.Init(mDeviceStorage, &GetFabricTable(), mReportScheduler, mSessionKeystore);
+    mICDManager.Init(mDeviceStorage, &GetFabricTable(), mSessionKeystore);
+    // Register the ICDStateObservers. All observers are released at mICDManager.Shutdown()
+    // They can be released individually with ReleaseObserver
+    mICDManager.RegisterObserver(mReportScheduler);
+    mICDManager.RegisterObserver(&app::DnssdServer::Instance());
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 #if defined(CHIP_APP_USE_ECHO)
@@ -404,6 +408,16 @@ void Server::OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event)
         ResumeSubscriptions();
 #endif
         break;
+#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
+    case DeviceEventType::kThreadConnectivityChange:
+        if (event.ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            // Refresh Multicast listening
+            ChipLogDetail(DeviceLayer, "Thread Attached updating Multicast address");
+            RejoinExistingMulticastGroups();
+        }
+        break;
+#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
     default:
         break;
     }
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 89dc4f12cf7132..018c6f2196eb49 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 
 #include <access/AccessControl.h>
 #include <access/examples/ExampleAccessControlDelegate.h>
@@ -349,6 +349,10 @@ class Server
 
     app::reporting::ReportScheduler * GetReportScheduler() { return mReportScheduler; }
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    app::ICDManager & GetICDManager() { return mICDManager; }
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
     /**
      * This function causes the ShutDown event to be generated async on the
      * Matter event loop.  Should be called before stopping the event loop.
diff --git a/src/app/server/java/ChipThreadWork.cpp b/src/app/server/java/ChipThreadWork.cpp
index 334e3052211e42..c95fd647ee1de4 100644
--- a/src/app/server/java/ChipThreadWork.cpp
+++ b/src/app/server/java/ChipThreadWork.cpp
@@ -17,7 +17,9 @@
 
 #include "ChipThreadWork.h"
 #include <platform/CHIPDeviceLayer.h>
-#include <semaphore.h>
+
+#include <condition_variable>
+#include <mutex>
 
 namespace chip {
 namespace ThreadWork {
@@ -26,12 +28,21 @@ namespace {
 struct WorkData
 {
     WorkCallback callback;
-    sem_t done;
+    std::mutex mux;
+    std::condition_variable cond;
+    bool done = false;
 
-    WorkData() { sem_init(&done, 0 /* shared */, 0); }
-    ~WorkData() { sem_destroy(&done); }
-    void Post() { sem_post(&done); }
-    void Wait() { sem_wait(&done); }
+    void Post()
+    {
+        std::unique_lock lock(mux);
+        done = true;
+        cond.notify_all();
+    }
+    void Wait()
+    {
+        std::unique_lock lock(mux);
+        cond.wait(lock, [&] { return done; });
+    }
 };
 
 void PerformWork(intptr_t arg)
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
index 26c0cb0693c532..78e3bdb229e49c 100644
--- a/src/app/tests/BUILD.gn
+++ b/src/app/tests/BUILD.gn
@@ -95,6 +95,8 @@ source_set("scenes-table-test-srcs") {
     "${chip_root}/src/app/clusters/scenes-server/ExtensionFieldSets.h",
     "${chip_root}/src/app/clusters/scenes-server/ExtensionFieldSetsImpl.cpp",
     "${chip_root}/src/app/clusters/scenes-server/ExtensionFieldSetsImpl.h",
+    "${chip_root}/src/app/clusters/scenes-server/SceneHandlerImpl.cpp",
+    "${chip_root}/src/app/clusters/scenes-server/SceneHandlerImpl.h",
     "${chip_root}/src/app/clusters/scenes-server/SceneTable.h",
     "${chip_root}/src/app/clusters/scenes-server/SceneTableImpl.cpp",
     "${chip_root}/src/app/clusters/scenes-server/SceneTableImpl.h",
diff --git a/src/app/tests/TestICDManager.cpp b/src/app/tests/TestICDManager.cpp
index 3b204df306c06d..ed6ecb7dc625b4 100644
--- a/src/app/tests/TestICDManager.cpp
+++ b/src/app/tests/TestICDManager.cpp
@@ -38,11 +38,34 @@ using TestSessionKeystoreImpl = Crypto::DefaultSessionKeystore;
 
 namespace {
 
+// Test Values
+constexpr uint16_t kMaxTestClients      = 2;
+constexpr FabricIndex kTestFabricIndex1 = 1;
+constexpr FabricIndex kTestFabricIndex2 = kMaxValidFabricIndex;
+constexpr uint64_t kClientNodeId11      = 0x100001;
+constexpr uint64_t kClientNodeId12      = 0x100002;
+constexpr uint64_t kClientNodeId21      = 0x200001;
+constexpr uint64_t kClientNodeId22      = 0x200002;
+
+constexpr uint8_t kKeyBuffer1a[] = {
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+};
+constexpr uint8_t kKeyBuffer1b[] = {
+    0xf1, 0xe1, 0xd1, 0xc1, 0xb1, 0xa1, 0x91, 0x81, 0x71, 0x61, 0x51, 0x14, 0x31, 0x21, 0x11, 0x01
+};
+constexpr uint8_t kKeyBuffer2a[] = {
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f
+};
+constexpr uint8_t kKeyBuffer2b[] = {
+    0xf2, 0xe2, 0xd2, 0xc2, 0xb2, 0xa2, 0x92, 0x82, 0x72, 0x62, 0x52, 0x42, 0x32, 0x22, 0x12, 0x02
+};
+
 class TestICDStateObserver : public app::ICDStateObserver
 {
 public:
     void OnEnterActiveMode() {}
     void OnTransitionToIdle() {}
+    void OnICDModeChange() {}
 };
 
 TestICDStateObserver mICDStateObserver;
@@ -67,8 +90,8 @@ class TestContext : public Test::AppContext
         {
             return FAILURE;
         }
-        TestSessionKeystoreImpl keystore;
-        ctx->mICDManager.Init(&ctx->testStorage, &ctx->GetFabricTable(), &mICDStateObserver, &keystore);
+        ctx->mICDManager.Init(&ctx->testStorage, &ctx->GetFabricTable(), &(ctx->mKeystore));
+        ctx->mICDManager.RegisterObserver(&mICDStateObserver);
         return SUCCESS;
     }
 
@@ -86,10 +109,11 @@ class TestContext : public Test::AppContext
         return SUCCESS;
     }
 
+    TestSessionKeystoreImpl mKeystore;
     app::ICDManager mICDManager;
+    TestPersistentStorageDelegate testStorage;
 
 private:
-    TestPersistentStorageDelegate testStorage;
     MonotonicallyIncreasingCounter<EventNumber> mEventCounter;
 };
 
@@ -117,13 +141,15 @@ class TestICDManager
     {
         TestContext * ctx = static_cast<TestContext *>(aContext);
 
-        // After the init we should be in active mode
+        // After the init we should be in Idle mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
+        AdvanceClockAndRunEventLoop(ctx, secondsToMilliseconds(ICDManagementServer::GetInstance().GetIdleModeDurationSec()) + 1);
+        // Idle mode interval expired, ICDManager transitioned to the ActiveMode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
         AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() + 1);
         // Active mode interval expired, ICDManager transitioned to the IdleMode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
         AdvanceClockAndRunEventLoop(ctx, secondsToMilliseconds(ICDManagementServer::GetInstance().GetIdleModeDurationSec()) + 1);
-        // Idle mode interval expired, ICDManager transitioned to the ActiveMode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
 
         // Events updating the Operation to Active mode can extend the current active mode time by 1 Active mode threshold.
@@ -139,7 +165,7 @@ class TestICDManager
     static void TestKeepActivemodeRequests(nlTestSuite * aSuite, void * aContext)
     {
         TestContext * ctx = static_cast<TestContext *>(aContext);
-        typedef ICDListener::KeepActiveFlags ActiveFlag;
+        typedef ICDListener::KeepActiveFlag ActiveFlag;
         ICDNotifier notifier = ICDNotifier::GetInstance();
 
         // Setting a requirement will transition the ICD to active mode.
@@ -184,6 +210,109 @@ class TestICDManager
         notifier.BroadcastActiveRequestWithdrawal(ActiveFlag::kExchangeContextOpen);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
     }
+
+    /*
+     * Test that verifies that the ICDManager is the correct operating mode based on entries
+     * in the ICDMonitoringTable
+     */
+    static void TestICDMRegisterUnregisterEvents(nlTestSuite * aSuite, void * aContext)
+    {
+        TestContext * ctx = static_cast<TestContext *>(aContext);
+        typedef ICDListener::ICDManagementEvents ICDMEvent;
+        ICDNotifier notifier = ICDNotifier::GetInstance();
+
+        // Set FeatureMap
+        // Configures CIP, UAT and LITS to 1
+        ctx->mICDManager.SetTestFeatureMapValue(0x07);
+
+        // Check ICDManager starts in SIT mode if no entries are present
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::SIT);
+
+        // Trigger a "fake" register, ICDManager shoudl remain in SIT mode
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager stayed in SIT mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::SIT);
+
+        // Create tables with different fabrics
+        ICDMonitoringTable table1(ctx->testStorage, kTestFabricIndex1, kMaxTestClients, &(ctx->mKeystore));
+        ICDMonitoringTable table2(ctx->testStorage, kTestFabricIndex2, kMaxTestClients, &(ctx->mKeystore));
+
+        // Add first entry to the first fabric
+        ICDMonitoringEntry entry1(&(ctx->mKeystore));
+        entry1.checkInNodeID    = kClientNodeId11;
+        entry1.monitoredSubject = kClientNodeId12;
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry1.SetKey(ByteSpan(kKeyBuffer1a)));
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table1.Set(0, entry1));
+
+        // Trigger register event after first entry was added
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is now in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::LIT);
+
+        // Add second entry to the first fabric
+        ICDMonitoringEntry entry2(&(ctx->mKeystore));
+        entry2.checkInNodeID    = kClientNodeId12;
+        entry2.monitoredSubject = kClientNodeId11;
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry2.SetKey(ByteSpan(kKeyBuffer1b)));
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table1.Set(1, entry2));
+
+        // Trigger register event after first entry was added
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is now in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::LIT);
+
+        // Add first entry to the first fabric
+        ICDMonitoringEntry entry3(&(ctx->mKeystore));
+        entry3.checkInNodeID    = kClientNodeId21;
+        entry3.monitoredSubject = kClientNodeId22;
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry3.SetKey(ByteSpan(kKeyBuffer2a)));
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table2.Set(0, entry3));
+
+        // Trigger register event after first entry was added
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is now in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::LIT);
+
+        // Add second entry to the first fabric
+        ICDMonitoringEntry entry4(&(ctx->mKeystore));
+        entry4.checkInNodeID    = kClientNodeId22;
+        entry4.monitoredSubject = kClientNodeId21;
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry4.SetKey(ByteSpan(kKeyBuffer2b)));
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table2.Set(1, entry4));
+
+        // Clear a fabric
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table2.RemoveAll());
+
+        // Trigger register event after fabric was cleared
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is still in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::LIT);
+
+        // Remove single entry from remaining fabric
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table1.Remove(1));
+
+        // Trigger register event after fabric was cleared
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is still in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::LIT);
+
+        // Remove last entry from remaining fabric
+        NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == table1.Remove(0));
+        NL_TEST_ASSERT(aSuite, table1.IsEmpty());
+        NL_TEST_ASSERT(aSuite, table2.IsEmpty());
+
+        // Trigger register event after fabric was cleared
+        notifier.BroadcastICDManagementEvent(ICDMEvent::kTableUpdated);
+
+        // Check ICDManager is still in the LIT operating mode
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.GetICDMode() == ICDManager::ICDMode::SIT);
+    }
 };
 
 } // namespace app
@@ -198,6 +327,7 @@ static const nlTest sTests[] =
 {
     NL_TEST_DEF("TestICDModeDurations",         TestICDManager::TestICDModeDurations),
     NL_TEST_DEF("TestKeepActivemodeRequests",   TestICDManager::TestKeepActivemodeRequests),
+    NL_TEST_DEF("TestICDMRegisterUnregisterEvents", TestICDManager::TestICDMRegisterUnregisterEvents),
     NL_TEST_SENTINEL()
 };
 // clang-format on
diff --git a/src/app/tests/TestICDMonitoringTable.cpp b/src/app/tests/TestICDMonitoringTable.cpp
index 91430e404188e6..170ece20e1778d 100644
--- a/src/app/tests/TestICDMonitoringTable.cpp
+++ b/src/app/tests/TestICDMonitoringTable.cpp
@@ -60,8 +60,39 @@ constexpr uint8_t kKeyBuffer2b[] = {
 constexpr uint8_t kKeyBuffer3a[] = {
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
 };
-// constexpr uint8_t kKeyBuffer3b[] = { 0xf3, 0xe3, 0xd3, 0xc3, 0xb3, 0xa3, 0x93, 0x83, 0x73, 0x63, 0x53, 0x14, 0x33, 0x23, 0x13,
-// 0x03 };
+
+void TestEntryAssignationOverload(nlTestSuite * aSuite, void * aContext)
+{
+    TestSessionKeystoreImpl keystore;
+    ICDMonitoringEntry entry(&keystore);
+
+    // Test Setting Key
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
+
+    entry.fabricIndex = 2;
+
+    NL_TEST_ASSERT(aSuite, !entry.IsValid());
+
+    entry.checkInNodeID    = 34;
+    entry.monitoredSubject = 32;
+
+    // Entry should be valid now
+    NL_TEST_ASSERT(aSuite, entry.IsValid());
+
+    ICDMonitoringEntry entry2;
+
+    NL_TEST_ASSERT(aSuite, !entry2.IsValid());
+
+    entry2 = entry;
+
+    NL_TEST_ASSERT(aSuite, entry2.IsValid());
+
+    NL_TEST_ASSERT(aSuite, entry2.fabricIndex == entry.fabricIndex);
+    NL_TEST_ASSERT(aSuite, entry2.checkInNodeID == entry.checkInNodeID);
+    NL_TEST_ASSERT(aSuite, entry2.monitoredSubject == entry.monitoredSubject);
+
+    NL_TEST_ASSERT(aSuite, entry2.IsKeyEquivalent(ByteSpan(kKeyBuffer1a)));
+}
 
 void TestEntryKeyFunctions(nlTestSuite * aSuite, void * aContext)
 {
@@ -395,6 +426,7 @@ int Test_Setup(void * inContext)
 int TestClientMonitoringRegistrationTable()
 {
     static nlTest sTests[] = { NL_TEST_DEF("TestEntryKeyFunctions", TestEntryKeyFunctions),
+                               NL_TEST_DEF("TestEntryAssignationOverload", TestEntryAssignationOverload),
                                NL_TEST_DEF("TestSaveAndLoadRegistrationValue", TestSaveAndLoadRegistrationValue),
                                NL_TEST_DEF("TestSaveAllInvalidRegistrationValues", TestSaveAllInvalidRegistrationValues),
                                NL_TEST_DEF("TestSaveLoadRegistrationValueForMultipleFabrics",
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
index 0898840410f6db..2ddc7d78fc64c6 100644
--- a/src/app/tests/TestReadInteraction.cpp
+++ b/src/app/tests/TestReadInteraction.cpp
@@ -76,41 +76,50 @@ static chip::System::Clock::ClockBase * gRealClock;
 class TestContext : public chip::Test::AppContext
 {
 public:
-    static int Initialize(void * context)
+    // Performs shared setup for all tests in the test suite
+    static int SetUpTestSuite(void * context)
     {
         gRealClock = &chip::System::SystemClock();
         chip::System::Clock::Internal::SetSystemClockForTesting(&gMockClock);
-
         if (AppContext::Initialize(context) != SUCCESS)
             return FAILURE;
+        return SUCCESS;
+    }
 
-        auto * ctx = static_cast<TestContext *>(context);
-
-        if (ctx->mEventCounter.Init(0) != CHIP_NO_ERROR)
-        {
+    // Performs shared teardown for all tests in the test suite
+    static int TearDownTestSuite(void * context)
+    {
+        chip::System::Clock::Internal::SetSystemClockForTesting(gRealClock);
+        if (AppContext::Finalize(context) != SUCCESS)
             return FAILURE;
-        }
+        return SUCCESS;
+    }
 
-        chip::app::LogStorageResources logStorageResources[] = {
+    // Performs setup for each individual test in the test suite
+    static int SetUp(void * context)
+    {
+        const chip::app::LogStorageResources logStorageResources[] = {
             { &gDebugEventBuffer[0], sizeof(gDebugEventBuffer), chip::app::PriorityLevel::Debug },
             { &gInfoEventBuffer[0], sizeof(gInfoEventBuffer), chip::app::PriorityLevel::Info },
             { &gCritEventBuffer[0], sizeof(gCritEventBuffer), chip::app::PriorityLevel::Critical },
         };
+        auto * ctx = static_cast<TestContext *>(context);
+        VerifyOrReturnError(ctx->mEventCounter.Init(0) == CHIP_NO_ERROR, FAILURE);
+
+        // Reinitialize the exchange manager before running each test, so the context
+        // pool will be guaranteed to be empty.
+        ctx->GetExchangeManager().Shutdown();
+        VerifyOrReturnError(ctx->GetExchangeManager().Init(&ctx->GetSecureSessionManager()) == CHIP_NO_ERROR, FAILURE);
 
         chip::app::EventManagement::CreateEventManagement(&ctx->GetExchangeManager(), ArraySize(logStorageResources),
                                                           gCircularEventBuffer, logStorageResources, &ctx->mEventCounter);
-
         return SUCCESS;
     }
 
-    static int Finalize(void * context)
+    // Performs teardown for each individual test in the test suite
+    static int TearDown(void * context)
     {
         chip::app::EventManagement::DestroyEventManagement();
-        chip::System::Clock::Internal::SetSystemClockForTesting(gRealClock);
-
-        if (AppContext::Finalize(context) != SUCCESS)
-            return FAILURE;
-
         return SUCCESS;
     }
 
@@ -333,6 +342,7 @@ class TestReadInteraction
     static void TestReadClientGenerateOneEventPaths(nlTestSuite * apSuite, void * apContext);
     static void TestReadClientGenerateTwoEventPaths(nlTestSuite * apSuite, void * apContext);
     static void TestReadClientInvalidReport(nlTestSuite * apSuite, void * apContext);
+    static void TestReadClientInvalidAttributeId(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandlerInvalidAttributePath(nlTestSuite * apSuite, void * apContext);
     static void TestProcessSubscribeRequest(nlTestSuite * apSuite, void * apContext);
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
@@ -390,12 +400,19 @@ class TestReadInteraction
     static void TestReadHandlerMalformedSubscribeRequest(nlTestSuite * apSuite, void * apContext);
 
 private:
+    enum class ReportType : uint8_t
+    {
+        kValid,
+        kInvalidNoAttributeId,
+        kInvalidOutOfRangeAttributeId,
+    };
+
     static void GenerateReportData(nlTestSuite * apSuite, void * apContext, System::PacketBufferHandle & aPayload,
-                                   bool aNeedInvalidReport, bool aSuppressResponse, bool aHasSubscriptionId);
+                                   ReportType aReportType, bool aSuppressResponse, bool aHasSubscriptionId);
 };
 
 void TestReadInteraction::GenerateReportData(nlTestSuite * apSuite, void * apContext, System::PacketBufferHandle & aPayload,
-                                             bool aNeedInvalidReport, bool aSuppressResponse, bool aHasSubscriptionId = false)
+                                             ReportType aReportType, bool aSuppressResponse, bool aHasSubscriptionId = false)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     System::PacketBufferTLVWriter writer;
@@ -428,12 +445,17 @@ void TestReadInteraction::GenerateReportData(nlTestSuite * apSuite, void * apCon
     AttributePathIB::Builder & attributePathBuilder = attributeDataIBBuilder.CreatePath();
     NL_TEST_ASSERT(apSuite, attributeDataIBBuilder.GetError() == CHIP_NO_ERROR);
 
-    if (aNeedInvalidReport)
+    if (aReportType == ReportType::kInvalidNoAttributeId)
     {
         attributePathBuilder.Node(1).Endpoint(2).Cluster(3).ListIndex(5).EndOfAttributePathIB();
     }
+    else if (aReportType == ReportType::kInvalidOutOfRangeAttributeId)
+    {
+        attributePathBuilder.Node(1).Endpoint(2).Cluster(3).Attribute(0xFFF18000).EndOfAttributePathIB();
+    }
     else
     {
+        NL_TEST_ASSERT(apSuite, aReportType == ReportType::kValid);
         attributePathBuilder.Node(1).Endpoint(2).Cluster(3).Attribute(4).EndOfAttributePathIB();
     }
 
@@ -496,7 +518,7 @@ void TestReadInteraction::TestReadClient(nlTestSuite * apSuite, void * apContext
     ctx.GetLoopback().mNumMessagesToDrop = 1;
     ctx.DrainAndServiceIO();
 
-    GenerateReportData(apSuite, apContext, buf, false /*aNeedInvalidReport*/, true /* aSuppressResponse*/);
+    GenerateReportData(apSuite, apContext, buf, ReportType::kValid, true /* aSuppressResponse*/);
     err = readClient.ProcessReportData(std::move(buf), ReadClient::ReportType::kContinuingTransaction);
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 }
@@ -521,8 +543,7 @@ void TestReadInteraction::TestReadUnexpectedSubscriptionId(nlTestSuite * apSuite
     ctx.DrainAndServiceIO();
 
     // For read, we don't expect there is subscription id in report data.
-    GenerateReportData(apSuite, apContext, buf, false /*aNeedInvalidReport*/, true /* aSuppressResponse*/,
-                       true /*aHasSubscriptionId*/);
+    GenerateReportData(apSuite, apContext, buf, ReportType::kValid, true /* aSuppressResponse*/, true /*aHasSubscriptionId*/);
     err = readClient.ProcessReportData(std::move(buf), ReadClient::ReportType::kContinuingTransaction);
     NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_INVALID_ARGUMENT);
 }
@@ -535,7 +556,6 @@ void TestReadInteraction::TestReadHandler(nlTestSuite * apSuite, void * apContex
     System::PacketBufferHandle reportDatabuf  = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     System::PacketBufferHandle readRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     ReadRequestMessage::Builder readRequestBuilder;
-    MockInteractionModelApp delegate;
     NullReadHandlerCallback nullCallback;
 
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
@@ -547,7 +567,7 @@ void TestReadInteraction::TestReadHandler(nlTestSuite * apSuite, void * apContex
         ReadHandler readHandler(nullCallback, exchangeCtx, chip::app::ReadHandler::InteractionType::Read,
                                 app::reporting::GetDefaultReportScheduler());
 
-        GenerateReportData(apSuite, apContext, reportDatabuf, false /*aNeedInvalidReport*/, false /* aSuppressResponse*/);
+        GenerateReportData(apSuite, apContext, reportDatabuf, ReportType::kValid, false /* aSuppressResponse*/);
         err = readHandler.SendReportData(std::move(reportDatabuf), false);
         NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_INCORRECT_STATE);
 
@@ -665,12 +685,46 @@ void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, voi
     ctx.GetLoopback().mNumMessagesToDrop = 1;
     ctx.DrainAndServiceIO();
 
-    GenerateReportData(apSuite, apContext, buf, true /*aNeedInvalidReport*/, true /* aSuppressResponse*/);
+    GenerateReportData(apSuite, apContext, buf, ReportType::kInvalidNoAttributeId, true /* aSuppressResponse*/);
 
     err = readClient.ProcessReportData(std::move(buf), ReadClient::ReportType::kContinuingTransaction);
     NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
 }
 
+void TestReadInteraction::TestReadClientInvalidAttributeId(nlTestSuite * apSuite, void * apContext)
+{
+    CHIP_ERROR err    = CHIP_NO_ERROR;
+    TestContext & ctx = *static_cast<TestContext *>(apContext);
+    MockInteractionModelApp delegate;
+
+    System::PacketBufferHandle buf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
+
+    app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
+                               chip::app::ReadClient::InteractionType::Read);
+
+    ReadPrepareParams readPrepareParams(ctx.GetSessionBobToAlice());
+    err = readClient.SendRequest(readPrepareParams);
+    NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+    // We don't actually want to deliver that message, because we want to
+    // synthesize the read response.  But we don't want it hanging around
+    // forever either.
+    ctx.GetLoopback().mNumMessagesToDrop = 1;
+    ctx.DrainAndServiceIO();
+
+    GenerateReportData(apSuite, apContext, buf, ReportType::kInvalidOutOfRangeAttributeId, true /* aSuppressResponse*/);
+
+    err = readClient.ProcessReportData(std::move(buf), ReadClient::ReportType::kContinuingTransaction);
+    // Overall processing should succeed.
+    NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+    // We should not have gotten any attribute reports or errors.
+    NL_TEST_ASSERT(apSuite, !delegate.mGotEventResponse);
+    NL_TEST_ASSERT(apSuite, delegate.mNumAttributeResponse == 0);
+    NL_TEST_ASSERT(apSuite, !delegate.mGotReport);
+    NL_TEST_ASSERT(apSuite, !delegate.mReadError);
+}
+
 void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSuite, void * apContext)
 {
     CHIP_ERROR err    = CHIP_NO_ERROR;
@@ -679,7 +733,6 @@ void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSu
     System::PacketBufferHandle reportDatabuf  = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     System::PacketBufferHandle readRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     ReadRequestMessage::Builder readRequestBuilder;
-    MockInteractionModelApp delegate;
     NullReadHandlerCallback nullCallback;
 
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
@@ -691,7 +744,7 @@ void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSu
         ReadHandler readHandler(nullCallback, exchangeCtx, chip::app::ReadHandler::InteractionType::Read,
                                 app::reporting::GetDefaultReportScheduler());
 
-        GenerateReportData(apSuite, apContext, reportDatabuf, false /*aNeedInvalidReport*/, false /* aSuppressResponse*/);
+        GenerateReportData(apSuite, apContext, reportDatabuf, ReportType::kValid, false /* aSuppressResponse*/);
         err = readHandler.SendReportData(std::move(reportDatabuf), false);
         NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_INCORRECT_STATE);
 
@@ -1464,7 +1517,6 @@ void TestReadInteraction::TestProcessSubscribeRequest(nlTestSuite * apSuite, voi
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1530,7 +1582,6 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling(nl
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1606,7 +1657,6 @@ void TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling(nl
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1682,13 +1732,12 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval(nlTestSui
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-    uint16_t kMinInterval        = 3;
-    uint16_t kMaxIntervalCeiling = 5;
+    uint16_t kMinInterval        = 305; // Default IdleModeDuration is 300
+    uint16_t kMaxIntervalCeiling = 605;
 
     Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToAlice(nullptr, false);
 
@@ -1758,7 +1807,6 @@ void TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval(nlTestSui
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1832,13 +1880,12 @@ void TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeDuration(
     System::PacketBufferTLVWriter writer;
     System::PacketBufferHandle subscribeRequestbuf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
     SubscribeRequestMessage::Builder subscribeRequestBuilder;
-    MockInteractionModelApp delegate;
     auto * engine = chip::app::InteractionModelEngine::GetInstance();
     err           = engine->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(), app::reporting::GetDefaultReportScheduler());
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-    uint16_t kMinInterval        = 3;
-    uint16_t kMaxIntervalCeiling = 3;
+    uint16_t kMinInterval        = 400;
+    uint16_t kMaxIntervalCeiling = 400;
 
     Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToAlice(nullptr, false);
 
@@ -1940,7 +1987,7 @@ void TestReadInteraction::TestSubscribeRoundtrip(nlTestSuite * apSuite, void * a
 
     readPrepareParams.mMinIntervalFloorSeconds   = 1;
     readPrepareParams.mMaxIntervalCeilingSeconds = 2;
-    printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -1970,7 +2017,6 @@ void TestReadInteraction::TestSubscribeRoundtrip(nlTestSuite * apSuite, void * a
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, delegate.mNumAttributeResponse == 2);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
@@ -2080,9 +2126,13 @@ void TestReadInteraction::TestSubscribeRoundtrip(nlTestSuite * apSuite, void * a
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, delegate.mNumAttributeResponse == 2);
 
+        uint16_t minInterval;
+        uint16_t maxInterval;
+        delegate.mpReadHandler->GetReportingIntervals(minInterval, maxInterval);
+
         // Test empty report
         // Advance monotonic timestamp for min interval to elapse
-        gMockClock.AdvanceMonotonic(System::Clock::Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds));
+        gMockClock.AdvanceMonotonic(System::Clock::Seconds16(maxInterval));
         ctx.GetIOContext().DriveIO();
 
         NL_TEST_ASSERT(apSuite, engine->GetReportingEngine().IsRunScheduled());
@@ -2150,7 +2200,10 @@ void TestReadInteraction::TestSubscribeEarlyReport(nlTestSuite * apSuite, void *
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
+        uint16_t minInterval;
+        uint16_t maxInterval;
+        delegate.mpReadHandler->GetReportingIntervals(minInterval, maxInterval);
+
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
 
         NL_TEST_ASSERT(apSuite,
@@ -2158,7 +2211,7 @@ void TestReadInteraction::TestSubscribeEarlyReport(nlTestSuite * apSuite, void *
                            gMockClock.GetMonotonicTimestamp() + Seconds16(readPrepareParams.mMinIntervalFloorSeconds));
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMaxTimestampForHandler(delegate.mpReadHandler) ==
-                           gMockClock.GetMonotonicTimestamp() + Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds));
+                           gMockClock.GetMonotonicTimestamp() + Seconds16(maxInterval));
 
         // Confirm that the node is scheduled to run
         NL_TEST_ASSERT(apSuite, reportScheduler->IsReportScheduled(delegate.mpReadHandler));
@@ -2204,7 +2257,7 @@ void TestReadInteraction::TestSubscribeEarlyReport(nlTestSuite * apSuite, void *
                            gMockClock.GetMonotonicTimestamp() + Seconds16(readPrepareParams.mMinIntervalFloorSeconds));
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMaxTimestampForHandler(delegate.mpReadHandler) ==
-                           gMockClock.GetMonotonicTimestamp() + Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds));
+                           gMockClock.GetMonotonicTimestamp() + Seconds16(maxInterval));
 
         // Confirm that the node is scheduled to run
         NL_TEST_ASSERT(apSuite, reportScheduler->IsReportScheduled(delegate.mpReadHandler));
@@ -2214,11 +2267,10 @@ void TestReadInteraction::TestSubscribeEarlyReport(nlTestSuite * apSuite, void *
         node->SetIntervalTimeStamps(delegate.mpReadHandler, gMockClock.GetMonotonicTimestamp() + Milliseconds32(50));
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMaxTimestampForHandler(delegate.mpReadHandler) ==
-                           gMockClock.GetMonotonicTimestamp() + Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds) +
-                               Milliseconds32(50));
+                           gMockClock.GetMonotonicTimestamp() + Seconds16(maxInterval) + Milliseconds32(50));
 
         // Advance monotonic timestamp for min interval to elapse
-        gMockClock.AdvanceMonotonic(Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds));
+        gMockClock.AdvanceMonotonic(Seconds16(maxInterval));
 
         NL_TEST_ASSERT(apSuite, !InteractionModelEngine::GetInstance()->GetReportingEngine().IsRunScheduled());
         // Service Timer expired event
@@ -2239,6 +2291,9 @@ void TestReadInteraction::TestSubscribeEarlyReport(nlTestSuite * apSuite, void *
         NL_TEST_ASSERT(apSuite, reportScheduler->IsReportScheduled(delegate.mpReadHandler));
         NL_TEST_ASSERT(apSuite, !InteractionModelEngine::GetInstance()->GetReportingEngine().IsRunScheduled());
     }
+
+    engine->Shutdown();
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
 }
 
 void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite, void * apContext)
@@ -2276,7 +2331,8 @@ void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite
 
     readPrepareParams.mMinIntervalFloorSeconds   = 1;
     readPrepareParams.mMaxIntervalCeilingSeconds = 3600;
-    printf("\nSend first subscribe request message with wildcard urgent event to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend first subscribe request message with wildcard urgent event to Node: 0x" ChipLogFormatX64 "\n",
+           ChipLogValueX64(chip::kTestDeviceNodeId));
 
     readPrepareParams.mKeepSubscriptions = true;
 
@@ -2303,8 +2359,6 @@ void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(1) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(1);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
-        NL_TEST_ASSERT(apSuite, nonUrgentDelegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 2);
 
         GenerateEvents(apSuite, apContext);
@@ -2333,7 +2387,6 @@ void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite
         NL_TEST_ASSERT(apSuite, !nonUrgentDelegate.mGotEventResponse);
 
         // Advance monotonic timestamp for min interval to elapse
-        startTime = gMockClock.GetMonotonicTimestamp();
         gMockClock.AdvanceMonotonic(System::Clock::Milliseconds32(800));
 
         // Service Timer expired event
@@ -2348,14 +2401,14 @@ void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite
         NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, !nonUrgentDelegate.mGotEventResponse);
 
-        // Since we just sent a report for our urgent subscription, the min interval of the urgent subcription should have been
+        // Since we just sent a report for our urgent subscription, the min interval of the urgent subscription should have been
         // updated
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMinTimestampForHandler(delegate.mpReadHandler) > gMockClock.GetMonotonicTimestamp());
         NL_TEST_ASSERT(apSuite, !delegate.mpReadHandler->IsDirty());
         delegate.mGotEventResponse = false;
 
-        // For our non-urgent subscription, we did not send anything, so the min interval should of the non urgent subcription
+        // For our non-urgent subscription, we did not send anything, so the min interval should of the non urgent subscription
         // should be in the past
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMinTimestampForHandler(nonUrgentDelegate.mpReadHandler) <
@@ -2370,7 +2423,7 @@ void TestReadInteraction::TestSubscribeUrgentWildcardEvent(nlTestSuite * apSuite
         NL_TEST_ASSERT(apSuite, !delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, !nonUrgentDelegate.mGotEventResponse);
 
-        // The min-interval should have elapsed for urgen subscription, and our handler should still
+        // The min-interval should have elapsed for the urgent subscription, and our handler should still
         // not be dirty or reportable.
         NL_TEST_ASSERT(apSuite,
                        reportScheduler->GetMinTimestampForHandler(delegate.mpReadHandler) <
@@ -2456,7 +2509,7 @@ void TestReadInteraction::TestSubscribeWildcard(nlTestSuite * apSuite, void * ap
 
     readPrepareParams.mMinIntervalFloorSeconds   = 0;
     readPrepareParams.mMaxIntervalCeilingSeconds = 1;
-    printf("\nSend subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -2608,7 +2661,7 @@ void TestReadInteraction::TestSubscribePartialOverlap(nlTestSuite * apSuite, voi
 
     readPrepareParams.mMinIntervalFloorSeconds   = 0;
     readPrepareParams.mMaxIntervalCeilingSeconds = 1;
-    printf("\nSend subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -2685,7 +2738,7 @@ void TestReadInteraction::TestSubscribeSetDirtyFullyOverlap(nlTestSuite * apSuit
 
     readPrepareParams.mMinIntervalFloorSeconds   = 0;
     readPrepareParams.mMaxIntervalCeilingSeconds = 1;
-    printf("\nSend subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -2758,7 +2811,7 @@ void TestReadInteraction::TestSubscribeEarlyShutdown(nlTestSuite * apSuite, void
     readPrepareParams.mMaxIntervalCeilingSeconds   = 5;
     readPrepareParams.mKeepSubscriptions           = false;
 
-    printf("Send subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("Send subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -2814,7 +2867,7 @@ void TestReadInteraction::TestSubscribeInvalidAttributePathRoundtrip(nlTestSuite
     readPrepareParams.mSessionHolder.Grab(ctx.GetSessionBobToAlice());
     readPrepareParams.mMinIntervalFloorSeconds   = 0;
     readPrepareParams.mMaxIntervalCeilingSeconds = 1;
-    printf("\nSend subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+    printf("\nSend subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
@@ -2831,8 +2884,12 @@ void TestReadInteraction::TestSubscribeInvalidAttributePathRoundtrip(nlTestSuite
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
+        uint16_t minInterval;
+        uint16_t maxInterval;
+        delegate.mpReadHandler->GetReportingIntervals(minInterval, maxInterval);
+
         // Advance monotonic timestamp for min interval to elapse
-        gMockClock.AdvanceMonotonic(System::Clock::Seconds16(readPrepareParams.mMaxIntervalCeilingSeconds));
+        gMockClock.AdvanceMonotonic(System::Clock::Seconds16(maxInterval));
         ctx.GetIOContext().DriveIO();
 
         NL_TEST_ASSERT(apSuite, engine->GetReportingEngine().IsRunScheduled());
@@ -2922,7 +2979,7 @@ void TestReadInteraction::TestSubscribeInvalidInterval(nlTestSuite * apSuite, vo
 
         NL_TEST_ASSERT(apSuite, readClient.SendRequest(readPrepareParams) == CHIP_ERROR_INVALID_ARGUMENT);
 
-        printf("\nSend subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend subscribe request message to Node: 0x" ChipLogFormatX64 "\n", ChipLogValueX64(chip::kTestDeviceNodeId));
 
         ctx.DrainAndServiceIO();
     }
@@ -2983,7 +3040,8 @@ void TestReadInteraction::TestPostSubscribeRoundtripStatusReportTimeout(nlTestSu
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -2994,7 +3052,6 @@ void TestReadInteraction::TestPostSubscribeRoundtripStatusReportTimeout(nlTestSu
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, delegate.mNumAttributeResponse == 2);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
@@ -3105,7 +3162,8 @@ void TestReadInteraction::TestSubscribeRoundtripStatusReportTimeout(nlTestSuite
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -3282,7 +3340,8 @@ void TestReadInteraction::TestSubscribeRoundtripChunkStatusReportTimeout(nlTestS
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -3354,7 +3413,8 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkStatusReportTimeout(nlT
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -3365,7 +3425,6 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkStatusReportTimeout(nlT
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
 
@@ -3458,7 +3517,8 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkReportTimeout(nlTestSui
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -3469,7 +3529,6 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkReportTimeout(nlTestSui
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
 
@@ -3560,7 +3619,8 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkReport(nlTestSuite * ap
     {
         app::ReadClient readClient(chip::app::InteractionModelEngine::GetInstance(), &ctx.GetExchangeManager(), delegate,
                                    chip::app::ReadClient::InteractionType::Subscribe);
-        printf("\nSend first subscribe request message to Node: %" PRIu64 "\n", chip::kTestDeviceNodeId);
+        printf("\nSend first subscribe request message to Node: 0x" ChipLogFormatX64 "\n",
+               ChipLogValueX64(chip::kTestDeviceNodeId));
         delegate.mGotReport = false;
         err                 = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -3571,7 +3631,6 @@ void TestReadInteraction::TestPostSubscribeRoundtripChunkReport(nlTestSuite * ap
         NL_TEST_ASSERT(apSuite, engine->ActiveHandlerAt(0) != nullptr);
         delegate.mpReadHandler = engine->ActiveHandlerAt(0);
 
-        NL_TEST_ASSERT(apSuite, delegate.mGotEventResponse);
         NL_TEST_ASSERT(apSuite, delegate.mGotReport);
         NL_TEST_ASSERT(apSuite, engine->GetNumActiveReadHandlers(ReadHandler::InteractionType::Subscribe) == 1);
 
@@ -4900,18 +4959,15 @@ void TestReadInteraction::TestSubscriptionReportWithDefunctSession(nlTestSuite *
 
 namespace {
 
-/**
- *   Test Suite. It lists all the test functions.
- */
-
-// clang-format off
-const nlTest sTests[] =
-{
+const nlTest sTests[] = {
     NL_TEST_DEF("TestReadRoundtrip", chip::app::TestReadInteraction::TestReadRoundtrip),
     NL_TEST_DEF("TestReadRoundtripWithDataVersionFilter", chip::app::TestReadInteraction::TestReadRoundtripWithDataVersionFilter),
-    NL_TEST_DEF("TestReadRoundtripWithNoMatchPathDataVersionFilter", chip::app::TestReadInteraction::TestReadRoundtripWithNoMatchPathDataVersionFilter),
-    NL_TEST_DEF("TestReadRoundtripWithMultiSamePathDifferentDataVersionFilter", chip::app::TestReadInteraction::TestReadRoundtripWithMultiSamePathDifferentDataVersionFilter),
-    NL_TEST_DEF("TestReadRoundtripWithSameDifferentPathsDataVersionFilter", chip::app::TestReadInteraction::TestReadRoundtripWithSameDifferentPathsDataVersionFilter),
+    NL_TEST_DEF("TestReadRoundtripWithNoMatchPathDataVersionFilter",
+                chip::app::TestReadInteraction::TestReadRoundtripWithNoMatchPathDataVersionFilter),
+    NL_TEST_DEF("TestReadRoundtripWithMultiSamePathDifferentDataVersionFilter",
+                chip::app::TestReadInteraction::TestReadRoundtripWithMultiSamePathDifferentDataVersionFilter),
+    NL_TEST_DEF("TestReadRoundtripWithSameDifferentPathsDataVersionFilter",
+                chip::app::TestReadInteraction::TestReadRoundtripWithSameDifferentPathsDataVersionFilter),
     NL_TEST_DEF("TestReadWildcard", chip::app::TestReadInteraction::TestReadWildcard),
     NL_TEST_DEF("TestReadChunking", chip::app::TestReadInteraction::TestReadChunking),
     NL_TEST_DEF("TestSetDirtyBetweenChunks", chip::app::TestReadInteraction::TestSetDirtyBetweenChunks),
@@ -4919,79 +4975,92 @@ const nlTest sTests[] =
     NL_TEST_DEF("TestReadUnexpectedSubscriptionId", chip::app::TestReadInteraction::TestReadUnexpectedSubscriptionId),
     NL_TEST_DEF("CheckReadHandler", chip::app::TestReadInteraction::TestReadHandler),
     NL_TEST_DEF("TestReadClientGenerateAttributePathList", chip::app::TestReadInteraction::TestReadClientGenerateAttributePathList),
-    NL_TEST_DEF("TestReadClientGenerateInvalidAttributePathList", chip::app::TestReadInteraction::TestReadClientGenerateInvalidAttributePathList),
+    NL_TEST_DEF("TestReadClientGenerateInvalidAttributePathList",
+                chip::app::TestReadInteraction::TestReadClientGenerateInvalidAttributePathList),
     NL_TEST_DEF("TestReadClientGenerateOneEventPaths", chip::app::TestReadInteraction::TestReadClientGenerateOneEventPaths),
     NL_TEST_DEF("TestReadClientGenerateTwoEventPaths", chip::app::TestReadInteraction::TestReadClientGenerateTwoEventPaths),
     NL_TEST_DEF("TestReadClientInvalidReport", chip::app::TestReadInteraction::TestReadClientInvalidReport),
+    NL_TEST_DEF("TestReadClientInvalidAttributeId", chip::app::TestReadInteraction::TestReadClientInvalidAttributeId),
     NL_TEST_DEF("TestReadHandlerInvalidAttributePath", chip::app::TestReadInteraction::TestReadHandlerInvalidAttributePath),
     NL_TEST_DEF("TestProcessSubscribeRequest", chip::app::TestReadInteraction::TestProcessSubscribeRequest),
-    /*
-        We need to figure out a way to run unit tests with an ICD build without affecting
-        all the standard unit tests
-        https://github.com/project-chip/connectedhomeip/issues/28446
-    */
+/*
+    We need to figure out a way to run unit tests with an ICD build without affecting
+    all the standard unit tests
+    https://github.com/project-chip/connectedhomeip/issues/28446
+*/
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    NL_TEST_DEF("TestICDProcessSubscribeRequestSupMaxIntervalCeiling", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling),
-    NL_TEST_DEF("TestICDProcessSubscribeRequestInfMaxIntervalCeiling", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling),
-    NL_TEST_DEF("TestICDProcessSubscribeRequestSupMinInterval", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval),
-    NL_TEST_DEF("TestICDProcessSubscribeRequestMaxMinInterval", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval),
-    NL_TEST_DEF("TestICDProcessSubscribeRequestInvalidIdleModeDuration", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeDuration),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestSupMaxIntervalCeiling",
+                chip::app::TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestInfMaxIntervalCeiling",
+                chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestSupMinInterval",
+                chip::app::TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestMaxMinInterval",
+                chip::app::TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestInvalidIdleModeDuration",
+                chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeDuration),
 #endif // #if CHIP_CONFIG_ENABLE_ICD_SERVER
     NL_TEST_DEF("TestSubscribeRoundtrip", chip::app::TestReadInteraction::TestSubscribeRoundtrip),
     NL_TEST_DEF("TestSubscribeEarlyReport", chip::app::TestReadInteraction::TestSubscribeEarlyReport),
     NL_TEST_DEF("TestPostSubscribeRoundtripChunkReport", chip::app::TestReadInteraction::TestPostSubscribeRoundtripChunkReport),
     NL_TEST_DEF("TestReadClientReceiveInvalidMessage", chip::app::TestReadInteraction::TestReadClientReceiveInvalidMessage),
-    NL_TEST_DEF("TestSubscribeClientReceiveInvalidStatusResponse", chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidStatusResponse),
-    NL_TEST_DEF("TestSubscribeClientReceiveWellFormedStatusResponse", chip::app::TestReadInteraction::TestSubscribeClientReceiveWellFormedStatusResponse),
-    NL_TEST_DEF("TestSubscribeClientReceiveInvalidReportMessage", chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidReportMessage),
-    NL_TEST_DEF("TestSubscribeClientReceiveUnsolicitedInvalidReportMessage", chip::app::TestReadInteraction::TestSubscribeClientReceiveUnsolicitedInvalidReportMessage),
-    NL_TEST_DEF("TestSubscribeClientReceiveInvalidSubscribeResponseMessage", chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidSubscribeResponseMessage),
-    NL_TEST_DEF("TestSubscribeClientReceiveUnsolicitedReportMessageWithInvalidSubscriptionId", chip::app::TestReadInteraction::TestSubscribeClientReceiveUnsolicitedReportMessageWithInvalidSubscriptionId),
+    NL_TEST_DEF("TestSubscribeClientReceiveInvalidStatusResponse",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidStatusResponse),
+    NL_TEST_DEF("TestSubscribeClientReceiveWellFormedStatusResponse",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveWellFormedStatusResponse),
+    NL_TEST_DEF("TestSubscribeClientReceiveInvalidReportMessage",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidReportMessage),
+    NL_TEST_DEF("TestSubscribeClientReceiveUnsolicitedInvalidReportMessage",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveUnsolicitedInvalidReportMessage),
+    NL_TEST_DEF("TestSubscribeClientReceiveInvalidSubscribeResponseMessage",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveInvalidSubscribeResponseMessage),
+    NL_TEST_DEF("TestSubscribeClientReceiveUnsolicitedReportMessageWithInvalidSubscriptionId",
+                chip::app::TestReadInteraction::TestSubscribeClientReceiveUnsolicitedReportMessageWithInvalidSubscriptionId),
     NL_TEST_DEF("TestReadChunkingInvalidSubscriptionId", chip::app::TestReadInteraction::TestReadChunkingInvalidSubscriptionId),
     NL_TEST_DEF("TestReadHandlerMalformedReadRequest1", chip::app::TestReadInteraction::TestReadHandlerMalformedReadRequest1),
     NL_TEST_DEF("TestReadHandlerMalformedReadRequest2", chip::app::TestReadInteraction::TestReadHandlerMalformedReadRequest2),
-    NL_TEST_DEF("TestReadHandlerMalformedSubscribeRequest", chip::app::TestReadInteraction::TestReadHandlerMalformedSubscribeRequest),
+    NL_TEST_DEF("TestReadHandlerMalformedSubscribeRequest",
+                chip::app::TestReadInteraction::TestReadHandlerMalformedSubscribeRequest),
     NL_TEST_DEF("TestSubscribeSendUnknownMessage", chip::app::TestReadInteraction::TestSubscribeSendUnknownMessage),
     NL_TEST_DEF("TestSubscribeSendInvalidStatusReport", chip::app::TestReadInteraction::TestSubscribeSendInvalidStatusReport),
     NL_TEST_DEF("TestReadHandlerInvalidSubscribeRequest", chip::app::TestReadInteraction::TestReadHandlerInvalidSubscribeRequest),
     NL_TEST_DEF("TestSubscribeInvalidateFabric", chip::app::TestReadInteraction::TestSubscribeInvalidateFabric),
     NL_TEST_DEF("TestShutdownSubscription", chip::app::TestReadInteraction::TestShutdownSubscription),
-    /*
-        Disable test when running the ICD specific unit tests.
-        Test tests reporting feature with hard coded time jumps which don't take into account that an ICD
-        can change the requested MaxInterval during the subscription response / request process
-        https://github.com/project-chip/connectedhomeip/issues/28419
-    */
-#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
     NL_TEST_DEF("TestSubscribeUrgentWildcardEvent", chip::app::TestReadInteraction::TestSubscribeUrgentWildcardEvent),
-#endif
     NL_TEST_DEF("TestSubscribeWildcard", chip::app::TestReadInteraction::TestSubscribeWildcard),
     NL_TEST_DEF("TestSubscribePartialOverlap", chip::app::TestReadInteraction::TestSubscribePartialOverlap),
     NL_TEST_DEF("TestSubscribeSetDirtyFullyOverlap", chip::app::TestReadInteraction::TestSubscribeSetDirtyFullyOverlap),
     NL_TEST_DEF("TestSubscribeEarlyShutdown", chip::app::TestReadInteraction::TestSubscribeEarlyShutdown),
-    NL_TEST_DEF("TestSubscribeInvalidAttributePathRoundtrip", chip::app::TestReadInteraction::TestSubscribeInvalidAttributePathRoundtrip),
+    NL_TEST_DEF("TestSubscribeInvalidAttributePathRoundtrip",
+                chip::app::TestReadInteraction::TestSubscribeInvalidAttributePathRoundtrip),
     NL_TEST_DEF("TestReadInvalidAttributePathRoundtrip", chip::app::TestReadInteraction::TestReadInvalidAttributePathRoundtrip),
     NL_TEST_DEF("TestSubscribeInvalidInterval", chip::app::TestReadInteraction::TestSubscribeInvalidInterval),
-    NL_TEST_DEF("TestSubscribeRoundtripStatusReportTimeout", chip::app::TestReadInteraction::TestSubscribeRoundtripStatusReportTimeout),
-    NL_TEST_DEF("TestPostSubscribeRoundtripStatusReportTimeout", chip::app::TestReadInteraction::TestPostSubscribeRoundtripStatusReportTimeout),
+    NL_TEST_DEF("TestSubscribeRoundtripStatusReportTimeout",
+                chip::app::TestReadInteraction::TestSubscribeRoundtripStatusReportTimeout),
+    NL_TEST_DEF("TestPostSubscribeRoundtripStatusReportTimeout",
+                chip::app::TestReadInteraction::TestPostSubscribeRoundtripStatusReportTimeout),
     NL_TEST_DEF("TestReadChunkingStatusReportTimeout", chip::app::TestReadInteraction::TestReadChunkingStatusReportTimeout),
     NL_TEST_DEF("TestReadReportFailure", chip::app::TestReadInteraction::TestReadReportFailure),
-    NL_TEST_DEF("TestSubscribeRoundtripChunkStatusReportTimeout", chip::app::TestReadInteraction::TestSubscribeRoundtripChunkStatusReportTimeout),
-    NL_TEST_DEF("TestPostSubscribeRoundtripChunkStatusReportTimeout", chip::app::TestReadInteraction::TestPostSubscribeRoundtripChunkStatusReportTimeout),
-    NL_TEST_DEF("TestPostSubscribeRoundtripChunkReportTimeout", chip::app::TestReadInteraction::TestPostSubscribeRoundtripChunkReportTimeout),
+    NL_TEST_DEF("TestSubscribeRoundtripChunkStatusReportTimeout",
+                chip::app::TestReadInteraction::TestSubscribeRoundtripChunkStatusReportTimeout),
+    NL_TEST_DEF("TestPostSubscribeRoundtripChunkStatusReportTimeout",
+                chip::app::TestReadInteraction::TestPostSubscribeRoundtripChunkStatusReportTimeout),
+    NL_TEST_DEF("TestPostSubscribeRoundtripChunkReportTimeout",
+                chip::app::TestReadInteraction::TestPostSubscribeRoundtripChunkReportTimeout),
     NL_TEST_DEF("TestReadShutdown", chip::app::TestReadInteraction::TestReadShutdown),
-    NL_TEST_DEF("TestSubscriptionReportWithDefunctSession", chip::app::TestReadInteraction::TestSubscriptionReportWithDefunctSession),
-    NL_TEST_SENTINEL()
+    NL_TEST_DEF("TestSubscriptionReportWithDefunctSession",
+                chip::app::TestReadInteraction::TestSubscriptionReportWithDefunctSession),
+    NL_TEST_SENTINEL(),
 };
-// clang-format on
 
 // clang-format off
-nlTestSuite sSuite =
-{
+nlTestSuite sSuite = {
     "TestReadInteraction",
     &sTests[0],
-    TestContext::Initialize,
-    TestContext::Finalize
+    TestContext::SetUpTestSuite,
+    TestContext::TearDownTestSuite,
+    TestContext::SetUp,
+    TestContext::TearDown,
 };
 // clang-format on
 
diff --git a/src/app/tests/TestSceneTable.cpp b/src/app/tests/TestSceneTable.cpp
index 08ada73b3729a1..3346c54dabdc6e 100644
--- a/src/app/tests/TestSceneTable.cpp
+++ b/src/app/tests/TestSceneTable.cpp
@@ -102,21 +102,21 @@ static const SceneStorageId sceneId12(kScene6, kGroup4);
 CharSpan empty;
 
 // Scene data
-static const SceneData sceneData1(CharSpan("Scene #1"));
-static const SceneData sceneData2(CharSpan("Scene #2"), 2000);
-static const SceneData sceneData3(CharSpan("Scene #3"), 250);
-static const SceneData sceneData4(CharSpan("Scene num4"), 5000);
+static const SceneData sceneData1("Scene #1"_span);
+static const SceneData sceneData2("Scene #2"_span, 2000);
+static const SceneData sceneData3("Scene #3"_span, 250);
+static const SceneData sceneData4("Scene num4"_span, 5000);
 static const SceneData sceneData5(empty);
-static const SceneData sceneData6(CharSpan("Scene #6"), 3000);
-static const SceneData sceneData7(CharSpan("Scene #7"), 20000);
-static const SceneData sceneData8(CharSpan("NAME TOO LOOONNG!"), 15000);
-static const SceneData sceneData9(CharSpan("Scene #9"), 3000);
-static const SceneData sceneData10(CharSpan("Scene #10"), 1000);
-static const SceneData sceneData11(CharSpan("Scene #11"), 50);
-static const SceneData sceneData12(CharSpan("Scene #12"), 100);
-static const SceneData sceneData13(CharSpan("Scene #13"), 100);
-static const SceneData sceneData14(CharSpan("Scene #14"), 100);
-static const SceneData sceneData15(CharSpan("Scene #15"), 100);
+static const SceneData sceneData6("Scene #6"_span, 3000);
+static const SceneData sceneData7("Scene #7"_span, 20000);
+static const SceneData sceneData8("NAME TOO LOOONNG!"_span, 15000);
+static const SceneData sceneData9("Scene #9"_span, 3000);
+static const SceneData sceneData10("Scene #10"_span, 1000);
+static const SceneData sceneData11("Scene #11"_span, 50);
+static const SceneData sceneData12("Scene #12"_span, 100);
+static const SceneData sceneData13("Scene #13"_span, 100);
+static const SceneData sceneData14("Scene #14"_span, 100);
+static const SceneData sceneData15("Scene #15"_span, 100);
 
 // Scenes
 SceneTableEntry scene1(sceneId1, sceneData1);
@@ -683,6 +683,8 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
     memset(buffer, 0, buff_span.size());
 };
 
+void TestHandlerHelpers(nlTestSuite * aSuite, void * aContext) {}
+
 void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
 {
     SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
@@ -1411,6 +1413,7 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene7));
     // scene count to Endpoint
 
+    // Endpoint 3 still unafected
     sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
@@ -1419,6 +1422,69 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
     NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
+    // Fill fabric 1 endpoint 3
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene2));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene3));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene4));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene5));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene6));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene7));
+
+    // Test removal of Endpoint clears scene on all fabrics for that endpoint
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
+    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
+    VerifyOrReturn(nullptr != sceneTable);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveEndpoint());
+
+    // Check Fabric1 on Endpoint 2
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId7, scene));
+
+    // Check Fabric 1 and 2 on Endpoint 1
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
+    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
+    VerifyOrReturn(nullptr != sceneTable);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
+
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId7, scene));
+
+    // Check Fabric 1 on Endpoint 3
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
+    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
+    VerifyOrReturn(nullptr != sceneTable);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
+
     // Test removal of fabric clears scene fabric on all endpoints
     sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
@@ -1431,7 +1497,6 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
 
     sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
@@ -1443,7 +1508,17 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
+
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
+    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
+    VerifyOrReturn(nullptr != sceneTable);
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId2, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId3, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId6, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
 
     sceneTable->RemoveFabric(kFabric2);
 
diff --git a/src/app/tests/TestTimeSyncDataProvider.cpp b/src/app/tests/TestTimeSyncDataProvider.cpp
index a4a658f330f83b..22eb066764c679 100644
--- a/src/app/tests/TestTimeSyncDataProvider.cpp
+++ b/src/app/tests/TestTimeSyncDataProvider.cpp
@@ -17,6 +17,7 @@
 
 #include <app/clusters/time-synchronization-server/TimeSyncDataProvider.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
+#include <lib/support/CHIPMemString.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
 #include <lib/support/UnitTestRegistration.h>
 
@@ -104,23 +105,22 @@ void TestTimeZoneStoreLoad(nlTestSuite * inSuite, void * inContext)
     TimeSyncDataProvider timeSyncDataProv;
     timeSyncDataProv.Init(persistentStorage);
 
-    const auto makeTimeZone = [](int32_t offset = 0, uint64_t validAt = 0, char * name = nullptr, uint8_t len = 0) {
+    const auto makeTimeZone = [](int32_t offset = 0, uint64_t validAt = 0, char * name = nullptr) {
         TimeSyncDataProvider::TimeZoneStore tzS;
         tzS.timeZone.offset  = offset;
         tzS.timeZone.validAt = validAt;
-        if (name != nullptr && len)
+        if (name != nullptr)
         {
-            memcpy(tzS.name, name, len);
-            tzS.timeZone.name.SetValue(chip::CharSpan(tzS.name, len));
+            Platform::CopyString(tzS.name, name);
+            tzS.timeZone.name.SetValue(chip::CharSpan::fromCharString(tzS.name));
         }
         return tzS;
     };
     char tzShort[]                             = "LA";
     char tzLong[]                              = "MunichOnTheLongRiverOfIsarInNiceSummerWeatherWithAugustinerBeer";
     char tzBerlin[]                            = "Berlin";
-    TimeSyncDataProvider::TimeZoneStore tzS[3] = { makeTimeZone(1, 1, tzShort, sizeof(tzShort)),
-                                                   makeTimeZone(2, 2, tzLong, sizeof(tzLong)),
-                                                   makeTimeZone(3, 3, tzBerlin, sizeof(tzBerlin)) };
+    TimeSyncDataProvider::TimeZoneStore tzS[3] = { makeTimeZone(1, 1, tzShort), makeTimeZone(2, 2, tzLong),
+                                                   makeTimeZone(3, 3, tzBerlin) };
     TimeZoneList tzL(tzS);
     NL_TEST_ASSERT(inSuite, tzL.size() == 3);
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == timeSyncDataProv.StoreTimeZone(tzL));
@@ -141,7 +141,7 @@ void TestTimeZoneStoreLoad(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, tz.offset == 1);
         NL_TEST_ASSERT(inSuite, tz.validAt == 1);
         NL_TEST_ASSERT(inSuite, tz.name.HasValue());
-        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 3);
+        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 2);
 
         tzL = tzL.SubSpan(1);
     }
@@ -152,7 +152,7 @@ void TestTimeZoneStoreLoad(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, tz.offset == 2);
         NL_TEST_ASSERT(inSuite, tz.validAt == 2);
         NL_TEST_ASSERT(inSuite, tz.name.HasValue());
-        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 64);
+        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 63);
 
         tzL = tzL.SubSpan(1);
     }
@@ -163,7 +163,7 @@ void TestTimeZoneStoreLoad(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, tz.offset == 3);
         NL_TEST_ASSERT(inSuite, tz.validAt == 3);
         NL_TEST_ASSERT(inSuite, tz.name.HasValue());
-        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 7);
+        NL_TEST_ASSERT(inSuite, tz.name.Value().size() == 6);
 
         tzL = tzL.SubSpan(1);
     }
diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml
index 9ecac058316cd5..7db46f10030999 100644
--- a/src/app/tests/suites/TestBasicInformation.yaml
+++ b/src/app/tests/suites/TestBasicInformation.yaml
@@ -78,6 +78,8 @@ tests:
                   18,
                   19,
                   20,
+                  21,
+                  22,
                   0xFFF8, # GeneratedCommandList
                   0xFFF9, # AcceptedCommandList
                   0xFFFA, # EventList
@@ -112,6 +114,8 @@ tests:
                   18,
                   19,
                   20,
+                  21,
+                  22,
                   0xFFF8, # GeneratedCommandList
                   0xFFF9, # AcceptedCommandList
                   0xFFFB, # AttributeList
@@ -191,9 +195,23 @@ tests:
       arguments:
           value: false
 
-    - label: "Read the ProductApppearance value"
+    - label: "Read the ProductAppearance value"
       command: "readAttribute"
       attribute: "ProductAppearance"
       response:
           # For now all-clusters-app is a satin purple.
           value: { Finish: 2, PrimaryColor: 5 }
+
+    - label: "Read the Specification Version value"
+      command: "readAttribute"
+      attribute: "SpecificationVersion"
+      response:
+          # For now all-clusters-app has a version 1.3.
+          value: 0x01030000
+
+    - label: "Read the Max Paths Per Invoke value"
+      command: "readAttribute"
+      attribute: "MaxPathsPerInvoke"
+      response:
+          # For now all-clusters-app only supports 1 max paths per invoke.
+          value: 1
diff --git a/src/app/tests/suites/TestDescriptorCluster.yaml b/src/app/tests/suites/TestDescriptorCluster.yaml
index 56b63a9d385cfe..332e72ede9b084 100644
--- a/src/app/tests/suites/TestDescriptorCluster.yaml
+++ b/src/app/tests/suites/TestDescriptorCluster.yaml
@@ -66,7 +66,6 @@ tests:
                   0x003F, # Group Key Management
                   0x0040, # Fixed Label
                   0x0041, # User Label
-                  0x0046, # ICD Management
                   0x0405, # Relative Humidity Measurement (why on EP0?)
                   0xFFF1FC06, # Fault Injection
               ]
diff --git a/src/app/tests/suites/TestFanControl.yaml b/src/app/tests/suites/TestFanControl.yaml
index b27fa4d143e546..92fca4f2a6e253 100644
--- a/src/app/tests/suites/TestFanControl.yaml
+++ b/src/app/tests/suites/TestFanControl.yaml
@@ -40,18 +40,6 @@ tests:
       response:
           value: 3
 
-    - label: "Write fan mode sequence"
-      command: "writeAttribute"
-      attribute: "FanModeSequence"
-      arguments:
-          value: 5
-
-    - label: "Read back fan mode sequence"
-      command: "readAttribute"
-      attribute: "FanModeSequence"
-      response:
-          value: 5
-
     - label: "Write percent setting"
       command: "writeAttribute"
       attribute: "PercentSetting"
diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
index 25921732bce5b9..e07b707e190858 100644
--- a/src/app/tests/suites/TestIcdManagementCluster.yaml
+++ b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -28,23 +28,29 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read Feature Map"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 0x07
+
     - label: "Read IdleModeDuration"
       command: "readAttribute"
       attribute: "IdleModeDuration"
       response:
-          value: 2
+          value: 3600
 
     - label: "Read ActiveModeDuration"
       command: "readAttribute"
       attribute: "ActiveModeDuration"
       response:
-          value: 300
+          value: 10000
 
     - label: "Read ActiveModeThreshold"
       command: "readAttribute"
       attribute: "ActiveModeThreshold"
       response:
-          value: 300
+          value: 1000
 
     - label: "Read ICDCounter"
       command: "readAttribute"
diff --git a/src/app/tests/suites/TestScenesFabricRemoval.yaml b/src/app/tests/suites/TestScenesFabricRemoval.yaml
new file mode 100644
index 00000000000000..3acb0ebf3ae9df
--- /dev/null
+++ b/src/app/tests/suites/TestScenesFabricRemoval.yaml
@@ -0,0 +1,394 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# !!!!!!!!!! TEST INFORMATION !!!!!!!!!!!!!!!!!!
+# This test covers removal of fabric in the SceneTable
+
+name: Scenes Fabric Removal
+
+config:
+    nodeId: 0x12344321
+    cluster: "Scenes"
+    endpoint: 1
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
+    discriminator:
+        type: int16u
+        defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
+    PakeVerifier:
+        type: octet_string
+        defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
+    G1:
+        type: group_id
+        defaultValue: 0x0001
+
+tests:
+    - label: "Commission DUT to TH1"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH1 reads the fabric index"
+      cluster: "Operational Credentials"
+      endpoint: 0
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: th1FabricIndex
+
+    - label: "Open Commissioning Window from alpha"
+      endpoint: 0
+      cluster: "Administrator Commissioning"
+      command: "OpenCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+              - name: "PAKEPasscodeVerifier"
+                value: PakeVerifier
+              - name: "Discriminator"
+                value: discriminator
+              - name: "Iterations"
+                value: 1000
+              - name: "Salt"
+                value: "SPAKE2P Key Salt"
+
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
+    - label: "Commission from TH2"
+      identity: "beta"
+      endpoint: 0
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Wait for the commissioned device to be retrieved for TH2"
+      endpoint: 0
+      identity: beta
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH2 reads the fabric index"
+      identity: "beta"
+      endpoint: 0
+      cluster: "Operational Credentials"
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: th2FabricIndex
+
+    - label: "TH1 sends a RemoveAllGroups command to DUT."
+      cluster: "Groups"
+      command: "RemoveAllGroups"
+
+    - label: "TH 1 Add Group KeySet."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x01a1,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1110000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1110001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1110002,
+                    }
+
+    - label: "TH1 Map KeySets to GroupId."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value: [{ FabricIndex: 0, GroupId: G1, GroupKeySetID: 0x01a1 }]
+
+    - label: "TH1 sends a AddGroup command to DUT for G1."
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "GroupName"
+                value: "Group1"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "Preparation step : TH2 Add Group KeySet."
+      identity: "beta"
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x01a2,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1120000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1120001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1120002,
+                    }
+
+    - label: "Preparation step TH2 Map KeySets to GroupId."
+      identity: "beta"
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value: [{ FabricIndex: 0, GroupId: G1, GroupKeySetID: 0x01a2 }]
+
+    - label: "TH2 sends a AddGroup command to DUT for G1."
+      identity: "beta"
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "GroupName"
+                value: "Group1"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 confirms its Scene table is empty and gets its capacity"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                saveAs: fabricCapacity
+              - name: "GroupID"
+                value: G1
+
+    - label:
+          "TH2 confirms its Scene table is empty and has the same capacity as
+          TH1"
+      identity: "beta"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 sends an AddScene command to DUT for Scene 1 G1"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value: []
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH1 sends an AddScene command to DUT for Scene 2 G1"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+              - name: "TransitionTime"
+                value: 0x0000
+              - name: "SceneName"
+                value: "Scene2"
+              - name: "ExtensionFieldSets"
+                value: []
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+
+    - label: "TH2 sends an AddScene command to DUT for Scene 1 G1"
+      identity: "beta"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value: []
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH2 sends an AddScene command to DUT for Scene 2 G1"
+      identity: "beta"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+              - name: "TransitionTime"
+                value: 0x0000
+              - name: "SceneName"
+                value: "Scene2"
+              - name: "ExtensionFieldSets"
+                value: []
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+
+    - label: "TH1 confirms its G1 holds 2 scenes"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity - 2
+              - name: "GroupID"
+                value: G1
+              - name: "SceneList"
+                value: [0x01, 0x02]
+
+    - label: "TH2 confirms its G1 holds 2 scenes"
+      command: "GetSceneMembership"
+      identity: "beta"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity - 2
+              - name: "GroupID"
+                value: G1
+              - name: "SceneList"
+                value: [0x01, 0x02]
+
+    - label: "TH1 sends RemoveFabric command for TH2"
+      cluster: "Operational Credentials"
+      endpoint: 0
+      command: "RemoveFabric"
+      arguments:
+          values:
+              - name: "FabricIndex"
+                value: th2FabricIndex
+
+    - label: "TH1 confirms its G1 still holds 2 scenes"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity - 2
+              - name: "GroupID"
+                value: G1
+              - name: "SceneList"
+                value: [0x01, 0x02]
+# TODO Figure out a way to recommission with Fabric Index 2 and confirm the scene table is empty for that fabric index
diff --git a/src/app/tests/suites/TestScenesFabricSceneInfo.yaml b/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
new file mode 100644
index 00000000000000..8c211e43d94f40
--- /dev/null
+++ b/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
@@ -0,0 +1,577 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# !!!!!!!!!! TEST INFORMATION !!!!!!!!!!!!!!!!!!
+# This test file tests the FabricSceneInfo attribute of the scenes cluster
+
+name: Scenes FabricSceneInfo testing
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - APPDEVICE.S
+    - S.S
+    - S.S.F03
+    - S.S.A0007
+
+config:
+    nodeId: 0x12344321
+    cluster: "Scenes"
+    endpoint: 1
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
+    discriminator:
+        type: int16u
+        defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
+    PakeVerifier:
+        type: octet_string
+        defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
+    G1:
+        type: group_id
+        defaultValue: 0x0001
+    G2:
+        type: group_id
+        defaultValue: 0x0002
+
+tests:
+    - label: "Commission DUT to TH1"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH1 reads the fabric index"
+      cluster: "Operational Credentials"
+      endpoint: 0
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: th1FabricIndex
+
+    - label: "Read FeatureMap FabricScene bit (global attribute 65532)"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x8]
+
+    - label: "Read the FabricSceneInfo attribute (0x0007) "
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          constraints:
+              type: list
+
+    - label: "TH reads from the DUT the (0x0006) SceneTableSize attribute"
+      command: "readAttribute"
+      attribute: "SceneTableSize"
+      response:
+          values:
+              - name: "SceneTableSize"
+                saveAs: maxScenes
+
+    - label: "Arithmetic operation to get the maxScenes - 1"
+      cluster: "Unit Testing"
+      command: "TestAddArguments"
+      arguments:
+          values:
+              - name: "arg1"
+                value: maxScenes - 1
+              - name: "arg2"
+                value: 0
+      response:
+          values:
+              - name: "returnValue"
+                saveAs: maxScenesMinusOne
+                value: maxScenes - 1
+
+    - label: "Arithmetic operation to get the fabric Capacity"
+      cluster: "Unit Testing"
+      command: "TestAddArguments"
+      arguments:
+          values:
+              - name: "arg1"
+                value: maxScenesMinusOne / 2
+              - name: "arg2"
+                value: 0
+      response:
+          values:
+              - name: "returnValue"
+                saveAs: fabricCapacity
+                value: maxScenesMinusOne / 2
+    - label: "Preparation step :Add Group KeySet."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x01a1,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1110000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1110001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1110002,
+                    }
+
+    - label: "Preparation step for using the Write Group Keys command."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value:
+              [
+                  { FabricIndex: 0, GroupId: G1, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 0, GroupId: G2, GroupKeySetID: 0x01a1 },
+              ]
+
+    - label: "TH sends a RemoveAllGroups command to DUT."
+      cluster: "Groups"
+      command: "RemoveAllGroups"
+
+    - label: "TH sends a AddGroup command to DUT for G1."
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "GroupName"
+                value: "Group1"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH sends a AddGroup command to DUT for G2."
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "GroupName"
+                value: "Group2"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G2
+
+    - label: "TH confirms the Fabric Capacity is Maximum"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH sends an AddScene command to DUT for Scene 1 G1"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
+                        },
+                    ]
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label:
+          "TH confirms the Scene was added to the Scene table by
+          GetSceneMembership"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity -1
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH confirms the Scene Was properly added with ViewScene"
+      command: "ViewScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
+                        },
+                    ]
+
+    - label: "Read the FabricSceneInfo attribute (0x0007) "
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label: "TH sends a RecallScene command for Scene 1 Group 1"
+      command: "RecallScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label: "TH sends an AddScene command to DUT for Scene 1 G1"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0002
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x00 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0xFA }],
+                        },
+                    ]
+
+    - label: "TH confirms the Scene Was properly added with ViewScene"
+      command: "ViewScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0002
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x00 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0xFA }],
+                        },
+                    ]
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "TH sends a RecallScene command for Scene 1 Group 2"
+      command: "RecallScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label:
+          "Configures the DUT to a different state, should invalidate the scene"
+      cluster: "Level Control"
+      command: "MoveToLevelWithOnOff"
+      arguments:
+          values:
+              - name: "Level"
+                value: 200
+              - name: "TransitionTime"
+                value: 0
+              - name: "OptionsMask"
+                value: 1
+              - name: "OptionsOverride"
+                value: 1
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "Store the current DUT state to a new scene"
+      command: "StoreScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 3,
+                      CurrentScene: 0x02,
+                      CurrentGroup: G1,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 3,
+                  },
+              ]
+
+    - label: "TH sends a RecallScene command for Scene 1 Group 2"
+      command: "RecallScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 3,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 3,
+                  },
+              ]
+
+    - label: "Remove Active scene"
+      command: "RemoveScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "Remove all scenes from G1"
+      command: "RemoveAllScenes"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "Confirm the FabricSceneInfo attribute was properly updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
diff --git a/src/app/tests/suites/TestScenesMultiFabric.yaml b/src/app/tests/suites/TestScenesMultiFabric.yaml
new file mode 100644
index 00000000000000..803b01cdd09e6b
--- /dev/null
+++ b/src/app/tests/suites/TestScenesMultiFabric.yaml
@@ -0,0 +1,1029 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# !!!!!!!!!! TEST INFORMATION !!!!!!!!!!!!!!!!!!
+# This test covers multi fabric support for scenes cluster attributes such as LastConfiguredBy and FabricSceneInfo
+
+name: Scenes Multi-fabric testing
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - APPDEVICE.S
+    - S.S
+    - S.S.F03
+    - S.S.A0007
+
+config:
+    nodeId: 0x12344321
+    cluster: "Scenes"
+    endpoint: 1
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
+    discriminator:
+        type: int16u
+        defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
+    PakeVerifier:
+        type: octet_string
+        defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
+    G1:
+        type: group_id
+        defaultValue: 0x0001
+    G2:
+        type: group_id
+        defaultValue: 0x0002
+
+tests:
+    - label: "Commission DUT to TH1"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH1 reads the fabric index"
+      cluster: "Operational Credentials"
+      endpoint: 0
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: th1FabricIndex
+
+    - label: "Read the commissioner node ID from the alpha fabric"
+      identity: "alpha"
+      endpoint: 0
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: commissionerNodeIdAlpha
+
+    - label: "Open Commissioning Window from alpha"
+      endpoint: 0
+      cluster: "Administrator Commissioning"
+      command: "OpenCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+              - name: "PAKEPasscodeVerifier"
+                value: PakeVerifier
+              - name: "Discriminator"
+                value: discriminator
+              - name: "Iterations"
+                value: 1000
+              - name: "Salt"
+                value: "SPAKE2P Key Salt"
+
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
+    - label: "Commission from TH2"
+      identity: "beta"
+      endpoint: 0
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Wait for the commissioned device to be retrieved for TH2"
+      endpoint: 0
+      identity: beta
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 4: TH2 reads the fabric index"
+      identity: "beta"
+      endpoint: 0
+      cluster: "Operational Credentials"
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: th2FabricIndex
+
+    - label: "Read the commissioner node ID from the beta fabric"
+      identity: "beta"
+      endpoint: 0
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: commissionerNodeIdBeta
+
+    - label: "Read FeatureMap FabricScene bit (global attribute 65532)"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x8]
+
+    - label: "Read the FabricSceneInfo attribute (0x0007) "
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          constraints:
+              type: list
+
+    - label: "TH reads from the DUT the (0x0006) SceneTableSize attribute"
+      command: "readAttribute"
+      attribute: "SceneTableSize"
+      response:
+          values:
+              - name: "SceneTableSize"
+                saveAs: maxScenes
+
+    - label: "Arithmetic operation to get the maxScenes - 1"
+      cluster: "Unit Testing"
+      command: "TestAddArguments"
+      arguments:
+          values:
+              - name: "arg1"
+                value: maxScenes - 1
+              - name: "arg2"
+                value: 0
+      response:
+          values:
+              - name: "returnValue"
+                saveAs: maxScenesMinusOne
+                value: maxScenes - 1
+
+    - label: "Arithmetic operation to get the fabric Capacity"
+      cluster: "Unit Testing"
+      command: "TestAddArguments"
+      arguments:
+          values:
+              - name: "arg1"
+                value: maxScenesMinusOne / 2
+              - name: "arg2"
+                value: 0
+      response:
+          values:
+              - name: "returnValue"
+                saveAs: fabricCapacity
+                value: maxScenesMinusOne / 2
+
+    - label: "Preparation step : TH 1 Add Group KeySet."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x01a1,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1110000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1110001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1110002,
+                    }
+
+    - label: "Preparation step TH1 Map KeySets to GroupId."
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value:
+              [
+                  { FabricIndex: 0, GroupId: G1, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 0, GroupId: G2, GroupKeySetID: 0x01a1 },
+              ]
+
+    - label: "TH1 sends a RemoveAllGroups command to DUT."
+      cluster: "Groups"
+      command: "RemoveAllGroups"
+
+    - label: "TH1 sends a AddGroup command to DUT for G1."
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "GroupName"
+                value: "Group1"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 sends a AddGroup command to DUT for G2."
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "GroupName"
+                value: "Group2"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G2
+
+    - label: "Preparation step : TH 2 Add Group KeySet."
+      identity: "beta"
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x01a2,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1120000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1120001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1120002,
+                    }
+
+    - label: "Preparation step TH1 Map KeySets to GroupId."
+      identity: "beta"
+      cluster: "Group Key Management"
+      endpoint: 0
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value: [{ FabricIndex: 0, GroupId: G1, GroupKeySetID: 0x01a2 }]
+
+    - label: "TH2 sends a AddGroup command to DUT for G1."
+      identity: "beta"
+      cluster: "Groups"
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "GroupName"
+                value: "Group1"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 confirms the Fabric Capacity is Maximum"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 Reads LastConfiguredBy attribute"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: null
+
+    - label: "TH2 reads LastConfiguredBy attribute"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: null
+
+    - label: "TH1 sends an AddScene command to DUT for Scene 1 G1"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
+                        },
+                    ]
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label:
+          "TH1 confirms the Scene was added to the Scene table by
+          GetSceneMembership"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity -1
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH2 confirms the Scene membership wasn't affected for fabric 2"
+      identity: "beta"
+      command: "GetSceneMembership"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "Capacity"
+                value: fabricCapacity
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 Read the FabricSceneInfo attribute (0x0007) "
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label: "TH2 Read the FabricSceneInfo attribute (0x0007) "
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value: []
+          # TODO : Have FabricSceneInfo initialized on adding a new fabric
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 sends an AddScene command to DUT for Scene 1 G1"
+      identity: "beta"
+      command: "AddScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+              - name: "TransitionTime"
+                value: 0x0001
+              - name: "SceneName"
+                value: "Scene1"
+              - name: "ExtensionFieldSets"
+                value:
+                    [
+                        {
+                            ClusterID: 0x0006,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
+                        },
+                        {
+                            ClusterID: 0x0008,
+                            AttributeValueList:
+                                [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
+                        },
+                    ]
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 sends a RecallScene command for Scene 1 Group 1"
+      identity: "beta"
+      command: "RecallScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH2 confirms the FabricSceneInfo attribute was properly updated"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label:
+          "TH1 confirms there were no change to its FabricSceneInfo attribute"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label: "TH1 copies Scene 1 from G1 to Scene 2 in G1"
+      command: "CopyScene"
+      arguments:
+          values:
+              - name: "Mode"
+                value: 0x00
+              - name: "GroupIdentifierFrom"
+                value: G1
+              - name: "SceneIdentifierFrom"
+                value: 0x01
+              - name: "GroupIdentifierTo"
+                value: G1
+              - name: "SceneIdentifierTo"
+                value: 0x02
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupIdentifierFrom"
+                value: G1
+              - name: "SceneIdentifierFrom"
+                value: 0x01
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 confirms the FabricSceneInfo didn't change"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label:
+          "TH1 confirms the update of FabricSceneInfo attribute with scene Valid
+          still false"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "TH2 Remove Scene 1 from G1"
+      identity: "beta"
+      command: "RemoveScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 confirms the FabricSceneInfo's update"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
+
+    - label: "TH1 confirms its FabricSceneInfo remained unchanged"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "TH1 copies all Scenes from G1 to G1"
+      command: "CopyScene"
+      arguments:
+          values:
+              - name: "Mode"
+                value: 0x01
+              - name: "GroupIdentifierFrom"
+                value: G1
+              - name: "SceneIdentifierFrom"
+                value: 0x00
+              - name: "GroupIdentifierTo"
+                value: G2
+              - name: "SceneIdentifierTo"
+                value: 0x00
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupIdentifierFrom"
+                value: G1
+              - name: "SceneIdentifierFrom"
+                value: 0x00
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 confirms its FabricSceneInfo remained unchanged"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
+
+    - label: "TH1 confirms its FabricSceneInfo was updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 4,
+                      CurrentScene: 0x00,
+                      CurrentGroup: 0x00,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity - 4,
+                  },
+              ]
+
+    - label: "TH1 sends a RecallScene command for Scene 1 Group 2"
+      command: "RecallScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+              - name: "SceneID"
+                value: 0x01
+
+    - label: "TH2 confirms its FabricSceneInfo remained unchanged"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
+
+    - label: "TH1 confirms its FabricSceneInfo was updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 4,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 4,
+                  },
+              ]
+
+    - label: "TH2 Store the current DUT state to a new scene"
+      identity: "beta"
+      command: "StoreScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 confirms its FabricSceneInfo was updated"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x02,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label:
+          "TH1 confirms its FabricSceneInfo's field SceneValid remains unchanged"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 4,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 4,
+                  },
+              ]
+
+    - label: "TH1 removes all scenes from G1"
+      command: "RemoveAllScenes"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G1
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 confirms its FabricSceneInfo remained unchanged"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x02,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
+
+    - label:
+          "TH1 confirms its FabricSceneInfo's field SceneCount and
+          RemainingCapacity were updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "TH2 Remove Scene 2 from G1"
+      identity: "beta"
+      command: "RemoveScene"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+      response:
+          values:
+              - name: "Status"
+                value: 0x00
+              - name: "GroupID"
+                value: G1
+              - name: "SceneID"
+                value: 0x02
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdBeta
+
+    - label: "TH2 confirms its FabricSceneInfo was updated"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x02,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
+
+    - label: "TH1 confirms its FabricSceneInfo remained unchanged"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 2,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 2,
+                  },
+              ]
+
+    - label: "TH1 removes all scenes from G2"
+      command: "RemoveAllScenes"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: G2
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: G2
+
+    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "LastConfiguredBy"
+      response:
+          value: commissionerNodeIdAlpha
+
+    - label: "TH2 confirms its FabricSceneInfo remained unchanged"
+      identity: "beta"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x02,
+                      CurrentGroup: G1,
+                      FabricIndex: th2FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
+
+    - label: "TH1 confirms its FabricSceneInfo was updated"
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 0,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G2,
+                      FabricIndex: th1FabricIndex,
+                      SceneValid: false,
+                      RemainingCapacity: fabricCapacity,
+                  },
+              ]
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index d94eada4ad6415..a6f9974e59d182 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -5707,7 +5707,7 @@ PICS:
     - label: "Does the device implement the SceneTableSize attribute?"
       id: S.S.A0006
 
-    - label: "Does the device implement the RemainingCapacity attribute?"
+    - label: "Does the device implement the FabricSceneInfo attribute?"
       id: S.S.A0007
 
     #
@@ -7311,7 +7311,7 @@ PICS:
           "Reset the following attributes to 0; BeaconLostCount, BeaconRxCount,
           PacketMulticastRxCount, PacketMulticastTxCount, PacketUnicastRxCount,
           PacketUnicastTxCount"
-      id: DGWIFI.S.C00.Tx
+      id: DGWIFI.C.C00.Tx
 
     # Window Covering Cluster Test Plan
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
index 4bbecd559ca785..05ab09f80501e5 100644
--- a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
@@ -254,7 +254,9 @@ tests:
       cluster: "Descriptor"
       attribute: "DeviceTypeList"
 
-    - label: "Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"
+    - label:
+          "Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect UNSUPPORTED_ACCESS"
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
@@ -291,7 +293,9 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
+    - label:
+          "Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect SUCCESS"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
@@ -299,7 +303,9 @@ tests:
       attribute: "VendorID"
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
+    - label:
+          "Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect SUCCESS"
       verification: |
           ./chip-tool basicinformation read vendor-id 2 0 --commissioner-name beta
 
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
index 42f492697ff450..e6390348f7148e 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
@@ -45,97 +45,88 @@ tests:
 
           1. First read action-list by following command
 
-          ./chip-tool actions read action-list 1 1 --trace_decode 1
-
-          Via the TH (bridge-app), verify the ActionList attribute that contains ActionListStructs.
-
-          [1686033574.850552][39104:39106] CHIP:DMG: ReportDataMessage =
-          [1686033574.850639][39104:39106] CHIP:DMG: {
-          [1686033574.850689][39104:39106] CHIP:DMG:         AttributeReportIBs =
-          [1686033574.850802][39104:39106] CHIP:DMG:         [
-          [1686033574.850861][39104:39106] CHIP:DMG:                 AttributeReportIB =
-          [1686033574.850976][39104:39106] CHIP:DMG:                 {
-          [1686033574.851039][39104:39106] CHIP:DMG:                         AttributeDataIB =
-          [1686033574.851133][39104:39106] CHIP:DMG:                         {
-          [1686033574.851206][39104:39106] CHIP:DMG:                                 DataVersion = 0x17ed8ce2,
-          [1686033574.851299][39104:39106] CHIP:DMG:                                 AttributePathIB =
-          [1686033574.851375][39104:39106] CHIP:DMG:                                 {
-          [1686033574.851450][39104:39106] CHIP:DMG:                                         Endpoint = 0x1,
-          [1686033574.851557][39104:39106] CHIP:DMG:                                         Cluster = 0x25,
-          [1686033574.851658][39104:39106] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1686033574.851736][39104:39106] CHIP:DMG:                                 }
-          [1686033574.851838][39104:39106] CHIP:DMG:
-          [1686033574.851914][39104:39106] CHIP:DMG:                                 Data = [
-          [1686033574.852009][39104:39106] CHIP:DMG:
-          [1686033574.852090][39104:39106] CHIP:DMG:                                         {
-          [1686033574.852194][39104:39106] CHIP:DMG:                                                 0x0 = 4097,
-          [1686033574.852287][39104:39106] CHIP:DMG:                                                 0x1 = "Room 1 On" (9 chars),
-          [1686033574.852393][39104:39106] CHIP:DMG:                                                 0x2 = 3,
-          [1686033574.852482][39104:39106] CHIP:DMG:                                                 0x3 = 57345,
-          [1686033574.852588][39104:39106] CHIP:DMG:                                                 0x4 = 1,
-          [1686033574.852692][39104:39106] CHIP:DMG:                                                 0x5 = 0,
-          [1686033574.852780][39104:39106] CHIP:DMG:                                         },
-          [1686033574.852880][39104:39106] CHIP:DMG:                                         {
-          [1686033574.852963][39104:39106] CHIP:DMG:                                                 0x0 = 4098,
-          [1686033574.853070][39104:39106] CHIP:DMG:                                                 0x1 = "Turn On Room 2" (14 chars),
-          [1686033574.853158][39104:39106] CHIP:DMG:                                                 0x2 = 3,
-          [1686033574.853311][39104:39106] CHIP:DMG:                                                 0x3 = 57346,
-          [1686033574.853428][39104:39106] CHIP:DMG:                                                 0x4 = 1,
-          [1686033574.853516][39104:39106] CHIP:DMG:                                                 0x5 = 0,
-          [1686033574.853621][39104:39106] CHIP:DMG:                                         },
-          [1686033574.853703][39104:39106] CHIP:DMG:                                 ],
-          [1686033574.853792][39104:39106] CHIP:DMG:                         },
-          [1686033574.853887][39104:39106] CHIP:DMG:
-          [1686033574.853969][39104:39106] CHIP:DMG:                 },
-          [1686033574.854059][39104:39106] CHIP:DMG:
-          [1686033574.854137][39104:39106] CHIP:DMG:         ],
-          [1686033574.854225][39104:39106] CHIP:DMG:
-          [1686033574.854283][39104:39106] CHIP:DMG:         SuppressResponse = true,
-          [1686033574.854342][39104:39106] CHIP:DMG:         InteractionModelRevision = 1
-          [1686033574.854395][39104:39106] CHIP:DMG: }
-
+          ./chip-tool actions read action-list 1 1
+
+          Via the TH (bridge-app), verify the ActionList attribute response.
+
+          [1698725144.232190][1963:1963] CHIP:IM: Received Read request
+          [1698725144.232296][1963:1963] CHIP:DMG: ReadRequestMessage =
+          [1698725144.232352][1963:1963] CHIP:DMG: {
+          [1698725144.232410][1963:1963] CHIP:DMG:         AttributePathIBs =
+          [1698725144.232484][1963:1963] CHIP:DMG:         [
+          [1698725144.232544][1963:1963] CHIP:DMG:                 AttributePathIB =
+          [1698725144.232608][1963:1963] CHIP:DMG:                 {
+          [1698725144.232688][1963:1963] CHIP:DMG:                         Endpoint = 0x1,
+          [1698725144.232758][1963:1963] CHIP:DMG:                         Cluster = 0x25,
+          [1698725144.232828][1963:1963] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1698725144.232893][1963:1963] CHIP:DMG:                 }
+          [1698725144.232959][1963:1963] CHIP:DMG:
+          [1698725144.233018][1963:1963] CHIP:DMG:         ],
+          [1698725144.233083][1963:1963] CHIP:DMG:
+          [1698725144.233142][1963:1963] CHIP:DMG:         isFabricFiltered = true,
+          [1698725144.233199][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698725144.233252][1963:1963] CHIP:DMG: },
+
+
+          ./chip-tool actions read endpoint-lists 1 1
+
+          Via the TH (chip-tool), verify the EndpointLists attribute that contains EndpointListStructs.
+
+          [1698729275.160463][1963:1963] CHIP:IM: Received Read request
+          [1698729275.160560][1963:1963] CHIP:DMG: ReadRequestMessage =
+          [1698729275.160618][1963:1963] CHIP:DMG: {
+          [1698729275.160668][1963:1963] CHIP:DMG:         AttributePathIBs =
+          [1698729275.160729][1963:1963] CHIP:DMG:         [
+          [1698729275.160785][1963:1963] CHIP:DMG:                 AttributePathIB =
+          [1698729275.160848][1963:1963] CHIP:DMG:                 {
+          [1698729275.160912][1963:1963] CHIP:DMG:                         Endpoint = 0x1,
+          [1698729275.160992][1963:1963] CHIP:DMG:                         Cluster = 0x25,
+          [1698729275.161070][1963:1963] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1698729275.161143][1963:1963] CHIP:DMG:                 }
+          [1698729275.161211][1963:1963] CHIP:DMG:
+          [1698729275.161270][1963:1963] CHIP:DMG:         ],
+          [1698729275.161335][1963:1963] CHIP:DMG:
+          [1698729275.161395][1963:1963] CHIP:DMG:         isFabricFiltered = true,
+          [1698729275.161452][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698729275.161505][1963:1963] CHIP:DMG: },
 
 
           2. Use the above obtained ActionID to verify the following commands
-           ./chip-tool actions instant-action 4097 1 1 --trace_decode 1
+           ./chip-tool actions instant-action 4097 1 1
       disabled: true
 
     - label: "Step 1: DUT issues an InstantAction command to TH"
       PICS: ACT.C.C00.Tx
       verification: |
-          ./chip-tool actions instant-action 4097 1 1 --trace_decode 1
-
-          Via the TH (bridge-app), verify the SUCCESS response for InstantAction.
-
-          [1686033693.327962][39117:39119] CHIP:DMG: InvokeResponseMessage =
-          [1686033693.328040][39117:39119] CHIP:DMG: {
-          [1686033693.328094][39117:39119] CHIP:DMG:         suppressResponse = false,
-          [1686033693.328151][39117:39119] CHIP:DMG:         InvokeResponseIBs =
-          [1686033693.328248][39117:39119] CHIP:DMG:         [
-          [1686033693.328307][39117:39119] CHIP:DMG:                 InvokeResponseIB =
-          [1686033693.328407][39117:39119] CHIP:DMG:                 {
-          [1686033693.328469][39117:39119] CHIP:DMG:                         CommandStatusIB =
-          [1686033693.328561][39117:39119] CHIP:DMG:                         {
-          [1686033693.328632][39117:39119] CHIP:DMG:                                 CommandPathIB =
-          [1686033693.328708][39117:39119] CHIP:DMG:                                 {
-          [1686033693.328807][39117:39119] CHIP:DMG:                                         EndpointId = 0x1,
-          [1686033693.328887][39117:39119] CHIP:DMG:                                         ClusterId = 0x25,
-          [1686033693.328987][39117:39119] CHIP:DMG:                                         CommandId = 0x0,
-          [1686033693.329062][39117:39119] CHIP:DMG:                                 },
-          [1686033693.329167][39117:39119] CHIP:DMG:
-          [1686033693.329237][39117:39119] CHIP:DMG:                                 StatusIB =
-          [1686033693.329376][39117:39119] CHIP:DMG:                                 {
-          [1686033693.329454][39117:39119] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1686033693.329551][39117:39119] CHIP:DMG:                                 },
-          [1686033693.329629][39117:39119] CHIP:DMG:
-          [1686033693.329716][39117:39119] CHIP:DMG:                         },
-          [1686033693.329794][39117:39119] CHIP:DMG:
-          [1686033693.329876][39117:39119] CHIP:DMG:                 },
-          [1686033693.329950][39117:39119] CHIP:DMG:
-          [1686033693.330005][39117:39119] CHIP:DMG:         ],
-          [1686033693.330101][39117:39119] CHIP:DMG:
-          [1686033693.330158][39117:39119] CHIP:DMG:         InteractionModelRevision = 1
-          [1686033693.330241][39117:39119] CHIP:DMG: },
+          ./chip-tool actions instant-action 4097 1 1
+
+          Via the TH (bridge-app), verify the InstantAction response that contains ActionID .
+
+          [1698724321.817293][1963:1963] CHIP:DMG: InvokeRequestMessage =
+          [1698724321.817361][1963:1963] CHIP:DMG: {
+          [1698724321.817413][1963:1963] CHIP:DMG:         suppressResponse = false,
+          [1698724321.817475][1963:1963] CHIP:DMG:         timedRequest = false,
+          [1698724321.817532][1963:1963] CHIP:DMG:         InvokeRequests =
+          [1698724321.817603][1963:1963] CHIP:DMG:         [
+          [1698724321.817659][1963:1963] CHIP:DMG:                 CommandDataIB =
+          [1698724321.817723][1963:1963] CHIP:DMG:                 {
+          [1698724321.817782][1963:1963] CHIP:DMG:                         CommandPathIB =
+          [1698724321.817974][1963:1963] CHIP:DMG:                         {
+          [1698724321.818045][1963:1963] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698724321.818141][1963:1963] CHIP:DMG:                                 ClusterId = 0x25,
+          [1698724321.818232][1963:1963] CHIP:DMG:                                 CommandId = 0x0,
+          [1698724321.818319][1963:1963] CHIP:DMG:                         },
+          [1698724321.818399][1963:1963] CHIP:DMG:
+          [1698724321.818462][1963:1963] CHIP:DMG:                         CommandFields =
+          [1698724321.818537][1963:1963] CHIP:DMG:                         {
+          [1698724321.818607][1963:1963] CHIP:DMG:                                 0x0 = 4097,
+          [1698724321.818697][1963:1963] CHIP:DMG:                         },
+          [1698724321.818767][1963:1963] CHIP:DMG:                 },
+          [1698724321.818838][1963:1963] CHIP:DMG:
+          [1698724321.818894][1963:1963] CHIP:DMG:         ],
+          [1698724321.818963][1963:1963] CHIP:DMG:
+          [1698724321.819017][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698724321.819088][1963:1963] CHIP:DMG: },
       disabled: true
 
     - label: "Step 2: DUT issues an StartAction command to TH"
diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
index 3809e72bc7205e..b170eb0aec2e02 100644
--- a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
@@ -54,7 +54,7 @@ tests:
       attribute: "ApplicationName"
       response:
           constraints:
-              type: char_string
+              type: long_char_string
               maxLength: 256
 
     - label: "Step 4: Reads the ProductID attribute"
diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml
index 6e4e78125d7566..1f909b06b83b1a 100644
--- a/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml
@@ -37,7 +37,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 2
+          value: 3
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
index e742a2a98e52a5..ac8fdc5a79ede3 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
@@ -32,7 +32,7 @@ tests:
 
           3. TH reads Reachable attribute from DUT and saves for future use
 
-          4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Basic cluster of the DUT
+          4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Bridged Device Basic Information cluster of the DUT
 
           5. TH saves the FabricIndex during commissioning
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
index 045bb85fa92f10..c5974efc25bbec 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
@@ -345,7 +345,7 @@ tests:
           On TH_CR3 send the below command
 
           Below is the example when using chip tool as controller (considering 36177160937 as the manual code generated by 1st controller)
-          ./chip-tool pairing code 1 36177160937 --commissioner-name gamma
+          ./chip-tool pairing code 3 36177160937 --commissioner-name gamma
 
           verify you got the following message in the TH_CR3(chip-tool) log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
index b4d15c1bc8a879..ce3979c6f5b09a 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.1. [TC-CNET-4.1] [WiFi] Verification for attributes check [DUT-Server]
@@ -21,197 +20,169 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
     endpoint: 0
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:47524C50726976617465"
 
 tests:
-    - label: "Preconditions"
-      verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          4. TH can communicate with the DUT
-      disabled: true
-
     - label: "Step 1: Factory reset the DUT"
       verification: |
-
-      disabled: true
-
+          Reset Devices to factory defaults
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Factory Reset the DUT and enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
     - label: "Step 2: Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after successfull Commission"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 3: TH reads Descriptor Cluster from the DUT with EP0 TH reads
           ServerList from the DUT"
-      verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Via the TH (chip-tool), verify that the server list has value as 49.
-
-          [1654250292.680821][5262:5267] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 812190876
-          [1654250292.681079][5262:5267] CHIP:TOO:   server list: 26 entries
-          [1654250292.681196][5262:5267] CHIP:TOO:     [1]: 3
-          [1654250292.681264][5262:5267] CHIP:TOO:     [2]: 4
-          [1654250292.681327][5262:5267] CHIP:TOO:     [3]: 29
-          [1654250292.681389][5262:5267] CHIP:TOO:     [4]: 30
-          [1654250292.681450][5262:5267] CHIP:TOO:     [5]: 31
-          [1654250292.681525][5262:5267] CHIP:TOO:     [6]: 40
-          [1654250292.681578][5262:5267] CHIP:TOO:     [7]: 42
-          [1654250292.681629][5262:5267] CHIP:TOO:     [8]: 43
-          [1654250292.681680][5262:5267] CHIP:TOO:     [9]: 44
-          [1654250292.681731][5262:5267] CHIP:TOO:     [10]: 45
-          [1654250292.681782][5262:5267] CHIP:TOO:     [11]: 46
-          [1654250292.681833][5262:5267] CHIP:TOO:     [12]: 47
-          [1654250292.681911][5262:5267] CHIP:TOO:     [13]: 48
-          [1654250292.681977][5262:5267] CHIP:TOO:     [14]: 49
-          [1654250292.682038][5262:5267] CHIP:TOO:     [15]: 50
-          [1654250292.682100][5262:5267] CHIP:TOO:     [16]: 51
-          [1654250292.682160][5262:5267] CHIP:TOO:     [17]: 52
-          [1654250292.682220][5262:5267] CHIP:TOO:     [18]: 53
-          [1654250292.682281][5262:5267] CHIP:TOO:     [19]: 54
-          [1654250292.682342][5262:5267] CHIP:TOO:     [20]: 55
-          [1654250292.682404][5262:5267] CHIP:TOO:     [21]: 60
-          [1654250292.682467][5262:5267] CHIP:TOO:     [22]: 62
-          [1654250292.682528][5262:5267] CHIP:TOO:     [23]: 63
-          [1654250292.682590][5262:5267] CHIP:TOO:     [24]: 64
-          [1654250292.682651][5262:5267] CHIP:TOO:     [25]: 65
-          [1654250292.682714][5262:5267] CHIP:TOO:     [26]: 1029
-      disabled: true
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [49]
 
     - label: "Step 4: TH reads FeatureMap attribute from the DUT"
-      verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Via the TH (chip-tool), verify that FeatureMap attribute value as 1 for WiFiNetworkInterface.
-
-          [1653473169.784344][29771:29776] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653473169.784413][29771:29776] CHIP:TOO:   FeatureMap: 1
-          [1653473169.784516][29771:29776] CHIP:EM: Sending Standalone Ack for MessageCounter:3349837 on exchange 7603i
-      disabled: true
-
-    - label: "Step 5: TH reads the MaxNetworks attribute from the DUT"
-      PICS: CNET.S.A0000
-      verification: |
-          ./chip-tool networkcommissioning read max-networks 1 0
-
-          Via the TH (chip-tool), Verify the MaxNetworks attribute that contains value in the range of 1 to 255.
-
-          [1653473181.407542][29777:29782] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000 DataVersion: 1600858167
-          [1653473181.407621][29777:29782] CHIP:TOO:   MaxNetworks: 1
-          [1653473181.407725][29777:29782] CHIP:EM: Sending Standalone Ack for MessageCounter:15199397 on exchange 5841i
-      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
     - label:
-          "Step 6: TH saves the MaxNetworks attribute value as
-          'MaxNetworksValue' for future use"
-      verification: |
-
-      disabled: true
+          "Step 5 & 6: TH reads the MaxNetworks attribute from the DUT. TH saves
+          the MaxNetworks attribute value as 'MaxNetworksValue' for future use"
+      PICS: CNET.S.A0000
+      command: "readAttribute"
+      attribute: "MaxNetworks"
+      response:
+          saveAs: MaxNetworksValue
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
     - label: "Step 7: TH reads the Networks attribute list from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should the type of octstr with a length range of 1 to 32.
-          -that the connected status is in tthe type of bool value as TRUE.
-
-          [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
-          [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
-          [1654250379.882123][5309:5314] CHIP:TOO:     [1]: {
-          [1654250379.882196][5309:5314] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1654250379.882257][5309:5314] CHIP:TOO:       Connected: TRUE
-          [1654250379.882312][5309:5314] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label: "Step 8: TH reads ScanMaxTimeSeconds attribute from the DUT"
       PICS: CNET.S.A0002
-      verification: |
-          ./chip-tool networkcommissioning read scan-max-time-seconds 1 0
-
-          Via the TH (chip-tool), Verify the ScanMaxTimeSeconds attribute that contains value in the range of 1 to 255 secs.
-
-          [1653473784.850830][29813:29818] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002 DataVersion: 1600858167
-          [1653473784.850916][29813:29818] CHIP:TOO:   ScanMaxTimeSeconds: 10
-          [1653473784.851029][29813:29818] CHIP:EM: Sending Standalone Ack for MessageCounter:16671548 on exchange 37205i
-      disabled: true
-
-    - label: "Step 9: TH reads ConnectMaxTimeSeconds Attribute from the DUT"
+      command: "readAttribute"
+      attribute: "ScanMaxTimeSeconds"
+      response:
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
+
+    - label: "Step 9: TH reads ConnectMaxTimeSeconds attribute from the DUT"
       PICS: CNET.S.A0003
-      verification: |
-          ./chip-tool networkcommissioning read connect-max-time-seconds 1 0
-
-          Via the TH (chip-tool), Verify the ConnectMaxTimeSeconds attribute that contains value in the range of 1 to 255 secs.
-
-          [1653473821.367214][29821:29826] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003 DataVersion: 1600858167
-          [1653473821.367283][29821:29826] CHIP:TOO:   ConnectMaxTimeSeconds: 20
-          [1653473821.367379][29821:29826] CHIP:EM: Sending Standalone Ack for MessageCounter:187119 on exchange 50022i
-      disabled: true
+      command: "readAttribute"
+      attribute: "ConnectMaxTimeSeconds"
+      response:
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
     - label: "Step 10: TH reads InterfaceEnabled attribute from the DUT"
       PICS: CNET.S.A0004
-      verification: |
-          ./chip-tool networkcommissioning read interface-enabled 1 0
-
-          Via the TH (chip-tool), Verify the InterfaceEnabled attribute that contains bool value as True.
-
-          [1653473893.275901][29834:29839] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004 DataVersion: 1600858167
-          [1653473893.275964][29834:29839] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1653473893.276084][29834:29839] CHIP:EM: Sending Standalone Ack for MessageCounter:13157245 on exchange 55578i
-      disabled: true
+      command: "readAttribute"
+      attribute: "InterfaceEnabled"
+      response:
+          value: true
+          constraints:
+              type: boolean
 
     - label: "Step 11: TH reads LastNetworkingStatus attribute from the DUT"
       PICS: CNET.S.A0005
-      verification: |
-          ./chip-tool networkcommissioning read last-networking-status 1 0
-
-          Via the TH (chip-tool), Verify the LastNetworkingStatus attribute that contains value as 0 that mentions success.
-
-          [1653473918.484769][29840:29845] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1600858167
-          [1653473918.484843][29840:29845] CHIP:TOO:   LastNetworkingStatus: 0
-          [1653473918.484940][29840:29845] CHIP:EM: Sending Standalone Ack for MessageCounter:10161085 on exchange 18769
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkingStatus"
+      response:
+          value: 0
+          constraints:
+              type: NetworkCommissioningStatusEnum
 
     - label:
-          "Step 12: TH reads the LastNetworkID attribute from the DUT TH reads
+          "Step 12a: TH reads the LastNetworkID attribute from the DUT. TH reads
           the Networks attribute from the DUT"
       PICS: CNET.S.A0006
-      verification: |
-          ./chip-tool networkcommissioning read last-network-id 1  0
-
-          Via the TH (chip-tool), Verify:
-          -that the LastNetworkID attribute that contains NetworkID that should be the type of octstr with a length range 1 to 32.
-          -if the Networks attribute list is Empty, then LastNetworkID attribute value is null.
-
-          [1653474059.383553][27286:27291] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 1912591449
-          [1653474059.383618][27286:27291] CHIP:TOO:   LastNetworkID: 47524C50726976617465
-          [1653474059.383723][27286:27291] CHIP:EM: Sending Standalone Ack for MessageCounter:6975079 on exchange 34674i
-
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify the lastnetworkID is present in the NetworkID in the entries of Network.
-
-          [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
-          [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
-          [1654250379.882123][5309:5314] CHIP:TOO:     [1]: {
-          [1654250379.882196][5309:5314] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1654250379.882257][5309:5314] CHIP:TOO:       Connected: TRUE
-          [1654250379.882312][5309:5314] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkID"
+      response:
+          value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          constraints:
+              type: octet_string
+              minLength: 1
+              maxLength: 32
+
+    - label: "Step 12b: TH reads the Networks attribute list from the DUT"
+      PICS: CNET.S.A0001
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 13: TH reads the LastConnectErrorValue attribute from the DUT"
       PICS: CNET.S.A0007
-      verification: |
-          ./chip-tool networkcommissioning read last-connect-error-value 1 0
-
-          Via the TH (chip-tool), Verify the LastConnectErrorValue attribute that contains value as null.
-
-          [1653474102.061746][29860:29865] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 1600858167
-          [1653474102.061812][29860:29865] CHIP:TOO:   LastConnectErrorValue: null
-          [1653474102.061934][29860:29865] CHIP:EM: Sending Standalone Ack for MessageCounter:5193529 on exchange 29546i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastConnectErrorValue"
+      response:
+          value: null
+          constraints:
+              type: int32s
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
index b9d5fed77a9909..1320f1f2c1d8a3 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.8. [TC-CNET-4.10] [Thread] Verification for RemoveNetwork Command
@@ -22,298 +21,304 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_THREAD
     endpoint: 0
+    PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET:
+        type: octet_string
+        defaultValue: "hex:1111111122222222"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on Thread network "
       verification: |
-          1. DUT supports CNET.S.F01(TH)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
-          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-      disabled: true
+          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
+
+          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
+          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
+          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
+          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
+          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
+          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
+          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
+          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
+          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
+          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 2
+          constraints:
+              type: bitmap32
 
     - label:
           "Step 1: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 1 62 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
-
-          [1650391404.723087][10042:10047] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650391404.723164][10042:10047] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650391404.723269][10042:10047] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650391404.723342][10042:10047] CHIP:TOO:     errorCode: 0
-          [1650391404.723381][10042:10047] CHIP:TOO:     debugText:
-          [1650391404.723419][10042:10047] CHIP:TOO:    }
-          [1650391404.723479][10042:10047] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 2: TH1 reads Networks attribute from the DUT and save the number
           of entries as 'NumNetworks'"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should be as PIXIT.CNET .THREAD_1 ST_OPERA TIONALDA TASET.
-          -that the connected status should be the type of bool value as TRUE.
-
-          [1657790578.359665][5247:5252] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 2276799582
-          [1657790578.359820][5247:5252] CHIP:TOO:   Networks: 1 entries
-          [1657790578.359925][5247:5252] CHIP:TOO:     [1]: {
-          [1657790578.359992][5247:5252] CHIP:TOO:       NetworkID: 1850171990782922
-          [1657790578.360049][5247:5252] CHIP:TOO:       Connected: TRUE
-          [1657790578.360103][5247:5252] CHIP:TOO:      }
-          [1657790578.360277][5247:5252] CHIP:EM: Sending Standalone Ack for MessageCounter:195491393 on exchange 23374i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          saveAs: NumNetworks
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 3: TH finds the index of the Networks list entry with NetworkID
           field value PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and saves it as
           'Userth_netidx'"
       verification: |
-
-      disabled: true
+          TH finds the index of the Networks list entry with NetworkID
+          field value PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and saves it as
+          'Userth_netidx'
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb
           field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-           ./chip-tool networkcommissioning  remove-network hex:1850171990782922 62 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1657790635.532308][5254:5259] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1657790635.532395][5254:5259] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657790635.532528][5254:5259] CHIP:TOO:   NetworkConfigResponse: {
-          [1657790635.532617][5254:5259] CHIP:TOO:     networkingStatus: 0
-          [1657790635.532671][5254:5259] CHIP:TOO:     networkIndex: 0
-          [1657790635.532718][5254:5259] CHIP:TOO:    }
-          [1657790635.532794][5254:5259] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657790635.532886][5254:5259] CHIP:EM: Sending Standalone Ack for MessageCounter:162806082 on exchange 55401i
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label: "Step 5: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify that the Networks attribute list has empty(0 entries).
-
-          [1657625584.426746][2703:2708] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1201757611
-          [1657625584.427014][2703:2708] CHIP:TOO:   Networks: 0 entries
-          [1657625584.427238][2703:2708] CHIP:EM: Sending Standalone Ack for MessageCounter:71370645 on exchange 9137i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              type: list
+              excludes:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
 
     - label: "Step 6: TH reads LastNetworkingStatus attribute from the DUT"
       PICS: CNET.S.A0005
-      verification: |
-          ./chip-tool networkcommissioning read last-networking-status 1 0
-
-          Via the TH (chip-tool), Verify the LastNetworkingStatus attribute that contains value as 0 that mentions success.
-
-          [1657625631.550171][2710:2715] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1201757611
-          [1657625631.550337][2710:2715] CHIP:TOO:   LastNetworkingStatus: 0
-          [1657625631.550495][2710:2715] CHIP:EM: Sending Standalone Ack for MessageCounter:45041626 on exchange 48206i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkingStatus"
+      response:
+          value: 0
+          constraints:
+              type: NetworkCommissioningStatusEnum
 
     - label: "Step 7: TH reads LastNetworkID attribute from the DUT"
       PICS: CNET.S.A0006
-      verification: |
-          ./chip-tool networkcommissioning read last-network-id 1 0
-
-          Via the TH (chip-tool), Verify that the LastNetworkID has PIXIT.CNET.THRE AD_1ST_OPERATI ONALDATASET.
-
-          [1657625691.050998][2718:2724] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 1201757611
-          [1657625691.051142][2718:2724] CHIP:TOO:   LastNetworkID: 1850171990782922
-          [1657625691.051317][2718:2724] CHIP:EM: Sending Standalone Ack for MessageCounter:151340993 on exchange 26558i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkID"
+      response:
+          value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
 
     - label:
           "Step 8: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
       PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657625860.742472][2739:2744] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2669958173
-          [1657625860.742607][2739:2744] CHIP:TOO:   Breadcrumb: 1
-          [1657625860.742764][2739:2744] CHIP:EM: Sending Standalone Ack for MessageCounter:246118803 on exchange 50195i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
 
     - label:
           "Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to the extended PAN ID of
           PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 2"
-      PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:1850171990782922 1 0 --Breadcrumb 2
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains networkingStatus value as 3(NetworkIdNotFound).
-
-          [1657625912.836563][2747:2752] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1657625912.836768][2747:2752] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1657625912.836933][2747:2752] CHIP:TOO:   ConnectNetworkResponse: {
-          [1657625912.837012][2747:2752] CHIP:TOO:     networkingStatus: 3
-          [1657625912.837075][2747:2752] CHIP:TOO:     errorValue: 0
-          [1657625912.837131][2747:2752] CHIP:TOO:    }
-          [1657625912.837220][2747:2752] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657625912.837330][2747:2752] CHIP:EM: Sending Standalone Ack for MessageCounter:259218125 on exchange 18569i
-      disabled: true
+      timedInteractionTimeoutMs: 5000
+      PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 2
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
+              - name: "ErrorValue"
+                constraints:
+                    type: int32s
 
     - label:
           "Step 10: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
       PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657781070.617341][4823:4828] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2383846386
-          [1657781070.617458][4823:4828] CHIP:TOO:   Breadcrumb: 1
-          [1657781070.617656][4823:4828] CHIP:EM: Sending Standalone Ack for MessageCounter:198695370 on exchange 43070i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
 
     - label:
           "Step 11: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
-
-          Via the TH (chip-tool), Verify the DUT sends ArmFailSafe with timeout as 0 secs to the TH.
-
-          [1657626058.290176][2767:2772] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657626058.290276][2767:2772] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657626058.290399][2767:2772] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657626058.290501][2767:2772] CHIP:TOO:     errorCode: 0
-          [1657626058.290560][2767:2772] CHIP:TOO:     debugText:
-          [1657626058.290613][2767:2772] CHIP:TOO:    }
-          [1657626058.290699][2767:2772] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
-    - label: "Step 12: TH reads Networks attribute from the DUT"
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 0
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
+
+    - label: "Step 12: TH reads Networks attribute from the DUT'"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should be as PIXIT.CNET .THREAD_1 ST_OPERA TIONALDA TASET.
-          -that the connected status should be the type of bool value as TRUE.
-
-          [1657790810.454838][5308:5313] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 2276799582
-          [1657790810.454996][5308:5313] CHIP:TOO:   Networks: 1 entries
-          [1657790810.455100][5308:5313] CHIP:TOO:     [1]: {
-          [1657790810.455168][5308:5313] CHIP:TOO:       NetworkID: 1850171990782922
-          [1657790810.455225][5308:5313] CHIP:TOO:       Connected: TRUE
-          [1657790810.455280][5308:5313] CHIP:TOO:      }
-          [1657790810.455479][5308:5313] CHIP:EM: Sending Standalone Ack for MessageCounter:256297954 on exchange 23059i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 13: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
-
-          Via the TH (chip-tool), Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
-
-          [1657626161.611078][2780:2785] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657626161.611183][2780:2785] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657626161.611310][2780:2785] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657626161.611412][2780:2785] CHIP:TOO:     errorCode: 0
-          [1657626161.611471][2780:2785] CHIP:TOO:     debugText:
-          [1657626161.611525][2780:2785] CHIP:TOO:    }
-          [1657626161.611613][2780:2785] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657626161.611722][2780:2785] CHIP:EM: Sending Standalone Ack for MessageCounter:216998470 on exchange 11517i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to extended PAN ID of
           PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning  remove-network hex:1850171990782922 32 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1657791030.761976][5336:5341] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1657791030.762070][5336:5341] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657791030.762217][5336:5341] CHIP:TOO:   NetworkConfigResponse: {
-          [1657791030.762314][5336:5341] CHIP:TOO:     networkingStatus: 0
-          [1657791030.762375][5336:5341] CHIP:TOO:     networkIndex: 0
-          [1657791030.762427][5336:5341] CHIP:TOO:    }
-          [1657791030.762511][5336:5341] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657791030.762608][5336:5341] CHIP:EM: Sending Standalone Ack for MessageCounter:266194732 on exchange 7795i
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
       PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning commissioning-complete 1 0
-
-          Via the TH (chip-tool), Verify the DUT sends CommissioningComplete command and the errorCode field is 0(OK).
-
-          [1657626243.485752][2795:2801] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1657626243.485947][2795:2801] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
-          [1657626243.486108][2795:2801] CHIP:TOO:   CommissioningCompleteResponse: {
-          [1657626243.486232][2795:2801] CHIP:TOO:     errorCode: 0
-          [1657626243.486293][2795:2801] CHIP:TOO:     debugText:
-          [1657626243.486368][2795:2801] CHIP:TOO:    }
-          [1657626243.486455][2795:2801] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657626243.486572][2795:2801] CHIP:EM: Sending Standalone Ack for MessageCounter:8090042 on exchange 53943i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "CommissioningComplete"
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 16: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0 to ensure the CommissioningComplete call
           properly persisted the failsafe context. This call should have no
           effect if Commissioning Complete call is handled correctly"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 0 0 62 0
-
-          Via the TH (chip-tool), Verify the DUT sends ArmFailSafe with timeout as 0 secs to the TH.
-
-
-          [1657626274.218994][2802:2807] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657626274.219096][2802:2807] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657626274.219220][2802:2807] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657626274.219322][2802:2807] CHIP:TOO:     errorCode: 0
-          [1657626274.219381][2802:2807] CHIP:TOO:     debugText:
-          [1657626274.219436][2802:2807] CHIP:TOO:    }
-          [1657626274.219522][2802:2807] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657626274.219632][2802:2807] CHIP:EM: Sending Standalone Ack for MessageCounter:52231112 on exchange 13160i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 0
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label: "Step 17: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify that the Networks attribute list has empty(0 entries).
-
-          [1657626300.861344][2808:2813] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1201757611
-          [1657626300.861492][2808:2813] CHIP:TOO:   Networks: 0 entries
-          [1657626300.861678][2808:2813] CHIP:EM: Sending Standalone Ack for MessageCounter:89835226 on exchange 41681i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              type: list
+              excludes:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 69e25476c127e1..3b67d6c9955190 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.9. [TC-CNET-4.11] [WiFi] Verification for ConnectNetwork Command
@@ -22,86 +21,122 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_WIFI
     endpoint: 0
 
-tests:
-    - label: "Preconditions"
-      verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          4. TH can connect to two valid Wi-Fi access points: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
-      disabled: true
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:47524C50726976617465"
+    PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:7A6967626565686F6D65"
+    PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS:
+        type: octet_string
+        defaultValue: "hex:70617373776f7264313233"
 
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
+tests:
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on WiFi network"
       verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
     - label:
           "Step 1: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
-
-          [1653479952.284160][30473:30478] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1653479952.284231][30473:30478] CHIP:TOO:   ArmFailSafeResponse: {
-          [1653479952.284273][30473:30478] CHIP:TOO:     errorCode: 0
-          [1653479952.284297][30473:30478] CHIP:TOO:     debugText:
-          [1653479952.284322][30473:30478] CHIP:TOO:    }
-          [1653479952.284361][30473:30478] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653479952.284425][30473:30478] CHIP:EM: Sending Standalone Ack for MessageCounter:9947639 on exchange 30687i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 2: TH reads Networks attribute from the DUT and saves the number
           of entries as 'NumNetworks'"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that contains value as PIXIT.CNET.WIFI_1ST_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as TRUE.
-
-          [1657733068.835240][7475:7480] CHIP:TOO:   Networks: 1 entries
-          [1657733068.835354][7475:7480] CHIP:TOO:     [1]: {
-          [1657733068.835434][7475:7480] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1657733068.835487][7475:7480] CHIP:TOO:       Connected: TRUE
-          [1657733068.835535][7475:7480] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          saveAs: NumNetworks
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 3: TH finds the index of the Networks list entry with NetworkID
           for PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and saves it as
           'Userwifi_netidx'"
       verification: |
-
-      disabled: true
+          TH finds the index of the Networks list entry with NetworkID for PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and saves it as 'Userwifi_netidx'
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.A0001
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your 1st network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1657290079.168208][2668:2673] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657290079.168273][2668:2673] CHIP:TOO:   NetworkConfigResponse: {
-          [1657290079.168311][2668:2673] CHIP:TOO:     networkingStatus: 0
-          [1657290079.168338][2668:2673] CHIP:TOO:     networkIndex: 0
-          [1657290079.168362][2668:2673] CHIP:TOO:    }
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label:
           "Step 5: TH sends AddOrUpdateWiFiNetwork command to the DUT with SSID
@@ -109,121 +144,125 @@ tests:
           set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS and Breadcrumb
           field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1657288838.207746][2455:2460] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1657288838.207816][2455:2460] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657288838.207935][2455:2460] CHIP:TOO:   NetworkConfigResponse: {
-          [1657288838.207990][2455:2460] CHIP:TOO:     networkingStatus: 0
-          [1657288838.208030][2455:2460] CHIP:TOO:     networkIndex: 0
-          [1657288838.208068][2455:2460] CHIP:TOO:    }
-      disabled: true
+      command: "AddOrUpdateWiFiNetwork"
+      arguments:
+          values:
+              - name: "SSID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Credentials"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS
+              - name: "breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
 
     - label: "Step 6: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that contains value as PIXIT.CNET.WIFI_2ND_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as FALSE.
-
-          [1657733345.351745][7595:7600] CHIP:TOO:   Networks: 1 entries
-          [1657733345.351888][7595:7600] CHIP:TOO:     [1]: {
-          [1657733345.351952][7595:7600] CHIP:TOO:       NetworkID: 536265655F4D6F746F
-          [1657733345.352000][7595:7600] CHIP:TOO:       Connected: FALSE
-          [1657733345.352053][7595:7600] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID,
+                          Connected: false,
+                      },
+                  ]
 
     - label:
           "Step 7: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID and Breadcrumb field
           set to 2"
-      PICS: CNET.S.C06.Rsp
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your second network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:536265655F4D6F746F 1 0 --Breadcrumb 2 (second network)
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 0 (success).
-
-          [1653479953.633815][30491:30496] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1653479953.633986][30491:30496] CHIP:TOO:   ConnectNetworkResponse: {
-          [1653479953.634133][30491:30496] CHIP:TOO:     networkingStatus: 0
-          [1653479953.634195][30491:30496] CHIP:TOO:     errorValue: null
-          [1653479953.634275][30491:30496] CHIP:TOO:    }
-          [1653479953.634367][30491:30496] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653479953.634501][30491:30496] CHIP:EM: Sending Standalone Ack for MessageCounter:490923 on exchange 21425i
-      disabled: true
+      PICS: CNET.C.C06.Tx
+      timedInteractionTimeoutMs: 5000
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 2
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
+              - name: "ErrorValue"
+                constraints:
+                    type: int32s
 
     - label:
           "Step 8: TH changes its WiFi connection to
           PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID"
       verification: |
           Make sure TH also joins the 2nd Wifi network to have a connectivity to the DUT.
-      disabled: true
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 9: TH discovers and connects to DUT on the
           PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID operational network"
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that contains value as PIXIT.CNET.WIFI_2ND_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as TRUE.
-
-          [1657733596.457792][7640:7645] CHIP:TOO:   Networks: 1 entries
-          [1657733596.457867][7640:7645] CHIP:TOO:     [1]: {
-          [1657733596.457906][7640:7645] CHIP:TOO:       NetworkID: 536265655F4D6F746F
-          [1657733596.457940][7640:7645] CHIP:TOO:       Connected: TRUE
-          [1657733596.457972][7640:7645] CHIP:TOO:      }
-      disabled: true
+      PICS: CNET.S.A0001
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 10: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
       PICS: CNET.S.C06.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 2.
-
-          [1657733618.370511][7653:7658] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2956231097
-          [1657733618.370581][7653:7658] CHIP:TOO:   Breadcrumb: 2
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 2
+          constraints:
+              type: int64u
 
     - label:
           "Step 11: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0. This forcibly disarms the fail-safe and
           is expected to cause the changes of configuration to
           NetworkCommissioning cluster done so far to be reverted."
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 0 secs to the TH.
-
-          [1657289119.775902][2519:2524] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657289119.775973][2519:2524] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657289119.776050][2519:2524] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657289119.776102][2519:2524] CHIP:TOO:     errorCode: 0
-          [1657289119.776141][2519:2524] CHIP:TOO:     debugText:
-          [1657289119.776177][2519:2524] CHIP:TOO:    }
-      disabled: true
-
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 0
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/26848
     - label:
           "Step 12 & 13: TH changes its WiFi connection to
-          PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and TH discovers and connects to
-          DUT on the PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID operational network"
+          PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID, TH discovers and connects to DUT
+          on the PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID operational network"
+      PICS: CNET.S.A0001 && PICS_USER_PROMPT
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
@@ -238,46 +277,47 @@ tests:
           [1684497703.596697][3941:3943] CHIP:TOO:       Connected: FALSE
           [1684497703.596721][3941:3943] CHIP:TOO:      }
           [1684497703.596882][3941:3943] CHIP:EM: <<< [E:51584i S:48726 M:88313254 (Ack:206238679)] (S) Msg TX to 1:0000000000000001 [3A8F] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 14: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 0 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout of 900 secs to the TH.
-
-          [1657289228.311622][2529:2534] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657289228.311668][2529:2534] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657289228.311721][2529:2534] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657289228.311758][2529:2534] CHIP:TOO:     errorCode: 0
-          [1657289228.311783][2529:2534] CHIP:TOO:     debugText:
-          [1657289228.311806][2529:2534] CHIP:TOO:    }
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
 
     - label:
           "Step 15: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1684497783.207292][4010:4012] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1684497783.207338][4010:4012] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1684497783.207481][4010:4012] CHIP:TOO:   NetworkConfigResponse: {
-          [1684497783.207531][4010:4012] CHIP:TOO:     networkingStatus: 0
-          [1684497783.207555][4010:4012] CHIP:TOO:     networkIndex: 0
-          [1684497783.207578][4010:4012] CHIP:TOO:    }
-          [1684497783.207635][4010:4012] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1684497783.207723][4010:4012] CHIP:EM: <<< [E:60874i S:60117 M:37627612 (Ack:227520870)] (S) Msg TX to 1:
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label:
           "Step 16: TH sends AddOrUpdateWiFiNetwork command to the DUT with SSID
@@ -285,96 +325,107 @@ tests:
           set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS and Breadcrumb
           field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1657734444.832145][7736:7741] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657734444.832215][7736:7741] CHIP:TOO:   NetworkConfigResponse: {
-          [1657734444.832251][7736:7741] CHIP:TOO:     networkingStatus: 0
-          [1657734444.832277][7736:7741] CHIP:TOO:     networkIndex: 0
-          [1657734444.832299][7736:7741] CHIP:TOO:    }
-          [1657734444.832335][7736:7741] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "AddOrUpdateWiFiNetwork"
+      arguments:
+          values:
+              - name: "SSID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Credentials"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS
+              - name: "breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
 
     - label:
           "Step 17: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID and Breadcrumb field
           set to 3"
       PICS: CNET.S.C06.Rsp && CNET.S.C07.Tx
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-          Below is an example:
-          ./chip-tool networkcommissioning connect-network hex:536265655F4D6F746F 1 0 --Breadcrumb 3 (second network)
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 0 (success).
-
-          [1657734624.698518][7768:7773] CHIP:TOO:   ConnectNetworkResponse: {
-          [1657734624.698601][7768:7773] CHIP:TOO:     networkingStatus: 0
-          [1657734624.698661][7768:7773] CHIP:TOO:     errorValue: null
-          [1657734624.698740][7768:7773] CHIP:TOO:    }
-      disabled: true
+      command: "ConnectNetwork"
+      timedInteractionTimeoutMs: 5000
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 3
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
+              - name: "ErrorValue"
+                constraints:
+                    type: int32s
 
     - label:
-          "Step 18 & 19: TH changes its WiFi connection to
-          PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID and TH discovers and connects to
-          DUT on the PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID operational network"
+          "Step 18: TH changes its WiFi connection to
+          PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID"
       verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that contains value as PIXIT.CNET.WIFI_2ND_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as TRUE.
+          Make sure TH also joins the 2nd Wifi network to have a connectivity to the DUT.
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
-          [1657733596.457792][7640:7645] CHIP:TOO:   Networks: 1 entries
-          [1657733596.457867][7640:7645] CHIP:TOO:     [1]: {
-          [1657733596.457906][7640:7645] CHIP:TOO:       NetworkID: 536265655F4D6F746F
-          [1657733596.457940][7640:7645] CHIP:TOO:       Connected: TRUE
-          [1657733596.457972][7640:7645] CHIP:TOO:      }
-      disabled: true
+    - label:
+          "Step 19: TH discovers and connects to DUT on the
+          PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID operational network"
+      PICS: CNET.S.A0001
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 20: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
       PICS: CNET.S.C06.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 3.
-
-          [1657734757.740003][7793:7798] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2956231102
-          [1657734757.740140][7793:7798] CHIP:TOO:   Breadcrumb: 3
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 3
+          constraints:
+              type: int64u
 
     - label: "Step 21: TH sends the CommissioningComplete command to the DUT"
-      verification: |
-          ./chip-tool generalcommissioning commissioning-complete 1 0
-
-          Via the TH (chip-tool), Verify the DUT sends CommissioningComplete command and the errorCode field is 0(OK).
-
-          [1657734803.411199][7802:7808] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
-          [1657734803.411256][7802:7808] CHIP:TOO:   CommissioningCompleteResponse: {
-          [1657734803.411306][7802:7808] CHIP:TOO:     errorCode: 0
-          [1657734803.411333][7802:7808] CHIP:TOO:     debugText:
-          [1657734803.411356][7802:7808] CHIP:TOO:    }
-      disabled: true
-
-    - label: "Step 23: TH reads Networks attribute from the DUT"
+      cluster: "General Commissioning"
+      command: "CommissioningComplete"
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
+
+    - label: "Step 22: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should be as PIXIT.CNET.WIFI_2ND_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as TRUE.
-
-          [1657734855.925075][7819:7824] CHIP:TOO:   Networks: 1 entries
-          [1657734855.925147][7819:7824] CHIP:TOO:     [1]: {
-          [1657734855.925185][7819:7824] CHIP:TOO:       NetworkID: 536265655F4D6F746F
-          [1657734855.925215][7819:7824] CHIP:TOO:       Connected: TRUE
-          [1657734855.925243][7819:7824] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
index df0a9776df37f5..ec89cc137f89e4 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.13. [TC-CNET-4.15] [WiFi] NetworkIDNotFound value as
@@ -22,81 +21,126 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_WIFI
     endpoint: 0
 
+    PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:7A6967626565686F6D65"
+
 tests:
-    - label: "Preconditions"
+    - label: "Precondition: DUT is factory reset"
       verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is factory reset
-          4. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          5. TH can communicate with the DUT
-          6. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
-      disabled: true
-
-    - label:
-          "Step 1: TH sends ArmFailSafe command to the DUT with the
-          ExpiryLengthSeconds field set to 900"
+          Reset Devices to factory defaults
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Factory Reset the DUT and enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on WiFi network"
       verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 0 1 0
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH with error code 0.
+    - label:
+          "Precondition: DUT MaxNetworks attribute value is at least 1 and is
+          saved as 'MaxNetworksValue' for future use"
+      PICS: CNET.S.A0000
+      command: "readAttribute"
+      attribute: "MaxNetworks"
+      response:
+          saveAs: MaxNetworksValue
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
-          [1650383264.543046][44233:44238] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650383264.543109][44233:44238] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650383264.543212][44233:44238] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650383264.543275][44233:44238] CHIP:TOO:     errorCode: 0
-          [1650383264.543313][44233:44238] CHIP:TOO:     debugText:
-          [1650383264.543348][44233:44238] CHIP:TOO:    }
-          [1650383264.543402][44233:44238] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650383264.543470][44233:44238] CHIP:EM: Sending Standalone Ack for MessageCounter:6293749 on exchange 65264i
-      disabled: true
+    - label:
+          "Step 1: TH sends ArmFailSafe command to the DUT with
+          ExpiryLengthSeconds set to 900"
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 2: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID, which does not
           match the provisioned network, and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 3 (NetworkIDNotFound).
-
-          [1650383270.888700][44239:44244] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650383270.888774][44239:44244] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650383270.888876][44239:44244] CHIP:TOO:   NetworkConfigResponse: {
-          [1650383270.888952][44239:44244] CHIP:TOO:     networkingStatus: 3
-          [1650383270.888992][44239:44244] CHIP:TOO:    }
-          [1650383270.889044][44239:44244] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650383270.889125][44239:44244] CHIP:EM: Sending Standalone Ack for MessageCounter:4715093 on exchange 59014i
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
 
     - label:
           "Step 3: TH sends ConnectNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID, which does not
           match the provisioned network, and Breadcrumb field set to 1"
       PICS: CNET.S.C06.Rsp && CNET.S.C07.Tx
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 3 (NetworkIDNotFound).
-
-          [1650383278.349428][44245:44250] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1650383278.349490][44245:44250] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1650383278.349592][44245:44250] CHIP:TOO:   ConnectNetworkResponse: {
-          [1650383278.349656][44245:44250] CHIP:TOO:     networkingStatus: 3
-          [1650383278.349693][44245:44250] CHIP:TOO:     errorValue: 0
-          [1650383278.349727][44245:44250] CHIP:TOO:    }
-          [1650383278.349782][44245:44250] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650383278.349847][44245:44250] CHIP:EM: Sending Standalone Ack for MessageCounter:11070796 on exchange 31080i
-      disabled: true
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
+              - name: "ErrorValue"
+                constraints:
+                    type: int32s
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
index 102e7f809ff4fe..36fa1ca62ceb30 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.14. [TC-CNET-4.16] [Thread] NetworkIDNotFound value as
@@ -22,37 +21,97 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_THREAD
     endpoint: 0
 
+    PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET:
+        type: octet_string
+        defaultValue: "hex:1111111122222222"
+
 tests:
-    - label: "Preconditions"
+    - label: "Precondition : Factory reset the DUT"
       verification: |
-          1. DUT supports CNET.S.F01(TH)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
-          3. DUT is factory reset
-          4. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          5. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          6. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
-      disabled: true
-
-    - label:
-          "Step 1: TH sends ArmFailSafe command to the DUT with the
-          ExpiryLengthSeconds field set to 900"
+          Reset Devices to factory defaults
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Factory Reset the DUT and enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on Thread network "
       verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 0 54 0
+          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
+
+          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
+          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
+          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
+          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
+          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
+          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
+          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
+          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
+          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
+          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after successfull Commission"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 2
+          constraints:
+              type: bitmap32
 
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
+    - label:
+          "Precondition: DUT MaxNetworks attribute value is at least 1 and is
+          saved as 'MaxNetworksValue' for future use"
+      PICS: CNET.S.A0000
+      command: "readAttribute"
+      attribute: "MaxNetworks"
+      response:
+          saveAs: MaxNetworksValue
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
-          [1650392597.976230][10152:10157] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650392597.976363][10152:10157] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650392597.976539][10152:10157] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650392597.976665][10152:10157] CHIP:TOO:     errorCode: 0
-          [1650392597.976729][10152:10157] CHIP:TOO:     debugText:
-          [1650392597.976785][10152:10157] CHIP:TOO:    }
-          [1650392597.976874][10152:10157] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650392597.976987][10152:10157] CHIP:EM: Sending Standalone Ack for MessageCounter:10494017 on exchange 14665i
-      disabled: true
+    - label:
+          "Step 1: TH sends ArmFailSafe command to the DUT with
+          ExpiryLengthSeconds set to 900"
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 2: TH sends RemoveNetwork Command to the DUT with NetworkID
@@ -60,27 +119,17 @@ tests:
           PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET, which does not match the
           commissioned network, and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network 2111111122222222 54 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 3 (NetworkIDNotFound).
-
-          [1683268296.896031][12131:12134] CHIP:DMG:         InteractionModelRevision = 1
-          [1683268296.896239][12131:12134] CHIP:DMG: },
-          [1683268296.896474][12131:12134] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1683268296.897219][12131:12134] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1683268296.897526][12131:12134] CHIP:TOO:   NetworkConfigResponse: {
-          [1683268296.897745][12131:12134] CHIP:TOO:     networkingStatus: 3
-          [1683268296.898546][12131:12134] CHIP:TOO:    }
-          [1683268296.898769][12131:12134] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1683268296.901995][12131:12134] CHIP:EM: <<< [E:60271i S:53927 M:99281930 (Ack:250739545)] (S) Msg TX to 1:0000000000000036 [345E] --- Type 0000:10 (SecureChannel:StandaloneAck)
-          [1683268296.903001][12131:12134] CHIP:IN: (S) Sending msg 99281930 on secure session with LSID: 53927
-          [1683268296.905843][12131:12134] CHIP:EM: Flushed pending ack for MessageCounter:250739545 on exchange 60271i
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
 
     - label:
           "Step 3: TH sends ConnectNetwork Command to the DUT with NetworkID
@@ -88,20 +137,14 @@ tests:
           PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET, which does not match the
           commissioned network, and Breadcrumb field set to 1"
       PICS: CNET.S.C06.Rsp && CNET.S.C07.Tx
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network 47524C50726976617465 54 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 3 (NetworkIDNotFound).
-
-          [1650392982.606392][10188:10193] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1650392982.606501][10188:10193] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1650392982.606653][10188:10193] CHIP:TOO:   ConnectNetworkResponse: {
-          [1650392982.606753][10188:10193] CHIP:TOO:     networkingStatus: 3
-          [1650392982.606815][10188:10193] CHIP:TOO:     errorValue: 0
-          [1650392982.606872][10188:10193] CHIP:TOO:    }
-          [1650392982.606960][10188:10193] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
index 2fa7fd06383799..7b60871fdbc6e3 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.2. [TC-CNET-4.2] [Thread] Verification for attributes check
@@ -22,217 +21,175 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_THREAD
     endpoint: 0
+    PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET:
+        type: octet_string
+        defaultValue: "hex:1111111122222222"
 
 tests:
-    - label: "Preconditions"
-      verification: |
-          1. DUT supports CNET.S.F01(TH)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
-          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-      disabled: true
-
     - label: "Step 1: Factory reset the DUT"
       verification: |
-
-      disabled: true
-
+          Reset Devices to factory defaults
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Factory Reset the DUT and enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
     - label: "Step 2: Commission TH and DUT on Thread network"
       verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
+
+          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
+          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
+          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
+          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
+          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
+          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
+          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
+          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
+          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
+          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after successfull Commission"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 3: TH reads Descriptor Cluster from the DUT with EP0 TH reads
           ServerList from the DUT"
-      verification: |
-          ./chip-tool descriptor read server-list 54 0
-
-          Via the TH (chip-tool), verify that the server list has value as 49.
-
-          [1686293236.629388][3601:3603] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 3777417155
-          [1686293236.629594][3601:3603] CHIP:TOO:   ServerList: 28 entries
-          [1686293236.629688][3601:3603] CHIP:TOO:     [1]: 3
-          [1686293236.629749][3601:3603] CHIP:TOO:     [2]: 4
-          [1686293236.629807][3601:3603] CHIP:TOO:     [3]: 29
-          [1686293236.629876][3601:3603] CHIP:TOO:     [4]: 30
-          [1686293236.629935][3601:3603] CHIP:TOO:     [5]: 31
-          [1686293236.629991][3601:3603] CHIP:TOO:     [6]: 40
-          [1686293236.630048][3601:3603] CHIP:TOO:     [7]: 42
-          [1686293236.630106][3601:3603] CHIP:TOO:     [8]: 43
-          [1686293236.630190][3601:3603] CHIP:TOO:     [9]: 44
-          [1686293236.630253][3601:3603] CHIP:TOO:     [10]: 45
-          [1686293236.630311][3601:3603] CHIP:TOO:     [11]: 46
-          [1686293236.630367][3601:3603] CHIP:TOO:     [12]: 47
-          [1686293236.630424][3601:3603] CHIP:TOO:     [13]: 48
-          [1686293236.630481][3601:3603] CHIP:TOO:     [14]: 49
-          [1686293236.630538][3601:3603] CHIP:TOO:     [15]: 50
-          [1686293236.630604][3601:3603] CHIP:TOO:     [16]: 51
-          [1686293236.630662][3601:3603] CHIP:TOO:     [17]: 52
-          [1686293236.630718][3601:3603] CHIP:TOO:     [18]: 53
-          [1686293236.630775][3601:3603] CHIP:TOO:     [19]: 54
-          [1686293236.630831][3601:3603] CHIP:TOO:     [20]: 55
-          [1686293236.630888][3601:3603] CHIP:TOO:     [21]: 60
-          [1686293236.630944][3601:3603] CHIP:TOO:     [22]: 62
-          [1686293236.631002][3601:3603] CHIP:TOO:     [23]: 63
-          [1686293236.631058][3601:3603] CHIP:TOO:     [24]: 64
-          [1686293236.631114][3601:3603] CHIP:TOO:     [25]: 65
-          [1686293236.631171][3601:3603] CHIP:TOO:     [26]: 70
-          [1686293236.631227][3601:3603] CHIP:TOO:     [27]: 1029
-          [1686293236.631285][3601:3603] CHIP:TOO:     [28]: 4294048774
-          [1686293236.631613][3601:3603] CHIP:EM: <<< [E:2627i S:46052 M:27080745 (Ack:161764674)] (S) Msg TX to 1:0000000000000037 [8709] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [49]
 
     - label: "Step 4: TH reads FeatureMap attribute from the DUT"
-      verification: |
-          ./chip-tool networkcommissioning read feature-map 54 0
-
-          Via the TH (chip-tool), verify that FeatureMap attribute value as 2 for Thread NetworkInterface.
-
-          [1645772204.502545][3809:3814] CHIP:DMG:         SuppressResponse = true,
-          [1645772204.502608][3809:3814] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772204.502683][3809:3814] CHIP:DMG: }
-          [1645772204.503195][3809:3814] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFCDataVersion: 92121563
-          [1645772204.503398][3809:3814] CHIP:TOO:   FeatureMap: 2
-          [1645772204.503556][3809:3814] CHIP:EM: Sending Standalone Ack for MessageCounter:5988746 on exchange 46140i
-      disabled: true
-
-    - label: "Step 5: TH reads the MaxNetworks attribute from the DUT"
-      PICS: CNET.S.A0000
-      verification: |
-          ./chip-tool networkcommissioning read max-networks 54 0
-
-          Via the TH (chip-tool), Verify the MaxNetworks attribute that contains value in the range of 1 to 255.
-
-          [1645772548.257320][3837:3842] CHIP:DMG:         SuppressResponse = true,
-          [1645772548.257381][3837:3842] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772548.257437][3837:3842] CHIP:DMG: }
-          [1645772548.257735][3837:3842] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 92121563
-          [1645772548.257878][3837:3842] CHIP:TOO:   MaxNetworks: 1
-          [1645772548.258032][3837:3842] CHIP:EM: Sending Standalone Ack for MessageCounter:7388528 on exchange 41499i
-      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 2
+          constraints:
+              type: bitmap32
 
     - label:
-          "Step 6: TH saves the MaxNetworks attribute value as
-          'MaxNetworksValue' for future use"
-      verification: |
-          TH1 saves the MaxNetworks attribute value
-      disabled: true
+          "Step 5 & 6: TH reads the MaxNetworks attribute from the DUT. TH saves
+          the MaxNetworks attribute value as 'MaxNetworksValue' for future use"
+      PICS: CNET.S.A0000
+      command: "readAttribute"
+      attribute: "MaxNetworks"
+      response:
+          saveAs: MaxNetworksValue
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
     - label: "Step 7: TH reads the Networks attribute list from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 54 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should be type of octstr with a length range 1 to 32.
-          -that the connected status is in the type of bool value as TRUE.
-
-          [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
-          [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772651.445209][3856:3861] CHIP:DMG: }
-          [1645772651.445754][3856:3861] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 92121563
-          [1645772651.445875][3856:3861] CHIP:TOO:   Networks: 1 entries
-          [1645772651.446057][3856:3861] CHIP:TOO:     [1]: {
-          [1645772651.446120][3856:3861] CHIP:TOO:       NetworkID: 1111161622222211
-          [1645772651.446173][3856:3861] CHIP:TOO:       Connected: TRUE
-          [1645772651.446228][3856:3861] CHIP:TOO:      }
-          [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
 
     - label: "Step 8: TH reads ScanMaxTimeSeconds attribute from the DUT"
       PICS: CNET.S.A0002
-      verification: |
-          ./chip-tool networkcommissioning read scan-max-time-seconds 54 0
-
-          Via the TH (chip-tool), Verify the ScanMaxTimeSeconds attribute that contains value in the range of 1 to 255 secs.
-
-          [1645772820.740795][3867:3872] CHIP:DMG:         SuppressResponse = true,
-          [1645772820.740855][3867:3872] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772820.740903][3867:3872] CHIP:DMG: }
-          [1645772820.741209][3867:3872] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002DataVersion: 92121563
-          [1645772820.741357][3867:3872] CHIP:TOO:   ScanMaxTimeSeconds: 10
-          [1645772820.741512][3867:3872] CHIP:EM: Sending Standalone Ack for MessageCounter:10309775 on exchange 55305i
-      disabled: true
-
-    - label: "Step 9: TH reads ConnectMaxTimeSeconds Attribute from the DUT"
+      command: "readAttribute"
+      attribute: "ScanMaxTimeSeconds"
+      response:
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
+
+    - label: "Step 9: TH reads ConnectMaxTimeSeconds attribute from the DUT"
       PICS: CNET.S.A0003
-      verification: |
-          ./chip-tool networkcommissioning read connect-max-time-seconds 54 0
-
-          Via the TH (chip-tool), Verify the ConnectMaxTimeSeconds attribute that contains value in the range of 1 to 255 secs.
-
-          [1645772901.118880][3879:3884] CHIP:DMG:         SuppressResponse = true,
-          [1645772901.119008][3879:3884] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772901.119141][3879:3884] CHIP:DMG: }
-          [1645772901.119684][3879:3884] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003DataVersion: 92121563
-          [1645772901.119885][3879:3884] CHIP:TOO:   ConnectMaxTimeSeconds: 20
-          [1645772901.120100][3879:3884] CHIP:EM: Sending Standalone Ack for MessageCounter:11917538 on exchange 4188
-      disabled: true
+      command: "readAttribute"
+      attribute: "ConnectMaxTimeSeconds"
+      response:
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
     - label: "Step 10: TH reads InterfaceEnabled attribute from the DUT"
       PICS: CNET.S.A0004
-      verification: |
-          ./chip-tool networkcommissioning read interface-enabled 54 0
-
-          Via the TH (chip-tool), Verify the InterfaceEnabled attribute that contains bool value as True.
-
-          [1645772984.653996][3895:3900] CHIP:DMG:         SuppressResponse = true,
-          [1645772984.654043][3895:3900] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772984.654084][3895:3900] CHIP:DMG: }
-          [1645772984.654310][3895:3900] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004DataVersion: 92121563
-          [1645772984.654388][3895:3900] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1645772984.654530][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:14026610 on exchange 33717i
-      disabled: true
+      command: "readAttribute"
+      attribute: "InterfaceEnabled"
+      response:
+          value: true
+          constraints:
+              type: boolean
 
     - label: "Step 11: TH reads LastNetworkingStatus attribute from the DUT"
       PICS: CNET.S.A0005
-      verification: |
-          ./chip-tool networkcommissioning read last-networking-status 54 0
-
-          Via the TH (chip-tool), Verify the LastNetworkingStatus attribute that contains value as 0 that mentions success.
-
-          [1645773078.930516][3905:3910] CHIP:DMG:         SuppressResponse = true,
-          [1645773078.930579][3905:3910] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773078.930635][3905:3910] CHIP:DMG: }
-          [1645773078.930943][3905:3910] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 92121563
-          [1645773078.931067][3905:3910] CHIP:TOO:   LastNetworkingStatus: 0
-          [1645773078.931217][3905:3910] CHIP:EM: Sending Standalone Ack for MessageCounter:16576011 on exchange 44187i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkingStatus"
+      response:
+          value: 0
+          constraints:
+              type: NetworkCommissioningStatusEnum
 
     - label:
-          "Step 12: TH reads the LastNetworkID attribute from the DUT TH reads
+          "Step 12a: TH reads the LastNetworkID attribute from the DUT. TH reads
           the Networks attribute from the DUT"
       PICS: CNET.S.A0006
-      verification: |
-          ./chip-tool networkcommissioning read last-network-id 54 0
-
-          Via the TH (chip-tool), Verify:
-          -that the LastNetworkID attribute that contains NetworkID that should be type of octstr with a length range 1 to 32.
-          -if the Networks attribute list is Empty, then LastNetworkID attribute value is null.
-
-          [1645773167.178501][3913:3918] CHIP:DMG:         SuppressResponse = true,
-          [1645773167.178561][3913:3918] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773167.178618][3913:3918] CHIP:DMG: }
-          [1645773167.178919][3913:3918] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006DataVersion: 92121563
-          [1645773167.182241][3913:3918] CHIP:TOO:   LastNetworkID: 1111161622222211
-          [1645773167.182422][3913:3918] CHIP:EM: Sending Standalone Ack for MessageCounter:2029571 on exchange 18566i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkID"
+      response:
+          value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          constraints:
+              type: octet_string
+              minLength: 1
+              maxLength: 32
+
+    - label: "Step 12b: TH reads the Networks attribute list from the DUT"
+      PICS: CNET.S.A0001
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 13: TH reads the LastConnectErrorValue attribute from the DUT"
       PICS: CNET.S.A0007
-      verification: |
-          ./chip-tool networkcommissioning read last-connect-error-value 54 0
-
-          Via the TH (chip-tool), Verify the LastConnectErrorValue attribute that contains value as null.
-
-          [1645773318.752774][3938:3943] CHIP:DMG:         SuppressResponse = true,
-          [1645773318.752861][3938:3943] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773318.753043][3938:3943] CHIP:DMG: }
-          [1645773318.753543][3938:3943] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 92121563
-          [1645773318.753724][3938:3943] CHIP:TOO:   LastConnectErrorValue: null
-          [1645773318.753985][3938:3943] CHIP:EM: Sending Standalone Ack for MessageCounter:15303417 on exchange 41937i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastConnectErrorValue"
+      response:
+          value: null
+          constraints:
+              type: int32s
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
index 1446d5ccb4bb43..1484d0738baf74 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
@@ -119,7 +119,7 @@ tests:
     - label: "Step 3: DUT sends the AddOrUpdateWiFiNetwork command to the TH"
       PICS: CNET.C.C02.Tx
       verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> <password> 1 0
 
           Below is an example:
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
index 410a4ca2b56751..b8e82aced329fc 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     4.4.20. [TC-CNET-4.22] [Thread] Verification for ScanNetworks command
@@ -22,179 +21,212 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_THREAD
     endpoint: 0
+    PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET:
+        type: octet_string
+        defaultValue: "hex:1111111122222222"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on Thread network "
       verification: |
-          1. DUT supports CNET.S.F01(TH)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
-          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-      disabled: true
+          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
+
+          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
+          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
+          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
+          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
+          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
+          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
+          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
+          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
+          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
+          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 1: TH sends ScanNetworks command to the DUT with the SSID field
           omitted and the Breadcrumb field set to 1"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
-      verification: |
-          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 1
+      command: "ScanNetworks"
+      arguments:
+          values:
+              - name: "SSID"
+                value: ""
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                constraints:
+                    anyOf: [0, 1, 5, 6, 12]
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
+              - name: "ThreadScanResults"
+                constraints:
+                    type: list
 
+    - label:
+          "Step 1: Verify each element in the ThreadScanResults list will have
+          the following fields:"
+      verification: |
           Via the TH (all-clusters-app), verify:
-          -the NetworkingStatus value as 0 that mentions success.
-          -the PanId value is in the range of 0 to 65534.
-          -the ExtendedPanId value is type of uint64.
-          -the NetworkName value is type of string with a size of 1 to 16 bytes.
-          -the Channel is type of uint16 with range 0 to 65535.
-          -the version value is type of uint8(0 to 255).
-          -the ExtendedAddress is a hwaddr with a size of 8 bytes
-          -the RSSI is of type int8 with a range of -120 to 0.
-          -the LQI is type of uint8(0 to 255).
-
-          [1658297246.000815][7679:7684] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
-          [1658297246.001029][7679:7684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1658297246.001190][7679:7684] CHIP:TOO:   ScanNetworksResponse: {
-          [1658297246.001270][7679:7684] CHIP:TOO:     networkingStatus: 0
-          [1658297246.001357][7679:7684] CHIP:TOO:     threadScanResults: 1 entries
-          [1658297246.001485][7679:7684] CHIP:TOO:       [1]: {
-          [1658297246.001548][7679:7684] CHIP:TOO:         PanId: 64206
-          [1658297246.001607][7679:7684] CHIP:TOO:         ExtendedPanId: 3861484836749312
-          [1658297246.001665][7679:7684] CHIP:TOO:         NetworkName: GRL
-          [1658297246.001721][7679:7684] CHIP:TOO:         Channel: 11
-          [1658297246.001777][7679:7684] CHIP:TOO:         Version: 4
-          [1658297246.001841][7679:7684] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
-          [1658297246.001900][7679:7684] CHIP:TOO:         Rssi: -81
-          [1658297246.001955][7679:7684] CHIP:TOO:         Lqi: 48
-          [1658297246.002010][7679:7684] CHIP:TOO:        }
-          [1658297246.002070][7679:7684] CHIP:TOO:    }
-          [1658297246.002181][7679:7684] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1658297246.002298][7679:7684] CHIP:EM: Sending Standalone Ack for MessageCounter:124278362 on exchange 24525i
-      disabled: true
+             -the PanId value is in the range of 0 to 65534.
+             -the ExtendedPanId value is type of uint64.
+             -the NetworkName value is type of string with a size of 1 to 16 bytes.
+             -the Channel is type of uint16 with range 0 to 65535.
+             -the version value is type of uint8(0 to 255).
+             -the ExtendedAddress is a hwaddr with a size of 8 bytes
+             -the RSSI is of type int8 with a range of -120 to 0.
+             -the LQI is type of uint8(0 to 255).
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 2: TH reads Breadcrumb attribute from the General Commissioning
           Cluster"
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 54 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657688310.986593][1613:1618] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 829017612
-          [1657688310.989412][1613:1618] CHIP:TOO:   Breadcrumb: 1
-          [1657688310.989586][1613:1618] CHIP:EM: Sending Standalone Ack for MessageCounter:63605306 on exchange 55886i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
+          constraints:
+              type: int64u
 
     - label:
           "Step 3: TH sends ScanNetworks command to the DUT with the SSID field
           set to null and the Breadcrumb field set to 2"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
-      verification: |
-          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 2
+      command: "ScanNetworks"
+      arguments:
+          values:
+              - name: "SSID"
+                value: null
+              - name: "Breadcrumb"
+                value: 2
+      response:
+          values:
+              - name: "NetworkingStatus"
+                constraints:
+                    anyOf: [0, 1, 5, 6, 12]
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
+              - name: "ThreadScanResults"
+                constraints:
+                    type: list
 
+    - label:
+          "Step 3: Verify each element in the ThreadScanResults list will have
+          the following fields:"
+      verification: |
           Via the TH (all-clusters-app), verify:
-          -the NetworkingStatus value as 0 that mentions success.
-          -the PanId value is in the range of 0 to 65534.
-          -the ExtendedPanId value is type of uint64.
-          -the NetworkName value is type of string with a size of 1 to 16 bytes.
-          -the Channel is type of uint16 with range 0 to 65535.
-          -the version value is type of uint8(0 to 255).
-          -the ExtendedAddress is a hwaddr with a size of 8 bytes
-          -the RSSI is of type int8 with a range of -120 to 0.
-          -the LQI is type of uint8(0 to 255).
-
-          [1658297283.141075][7695:7700] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
-          [1658297283.141183][7695:7700] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1658297283.141356][7695:7700] CHIP:TOO:   ScanNetworksResponse: {
-          [1658297283.141438][7695:7700] CHIP:TOO:     networkingStatus: 0
-          [1658297283.141534][7695:7700] CHIP:TOO:     threadScanResults: 2 entries
-          [1658297283.141663][7695:7700] CHIP:TOO:       [1]: {
-          [1658297283.141729][7695:7700] CHIP:TOO:         PanId: 64206
-          [1658297283.141788][7695:7700] CHIP:TOO:         ExtendedPanId: 3861484836749312
-          [1658297283.141847][7695:7700] CHIP:TOO:         NetworkName: GRL
-          [1658297283.141904][7695:7700] CHIP:TOO:         Channel: 11
-          [1658297283.141961][7695:7700] CHIP:TOO:         Version: 4
-          [1658297283.142023][7695:7700] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
-          [1658297283.142079][7695:7700] CHIP:TOO:         Rssi: -80
-          [1658297283.142134][7695:7700] CHIP:TOO:         Lqi: 52
-          [1658297283.142188][7695:7700] CHIP:TOO:        }
-          [1658297283.142271][7695:7700] CHIP:TOO:       [2]: {
-          [1658297283.142331][7695:7700] CHIP:TOO:         PanId: 64206
-          [1658297283.142386][7695:7700] CHIP:TOO:         ExtendedPanId: 3861484836749312
-          [1658297283.142443][7695:7700] CHIP:TOO:         NetworkName: GRL
-          [1658297283.142500][7695:7700] CHIP:TOO:         Channel: 11
-          [1658297283.142551][7695:7700] CHIP:TOO:         Version: 4
-          [1658297283.142609][7695:7700] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
-          [1658297283.142665][7695:7700] CHIP:TOO:         Rssi: -83
-          [1658297283.142718][7695:7700] CHIP:TOO:         Lqi: 44
-          [1658297283.142771][7695:7700] CHIP:TOO:        }
-          [1658297283.142828][7695:7700] CHIP:TOO:    }
-          [1658297283.142958][7695:7700] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1658297283.143074][7695:7700] CHIP:EM: Sending Standalone Ack for MessageCounter:115607423 on exchange 55136i
-      disabled: true
+             -the PanId value is in the range of 0 to 65534.
+             -the ExtendedPanId value is type of uint64.
+             -the NetworkName value is type of string with a size of 1 to 16 bytes.
+             -the Channel is type of uint16 with range 0 to 65535.
+             -the version value is type of uint8(0 to 255).
+             -the ExtendedAddress is a hwaddr with a size of 8 bytes
+             -the RSSI is of type int8 with a range of -120 to 0.
+             -the LQI is type of uint8(0 to 255).
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 4: TH reads Breadcrumb attribute from the General Commissioning
           Cluster"
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 54 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 2.
-
-          [1657688397.398564][1626:1631] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 829017613
-          [1657688397.398697][1626:1631] CHIP:TOO:   Breadcrumb: 2
-          [1657688397.398852][1626:1631] CHIP:EM: Sending Standalone Ack for MessageCounter:129342305 on exchange 25970i
-      disabled: true
-
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 2
+          constraints:
+              type: int64u
     - label:
           "Step 5: TH sends ScanNetworks command to the DUT with the SSID field
           set to a random string of ASCII characters with a size of between 1
           and 31 characters and the Breadcrumb field set to 3"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
-      verification: |
-          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 3
+      command: "ScanNetworks"
+      arguments:
+          values:
+              - name: "SSID"
+                value: "hex:1111111522222222"
+              - name: "Breadcrumb"
+                value: 3
+      response:
+          values:
+              - name: "NetworkingStatus"
+                constraints:
+                    anyOf: [0, 1, 5, 6, 12]
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
+              - name: "ThreadScanResults"
+                constraints:
+                    type: list
 
+    - label:
+          "Step 5: Verify each element in the ThreadScanResults list will have
+          the following fields:"
+      verification: |
           Via the TH (all-clusters-app), verify:
-          -the NetworkingStatus value should be as 0 that mentions success.
-          -the PanId value should be with in the range of 0 to 65534.
-          -the ExtendedPanId value is type of uint64.
-          -the NetworkName value is type of string with a size of 1 to 16 bytes.
-          -the Channel is type of uint16 with range 0 to 65535.
-          -the version value is type of uint8(0 to 255).
-          -the ExtendedAddress is a hwaddr with a size of 8 bytes
-          -the RSSI is of type int8 with a range of -120 to 0.
-          -the LQI is type of uint8(0 to 255).
-
-          [1658297312.201709][7708:7713] CHIP:DMG: },
-          [1658297312.201898][7708:7713] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
-          [1658297312.202021][7708:7713] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1658297312.202196][7708:7713] CHIP:TOO:   ScanNetworksResponse: {
-          [1658297312.202276][7708:7713] CHIP:TOO:     networkingStatus: 0
-          [1658297312.202359][7708:7713] CHIP:TOO:     threadScanResults: 1 entries
-          [1658297312.202481][7708:7713] CHIP:TOO:       [1]: {
-          [1658297312.202544][7708:7713] CHIP:TOO:         PanId: 64206
-          [1658297312.202604][7708:7713] CHIP:TOO:         ExtendedPanId: 3861484836749312
-          [1658297312.202663][7708:7713] CHIP:TOO:         NetworkName: GRL
-          [1658297312.202718][7708:7713] CHIP:TOO:         Channel: 11
-          [1658297312.202775][7708:7713] CHIP:TOO:         Version: 4
-          [1658297312.202838][7708:7713] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
-          [1658297312.202897][7708:7713] CHIP:TOO:         Rssi: -78
-          [1658297312.202952][7708:7713] CHIP:TOO:         Lqi: 60
-          [1658297312.203007][7708:7713] CHIP:TOO:        }
-          [1658297312.203066][7708:7713] CHIP:TOO:    }
-          [1658297312.203176][7708:7713] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1658297312.203284][7708:7713] CHIP:EM: Sending Standalone Ack for MessageCounter:217378941 on exchange 37389i
-      disabled: true
+             -the PanId value is in the range of 0 to 65534.
+             -the ExtendedPanId value is type of uint64.
+             -the NetworkName value is type of string with a size of 1 to 16 bytes.
+             -the Channel is type of uint16 with range 0 to 65535.
+             -the version value is type of uint8(0 to 255).
+             -the ExtendedAddress is a hwaddr with a size of 8 bytes
+             -the RSSI is of type int8 with a range of -120 to 0.
+             -the LQI is type of uint8(0 to 255).
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 6: TH reads Breadcrumb attribute from the General Commissioning
           Cluster"
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 54 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 3.
-
-          [1657688489.553742][1639:1644] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 829017614
-          [1657688489.553897][1639:1644] CHIP:TOO:   Breadcrumb: 3
-          [1657688489.554053][1639:1644] CHIP:EM: Sending Standalone Ack for MessageCounter:86525470 on exchange 7368i
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 3
+          constraints:
+              type: int64u
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
index e65428f1878632..aa7d545e9b4a70 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,179 +11,146 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.3. [TC-CNET-4.3] [Ethernet] Verification for attributes check
     [DUT-Server]
+
 PICS:
     - CNET.S.F02
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    # PIXIT.CNET.ENDPOINT_ETHERNET
     endpoint: 0
+    NetworkID:
+        type: octet_string
+        defaultValue: "hex:6574682D617070"
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J042C00KA0648G00"
 
 tests:
-    - label: "Preconditions"
-      verification: |
-          1. DUT supports CNET.S.F02(ET)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_ETHERNET with FeatureMap attribute of 4
-          3. DUT has a valid Ethernet connection
-          4. TH can communicate with the DUT
-      disabled: true
+    - label: "Step 1: Reset Devices to factory defaults"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "FactoryReset"
 
-    - label: "Step 1: Factory reset the DUT"
+    - label: "Step 1: Reset Devices to factory defaults"
       verification: |
-
-      disabled: true
+          Reset Devices to factory defaults
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Factory Reset the DUT and enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Step 2: Commission TH and DUT on Ethernet setup"
-      verification: |
-
-      disabled: true
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 2: Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
     - label:
           "Step 3: TH reads Descriptor Cluster from the DUT with EP0 TH reads
           ServerList from the DUT"
-      verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Via the TH (chip-tool), verify that the server list has value as 49.
-
-          [1646226258.250313][2446:2451] CHIP:DMG:        SuppressResponse = true,
-          [1646226258.250337][2446:2451] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226258.250359][2446:2451] CHIP:DMG: }
-          [1646226258.252027][2446:2451] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001DataVersion: 3582931896
-          [1646226258.252128][2446:2451] CHIP:TOO:   server list: 25 entries
-          [1646226258.252183][2446:2451] CHIP:TOO:     [1]: 3
-          [1646226258.252208][2446:2451] CHIP:TOO:     [2]: 4
-          [1646226258.252232][2446:2451] CHIP:TOO:     [3]: 29
-          [1646226258.252256][2446:2451] CHIP:TOO:     [4]: 30
-          [1646226258.252280][2446:2451] CHIP:TOO:     [5]: 31
-          [1646226258.252303][2446:2451] CHIP:TOO:     [6]: 40
-          [1646226258.252326][2446:2451] CHIP:TOO:     [7]: 42
-          [1646226258.252349][2446:2451] CHIP:TOO:     [8]: 43
-          [1646226258.252373][2446:2451] CHIP:TOO:     [9]: 44
-          [1646226258.252396][2446:2451] CHIP:TOO:     [10]: 45
-          [1646226258.252420][2446:2451] CHIP:TOO:     [11]: 46
-          [1646226258.252443][2446:2451] CHIP:TOO:     [12]: 48
-          [1646226258.252466][2446:2451] CHIP:TOO:     [13]: 49
-          [1646226258.252489][2446:2451] CHIP:TOO:     [14]: 50
-          [1646226258.252512][2446:2451] CHIP:TOO:     [15]: 51
-          [1646226258.252536][2446:2451] CHIP:TOO:     [16]: 52
-          [1646226258.252559][2446:2451] CHIP:TOO:     [17]: 53
-          [1646226258.252582][2446:2451] CHIP:TOO:     [18]: 54
-          [1646226258.252605][2446:2451] CHIP:TOO:     [19]: 55
-          [1646226258.252629][2446:2451] CHIP:TOO:     [20]: 60
-          [1646226258.252652][2446:2451] CHIP:TOO:     [21]: 62
-          [1646226258.252675][2446:2451] CHIP:TOO:     [22]: 63
-          [1646226258.252698][2446:2451] CHIP:TOO:     [23]: 64
-          [1646226258.252721][2446:2451] CHIP:TOO:     [24]: 65
-          [1646226258.252745][2446:2451] CHIP:TOO:     [25]: 1029
-          [1646226258.255517][2446:2451] CHIP:EM: Sending Standalone Ack for MessageCounter:10627940 on exchange 21443i
-      disabled: true
-
-    - label: "Step 4: TH reads FeatureMap attribute from the DUT"
-      verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Via the TH (chip-tool), verify that FeatureMap attribute value as 4 for Ethernet NetworkInterface.
-
-          [1649309323.273092][2611:2617] CHIP:DMG: }
-          [1649309323.273466][2611:2617] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 3138976789
-          [1649309323.278715][2611:2617] CHIP:TOO:   FeatureMap: 4
-          [1649309323.278863][2611:2617] CHIP:EM: Sending Standalone Ack for MessageCounter:532597 on exchange 51560i
-      disabled: true
-
-    - label: "Step 5: TH reads the MaxNetworks attribute from the DUT"
-      PICS: CNET.S.A0000
-      verification: |
-          ./chip-tool networkcommissioning read max-networks 1 0
-
-          Via the TH (chip-tool), Verify the MaxNetworks attribute that contains value in the range of 1 to 255.
-
-          [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
-          [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226441.815889][2475:2480] CHIP:DMG: }
-          [1646226441.816092][2475:2480] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 3622667250
-          [1646226441.816191][2475:2480] CHIP:TOO:   MaxNetworks: 1
-          [1646226441.816288][2475:2480] CHIP:EM: Sending Standalone Ack for MessageCounter:14864333 on exchange 39473i
-      disabled: true
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [49]
+
+    - label: "Step 4a: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 4
+          constraints:
+              type: bitmap32
 
     - label:
-          "Step 6: TH saves the MaxNetworks attribute value as
-          'MaxNetworksValue' for future use"
-      verification: |
-          TH saves MaxNetworks attribute value
-      disabled: true
+          "Step 5 & 6: TH reads the MaxNetworks attribute from the DUT. TH saves
+          the MaxNetworks attribute value as 'MaxNetworksValue' for future use"
+      PICS: CNET.S.A0000
+      command: "readAttribute"
+      attribute: "MaxNetworks"
+      response:
+          saveAs: MaxNetworksValue
+          constraints:
+              type: int8u
+              minValue: 1
+              maxValue: 255
 
     - label: "Step 7: TH reads the Networks attribute list from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that should be the type of octstr with a length range of 1 to 32.
-          -that the connected status should be type of bool and value as TRUE.
-
-          [1654076774.294361][33659:33664] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 609053543
-          [1654076774.294505][33659:33664] CHIP:TOO:   Networks: 1 entries
-          [1654076774.294625][33659:33664] CHIP:TOO:     [1]: {
-          [1654076774.294679][33659:33664] CHIP:TOO:       NetworkID: 6368697035
-          [1654076774.294726][33659:33664] CHIP:TOO:       Connected: TRUE
-          [1654076774.294774][33659:33664] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains: [{ NetworkID: NetworkID, Connected: true }]
 
     - label: "Step 8: TH reads InterfaceEnabled attribute from the DUT"
       PICS: CNET.S.A0004
-      verification: |
-          ./chip-tool networkcommissioning read interface-enabled 1 0
-
-           Via the TH (chip-tool), Verify the InterfaceEnabled attribute that contains bool value as True.
-
-           [1653473893.275901][29834:29839] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004 DataVersion: 1600858167
-           [1653473893.275964][29834:29839] CHIP:TOO:   InterfaceEnabled: TRUE
-           [1653473893.276084][29834:29839] CHIP:EM: Sending Standalone Ack for MessageCounter:13157245 on exchange 55578i
-      disabled: true
+      command: "readAttribute"
+      attribute: "InterfaceEnabled"
+      response:
+          value: true
+          constraints:
+              type: boolean
 
     - label: "Step 9: TH reads LastNetworkingStatus attribute from the DUT"
       PICS: CNET.S.A0005
-      verification: |
-          ./chip-tool networkcommissioning read last-networking-status 1 0
-
-          Via the TH (chip-tool), Verify the LastNetworkingStatus attribute that contains value as null as per spec.
-
-          [1659609891.611493][3877:3882] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 4108508964
-          [1659609891.611559][3877:3882] CHIP:TOO:   LastNetworkingStatus: null
-          [1659609891.611689][3877:3882] CHIP:EM: Sending Standalone Ack for MessageCounter:172102677 on exchange 50438i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkingStatus"
+      response:
+          value: null
 
     - label:
-          "Step 10: TH reads the LastNetworkID attribute from the DUT TH reads
+          "Step 10: TH reads the LastNetworkID attribute from the DUT. TH reads
           the Networks attribute from the DUT"
       PICS: CNET.S.A0006
-      verification: |
-          ./chip-tool networkcommissioning read last-network-id 1 0
-
-          Via the TH (chip-tool), Verify:
-          -that the LastNetworkID attribute that contains NetworkID that should be the type of octstr with a length range of 1 to 32.
-          -if the Networks attribute list is Empty, then LastNetworkID attribute value is null.
-
-          [1659610135.589352][3895:3900] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 4108508964
-          [1659610135.589410][3895:3900] CHIP:TOO:   LastNetworkID: null
-          [1659610135.589549][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:28696356 on exchange 52969i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkID"
+      response:
+          value: null
+          constraints:
+              type: octet_string
+              minLength: 1
+              maxLength: 32
+
+    - label: "Step 10: TH reads the Networks attribute list from the DUT"
+      PICS: CNET.S.A0001
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains: [{ NetworkID: NetworkID, Connected: true }]
 
     - label:
           "Step 11: TH reads the LastConnectErrorValue attribute from the DUT"
       PICS: CNET.S.A0007
-      verification: |
-          ./chip-tool networkcommissioning read last-connect-error-value 1 0
-
-          Via the TH (chip-tool), Verify the LastConnectErrorValue attribute that contains value as null.
-
-          [1653483224.839873][28189:28194] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 3189790698
-          [1653483224.839927][28189:28194] CHIP:TOO:   LastConnectErrorValue: null
-          [1653483224.840028][28189:28194] CHIP:EM: Sending Standalone Ack for MessageCounter:289132 on exchange 60682i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastConnectErrorValue"
+      response:
+          value: null
+          constraints:
+              type: int32s
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
index 26493ea10e7c1c..aaf348393320e1 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
@@ -1,8 +1,8 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License atour sweet
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.4. [TC-CNET-4.4] [WiFi] Verification for ScanNetworks command
@@ -22,216 +21,153 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_WIFI
     endpoint: 0
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:47524C50726976617465"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition : Commission TH and DUT on WiFi network"
       verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          4. TH can communicate with the DUT
-      disabled: true
-
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
-      verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
     - label:
-          "Step 1: TH sends ScanNetworks command to the DUT with the SSID field
+          "Step 1a: TH sends ScanNetworks command to the DUT with the SSID field
           set to 'null' and Breadcrumb field set to 1"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
-      verification: |
-          ./chip-tool networkcommissioning scan-networks 1 0 --Ssid null --Breadcrumb 1
+      command: "ScanNetworks"
+      arguments:
+          values:
+              - name: "SSID"
+                value: null
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                constraints:
+                    anyOf: [0, 1, 5, 6, 12]
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
+              - name: "WiFiScanResults"
+                constraints:
+                    type: list
 
+    - label:
+          "Step 1a: Verify each element in the WiFiScanResults list will have
+          the following fields:"
+      verification: |
           Via the TH (chip-tool), verify:
-          -the NetworkingStatus value should be as 0 that mentions success.
           -the Security value is in the type of map8 with length range 0 to 254.
           -the SSID value is in the  ype of octstr with length range 1 to 32.
           -the BSSID value is in the type of octstr with length range of 6.
           -the Channel is in the type of uint16 with range 0 to 65,535.
           -the WiFi Band is in the of type enum8 with a range of -128 to 127.
           -the RSSI is in the of type int8 with a range of -120 to 0.
-
-          [1653475026.012811][29937:29942] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1653475026.012942][29937:29942] CHIP:TOO:   ScanNetworksResponse: {
-          [1653475026.012983][29937:29942] CHIP:TOO:     networkingStatus: 0
-          [1653475026.013075][29937:29942] CHIP:TOO:     wiFiScanResults: 15 entries
-          [1653475026.013143][29937:29942] CHIP:TOO:       [1]: {
-          [1653475026.013169][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013195][29937:29942] CHIP:TOO:         Ssid: 47524C507269766174655F455854
-          [1653475026.013219][29937:29942] CHIP:TOO:         Bssid: E01CFCE4B236
-          [1653475026.013242][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.013264][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.013286][29937:29942] CHIP:TOO:         Rssi: -9
-          [1653475026.013310][29937:29942] CHIP:TOO:        }
-          [1653475026.013344][29937:29942] CHIP:TOO:       [2]: {
-          [1653475026.013368][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013390][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.013414][29937:29942] CHIP:TOO:         Bssid: C006C3F95EEB
-          [1653475026.013436][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.013458][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013479][29937:29942] CHIP:TOO:         Rssi: -52
-          [1653475026.013500][29937:29942] CHIP:TOO:        }
-          [1653475026.013531][29937:29942] CHIP:TOO:       [3]: {
-          [1653475026.013556][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013578][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.013599][29937:29942] CHIP:TOO:         Bssid: C606C3F95EEB
-          [1653475026.013621][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.013642][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013663][29937:29942] CHIP:TOO:         Rssi: -52
-          [1653475026.013684][29937:29942] CHIP:TOO:        }
-          [1653475026.013715][29937:29942] CHIP:TOO:       [4]: {
-          [1653475026.013738][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.013762][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D7468726561642D3547487A
-          [1653475026.013784][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABE
-          [1653475026.013806][29937:29942] CHIP:TOO:         Channel: 44
-          [1653475026.013827][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013848][29937:29942] CHIP:TOO:         Rssi: -55
-          [1653475026.013869][29937:29942] CHIP:TOO:        }
-          [1653475026.013900][29937:29942] CHIP:TOO:       [5]: {
-          [1653475026.013923][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013945][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.013967][29937:29942] CHIP:TOO:         Bssid: C006C3F95F31
-          [1653475026.013988][29937:29942] CHIP:TOO:         Channel: 48
-          [1653475026.014029][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014051][29937:29942] CHIP:TOO:         Rssi: -65
-          [1653475026.014073][29937:29942] CHIP:TOO:        }
-          [1653475026.014106][29937:29942] CHIP:TOO:       [6]: {
-          [1653475026.014129][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014151][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.014172][29937:29942] CHIP:TOO:         Bssid: C606C3F95F31
-          [1653475026.014194][29937:29942] CHIP:TOO:         Channel: 48
-          [1653475026.014215][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014236][29937:29942] CHIP:TOO:         Rssi: -65
-          [1653475026.014257][29937:29942] CHIP:TOO:        }
-          [1653475026.014288][29937:29942] CHIP:TOO:       [7]: {
-          [1653475026.014311][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014335][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.014357][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECF
-          [1653475026.014379][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014400][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014421][29937:29942] CHIP:TOO:         Rssi: -68
-          [1653475026.014442][29937:29942] CHIP:TOO:        }
-          [1653475026.014473][29937:29942] CHIP:TOO:       [8]: {
-          [1653475026.014496][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014518][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.014540][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC7
-          [1653475026.014561][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014582][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014603][29937:29942] CHIP:TOO:         Rssi: -73
-          [1653475026.014624][29937:29942] CHIP:TOO:        }
-          [1653475026.014654][29937:29942] CHIP:TOO:       [9]: {
-          [1653475026.014677][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014698][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.014720][29937:29942] CHIP:TOO:         Bssid: 1627F5374EC7
-          [1653475026.014741][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014762][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014783][29937:29942] CHIP:TOO:         Rssi: -72
-          [1653475026.014804][29937:29942] CHIP:TOO:        }
-          [1653475026.014834][29937:29942] CHIP:TOO:       [10]: {
-          [1653475026.014858][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.014880][29937:29942] CHIP:TOO:         Ssid: 4368697031
-          [1653475026.014902][29937:29942] CHIP:TOO:         Bssid: 0C0E764EF1C8
-          [1653475026.014923][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.014944][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.014965][29937:29942] CHIP:TOO:         Rssi: -38
-          [1653475026.014986][29937:29942] CHIP:TOO:        }
-          [1653475026.015017][29937:29942] CHIP:TOO:       [11]: {
-          [1653475026.015039][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015061][29937:29942] CHIP:TOO:         Ssid: 4368697073657475703442
-          [1653475026.015083][29937:29942] CHIP:TOO:         Bssid: E01CFCEA2A46
-          [1653475026.015105][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.015126][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015147][29937:29942] CHIP:TOO:         Rssi: -34
-          [1653475026.015168][29937:29942] CHIP:TOO:        }
-          [1653475026.015198][29937:29942] CHIP:TOO:       [12]: {
-          [1653475026.015221][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015244][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015266][29937:29942] CHIP:TOO:         Bssid: 6032B197B89E
-          [1653475026.015288][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.015309][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015330][29937:29942] CHIP:TOO:         Rssi: -37
-          [1653475026.015351][29937:29942] CHIP:TOO:        }
-          [1653475026.015381][29937:29942] CHIP:TOO:       [13]: {
-          [1653475026.015404][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.015427][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D746872656164
-          [1653475026.015449][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABC
-          [1653475026.015470][29937:29942] CHIP:TOO:         Channel: 2
-          [1653475026.015491][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015512][29937:29942] CHIP:TOO:         Rssi: -40
-          [1653475026.015533][29937:29942] CHIP:TOO:        }
-          [1653475026.015563][29937:29942] CHIP:TOO:       [14]: {
-          [1653475026.015587][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015609][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015631][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC6
-          [1653475026.015652][29937:29942] CHIP:TOO:         Channel: 6
-          [1653475026.015673][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015694][29937:29942] CHIP:TOO:         Rssi: -53
-          [1653475026.015714][29937:29942] CHIP:TOO:        }
-          [1653475026.015745][29937:29942] CHIP:TOO:       [15]: {
-          [1653475026.015768][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015789][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015811][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECE
-          [1653475026.015832][29937:29942] CHIP:TOO:         Channel: 6
-          [1653475026.015853][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015874][29937:29942] CHIP:TOO:         Rssi: -50
-          [1653475026.015896][29937:29942] CHIP:TOO:        }
-          [1653475026.015920][29937:29942] CHIP:TOO:    }
-          [1653475026.016050][29937:29942] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653475026.016114][29937:29942] CHIP:EM: Sending Standalone Ack for MessageCounter:14684023 on exchange 35456i
-      disabled: true
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
-          "Step 1b: TH reads Breadcumb attribute from the General Commissioning
+          "Step 1b: TH reads Breadcrumb attribute from the General Commissioning
           Cluster"
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657190614.753193][5241:5246] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642039
-          [1657190614.753305][5241:5246] CHIP:TOO:   Breadcrumb: 1
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
+          constraints:
+              type: int64u
 
     - label:
           "Step 2a: TH sends ScanNetworks Command to the DUT with SSID field set
-          to PIXIT.CNET.WIFI_ 1ST_ACCESSPOINT _SSID and Breadcrumb field set to
-          2"
+          to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field set to 2"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
-      verification: |
-          Below is an example:
-          ./chip-tool networkcommissioning scan-networks 1 0 --Ssid hex:47524C50726976617465 --Breadcrumb 2
-
-          Via the TH (chip-tool), verify the ScanNetworks response with first network SSID.
-
-          [1653475824.575642][30076:30081] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1653475824.575807][30076:30081] CHIP:TOO:   ScanNetworksResponse: {
-          [1653475824.575888][30076:30081] CHIP:TOO:     networkingStatus: 0
-          [1653475824.575966][30076:30081] CHIP:TOO:     wiFiScanResults: 1 entries
-          [1653475824.576108][30076:30081] CHIP:TOO:       [1]: {
-          [1653475824.576168][30076:30081] CHIP:TOO:         Security: 8
-          [1653475824.576227][30076:30081] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475824.576283][30076:30081] CHIP:TOO:         Bssid: E01CFCE4B236
-          [1653475824.576339][30076:30081] CHIP:TOO:         Channel: 11
-          [1653475824.576392][30076:30081] CHIP:TOO:         WiFiBand: 0
-          [1653475824.576445][30076:30081] CHIP:TOO:         Rssi: -9
-          [1653475824.576500][30076:30081] CHIP:TOO:        }
-          [1653475824.576560][30076:30081] CHIP:TOO:    }
-          [1653475824.576668][30076:30081] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653475824.576777][30076:30081] CHIP:EM: Sending Standalone Ack for MessageCounter:251134 on exchange 38023i
-      disabled: true
+      command: "ScanNetworks"
+      arguments:
+          values:
+              - name: "SSID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 2
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
+              - name: "DebugText"
+                constraints:
+                    maxLength: 512
+              - name: "WiFiScanResults"
+                constraints:
+                    type: list
 
     - label:
-          "Step 2b: TH reads Breadcumb attribute from the General Commissioning
-          Cluster"
+          "Step 2a: Verify each element in the WiFiScanResults list will have
+          the following fields: "
       verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 2.
+          Via the TH (chip-tool), verify:
+          -the Security value is in the type of map8 with length range 0 to 254.
+          -the SSID value is in the  ype of octstr with length range 1 to 32.
+          -the BSSID value is in the type of octstr with length range of 6.
+          -the Channel is in the type of uint16 with range 0 to 65,535.
+          -the WiFi Band is in the of type enum8 with a range of -128 to 127.
+          -the RSSI is in the of type int8 with a range of -120 to 0.
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
-          [1657197542.352377][5661:5666] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642042
-          [1657197542.352450][5661:5666] CHIP:TOO:   Breadcrumb: 2
-      disabled: true
+    - label:
+          "Step 2b: TH reads Breadcrumb attribute from the General Commissioning
+          Cluster"
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 2
+          constraints:
+              type: int64u
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
index d50e856b4c2501..3d5a732fae831b 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.5. [TC-CNET-4.5] [Wi-Fi] FAILSAFE_REQUIRED message Validation
@@ -22,17 +21,50 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_WIFI
     endpoint: 0
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:7A6967626565686F6D65"
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_CREDENTIALS:
+        type: octet_string
+        defaultValue: "hex:70617373776f7264313233"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on WiFi network"
       verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          4. TH can communicate with the DUT
-      disabled: true
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
     - label:
           "Step 1: TH sends the AddOrUpdateWiFiNetwork command to the DUT with
@@ -40,54 +72,44 @@ tests:
           T_ACCESSPOINT_SSI D 2. Credentials field set to PIXIT.CNET.WIFI_1S
           T_ACCESSPOINT_CRE DENTIALS 3. Breadcrumb field set to 1"
       PICS: CNET.S.C02.Rsp
-      verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network  hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the AddOrUpdateWiFiNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "AddOrUpdateWiFiNetwork"
+      arguments:
+          values:
+              - name: "SSID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Credentials"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_CREDENTIALS
+              - name: "breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
 
     - label:
           "Step 2: TH sends RemoveNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCE SSPOINT_SSID and Breadcrumb
           field set to 1"
-      PICS: CNET.S.C02.Rsp
-      verification: |
-          ./chip-tool networkcommissioning remove hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the RemoveNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      PICS: CNET.S.C04.Rsp
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
 
     - label:
           "Step 3: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCE SSPOINT_SSID and Breadcrumb
           field set to 1"
       PICS: CNET.S.C06.Rsp
-      verification: |
-          ./chip-tool networkcommissioning connect hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the ConnectNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
index e9f1368e4c79cb..aeac82e7857335 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.6. [TC-CNET-4.6] [Thread] FAILSAFE_REQUIRED message Validation
@@ -22,76 +21,93 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
     endpoint: 0
+    PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET:
+        type: octet_string
+        defaultValue: "hex:1111111122222222"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on Thread network"
       verification: |
-          1. DUT supports CNET.S.F01(TH)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
-          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-      disabled: true
-
-    - label: "Commission TH and DUT on Thread setup"
-      verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
+
+          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
+          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
+          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
+          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
+          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
+          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
+          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
+          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
+          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
+          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 2
+          constraints:
+              type: bitmap32
 
     - label:
           "Step 1: TH sends the AddOrUpdateThreadNetwork command to the DUT with
-          the following fields: OperationalDataset field set to
-          PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET Breadcrumb field set to 1"
+          OperationalDataset field set to
+          PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 1"
       PICS: CNET.S.C03.Rsp
-      verification: |
-          ./chip-tool networkcommissioning add-or-update-thread-network-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning add-or-update-thread-network hex:1011101122222229 51 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the AddOrUpdateThreadNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "AddOrUpdateThreadNetwork"
+      arguments:
+          values:
+              - name: "OperationalDataset"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
 
     - label:
           "Step 2: TH sends RemoveNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb
           field set to 1"
       PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network hex:1011101122222229 51 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the RemoveNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
 
     - label:
           "Step 3: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb
           field set to 1"
       PICS: CNET.S.C06.Rsp
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:1011101122222229 51 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the ConnectNetwork command.
-
-          [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
-          [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
-          [1657619600.364186][2056:2061] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          error: FAILSAFE_REQUIRED
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
index 5963e9bbae6801..341fe7d1cae131 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     12.4.7. [TC-CNET-4.9] [WiFi] Verification for RemoveNetwork Command
@@ -22,290 +21,302 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
+    cluster: "Network Commissioning"
+    #PIXIT.CNET.ENDPOINT_WIFI
     endpoint: 0
+    PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID:
+        type: octet_string
+        defaultValue: "hex:7A6967626565686F6D65"
 
 tests:
-    - label: "Preconditions"
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
+    - label: "Precondition: Commission TH and DUT on WiFi network"
       verification: |
-          1. DUT supports CNET.S.F00(WI)
-          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
-          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
-          4. TH can communicate with the DUT
-      disabled: true
-
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
-      verification: |
-
-      disabled: true
+          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
+
+          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
+          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
+          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
+          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
+          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
+          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
+          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: enter 'y' after success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Precondition: TH reads FeatureMap attribute from the DUT"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
+          constraints:
+              type: bitmap32
 
     - label:
           "Step 1: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
-
-          [1653478311.640549][30368:30373] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1653478311.640646][30368:30373] CHIP:TOO:   ArmFailSafeResponse: {
-          [1653478311.640696][30368:30373] CHIP:TOO:     errorCode: 0
-          [1653478311.640729][30368:30373] CHIP:TOO:     debugText:
-          [1653478311.640763][30368:30373] CHIP:TOO:    }
-          [1653478311.640821][30368:30373] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653478311.640901][30368:30373] CHIP:EM: Sending Standalone Ack for MessageCounter:8633037 on exchange 20698i
-      disabled: true
-
-    - label:
-          "Step 2: TH reads Networks attribute from the DUT and saves the number
-          of entries as 'NumNetworks'"
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
+
+    - label: "Step 2: TH reads Networks attribute from the DUT "
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that value as PIXIT.CNET.WIFI_1ST_ ACCESSPOINT_SSID.
-          -that the connected status is in the the type of bool value as TRUE.
-
-          [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
-          [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
-          [1654250379.882123][5309:5314] CHIP:TOO:     [1]: {
-          [1654250379.882196][5309:5314] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1654250379.882257][5309:5314] CHIP:TOO:       Connected: TRUE
-          [1654250379.882312][5309:5314] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 3: TH finds the index of the Networks list entry with NetworkID
           field value PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and saves it as
-          'Userwifi_netidx'"
+          'Userth_netidx'"
       verification: |
-          ./chip-tool networkcommissioning read last-network-id 1 0
-
-          Via the TH (chip-tool), Verify:
-          -that the LastNetworkID attribute that contains NetworkID that should be the type of octstr with a length range 1 to 32.
-
-          [1657198553.376268][5799:5804] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 2494552649
-          [1657198553.376351][5799:5804] CHIP:TOO:   LastNetworkID: 47524C50726976617465
-      disabled: true
+          TH finds the index of the Networks list entry with NetworkID
+          field value PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and saves it as
+          'Userth_netidx'
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1653478327.351092][30388:30393] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1653478327.351200][30388:30393] CHIP:TOO:   NetworkConfigResponse: {
-          [1653478327.351252][30388:30393] CHIP:TOO:     networkingStatus: 0
-          [1653478327.351288][30388:30393] CHIP:TOO:     networkIndex: 0
-          [1653478327.351320][30388:30393] CHIP:TOO:    }
-          [1653478327.351373][30388:30393] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653478327.351449][30388:30393] CHIP:EM: Sending Standalone Ack for MessageCounter:14887098 on exchange 8676i
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label: "Step 5: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify that the Networks attribute list has empty(0 entries).
-
-          [1653478331.979300][30395:30400] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1600858167
-          [1653478331.979380][30395:30400] CHIP:TOO:   Networks: 0 entries
-          [1653478331.979496][30395:30400] CHIP:EM: Sending Standalone Ack for MessageCounter:609449 on exchange 40264i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              type: list
+              excludes:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label: "Step 6: TH reads LastNetworkingStatus attribute from the DUT"
       PICS: CNET.S.A0005
-      verification: |
-          ./chip-tool networkcommissioning read last-networking-status 1 0
-
-          Via the TH (chip-tool), Verify the LastNetworkingStatus attribute that contains value as 0 that mentions success.
-
-          [1653478850.425096][30420:30425] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1600858167
-          [1653478850.425170][30420:30425] CHIP:TOO:   LastNetworkingStatus: 0
-          [1653478850.425269][30420:30425] CHIP:EM: Sending Standalone Ack for MessageCounter:8275942 on exchange 13394i
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkingStatus"
+      response:
+          value: 0
+          constraints:
+              type: NetworkCommissioningStatusEnum
 
     - label: "Step 7: TH reads LastNetworkID attribute from the DUT"
       PICS: CNET.S.A0006
-      verification: |
-          ./chip-tool networkcommissioning read last-network-id 1 0
-
-          Via the TH (chip-tool), Verify that the LastNetworkID has PIXIT.CNET.WIFI_ 1ST_ACCESSPOINT _SSID.
-
-          [1657197861.497831][5737:5742] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 2494552649
-          [1657197861.497897][5737:5742] CHIP:TOO:   LastNetworkID: 47524C50726976617465
-      disabled: true
+      command: "readAttribute"
+      attribute: "LastNetworkID"
+      response:
+          value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          constraints:
+              type: octet_string
+              minLength: 1
+              maxLength: 32
 
     - label:
           "Step 8: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
       PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657197903.686316][5745:5750] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642043
-          [1657197903.686428][5745:5750] CHIP:TOO:   Breadcrumb: 1
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
+          constraints:
+              type: int64u
 
     - label:
           "Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 2"
-      PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
-
-          Below is an example:
-
-          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 2
-
-          Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains networkingStatus value as 3(NetworkIdNotFound).
-
-          [1657288261.892249][2347:2352] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1657288261.892304][2347:2352] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1657288261.892430][2347:2352] CHIP:TOO:   ConnectNetworkResponse: {
-          [1657288261.892477][2347:2352] CHIP:TOO:     networkingStatus: 3
-          [1657288261.892511][2347:2352] CHIP:TOO:     errorValue: 0
-          [1657288261.892542][2347:2352] CHIP:TOO:    }
-      disabled: true
+      PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
+      timedInteractionTimeoutMs: 5000
+      command: "ConnectNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 2
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 3
+              - name: "ErrorValue"
+                constraints:
+                    type: int32s
 
     - label:
           "Step 10: TH reads Breadcrumb attribute from the General Commissioning
           cluster of the DUT"
-      PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
-
-          Via the TH (chip-tool), verify the Breadcumb attribute that contains value as 1.
-
-          [1657288331.671111][2360:2365] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 3470734109
-          [1657288331.671207][2360:2365] CHIP:TOO:   Breadcrumb: 1
-      disabled: true
+      cluster: "General Commissioning"
+      command: "readAttribute"
+      attribute: "Breadcrumb"
+      response:
+          value: 1
+          constraints:
+              type: int64u
 
     - label:
           "Step 11: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 0 secs to the TH.
-
-          [1657288382.006035][2369:2374] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657288382.006094][2369:2374] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657288382.006157][2369:2374] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657288382.006201][2369:2374] CHIP:TOO:     errorCode: 0
-          [1657288382.006233][2369:2374] CHIP:TOO:     debugText:
-          [1657288382.006263][2369:2374] CHIP:TOO:    }
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 0
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label: "Step 12: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify:
-          -the Networks attribute has NetworkID that contains value as PIXIT.CNET.WIFI_1ST_ ACCESSPOINT_SSID.
-          -that the connected status should be the type of bool value as TRUE.
-
-          1684494160.580218][15306:15308] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 130057616
-          [1684494160.580248][15306:15308] CHIP:TOO:   Networks: 1 entries
-          [1684494160.580273][15306:15308] CHIP:TOO:     [1]: {
-          [1684494160.580288][15306:15308] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1684494160.580298][15306:15308] CHIP:TOO:       Connected: TRUE
-          [1684494160.580307][15306:15308] CHIP:TOO:      }
-          [1684494160.580360][15306:15308] CHIP:EM: <<< [E:26231i S:16056 M:263765151 (Ack:216379970)] (S) Msg TX to 1:0000000000000001 [4DB7] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              contains:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
 
     - label:
           "Step 13: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 900 secs to the TH.
-
-          [1657288428.409103][2382:2388] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657288428.409191][2382:2388] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657288428.409303][2382:2388] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657288428.409367][2382:2388] CHIP:TOO:     errorCode: 0
-          [1657288428.409435][2382:2388] CHIP:TOO:     debugText:
-          [1657288428.409481][2382:2388] CHIP:TOO:    }
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 900
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
-      verification: |
-          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
-          Below is an example:
-
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
-
-          Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
-
-          [1687240172.756582][17509:17511] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1687240172.756684][17509:17511] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1687240172.756847][17509:17511] CHIP:TOO:   NetworkConfigResponse: {
-          [1687240172.756951][17509:17511] CHIP:TOO:     networkingStatus: 0
-          [1687240172.757011][17509:17511] CHIP:TOO:     networkIndex: 0
-          [1687240172.757062][17509:17511] CHIP:TOO:    }
-      disabled: true
+      command: "RemoveNetwork"
+      arguments:
+          values:
+              - name: "NetworkID"
+                value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+              - name: "Breadcrumb"
+                value: 1
+      response:
+          values:
+              - name: "NetworkingStatus"
+                value: 0
 
     - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
-      PICS: CNET.S.C04.Rsp
-      verification: |
-          ./chip-tool generalcommissioning commissioning-complete 1 0
-
-          Via the TH (chip-tool), Verify the DUT sends CommissioningComplete command and the errorCode field is 0(OK).
-
-          [1657288504.905001][2397:2402] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1657288504.905050][2397:2402] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
-          [1657288504.905108][2397:2402] CHIP:TOO:   CommissioningCompleteResponse: {
-          [1657288504.905145][2397:2402] CHIP:TOO:     errorCode: 0
-          [1657288504.905169][2397:2402] CHIP:TOO:     debugText:
-          [1657288504.905191][2397:2402] CHIP:TOO:    }
-      disabled: true
+      cluster: "General Commissioning"
+      command: "CommissioningComplete"
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label:
           "Step 16: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0 to ensure the CommissioningComplete call
           properly persisted the failsafe context. This call should have no
           effect if Commissioning Complete call is handled correctly"
-      verification: |
-          ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
-
-          Via the TH (chip-tool),  Verify the DUT sends ArmFailSafe with timeout as 0 secs to the TH.
-
-          [1657288529.987350][2404:2409] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1657288529.987514][2404:2409] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1657288529.987612][2404:2409] CHIP:TOO:   ArmFailSafeResponse: {
-          [1657288529.987677][2404:2409] CHIP:TOO:     errorCode: 0
-          [1657288529.987725][2404:2409] CHIP:TOO:     debugText:
-          [1657288529.987772][2404:2409] CHIP:TOO:    }
-      disabled: true
+      cluster: "General Commissioning"
+      command: "ArmFailSafe"
+      arguments:
+          values:
+              - name: "ExpiryLengthSeconds"
+                value: 0
+              - name: "Breadcrumb"
+                value: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0
+              - name: "DebugText"
+                value: ""
 
     - label: "Step 17: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Via the TH (chip-tool), Verify that the Networks attribute list has empty(0 entries).
-
-          [1657288549.446752][2412:2417] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1420716065
-          [1657288549.446852][2412:2417] CHIP:TOO:   Networks: 0 entries
-      disabled: true
+      command: "readAttribute"
+      attribute: "Networks"
+      response:
+          constraints:
+              type: list
+              excludes:
+                  [
+                      {
+                          NetworkID: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID,
+                          Connected: true,
+                      },
+                  ]
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
index 1fdcfce09d47ee..147242c5db841e 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
@@ -65,8 +65,9 @@ tests:
               type: list
               contains: [0, 1, 8, 65528, 65529, 65531, 65532, 65533]
 
-    - label: "Step 4b: Read optional attribute(UpTime) in AttributeList"
-      PICS: DGGEN.S.A0002
+    - label:
+          "Step 4b: Validate presence of mandatory attribute(UpTime) in
+          AttributeList"
       command: "readAttribute"
       attribute: "AttributeList"
       response:
@@ -168,12 +169,12 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0]
+              contains: [0, 1]
 
     - label: "Step 7: TH reads GeneratedCommandList from DUT"
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response:
-          value: []
+          value: [2]
           constraints:
               type: list
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
index 22a222055e689f..5b4e7a489a613f 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -183,7 +183,6 @@ tests:
     - label:
           "Step 4a: TH reads the Uptime attribute value of DUT. Store the value
           in uptime1"
-      PICS: DGGEN.S.A0002
       command: "readAttribute"
       attribute: "UpTime"
       response:
@@ -192,7 +191,6 @@ tests:
               type: int64u
 
     - label: "Wait 10 seconds"
-      PICS: DGGEN.S.A0002
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -203,7 +201,6 @@ tests:
     - label:
           "Step 4b: TH reads a Uptime attribute value of DUT. Store the value in
           uptime2. Verify that uptime2 is greater than uptime1."
-      PICS: DGGEN.S.A0002
       command: "readAttribute"
       attribute: "UpTime"
       response:
@@ -241,7 +238,6 @@ tests:
     - label:
           "Step 4c: TH reads a Uptime attribute value of DUT. Store the value in
           uptime3. Verify that uptime3 is lesser than uptime2."
-      PICS: DGGEN.S.A0003
       command: "readAttribute"
       attribute: "UpTime"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
index 61a5800c2b4204..35988227c4a33e 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
@@ -519,7 +519,8 @@ tests:
                 value: "y"
 
     #issue #18145
-    - label: "Step 30: TH reads ActiveNetworkFaults attribute value from DUT"
+    - label:
+          "Step 30: TH reads ActiveNetworkFaultsList attribute value from DUT"
       PICS: DGTHREAD.S.A003e
       command: "readAttribute"
       attribute: "ActiveNetworkFaultsList"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml
index 905d7f1b03f3ad..6580facaee8340 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml
@@ -28,5 +28,5 @@ tests:
     #  command: "WaitForCommissioning"
 
     - label: "DUT sends ResetCounts command to TH"
-      PICS: DGWIFI.S.C00.Tx
+      PICS: DGWIFI.C.C00.Tx
       wait: "ResetCounts"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
index f561d9130e46ce..d6b889127d80a6 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
@@ -607,8 +607,9 @@ tests:
 
     - label:
           "Step 5e: TH sends Set Credential Command to DUT with the following
-          fields: OperationType as 0-Add Credential as 1 1- PIN, Index
-          CredentialData as 123456 UserIndex as 1 UserStatus as 0 UserType as 0"
+          fields: 1.OperationType as 0 2.Credential as 1 1- PIN, Index
+          3.CredentialData as 123456 4.UserIndex as 1 5.UserStatus as null
+          6.UserType as null"
       PICS: DRLK.S.F08 && DRLK.S.C22.Rsp && DRLK.S.C23.Tx
       verification: |
           ./chip-tool doorlock clear-credential  '{ "credentialType" : 1 , "credentialIndex" : 2 }'  1 1 --timedInteractionTimeoutMs 1000
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml
index 3c38efe9802c5d..515b36078dbbb1 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml
@@ -40,779 +40,720 @@ tests:
     - label: "Step 1: DUT sends Lock Door command to TH."
       PICS: DRLK.C.C00.Tx
       verification: |
-          ./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Lock Door command with SUCCESS response on TH(lock-app) log:
 
-          [1685673050.566811][2584:2586] CHIP:DMG: InvokeResponseMessage =
-          [1685673050.566867][2584:2586] CHIP:DMG: {
-          [1685673050.566921][2584:2586] CHIP:DMG:         suppressResponse = false,
-          [1685673050.566977][2584:2586] CHIP:DMG:         InvokeResponseIBs =
-          [1685673050.567050][2584:2586] CHIP:DMG:         [
-          [1685673050.567107][2584:2586] CHIP:DMG:                 InvokeResponseIB =
-          [1685673050.567186][2584:2586] CHIP:DMG:                 {
-          [1685673050.567248][2584:2586] CHIP:DMG:                         CommandStatusIB =
-          [1685673050.567320][2584:2586] CHIP:DMG:                         {
-          [1685673050.567387][2584:2586] CHIP:DMG:                                 CommandPathIB =
-          [1685673050.567464][2584:2586] CHIP:DMG:                                 {
-          [1685673050.567540][2584:2586] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673050.567625][2584:2586] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673050.567706][2584:2586] CHIP:DMG:                                         CommandId = 0x0,
-          [1685673050.567784][2584:2586] CHIP:DMG:                                 },
-          [1685673050.567870][2584:2586] CHIP:DMG:
-          [1685673050.567938][2584:2586] CHIP:DMG:                                 StatusIB =
-          [1685673050.568015][2584:2586] CHIP:DMG:                                 {
-          [1685673050.568092][2584:2586] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673050.568171][2584:2586] CHIP:DMG:                                 },
-          [1685673050.568246][2584:2586] CHIP:DMG:
-          [1685673050.568313][2584:2586] CHIP:DMG:                         },
-          [1685673050.568389][2584:2586] CHIP:DMG:
-          [1685673050.568451][2584:2586] CHIP:DMG:                 },
-          [1685673050.568524][2584:2586] CHIP:DMG:
-          [1685673050.568578][2584:2586] CHIP:DMG:         ],
-          [1685673050.568650][2584:2586] CHIP:DMG:
-          [1685673050.568707][2584:2586] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673050.568761][2584:2586] CHIP:DMG: },
+          [1698646727.274715][11887:11887] CHIP:DMG: InvokeRequestMessage =
+          [1698646727.274753][11887:11887] CHIP:DMG: {
+          [1698646727.274788][11887:11887] CHIP:DMG:         suppressResponse = false,
+          [1698646727.274829][11887:11887] CHIP:DMG:         timedRequest = true,
+          [1698646727.274867][11887:11887] CHIP:DMG:         InvokeRequests =
+          [1698646727.274916][11887:11887] CHIP:DMG:         [
+          [1698646727.274955][11887:11887] CHIP:DMG:                 CommandDataIB =
+          [1698646727.274998][11887:11887] CHIP:DMG:                 {
+          [1698646727.275119][11887:11887] CHIP:DMG:                         CommandPathIB =
+          [1698646727.275180][11887:11887] CHIP:DMG:                         {
+          [1698646727.275229][11887:11887] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646727.275279][11887:11887] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646727.275398][11887:11887] CHIP:DMG:                                 CommandId = 0x0,
+          [1698646727.275447][11887:11887] CHIP:DMG:                         },
+          [1698646727.275498][11887:11887] CHIP:DMG:
+          [1698646727.275591][11887:11887] CHIP:DMG:                         CommandFields =
+          [1698646727.275639][11887:11887] CHIP:DMG:                         {
+          [1698646727.275687][11887:11887] CHIP:DMG:                         },
+          [1698646727.275765][11887:11887] CHIP:DMG:                 },
+          [1698646727.275817][11887:11887] CHIP:DMG:
+          [1698646727.275854][11887:11887] CHIP:DMG:         ],
+          [1698646727.275900][11887:11887] CHIP:DMG:
+          [1698646727.275977][11887:11887] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646727.276053][11887:11887] CHIP:DMG: },
       disabled: true
 
     - label: "Step 2: DUT sends Unlock Door command to TH."
       PICS: DRLK.C.C01.Tx
       verification: |
-          ./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Unlock Door command with SUCCESS response on TH(lock-app) log:
 
-          [1685673083.557613][2593:2595] CHIP:DMG: InvokeResponseMessage =
-          [1685673083.557668][2593:2595] CHIP:DMG: {
-          [1685673083.557724][2593:2595] CHIP:DMG:         suppressResponse = false,
-          [1685673083.557834][2593:2595] CHIP:DMG:         InvokeResponseIBs =
-          [1685673083.557915][2593:2595] CHIP:DMG:         [
-          [1685673083.557973][2593:2595] CHIP:DMG:                 InvokeResponseIB =
-          [1685673083.558070][2593:2595] CHIP:DMG:                 {
-          [1685673083.558133][2593:2595] CHIP:DMG:                         CommandStatusIB =
-          [1685673083.558222][2593:2595] CHIP:DMG:                         {
-          [1685673083.558306][2593:2595] CHIP:DMG:                                 CommandPathIB =
-          [1685673083.558399][2593:2595] CHIP:DMG:                                 {
-          [1685673083.558493][2593:2595] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673083.558589][2593:2595] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673083.558685][2593:2595] CHIP:DMG:                                         CommandId = 0x1,
-          [1685673083.558775][2593:2595] CHIP:DMG:                                 },
-          [1685673083.558878][2593:2595] CHIP:DMG:
-          [1685673083.558962][2593:2595] CHIP:DMG:                                 StatusIB =
-          [1685673083.559058][2593:2595] CHIP:DMG:                                 {
-          [1685673083.559150][2593:2595] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673083.559243][2593:2595] CHIP:DMG:                                 },
-          [1685673083.559335][2593:2595] CHIP:DMG:
-          [1685673083.559418][2593:2595] CHIP:DMG:                         },
-          [1685673083.559513][2593:2595] CHIP:DMG:
-          [1685673083.559582][2593:2595] CHIP:DMG:                 },
-          [1685673083.559663][2593:2595] CHIP:DMG:
-          [1685673083.559720][2593:2595] CHIP:DMG:         ],
-          [1685673083.559792][2593:2595] CHIP:DMG:
-          [1685673083.559848][2593:2595] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673083.559903][2593:2595] CHIP:DMG: },
+          [1698646754.942170][11887:11887] CHIP:DMG: InvokeRequestMessage =
+          [1698646754.942214][11887:11887] CHIP:DMG: {
+          [1698646754.942241][11887:11887] CHIP:DMG:         suppressResponse = false,
+          [1698646754.942284][11887:11887] CHIP:DMG:         timedRequest = true,
+          [1698646754.942314][11887:11887] CHIP:DMG:         InvokeRequests =
+          [1698646754.942351][11887:11887] CHIP:DMG:         [
+          [1698646754.942397][11887:11887] CHIP:DMG:                 CommandDataIB =
+          [1698646754.942443][11887:11887] CHIP:DMG:                 {
+          [1698646754.942490][11887:11887] CHIP:DMG:                         CommandPathIB =
+          [1698646754.942527][11887:11887] CHIP:DMG:                         {
+          [1698646754.942563][11887:11887] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646754.942613][11887:11887] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646754.942650][11887:11887] CHIP:DMG:                                 CommandId = 0x1,
+          [1698646754.942686][11887:11887] CHIP:DMG:                         },
+          [1698646754.942735][11887:11887] CHIP:DMG:
+          [1698646754.942768][11887:11887] CHIP:DMG:                         CommandFields =
+          [1698646754.942803][11887:11887] CHIP:DMG:                         {
+          [1698646754.942838][11887:11887] CHIP:DMG:                         },
+          [1698646754.942882][11887:11887] CHIP:DMG:                 },
+          [1698646754.942918][11887:11887] CHIP:DMG:
+          [1698646754.942946][11887:11887] CHIP:DMG:         ],
+          [1698646754.942992][11887:11887] CHIP:DMG:
+          [1698646754.943021][11887:11887] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646754.943048][11887:11887] CHIP:DMG: },
       disabled: true
 
     - label: "Step 3: DUT sends Unlock with Timeout command to TH."
       PICS: DRLK.C.C03.Tx
       verification: |
-          ./chip-tool doorlock unlock-with-timeout 60 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock unlock-with-timeout 60 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Unlock with Timeout command with SUCCESS response on TH(lock-app) log:
 
-          [1685673101.154705][2596:2598] CHIP:DMG: InvokeResponseMessage =
-          [1685673101.154760][2596:2598] CHIP:DMG: {
-          [1685673101.154813][2596:2598] CHIP:DMG:         suppressResponse = false,
-          [1685673101.154869][2596:2598] CHIP:DMG:         InvokeResponseIBs =
-          [1685673101.154941][2596:2598] CHIP:DMG:         [
-          [1685673101.154998][2596:2598] CHIP:DMG:                 InvokeResponseIB =
-          [1685673101.155074][2596:2598] CHIP:DMG:                 {
-          [1685673101.155135][2596:2598] CHIP:DMG:                         CommandStatusIB =
-          [1685673101.155206][2596:2598] CHIP:DMG:                         {
-          [1685673101.155273][2596:2598] CHIP:DMG:                                 CommandPathIB =
-          [1685673101.155349][2596:2598] CHIP:DMG:                                 {
-          [1685673101.155426][2596:2598] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673101.155501][2596:2598] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673101.155586][2596:2598] CHIP:DMG:                                         CommandId = 0x3,
-          [1685673101.155660][2596:2598] CHIP:DMG:                                 },
-          [1685673101.155743][2596:2598] CHIP:DMG:
-          [1685673101.155812][2596:2598] CHIP:DMG:                                 StatusIB =
-          [1685673101.155886][2596:2598] CHIP:DMG:                                 {
-          [1685673101.155965][2596:2598] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673101.156041][2596:2598] CHIP:DMG:                                 },
-          [1685673101.156115][2596:2598] CHIP:DMG:
-          [1685673101.156183][2596:2598] CHIP:DMG:                         },
-          [1685673101.156259][2596:2598] CHIP:DMG:
-          [1685673101.156321][2596:2598] CHIP:DMG:                 },
-          [1685673101.156392][2596:2598] CHIP:DMG:
-          [1685673101.156447][2596:2598] CHIP:DMG:         ],
-          [1685673101.156517][2596:2598] CHIP:DMG:
-          [1685673101.156573][2596:2598] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673101.156629][2596:2598] CHIP:DMG: },
+          [1698646961.411111][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698646961.411145][11905:11905] CHIP:DMG: {
+          [1698646961.411175][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698646961.411212][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698646961.411246][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698646961.411291][11905:11905] CHIP:DMG:         [
+          [1698646961.411328][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698646961.411374][11905:11905] CHIP:DMG:                 {
+          [1698646961.411478][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698646961.411527][11905:11905] CHIP:DMG:                         {
+          [1698646961.411572][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646961.411616][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646961.411694][11905:11905] CHIP:DMG:                                 CommandId = 0x3,
+          [1698646961.411776][11905:11905] CHIP:DMG:                         },
+          [1698646961.411824][11905:11905] CHIP:DMG:
+          [1698646961.411861][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698646961.411903][11905:11905] CHIP:DMG:                         {
+          [1698646961.411972][11905:11905] CHIP:DMG:                                 0x0 = 60,
+          [1698646961.412053][11905:11905] CHIP:DMG:                         },
+          [1698646961.412093][11905:11905] CHIP:DMG:                 },
+          [1698646961.412136][11905:11905] CHIP:DMG:
+          [1698646961.412169][11905:11905] CHIP:DMG:         ],
+          [1698646961.412211][11905:11905] CHIP:DMG:
+          [1698646961.412244][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646961.412277][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 4: DUT sends Set Week Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C0b.Tx
       verification: |
-          ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Set user command with SUCCESS response on TH(lock-app) log:
 
-          [1685673117.936503][2600:2602] CHIP:DMG: InvokeResponseMessage =
-          [1685673117.936560][2600:2602] CHIP:DMG: {
-          [1685673117.936615][2600:2602] CHIP:DMG:         suppressResponse = false,
-          [1685673117.936672][2600:2602] CHIP:DMG:         InvokeResponseIBs =
-          [1685673117.936747][2600:2602] CHIP:DMG:         [
-          [1685673117.936803][2600:2602] CHIP:DMG:                 InvokeResponseIB =
-          [1685673117.936880][2600:2602] CHIP:DMG:                 {
-          [1685673117.936941][2600:2602] CHIP:DMG:                         CommandStatusIB =
-          [1685673117.937029][2600:2602] CHIP:DMG:                         {
-          [1685673117.937106][2600:2602] CHIP:DMG:                                 CommandPathIB =
-          [1685673117.937199][2600:2602] CHIP:DMG:                                 {
-          [1685673117.937292][2600:2602] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673117.937389][2600:2602] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673117.937486][2600:2602] CHIP:DMG:                                         CommandId = 0x1a,
-          [1685673117.937577][2600:2602] CHIP:DMG:                                 },
-          [1685673117.937680][2600:2602] CHIP:DMG:
-          [1685673117.937755][2600:2602] CHIP:DMG:                                 StatusIB =
-          [1685673117.938008][2600:2602] CHIP:DMG:                                 {
-          [1685673117.938101][2600:2602] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673117.938194][2600:2602] CHIP:DMG:                                 },
-          [1685673117.938286][2600:2602] CHIP:DMG:
-          [1685673117.938368][2600:2602] CHIP:DMG:                         },
-          [1685673117.938462][2600:2602] CHIP:DMG:
-          [1685673117.938530][2600:2602] CHIP:DMG:                 },
-          [1685673117.938610][2600:2602] CHIP:DMG:
-          [1685673117.938667][2600:2602] CHIP:DMG:         ],
-          [1685673117.938737][2600:2602] CHIP:DMG:
-          [1685673117.938795][2600:2602] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673117.938850][2600:2602] CHIP:DMG: },
-
-
-          ./chip-tool doorlock set-week-day-schedule 1 1 2  15 45 16 55 1 1 --trace_decode 1
+          [1698646982.058610][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698646982.058637][11905:11905] CHIP:DMG: {
+          [1698646982.058661][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698646982.058690][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698646982.058717][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698646982.058754][11905:11905] CHIP:DMG:         [
+          [1698646982.058780][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698646982.058811][11905:11905] CHIP:DMG:                 {
+          [1698646982.058839][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698646982.058876][11905:11905] CHIP:DMG:                         {
+          [1698646982.058910][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646982.058944][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646982.058979][11905:11905] CHIP:DMG:                                 CommandId = 0x1a,
+          [1698646982.059011][11905:11905] CHIP:DMG:                         },
+          [1698646982.059072][11905:11905] CHIP:DMG:
+          [1698646982.059104][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698646982.059137][11905:11905] CHIP:DMG:                         {
+          [1698646982.059192][11905:11905] CHIP:DMG:                                 0x0 = 0,
+          [1698646982.059232][11905:11905] CHIP:DMG:                                 0x1 = 1,
+          [1698646982.059270][11905:11905] CHIP:DMG:                                 0x2 = "xxx" (3 chars),
+          [1698646982.059333][11905:11905] CHIP:DMG:                                 0x3 = 6452,
+          [1698646982.059371][11905:11905] CHIP:DMG:                                 0x4 = 1,
+          [1698646982.059406][11905:11905] CHIP:DMG:                                 0x5 = 0,
+          [1698646982.059467][11905:11905] CHIP:DMG:                                 0x6 = 0,
+          [1698646982.059503][11905:11905] CHIP:DMG:                         },
+          [1698646982.059534][11905:11905] CHIP:DMG:                 },
+          [1698646982.059571][11905:11905] CHIP:DMG:
+          [1698646982.059625][11905:11905] CHIP:DMG:         ],
+          [1698646982.059662][11905:11905] CHIP:DMG:
+          [1698646982.059714][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646982.059763][11905:11905] CHIP:DMG: },
+
+          ./chip-tool doorlock set-week-day-schedule 1 1 2  15 45 16 55 1 1
 
           Verify TH receives Set Week Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673143.421323][2604:2606] CHIP:DMG: InvokeResponseMessage =
-          [1685673143.421380][2604:2606] CHIP:DMG: {
-          [1685673143.421437][2604:2606] CHIP:DMG:         suppressResponse = false,
-          [1685673143.421495][2604:2606] CHIP:DMG:         InvokeResponseIBs =
-          [1685673143.421569][2604:2606] CHIP:DMG:         [
-          [1685673143.421628][2604:2606] CHIP:DMG:                 InvokeResponseIB =
-          [1685673143.421705][2604:2606] CHIP:DMG:                 {
-          [1685673143.421893][2604:2606] CHIP:DMG:                         CommandStatusIB =
-          [1685673143.421975][2604:2606] CHIP:DMG:                         {
-          [1685673143.422043][2604:2606] CHIP:DMG:                                 CommandPathIB =
-          [1685673143.422121][2604:2606] CHIP:DMG:                                 {
-          [1685673143.422197][2604:2606] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673143.422277][2604:2606] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673143.422357][2604:2606] CHIP:DMG:                                         CommandId = 0xb,
-          [1685673143.422432][2604:2606] CHIP:DMG:                                 },
-          [1685673143.422517][2604:2606] CHIP:DMG:
-          [1685673143.422586][2604:2606] CHIP:DMG:                                 StatusIB =
-          [1685673143.422660][2604:2606] CHIP:DMG:                                 {
-          [1685673143.422737][2604:2606] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673143.422812][2604:2606] CHIP:DMG:                                 },
-          [1685673143.422887][2604:2606] CHIP:DMG:
-          [1685673143.422954][2604:2606] CHIP:DMG:                         },
-          [1685673143.423030][2604:2606] CHIP:DMG:
-          [1685673143.423092][2604:2606] CHIP:DMG:                 },
-          [1685673143.423162][2604:2606] CHIP:DMG:
-          [1685673143.423218][2604:2606] CHIP:DMG:         ],
-          [1685673143.423289][2604:2606] CHIP:DMG:
-          [1685673143.423345][2604:2606] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673143.423400][2604:2606] CHIP:DMG: },
+          [1698647005.052611][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647005.052642][11905:11905] CHIP:DMG: {
+          [1698647005.052668][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647005.052700][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647005.052728][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647005.052783][11905:11905] CHIP:DMG:         [
+          [1698647005.052813][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647005.052845][11905:11905] CHIP:DMG:                 {
+          [1698647005.052889][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647005.052931][11905:11905] CHIP:DMG:                         {
+          [1698647005.052980][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647005.053019][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647005.053057][11905:11905] CHIP:DMG:                                 CommandId = 0xb,
+          [1698647005.053103][11905:11905] CHIP:DMG:                         },
+          [1698647005.053142][11905:11905] CHIP:DMG:
+          [1698647005.053174][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647005.053209][11905:11905] CHIP:DMG:                         {
+          [1698647005.053258][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647005.053297][11905:11905] CHIP:DMG:                                 0x1 = 1,
+          [1698647005.053347][11905:11905] CHIP:DMG:                                 0x2 = 2,
+          [1698647005.053386][11905:11905] CHIP:DMG:                                 0x3 = 15,
+          [1698647005.053424][11905:11905] CHIP:DMG:                                 0x4 = 45,
+          [1698647005.053462][11905:11905] CHIP:DMG:                                 0x5 = 16,
+          [1698647005.053512][11905:11905] CHIP:DMG:                                 0x6 = 55,
+          [1698647005.053549][11905:11905] CHIP:DMG:                         },
+          [1698647005.053593][11905:11905] CHIP:DMG:                 },
+          [1698647005.053636][11905:11905] CHIP:DMG:
+          [1698647005.053669][11905:11905] CHIP:DMG:         ],
+          [1698647005.053809][11905:11905] CHIP:DMG:
+          [1698647005.053864][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647005.053898][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 5: DUT sends Get Week Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C0c.Tx
       verification: |
-          ./chip-tool doorlock get-week-day-schedule 1 1 1 1 --trace_decode 1
+          ./chip-tool doorlock get-week-day-schedule 1 1 1 1
 
           Verify TH receives Get Week Day Schedule command response on TH(lock-app) log:
 
-          [1685673169.698639][2609:2611] CHIP:DMG: InvokeResponseMessage =
-          [1685673169.698694][2609:2611] CHIP:DMG: {
-          [1685673169.698748][2609:2611] CHIP:DMG:         suppressResponse = false,
-          [1685673169.698804][2609:2611] CHIP:DMG:         InvokeResponseIBs =
-          [1685673169.698882][2609:2611] CHIP:DMG:         [
-          [1685673169.698940][2609:2611] CHIP:DMG:                 InvokeResponseIB =
-          [1685673169.699023][2609:2611] CHIP:DMG:                 {
-          [1685673169.699083][2609:2611] CHIP:DMG:                         CommandDataIB =
-          [1685673169.699151][2609:2611] CHIP:DMG:                         {
-          [1685673169.699211][2609:2611] CHIP:DMG:                                 CommandPathIB =
-          [1685673169.699288][2609:2611] CHIP:DMG:                                 {
-          [1685673169.699363][2609:2611] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673169.699443][2609:2611] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673169.699521][2609:2611] CHIP:DMG:                                         CommandId = 0xc,
-          [1685673169.699596][2609:2611] CHIP:DMG:                                 },
-          [1685673169.699787][2609:2611] CHIP:DMG:
-          [1685673169.699917][2609:2611] CHIP:DMG:                                 CommandFields =
-          [1685673169.700000][2609:2611] CHIP:DMG:                                 {
-          [1685673169.700080][2609:2611] CHIP:DMG:                                         0x0 = 1,
-          [1685673169.700162][2609:2611] CHIP:DMG:                                         0x1 = 1,
-          [1685673169.700243][2609:2611] CHIP:DMG:                                         0x2 = 0,
-          [1685673169.700324][2609:2611] CHIP:DMG:                                         0x3 = 2,
-          [1685673169.700451][2609:2611] CHIP:DMG:                                         0x4 = 15,
-          [1685673169.700535][2609:2611] CHIP:DMG:                                         0x5 = 45,
-          [1685673169.700616][2609:2611] CHIP:DMG:                                         0x6 = 16,
-          [1685673169.700697][2609:2611] CHIP:DMG:                                         0x7 = 55,
-          [1685673169.700835][2609:2611] CHIP:DMG:                                 },
-          [1685673169.700908][2609:2611] CHIP:DMG:                         },
-          [1685673169.700991][2609:2611] CHIP:DMG:
-          [1685673169.701053][2609:2611] CHIP:DMG:                 },
-          [1685673169.701130][2609:2611] CHIP:DMG:
-          [1685673169.701186][2609:2611] CHIP:DMG:         ],
-          [1685673169.701265][2609:2611] CHIP:DMG:
-          [1685673169.701320][2609:2611] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673169.701375][2609:2611] CHIP:DMG: },
+          [1698647031.575773][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647031.575813][11905:11905] CHIP:DMG: {
+          [1698647031.575848][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647031.575886][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647031.575925][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647031.575974][11905:11905] CHIP:DMG:         [
+          [1698647031.576012][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647031.576055][11905:11905] CHIP:DMG:                 {
+          [1698647031.576095][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647031.576140][11905:11905] CHIP:DMG:                         {
+          [1698647031.576192][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647031.576242][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647031.576320][11905:11905] CHIP:DMG:                                 CommandId = 0xc,
+          [1698647031.576372][11905:11905] CHIP:DMG:                         },
+          [1698647031.576424][11905:11905] CHIP:DMG:
+          [1698647031.576466][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647031.576513][11905:11905] CHIP:DMG:                         {
+          [1698647031.576563][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647031.576613][11905:11905] CHIP:DMG:                                 0x1 = 1,
+          [1698647031.576665][11905:11905] CHIP:DMG:                         },
+          [1698647031.576708][11905:11905] CHIP:DMG:                 },
+          [1698647031.576755][11905:11905] CHIP:DMG:
+          [1698647031.576792][11905:11905] CHIP:DMG:         ],
+          [1698647031.576835][11905:11905] CHIP:DMG:
+          [1698647031.576866][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647031.576896][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 6: DUT sends Clear Week Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C0d.Tx
       verification: |
-          ./chip-tool doorlock clear-week-day-schedule 1 1 1 1 --trace_decode 1
+          ./chip-tool doorlock clear-week-day-schedule 1 1 1 1
 
           Verify TH receives Clear Week Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673196.080189][2614:2616] CHIP:DMG: InvokeResponseMessage =
-          [1685673196.080247][2614:2616] CHIP:DMG: {
-          [1685673196.080303][2614:2616] CHIP:DMG:         suppressResponse = false,
-          [1685673196.080383][2614:2616] CHIP:DMG:         InvokeResponseIBs =
-          [1685673196.080455][2614:2616] CHIP:DMG:         [
-          [1685673196.080533][2614:2616] CHIP:DMG:                 InvokeResponseIB =
-          [1685673196.080616][2614:2616] CHIP:DMG:                 {
-          [1685673196.080696][2614:2616] CHIP:DMG:                         CommandStatusIB =
-          [1685673196.080768][2614:2616] CHIP:DMG:                         {
-          [1685673196.080836][2614:2616] CHIP:DMG:                                 CommandPathIB =
-          [1685673196.080933][2614:2616] CHIP:DMG:                                 {
-          [1685673196.081030][2614:2616] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673196.081112][2614:2616] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673196.081213][2614:2616] CHIP:DMG:                                         CommandId = 0xd,
-          [1685673196.081284][2614:2616] CHIP:DMG:                                 },
-          [1685673196.081362][2614:2616] CHIP:DMG:
-          [1685673196.081448][2614:2616] CHIP:DMG:                                 StatusIB =
-          [1685673196.081519][2614:2616] CHIP:DMG:                                 {
-          [1685673196.081616][2614:2616] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673196.081692][2614:2616] CHIP:DMG:                                 },
-          [1685673196.081822][2614:2616] CHIP:DMG:
-          [1685673196.081891][2614:2616] CHIP:DMG:                         },
-          [1685673196.081991][2614:2616] CHIP:DMG:
-          [1685673196.082053][2614:2616] CHIP:DMG:                 },
-          [1685673196.082125][2614:2616] CHIP:DMG:
-          [1685673196.082202][2614:2616] CHIP:DMG:         ],
-          [1685673196.082276][2614:2616] CHIP:DMG:
-          [1685673196.082331][2614:2616] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673196.082409][2614:2616] CHIP:DMG: },
+          [1698646775.513834][11887:11887] CHIP:DMG: InvokeRequestMessage =
+          [1698646775.513862][11887:11887] CHIP:DMG: {
+          [1698646775.513884][11887:11887] CHIP:DMG:         suppressResponse = false,
+          [1698646775.513911][11887:11887] CHIP:DMG:         timedRequest = false,
+          [1698646775.513942][11887:11887] CHIP:DMG:         InvokeRequests =
+          [1698646775.513982][11887:11887] CHIP:DMG:         [
+          [1698646775.514007][11887:11887] CHIP:DMG:                 CommandDataIB =
+          [1698646775.514033][11887:11887] CHIP:DMG:                 {
+          [1698646775.514059][11887:11887] CHIP:DMG:                         CommandPathIB =
+          [1698646775.514088][11887:11887] CHIP:DMG:                         {
+          [1698646775.514118][11887:11887] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646775.514152][11887:11887] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646775.514184][11887:11887] CHIP:DMG:                                 CommandId = 0xd,
+          [1698646775.514214][11887:11887] CHIP:DMG:                         },
+          [1698646775.514245][11887:11887] CHIP:DMG:
+          [1698646775.514272][11887:11887] CHIP:DMG:                         CommandFields =
+          [1698646775.514301][11887:11887] CHIP:DMG:                         {
+          [1698646775.514332][11887:11887] CHIP:DMG:                                 0x0 = 1,
+          [1698646775.514364][11887:11887] CHIP:DMG:                                 0x1 = 1,
+          [1698646775.514396][11887:11887] CHIP:DMG:                         },
+          [1698646775.514422][11887:11887] CHIP:DMG:                 },
+          [1698646775.514453][11887:11887] CHIP:DMG:
+          [1698646775.514477][11887:11887] CHIP:DMG:         ],
+          [1698646775.514507][11887:11887] CHIP:DMG:
+          [1698646775.514529][11887:11887] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646775.514552][11887:11887] CHIP:DMG: },
       disabled: true
 
     - label: "Step 7: DUT sends Set Year Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C0e.Tx
       verification: |
-          ./chip-tool doorlock set-year-day-schedule 1 1 1080 2100 1 1 --trace_decode 1
+          ./chip-tool doorlock set-year-day-schedule 1 1 1080 2100 1 1
 
           Verify TH receives Set Year Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673212.614964][2617:2619] CHIP:DMG: InvokeResponseMessage =
-          [1685673212.615020][2617:2619] CHIP:DMG: {
-          [1685673212.615096][2617:2619] CHIP:DMG:         suppressResponse = false,
-          [1685673212.615154][2617:2619] CHIP:DMG:         InvokeResponseIBs =
-          [1685673212.615227][2617:2619] CHIP:DMG:         [
-          [1685673212.615306][2617:2619] CHIP:DMG:                 InvokeResponseIB =
-          [1685673212.615385][2617:2619] CHIP:DMG:                 {
-          [1685673212.615466][2617:2619] CHIP:DMG:                         CommandStatusIB =
-          [1685673212.615544][2617:2619] CHIP:DMG:                         {
-          [1685673212.615611][2617:2619] CHIP:DMG:                                 CommandPathIB =
-          [1685673212.615707][2617:2619] CHIP:DMG:                                 {
-          [1685673212.615784][2617:2619] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673212.615884][2617:2619] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673212.615962][2617:2619] CHIP:DMG:                                         CommandId = 0xe,
-          [1685673212.616061][2617:2619] CHIP:DMG:                                 },
-          [1685673212.616147][2617:2619] CHIP:DMG:
-          [1685673212.616237][2617:2619] CHIP:DMG:                                 StatusIB =
-          [1685673212.616314][2617:2619] CHIP:DMG:                                 {
-          [1685673212.616411][2617:2619] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673212.616487][2617:2619] CHIP:DMG:                                 },
-          [1685673212.616583][2617:2619] CHIP:DMG:
-          [1685673212.616651][2617:2619] CHIP:DMG:                         },
-          [1685673212.616747][2617:2619] CHIP:DMG:
-          [1685673212.616809][2617:2619] CHIP:DMG:                 },
-          [1685673212.616902][2617:2619] CHIP:DMG:
-          [1685673212.616959][2617:2619] CHIP:DMG:         ],
-          [1685673212.617030][2617:2619] CHIP:DMG:
-          [1685673212.617109][2617:2619] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673212.617164][2617:2619] CHIP:DMG: },
+          [1698646805.099727][11887:11887] CHIP:DMG: InvokeRequestMessage =
+          [1698646805.099759][11887:11887] CHIP:DMG: {
+          [1698646805.099786][11887:11887] CHIP:DMG:         suppressResponse = false,
+          [1698646805.099817][11887:11887] CHIP:DMG:         timedRequest = false,
+          [1698646805.099847][11887:11887] CHIP:DMG:         InvokeRequests =
+          [1698646805.099885][11887:11887] CHIP:DMG:         [
+          [1698646805.099914][11887:11887] CHIP:DMG:                 CommandDataIB =
+          [1698646805.099946][11887:11887] CHIP:DMG:                 {
+          [1698646805.099976][11887:11887] CHIP:DMG:                         CommandPathIB =
+          [1698646805.100015][11887:11887] CHIP:DMG:                         {
+          [1698646805.100051][11887:11887] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698646805.100089][11887:11887] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698646805.100126][11887:11887] CHIP:DMG:                                 CommandId = 0xe,
+          [1698646805.100161][11887:11887] CHIP:DMG:                         },
+          [1698646805.100196][11887:11887] CHIP:DMG:
+          [1698646805.100227][11887:11887] CHIP:DMG:                         CommandFields =
+          [1698646805.100260][11887:11887] CHIP:DMG:                         {
+          [1698646805.100427][11887:11887] CHIP:DMG:                                 0x0 = 1,
+          [1698646805.100471][11887:11887] CHIP:DMG:                                 0x1 = 1,
+          [1698646805.100510][11887:11887] CHIP:DMG:                                 0x2 = 1080,
+          [1698646805.100548][11887:11887] CHIP:DMG:                                 0x3 = 2100,
+          [1698646805.100585][11887:11887] CHIP:DMG:                         },
+          [1698646805.100618][11887:11887] CHIP:DMG:                 },
+          [1698646805.100656][11887:11887] CHIP:DMG:
+          [1698646805.100684][11887:11887] CHIP:DMG:         ],
+          [1698646805.100721][11887:11887] CHIP:DMG:
+          [1698646805.100749][11887:11887] CHIP:DMG:         InteractionModelRevision = 11
+          [1698646805.100777][11887:11887] CHIP:DMG: },
       disabled: true
 
     - label: "Step 8: DUT sends Get Year Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C0f.Tx
       verification: |
-          ./chip-tool doorlock get-year-day-schedule 1 1 1 1 --trace_decode 1
+          ./chip-tool doorlock get-year-day-schedule 1 1 1 1
 
           Verify TH receives Get Year Day Schedule command response on TH(lock-app) log:
 
-          [1685673233.319349][2622:2624] CHIP:DMG: InvokeResponseMessage =
-          [1685673233.319404][2622:2624] CHIP:DMG: {
-          [1685673233.319458][2622:2624] CHIP:DMG:         suppressResponse = false,
-          [1685673233.319515][2622:2624] CHIP:DMG:         InvokeResponseIBs =
-          [1685673233.319592][2622:2624] CHIP:DMG:         [
-          [1685673233.319648][2622:2624] CHIP:DMG:                 InvokeResponseIB =
-          [1685673233.319732][2622:2624] CHIP:DMG:                 {
-          [1685673233.319792][2622:2624] CHIP:DMG:                         CommandDataIB =
-          [1685673233.319863][2622:2624] CHIP:DMG:                         {
-          [1685673233.319987][2622:2624] CHIP:DMG:                                 CommandPathIB =
-          [1685673233.320066][2622:2624] CHIP:DMG:                                 {
-          [1685673233.320144][2622:2624] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673233.320223][2622:2624] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673233.320303][2622:2624] CHIP:DMG:                                         CommandId = 0xf,
-          [1685673233.320379][2622:2624] CHIP:DMG:                                 },
-          [1685673233.320458][2622:2624] CHIP:DMG:
-          [1685673233.320524][2622:2624] CHIP:DMG:                                 CommandFields =
-          [1685673233.320598][2622:2624] CHIP:DMG:                                 {
-          [1685673233.320678][2622:2624] CHIP:DMG:                                         0x0 = 1,
-          [1685673233.320758][2622:2624] CHIP:DMG:                                         0x1 = 1,
-          [1685673233.320840][2622:2624] CHIP:DMG:                                         0x2 = 0,
-          [1685673233.320992][2622:2624] CHIP:DMG:                                         0x3 = 1080,
-          [1685673233.321075][2622:2624] CHIP:DMG:                                         0x4 = 2100,
-          [1685673233.321155][2622:2624] CHIP:DMG:                                 },
-          [1685673233.321226][2622:2624] CHIP:DMG:                         },
-          [1685673233.321310][2622:2624] CHIP:DMG:
-          [1685673233.321372][2622:2624] CHIP:DMG:                 },
-          [1685673233.321450][2622:2624] CHIP:DMG:
-          [1685673233.321506][2622:2624] CHIP:DMG:         ],
-          [1685673233.321581][2622:2624] CHIP:DMG:
-          [1685673233.321637][2622:2624] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673233.321691][2622:2624] CHIP:DMG: },
+          [1698647099.466619][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647099.466652][11905:11905] CHIP:DMG: {
+          [1698647099.466679][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647099.466709][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647099.466751][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647099.466787][11905:11905] CHIP:DMG:         [
+          [1698647099.466814][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647099.466842][11905:11905] CHIP:DMG:                 {
+          [1698647099.466880][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647099.466921][11905:11905] CHIP:DMG:                         {
+          [1698647099.466966][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647099.467000][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647099.467047][11905:11905] CHIP:DMG:                                 CommandId = 0xf,
+          [1698647099.467080][11905:11905] CHIP:DMG:                         },
+          [1698647099.467124][11905:11905] CHIP:DMG:
+          [1698647099.467155][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647099.467197][11905:11905] CHIP:DMG:                         {
+          [1698647099.467232][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647099.467277][11905:11905] CHIP:DMG:                                 0x1 = 1,
+          [1698647099.467311][11905:11905] CHIP:DMG:                         },
+          [1698647099.467352][11905:11905] CHIP:DMG:                 },
+          [1698647099.467386][11905:11905] CHIP:DMG:
+          [1698647099.467411][11905:11905] CHIP:DMG:         ],
+          [1698647099.467455][11905:11905] CHIP:DMG:
+          [1698647099.467481][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647099.467517][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 9: DUT sends Clear Year Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C10.Tx
       verification: |
-          ./chip-tool doorlock clear-year-day-schedule 1 1 1 1 --trace_decode 1
+          ./chip-tool doorlock clear-year-day-schedule 1 1 1 1
 
           Verify TH receives Clear Year Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673250.141106][2626:2628] CHIP:DMG: InvokeResponseMessage =
-          [1685673250.141162][2626:2628] CHIP:DMG: {
-          [1685673250.141215][2626:2628] CHIP:DMG:         suppressResponse = false,
-          [1685673250.141271][2626:2628] CHIP:DMG:         InvokeResponseIBs =
-          [1685673250.141342][2626:2628] CHIP:DMG:         [
-          [1685673250.141399][2626:2628] CHIP:DMG:                 InvokeResponseIB =
-          [1685673250.141479][2626:2628] CHIP:DMG:                 {
-          [1685673250.141539][2626:2628] CHIP:DMG:                         CommandStatusIB =
-          [1685673250.141608][2626:2628] CHIP:DMG:                         {
-          [1685673250.141672][2626:2628] CHIP:DMG:                                 CommandPathIB =
-          [1685673250.141746][2626:2628] CHIP:DMG:                                 {
-          [1685673250.141871][2626:2628] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673250.141952][2626:2628] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673250.142031][2626:2628] CHIP:DMG:                                         CommandId = 0x10,
-          [1685673250.142104][2626:2628] CHIP:DMG:                                 },
-          [1685673250.142189][2626:2628] CHIP:DMG:
-          [1685673250.142254][2626:2628] CHIP:DMG:                                 StatusIB =
-          [1685673250.142325][2626:2628] CHIP:DMG:                                 {
-          [1685673250.142402][2626:2628] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673250.142567][2626:2628] CHIP:DMG:                                 },
-          [1685673250.142648][2626:2628] CHIP:DMG:
-          [1685673250.142716][2626:2628] CHIP:DMG:                         },
-          [1685673250.142794][2626:2628] CHIP:DMG:
-          [1685673250.142853][2626:2628] CHIP:DMG:                 },
-          [1685673250.142924][2626:2628] CHIP:DMG:
-          [1685673250.143047][2626:2628] CHIP:DMG:         ],
-          [1685673250.143123][2626:2628] CHIP:DMG:
-          [1685673250.143179][2626:2628] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673250.143233][2626:2628] CHIP:DMG: },
+          [1698647125.062059][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647125.062092][11905:11905] CHIP:DMG: {
+          [1698647125.062121][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647125.062156][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647125.062187][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647125.062229][11905:11905] CHIP:DMG:         [
+          [1698647125.062260][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647125.062295][11905:11905] CHIP:DMG:                 {
+          [1698647125.062328][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647125.062373][11905:11905] CHIP:DMG:                         {
+          [1698647125.062412][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647125.062452][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647125.062492][11905:11905] CHIP:DMG:                                 CommandId = 0x10,
+          [1698647125.062530][11905:11905] CHIP:DMG:                         },
+          [1698647125.062570][11905:11905] CHIP:DMG:
+          [1698647125.062603][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647125.062642][11905:11905] CHIP:DMG:                         {
+          [1698647125.062682][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647125.062723][11905:11905] CHIP:DMG:                                 0x1 = 1,
+          [1698647125.062764][11905:11905] CHIP:DMG:                         },
+          [1698647125.062800][11905:11905] CHIP:DMG:                 },
+          [1698647125.062839][11905:11905] CHIP:DMG:
+          [1698647125.062869][11905:11905] CHIP:DMG:         ],
+          [1698647125.062909][11905:11905] CHIP:DMG:
+          [1698647125.062939][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647125.062969][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 10: DUT sends Set Holiday Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C11.Tx
       verification: |
-          ./chip-tool doorlock set-holiday-schedule 1 20 30 0 1 1 --trace_decode 1
+          ./chip-tool doorlock set-holiday-schedule 1 20 30 0 1 1
 
           Verify TH receives Set Holiday Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673266.868536][2630:2632] CHIP:DMG: InvokeResponseMessage =
-          [1685673266.868592][2630:2632] CHIP:DMG: {
-          [1685673266.868645][2630:2632] CHIP:DMG:         suppressResponse = false,
-          [1685673266.868772][2630:2632] CHIP:DMG:         InvokeResponseIBs =
-          [1685673266.868851][2630:2632] CHIP:DMG:         [
-          [1685673266.868908][2630:2632] CHIP:DMG:                 InvokeResponseIB =
-          [1685673266.868985][2630:2632] CHIP:DMG:                 {
-          [1685673266.869181][2630:2632] CHIP:DMG:                         CommandStatusIB =
-          [1685673266.869255][2630:2632] CHIP:DMG:                         {
-          [1685673266.869323][2630:2632] CHIP:DMG:                                 CommandPathIB =
-          [1685673266.869399][2630:2632] CHIP:DMG:                                 {
-          [1685673266.869475][2630:2632] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673266.869554][2630:2632] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673266.869632][2630:2632] CHIP:DMG:                                         CommandId = 0x11,
-          [1685673266.869708][2630:2632] CHIP:DMG:                                 },
-          [1685673266.869819][2630:2632] CHIP:DMG:
-          [1685673266.869887][2630:2632] CHIP:DMG:                                 StatusIB =
-          [1685673266.869965][2630:2632] CHIP:DMG:                                 {
-          [1685673266.870041][2630:2632] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673266.870115][2630:2632] CHIP:DMG:                                 },
-          [1685673266.870190][2630:2632] CHIP:DMG:
-          [1685673266.870256][2630:2632] CHIP:DMG:                         },
-          [1685673266.870332][2630:2632] CHIP:DMG:
-          [1685673266.870392][2630:2632] CHIP:DMG:                 },
-          [1685673266.870463][2630:2632] CHIP:DMG:
-          [1685673266.870518][2630:2632] CHIP:DMG:         ],
-          [1685673266.870589][2630:2632] CHIP:DMG:
-          [1685673266.870644][2630:2632] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673266.870698][2630:2632] CHIP:DMG: },
+          [1698647147.130306][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647147.130327][11905:11905] CHIP:DMG: {
+          [1698647147.130345][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647147.130367][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647147.130386][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647147.130412][11905:11905] CHIP:DMG:         [
+          [1698647147.130431][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647147.130453][11905:11905] CHIP:DMG:                 {
+          [1698647147.130473][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647147.130503][11905:11905] CHIP:DMG:                         {
+          [1698647147.130527][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647147.130551][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647147.130576][11905:11905] CHIP:DMG:                                 CommandId = 0x11,
+          [1698647147.130598][11905:11905] CHIP:DMG:                         },
+          [1698647147.130623][11905:11905] CHIP:DMG:
+          [1698647147.130644][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647147.130667][11905:11905] CHIP:DMG:                         {
+          [1698647147.130693][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647147.130718][11905:11905] CHIP:DMG:                                 0x1 = 20,
+          [1698647147.130743][11905:11905] CHIP:DMG:                                 0x2 = 30,
+          [1698647147.130767][11905:11905] CHIP:DMG:                                 0x3 = 0,
+          [1698647147.130792][11905:11905] CHIP:DMG:                         },
+          [1698647147.130813][11905:11905] CHIP:DMG:                 },
+          [1698647147.130839][11905:11905] CHIP:DMG:
+          [1698647147.130858][11905:11905] CHIP:DMG:         ],
+          [1698647147.130883][11905:11905] CHIP:DMG:
+          [1698647147.130902][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647147.130920][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 11: DUT sends Get Holiday Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C12.Tx
       verification: |
-          ./chip-tool doorlock get-holiday-schedule 1 1 1 --trace_decode 1
+          ./chip-tool doorlock get-holiday-schedule 1 1 1
 
           Verify TH receives Get Holiday Day Schedule command response on TH(lock-app) log:
 
-          [1685673297.404334][2637:2639] CHIP:DMG: InvokeResponseMessage =
-          [1685673297.404389][2637:2639] CHIP:DMG: {
-          [1685673297.404442][2637:2639] CHIP:DMG:         suppressResponse = false,
-          [1685673297.404499][2637:2639] CHIP:DMG:         InvokeResponseIBs =
-          [1685673297.404575][2637:2639] CHIP:DMG:         [
-          [1685673297.404632][2637:2639] CHIP:DMG:                 InvokeResponseIB =
-          [1685673297.404716][2637:2639] CHIP:DMG:                 {
-          [1685673297.404776][2637:2639] CHIP:DMG:                         CommandDataIB =
-          [1685673297.404848][2637:2639] CHIP:DMG:                         {
-          [1685673297.404915][2637:2639] CHIP:DMG:                                 CommandPathIB =
-          [1685673297.404997][2637:2639] CHIP:DMG:                                 {
-          [1685673297.405075][2637:2639] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673297.405155][2637:2639] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673297.405233][2637:2639] CHIP:DMG:                                         CommandId = 0x12,
-          [1685673297.405307][2637:2639] CHIP:DMG:                                 },
-          [1685673297.405385][2637:2639] CHIP:DMG:
-          [1685673297.405451][2637:2639] CHIP:DMG:                                 CommandFields =
-          [1685673297.405524][2637:2639] CHIP:DMG:                                 {
-          [1685673297.405602][2637:2639] CHIP:DMG:                                         0x0 = 1,
-          [1685673297.405683][2637:2639] CHIP:DMG:                                         0x1 = 0,
-          [1685673297.405803][2637:2639] CHIP:DMG:                                         0x2 = 20,
-          [1685673297.405889][2637:2639] CHIP:DMG:                                         0x3 = 30,
-          [1685673297.405970][2637:2639] CHIP:DMG:                                         0x4 = 0,
-          [1685673297.406051][2637:2639] CHIP:DMG:                                 },
-          [1685673297.406122][2637:2639] CHIP:DMG:                         },
-          [1685673297.406202][2637:2639] CHIP:DMG:
-          [1685673297.406262][2637:2639] CHIP:DMG:                 },
-          [1685673297.406336][2637:2639] CHIP:DMG:
-          [1685673297.406391][2637:2639] CHIP:DMG:         ],
-          [1685673297.406467][2637:2639] CHIP:DMG:
-          [1685673297.406524][2637:2639] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673297.406578][2637:2639] CHIP:DMG: },
+          [1698647166.323919][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647166.323940][11905:11905] CHIP:DMG: {
+          [1698647166.323958][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647166.323979][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647166.323998][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647166.324022][11905:11905] CHIP:DMG:         [
+          [1698647166.324041][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647166.324064][11905:11905] CHIP:DMG:                 {
+          [1698647166.324084][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647166.324110][11905:11905] CHIP:DMG:                         {
+          [1698647166.324158][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647166.324184][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647166.324208][11905:11905] CHIP:DMG:                                 CommandId = 0x12,
+          [1698647166.324231][11905:11905] CHIP:DMG:                         },
+          [1698647166.324256][11905:11905] CHIP:DMG:
+          [1698647166.324277][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647166.324348][11905:11905] CHIP:DMG:                         {
+          [1698647166.324374][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647166.324399][11905:11905] CHIP:DMG:                         },
+          [1698647166.324420][11905:11905] CHIP:DMG:                 },
+          [1698647166.324445][11905:11905] CHIP:DMG:
+          [1698647166.324464][11905:11905] CHIP:DMG:         ],
+          [1698647166.324488][11905:11905] CHIP:DMG:
+          [1698647166.324506][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647166.324525][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 12: DUT sends Clear Holiday Day Schedule command to TH."
       PICS: DRLK.C.F04 && DRLK.C.C13.Tx
       verification: |
-          ./chip-tool doorlock clear-holiday-schedule 1 1 1 --trace_decode 1
+          ./chip-tool doorlock clear-holiday-schedule 1 1 1
 
           Verify TH receives Clear Holiday Day Schedule command with SUCCESS response on TH(lock-app) log:
 
-          [1685673314.255117][2642:2644] CHIP:DMG: InvokeResponseMessage =
-          [1685673314.255174][2642:2644] CHIP:DMG: {
-          [1685673314.255230][2642:2644] CHIP:DMG:         suppressResponse = false,
-          [1685673314.255286][2642:2644] CHIP:DMG:         InvokeResponseIBs =
-          [1685673314.255360][2642:2644] CHIP:DMG:         [
-          [1685673314.255417][2642:2644] CHIP:DMG:                 InvokeResponseIB =
-          [1685673314.255494][2642:2644] CHIP:DMG:                 {
-          [1685673314.255553][2642:2644] CHIP:DMG:                         CommandStatusIB =
-          [1685673314.255625][2642:2644] CHIP:DMG:                         {
-          [1685673314.255690][2642:2644] CHIP:DMG:                                 CommandPathIB =
-          [1685673314.255765][2642:2644] CHIP:DMG:                                 {
-          [1685673314.255840][2642:2644] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673314.255919][2642:2644] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673314.255996][2642:2644] CHIP:DMG:                                         CommandId = 0x13,
-          [1685673314.256071][2642:2644] CHIP:DMG:                                 },
-          [1685673314.256154][2642:2644] CHIP:DMG:
-          [1685673314.256219][2642:2644] CHIP:DMG:                                 StatusIB =
-          [1685673314.256293][2642:2644] CHIP:DMG:                                 {
-          [1685673314.256371][2642:2644] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673314.256446][2642:2644] CHIP:DMG:                                 },
-          [1685673314.256521][2642:2644] CHIP:DMG:
-          [1685673314.256589][2642:2644] CHIP:DMG:                         },
-          [1685673314.256665][2642:2644] CHIP:DMG:
-          [1685673314.256724][2642:2644] CHIP:DMG:                 },
-          [1685673314.256796][2642:2644] CHIP:DMG:
-          [1685673314.256851][2642:2644] CHIP:DMG:         ],
-          [1685673314.256921][2642:2644] CHIP:DMG:
-          [1685673314.256976][2642:2644] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673314.257030][2642:2644] CHIP:DMG: },
+          [1698647186.638119][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647186.638155][11905:11905] CHIP:DMG: {
+          [1698647186.638186][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647186.638240][11905:11905] CHIP:DMG:         timedRequest = false,
+          [1698647186.638275][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647186.638320][11905:11905] CHIP:DMG:         [
+          [1698647186.638355][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647186.638406][11905:11905] CHIP:DMG:                 {
+          [1698647186.638444][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647186.638498][11905:11905] CHIP:DMG:                         {
+          [1698647186.638548][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647186.638605][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647186.638653][11905:11905] CHIP:DMG:                                 CommandId = 0x13,
+          [1698647186.638715][11905:11905] CHIP:DMG:                         },
+          [1698647186.638761][11905:11905] CHIP:DMG:
+          [1698647186.638811][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647186.638852][11905:11905] CHIP:DMG:                         {
+          [1698647186.638909][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647186.638953][11905:11905] CHIP:DMG:                         },
+          [1698647186.639008][11905:11905] CHIP:DMG:                 },
+          [1698647186.639053][11905:11905] CHIP:DMG:
+          [1698647186.639087][11905:11905] CHIP:DMG:         ],
+          [1698647186.639142][11905:11905] CHIP:DMG:
+          [1698647186.639178][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647186.639223][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 13: DUT sends Set USer command to TH."
       PICS: DRLK.C.F08 && DRLK.C.C1a.Tx
       verification: |
-          ./chip-tool doorlock set-user 0 2 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock set-user 0 2 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Set User command with SUCCESS response on TH(lock-app) log:
 
-          [1685673332.573601][2645:2647] CHIP:DMG: InvokeResponseMessage =
-          [1685673332.573656][2645:2647] CHIP:DMG: {
-          [1685673332.573709][2645:2647] CHIP:DMG:         suppressResponse = false,
-          [1685673332.573902][2645:2647] CHIP:DMG:         InvokeResponseIBs =
-          [1685673332.573982][2645:2647] CHIP:DMG:         [
-          [1685673332.574040][2645:2647] CHIP:DMG:                 InvokeResponseIB =
-          [1685673332.574116][2645:2647] CHIP:DMG:                 {
-          [1685673332.574175][2645:2647] CHIP:DMG:                         CommandStatusIB =
-          [1685673332.574245][2645:2647] CHIP:DMG:                         {
-          [1685673332.574312][2645:2647] CHIP:DMG:                                 CommandPathIB =
-          [1685673332.574390][2645:2647] CHIP:DMG:                                 {
-          [1685673332.574466][2645:2647] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673332.574545][2645:2647] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673332.574623][2645:2647] CHIP:DMG:                                         CommandId = 0x1a,
-          [1685673332.574697][2645:2647] CHIP:DMG:                                 },
-          [1685673332.574780][2645:2647] CHIP:DMG:
-          [1685673332.574848][2645:2647] CHIP:DMG:                                 StatusIB =
-          [1685673332.574922][2645:2647] CHIP:DMG:                                 {
-          [1685673332.575013][2645:2647] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673332.575108][2645:2647] CHIP:DMG:                                 },
-          [1685673332.575202][2645:2647] CHIP:DMG:
-          [1685673332.575276][2645:2647] CHIP:DMG:                         },
-          [1685673332.575357][2645:2647] CHIP:DMG:
-          [1685673332.575417][2645:2647] CHIP:DMG:                 },
-          [1685673332.575488][2645:2647] CHIP:DMG:
-          [1685673332.575543][2645:2647] CHIP:DMG:         ],
-          [1685673332.575612][2645:2647] CHIP:DMG:
-          [1685673332.575667][2645:2647] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673332.575721][2645:2647] CHIP:DMG: },
+          [1698647215.994171][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647215.994229][11905:11905] CHIP:DMG: {
+          [1698647215.994264][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647215.994319][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647215.994358][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647215.994426][11905:11905] CHIP:DMG:         [
+          [1698647215.994466][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647215.994516][11905:11905] CHIP:DMG:                 {
+          [1698647215.994571][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647215.994617][11905:11905] CHIP:DMG:                         {
+          [1698647215.994679][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647215.994730][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647215.994792][11905:11905] CHIP:DMG:                                 CommandId = 0x1a,
+          [1698647215.994840][11905:11905] CHIP:DMG:                         },
+          [1698647215.994888][11905:11905] CHIP:DMG:
+          [1698647215.994946][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647215.994993][11905:11905] CHIP:DMG:                         {
+          [1698647215.995054][11905:11905] CHIP:DMG:                                 0x0 = 0,
+          [1698647215.995106][11905:11905] CHIP:DMG:                                 0x1 = 2,
+          [1698647215.995174][11905:11905] CHIP:DMG:                                 0x2 = "xxx" (3 chars),
+          [1698647215.995225][11905:11905] CHIP:DMG:                                 0x3 = 6452,
+          [1698647215.995290][11905:11905] CHIP:DMG:                                 0x4 = 1,
+          [1698647215.995341][11905:11905] CHIP:DMG:                                 0x5 = 0,
+          [1698647215.995406][11905:11905] CHIP:DMG:                                 0x6 = 0,
+          [1698647215.995455][11905:11905] CHIP:DMG:                         },
+          [1698647215.995513][11905:11905] CHIP:DMG:                 },
+          [1698647215.995566][11905:11905] CHIP:DMG:
+          [1698647215.995617][11905:11905] CHIP:DMG:         ],
+          [1698647215.995670][11905:11905] CHIP:DMG:
+          [1698647215.995720][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647215.995759][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 14: DUT sends Get User to TH."
       PICS: DRLK.C.F08 && DRLK.C.C1b.Tx
       verification: |
-          ./chip-tool doorlock get-user 2 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock get-user 2 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Get User command response on TH(lock-app) log:
 
-          [1685673354.071762][2648:2650] CHIP:DMG: InvokeResponseMessage =
-          [1685673354.071817][2648:2650] CHIP:DMG: {
-          [1685673354.071870][2648:2650] CHIP:DMG:         suppressResponse = false,
-          [1685673354.071926][2648:2650] CHIP:DMG:         InvokeResponseIBs =
-          [1685673354.072011][2648:2650] CHIP:DMG:         [
-          [1685673354.072068][2648:2650] CHIP:DMG:                 InvokeResponseIB =
-          [1685673354.072156][2648:2650] CHIP:DMG:                 {
-          [1685673354.072216][2648:2650] CHIP:DMG:                         CommandDataIB =
-          [1685673354.072285][2648:2650] CHIP:DMG:                         {
-          [1685673354.072352][2648:2650] CHIP:DMG:                                 CommandPathIB =
-          [1685673354.072428][2648:2650] CHIP:DMG:                                 {
-          [1685673354.072502][2648:2650] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673354.072582][2648:2650] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673354.072658][2648:2650] CHIP:DMG:                                         CommandId = 0x1c,
-          [1685673354.072733][2648:2650] CHIP:DMG:                                 },
-          [1685673354.072807][2648:2650] CHIP:DMG:
-          [1685673354.072875][2648:2650] CHIP:DMG:                                 CommandFields =
-          [1685673354.072948][2648:2650] CHIP:DMG:                                 {
-          [1685673354.073024][2648:2650] CHIP:DMG:                                         0x0 = 2,
-          [1685673354.073111][2648:2650] CHIP:DMG:                                         0x1 = "xxx" (3 chars),
-          [1685673354.073299][2648:2650] CHIP:DMG:                                         0x2 = 6452,
-          [1685673354.073384][2648:2650] CHIP:DMG:                                         0x3 = 1,
-          [1685673354.073465][2648:2650] CHIP:DMG:                                         0x4 = 0,
-          [1685673354.073546][2648:2650] CHIP:DMG:                                         0x5 = 0,
-          [1685673354.073667][2648:2650] CHIP:DMG:                                         0x6 = [
-          [1685673354.073749][2648:2650] CHIP:DMG:
-          [1685673354.073959][2648:2650] CHIP:DMG:                                         ],
-          [1685673354.074042][2648:2650] CHIP:DMG:                                         0x7 = 1,
-          [1685673354.074121][2648:2650] CHIP:DMG:                                         0x8 = 1,
-          [1685673354.074201][2648:2650] CHIP:DMG:                                         0x9 = NULL
-          [1685673354.074281][2648:2650] CHIP:DMG:                                 },
-          [1685673354.074350][2648:2650] CHIP:DMG:                         },
-          [1685673354.074439][2648:2650] CHIP:DMG:
-          [1685673354.074501][2648:2650] CHIP:DMG:                 },
-          [1685673354.074583][2648:2650] CHIP:DMG:
-          [1685673354.074638][2648:2650] CHIP:DMG:         ],
-          [1685673354.074725][2648:2650] CHIP:DMG:
-          [1685673354.074781][2648:2650] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673354.074836][2648:2650] CHIP:DMG: },
+          [1698647231.998669][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647231.998703][11905:11905] CHIP:DMG: {
+          [1698647231.998735][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647231.998772][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647231.998806][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647231.998850][11905:11905] CHIP:DMG:         [
+          [1698647231.998884][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647231.998923][11905:11905] CHIP:DMG:                 {
+          [1698647231.998959][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647231.999001][11905:11905] CHIP:DMG:                         {
+          [1698647231.999044][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647231.999088][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647231.999191][11905:11905] CHIP:DMG:                                 CommandId = 0x1b,
+          [1698647231.999235][11905:11905] CHIP:DMG:                         },
+          [1698647231.999316][11905:11905] CHIP:DMG:
+          [1698647231.999355][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647231.999429][11905:11905] CHIP:DMG:                         {
+          [1698647231.999475][11905:11905] CHIP:DMG:                                 0x0 = 2,
+          [1698647231.999543][11905:11905] CHIP:DMG:                         },
+          [1698647231.999586][11905:11905] CHIP:DMG:                 },
+          [1698647231.999653][11905:11905] CHIP:DMG:
+          [1698647231.999713][11905:11905] CHIP:DMG:         ],
+          [1698647231.999759][11905:11905] CHIP:DMG:
+          [1698647231.999793][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647231.999825][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 15: DUT sends Clear User command to TH.a"
       PICS: DRLK.C.F08 && DRLK.C.C1d.Tx
       verification: |
-          ./chip-tool doorlock clear-user 2 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock clear-user 2 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Clear User command with SUCCESS response on TH(lock-app) log:
 
-          [1685673377.373571][2656:2658] CHIP:DMG: InvokeResponseMessage =
-          [1685673377.373626][2656:2658] CHIP:DMG: {
-          [1685673377.373680][2656:2658] CHIP:DMG:         suppressResponse = false,
-          [1685673377.373736][2656:2658] CHIP:DMG:         InvokeResponseIBs =
-          [1685673377.373862][2656:2658] CHIP:DMG:         [
-          [1685673377.373923][2656:2658] CHIP:DMG:                 InvokeResponseIB =
-          [1685673377.374005][2656:2658] CHIP:DMG:                 {
-          [1685673377.374066][2656:2658] CHIP:DMG:                         CommandStatusIB =
-          [1685673377.374135][2656:2658] CHIP:DMG:                         {
-          [1685673377.374204][2656:2658] CHIP:DMG:                                 CommandPathIB =
-          [1685673377.374279][2656:2658] CHIP:DMG:                                 {
-          [1685673377.374357][2656:2658] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673377.374435][2656:2658] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673377.374514][2656:2658] CHIP:DMG:                                         CommandId = 0x1d,
-          [1685673377.374587][2656:2658] CHIP:DMG:                                 },
-          [1685673377.374669][2656:2658] CHIP:DMG:
-          [1685673377.374738][2656:2658] CHIP:DMG:                                 StatusIB =
-          [1685673377.374813][2656:2658] CHIP:DMG:                                 {
-          [1685673377.374889][2656:2658] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673377.374964][2656:2658] CHIP:DMG:                                 },
-          [1685673377.375039][2656:2658] CHIP:DMG:
-          [1685673377.375107][2656:2658] CHIP:DMG:                         },
-          [1685673377.375182][2656:2658] CHIP:DMG:
-          [1685673377.375241][2656:2658] CHIP:DMG:                 },
-          [1685673377.375313][2656:2658] CHIP:DMG:
-          [1685673377.375369][2656:2658] CHIP:DMG:         ],
-          [1685673377.375437][2656:2658] CHIP:DMG:
-          [1685673377.375489][2656:2658] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673377.375543][2656:2658] CHIP:DMG: },
+          [1698647262.792533][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647262.792569][11905:11905] CHIP:DMG: {
+          [1698647262.792600][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647262.792637][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647262.792671][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647262.792715][11905:11905] CHIP:DMG:         [
+          [1698647262.792750][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647262.792841][11905:11905] CHIP:DMG:                 {
+          [1698647262.792917][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647262.792993][11905:11905] CHIP:DMG:                         {
+          [1698647262.793040][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647262.793085][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647262.793130][11905:11905] CHIP:DMG:                                 CommandId = 0x1d,
+          [1698647262.793172][11905:11905] CHIP:DMG:                         },
+          [1698647262.793216][11905:11905] CHIP:DMG:
+          [1698647262.793290][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647262.793332][11905:11905] CHIP:DMG:                         {
+          [1698647262.793401][11905:11905] CHIP:DMG:                                 0x0 = 2,
+          [1698647262.793485][11905:11905] CHIP:DMG:                         },
+          [1698647262.793527][11905:11905] CHIP:DMG:                 },
+          [1698647262.793569][11905:11905] CHIP:DMG:
+          [1698647262.793603][11905:11905] CHIP:DMG:         ],
+          [1698647262.793679][11905:11905] CHIP:DMG:
+          [1698647262.793717][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647262.793750][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 16: DUT sends Set Credential command to TH.a"
       PICS: DRLK.C.F08 && DRLK.C.C22.Tx
       verification: |
-          ./chip-tool doorlock set-credential 0 '{ "credentialType" : 1 , "credentialIndex" : 1 }' 123456 1 0 0 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock set-credential 0 '{ "credentialType" : 1 , "credentialIndex" : 1 }' 123456 1 0 0 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Set Credential command response on TH(lock-app) log:
 
-          [1685673397.369211][2660:2662] CHIP:DMG: InvokeResponseMessage =
-          [1685673397.369266][2660:2662] CHIP:DMG: {
-          [1685673397.369320][2660:2662] CHIP:DMG:         suppressResponse = false,
-          [1685673397.369375][2660:2662] CHIP:DMG:         InvokeResponseIBs =
-          [1685673397.369448][2660:2662] CHIP:DMG:         [
-          [1685673397.369504][2660:2662] CHIP:DMG:                 InvokeResponseIB =
-          [1685673397.369584][2660:2662] CHIP:DMG:                 {
-          [1685673397.369644][2660:2662] CHIP:DMG:                         CommandDataIB =
-          [1685673397.369712][2660:2662] CHIP:DMG:                         {
-          [1685673397.369829][2660:2662] CHIP:DMG:                                 CommandPathIB =
-          [1685673397.369908][2660:2662] CHIP:DMG:                                 {
-          [1685673397.369981][2660:2662] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673397.370061][2660:2662] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673397.370138][2660:2662] CHIP:DMG:                                         CommandId = 0x23,
-          [1685673397.370212][2660:2662] CHIP:DMG:                                 },
-          [1685673397.370289][2660:2662] CHIP:DMG:
-          [1685673397.370356][2660:2662] CHIP:DMG:                                 CommandFields =
-          [1685673397.370428][2660:2662] CHIP:DMG:                                 {
-          [1685673397.370506][2660:2662] CHIP:DMG:                                         0x0 = 133,
-          [1685673397.370586][2660:2662] CHIP:DMG:                                         0x1 = NULL
-          [1685673397.370665][2660:2662] CHIP:DMG:                                         0x2 = 2,
-          [1685673397.370743][2660:2662] CHIP:DMG:                                 },
-          [1685673397.370812][2660:2662] CHIP:DMG:                         },
-          [1685673397.370892][2660:2662] CHIP:DMG:
-          [1685673397.370951][2660:2662] CHIP:DMG:                 },
-          [1685673397.371023][2660:2662] CHIP:DMG:
-          [1685673397.371078][2660:2662] CHIP:DMG:         ],
-          [1685673397.371150][2660:2662] CHIP:DMG:
-          [1685673397.371208][2660:2662] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673397.371263][2660:2662] CHIP:DMG: },
+          [1698647281.453556][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647281.453576][11905:11905] CHIP:DMG: {
+          [1698647281.453593][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647281.453614][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647281.453634][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647281.453661][11905:11905] CHIP:DMG:         [
+          [1698647281.453681][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647281.453703][11905:11905] CHIP:DMG:                 {
+          [1698647281.453735][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647281.453762][11905:11905] CHIP:DMG:                         {
+          [1698647281.453791][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647281.453822][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647281.453851][11905:11905] CHIP:DMG:                                 CommandId = 0x22,
+          [1698647281.453880][11905:11905] CHIP:DMG:                         },
+          [1698647281.453907][11905:11905] CHIP:DMG:
+          [1698647281.453929][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647281.453957][11905:11905] CHIP:DMG:                         {
+          [1698647281.453987][11905:11905] CHIP:DMG:                                 0x0 = 0,
+          [1698647281.454016][11905:11905] CHIP:DMG:                                 0x1 =
+          [1698647281.454046][11905:11905] CHIP:DMG:                                 {
+          [1698647281.454077][11905:11905] CHIP:DMG:                                         0x0 = 1,
+          [1698647281.454109][11905:11905] CHIP:DMG:                                         0x1 = 1,
+          [1698647281.454141][11905:11905] CHIP:DMG:                                 },
+          [1698647281.454172][11905:11905] CHIP:DMG:                                 0x2 = [
+          [1698647281.454202][11905:11905] CHIP:DMG:                                                 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+          [1698647281.454232][11905:11905] CHIP:DMG:                                 ] (6 bytes)
+          [1698647281.454263][11905:11905] CHIP:DMG:                                 0x3 = 1,
+          [1698647281.454290][11905:11905] CHIP:DMG:                                 0x4 = 0,
+          [1698647281.454320][11905:11905] CHIP:DMG:                                 0x5 = 0,
+          [1698647281.454349][11905:11905] CHIP:DMG:                         },
+          [1698647281.454376][11905:11905] CHIP:DMG:                 },
+          [1698647281.454403][11905:11905] CHIP:DMG:
+          [1698647281.454422][11905:11905] CHIP:DMG:         ],
+          [1698647281.454448][11905:11905] CHIP:DMG:
+          [1698647281.454467][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647281.454485][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 17: DUT sends Get Credential to TH."
       PICS: DRLK.C.F08 && DRLK.C.C24.Tx
       verification: |
-          ./chip-tool doorlock get-credential-status  '{ "credentialType" : 1 , "credentialIndex" : 1 }' 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock get-credential-status  '{ "credentialType" : 1 , "credentialIndex" : 1 }' 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Get Credential command response on TH(lock-app) log:
 
-          [1685673421.665556][2664:2666] CHIP:DMG: InvokeResponseMessage =
-          [1685673421.665610][2664:2666] CHIP:DMG: {
-          [1685673421.665662][2664:2666] CHIP:DMG:         suppressResponse = false,
-          [1685673421.665720][2664:2666] CHIP:DMG:         InvokeResponseIBs =
-          [1685673421.665921][2664:2666] CHIP:DMG:         [
-          [1685673421.665982][2664:2666] CHIP:DMG:                 InvokeResponseIB =
-          [1685673421.666061][2664:2666] CHIP:DMG:                 {
-          [1685673421.666121][2664:2666] CHIP:DMG:                         CommandDataIB =
-          [1685673421.666195][2664:2666] CHIP:DMG:                         {
-          [1685673421.666261][2664:2666] CHIP:DMG:                                 CommandPathIB =
-          [1685673421.666335][2664:2666] CHIP:DMG:                                 {
-          [1685673421.666411][2664:2666] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673421.666490][2664:2666] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673421.666652][2664:2666] CHIP:DMG:                                         CommandId = 0x25,
-          [1685673421.666732][2664:2666] CHIP:DMG:                                 },
-          [1685673421.666812][2664:2666] CHIP:DMG:
-          [1685673421.666881][2664:2666] CHIP:DMG:                                 CommandFields =
-          [1685673421.666961][2664:2666] CHIP:DMG:                                 {
-          [1685673421.667041][2664:2666] CHIP:DMG:                                         0x0 = false,
-          [1685673421.667122][2664:2666] CHIP:DMG:                                         0x1 = NULL
-          [1685673421.667203][2664:2666] CHIP:DMG:                                         0x2 = NULL
-          [1685673421.667282][2664:2666] CHIP:DMG:                                         0x3 = NULL
-          [1685673421.667362][2664:2666] CHIP:DMG:                                         0x4 = NULL
-          [1685673421.667439][2664:2666] CHIP:DMG:                                 },
-          [1685673421.667509][2664:2666] CHIP:DMG:                         },
-          [1685673421.667590][2664:2666] CHIP:DMG:
-          [1685673421.667722][2664:2666] CHIP:DMG:                 },
-          [1685673421.667808][2664:2666] CHIP:DMG:
-          [1685673421.667865][2664:2666] CHIP:DMG:         ],
-          [1685673421.667939][2664:2666] CHIP:DMG:
-          [1685673421.667995][2664:2666] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673421.668049][2664:2666] CHIP:DMG: },
+          [1698647325.882227][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647325.882264][11905:11905] CHIP:DMG: {
+          [1698647325.882299][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647325.882339][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647325.882377][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647325.882427][11905:11905] CHIP:DMG:         [
+          [1698647325.882465][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647325.882518][11905:11905] CHIP:DMG:                 {
+          [1698647325.882559][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647325.882606][11905:11905] CHIP:DMG:                         {
+          [1698647325.882656][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647325.882706][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647325.882754][11905:11905] CHIP:DMG:                                 CommandId = 0x24,
+          [1698647325.882800][11905:11905] CHIP:DMG:                         },
+          [1698647325.882849][11905:11905] CHIP:DMG:
+          [1698647325.882890][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647325.882935][11905:11905] CHIP:DMG:                         {
+          [1698647325.882981][11905:11905] CHIP:DMG:                                 0x0 =
+          [1698647325.883029][11905:11905] CHIP:DMG:                                 {
+          [1698647325.883080][11905:11905] CHIP:DMG:                                         0x0 = 1,
+          [1698647325.883133][11905:11905] CHIP:DMG:                                         0x1 = 1,
+          [1698647325.883185][11905:11905] CHIP:DMG:                                 },
+          [1698647325.883232][11905:11905] CHIP:DMG:                         },
+          [1698647325.883276][11905:11905] CHIP:DMG:                 },
+          [1698647325.883324][11905:11905] CHIP:DMG:
+          [1698647325.883361][11905:11905] CHIP:DMG:         ],
+          [1698647325.883409][11905:11905] CHIP:DMG:
+          [1698647325.883446][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647325.883483][11905:11905] CHIP:DMG: },
       disabled: true
 
     - label: "Step 18: DUT sends Clear Credential command to TH."
       PICS: DRLK.C.F08 && DRLK.C.C26.Tx
       verification: |
-          ./chip-tool doorlock clear-credential  '{ "credentialType" : 1 , "credentialIndex" : 1 }' 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          ./chip-tool doorlock clear-credential  '{ "credentialType" : 1 , "credentialIndex" : 1 }' 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Clear Credential command with SUCCESS response on TH(lock-app) log:
 
-          [1685673444.692000][2668:2670] CHIP:DMG: InvokeResponseMessage =
-          [1685673444.692055][2668:2670] CHIP:DMG: {
-          [1685673444.692109][2668:2670] CHIP:DMG:         suppressResponse = false,
-          [1685673444.692164][2668:2670] CHIP:DMG:         InvokeResponseIBs =
-          [1685673444.692235][2668:2670] CHIP:DMG:         [
-          [1685673444.692292][2668:2670] CHIP:DMG:                 InvokeResponseIB =
-          [1685673444.692368][2668:2670] CHIP:DMG:                 {
-          [1685673444.692429][2668:2670] CHIP:DMG:                         CommandStatusIB =
-          [1685673444.692518][2668:2670] CHIP:DMG:                         {
-          [1685673444.692597][2668:2670] CHIP:DMG:                                 CommandPathIB =
-          [1685673444.692691][2668:2670] CHIP:DMG:                                 {
-          [1685673444.692783][2668:2670] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673444.692879][2668:2670] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673444.692974][2668:2670] CHIP:DMG:                                         CommandId = 0x26,
-          [1685673444.693065][2668:2670] CHIP:DMG:                                 },
-          [1685673444.693164][2668:2670] CHIP:DMG:
-          [1685673444.693239][2668:2670] CHIP:DMG:                                 StatusIB =
-          [1685673444.693330][2668:2670] CHIP:DMG:                                 {
-          [1685673444.693517][2668:2670] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673444.693608][2668:2670] CHIP:DMG:                                 },
-          [1685673444.693700][2668:2670] CHIP:DMG:
-          [1685673444.693934][2668:2670] CHIP:DMG:                         },
-          [1685673444.694029][2668:2670] CHIP:DMG:
-          [1685673444.694099][2668:2670] CHIP:DMG:                 },
-          [1685673444.694183][2668:2670] CHIP:DMG:
-          [1685673444.694241][2668:2670] CHIP:DMG:         ],
-          [1685673444.694410][2668:2670] CHIP:DMG:
-          [1685673444.694467][2668:2670] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673444.694522][2668:2670] CHIP:DMG: },
-
-
-          ./chip-tool doorlock clear-user 1 1 1 --timedInteractionTimeoutMs 1000 --trace_decode 1
+          [1698647366.030707][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647366.030759][11905:11905] CHIP:DMG: {
+          [1698647366.030791][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647366.030828][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647366.030876][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647366.030923][11905:11905] CHIP:DMG:         [
+          [1698647366.030970][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647366.031012][11905:11905] CHIP:DMG:                 {
+          [1698647366.031063][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647366.031107][11905:11905] CHIP:DMG:                         {
+          [1698647366.031150][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647366.031209][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647366.031253][11905:11905] CHIP:DMG:                                 CommandId = 0x26,
+          [1698647366.031310][11905:11905] CHIP:DMG:                         },
+          [1698647366.031354][11905:11905] CHIP:DMG:
+          [1698647366.031404][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647366.031445][11905:11905] CHIP:DMG:                         {
+          [1698647366.031495][11905:11905] CHIP:DMG:                                 0x0 =
+          [1698647366.031548][11905:11905] CHIP:DMG:                                 {
+          [1698647366.031608][11905:11905] CHIP:DMG:                                         0x0 = 1,
+          [1698647366.031669][11905:11905] CHIP:DMG:                                         0x1 = 1,
+          [1698647366.031729][11905:11905] CHIP:DMG:                                 },
+          [1698647366.031773][11905:11905] CHIP:DMG:                         },
+          [1698647366.031811][11905:11905] CHIP:DMG:                 },
+          [1698647366.031869][11905:11905] CHIP:DMG:
+          [1698647366.031903][11905:11905] CHIP:DMG:         ],
+          [1698647366.031960][11905:11905] CHIP:DMG:
+          [1698647366.031994][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647366.032040][11905:11905] CHIP:DMG: },
+      disabled: true
+
+    - label: "Step 19: DUT sends Clear User command to TH.a "
+      PICS: DRLK.C.F08 && DRLK.C.C1d.Tx
+      verification: |
+          ./chip-tool doorlock clear-user 1 1 1 --timedInteractionTimeoutMs 1000
 
           Verify TH receives Clear User command with SUCCESS response on TH(lock-app) log:
 
-          [1685673467.295855][2674:2676] CHIP:DMG: InvokeResponseMessage =
-          [1685673467.295906][2674:2676] CHIP:DMG: {
-          [1685673467.295986][2674:2676] CHIP:DMG:         suppressResponse = false,
-          [1685673467.296044][2674:2676] CHIP:DMG:         InvokeResponseIBs =
-          [1685673467.296116][2674:2676] CHIP:DMG:         [
-          [1685673467.296194][2674:2676] CHIP:DMG:                 InvokeResponseIB =
-          [1685673467.296271][2674:2676] CHIP:DMG:                 {
-          [1685673467.296361][2674:2676] CHIP:DMG:                         CommandStatusIB =
-          [1685673467.296432][2674:2676] CHIP:DMG:                         {
-          [1685673467.296519][2674:2676] CHIP:DMG:                                 CommandPathIB =
-          [1685673467.296595][2674:2676] CHIP:DMG:                                 {
-          [1685673467.296692][2674:2676] CHIP:DMG:                                         EndpointId = 0x1,
-          [1685673467.296772][2674:2676] CHIP:DMG:                                         ClusterId = 0x101,
-          [1685673467.296872][2674:2676] CHIP:DMG:                                         CommandId = 0x1d,
-          [1685673467.296947][2674:2676] CHIP:DMG:                                 },
-          [1685673467.297053][2674:2676] CHIP:DMG:
-          [1685673467.297121][2674:2676] CHIP:DMG:                                 StatusIB =
-          [1685673467.297217][2674:2676] CHIP:DMG:                                 {
-          [1685673467.297295][2674:2676] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1685673467.297392][2674:2676] CHIP:DMG:                                 },
-          [1685673467.297468][2674:2676] CHIP:DMG:
-          [1685673467.297554][2674:2676] CHIP:DMG:                         },
-          [1685673467.297632][2674:2676] CHIP:DMG:
-          [1685673467.297692][2674:2676] CHIP:DMG:                 },
-          [1685673467.297836][2674:2676] CHIP:DMG:
-          [1685673467.297895][2674:2676] CHIP:DMG:         ],
-          [1685673467.297997][2674:2676] CHIP:DMG:
-          [1685673467.298055][2674:2676] CHIP:DMG:         InteractionModelRevision = 1
-          [1685673467.298109][2674:2676] CHIP:DMG: },
+          [1698647393.727713][11905:11905] CHIP:DMG: InvokeRequestMessage =
+          [1698647393.727764][11905:11905] CHIP:DMG: {
+          [1698647393.727796][11905:11905] CHIP:DMG:         suppressResponse = false,
+          [1698647393.727833][11905:11905] CHIP:DMG:         timedRequest = true,
+          [1698647393.727881][11905:11905] CHIP:DMG:         InvokeRequests =
+          [1698647393.727926][11905:11905] CHIP:DMG:         [
+          [1698647393.727973][11905:11905] CHIP:DMG:                 CommandDataIB =
+          [1698647393.728014][11905:11905] CHIP:DMG:                 {
+          [1698647393.728061][11905:11905] CHIP:DMG:                         CommandPathIB =
+          [1698647393.728105][11905:11905] CHIP:DMG:                         {
+          [1698647393.728147][11905:11905] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698647393.728191][11905:11905] CHIP:DMG:                                 ClusterId = 0x101,
+          [1698647393.728247][11905:11905] CHIP:DMG:                                 CommandId = 0x1d,
+          [1698647393.728322][11905:11905] CHIP:DMG:                         },
+          [1698647393.728382][11905:11905] CHIP:DMG:
+          [1698647393.728420][11905:11905] CHIP:DMG:                         CommandFields =
+          [1698647393.728475][11905:11905] CHIP:DMG:                         {
+          [1698647393.728520][11905:11905] CHIP:DMG:                                 0x0 = 1,
+          [1698647393.728565][11905:11905] CHIP:DMG:                         },
+          [1698647393.728617][11905:11905] CHIP:DMG:                 },
+          [1698647393.728659][11905:11905] CHIP:DMG:
+          [1698647393.728706][11905:11905] CHIP:DMG:         ],
+          [1698647393.728749][11905:11905] CHIP:DMG:
+          [1698647393.728794][11905:11905] CHIP:DMG:         InteractionModelRevision = 11
+          [1698647393.728829][11905:11905] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
index a3c8a70e81316a..9cc0cd99ce620d 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
@@ -304,7 +304,7 @@ tests:
 
     - label:
           "Step 1c: TH cleans up the groups by sending the RemoveAllGroups
-          command to the DUT on PIXIT.MOD.ENDPOINT"
+          command to the DUT on PIXIT.G.ENDPOINT"
       verification: |
           ./chip-tool groups remove-all-groups 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml
index 0f649db450f85a..fae8d6af6de22a 100755
--- a/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml
@@ -44,8 +44,8 @@ tests:
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
-          value: 1
           constraints:
+              hasMasksSet: [0x1]
               type: bitmap32
 
     - label: "Step 3: TH reads FeatureMap attribute from DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
index 9a30ae38134f45..f475ac57da0c16 100755
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
@@ -31,7 +31,7 @@ config:
         defaultValue: 5000
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
+    - label: "Step 0:Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -39,14 +39,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "TH reads the OnMode attribute from the DUT"
+    - label: "Step 1: TH reads the OnMode attribute from the DUT"
       PICS: MOD.S.A0005 && MOD.S.F00
       command: "readAttribute"
       attribute: "OnMode"
       response:
           saveAs: on_mode_dut
 
-    - label: "TH reads the CurrentMode attribute from the DUT"
+    - label: "Step 2a: TH reads the CurrentMode attribute from the DUT"
       PICS: MOD.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
@@ -54,8 +54,8 @@ tests:
           saveAs: old_current_mode_dut
 
     - label:
-          "If the OnMode and CurrentMode attributes have the same value, proceed
-          to step 2c, Otherwise proceed to step 3a"
+          "Step 2b: If the OnMode and CurrentMode attributes have the same
+          value, proceed to step 2c, Otherwise proceed to step 3a"
       PICS: MOD.S.A0003 && MOD.S.A0005 && MOD.S.F00
       cluster: "EqualityCommands"
       command: "UnsignedNumberEquals"
@@ -70,7 +70,7 @@ tests:
                 - name: "Equals"
                   saveAs: IsExpectedValue
 
-    - label: "TH reads the SupportedModes attribute from the DUT"
+    - label: "Step 2c: TH reads the SupportedModes attribute from the DUT"
       runIf: IsExpectedValue
       PICS: MOD.S.A0005 && MOD.S.F00
       command: "readAttribute"
@@ -80,9 +80,9 @@ tests:
               type: list
 
     - label:
-          "Select a value from the list in step 2c with a different value than
-          the onMode value read in step 1. TH sends a ChangeToMode command to
-          the TH with the selected value."
+          "Step 2d: Select a value from the list in step 2c with a different
+          value than the onMode value read in step 1. TH sends a ChangeToMode
+          command to the TH with the selected value."
       runIf: IsExpectedValue
       PICS: MOD.S.A0002 && MOD.S.C00.Rsp && MOD.S.F00
       command: "ChangeToMode"
@@ -91,12 +91,12 @@ tests:
               - name: "NewMode"
                 value: NewMode
 
-    - label: "TH sends an Off command to the DUT"
+    - label: "Step 3a: TH sends an Off command to the DUT"
       PICS: OO.S.C00.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "Off"
 
-    - label: "TH sends an On command to the DUT"
+    - label: "Step 3b: TH sends an On command to the DUT"
       PICS: OO.S.C01.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "On"
@@ -109,7 +109,7 @@ tests:
               - name: "ms"
                 value: WaitTime
 
-    - label: "TH reads the CurrentMode attribute from the DUT"
+    - label: "Step 3c: TH reads the CurrentMode attribute from the DUT"
       PICS: MOD.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
index 09e48c70836e4d..0490c2f22949b5 100755
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name: 80.5.2. [TC-MOD-3.2] StartUpMode verification with DUT as Server
 
@@ -28,7 +27,7 @@ config:
         defaultValue: 7
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
+    - label: "Step 0: Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -36,14 +35,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "TH reads the StartUpMode attribute from the DUT"
+    - label: "Step 1: TH reads the StartUpMode attribute from the DUT"
       PICS: MOD.S.A0004
       command: "readAttribute"
       attribute: "StartUpMode"
       response:
           saveAs: startup_mode_dut
 
-    - label: "TH reads the CurrentMode attribute from the DUT"
+    - label: "Step 2a: TH reads the CurrentMode attribute from the DUT"
       PICS: MOD.S.A0003
       command: "readAttribute"
       attribute: "CurrentMode"
@@ -51,8 +50,8 @@ tests:
           saveAs: old_current_mode_dut
 
     - label:
-          "If startup_mode_dut is equal to old_current_mode_dut proceed to step
-          4. Else proceed to step 6"
+          "Step 2b: If the StartUpMode and CurrentMode attributes have the same
+          value, proceed to step 2c, Otherwise proceed to step 3a."
       PICS: MOD.S.A0003 && MOD.S.A0004
       cluster: "EqualityCommands"
       command: "UnsignedNumberEquals"
@@ -67,7 +66,7 @@ tests:
                 - name: "Equals"
                   saveAs: IsExpectedValue
 
-    - label: "TH reads the SupportedModes attribute from the DUT"
+    - label: "Step 2c: TH reads the SupportedModes attribute from the DUT"
       runIf: IsExpectedValue
       PICS: MOD.S.A0002
       command: "readAttribute"
@@ -77,9 +76,9 @@ tests:
               type: list
 
     - label:
-          "Select a value from the list in step 2c with a different value than
-          the StartUpMode value read in step 1. TH sends a ChangeToMode command
-          to the DUT with the selected value."
+          "Step 2d: Select a value from the list in step 2c with a different
+          value than the StartUpMode value read in step 1. TH sends a
+          ChangeToMode command to the DUT with the selected value."
       runIf: IsExpectedValue
       PICS: MOD.S.A0002 && MOD.S.C00.Rsp
       command: "ChangeToMode"
@@ -88,7 +87,7 @@ tests:
               - name: "NewMode"
                 value: NewMode
 
-    - label: "Physically power cycle the device."
+    - label: "Step 3a: Physically power cycle the device."
       verification: |
           Physically power cycle the device.
       cluster: "LogCommands"
@@ -101,7 +100,7 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Commission device after reboot"
+    - label: "Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -109,7 +108,7 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "TH reads the CurrentMode attribute from the DUT"
+    - label: "Step 3b: TH reads the CurrentMode attribute from the DUT"
       PICS: MOD.S.A0003 && MOD.S.F00 && PICS_USER_PROMPT
       command: "readAttribute"
       attribute: "CurrentMode"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
index 172635fbba8b72..dd0f76b778635d 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
@@ -127,7 +127,7 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Commission device after reboot"
+    - label: "Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml
index a133eb9a975531..c737c6c3d19926 100644
--- a/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name: 222.2.1. [TC-REFALM-2.1] Attributes with DUT as Server
 
@@ -20,62 +19,58 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
+    cluster: "Refrigerator Alarm"
+    endpoint: 1
 
 tests:
-    - label: "Note"
-      verification: |
-          This is a simulated example log for instructional purposes only. In real scenarios, the actual log may vary depending on the feature implementation in Reference App.
-      disabled: true
-
     - label:
           "Step 1: Commission DUT to TH (can be skipped if done in a preceding
           test)"
-      verification: |
-
-      disabled: true
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
     - label:
           "Step 2: Ensure that the door alarm is not locally suppressed and the
           door is closed"
       verification: |
           Ensure that the door alarm is not locally suppressed and the door is closed
-      disabled: true
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
-    - label: "Step 3: TH reads from the DUT the Mask attribute"
+    - label: "Step 3:TH reads from the DUT the Mask attribute"
       PICS: REFALM.S.A0000
-      verification: |
-          ./chip-tool refrigeratoralarm read mask 1 1
-          On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 1.
-          [1688447677.832882][4229:4231] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0000 DataVersion: 1795162772
-          [1688447677.833165][4229:4231] CHIP:TOO:   Mask: 1
-          [1688447677.833494][4229:4231] CHIP:EM: <<< [E:27636i S:5449 M:199797248 (Ack:151091416)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      command: "readAttribute"
+      attribute: "Mask"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x1]
 
-    - label: "Step 4: TH reads from the DUT the State attribute"
+    - label: "Step 4:TH reads from the DUT the State attribute"
       PICS: REFALM.S.A0002
-      verification: |
-          ./chip-tool refrigeratoralarm read state 1 1
-          On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 0.
-
-          [1688447820.603249][4247:4249] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0002 DataVersion: 1795162772
-          [1688447820.603415][4247:4249] CHIP:TOO:   State: 0
-          [1688447820.603708][4247:4249] CHIP:EM: <<< [E:2198i S:4260 M:156565261 (Ack:46517349)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      command: "readAttribute"
+      attribute: "State"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksClear: [0x1]
 
-    - label: "Step 5: TH reads from the DUT the Supported attribute"
+    - label: "Step 5:TH reads from the DUT the Supportedask attribute"
       PICS: REFALM.S.A0003
-      verification: |
-          ./chip-tool refrigeratoralarm read supported 1 1
-          On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 1.
-
-          [1689677642.708638][18413:18415] CHIP:DMG:         SuppressResponse = true,
-          [1689677642.708645][18413:18415] CHIP:DMG:         InteractionModelRevision = 1
-          [1689677642.708651][18413:18415] CHIP:DMG: }
-          [1689677642.708726][18413:18415] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0003 DataVersion: 1517282962
-          [1689677642.708773][18413:18415] CHIP:TOO:   Supported: 1
-          [1689677642.708845][18413:18415] CHIP:EM: <<< [E:32432i S:53289 M:29829407 (Ack:142651059)] (S) Msg TX to 1:0000000000000001 [BFDE] --- Type 0000:10 (SecureChannel:StandaloneAck)
-          [1689677642.708859][18413:18415] CHIP:IN: (S) Sending msg 29829407 on secure session with LSID: 53289
-          [1689677642.708900][18413:18415] CHIP:EM: Flushed pending ack for MessageCounter:142651059 on exchange 32432i
-      disabled: true
+      command: "readAttribute"
+      attribute: "Supported"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x1]
diff --git a/src/app/tests/suites/certification/Test_TC_RVCRUNM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCRUNM_3_1.yaml
index 5bb88f11b6943d..d7d9bbd37f60df 100644
--- a/src/app/tests/suites/certification/Test_TC_RVCRUNM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RVCRUNM_3_1.yaml
@@ -17,6 +17,8 @@ name: 87.4.1. [TC-RVCRUNM-3.1] On Mode functionality with DUT as Server
 PICS:
     - RVCRUNM.S.A0003
     - RVCRUNM.S.F00
+    - OO.S.C00.Rsp
+    - OO.S.C01.Rsp
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
index ffd8849ca25d08..35e48f646d470a 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
@@ -47,66 +47,43 @@ tests:
     - label: "Step 2a: Set up subscription to SwitchLatched event"
       PICS: SWTCH.S.F00
       verification: |
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT
-          (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have the capability to generate this event)
-
-          echo '{"Name":"SwitchLatched","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
-
-          Verify DUT generated the SwitchLachted event :
-
-          [1687169759.564727][21941:21943] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":1}"
-          [1687169759.565067][21941:21941] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 5f83636d
-          [1687169759.565099][21941:21941] CHIP:-: The latching switch is moved to a new position:1
-          [1687169759.565108][21941:21941] CHIP:ZCL: SwitchServer: OnSwitchLatch
-
           Please use Interactive mode to Verify the subscription of an event
           Here the command to enter interactive mode:--
-          1. ./chip-tool interactive start
-          2. switch subscribe-event switch-latched 1 100 1 1
+          ./chip-tool interactive start
 
-          Verify SwitchLatched event On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          [1659527630.476706][4774:4779] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
-          [1659527630.476742][4774:4779] CHIP:TOO:   Event number: 4
-          [1659527630.476771][4774:4779] CHIP:TOO:   Priority: Info
-          [1659527630.476799][4774:4779] CHIP:TOO:   Timestamp: 29687894
-          [1659527630.476887][4774:4779] CHIP:TOO:   SwitchLatched: {
-          [1659527630.476934][4774:4779] CHIP:TOO:     NewPosition: 1
-          [1659527630.476969][4774:4779] CHIP:TOO:    }
+          switch subscribe-event switch-latched 1 100 1 1
+
+          [1697604266.130621][7393:7395] CHIP:DMG: SubscribeResponseMessage =
+          [1697604266.130624][7393:7395] CHIP:DMG: {
+          [1697604266.130628][7393:7395] CHIP:DMG:         SubscriptionId = 0xf6d55121,
+          [1697604266.130632][7393:7395] CHIP:DMG:         MaxInterval = 0x64,
+          [1697604266.130636][7393:7395] CHIP:DMG:         InteractionModelRevision = 11
+          [1697604266.130640][7393:7395] CHIP:DMG: }
       disabled: true
 
     - label: "Step 2b: Operator sets switch to first position"
       PICS: SWTCH.S.F00
       verification: |
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT
+          On Raspi platform to trigger the event,  give the below command by opening an another terminal in DUT
           (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have the capability to generate this event)
 
           echo '{"Name":"SwitchLatched","NewPosition":0}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
           DUT generated the SwitchLatched event with NewPosition 0:
 
-          [1686289860.323236][30125:30127] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":0}"
-          [1686289860.323565][30125:30125] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 89759737
-          [1686289860.323602][30125:30125] CHIP:-: The latching switch is moved to a new position:0
-          [1686289860.323618][30125:30125] CHIP:ZCL: SwitchServer: OnSwitchLatch
-
-          ./chip-tool switch read-event switch-latched 1 1
-
-          Verify SwitchLatched event with NewPosition set to 0 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
-
-          [1687257759.711008][17346:17348] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
-          [1687257759.711011][17346:17348] CHIP:TOO:   Event number: 5
-          [1687257759.711013][17346:17348] CHIP:TOO:   Priority: Info
-          [1687257759.711015][17346:17348] CHIP:TOO:   Timestamp: 1687256995382
-          [1687257759.711018][17346:17348] CHIP:TOO:   SwitchLatched: {
-          [1687257759.711021][17346:17348] CHIP:TOO:     NewPosition: 0
-          [1687257759.711024][17346:17348] CHIP:TOO:    }
+          [1697604377.953057][7384:7386] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":0}"
+          [1697604377.955361][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0a9
+          [1697604377.955421][7384:7384] CHIP:-: The latching switch is moved to a new position:0
+          [1697604377.955430][7384:7384] CHIP:ZCL: SwitchServer: OnSwitchLatch
+          [1697604377.955474][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000006 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Epoch timestamp: 0x0000018B411B1D63
       disabled: true
 
     - label: "Step 2c: Read CurrentPosition attribute"
       PICS: SWTCH.S.F00
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition value is 0 in TH(chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -124,29 +101,28 @@ tests:
 
           DUT generated the SwitchLatched event with NewPosition set to 1:
 
-          [1659600080.279936][7312:7321] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":1}"
-          [1659600080.280318][7312:7312] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 1755409c
-          [1659600080.280376][7312:7312] CHIP:-: The latching switch is moved to a new position:1
-          [1659600080.280412][7312:7312] CHIP:ZCL: SwitchServer: OnSwitchLatch
-          [1659600080.280503][7312:7312] CHIP:EVL: LogEvent event number: 0x0000000000020005 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Sys timestamp: 0x0000000000EB91B3
+          [1697604732.758383][7384:7386] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":1}"
+          [1697604732.758668][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0aa
+          [1697604732.758703][7384:7384] CHIP:-: The latching switch is moved to a new position:1
+          [1697604732.758712][7384:7384] CHIP:ZCL: SwitchServer: OnSwitchLatch
+          [1697604732.758757][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000007 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Epoch timestamp: 0x0000018B41208756
 
-          ./chip-tool switch read-event switch-latched 1 1
+          switch read-event switch-latched 1 1
 
-          Verify SwitchLatched event with NewPosition set to 1 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
+          Verify TH receives SwitchLatched event with NewPosition set to 1 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
 
-          [1687257297.110327][17168:17170] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
-          [1687257297.110330][17168:17170] CHIP:TOO:   Event number: 7
-          [1687257297.110333][17168:17170] CHIP:TOO:   Priority: Info
-          [1687257297.110336][17168:17170] CHIP:TOO:   Timestamp: 1687257190679
-          [1687257297.110341][17168:17170] CHIP:TOO:   SwitchLatched: {
-          [1687257297.110345][17168:17170] CHIP:TOO:     NewPosition: 1
-          [1687257297.110349][17168:17170] CHIP:TOO:    }
+          [1687257297.110327][17168:17170] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000 [1687257297.110330][17168:17170] CHIP:TOO: Event number: 7
+          [1687257297.110333][17168:17170] CHIP:TOO: Priority: Info
+          [1687257297.110336][17168:17170] CHIP:TOO: Timestamp: 1687257190679
+          [1687257297.110341][17168:17170] CHIP:TOO: SwitchLatched: {
+          [1687257297.110345][17168:17170] CHIP:TOO: NewPosition: 1
+          [1687257297.110349][17168:17170] CHIP:TOO: }
       disabled: true
 
     - label: "Step 2e: Read CurrentPosition attribute"
       PICS: SWTCH.S.F00
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition value is 1 in TH(chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -159,40 +135,45 @@ tests:
           sets switch to next position - Read CurrentPosition attribute"
       PICS: SWTCH.S.F00
       verification: |
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT
-          (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have the capability to generate this event)
+          If NumberOfPositions>2, then Set switch to next position Otherwise skip this step.
 
-          echo '{"Name":"SwitchLatched","NewPosition":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          For checking the number of positions that switch supports, Please read the NumberOfPositions attribute From TC-SWTCH-2.1 in step 2a .
 
-          DUT generated the SwitchLatched event with NewPosition set to 2:
+          switch read number-of-positions 1 1
 
-          [1659600438.058928][7312:7321] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":2}"
-          [1659600438.059436][7312:7312] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 1755409d
-          [1659600438.059519][7312:7312] CHIP:-: The latching switch is moved to a new position:2
-          [1659600438.059644][7312:7312] CHIP:ZCL: SwitchServer: OnSwitchLatch
-          [1659600438.059857][7312:7312] CHIP:EVL: LogEvent event number: 0x0000000000020006 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Sys timestamp: 0x0000000000F10746
+          Verify the "NumberOfPositions" attribute value On TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
 
-          ./chip-tool switch read-event switch-latched 1 1
+          [1697605547.057869][7525:7527] CHIP:DMG: }
+          [1697605547.058012][7525:7527] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0000 DataVersion: 1304215724
+          [1697605547.058063][7525:7527] CHIP:TOO:   NumberOfPositions: 2
 
-          Verify  SwitchLatched event with NewPosition set to 2 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
-
-          [1687257759.711126][17346:17348] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
-          [1687257759.711129][17346:17348] CHIP:TOO:   Event number: 8
-          [1687257759.711131][17346:17348] CHIP:TOO:   Priority: Info
-          [1687257759.711133][17346:17348] CHIP:TOO:   Timestamp: 1687257552953
-          [1687257759.711136][17346:17348] CHIP:TOO:   SwitchLatched: {
-          [1687257759.711140][17346:17348] CHIP:TOO:     NewPosition: 2
-          [1687257759.711141][17346:17348] CHIP:TOO:    }
-
-          In the current SDK development, Max number of positions is configured as 2, hence the current  test step should fail as NewPosition reached more than the Max NumberOfPositions.
-          If the DUT supports more number of positions, then for the command in previous step, position should increase to the next level. Below is the sample command to execute, if the DUT supports NumberOfPositions >  2 .
+          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT
+          (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have the capability to generate this event)
 
-          ./chip-tool switch read current-position 1 1
+          echo '{"Name":"SwitchLatched","NewPosition":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify CurrentPosition value is 2 On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
+          DUT generated the SwitchLatched event with NewPosition set to 2:
 
-          [1659600502.023560][4306:4311] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001 DataVersion: 391463069
-          [1687847841.651568][19369:19371] CHIP:TOO:   CurrentPosition: 2
+          [1697615458.515582][7384:7386] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":2}"
+          [1697615458.515822][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0c5
+          [1697615458.515854][7384:7384] CHIP:-: The latching switch is moved to a new position:3
+          [1697615458.515867][7384:7384] CHIP:ZCL: SwitchServer: OnSwitchLatch
+          [1697615458.516014][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x000000000000000B due to overflow: event priority_level: 1
+          [1697615458.516081][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697615458.516110][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000024 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Epoch timestamp: 0x0000018B41C430D3
+
+          switch read-event switch-latched 1 1
+
+          Verify TH receives SwitchLatched event with NewPosition set to 3 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
+
+          [1697615514.717194][7767:7769] CHIP:DMG: }
+          [1697615514.717359][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
+          [1697615514.717371][7767:7769] CHIP:TOO:   Event number: 36
+          [1697615514.717383][7767:7769] CHIP:TOO:   Priority: Info
+          [1697615514.717396][7767:7769] CHIP:TOO:   Timestamp: 1697615458515
+          [1697615514.717430][7767:7769] CHIP:TOO:   SwitchLatched: {
+          [1697615514.717449][7767:7769] CHIP:TOO:     NewPosition: 2
+          [1697615514.717464][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -201,6 +182,18 @@ tests:
           next position, - Read CurrentPosition attribute"
       PICS: SWTCH.S.F00
       verification: |
+          If NumberOfPositions>3, then Set the switch to next position Otherwise skip this step.
+
+          For checking the number of positions that switch supports, Please read the NumberOfPositions attribute From TC-SWTCH-2.1 in step 2a .
+
+          switch read number-of-positions 1 1
+
+          Verify the "NumberOfPositions" attribute value On TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
+
+          [1697605547.057869][7525:7527] CHIP:DMG: }
+          [1697605547.058012][7525:7527] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0000 DataVersion: 1304215724
+          [1697605547.058063][7525:7527] CHIP:TOO:   NumberOfPositions: 2
+
           In Raspi platform to change the switch to third position use the below sample command, its required to  use equivalent command on the respective DUT. Open one more terminal on DUT side to execute the echo command .
 
           echo '{"Name":"SwitchLatched","NewPosition":3}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
@@ -213,7 +206,7 @@ tests:
           [1659600438.059644][7312:7312] CHIP:ZCL: SwitchServer: OnSwitchLatch
           [1659600438.059857][7312:7312] CHIP:EVL: LogEvent event number: 0x0000000000020006 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Sys timestamp: 0x0000000000F10746
 
-          ./chip-tool switch read-event switch-latched 1 1
+          switch read-event switch-latched 1 1
 
           Verify SwitchLatched event with NewPosition set to 3 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
 
@@ -224,15 +217,6 @@ tests:
           [1687258513.235235][17561:17563] CHIP:TOO:   SwitchLatched: {
           [1687258513.235238][17561:17563] CHIP:TOO:     NewPosition: 3
           [1687258513.235239][17561:17563] CHIP:TOO:    }
-
-          In the current SDK development, Max number of positions are configured as 2, hence the current  test step should fail as its reached more than the numberof position. If the DUT supports more number of positions, then for the above command, it should increase to the next level. Below is the sample command to execute , if the DUT supports more than 2 NumberOfPositions.
-
-          ./chip-tool switch read current-position 1 1
-
-          Verify CurrentPosition value is 3 On TH(chip-tool) Log and below is the sample log provided for the raspi platform and below is the sample log provided for the raspi platform:
-
-          [1659600502.023560][4306:4311] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001 DataVersion: 391463069
-          [1687847873.385882][19378:19380] CHIP:TOO:   CurrentPosition: 3
       disabled: true
 
     - label: "Step 2h: Operator returns switch to first position"
@@ -244,28 +228,30 @@ tests:
 
           DUT generated the SwitchLatched event with NewPosition set to 0:
 
-          [1659599703.232994][7312:7321] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":0}"
-          [1659599703.233543][7312:7312] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 1755409b
-          [1659599703.233624][7312:7312] CHIP:-: The latching switch is moved to a new position:0
-          [1659599703.233682][7312:7312] CHIP:ZCL: SwitchServer: OnSwitchLatch
+          [1697606147.106734][7384:7386] CHIP:-: Received payload: "{"Name":"SwitchLatched","NewPosition":0}"
+          [1697606147.106976][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0ae
+          [1697606147.107012][7384:7384] CHIP:-: The latching switch is moved to a new position:0
+          [1697606147.107023][7384:7384] CHIP:ZCL: SwitchServer: OnSwitchLatch
+          [1697606147.107137][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697606147.107170][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000000B priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x0 Epoch timestamp: 0x0000018B41361C23
 
-          ./chip-tool switch read-event switch-latched 1 1
+          switch read-event switch-latched 1 1
 
-          Verify SwitchLatched event with NewPosition set to 0 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
+          Verify TH receives SwitchLatched event with NewPosition set to 0 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
 
-          [1687258655.138839][17617:17619] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
-          [1687258655.138841][17617:17619] CHIP:TOO:   Event number: 10
-          [1687258655.138844][17617:17619] CHIP:TOO:   Priority: Info
-          [1687258655.138846][17617:17619] CHIP:TOO:   Timestamp: 1687258651896
-          [1687258655.138849][17617:17619] CHIP:TOO:   SwitchLatched: {
-          [1687258655.138851][17617:17619] CHIP:TOO:     NewPosition: 0
-          [1687258655.138853][17617:17619] CHIP:TOO:    }
+          [1697606183.274301][7536:7538] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0000
+          [1697606183.274313][7536:7538] CHIP:TOO:   Event number: 11
+          [1697606183.274320][7536:7538] CHIP:TOO:   Priority: Info
+          [1697606183.274325][7536:7538] CHIP:TOO:   Timestamp: 1697606147107
+          [1697606183.274350][7536:7538] CHIP:TOO:   SwitchLatched: {
+          [1697606183.274362][7536:7538] CHIP:TOO:     NewPosition: 0
+          [1697606183.274373][7536:7538] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 2i: Read CurrentPosition attribute"
       PICS: SWTCH.S.F00
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition value is 0 On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -278,33 +264,20 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT
-          (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have the capability to generate this event)
-
-          echo '{"Name":"InitialPress","NewPosition":0}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
-
-          DUT generated the InitialPress event with NewPosition set to 0:
-
-          [1659612230.311864][7312:7321] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":0}"
-          [1659612230.312345][7312:7312] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 175540a4
-          [1659612230.312422][7312:7312] CHIP:-: The new position when the momentary switch starts to be pressed:0
-          [1659612230.312472][7312:7312] CHIP:ZCL: SwitchServer: OnInitialPress
-
-
           Please use Interactive mode to Verify the subscription of an event
           Here the command to enter interactive mode:--
-          1. ./chip-tool interactive start
-          2. switch subscribe-event  initial-press 1 100 1 1
+           ./chip-tool interactive start
+
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          Verify InitialPress event with NewPosition set to 0 On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
+          switch subscribe-event initial-press 1 100 1 1
 
-          [1659612272.121119][4957:4962] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659612272.121143][4957:4962] CHIP:TOO:          Event number: 131085
-          [1659612272.121164][4957:4962] CHIP:TOO:          Priority: Info
-          [1659612272.121186][4957:4962] CHIP:TOO:          Timestamp: 27588291
-          [1659612272.121313][4957:4962] CHIP:TOO:   InitialPress: {
-          [1659612272.121347][4957:4962] CHIP:TOO:     NewPosition: 0
-          [1659612272.121369][4957:4962] CHIP:TOO:    }
+          [1697606330.206997][7536:7538] CHIP:DMG: SubscribeResponseMessage =
+          [1697606330.207001][7536:7538] CHIP:DMG: {
+          [1697606330.207004][7536:7538] CHIP:DMG:         SubscriptionId = 0x460ae381,
+          [1697606330.207008][7536:7538] CHIP:DMG:         MaxInterval = 0x64,
+          [1697606330.207011][7536:7538] CHIP:DMG:         InteractionModelRevision = 11
+          [1697606330.207014][7536:7538] CHIP:DMG: }
       disabled: true
 
     - label: "Step 3b: Operator does not operate switch"
@@ -316,7 +289,7 @@ tests:
     - label: "Step 3c: Read CurrentPosition attribute"
       PICS: SWTCH.S.F01
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition value is 0 On TH (chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -336,17 +309,30 @@ tests:
 
           DUT generated the InitialPress event with NewPosition set to 1:
 
-          [1659612460.072098][7312:7321] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
-          [1659612460.072562][7312:7312] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 175540a5
-          [1659612460.072646][7312:7312] CHIP:-: The new position when the momentary switch starts to be pressed:1
-          [1659612460.072706][7312:7312] CHIP:ZCL: SwitchServer: OnInitialPress
-          [1659612460.073008][7312:7312] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697606594.815345][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697606594.815586][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0af
+          [1697606594.815620][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697606594.815631][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697606594.815743][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697606594.815773][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000000C priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B413CF0FF
+
+          switch read-event initial-press   1 1
+
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH(Chip-tool) log and below is the sample log provided for the raspi platform:
+
+          [1697606630.390750][7536:7538] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697606630.390763][7536:7538] CHIP:TOO:   Event number: 12
+          [1697606630.390771][7536:7538] CHIP:TOO:   Priority: Info
+          [1697606630.390780][7536:7538] CHIP:TOO:   Timestamp: 1697606594815
+          [1697606630.390822][7536:7538] CHIP:TOO:   InitialPress: {
+          [1697606630.390840][7536:7538] CHIP:TOO:     NewPosition: 1
+          [1697606630.390851][7536:7538] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 3e: Read CurrentPosition attribute"
       PICS: SWTCH.S.F01
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition  value is 1 On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -364,19 +350,20 @@ tests:
 
           echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify ShortRelease event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
-          [1669874154.289653][2239:2241] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
-          [1669874154.290189][2239:2239] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 2c2733fa
-          [1669874154.290274][2239:2239] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
-          [1669874154.290329][2239:2239] CHIP:ZCL: SwitchServer: OnShortRelease
-          [1669874154.290460][2239:2239] CHIP:EVL: LogEvent event number: 0x000000000000000C priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Sys timestamp: 0x00000000004B0B8D
+          [1697606778.141141][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697606778.141356][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b0
+          [1697606778.141394][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697606778.141410][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697606778.141548][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697606778.141592][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000000D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B413FBD1D
       disabled: true
 
     - label: "Step 3g: Read CurrentPosition attribute"
       PICS: SWTCH.S.F01
       verification: |
-          ./chip-tool switch read current-position 1 1
+          switch read current-position 1 1
 
           Verify CurrentPosition value is 0 On TH(chip-tool) Log and below is the sample log provided for the raspi platform:
 
@@ -390,29 +377,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
-
-          Verify  InitialPress and ShortRelease events has been subscribed:
-
-          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Please use Interactive mode to Verify the subscription of an event
+          Here the command to enter interactive mode:--
+          1. ./chip-tool interactive start
 
-          Verify InitialPress event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          [1659686596.526276][2530:2538] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
-          [1659686596.526734][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e771a
-          [1659686596.526820][2530:2530] CHIP:-: The new position when the momentary switch starts to be pressed:1
-          [1659686596.526881][2530:2530] CHIP:ZCL: SwitchServer: OnInitialPress
+          switch subscribe-event initial-press 1 100 1 1
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          [1697607013.770976][7736:7738] CHIP:DMG: SubscribeResponseMessage =
+          [1697607013.770988][7736:7738] CHIP:DMG: {
+          [1697607013.770998][7736:7738] CHIP:DMG:         SubscriptionId = 0xfba47d40,
+          [1697607013.771010][7736:7738] CHIP:DMG:         MaxInterval = 0x64,
+          [1697607013.771021][7736:7738] CHIP:DMG:         InteractionModelRevision = 11
+          [1697607013.771030][7736:7738] CHIP:DMG: }
 
-          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          Verify ShortRelease event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          switch subscribe-event short-release 1 100 1 1
 
-          [1659686852.011134][2530:2538] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
-          [1659686852.011424][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e771b
-          [1659686852.011466][2530:2530] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
-          [1659686852.011490][2530:2530] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697607082.641213][7736:7738] CHIP:DMG: SubscribeResponseMessage =
+          [1697607082.641216][7736:7738] CHIP:DMG: {
+          [1697607082.641221][7736:7738] CHIP:DMG:         SubscriptionId = 0xbe6a8e5d,
+          [1697607082.641225][7736:7738] CHIP:DMG:         MaxInterval = 0x64,
+          [1697607082.641229][7736:7738] CHIP:DMG:         InteractionModelRevision = 11
+          [1697607082.641233][7736:7738] CHIP:DMG: }
       disabled: true
 
     - label: "Step 4b: Operator does not operate switch"
@@ -426,21 +415,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event  initial-press 1 100 1 1
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the InitialPress event with NewPosition set to 1:
 
-          [1659686631.947247][3045:3050] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659686631.947272][3045:3050] CHIP:TOO:          Event number: 23
-          [1659686631.947296][3045:3050] CHIP:TOO:          Priority: Info
-          [1659686631.947320][3045:3050] CHIP:TOO:          Timestamp: 9048822
-          [1659686631.947348][3045:3050] CHIP:TOO:   InitialPress: {
-          [1659686631.947374][3045:3050] CHIP:TOO:     NewPosition: 1
-          [1659686631.947397][3045:3050] CHIP:TOO:    }
+          [1697607350.058984][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697607350.059268][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b2
+          [1697607350.059302][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697607350.059311][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697607350.059431][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697607350.059466][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000000F priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B4148772B
+
+          switch read-event initial-press   1 1
+
+          Verify TH receive InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697607828.913031][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697607828.913034][7767:7769] CHIP:TOO:   Event number: 17
+          [1697607828.913037][7767:7769] CHIP:TOO:   Priority: Info
+          [1697607828.913040][7767:7769] CHIP:TOO:   Timestamp: 1697607697125
+          [1697607828.913046][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697607828.913050][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697607828.913054][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 4d: Operator releases switch"
@@ -448,21 +447,30 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1 --keepSubscriptions true
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
+
+          [1697607957.484361][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697607957.484562][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b6
+          [1697607957.484610][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697607957.484622][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697607957.484732][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697607957.484765][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000013 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B4151BBEC
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          switch read-event short-release 1 1
 
-          [1659686907.770389][3061:3066] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659686907.770413][3061:3066] CHIP:TOO:          Event number: 24
-          [1659686907.770434][3061:3066] CHIP:TOO:          Priority: Info
-          [1659686907.770456][3061:3066] CHIP:TOO:          Timestamp: 9304307
-          [1659686907.770482][3061:3066] CHIP:TOO:   ShortRelease: {
-          [1659686907.770506][3061:3066] CHIP:TOO:     PreviousPosition: 1
-          [1659686907.770528][3061:3066] CHIP:TOO:    }
+          Verify TH receive ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697608045.926586][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697608045.926590][7767:7769] CHIP:TOO:   Event number: 19
+          [1697608045.926593][7767:7769] CHIP:TOO:   Priority: Info
+          [1697608045.926596][7767:7769] CHIP:TOO:   Timestamp: 1697607957484
+          [1697608045.926601][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697608045.926605][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697608045.926608][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -476,28 +484,26 @@ tests:
 
           echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
-
-          [1659686596.526276][2530:2538] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
-          [1659686596.526734][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e771a
-          [1659686596.526820][2530:2530] CHIP:-: The new position when the momentary switch starts to be pressed:1
-          [1659686596.526881][2530:2530] CHIP:ZCL: SwitchServer: OnInitialPress
+          DUT generated the InitialPress event with NewPosition set to 1:
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          [1697608104.080281][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697608104.080508][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b7
+          [1697608104.080548][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697608104.080561][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697608104.080675][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697608104.080709][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000014 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B4153F890
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event  initial-press 1 100 1 1
+          switch read-event initial-press   1 1
 
           Verify InitialPress event with NewPosition set to 1 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
 
-          [1659692069.006090][3668:3674] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659692069.006114][3668:3674] CHIP:TOO:          Event number: 26
-          [1659692069.006138][3668:3674] CHIP:TOO:          Priority: Info
-          [1659692069.006160][3668:3674] CHIP:TOO:          Timestamp: 14513708
-          [1659692069.006187][3668:3674] CHIP:TOO:   InitialPress: {
-          [1659692069.006211][3668:3674] CHIP:TOO:     NewPosition: 1
-          [1659692069.006233][3668:3674] CHIP:TOO:    }
+          [1697608164.378204][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697608164.378207][7767:7769] CHIP:TOO:   Event number: 20
+          [1697608164.378209][7767:7769] CHIP:TOO:   Priority: Info
+          [1697608164.378211][7767:7769] CHIP:TOO:   Timestamp: 1697608104080
+          [1697608164.378214][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697608164.378217][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697608164.378219][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 4f: Operator releases switch"
@@ -509,28 +515,26 @@ tests:
 
           echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify ShortRelease event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
-
-          [1659686852.011134][2530:2538] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
-          [1659686852.011424][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e771b
-          [1659686852.011466][2530:2530] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
-          [1659686852.011490][2530:2530] CHIP:ZCL: SwitchServer: OnShortRelease
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          [1697608242.275996][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697608242.276246][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b8
+          [1697608242.276280][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697608242.276296][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697608242.276424][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697608242.276468][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000015 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41561464
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          switch read-event short-release 1 1
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
 
-          [1659692123.069593][3675:3680] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659692123.069616][3675:3680] CHIP:TOO:          Event number: 27
-          [1659692123.069639][3675:3680] CHIP:TOO:          Priority: Info
-          [1659692123.069660][3675:3680] CHIP:TOO:          Timestamp: 14562409
-          [1659692123.069687][3675:3680] CHIP:TOO:   ShortRelease: {
-          [1659692123.069711][3675:3680] CHIP:TOO:     PreviousPosition: 1
-          [1659692123.069734][3675:3680] CHIP:TOO:    }
+          [1697608382.457912][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697608382.457915][7767:7769] CHIP:TOO:   Event number: 21
+          [1697608382.457917][7767:7769] CHIP:TOO:   Priority: Info
+          [1697608382.457919][7767:7769] CHIP:TOO:   Timestamp: 1697608242276
+          [1697608382.457923][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697608382.457927][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697608382.457929][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -540,49 +544,54 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
-
-           echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
-
-          Verify InitialPress event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          Please use Interactive mode to Verify the subscription of an event
+          Here the command to enter interactive mode:--
+          ./chip-tool interactive start
 
-          [1659693098.031462][2530:2538] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
-          [1659693098.031812][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7724
-          [1659693098.031859][2530:2530] CHIP:-: The new position when the momentary switch starts to be pressed:1
-          [1659693098.031888][2530:2530] CHIP:ZCL: SwitchServer: OnInitialPress
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          switch subscribe-event  initial-press 1 100 1 1
 
-           echo '{"Name":"LongPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify LongPress event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          [1697608480.015747][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697608480.015750][7767:7769] CHIP:DMG: {
+          [1697608480.015753][7767:7769] CHIP:DMG:         SubscriptionId = 0x9c490538,
+          [1697608480.015756][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697608480.015758][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697608480.015761][7767:7769] CHIP:DMG: }
 
-          1659693130.924755][2530:2538] CHIP:-: Received payload: "{"Name":"LongPress","NewPosition":1}"
-          [1659693130.925030][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7725
-          [1659693130.925064][2530:2530] CHIP:-: The new position when the momentary switch has been pressed for a long time:1
-          [1659693130.925313][2530:2530] CHIP:ZCL: SwitchServer: OnLongPress
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          switch subscribe-event  long-press 1 100 1 1
 
-           echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          [1697608527.530605][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697608527.530609][7767:7769] CHIP:DMG: {
+          [1697608527.530613][7767:7769] CHIP:DMG:         SubscriptionId = 0xaa07867b,
+          [1697608527.530619][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697608527.530623][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697608527.530628][7767:7769] CHIP:DMG: }
 
-          Verify ShortRelease event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          [1659693174.708920][2530:2538] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
-          [1659693174.709388][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7726
-          [1659693174.709479][2530:2530] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
-          [1659693174.709539][2530:2530] CHIP:ZCL: SwitchServer: OnShortRelease
+          switch subscribe-event short-release 1 100 1 1
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          [1697608580.243388][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697608580.243391][7767:7769] CHIP:DMG: {
+          [1697608580.243394][7767:7769] CHIP:DMG:         SubscriptionId = 0x9b71447a,
+          [1697608580.243397][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697608580.243400][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697608580.243402][7767:7769] CHIP:DMG: }
 
-           echo '{"Name":"LongRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          Verify LongRelease event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          switch subscribe-event  long-release 1 100 1 1
 
-          [1674036547.915803][19172:19174] CHIP:-: Received payload: "{"Name":"LongRelease","PreviousPosition":1}"
-          [1674036547.916262][19172:19172] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 40105288
-          [1674036547.916347][19172:19172] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released after having been pressed for a long time:1
-          [1674036547.916493][19172:19172] CHIP:ZCL: SwitchServer: OnLongRelease
+          [1697608657.944735][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697608657.944738][7767:7769] CHIP:DMG: {
+          [1697608657.944741][7767:7769] CHIP:DMG:         SubscriptionId = 0x3d884dce,
+          [1697608657.944745][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697608657.944748][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697608657.944751][7767:7769] CHIP:DMG: }
       disabled: true
 
     - label: "Step 5b: Operator does not operate switch"
@@ -596,21 +605,30 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event  initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
+
+          [1697608754.628837][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697608754.629085][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0b9
+          [1697608754.629120][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697608754.629132][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697608754.629247][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697608754.629277][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000016 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B415DE5C5
+
+          switch read-event initial-press   1 1
 
-          [1659692507.869323][3696:3701] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659692507.869342][3696:3701] CHIP:TOO:          Event number: 28
-          [1659692507.869361][3696:3701] CHIP:TOO:          Priority: Info
-          [1659692507.869379][3696:3701] CHIP:TOO:          Timestamp: 14905717
-          [1659692507.869402][3696:3701] CHIP:TOO:   InitialPress: {
-          [1659692507.869421][3696:3701] CHIP:TOO:     NewPosition: 1
-          [1659692507.869440][3696:3701] CHIP:TOO:    }
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697608808.722369][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697608808.722371][7767:7769] CHIP:TOO:   Event number: 22
+          [1697608808.722374][7767:7769] CHIP:TOO:   Priority: Info
+          [1697608808.722376][7767:7769] CHIP:TOO:   Timestamp: 1697608754629
+          [1697608808.722380][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697608808.722383][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697608808.722385][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 5d: Operator releases switch"
@@ -618,21 +636,30 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          [1697608936.890550][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697608936.890789][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0ba
+          [1697608936.890824][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697608936.890833][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697608936.890948][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697608936.890983][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000017 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B4160ADBA
 
-          [1659692890.665344][3721:3726] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659692890.665369][3721:3726] CHIP:TOO:          Event number: 31
-          [1659692890.665392][3721:3726] CHIP:TOO:          Priority: Info
-          [1659692890.665416][3721:3726] CHIP:TOO:          Timestamp: 15332747
-          [1659692890.665444][3721:3726] CHIP:TOO:   ShortRelease: {
-          [1659692890.665470][3721:3726] CHIP:TOO:     PreviousPosition: 1
-          [1659692890.665494][3721:3726] CHIP:TOO:    }
+          switch read-event short-release 1 1
+
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697608970.793400][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697608970.793402][7767:7769] CHIP:TOO:   Event number: 23
+          [1697608970.793405][7767:7769] CHIP:TOO:   Priority: Info
+          [1697608970.793408][7767:7769] CHIP:TOO:   Timestamp: 1697608936890
+          [1697608970.793414][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697608970.793417][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697608970.793421][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -642,37 +669,59 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event  initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the InitialPress event with NewPosition set to 1:
+
+          [1697609110.498463][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609110.498726][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bb
+          [1697609110.498757][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609110.498766][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609110.498925][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 2
+          [1697609110.499002][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609110.499030][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000018 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416353E2
+
+          switch read-event initial-press   1 1
 
           Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
-          [1659692507.869323][3696:3701] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659692507.869342][3696:3701] CHIP:TOO:          Event number: 28
-          [1659692507.869361][3696:3701] CHIP:TOO:          Priority: Info
-          [1659692507.869379][3696:3701] CHIP:TOO:          Timestamp: 14905717
-          [1659692507.869402][3696:3701] CHIP:TOO:   InitialPress: {
-          [1659692507.869421][3696:3701] CHIP:TOO:     NewPosition: 1
-          [1659692507.869440][3696:3701] CHIP:TOO:    }
+          [1697609188.273452][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609188.273455][7767:7769] CHIP:TOO:   Event number: 24
+          [1697609188.273457][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609188.273459][7767:7769] CHIP:TOO:   Timestamp: 1697609110498
+          [1697609188.273463][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609188.273466][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609188.273469][7767:7769] CHIP:TOO:    }
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event long-press 1 100 1 1
+          echo '{"Name":"LongPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the longPress event with NewPosition set to 1:
+
+          [1697609280.508624][7384:7386] CHIP:-: Received payload: "{"Name":"LongPress","NewPosition":1}"
+          [1697609280.508890][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bc
+          [1697609280.508924][7384:7384] CHIP:-: The new position when the momentary switch has been pressed for a long time:1
+          [1697609280.508933][7384:7384] CHIP:ZCL: SwitchServer: OnLongPress
+          [1697609280.509078][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000001 due to overflow: event priority_level: 1
+          [1697609280.509144][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609280.509174][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000019 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x2 Epoch timestamp: 0x0000018B4165EBFC
+          [1697609280.509203][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_005C update version to e31eae9f
+
+
+          switch read-event long-press 1 1
 
-          Verify longPress event with NewPosition set to 1 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
+          Verify TH receives longPress event with NewPosition set to 1 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
 
-          [1659692638.993482][3706:3712] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0002
-          [1659692638.993504][3706:3712] CHIP:TOO:          Event number: 30
-          [1659692638.993525][3706:3712] CHIP:TOO:          Priority: Info
-          [1659692638.993545][3706:3712] CHIP:TOO:          Timestamp: 15084506
-          [1659692638.993571][3706:3712] CHIP:TOO:   LongPress: {
-          [1659692638.993593][3706:3712] CHIP:TOO:     NewPosition: 1
-          [1659692638.993615][3706:3712] CHIP:TOO:    }
+          [1697609316.967370][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0002
+          [1697609316.967375][7767:7769] CHIP:TOO:   Event number: 25
+          [1697609316.967376][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609316.967380][7767:7769] CHIP:TOO:   Timestamp: 1697609280508
+          [1697609316.967391][7767:7769] CHIP:TOO:   LongPress: {
+          [1697609316.967397][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609316.967402][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 5f: Operator releases switch"
@@ -680,21 +729,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event long-release 1 100 1 1
+          echo '{"Name":"LongRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the LongRelease event with previousPosition set to 1:
 
-          Verify LongRelease event with previousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          [1697609417.101354][7384:7386] CHIP:-: Received payload: "{"Name":"LongRelease","PreviousPosition":1}"
+          [1697609417.101563][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bd
+          [1697609417.101600][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released after having been pressed for a long time:1
+          [1697609417.101614][7384:7384] CHIP:ZCL: SwitchServer: OnLongRelease
+          [1697609417.101765][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000004 due to overflow: event priority_level: 1
+          [1697609417.101831][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609417.101862][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001C priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x4 Epoch timestamp: 0x0000018B4168018D
 
-          [1659693001.739969][3732:3737] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0004
-          [1659693001.740012][3732:3737] CHIP:TOO:          Event number: 32
-          [1659693001.740049][3732:3737] CHIP:TOO:          Priority: Info
-          [1659693001.740087][3732:3737] CHIP:TOO:          Timestamp: 15438774
-          [1659693001.740134][3732:3737] CHIP:TOO:   LongRelease: {
-          [1659693001.740174][3732:3737] CHIP:TOO:     PreviousPosition: 1
-          [1659693001.740212][3732:3737] CHIP:TOO:    }
+           switch read-event long-release 1 1
+
+          Verify TH receives LongRelease event with previousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609485.675506][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0004
+          [1697609485.675509][7767:7769] CHIP:TOO:   Event number: 28
+          [1697609485.675511][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609485.675513][7767:7769] CHIP:TOO:   Timestamp: 1697609417101
+          [1697609485.675531][7767:7769] CHIP:TOO:   LongRelease: {
+          [1697609485.675538][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697609485.675542][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -704,51 +763,54 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
-
-          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Please use Interactive mode to Verify the subscription of an event
+          Here the command to enter interactive mode:--
 
-          Verify InitialPress event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          ./chip-tool interactive start
 
-          [1659693098.031462][2530:2538] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
-          [1659693098.031812][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7724
-          [1659693098.031859][2530:2530] CHIP:-: The new position when the momentary switch starts to be pressed:1
-          [1659693098.031888][2530:2530] CHIP:ZCL: SwitchServer: OnInitialPress
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          switch subscribe-event initial-press 1 100 1 1
 
-          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          [1697609572.733866][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697609572.733870][7767:7769] CHIP:DMG: {
+          [1697609572.733872][7767:7769] CHIP:DMG:         SubscriptionId = 0xdb9c2f95,
+          [1697609572.733875][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697609572.733878][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697609572.733880][7767:7769] CHIP:DMG: }
 
-          Verify ShortRelease  event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          [1659694387.719620][2530:2538] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
-          [1659694387.720095][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7729
-          [1659694387.720237][2530:2530] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
-          [1659694387.720304][2530:2530] CHIP:ZCL: SwitchServer: OnShortRelease
+          switch subscribe-event short-release 1 100 1 1
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          [1697609772.052026][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697609772.052029][7767:7769] CHIP:DMG: {
+          [1697609772.052032][7767:7769] CHIP:DMG:         SubscriptionId = 0xd48293d0,
+          [1697609772.052035][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697609772.052038][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697609772.052040][7767:7769] CHIP:DMG: }
 
-          echo '{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          Verify MultiPressComplete  event with PreviousPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
+          switch subscribe-event multi-press-ongoing 1 100 1 1
 
-          [1659694592.347850][2530:2538] CHIP:-: Received payload: "{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":1}"
-          [1659694592.348389][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e772b
-          [1659694592.348481][2530:2530] CHIP:-: The new position when the momentary switch has been pressed in a multi-press sequence:1
+          [1697609745.441125][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697609745.441128][7767:7769] CHIP:DMG: {
+          [1697609745.441131][7767:7769] CHIP:DMG:         SubscriptionId = 0x2161432e,
+          [1697609745.441134][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697609745.441136][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697609745.441139][7767:7769] CHIP:DMG: }
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
-          echo '{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          switch subscribe-event multi-press-complete 1 100 1 1
 
-          Verify MultiPressOngoing event with NewPosition set to 1 on DUT(all-cluster-app) log and below is the sample log provided for the raspi platform:
-
-          [1659695302.038797][2530:2538] CHIP:-: Received payload: "{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}"
-          [1659695302.039933][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e7730
-          [1659695302.040020][2530:2530] CHIP:-: The new position when the momentary switch has been pressed in a multi-press sequence:1
-          [1659695302.040078][2530:2530] CHIP:-: 2 times the momentary switch has been pressed
-          [1659695302.040131][2530:2530] CHIP:ZCL: SwitchServer: OnMultiPressOngoing
-          [1659694592.348541][2530:2530] CHIP:-: 1 times the momentary switch has been pressed
-          [1659694592.348585][2530:2530] CHIP:ZCL: SwitchServer: OnMultiPressOngoing
+          [1697609646.344664][7767:7769] CHIP:DMG: SubscribeResponseMessage =
+          [1697609646.344669][7767:7769] CHIP:DMG: {
+          [1697609646.344674][7767:7769] CHIP:DMG:         SubscriptionId = 0x9177cb65,
+          [1697609646.344679][7767:7769] CHIP:DMG:         MaxInterval = 0x64,
+          [1697609646.344684][7767:7769] CHIP:DMG:         InteractionModelRevision = 11
+          [1697609646.344688][7767:7769] CHIP:DMG: }
       disabled: true
 
     - label: "Step 6b: Operator does not operate switch"
@@ -762,20 +824,30 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
+
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
 
-          [1659694345.040034][3787:3792] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659694345.040059][3787:3792] CHIP:TOO:          Event number: 37
-          [1659694345.040083][3787:3792] CHIP:TOO:          Priority: Info
-          [1659694345.040106][3787:3792] CHIP:TOO:          Timestamp: 16729153
-          [1659694345.040135][3787:3792] CHIP:TOO:   InitialPress: {
-          [1659694345.040160][3787:3792] CHIP:TOO:     NewPosition: 1
+          switch read-event initial-press   1 1
+
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 6d: Operator releases switch"
@@ -783,39 +855,59 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          [1659694426.794832][3797:3802] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659694426.794853][3797:3802] CHIP:TOO:          Event number: 38
-          [1659694426.794873][3797:3802] CHIP:TOO:          Priority: Info
-          [1659694426.794891][3797:3802] CHIP:TOO:          Timestamp: 16840016
-          [1659694426.794914][3797:3802] CHIP:TOO:   ShortRelease: {
-          [1659694426.794934][3797:3802] CHIP:TOO:     PreviousPosition: 1
-          [1659694426.794952][3797:3802] CHIP:TOO:    }
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          switch read-event short-release 1 1
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-complete 1 100 1 1
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
-          Verify MultiPressComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
 
-          [1659695330.923244][3912:3918] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
-          [1659695330.923264][3912:3918] CHIP:TOO:          Event number: 45
-          [1659695330.923283][3912:3918] CHIP:TOO:          Priority: Info
-          [1659695330.923302][3912:3918] CHIP:TOO:          Timestamp: 17754336
-          [1659695330.923326][3912:3918] CHIP:TOO:   MultiPressComplete: {
-          [1659695330.923346][3912:3918] CHIP:TOO:     PrevioiusPosition: 1
-          [1659695330.923366][3912:3918] CHIP:TOO:     TotalNumberOfPressesCounted: 1
-          [1659695330.923385][3912:3918] CHIP:TOO:    }
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
+
+          echo '{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the MultiPressComplete event with PreviousPosition set to 1:
+
+          [1697610133.480979][7384:7386] CHIP:-: Received payload: "{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":1}"
+          [1697610133.481239][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0c0
+          [1697610133.481271][7384:7384] CHIP:-: The previous position when the momentary switch has been pressed in a multi-press sequence:1
+          [1697610133.481280][7384:7384] CHIP:-: 1 times the momentary switch has been pressed
+          [1697610133.481287][7384:7384] CHIP:ZCL: SwitchServer: OnMultiPressComplete
+          [1697610133.481399][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610133.481431][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001F priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x6 Epoch timestamp: 0x0000018B4172EFE9
+
+          switch read-event multi-press-complete 1 1
+
+          Verify TH receives MultiPressComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610193.287175][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0006
+          [1697610193.287187][7767:7769] CHIP:TOO:   Event number: 31
+          [1697610193.287198][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610193.287207][7767:7769] CHIP:TOO:   Timestamp: 1697610133481
+          [1697610193.287241][7767:7769] CHIP:TOO:   MultiPressComplete: {
+          [1697610193.287261][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610193.287273][7767:7769] CHIP:TOO:     TotalNumberOfPressesCounted: 1
+          [1697610193.287285][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 6e: Operator operates switch (press briefly)"
@@ -823,21 +915,30 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
 
-          [1659695901.066563][3955:3960] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659695901.066583][3955:3960] CHIP:TOO:          Event number: 46
-          [1659695901.066602][3955:3960] CHIP:TOO:          Priority: Info
-          [1659695901.066643][3955:3960] CHIP:TOO:          Timestamp: 18095747
-          [1659695901.066669][3955:3960] CHIP:TOO:   InitialPress: {
-          [1659695901.066689][3955:3960] CHIP:TOO:     NewPosition: 1
-          [1659695901.066708][3955:3960] CHIP:TOO:    }
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
+
+          switch read-event initial-press   1 1
+
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 6f: Operator releases switch"
@@ -845,21 +946,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
 
-          [1659694426.794832][3797:3802] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659694426.794853][3797:3802] CHIP:TOO:          Event number: 38
-          [1659694426.794873][3797:3802] CHIP:TOO:          Priority: Info
-          [1659694426.794891][3797:3802] CHIP:TOO:          Timestamp: 16840016
-          [1659694426.794914][3797:3802] CHIP:TOO:   ShortRelease: {
-          [1659694426.794934][3797:3802] CHIP:TOO:     PreviousPosition: 1
-          [1659694426.794952][3797:3802] CHIP:TOO:    }
+          switch read-event short-release 1 1
+
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -869,37 +980,58 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
 
-          [1659694345.040034][3787:3792] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659694345.040059][3787:3792] CHIP:TOO:          Event number: 37
-          [1659694345.040083][3787:3792] CHIP:TOO:          Priority: Info
-          [1659694345.040106][3787:3792] CHIP:TOO:          Timestamp: 16729153
-          [1659694345.040135][3787:3792] CHIP:TOO:   InitialPress: {
-          [1659694345.040160][3787:3792] CHIP:TOO:     NewPosition: 1
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          switch read-event initial-press   1 1
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-ongoing 1 100 1 1
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
-          Verify MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 2 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
 
-          [1659695330.923244][3912:3918] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
-          [1659695330.923264][3912:3918] CHIP:TOO:          Event number: 45
-          [1659695330.923283][3912:3918] CHIP:TOO:          Priority: Info
-          [1659695330.923302][3912:3918] CHIP:TOO:          Timestamp: 17754336
-          [1659695330.923326][3912:3918] CHIP:TOO:   MultiPressOngoing: {
-          [1659695330.923346][3912:3918] CHIP:TOO:     NewPosition: 1
-          [1659695330.923366][3912:3918] CHIP:TOO:     CurrentNumberOfPressesCounted: 2
-          [1659695330.923385][3912:3918] CHIP:TOO:    }
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
+
+          echo '{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the MultiPressongoing event with NewPosition set to 1:
+
+          [1697610439.738698][7384:7386] CHIP:-: Received payload: "{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}"
+          [1697610439.738953][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0c1
+          [1697610439.738982][7384:7384] CHIP:-: The new position when the momentary switch has been pressed in a multi-press sequence:1
+          [1697610439.738995][7384:7384] CHIP:-: 2 times the momentary switch has been pressed
+          [1697610439.739001][7384:7384] CHIP:ZCL: SwitchServer: OnMultiPressOngoing
+          [1697610439.739129][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000006 due to overflow: event priority_level: 1
+          [1697610439.739190][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610439.739220][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000020 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x5 Epoch timestamp: 0x0000018B41779C3B
+
+          switch read-event multi-press-ongoing 1 1
+
+          Verify TH receives  MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 2 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610464.005842][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
+          [1697610464.005846][7767:7769] CHIP:TOO:   Event number: 32
+          [1697610464.005848][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610464.005850][7767:7769] CHIP:TOO:   Timestamp: 1697610439739
+          [1697610464.005861][7767:7769] CHIP:TOO:   MultiPressOngoing: {
+          [1697610464.005866][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697610464.005869][7767:7769] CHIP:TOO:     CurrentNumberOfPressesCounted: 2
+          [1697610464.005872][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 6h: Operator releases switch"
@@ -907,43 +1039,59 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
-
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          [1659696223.568247][3981:3986] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659696223.568272][3981:3986] CHIP:TOO:          Event number: 53
-          [1659696223.568296][3981:3986] CHIP:TOO:          Priority: Info
-          [1659696223.568319][3981:3986] CHIP:TOO:          Timestamp: 18666186
-          [1659696223.568348][3981:3986] CHIP:TOO:   ShortRelease: {
-          [1659696223.568373][3981:3986] CHIP:TOO:     PreviousPosition: 1
-          [1659696223.568397][3981:3986] CHIP:TOO:    }
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
 
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
 
-          On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event)
+          switch read-event short-release 1 1
 
-          echo '{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-complete 1 100 1 1
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          Verify MultiPressComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 2 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          echo '{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          [1659695330.923244][3912:3918] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
-          [1659695330.923264][3912:3918] CHIP:TOO:          Event number: 45
-          [1659695330.923283][3912:3918] CHIP:TOO:          Priority: Info
-          [1659695330.923302][3912:3918] CHIP:TOO:          Timestamp: 17754336
-          [1659695330.923326][3912:3918] CHIP:TOO:   MultiPressComplete: {
-          [1659695330.923346][3912:3918] CHIP:TOO:     PrevioiusPosition: 1
-          [1659695330.923366][3912:3918] CHIP:TOO:     TotalNumberOfPressesCounted: 2
-          [1659695330.923385][3912:3918] CHIP:TOO:    }
+          DUT generated the MultiPressComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 2 :
+
+          [1697610593.918223][7384:7386] CHIP:-: Received payload: "{"Name":"MultiPressComplete","PreviousPosition":1,"TotalNumberOfPressesCounted":2}"
+          [1697610593.918505][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0c2
+          [1697610593.918536][7384:7384] CHIP:-: The previous position when the momentary switch has been pressed in a multi-press sequence:1
+          [1697610593.918545][7384:7384] CHIP:-: 2 times the momentary switch has been pressed
+          [1697610593.918552][7384:7384] CHIP:ZCL: SwitchServer: OnMultiPressComplete
+          [1697610593.918693][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000007 due to overflow: event priority_level: 1
+          [1697610593.918774][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610593.918814][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000021 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x6 Epoch timestamp: 0x0000018B4179F67E
+
+          switch read-event multi-press-complete 1 1
+
+          Verify TH receives MultiPressComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 2 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610633.998752][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0006
+          [1697610633.998762][7767:7769] CHIP:TOO:   Event number: 33
+          [1697610633.998769][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610633.998776][7767:7769] CHIP:TOO:   Timestamp: 1697610593918
+          [1697610633.998792][7767:7769] CHIP:TOO:   MultiPressComplete: {
+          [1697610633.998803][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610633.998811][7767:7769] CHIP:TOO:     TotalNumberOfPressesCounted: 2
+          [1697610633.998821][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -955,25 +1103,34 @@ tests:
       disabled: true
 
     - label: "Step 6j: Operator operates switch (press briefly)"
-      PICS: SWTCH.S.F01 && SWTCH.S.F04
+      PICS: ""
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
+
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
+
+          switch read-event initial-press   1 1
 
-          [1659695901.066563][3955:3960] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659695901.066583][3955:3960] CHIP:TOO:          Event number: 46
-          [1659695901.066602][3955:3960] CHIP:TOO:          Priority: Info
-          [1659695901.066643][3955:3960] CHIP:TOO:          Timestamp: 18095747
-          [1659695901.066669][3955:3960] CHIP:TOO:   InitialPress: {
-          [1659695901.066689][3955:3960] CHIP:TOO:     NewPosition: 1
-          [1659695901.066708][3955:3960] CHIP:TOO:    }
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label: "Step 6k: Operator releases switch"
@@ -981,21 +1138,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
+
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
 
-          Verify  ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+           switch read-event short-release 1 1
 
-          [1659694426.794832][3797:3802] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659694426.794853][3797:3802] CHIP:TOO:          Event number: 38
-          [1659694426.794873][3797:3802] CHIP:TOO:          Priority: Info
-          [1659694426.794891][3797:3802] CHIP:TOO:          Timestamp: 16840016
-          [1659694426.794914][3797:3802] CHIP:TOO:   ShortRelease: {
-          [1659694426.794934][3797:3802] CHIP:TOO:     PreviousPosition: 1
-          [1659694426.794952][3797:3802] CHIP:TOO:    }
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -1005,26 +1172,47 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
 
-          [1659694345.040034][3787:3792] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659694345.040059][3787:3792] CHIP:TOO:          Event number: 37
-          [1659694345.040083][3787:3792] CHIP:TOO:          Priority: Info
-          [1659694345.040106][3787:3792] CHIP:TOO:          Timestamp: 16729153
-          [1659694345.040135][3787:3792] CHIP:TOO:   InitialPress: {
-          [1659694345.040160][3787:3792] CHIP:TOO:     NewPosition: 1
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          switch read-event initial-press   1 1
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-ongoing 1 100 1 1
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
+
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
+
+          echo '{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 2:
+
+          [1697611293.571665][7384:7386] CHIP:-: Received payload: "{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":2}"
+          [1697611293.571907][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0c4
+          [1697611293.571940][7384:7384] CHIP:-: The new position when the momentary switch has been pressed in a multi-press sequence:1
+          [1697611293.571949][7384:7384] CHIP:-: 2 times the momentary switch has been pressed
+          [1697611293.571955][7384:7384] CHIP:ZCL: SwitchServer: OnMultiPressOngoing
+          [1697611293.572127][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x000000000000000A due to overflow: event priority_level: 1
+          [1697611293.572215][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697611293.572258][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000023 priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x5 Epoch timestamp: 0x0000018B4184A383
+
+          switch read-event  multi-press-ongoing  1 1
 
           Verify MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 2 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
@@ -1043,21 +1231,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
+
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          switch read-event short-release 1 1
 
-          [1659694426.794832][3797:3802] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659694426.794853][3797:3802] CHIP:TOO:          Event number: 38
-          [1659694426.794873][3797:3802] CHIP:TOO:          Priority: Info
-          [1659694426.794891][3797:3802] CHIP:TOO:          Timestamp: 16840016
-          [1659694426.794914][3797:3802] CHIP:TOO:   ShortRelease: {
-          [1659694426.794934][3797:3802] CHIP:TOO:     PreviousPosition: 1
-          [1659694426.794952][3797:3802] CHIP:TOO:    }
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -1067,26 +1265,36 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event initial-press 1 100 1 1
+          echo '{"Name":"InitialPress","NewPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          DUT generated the InitialPress event with NewPosition set to 1:
+
+          [1697609895.678486][7384:7386] CHIP:-: Received payload: "{"Name":"InitialPress","NewPosition":1}"
+          [1697609895.678744][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0be
+          [1697609895.678786][7384:7384] CHIP:-: The new position when the momentary switch starts to be pressed:1
+          [1697609895.678800][7384:7384] CHIP:ZCL: SwitchServer: OnInitialPress
+          [1697609895.678917][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697609895.678949][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001D priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x1 Epoch timestamp: 0x0000018B416F4EFE
 
-          [1659694345.040034][3787:3792] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
-          [1659694345.040059][3787:3792] CHIP:TOO:          Event number: 37
-          [1659694345.040083][3787:3792] CHIP:TOO:          Priority: Info
-          [1659694345.040106][3787:3792] CHIP:TOO:          Timestamp: 16729153
-          [1659694345.040135][3787:3792] CHIP:TOO:   InitialPress: {
-          [1659694345.040160][3787:3792] CHIP:TOO:     NewPosition: 1
+          switch read-event  initial-press 1 1
 
-          In Raspi platform to change the switch to second position use the below command, Pls use equivalent command on the respective DUT.open one more terminal on DUT side execute the echo command on that terminal.
+          Verify TH receives InitialPress event with NewPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+
+          [1697609943.498311][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0001
+          [1697609943.498313][7767:7769] CHIP:TOO:   Event number: 29
+          [1697609943.498315][7767:7769] CHIP:TOO:   Priority: Info
+          [1697609943.498317][7767:7769] CHIP:TOO:   Timestamp: 1697609895678
+          [1697609943.498320][7767:7769] CHIP:TOO:   InitialPress: {
+          [1697609943.498323][7767:7769] CHIP:TOO:     NewPosition: 1
+          [1697609943.498325][7767:7769] CHIP:TOO:    }
+
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
           echo '{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":3}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
 
-          Verify MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 3 on TH (all-cluster-app) log and below is the sample log provided for the raspi platform:
+          DUT generated the MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 3:
 
           [1686290991.699382][30125:30127] CHIP:-: Received payload: "{"Name":"MultiPressOngoing","NewPosition":1,"CurrentNumberOfPressesCounted":3}"
           [1686290991.699646][30125:30125] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 89759738
@@ -1094,13 +1302,9 @@ tests:
           [1686290991.699687][30125:30125] CHIP:-: 3 times the momentary switch has been pressed
           [1686290991.699694][30125:30125] CHIP:ZCL: SwitchServer: OnMultiPressOngoing
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
-
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-ongoing 1 100 1 1
+          switch read-event  multi-press-ongoing  1 1
 
-          Verify MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 3 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          Verify TH receives  MultiPressongoing event with NewPosition set to 1 and CurrentNumberOfPressesCounted set to 3 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
           [1659698336.786184][4081:4086] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
           [1659698336.786209][4081:4086] CHIP:TOO:          Event number: 57
@@ -1117,21 +1321,31 @@ tests:
       verification: |
           Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch.
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
+          On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
 
-          1. ./chip-tool interactive start
-          2. switch subscribe-event short-release 1 100 1 1
+          echo '{"Name":"ShortRelease","PreviousPosition":1}' > /tmp/chip_all_clusters_fifo_<PID>  (PID of DUT)
+
+          DUT generated the ShortRelease event with PreviousPosition set to 1:
+
+          [1697610020.642902][7384:7386] CHIP:-: Received payload: "{"Name":"ShortRelease","PreviousPosition":1}"
+          [1697610020.643151][7384:7384] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to 4dbcc0bf
+          [1697610020.643184][7384:7384] CHIP:-: The the previous value of the CurrentPosition when the momentary switch has been released:1
+          [1697610020.643194][7384:7384] CHIP:ZCL: SwitchServer: OnShortRelease
+          [1697610020.643356][7384:7384] CHIP:EVL: Dropped 1 event from buffer with priority 1 and event number  0x0000000000000005 due to overflow: event priority_level: 1
+          [1697610020.643427][7384:7384] CHIP:EVL: Copy Event to next buffer with priority 1
+          [1697610020.643456][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000001E priority: 1, endpoint id:  0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B41713723
+
+          switch read-event short-release  1 1
 
-          Verify ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
+          Verify TH receives ShortRelease event with PreviousPosition set to 1 on TH chip-tool log and below is the sample log provided for the raspi platform:
 
-          [1659696223.568247][3981:3986] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
-          [1659696223.568272][3981:3986] CHIP:TOO:          Event number: 53
-          [1659696223.568296][3981:3986] CHIP:TOO:          Priority: Info
-          [1659696223.568319][3981:3986] CHIP:TOO:          Timestamp: 18666186
-          [1659696223.568348][3981:3986] CHIP:TOO:   ShortRelease: {
-          [1659696223.568373][3981:3986] CHIP:TOO:     PreviousPosition: 1
-          [1659696223.568397][3981:3986] CHIP:TOO:    }
+          [1697610069.134658][7767:7769] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0003
+          [1697610069.134661][7767:7769] CHIP:TOO:   Event number: 30
+          [1697610069.134663][7767:7769] CHIP:TOO:   Priority: Info
+          [1697610069.134665][7767:7769] CHIP:TOO:   Timestamp: 1697610020643
+          [1697610069.134669][7767:7769] CHIP:TOO:   ShortRelease: {
+          [1697610069.134672][7767:7769] CHIP:TOO:     PreviousPosition: 1
+          [1697610069.134675][7767:7769] CHIP:TOO:    }
 
 
           On Raspi platform To trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor Dut should have capability to generate this event)
@@ -1144,13 +1358,9 @@ tests:
           [1659694592.348389][2530:2530] CHIP:DMG: Endpoint 1, Cluster 0x0000_003B update version to ee5e772b
           [1659694592.348481][2530:2530] CHIP:-: The new position when the momentary switch has been pressed in a multi-press sequence:1
 
-          Please use Interactive mode to Verify the subscription of an event
-          Here the command to enter interactive mode:--
-
-          1. ./chip-tool interactive start
-          2. switch subscribe-event multi-press-complete 1 100 1 1
+           switch read-event multi-press-complete 1 1
 
-          Verify MultiPressonComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 3 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
+          Verify TH receives MultiPressonComplete event with PreviousPosition set to 1 and TotalNumberOfPressesCounted set to 3 on TH (chip-tool) log and below is the sample log provided for the raspi platform:
 
           [1659695330.923244][3912:3918] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Event 0x0000_0005
           [1659695330.923264][3912:3918] CHIP:TOO:          Event number: 45
diff --git a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
index ed3fe73f726710..08cb955a312fc4 100644
--- a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
@@ -41,7 +41,7 @@ tests:
           constraints:
               type: int16u
 
-    - label: "Step 3a: Read FeatureMap (global attribute 65532)"
+    - label: "Step 3a: Read FeatureMap NameSupport bit (global attribute 65532)"
       PICS: (!S.S.F00)
       command: "readAttribute"
       attribute: "FeatureMap"
@@ -50,7 +50,7 @@ tests:
               type: bitmap32
               hasMasksClear: [0x1]
 
-    - label: "Step 3a: Read FeatureMap (global attribute 65532)"
+    - label: "Step 3a: Read FeatureMap NameSupport bit (global attribute 65532)"
       PICS: S.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
@@ -59,7 +59,17 @@ tests:
               type: bitmap32
               hasMasksSet: [0x1]
 
-    - label: "Step 3b: Read FeatureMap (global attribute 65532)"
+    - label: "Step 3b: Read FeatureMap Explicit bit (global attribute 65532)"
+      PICS: (!S.S.F01)
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksClear: [0x2]
+
+    - label: "Step 3b: Read FeatureMap Explicit bit (global attribute 65532)"
+      PICS: S.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -67,7 +77,17 @@ tests:
               type: bitmap32
               hasMasksSet: [0x2]
 
-    - label: "Step 3c: Read FeatureMap (global attribute 65532)"
+    - label: "Step 3c: Read FeatureMap TableSize bit (global attribute 65532)"
+      PICS: (!S.S.F02)
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksClear: [0x4]
+
+    - label: "Step 3c: Read FeatureMap TableSize bit (global attribute 65532)"
+      PICS: S.S.F02
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -75,6 +95,24 @@ tests:
               type: bitmap32
               hasMasksSet: [0x4]
 
+    - label: "Step 3d: Read FeatureMap FabricScene bit (global attribute 65532)"
+      PICS: (!S.S.F03)
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksClear: [0x8]
+
+    - label: "Step 3d: Read FeatureMap FabricScene bit (global attribute 65532)"
+      PICS: S.S.F03
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x8]
+
     - label:
           "Step 4: Read Mandatory attributes in AttributeList (global attribute
           65531)"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
index 3e31cf836e1dd2..97f3c0a23a1892 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
@@ -35,7 +35,7 @@ tests:
                 value: nodeId
 
     - label: "Step 2: TH reads from the DUT the (0x0000) SceneCount attribute"
-      PICS: S.S.A0000
+      PICS: S.S.A0000 && (!S.S.F03)
       command: "readAttribute"
       attribute: "SceneCount"
       response:
@@ -43,7 +43,7 @@ tests:
               type: int8u
 
     - label: "Step 3: TH reads from the DUT the (0x0001) CurrentScene attribute"
-      PICS: S.S.A0001
+      PICS: S.S.A0001 && (!S.S.F03)
       command: "readAttribute"
       attribute: "CurrentScene"
       response:
@@ -51,7 +51,7 @@ tests:
               type: int8u
 
     - label: "Step 4: TH reads from the DUT the (0x0002) CurrentGroup attribute"
-      PICS: S.S.A0002
+      PICS: S.S.A0002 && (!S.S.F03)
       command: "readAttribute"
       attribute: "CurrentGroup"
       response:
@@ -59,7 +59,7 @@ tests:
               type: group_id
 
     - label: "Step 5: TH reads from the DUT the (0x0003) SceneValid attribute"
-      PICS: S.S.A0003
+      PICS: S.S.A0003 && (!S.S.F03)
       command: "readAttribute"
       attribute: "SceneValid"
       response:
@@ -67,7 +67,7 @@ tests:
               type: boolean
 
     - label: "Step 6: TH reads from the DUT the (0x0004) NameSupport attribute"
-      PICS: S.S.A0003 && S.S.F00
+      PICS: S.S.A0004 && S.S.F00
       command: "readAttribute"
       attribute: "NameSupport"
       response:
@@ -103,11 +103,10 @@ tests:
               type: int16u
 
     - label:
-          "Step 9: TH reads from the DUT the (0x0007) RemainingCapacity
-          attribute"
+          "Step 9: TH reads from the DUT the (0x0007) FabricSceneInfo attribute"
       PICS: S.S.A0007
       command: "readAttribute"
-      attribute: "RemainingCapacity"
+      attribute: "FabricSceneInfo"
       response:
           constraints:
-              type: int8u
+              type: list
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
index 16780a7e9c0353..5601e168d5ab34 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -309,7 +309,7 @@ tests:
               type: boolean
 
     - label: "Step 3g: TH reads attribute SceneTableSize from DUT."
-      PICS: S.S.F03 && S.S.F02
+      PICS: PICS_SDK_CI_ONLY && S.S.F03 && S.S.F02
       command: "readAttribute"
       attribute: "SceneTableSize"
       response:
@@ -317,7 +317,6 @@ tests:
           constraints:
               type: int16u
 
-    #FabricSceneInfo attribute not supported
     - label: "Step 3h: TH reads attribute FabricSceneInfo from DUT"
       verification: |
           DUT provides FabricSceneInfo containing (for the current fabric) following fields:
@@ -330,7 +329,7 @@ tests:
 
           SceneValid has the value TRUE.
 
-          if S.S.F02(TS), RemainingCapacity has the value SceneTableSize/2
+          if S.S.F02(TS), RemainingCapacity has the value fabricCapacity - 1
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP && S.S.F03 && S.S.F02
@@ -341,18 +340,21 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    #- label: "Step 3h: TH reads attribute FabricSceneInfo from DUT"
-    #  PICS: S.S.F03 && S.S.F02
-    #  command: "readAttribute"
-    #  attribute: "FabricSceneInfo"
-    #  response:
-    #      value: {
-    #              SceneCount: SceneCountValue,
-    #              CurrentScene: 0x01,
-    #              CurrentGroup: G1,
-    #              SceneValid: true,
-    #              RemainingCapacity: ( SceneTableSizeValue/2 ),
-    #          }
+    - label: "Step 3h: TH reads attribute FabricSceneInfo from DUT"
+      PICS: PICS_SDK_CI_ONLY && S.S.F03 && S.S.F02
+      command: "readAttribute"
+      attribute: "FabricSceneInfo"
+      response:
+          value:
+              [
+                  {
+                      SceneCount: 1,
+                      CurrentScene: 0x01,
+                      CurrentGroup: G1,
+                      SceneValid: true,
+                      RemainingCapacity: fabricCapacity - 1,
+                  },
+              ]
 
     - label: "Step 4a: Reboot target device"
       PICS: PICS_SDK_CI_ONLY
@@ -449,76 +451,31 @@ tests:
               - name: "TransitionTime"
                 value: 0x0000
               - name: "ExtensionFieldSets"
-                value:
-                    [
-                        {
-                            ClusterID: 0x0006,
-                            AttributeValueList:
-                                [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
-                        },
-                        {
-                            ClusterID: 0x0008,
-                            AttributeValueList:
-                                [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
-                        },
-                        {
-                            ClusterID: 0x0300,
-                            AttributeValueList:
-                                [
-                                    {
-                                        AttributeID: 0x0003,
-                                        AttributeValue: 0x616b,
-                                    },
-                                    {
-                                        AttributeID: 0x0004,
-                                        AttributeValue: 0x607d,
-                                    },
-                                    {
-                                        AttributeID: 0x4000,
-                                        AttributeValue: 0x0000,
-                                    },
-                                    {
-                                        AttributeID: 0x0001,
-                                        AttributeValue: 0x00,
-                                    },
-                                    {
-                                        AttributeID: 0x4002,
-                                        AttributeValue: 0x00,
-                                    },
-                                    {
-                                        AttributeID: 0x4003,
-                                        AttributeValue: 0x00,
-                                    },
-                                    {
-                                        AttributeID: 0x4004,
-                                        AttributeValue: 0x0019,
-                                    },
-                                    {
-                                        AttributeID: 0x0007,
-                                        AttributeValue: 0x00,
-                                    },
-                                    {
-                                        AttributeID: 0x4001,
-                                        AttributeValue: 0x02,
-                                    },
-                                ],
-                        },
-                    ]
-                #TODO : Need to change the check for a check like below if possible
-                # constraints:
-                #     type: list
-                #     contains: [
-                #         {
-                #             ClusterID: 0x0006,
-                #             AttributeValueList:
-                #                 [{ AttributeID: 0x0000, AttributeValue: 0x01 }],
-                #         },
-                #         {
-                #             ClusterID: 0x0008,
-                #             AttributeValueList:
-                #                 [{ AttributeID: 0x0000, AttributeValue: 0x64 }],
-                #         },
-                #     ]
+                constraints:
+                    type: list
+                    contains:
+                        [
+                            {
+                                ClusterID: 0x0006,
+                                AttributeValueList:
+                                    [
+                                        {
+                                            AttributeID: 0x0000,
+                                            AttributeValue: 0x01,
+                                        },
+                                    ],
+                            },
+                            {
+                                ClusterID: 0x0008,
+                                AttributeValueList:
+                                    [
+                                        {
+                                            AttributeID: 0x0000,
+                                            AttributeValue: 0x64,
+                                        },
+                                    ],
+                            },
+                        ]
 
     - label:
           "Step 5: TH sends a ViewScene command to DUT with the GroupID field
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_3_2.yaml
index 29786eb28374e6..fa0db91e224883 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_3_2.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name: 219.3.2. [TC-TCCM-3.2] Startup Mode functionality with DUT as Server
 
@@ -20,195 +19,158 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
+    cluster: "Refrigerator And Temperature Controlled Cabinet Mode"
+    endpoint: 1
 
-tests:
-    - label: "Preconditions"
-      verification: |
-          !TCCM.S.F00(DEPONOFF) | OnOff cluster’s StartUpOnOff attribute is NULL | StartUpOnOff is 0 | OnMode is NULL
-      disabled: true
-
-    - label: "NOTE"
-      verification: |
-          To Execute the TC-TCCM-3.2 test case using reboot in raspi device we followed the below suggested way:
-
-          To run a reboot test case on raspi, run the app with --KVS flag with a file in local directory and pass that file to the command to launch the app. Steps
-
-            step-1:  create a file using touch command , something like touch mytest.txt
-            step-2:  chmod 777 mytest.txt
-            step-3:  launch the app ./chip-all-clusters-app --KVS ./mytest.txt
-
-          if you launch the app with the above commands and provision the app, even when you reboot the app with 'sudo reboot' , next time you launch the app with 'sudo ./out/all-clusters-app/chip-all-clusters-app --KVS ./mytest.txt' , you can run read/write attribs and commands without reprovisioning the device.
-      disabled: true
+    new_start_up_mode_th:
+        type: int8u
+        defaultValue: 0
+    new_mode_th:
+        type: int8u
+        defaultValue: 1
 
+tests:
     - label:
           "Step 1: Commission DUT to TH (can be skipped if done in a preceding
           test)."
-      verification: |
-
-      disabled: true
-
-    - label: "Step 2: TH reads from the DUT the StartUpMode attribute."
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 2: TH reads the StartUpMode attribute from the DUT"
       PICS: TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read start-up-mode 1 1
-
-          On TH(chip-tool),  Verify that StartUpMode attribute value is an integer or Null
-          - Save the value as startup_mode_dut, below is the sample log provided for the raspi platform:
-          - If startup_mode_dut is null proceed to step 3. Else save startup_mode_dut as new_start_up_mode_th and proceed to step 5.
-          - Here startup_mode_dut is null proceed to step 3.
+      command: "readAttribute"
+      attribute: "StartUpMode"
+      response:
+          saveAs: startup_mode_dut
+          constraints:
+              type: int8u
 
-          [1690541247.521286][2594:2596] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0002 DataVersion: 667171525
-          [1690541247.523875][2594:2596] CHIP:TOO:   StartUpMode: null
-      disabled: true
-
-    - label: "Step 3: TH reads from the DUT the SupportedModes attribute."
+    - label:
+          "If startup_mode_dut is null proceed to step 3. Else save
+          startup_mode_dut as new_start_up_mode_th and proceed to step 5"
+      PICS: TCCM.S.A0002
+      cluster: "EqualityCommands"
+      command: "UnsignedNumberEquals"
+      arguments:
+          values:
+              - name: "Value1"
+                value: startup_mode_dut
+              - name: "Value2"
+                value: null
+      response:
+          - values:
+                - name: "Equals"
+                  saveAs: IsExpectedValue
+
+    - label: "Step 3: TH reads the SupportedModes attribute from the DUT"
+      runIf: IsExpectedValue
       PICS: TCCM.S.A0000
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read supported-modes 1 1
-
-          On TH(chip-tool) log, Verify DUT response contains a list of ModeOptionsStruct entries
-          - Verify that the list has two or more entries
-          - Save the Mode field values as supported_modes_dut
-          - Select a value from supported_modes_dut and save the value as new_start_up_mode_th, below is the sample log provided for the raspi platform:
-
-          [1690190590.967854][16509:16511] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0000 DataVersion: 899063585
-          [1690190590.967878][16509:16511] CHIP:TOO:   SupportedModes: 3 entries
-          [1690190590.967889][16509:16511] CHIP:TOO:     [1]: {
-          [1690190590.967892][16509:16511] CHIP:TOO:       Label: Normal
-          [1690190590.967895][16509:16511] CHIP:TOO:       Mode: 0
-          [1690190590.967899][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967904][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967907][16509:16511] CHIP:TOO:           Value: 0
-          [1690190590.967910][16509:16511] CHIP:TOO:          }
-          [1690190590.967913][16509:16511] CHIP:TOO:      }
-          [1690190590.967918][16509:16511] CHIP:TOO:     [2]: {
-          [1690190590.967920][16509:16511] CHIP:TOO:       Label: Rapid Cool
-          [1690190590.967923][16509:16511] CHIP:TOO:       Mode: 1
-          [1690190590.967926][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967929][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967932][16509:16511] CHIP:TOO:           Value: 16384
-          [1690190590.967934][16509:16511] CHIP:TOO:          }
-          [1690190590.967937][16509:16511] CHIP:TOO:      }
-          [1690190590.967942][16509:16511] CHIP:TOO:     [3]: {
-          [1690190590.967944][16509:16511] CHIP:TOO:       Label: Rapid Freeze
-          [1690190590.967946][16509:16511] CHIP:TOO:       Mode: 2
-          [1690190590.967950][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967953][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967956][16509:16511] CHIP:TOO:           Value: 16385
-          [1690190590.967958][16509:16511] CHIP:TOO:          }
-          [1690190590.967961][16509:16511] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "SupportedModes"
+      response:
+          saveAs: supported_modes_dut
+          constraints:
+              type: list
+              minLength: 2
 
     - label:
-          "Step 4: TH writes to the DUT the StartUpMode attribute with the
+          "Step 4:TH writes to the DUT the StartUpMode attribute with the
           new_start_up_mode_th value"
+      runIf: IsExpectedValue
       PICS: TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode write start-up-mode 0 1 1
-
-          On TH(chip-tool) log, Verify that DUT responds with a successful (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690190139.816096][16383:16385] CHIP:DMG:                         StatusIB =
-          [1690190139.816100][16383:16385] CHIP:DMG:                         {
-          [1690190139.816102][16383:16385] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1690190139.816105][16383:16385] CHIP:DMG:                         },
-      disabled: true
+      command: "writeAttribute"
+      attribute: "StartUpMode"
+      arguments:
+          value: new_start_up_mode_th
 
-    - label: "Step 5: TH reads from the DUT the CurrentMode attribute."
+    - label: "Step 5: TH reads the CurrentMode attribute from the DUT"
       PICS: TCCM.S.A0001
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read current-mode 1 1
-
-          On TH(chip-tool), Verify that CurrentMode attribute value is an integer
-          - Save the value as old_current_mode_dut,  below is the sample log provided for the raspi platform:
-
-          NOTE: If startup_mode_dut is equal to old_current_mode_dut proceed to step 6. Else proceed to step 8
+      command: "readAttribute"
+      attribute: "CurrentMode"
+      response:
+          saveAs: old_current_mode_dut
+          constraints:
+              type: int8u
 
-          [1690190562.418843][16505:16507] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0001 DataVersion: 899063585
-          [1690190562.418907][16505:16507] CHIP:TOO:   CurrentMode: 0
-      disabled: true
-
-    - label: "Step 6: TH reads from the DUT the SupportedModes attribute."
+    - label:
+          "If startup_mode_dut is equal to old_current_mode_dut proceed to step
+          6. Else proceed to step 8"
+      PICS: TCCM.S.A0002 && TCCM.S.A0001
+      cluster: "EqualityCommands"
+      command: "UnsignedNumberEquals"
+      arguments:
+          values:
+              - name: "Value1"
+                value: startup_mode_dut
+              - name: "Value2"
+                value: old_current_mode_dut
+      response:
+          - values:
+                - name: "Equals"
+                  saveAs: Step5_IsExpectedValue
+
+    - label: "Step 6: TH reads the SupportedModes attribute from the DUT"
+      runIf: Step5_IsExpectedValue
       PICS: TCCM.S.A0000
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read supported-modes 1 1
-
-          On TH(chip-tool) log, Verify DUT response contains a list of ModeOptionsStruct entries
-          - Verify that the list has two or more entries
-          - Save the Mode field values as supported_modes_dut
-          - Select a value from supported_modes_dut different from startup_mode_dut. Save the value as new_mode_th, below is the sample log provided for the raspi platform:
-
-          [1690190590.967854][16509:16511] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0000 DataVersion: 899063585
-          [1690190590.967878][16509:16511] CHIP:TOO:   SupportedModes: 3 entries
-          [1690190590.967889][16509:16511] CHIP:TOO:     [1]: {
-          [1690190590.967892][16509:16511] CHIP:TOO:       Label: Normal
-          [1690190590.967895][16509:16511] CHIP:TOO:       Mode: 0
-          [1690190590.967899][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967904][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967907][16509:16511] CHIP:TOO:           Value: 0
-          [1690190590.967910][16509:16511] CHIP:TOO:          }
-          [1690190590.967913][16509:16511] CHIP:TOO:      }
-          [1690190590.967918][16509:16511] CHIP:TOO:     [2]: {
-          [1690190590.967920][16509:16511] CHIP:TOO:       Label: Rapid Cool
-          [1690190590.967923][16509:16511] CHIP:TOO:       Mode: 1
-          [1690190590.967926][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967929][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967932][16509:16511] CHIP:TOO:           Value: 16384
-          [1690190590.967934][16509:16511] CHIP:TOO:          }
-          [1690190590.967937][16509:16511] CHIP:TOO:      }
-          [1690190590.967942][16509:16511] CHIP:TOO:     [3]: {
-          [1690190590.967944][16509:16511] CHIP:TOO:       Label: Rapid Freeze
-          [1690190590.967946][16509:16511] CHIP:TOO:       Mode: 2
-          [1690190590.967950][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967953][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967956][16509:16511] CHIP:TOO:           Value: 16385
-          [1690190590.967958][16509:16511] CHIP:TOO:          }
-          [1690190590.967961][16509:16511] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "SupportedModes"
+      response:
+          saveAs: Step6_supported_modes_dut
+          constraints:
+              type: list
+              minLength: 2
 
     - label:
           "Step 7: TH sends a ChangeToMode command to the DUT with NewMode set
           to new_mode_th"
-      PICS: TCCM.S.C00.Rsp
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode change-to-mode 2 1 1
-
-          Verify on TH(chip-tool) log, DUT responds contains a ChangeToModeResponse command with a SUCCESS (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690190614.263418][16516:16518] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Command 0x0000_0001
-          [1690190614.263432][16516:16518] CHIP:TOO:   ChangeToModeResponse: {
-          [1690190614.263438][16516:16518] CHIP:TOO:     status: 0
-          [1690190614.263441][16516:16518] CHIP:TOO:    }
-      disabled: true
-
-    - label: "Step 8: Physically power cycle the device"
+      runIf: Step5_IsExpectedValue
+      PICS: DISHM.S.C00.Rsp
+      command: "ChangeToMode"
+      arguments:
+          values:
+              - name: "NewMode"
+                value: new_mode_th
+
+    - label: "Step 8: Physically power cycle the device."
       verification: |
-          Physically power cycle the device
-      disabled: true
-
-    - label: "Step 9: TH reads from the DUT the StartUpMode attribute."
-      PICS: TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read start-up-mode 1 1
-
-          On TH(chip-tool),  Verify that StartUpMode attribute value is an integer
-          - Save the value as new_start_up_mode_dut
-          - The value is equal to new_start_up_mode_th and below is the sample log provided for the raspi platform, Here StartUpMode value is 0
-
-          [1690541859.062480][2695:2697] CHIP:DMG: }
-          [1690541859.062677][2695:2697] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0002 DataVersion: 1628543926
-          [1690541859.062764][2695:2697] CHIP:TOO:   StartUpMode: 0
-      disabled: true
-
-    - label: "Step 10: TH reads from the DUT the CurrentMode attribute."
-      PICS: TCCM.S.A0001
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read current-mode 1 1
-
-          On TH(chip-tool), Verify that CurrentMode attribute value is an integer value and equal to  new_start_up_mode_dut,  below is the sample log provided for the raspi platform, Here CurrentMode attribute value is 0
-
-          [1690190646.897310][16529:16531] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0001 DataVersion: 3922115677
-          [1690190646.897357][16529:16531] CHIP:TOO:   CurrentMode: 0
-      disabled: true
+          Physically power cycle the device.
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_SKIP_SAMPLE_APP
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 9: TH reads the StartUpMode attribute from the DUT"
+      PICS: TCCM.S.A0002 && PICS_SKIP_SAMPLE_APP
+      command: "readAttribute"
+      attribute: "StartUpMode"
+      response:
+          saveAs: new_start_up_mode_dut
+          constraints:
+              type: int8u
+              anyOf: [new_start_up_mode_th, startup_mode_dut]
+
+    - label: "Step 10: TH reads the CurrentMode attribute from the DUT"
+      PICS: TCCM.S.A0001 && PICS_SKIP_SAMPLE_APP
+      command: "readAttribute"
+      attribute: "CurrentMode"
+      response:
+          value: new_start_up_mode_dut
+          constraints:
+              type: int8u
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
index 5be0c6eba7b28d..f6f3eb978c5b0f 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
     219.3.3. [TC-TCCM-3.3] On Mode and Startup Mode functionality with DUT as
@@ -21,229 +20,174 @@ PICS:
     - TCCM.S.A0002
     - TCCM.S.A0003
     - TCCM.S.F00
+    - OO.S.A4003
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
+    cluster: "Refrigerator And Temperature Controlled Cabinet Mode"
+    endpoint: 1
 
-tests:
-    - label: "Note"
-      verification: |
-          To Execute the TC-TCC-3.3 test case using reboot in raspi device we followed the below suggested way:
-
-          To run a reboot test case on raspi, run the app with --KVS flag with a file in local directory and pass that file to the command to launch the app. Steps
+    new_start_up_mode_th:
+        type: int8u
+        defaultValue: 0
+    new_mode_th:
+        type: int8u
+        defaultValue: 1
 
-            step-1:  create a file using touch command , something like touch mytest.txt
-            step-2:  chmod 777 mytest.txt
-            step-3:  launch the app ./chip-all-clusters-app --KVS ./mytest.txt
-
-          if you launch the app with the above commands and provision the app, even when you reboot the app with 'sudo reboot' , next time you launch the app with 'sudo ./out/all-clusters-app/chip-all-clusters-app --KVS ./mytest.txt' , you can run read/write attribs and commands without reprovisioning the device.
-      disabled: true
+tests:
+    - label: "Step 1: Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 2: TH reads the StartUpMode attribute from the DUT"
+      PICS: TCCM.S.A0002
+      command: "readAttribute"
+      attribute: "StartUpMode"
+      response:
+          saveAs: startup_mode_dut
+          constraints:
+              type: int8u
 
     - label:
-          "Step 1: Commission DUT to TH (can be skipped if done in a preceding
-          test)."
-      verification: |
-
-      disabled: true
-
-    - label: "Step 2: TH reads from the DUT the StartUpMode attribute."
+          "If startup_mode_dut is null proceed to step 3. Else save
+          startup_mode_dut as new_start_up_mode_th and proceed to step 5"
       PICS: TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read start-up-mode 1 1
-
-          On TH(chip-tool),  Verify that StartUpMode attribute value is an integer or Null
-          - Save the value as startup_mode_dut, below is the sample log provided for the raspi platform:
-          - If startup_mode_dut is null proceed to step 3. Else save startup_mode_dut as new_start_up_mode_th and proceed to step 5.
-          - Here startup_mode_dut is null proceed to step 3.
-
-          [1690541247.515223][2594:2596] CHIP:DMG: }
-          [1690541247.521286][2594:2596] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0002 DataVersion: 667171525
-          [1690541247.523875][2594:2596] CHIP:TOO:   StartUpMode: null
-      disabled: true
-
-    - label: "Step 3: TH reads from the DUT the SupportedModes attribute."
+      cluster: "EqualityCommands"
+      command: "UnsignedNumberEquals"
+      arguments:
+          values:
+              - name: "Value1"
+                value: startup_mode_dut
+              - name: "Value2"
+                value: null
+      response:
+          - values:
+                - name: "Equals"
+                  saveAs: IsExpectedValue
+
+    - label: "Step 3: TH reads the SupportedModes attribute from the DUT"
+      runIf: IsExpectedValue
       PICS: TCCM.S.A0000
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read supported-modes 1 1
-
-          On TH(chip-tool) log, Verify DUT response contains a list of ModeOptionsStruct entries
-          - Verify that the list has two or more entries
-          - Save the Mode field values as supported_modes_dut
-          - Select a value from supported_modes_dut and save the value as new_start_up_mode_th, below is the sample log provided for the raspi platform:
-
-          [1690190590.967854][16509:16511] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0000 DataVersion: 899063585
-          [1690190590.967878][16509:16511] CHIP:TOO:   SupportedModes: 3 entries
-          [1690190590.967889][16509:16511] CHIP:TOO:     [1]: {
-          [1690190590.967892][16509:16511] CHIP:TOO:       Label: Normal
-          [1690190590.967895][16509:16511] CHIP:TOO:       Mode: 0
-          [1690190590.967899][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967904][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967907][16509:16511] CHIP:TOO:           Value: 0
-          [1690190590.967910][16509:16511] CHIP:TOO:          }
-          [1690190590.967913][16509:16511] CHIP:TOO:      }
-          [1690190590.967918][16509:16511] CHIP:TOO:     [2]: {
-          [1690190590.967920][16509:16511] CHIP:TOO:       Label: Rapid Cool
-          [1690190590.967923][16509:16511] CHIP:TOO:       Mode: 1
-          [1690190590.967926][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967929][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967932][16509:16511] CHIP:TOO:           Value: 16384
-          [1690190590.967934][16509:16511] CHIP:TOO:          }
-          [1690190590.967937][16509:16511] CHIP:TOO:      }
-          [1690190590.967942][16509:16511] CHIP:TOO:     [3]: {
-          [1690190590.967944][16509:16511] CHIP:TOO:       Label: Rapid Freeze
-          [1690190590.967946][16509:16511] CHIP:TOO:       Mode: 2
-          [1690190590.967950][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967953][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967956][16509:16511] CHIP:TOO:           Value: 16385
-          [1690190590.967958][16509:16511] CHIP:TOO:          }
-          [1690190590.967961][16509:16511] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "SupportedModes"
+      response:
+          saveAs: supported_modes_dut
+          constraints:
+              type: list
+              minLength: 2
 
     - label:
-          "Step 4: TH writes to the DUT the StartUpMode attribute with the
+          "Step 4:TH writes to the DUT the StartUpMode attribute with the
           new_start_up_mode_th value"
+      runIf: IsExpectedValue
       PICS: TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode write start-up-mode 0 1 1
+      command: "writeAttribute"
+      attribute: "StartUpMode"
+      arguments:
+          value: new_start_up_mode_th
 
-          On TH(chip-tool) log, Verify that DUT responds with a successful (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690190139.816096][16383:16385] CHIP:DMG:                         StatusIB =
-          [1690190139.816100][16383:16385] CHIP:DMG:                         {
-          [1690190139.816102][16383:16385] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1690190139.816105][16383:16385] CHIP:DMG:                         },
-      disabled: true
-
-    - label: "Step 5: TH reads from the DUT the OnMode attribute."
+    - label: "Step 5: TH reads the OnMode attribute from the DUT"
       PICS: TCCM.S.A0003 && TCCM.S.A0002
-      verification: |
-          As default value of OnMode attribute is NULL. Set the OnMode to any mode value listed in the SupportedModes entries.
-
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode write on-mode 0 1 1
-
-          On TH(chip-tool) log, Verify that DUT responds with a successful (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690190824.443367][16580:16582] CHIP:DMG:                         StatusIB =
-          [1690190824.443379][16580:16582] CHIP:DMG:                         {
-          [1690190824.443391][16580:16582] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1690190824.443402][16580:16582] CHIP:DMG:                         },
-
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read on-mode 1 1
-
-          On TH(chip-tool),  Verify that OnMode attribute value is an integer
-          - Save the value as old_on_mode_dut, below is the sample log provided for the raspi platform, here OnMode attribute value is 0
+      command: "readAttribute"
+      attribute: "OnMode"
+      response:
+          saveAs: old_on_mode_dut
+          constraints:
+              type: int8u
 
-          [1690190846.367481][16585:16587] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0003 DataVersion: 978521150
-          [1690190846.367522][16585:16587] CHIP:TOO:   OnMode: 0
-
-          If startup_mode_dut is equal to old_on_mode_dut proceed to step 6. Else proceed to step 8.
-      disabled: true
-
-    - label: "Step 6: TH reads from the DUT the SupportedModes attribute."
+    - label:
+          "If startup_mode_dut is equal to old_on_mode_dut proceed to step 6.
+          Else proceed to step 8."
+      PICS: TCCM.S.A0003 && TCCM.S.A0002
+      cluster: "EqualityCommands"
+      command: "UnsignedNumberEquals"
+      arguments:
+          values:
+              - name: "Value1"
+                value: startup_mode_dut
+              - name: "Value2"
+                value: old_on_mode_dut
+      response:
+          - values:
+                - name: "Equals"
+                  saveAs: Step5_IsExpectedValue
+
+    - label: "Step 6: TH reads the SupportedModes attribute from the DUT"
+      runIf: Step5_IsExpectedValue
       PICS: TCCM.S.A0000 && TCCM.S.A0002
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read supported-modes 1 1
-
-          On TH(chip-tool) log, Verify DUT response contains a list of ModeOptionsStruct entries
-          - Verify that the list has two or more entries
-          - Save the Mode field values as supported_modes_dut
-          - Select a value from supported_modes_dut different from startup_mode_dut. Save the value as new_mode_th, below is the sample log provided for the raspi platform:
-
-          [1690190590.967854][16509:16511] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0000 DataVersion: 899063585
-          [1690190590.967878][16509:16511] CHIP:TOO:   SupportedModes: 3 entries
-          [1690190590.967889][16509:16511] CHIP:TOO:     [1]: {
-          [1690190590.967892][16509:16511] CHIP:TOO:       Label: Normal
-          [1690190590.967895][16509:16511] CHIP:TOO:       Mode: 0
-          [1690190590.967899][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967904][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967907][16509:16511] CHIP:TOO:           Value: 0
-          [1690190590.967910][16509:16511] CHIP:TOO:          }
-          [1690190590.967913][16509:16511] CHIP:TOO:      }
-          [1690190590.967918][16509:16511] CHIP:TOO:     [2]: {
-          [1690190590.967920][16509:16511] CHIP:TOO:       Label: Rapid Cool
-          [1690190590.967923][16509:16511] CHIP:TOO:       Mode: 1
-          [1690190590.967926][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967929][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967932][16509:16511] CHIP:TOO:           Value: 16384
-          [1690190590.967934][16509:16511] CHIP:TOO:          }
-          [1690190590.967937][16509:16511] CHIP:TOO:      }
-          [1690190590.967942][16509:16511] CHIP:TOO:     [3]: {
-          [1690190590.967944][16509:16511] CHIP:TOO:       Label: Rapid Freeze
-          [1690190590.967946][16509:16511] CHIP:TOO:       Mode: 2
-          [1690190590.967950][16509:16511] CHIP:TOO:       ModeTags: 1 entries
-          [1690190590.967953][16509:16511] CHIP:TOO:         [1]: {
-          [1690190590.967956][16509:16511] CHIP:TOO:           Value: 16385
-          [1690190590.967958][16509:16511] CHIP:TOO:          }
-          [1690190590.967961][16509:16511] CHIP:TOO:      }
-      disabled: true
+      command: "readAttribute"
+      attribute: "SupportedModes"
+      response:
+          saveAs: step6_supported_modes_dut
+          constraints:
+              type: list
+              minLength: 2
 
     - label:
-          "Step 7: TH writes to the DUT the OnMode attribute with the
-          new_mode_th value"
+          "Step 7:TH writes to the DUT the OnMode attribute with the new_mode_th
+          value"
+      runIf: Step5_IsExpectedValue
       PICS: TCCM.S.A0003
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode write on-mode 1 1 1
+      command: "writeAttribute"
+      attribute: "OnMode"
+      arguments:
+          value: new_mode_th
 
-          On TH(chip-tool) log, Verify that DUT responds with a successful (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690190905.134866][16594:16596] CHIP:DMG:                         StatusIB =
-          [1690190905.134869][16594:16596] CHIP:DMG:                         {
-          [1690190905.134873][16594:16596] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1690190905.134876][16594:16596] CHIP:DMG:                         },
-      disabled: true
-
-    - label: "Step 8: TH reads from the DUT the OnMode attribute."
+    - label: "Step 8: TH reads the OnMode attribute from the DUT"
       PICS: TCCM.S.A0003 && TCCM.S.F00
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read on-mode 1 1
-
-          On TH(chip-tool),  Verify that OnMode attribute value is an integer
-          - Save the value as new_on_mode_dut and  value is equal to new_mode_th,  below is the sample log provided for the raspi platform, here OnMode attribute value is 1
-
-          [1690190846.367481][16585:16587] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0003 DataVersion: 978521150
-          [1690190846.367522][16585:16587] CHIP:TOO:   OnMode: 1
-      disabled: true
+      command: "readAttribute"
+      attribute: "OnMode"
+      response:
+          saveAs: new_on_mode_dut
+          constraints:
+              anyOf: [new_mode_th, old_on_mode_dut]
 
     - label:
-          "Step 9: TH writes to the DUT the StartUpOnOff attribute with the
-          value 1."
+          "Step 9:TH writes to the DUT the StartUpOnOff attribute with the value
+          1"
       PICS: OO.S.A4003
-      verification: |
-          ./chip-tool onoff write start-up-on-off 1 1 1
+      cluster: "On/Off"
+      command: "writeAttribute"
+      attribute: "StartUpOnOff"
+      arguments:
+          value: 1
 
-          On TH(chip-tool) log, Verify DUT responds with a successful (value 0x00) status response and below is the sample log provided for the raspi platform:
-
-          [1690180270.884152][14228:14230] CHIP:DMG:                         {
-          [1690180270.884156][14228:14230] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1690180270.884158][14228:14230] CHIP:DMG:                         },
-      disabled: true
-
-    - label: "Step 10: Physically power cycle the device"
-      verification: |
-          Physically power cycle the device
-      disabled: true
-
-    - label: "Step 11: TH reads from the DUT the StartUpMode attribute."
-      PICS: TCCM.S.A0002
+    - label: "Step 10: Physically power cycle the device."
       verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read start-up-mode 1 1
-
-          On TH(chip-tool),  Verify that StartUpMode attribute value is an integer  value is equal to new_start_up_mode_th, below is the sample log provided for the raspi platform , here StartUpMode is 0
-
-          [1690541247.515223][2594:2596] CHIP:DMG: }
-          [1690541247.521286][2594:2596] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0002 DataVersion: 667171525
-          [1690541247.523875][2594:2596] CHIP:TOO:   StartUpMode: 0
-      disabled: true
-
-    - label: "Step 12: TH reads from the DUT the CurrentMode attribute."
-      PICS: TCCM.S.A0001
-      verification: |
-          ./chip-tool refrigeratorandtemperaturecontrolledcabinetmode read current-mode 1 1
-
-          On TH(chip-tool), Verify that CurrentMode attribute value is an integer value and equal to new_on_mode_dut,  below is the sample log provided for the raspi platform, Here CurrentMode attribute value is 1
-
-          [1690190945.261971][16605:16607] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0052 Attribute 0x0000_0001 DataVersion: 4180211608
-          [1690190945.261982][16605:16607] CHIP:TOO:   CurrentMode: 1
-      disabled: true
+          Physically power cycle the device.
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_SKIP_SAMPLE_APP
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 11: TH reads the StartUpMode attribute from the DUT"
+      PICS: TCCM.S.A0002 && PICS_SKIP_SAMPLE_APP
+      command: "readAttribute"
+      attribute: "StartUpMode"
+      response:
+          constraints:
+              anyOf: [new_start_up_mode_th, startup_mode_dut]
+
+    - label: "Step 12: TH reads the CurrentMode attribute from the DUT"
+      PICS: TCCM.S.A0001 && PICS_SKIP_SAMPLE_APP
+      command: "readAttribute"
+      attribute: "CurrentMode"
+      response:
+          value: new_on_mode_dut
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index a4dcce73f08600..77167aa6f46673 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -651,14 +651,14 @@ I.C.AO-WRITE=0
 
 # Scenes Cluster
 S.S=1
-S.S.A0000=1
-S.S.A0001=1
-S.S.A0002=1
-S.S.A0003=1
+S.S.A0000=0
+S.S.A0001=0
+S.S.A0002=0
+S.S.A0003=0
 S.S.A0004=1
 S.S.A0005=1
 S.S.A0006=1
-S.S.A0007=0
+S.S.A0007=1
 S.S.C00.Rsp=1
 S.S.C01.Rsp=1
 S.S.C02.Rsp=1
@@ -674,7 +674,7 @@ S.S.AO=0
 S.S.F00=1
 S.S.F01=1
 S.S.F02=1
-S.S.F03=0
+S.S.F03=1
 PICS_SC_RECALL_SCENE_TRANSITION_TIME=1
 
 S.C=0
@@ -1134,7 +1134,7 @@ DGWIFI.S.A000b=1
 DGWIFI.S.A000c=1
 # Client
 DGWIFI.C=1
-DGWIFI.S.C00.Tx=0
+DGWIFI.C.C00.Tx=0
 # Events
 DGWIFI.S.E00=1
 DGWIFI.S.E01=1
diff --git a/src/app/tests/suites/ciTests.json b/src/app/tests/suites/ciTests.json
index d17ace003fefcb..18a069f267e33e 100644
--- a/src/app/tests/suites/ciTests.json
+++ b/src/app/tests/suites/ciTests.json
@@ -41,7 +41,6 @@
         "TestColorControl_9_2"
     ],
     "DeviceManagement": [
-        "TestIcdManagementCluster",
         "Test_TC_OPCREDS_1_2",
         "Test_TC_OPCREDS_3_7",
         "Test_TC_BINFO_1_1",
@@ -71,7 +70,7 @@
     "GeneralCommissioning": ["Test_TC_CGEN_1_1", "Test_TC_CGEN_2_1"],
     "GeneralDiagnostics": ["Test_TC_DGGEN_1_1"],
     "GroupKeyManagement": ["Test_TC_GRPKEY_1_1", "Test_TC_GRPKEY_2_2"],
-    "IcdManagement": ["Test_TC_ICDM_1_1"],
+    "IcdManagement": ["TestIcdManagementCluster", "Test_TC_ICDM_1_1"],
     "Identify": [
         "Test_TC_I_1_1",
         "Test_TC_I_2_1",
@@ -179,11 +178,12 @@
         "Test_TC_PCC_2_4"
     ],
     "PowerSourceConfiguration": ["Test_TC_PSCFG_1_1", "Test_TC_PSCFG_2_1"],
-    "RefrigeratorAlarm": ["Test_TC_REFALM_1_1"],
+    "RefrigeratorAlarm": ["Test_TC_REFALM_1_1", "Test_TC_REFALM_2_1"],
     "RelativeHumidityMeasurement": ["Test_TC_RH_1_1", "Test_TC_RH_2_1"],
     "RoboticVacuumCleaner": [
         "Test_TC_RVCCLEANM_1_1",
         "Test_TC_RVCRUNM_1_1",
+        "Test_TC_RVCRUNM_3_1",
         "Test_TC_RVCOPSTATE_1_1"
     ],
     "SecureChannel": [],
@@ -199,7 +199,9 @@
     "Switch": ["Test_TC_SWTCH_1_1", "Test_TC_SWTCH_2_1"],
     "TemperatureControlledCabinetMode": [
         "Test_TC_TCCM_1_1",
-        "Test_TC_TCCM_3_1"
+        "Test_TC_TCCM_3_1",
+        "Test_TC_TCCM_3_2",
+        "Test_TC_TCCM_3_3"
     ],
     "TemperatureControl": [
         "Test_TC_TCTL_1_1",
@@ -319,6 +321,9 @@
         "Test_TC_G_2_1"
     ],
     "Scenes": [
+        "TestScenesFabricRemoval",
+        "TestScenesFabricSceneInfo",
+        "TestScenesMultiFabric",
         "Test_TC_S_1_1",
         "Test_TC_S_2_1",
         "Test_TC_S_2_2",
diff --git a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
index c3ba7b4ca0e65e..2313480351d803 100644
--- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
+++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
@@ -117,7 +117,6 @@ CHIP_ERROR DiscoveryCommands::SetupDiscoveryCommands()
         ReturnErrorOnFailure(mDNSResolver.Init(chip::DeviceLayer::UDPEndPointManager()));
         mReady = true;
     }
-    mDNSResolver.SetOperationalDelegate(this);
     mDNSResolver.SetCommissioningDelegate(this);
     return CHIP_NO_ERROR;
 }
@@ -125,7 +124,6 @@ CHIP_ERROR DiscoveryCommands::SetupDiscoveryCommands()
 CHIP_ERROR DiscoveryCommands::TearDownDiscoveryCommands()
 {
     mDNSResolver.StopDiscovery();
-    mDNSResolver.SetOperationalDelegate(nullptr);
     mDNSResolver.SetCommissioningDelegate(nullptr);
     return CHIP_NO_ERROR;
 }
@@ -175,6 +173,16 @@ void DiscoveryCommands::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData &
         data.mrpRetryIntervalActive.SetValue(nodeData.resolutionData.mrpRetryIntervalActive.Value().count());
     }
 
+    if (nodeData.resolutionData.mrpRetryActiveThreshold.HasValue())
+    {
+        data.mrpRetryActiveThreshold.SetValue(nodeData.resolutionData.mrpRetryActiveThreshold.Value().count());
+    }
+
+    if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue())
+    {
+        data.isICDOperatingAsLIT.SetValue(nodeData.resolutionData.isICDOperatingAsLIT.Value());
+    }
+
     chip::app::StatusIB status;
     status.mStatus = chip::Protocols::InteractionModel::Status::Success;
 
diff --git a/src/app/tests/suites/commands/discovery/DiscoveryCommands.h b/src/app/tests/suites/commands/discovery/DiscoveryCommands.h
index 37fd9b4f8bf376..8425ef4ff1be81 100644
--- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.h
+++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.h
@@ -24,7 +24,7 @@
 
 #include <app-common/zap-generated/tests/simulated-cluster-objects.h>
 
-class DiscoveryCommands : public chip::Dnssd::CommissioningResolveDelegate, public chip::Dnssd::OperationalResolveDelegate
+class DiscoveryCommands : public chip::Dnssd::CommissioningResolveDelegate
 {
 public:
     DiscoveryCommands(){};
@@ -64,10 +64,6 @@ class DiscoveryCommands : public chip::Dnssd::CommissioningResolveDelegate, publ
     /////////// CommissioningDelegate Interface /////////
     void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
 
-    /////////// OperationalDelegate Interface /////////
-    void OnOperationalNodeResolved(const chip::Dnssd::ResolvedNodeData & nodeData) override{};
-    void OnOperationalNodeResolutionFailed(const chip::PeerId & peerId, CHIP_ERROR error) override{};
-
 private:
     bool mReady = false;
     chip::Dnssd::ResolverProxy mDNSResolver;
diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json
index a26fe6737a29c0..74e1d33ba99fdd 100644
--- a/src/app/tests/suites/manualTests.json
+++ b/src/app/tests/suites/manualTests.json
@@ -267,19 +267,13 @@
     "OperationalState": ["Test_TC_OPSTATE_2_2"],
     "RelativeHumidityMeasurement": ["Test_TC_RH_2_2"],
     "SmokeCOAlarm": [],
-    "RefrigeratorAlarm": [
-        "Test_TC_REFALM_2_1",
-        "Test_TC_REFALM_2_2",
-        "Test_TC_REFALM_2_3"
-    ],
+    "RefrigeratorAlarm": ["Test_TC_REFALM_2_2", "Test_TC_REFALM_2_3"],
     "RVCCleanMode": ["Test_TC_RVCCLEANM_3_3"],
     "RVCOperationalState": ["Test_TC_RVCOPSTATE_2_2"],
     "RVCRunMode": ["Test_TC_RVCRUNM_3_3"],
     "TemperatureControlledCabinetMode": [
         "Test_TC_TCCM_1_2",
-        "Test_TC_TCCM_2_1",
-        "Test_TC_TCCM_3_2",
-        "Test_TC_TCCM_3_3"
+        "Test_TC_TCCM_2_1"
     ],
     "Switch": ["Test_TC_SWTCH_2_2", "Test_TC_SWTCH_3_2"],
     "TemperatureControl": ["Test_TC_TCTL_3_2", "Test_TC_TCTL_3_3"],
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index 619ecdcd923dcc..9d618dcc69e93c 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -158,6 +158,9 @@ void MatterRefrigeratorAndTemperatureControlledCabinetModePluginServerInitCallba
 void MatterOperationalStatePluginServerInitCallback() {}
 void MatterRvcOperationalStatePluginServerInitCallback() {}
 void MatterDishwasherAlarmPluginServerInitCallback() {}
+void MatterBooleanSensorConfigurationPluginServerInitCallback() {}
+void MatterValveConfigurationAndControlPluginServerInitCallback() {}
+void MatterMicrowaveOvenModePluginServerInitCallback() {}
 // ****************************************
 // Print out information about each cluster
 // ****************************************
diff --git a/src/app/zap-templates/partials/idl/cluster_definition.zapt b/src/app/zap-templates/partials/idl/cluster_definition.zapt
index ea8923f66c578b..431b64c6b8b02c 100644
--- a/src/app/zap-templates/partials/idl/cluster_definition.zapt
+++ b/src/app/zap-templates/partials/idl/cluster_definition.zapt
@@ -7,6 +7,14 @@ cluster {{asUpperCamelCase name}} = {{!}}
      {{else}}
         {{~code~}}
      {{/if}} {
+  {{#global_attribute_default code="0xFFFD"}}
+  {{#if defaultValue}}
+  revision {{defaultValue}};
+  {{else}}
+  revision 1; // NOTE: Default/not specifically set
+  {{/if}}
+
+  {{/global_attribute_default}}
   {{#zcl_enums}}
   enum {{asUpperCamelCase name preserveAcronyms=true}} : enum{{multiply size 8}} {
     {{#zcl_enum_items}}
diff --git a/src/app/zap-templates/templates/app/attribute-size.zapt b/src/app/zap-templates/templates/app/attribute-size.zapt
deleted file mode 100644
index 489dca0b893f68..00000000000000
--- a/src/app/zap-templates/templates/app/attribute-size.zapt
+++ /dev/null
@@ -1,11 +0,0 @@
-{{> header}}
-
-// Prevent multiple inclusion
-#pragma once
-
-// ZCL attribute sizes
-{{#zcl_atomics}}
-{{#if size}}
-{{ident}}ZCL_{{asDelimitedMacro name}}_ATTRIBUTE_TYPE, {{size}},
-{{/if}}
-{{/zcl_atomics}}
diff --git a/src/app/zap-templates/templates/app/cluster-enums-check.zapt b/src/app/zap-templates/templates/app/cluster-enums-check.zapt
index cf66cef8a3d5c2..cb263c05153db1 100644
--- a/src/app/zap-templates/templates/app/cluster-enums-check.zapt
+++ b/src/app/zap-templates/templates/app/cluster-enums-check.zapt
@@ -14,21 +14,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue({{asUpperCamelCase ../n
 {
     using EnumType = {{asUpperCamelCase ../name}}::{{asType label}};
     switch (val) {
-{{#if (isInConfigList label "WeakEnums")}}
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-{{/if}}
     {{#zcl_enum_items}}
     case EnumType::k{{asUpperCamelCase label}}:
     {{/zcl_enum_items}}
-{{#if (isInConfigList label "WeakEnums")}}
-#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    {{#zcl_enum_items}}
-    case EMBER_ZCL_{{asDelimitedMacro parent.label}}_{{asDelimitedMacro label}}:
-    {{/zcl_enum_items}}
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-{{/if}}
         return val;
     default:
         return static_cast<EnumType>({{first_unused_enum_value mode="first_unused"}});
diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt
index 2f4ba955abbf89..34092a124f519e 100644
--- a/src/app/zap-templates/templates/app/cluster-enums.zapt
+++ b/src/app/zap-templates/templates/app/cluster-enums.zapt
@@ -4,7 +4,6 @@
 
 #include <stdint.h>
 
-#include <app-common/zap-generated/enums.h>
 
 namespace chip {
 namespace app {
@@ -14,11 +13,6 @@ namespace Clusters {
 namespace {{asUpperCamelCase name}} {
 {{#zcl_enums}}
 
-{{#if (isInConfigList label "WeakEnums")}}
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-{{/if}}
 // Enum for {{label}}
 enum class {{asType label}} : {{asUnderlyingZclType name}} {
 {{#zcl_enum_items}}
@@ -38,12 +32,6 @@ kUnknownEnumValue = {{first_unused_enum_value mode="first_unused"}},
 // src/app/common/templates/config-data.yaml.
 {{/unless}}
 };
-{{#if (isInConfigList label "WeakEnums")}}
-#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using {{asType label}} = EmberAf{{asType label}};
-static {{asType label}} __attribute__((unused)) k{{asType label}}kUnknownEnumValue = static_cast<{{asType label}}>({{first_unused_enum_value mode="first_unused"}});
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-{{/if}}
 {{/zcl_enums}}
 {{#zcl_bitmaps}}
 
diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
index 9b4fe04b4341a9..4e17d227629f34 100644
--- a/src/app/zap-templates/templates/app/cluster-objects.zapt
+++ b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -13,7 +13,6 @@
 #include <lib/core/ClusterEnums.h>
 #include <lib/support/BitMask.h>
 #include <protocols/interaction_model/Constants.h>
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
diff --git a/src/app/zap-templates/templates/app/enums.zapt b/src/app/zap-templates/templates/app/enums.zapt
deleted file mode 100644
index d0e95a7df2b75f..00000000000000
--- a/src/app/zap-templates/templates/app/enums.zapt
+++ /dev/null
@@ -1,20 +0,0 @@
-{{> header}}
-
-// Prevent multiple inclusion
-#pragma once
-
-#include <stdint.h>
-
-// ZCL enums
-
-{{#zcl_enums}}
-{{#if (isInConfigList label "WeakEnums")}}
-
-// Enum for {{label}}
-enum EmberAf{{asType label}} : {{asUnderlyingZclType name}} {
-{{#zcl_enum_items}}
-{{ident}}EMBER_ZCL_{{asDelimitedMacro parent.label}}_{{asDelimitedMacro label}} = {{value}},
-{{/zcl_enum_items}}
-};
-{{/if}}
-{{/zcl_enums}}
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 211fed5581d049..ce8ac2beb043b8 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -10,6 +10,7 @@
    <xi:include href="chip/ballast-configuration-cluster.xml" />
    <xi:include href="chip/basic-information-cluster.xml" />
    <xi:include href="chip/binding-cluster.xml" />
+   <xi:include href="chip/boolean-sensor-configuration-cluster.xml" />
    <xi:include href="chip/boolean-state-cluster.xml" />
    <xi:include href="chip/actions-cluster.xml" />
    <xi:include href="chip/bridged-device-basic-information.xml" />
@@ -23,7 +24,11 @@
    <xi:include href="chip/diagnostic-logs-cluster.xml" />
    <xi:include href="chip/dishwasher-alarm-cluster.xml" />
    <xi:include href="chip/dishwasher-mode-cluster.xml" />
+   <xi:include href="chip/drlc.xml" />
+   <xi:include href="chip/microwave-oven-mode-cluster.xml" />
+   <xi:include href="chip/microwave-oven-control-cluster.xml" />
    <xi:include href="chip/door-lock-cluster.xml" />
+   <xi:include href="chip/energy-evse-cluster.xml" />
    <xi:include href="chip/ethernet-network-diagnostics-cluster.xml" />
    <xi:include href="chip/fan-control-cluster.xml" />
    <xi:include href="chip/fault-injection-cluster.xml" />
@@ -40,6 +45,7 @@
    <xi:include href="chip/level-control-cluster.xml" />
    <xi:include href="chip/keypad-input-cluster.xml" />
    <xi:include href="chip/laundry-washer-mode-cluster.xml" />
+   <xi:include href="chip/laundry-dryer-controls-cluster.xml" />
    <xi:include href="chip/localization-configuration-cluster.xml" />
    <xi:include href="chip/low-power-cluster.xml" />
    <xi:include href="chip/media-input-cluster.xml" />
@@ -51,7 +57,9 @@
    <xi:include href="chip/onoff-cluster.xml" />
    <xi:include href="chip/operational-credentials-cluster.xml" />
    <xi:include href="chip/operational-state-cluster.xml" />
+   <xi:include href="chip/operational-state-oven-cluster.xml" />
    <xi:include href="chip/operational-state-rvc-cluster.xml" />
+   <xi:include href="chip/oven-mode-cluster.xml" />
    <xi:include href="chip/pressure-measurement-cluster.xml" />
    <xi:include href="chip/power-source-cluster.xml" />
    <xi:include href="chip/power-source-configuration-cluster.xml" />
@@ -78,9 +86,11 @@
    <xi:include href="chip/thread-network-diagnostics-cluster.xml" />
    <xi:include href="chip/time-format-localization-cluster.xml" />
    <xi:include href="chip/time-synchronization-cluster.xml" />
+   <xi:include href="chip/timer-cluster.xml" />
    <xi:include href="chip/channel-cluster.xml" />
    <xi:include href="chip/user-label-cluster.xml" />
    <xi:include href="chip/unit-localization-cluster.xml" />
+   <xi:include href="chip/valve-configuration-and-control-cluster.xml" />
    <xi:include href="chip/wake-on-lan-cluster.xml" />
    <xi:include href="chip/washer-controls-cluster.xml" />
    <xi:include href="chip/wifi-network-diagnostics-cluster.xml" />
diff --git a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml
index 7e49682a8b1845..992b07897336c9 100644
--- a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml
@@ -25,18 +25,20 @@ limitations under the License.
     <server init="false" tick="false">true</server>
     <description>This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client.</description>
 
-    <command source="client" code="0x00" name="GetSetupPIN" response="GetSetupPINResponse" mustUseTimedInvoke="true" optional="false">
+    <command source="client" code="0x00" name="GetSetupPIN" isFabricScoped="true" response="GetSetupPINResponse" mustUseTimedInvoke="true" optional="false">
       <description>Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response.</description>
+      <access op="invoke" role="administer" />
       <arg name="TempAccountIdentifier" minLength="16" length="100" type="char_string"/>
     </command>
 
-    <command source="client" code="0x02" name="Login" mustUseTimedInvoke="true" optional="false">
+    <command source="client" code="0x02" name="Login" isFabricScoped="true" mustUseTimedInvoke="true" optional="false">
       <description>Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active.</description>
+      <access op="invoke" role="administer" />
       <arg name="TempAccountIdentifier" minLength="16" length="100" type="char_string"/>
       <arg name="SetupPIN" minLength="11" type="char_string"/>
     </command>
 
-    <command source="client" code="0x03" name="Logout" mustUseTimedInvoke="true" optional="false">
+    <command source="client" code="0x03" name="Logout" isFabricScoped="true" mustUseTimedInvoke="true" optional="false">
       <description>The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session.</description>
     </command>
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
index 2cea9bf945c77c..d68b3d3851ae22 100644
--- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ limitations under the License.
     <server init="false" tick="false">true</server>
     <description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
 
-    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST"        type="ARRAY" entryType="int16u" length="254" reportable="true"  writable="false" optional="true">CatalogList</attribute>
-    <attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct"      default="0x0" isNullable="true" writable="true"  optional="true">CurrentApp</attribute>
+    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST"        type="ARRAY" entryType="int16u" reportable="true"  writable="false" optional="true">CatalogList</attribute>
+    <attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct"      isNullable="true" writable="false"  optional="true">CurrentApp</attribute>
 
     <command source="client" code="0x00" name="LaunchApp" response="LauncherResponse" optional="false">
       <description>Upon receipt, this SHALL launch the specified app with optional data. The TV Device SHALL launch and bring to foreground the identified application in the command if the application is not already launched and in foreground. The TV Device SHALL update state attribute on the Application Basic cluster of the Endpoint corresponding to the launched application. This command returns a Launch Response.</description>
@@ -46,7 +46,7 @@ limitations under the License.
 
     <command source="server" code="0x03" name="LauncherResponse" optional="false">
       <description>This command SHALL be generated in response to LaunchApp commands.</description>
-      <arg name="Status" type="ApplicationLauncherStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
       <arg name="Data" type="octet_string" optional="true"/>
     </command>
 
@@ -69,7 +69,7 @@ limitations under the License.
     <item name="ApplicationID" type="char_string"/>
   </struct>
 
-  <enum name="ApplicationLauncherStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x050c"/>
     <item name="Success" value="0x00"/>
     <item name="AppNotAvailable" value="0x01"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
index a37d30c8ce9f61..a9c0f7f620e42a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -72,7 +72,7 @@ limitations under the License.
     <description>This cluster provides attributes and events for determining basic information about Nodes, which supports both
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location.</description>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
+    <globalAttribute side="either" code="0xFFFD" value="3"/>
 
     <attribute side="server" code="0"  define="DATA_MODEL_REVISION"       type="int16u"                                                                             >DataModelRevision</attribute>
     <attribute side="server" code="1"  define="VENDOR_NAME"               type="char_string"               length="32"                                              >VendorName</attribute>
@@ -107,6 +107,8 @@ limitations under the License.
     <attribute side="server" code="18" define="UNIQUE_ID"                 type="char_string"               length="32"                               optional="true">UniqueID</attribute>
     <attribute side="server" code="19" define="CAPABILITY_MINIMA"         type="CapabilityMinimaStruct"                              writable="false"               >CapabilityMinima</attribute>
     <attribute side="server" code="20" define="PRODUCT_APPEARANCE"        type="ProductAppearanceStruct"                                             optional="true">ProductAppearance</attribute>
+    <attribute side="server" code="21" define="SPECIFICATION_VERSION"     type="int32u"                                                                             >SpecificationVersion</attribute>
+    <attribute side="server" code="22" define="MAX_PATHS_PER_INVOKE"      type="int16u"                                                                             >MaxPathsPerInvoke</attribute>
 
     <event side="server" code="0x00" name="StartUp" priority="critical" optional="false">
       <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-sensor-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-sensor-configuration-cluster.xml
new file mode 100644
index 00000000000000..44bb181f2b9d59
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/boolean-sensor-configuration-cluster.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+
+  <bitmap name="Feature" type="bitmap32">
+    <cluster code="0x0080"/>
+    <field name="Visual" mask="0x1"/>
+    <field name="Audible" mask="0x2"/>
+    <field name="AlarmSuppress" mask="0x4"/>
+    <field name="SensitivityLevel" mask="0x8"/>
+  </bitmap>
+
+  <bitmap name="AlarmModeBitmap" type="bitmap8">
+    <cluster code="0x0080"/>
+    <field name="Visual" mask="0x1"/>
+    <field name="Audible" mask="0x2"/>
+  </bitmap>
+
+  <enum name="SensitivityEnum" type="enum8">
+    <cluster code="0x0080"/>
+    <item name="High" value="0x0"/>
+    <item name="Standard" value="0x1"/>
+    <item name="Low" value="0x2"/>
+  </enum>
+
+  <cluster apiMaturity="provisional">
+    <name>Boolean Sensor Configuration</name>
+    <domain>Measurement &amp; Sensing</domain>
+    <code>0x0080</code>
+    <define>BOOLEAN_SENSOR_CONFIGURATION_CLUSTER</define>
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+    <description>This cluster is used to configure a boolean sensor.</description>
+    <globalAttribute side="either" code="0xFFFD" value="1"/>
+
+    <attribute side="server" code="0x0000" define="SENSITIVITY_LEVEL" type="SensitivityEnum" isNullable="false" min="0" max="2" writable="true" optional="true">SensitivityLevel</attribute>
+    <attribute side="server" code="0x0001" define="ALARMS_ACTIVE" type="AlarmModeBitmap" isNullable="false" writable="false" optional="true">AlarmsActive</attribute>
+    <attribute side="server" code="0x0002" define="ALARMS_SUPPRESSED" type="AlarmModeBitmap" isNullable="false" writable="false" optional="true">AlarmsSuppressed</attribute>
+    <attribute side="server" code="0x0003" define="ALARMS_ENABLED" type="AlarmModeBitmap" isNullable="false" writable="true" optional="true">AlarmsEnabled</attribute>
+
+    <command source="client" code="0x00" name="SuppressRequest" optional="true">
+      <description>This command is used to suppress the specified alarm.</description>
+      <arg name="AlarmsToSuppress" type="AlarmModeBitmap"/>
+    </command>
+
+    <event side="server" code="0x00" priority="info" name="AlarmsStateChanged" optional="true">
+      <description>This event SHALL be generated when any bits in the AlarmsActive and/or AlarmsSuppressed attributes change.</description>
+      <field id="0" name="AlarmsActive" type="AlarmModeBitmap"/>
+      <field id="1" name="AlarmsSuppressed" type="AlarmModeBitmap" optional="true"/>
+    </event>
+
+    <event side="server" code="0x01" priority="info" name="SensorFault" optional="true">
+      <description>This event SHALL be generated when the device detects a sensor fault.</description>
+    </event>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
index 649c45fea3ae5a..3c4499d6d7a28e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
@@ -69,7 +69,7 @@ limitations under the License.
         <define>BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER</define>
         <client tick="false" init="false">true</client>
         <server tick="false" init="false">true</server>
-        <globalAttribute side="either" code="0xFFFD" value="2"/>
+        <globalAttribute side="either" code="0xFFFD" value="3"/>
 
         <attribute side="server" code="1"  define="VENDOR_NAME"               type="char_string"               length="32"                              optional="true">VendorName</attribute>
         <attribute side="server" code="2"  define="VENDOR_ID"                 type="vendor_id"                                                          optional="true">VendorID</attribute>
@@ -86,7 +86,7 @@ limitations under the License.
         <attribute side="server" code="15" define="SERIAL_NUMBER"             type="char_string"               length="32"                              optional="true">SerialNumber</attribute>
         <attribute side="server" code="17" define="REACHABLE"                 type="boolean"                                default="1"                 optional="false">Reachable</attribute>
         <attribute side="server" code="18" define="UNIQUE_ID"                 type="char_string"               length="32"                              optional="true">UniqueID</attribute>
-        <attribute side="server" code="20" define="PRODUCT_APPEARANCE"        type="ProductAppearanceStruct"                                             optional="true">ProductAppearance</attribute>
+        <attribute side="server" code="20" define="PRODUCT_APPEARANCE"        type="ProductAppearanceStruct"                                            optional="true">ProductAppearance</attribute>
 
         <event side="server" code="0x00" name="StartUp" priority="critical" optional="true">
             <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
index 80c2118e855adf..ec8a2e2cc5d068 100644
--- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
@@ -46,7 +46,7 @@ limitations under the License.
 
     <command source="server" code="0x01" name="ChangeChannelResponse" optional="true">
       <description>Upon receipt, this SHALL display the active status of the input list on screen.</description>
-      <arg name="Status" type="ChannelStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
       <arg name="Data"   type="char_string" optional="true"/>
     </command>
 
@@ -74,7 +74,7 @@ limitations under the License.
     <item name="MSO" value="0x00"/>
   </enum>
 
-  <enum name="ChannelStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x0504"/>
     <item name="Success" value="0x00"/>
     <item name="MultipleMatches" value="0x01"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
index a53d6f4e83d3c8..c671c5b3e58373 100644
--- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
@@ -52,6 +52,8 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
+    <globalAttribute side="either" code="0xFFFD" value="3"/>
+
     <!-- Attributes -->
     <attribute side="server" code="0x0000" define="MEASURED_VALUE" type="single" writable="false" isNullable="true" optional="true">MeasuredValue</attribute>
     <attribute side="server" code="0x0001" define="MIN_MEASURED_VALUE" type="single" writable="false" isNullable="true" optional="true">MinMeasuredValue</attribute>
diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
index 92cfef63019d77..949a5d89924f8d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,9 +24,10 @@ limitations under the License.
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
+    <globalAttribure side="either" code="0xFFFD" value="1"/>
 
     <attribute side="server" code="0x0000" define="CONTENT_LAUNCHER_ACCEPT_HEADER"                 type="ARRAY" entryType="char_string" length="254" writable="false" optional="true">AcceptHeader</attribute>
-    <attribute side="server" code="0x0001" define="CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS" type="bitmap32" default="0"                       writable="true"  optional="true">SupportedStreamingProtocols</attribute>
+    <attribute side="server" code="0x0001" define="CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS" type="SupportedProtocolsBitmap" default="0"                       writable="false"  optional="true">SupportedStreamingProtocols</attribute>
 
     <command source="client" code="0x00" name="LaunchContent" response="LauncherResponse" optional="true">
       <description>Upon receipt, this SHALL launch the specified content with optional search criteria.</description>
@@ -44,7 +45,7 @@ limitations under the License.
 
     <command source="server" code="0x02" name="LauncherResponse" optional="true" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to LaunchContent command.</description>
-      <arg name="Status" type="ContentLaunchStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
       <arg name="Data" type="char_string" optional="true"/>
     </command>
 
@@ -57,33 +58,35 @@ limitations under the License.
 
   <struct name="AdditionalInfoStruct">
     <cluster code="0x050a"/>
-    <item name="Name" type="char_string"/>
-    <item name="Value" type="char_string"/>
+    <item name="Name" type="char_string" length="256" />
+    <!-- TODO: spec sets this max size, but seems impossible given UDP size limits -->
+    <item name="Value" type="char_string" length="8192" />
   </struct>
 
   <enum name="MetricTypeEnum" type="enum8">
-    <cluster code="0x050a"/>
-    <item name="Pixels" value="0x00"/>
-    <item name="Percentage" value="0x01"/>
+      <cluster code="0x050a"/>
+      <item name="Pixels" value="0x00"/>
+      <item name="Percentage" value="0x01"/>
   </enum>
 
   <struct name="DimensionStruct">
-    <cluster code="0x050a"/>
-    <item name="Width" type="double" optional="false"/>
-    <item name="Height" type="double" optional="false"/>
-    <item name="Metric" type="MetricTypeEnum"/>
+      <cluster code="0x050a"/>
+      <item name="Width" type="double" optional="false"/>
+      <item name="Height" type="double" optional="false"/>
+      <item name="Metric" type="MetricTypeEnum"/>
   </struct>
 
   <struct name="StyleInformationStruct">
-    <cluster code="0x050a"/>
-    <item name="ImageURL" type="char_string" optional="true"/>
-    <item name="Color" type="char_string" optional="true"/>
-    <item name="Size" type="DimensionStruct" optional="true"/>
+      <cluster code="0x050a"/>
+      <!-- TODO: spec sets this max size, but seems impossible given UDP size limits -->
+      <item name="ImageURL" type="char_string" length="8192" optional="true"/>
+      <item name="Color" type="char_string" length="9" optional="true"/>
+      <item name="Size" type="DimensionStruct" optional="true"/>
   </struct>
 
   <struct name="BrandingInformationStruct">
     <cluster code="0x050a"/>
-    <item name="ProviderName" type="char_string"/>
+    <item name="ProviderName" type="char_string" length="256" />
     <item name="Background" type="StyleInformationStruct" optional="true"/>
     <item name="Logo" type="StyleInformationStruct" optional="true"/>
     <item name="ProgressBar" type="StyleInformationStruct" optional="true"/>
@@ -110,21 +113,21 @@ limitations under the License.
     <item name="Video" value="0x0D"/>
   </enum>
 
-  <enum name="ContentLaunchStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x050a"/>
-    <item name="success" value="0x00"/>
-    <item name="urlNotAvailable" value="0x01"/>
-    <item name="authFailed" value="0x02"/>
+    <item name="Success" value="0x00"/>
+    <item name="URLNotAvailable" value="0x01"/>
+    <item name="AuthFailed" value="0x02"/>
   </enum>
 
   <struct name="ParameterStruct">
     <cluster code="0x050a"/>
     <item name="Type" type="ParameterEnum"/>
-    <item name="Value" type="char_string"/>
+    <item name="Value" type="char_string" length="1024" />
     <item name="ExternalIDList" type="AdditionalInfoStruct" array="true" optional="true"/>
   </struct>
 
-  <bitmap name="SupportedStreamingProtocol" type="bitmap32">
+  <bitmap name="SupportedProtocolsBitmap" type="bitmap32">
     <cluster code="0x050a"/>
     <field name="DASH" mask="0x1"/>
     <field name="HLS" mask="0x2"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
new file mode 100644
index 00000000000000..c5e4b98ae6d333
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="Energy"/>
+
+  <bitmap name="Feature" type="bitmap32">
+    <cluster code="0x0096"/>
+    <field name="EnrollmentGroups" mask="0x1"/>
+    <field name="TemperatureOffset" mask="0x2"/>
+    <field name="TemperatureSetpoint" mask="0x4"/>
+    <field name="LoadAdjustment" mask="0x8"/>
+    <field name="DutyCycle" mask="0x10"/>
+    <field name="PowerSavings" mask="0x20"/>
+    <field name="HeatingSource" mask="0x40"/>
+  </bitmap>
+
+  <bitmap name="DeviceClassBitmap" type="bitmap32">
+    <cluster code="0x0096"/>
+    <field name="HVAC" mask="0x01"/>
+    <field name="StripHeater" mask="0x02"/>
+    <field name="WaterHeater" mask="0x04"/>
+    <field name="PoolPump" mask="0x08"/>
+    <field name="SmartAppliance" mask="0x10"/>
+    <field name="IrrigationPump" mask="0x20"/>
+    <field name="CommercialLoad" mask="0x40"/>
+    <field name="ResidentialLoad" mask="0x80"/>
+    <field name="ExteriorLighting" mask="0x0100"/>
+    <field name="InteriorLighting" mask="0x0200"/>
+    <field name="EV" mask="0x0400"/>
+    <field name="GenerationSystem" mask="0x0800"/>
+    <field name="SmartInverter" mask="0x1000"/>
+    <field name="EVSE" mask="0x2000"/>
+    <field name="RESU" mask="0x4000"/>
+    <field name="EMS" mask="0x8000"/>
+    <field name="SEM" mask="0x10000"/>
+  </bitmap>
+
+  <bitmap name="EventControlBitmap" type="bitmap16">
+    <cluster code="0x0096"/>
+    <field name="RandomStart" mask="0x01"/>
+  </bitmap>
+
+  <bitmap name="EventTransitionControlBitmap" type="bitmap16">
+    <cluster code="0x0096"/>
+    <field name="RandomDuration" mask="0x01"/>
+    <field name="IgnoreOptOut" mask="0x02"/>
+  </bitmap>
+
+  <bitmap name="CancelControlBitmap" type="bitmap16">
+    <cluster code="0x0096"/>
+    <field name="RandomEnd" mask="0x01"/>
+  </bitmap>
+
+  <enum name="LoadControlEventChangeSourceEnum" type="enum8">
+    <cluster code="0x0096"/>
+    <item name="Automatic" value="0x00"/>
+    <item name="UserAction" value="0x01"/>
+  </enum>
+
+  <enum name="LoadControlEventStatusEnum" type="enum8">
+    <cluster code="0x0096"/>
+    <item name="Unknown" value="0x00"/>
+    <item name="Received" value="0x01"/>
+    <item name="InProgress" value="0x02"/>
+    <item name="Completed" value="0x03"/>
+    <item name="OptedOut" value="0x04"/>
+    <item name="OptedIn" value="0x05"/>
+    <item name="Canceled" value="0x06"/>
+    <item name="Superseded" value="0x07"/>
+    <item name="PartialOptedOut" value="0x08"/>
+    <item name="PartialOptedIn" value="0x09"/>
+    <item name="NoParticipation" value="0x0A"/>
+    <item name="Unavailable" value="0x0B"/>
+    <item name="Failed" value="0x0C"/>
+  </enum>
+
+  <enum name="CriticalityLevelEnum" type="enum8">
+    <cluster code="0x0096"/>
+    <item name="Unknown" value="0x00"/>
+    <item name="Green" value="0x01"/>
+    <item name="Level1" value="0x02"/>
+    <item name="Level2" value="0x03"/>
+    <item name="Level3" value="0x04"/>
+    <item name="Level4" value="0x05"/>
+    <item name="Level5" value="0x06"/>
+    <item name="Emergency" value="0x07"/>
+    <item name="PlannedOutage" value="0x08"/>
+    <item name="ServiceDisconnect" value="0x09"/>
+  </enum>
+
+  <enum name="HeatingSourceEnum" type="enum8">
+    <cluster code="0x0096"/>
+    <item name="Any" value="0x0"/>
+    <item name="Electric" value="0x1"/>
+    <item name="NonElectric" value="0x2"/>
+  </enum>
+
+  <struct name="TemperatureControlStruct">
+    <cluster code="0x0096"/>
+    <!-- Note: No TemperatureDifference type available yet in ZAP XML -->
+    <item fieldId="0" name="CoolingTempOffset" type="int16u" isNullable="true" optional="true" />
+    <item fieldId="1" name="HeatingtTempOffset" type="int16u" isNullable="true" optional="true" />
+    <item fieldId="2" name="CoolingTempSetpoint" type="temperature" isNullable="true" optional="true" />
+    <item fieldId="3" name="HeatingTempSetpoint" type="temperature" isNullable="true" optional="true" />
+  </struct>
+
+  <struct name="AverageLoadControlStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="LoadAdjustment" type="int8s" min="-100" max="100" />
+  </struct>
+
+  <struct name="DutyCycleControlStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="DutyCycle" type="percent" />
+  </struct>
+
+  <struct name="PowerSavingsControlStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="PowerSavings" type="percent" />
+  </struct>
+
+  <struct name="HeatingSourceControlStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="HeatingSource" type="HeatingSourceEnum"/>
+  </struct>
+
+  <struct name="LoadControlEventTransitionStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="Duration" type="int16u" max="1440"/>
+    <item fieldId="1" name="Control" type="EventTransitionControlBitmap"/>
+    <item fieldId="2" name="TemperatureControl" type="TemperatureControlStruct" optional="true"/>
+    <item fieldId="3" name="AverageLoadControl" type="AverageLoadControlStruct" optional="true"/>
+    <item fieldId="4" name="DutyCycleControl" type="DutyCycleControlStruct" optional="true"/>
+    <item fieldId="5" name="PowerSavingsControl" type="PowerSavingsControlStruct" optional="true"/>
+    <item fieldId="6" name="HeatingSourceControl" type="HeatingSourceControlStruct" optional="true"/>
+  </struct>
+
+  <!-- This does not quite match the spec, which has LoadControlEventStruct as a
+       fabric-scoped struct with some fabric-sensitive fields, but that doesn't
+       really make sense in all the places where the struct is used, and the spec
+       does not really define other things in a way that would work with that at
+       the moment. -->
+  <struct name="LoadControlEventStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="EventID" type="octet_string" length="16"/>
+    <item fieldId="1" name="ProgramID" type="octet_string" length="16" isNullable="true"/>
+    <item fieldId="2" name="Control" type="EventControlBitmap" />
+    <item fieldId="3" name="DeviceClass" type="DeviceClassBitmap" />
+    <item fieldId="4" name="EnrollmentGroup" type="int8u" optional="true" />
+    <item fieldId="5" name="Criticality" type="CriticalityLevelEnum" defaut="0" />
+    <item fieldId="6" name="StartTime" type="epoch_s" isNullable="true" />
+    <item fieldId="7" name="Transitions" array="true" type="LoadControlEventTransitionStruct" />
+  </struct>
+
+  <struct name="LoadControlProgramStruct">
+    <cluster code="0x0096"/>
+    <item fieldId="0" name="ProgramID" type="octet_string" length="16"/>
+    <item fieldId="1" name="Name" type="long_char_string" length="32"/>
+    <item fieldId="2" name="EnrollmentGroup" type="int8u" isNullable="true" min="1" max="0xFF"/>
+    <item fieldId="3" name="RandomStartMinutes" type="int8u" isNullable="true" min="0x00" max="0x3C"/>
+    <item fieldId="4" name="RandomDurationMinutes" type="int8u" isNullable="true" min="0x00" max="0x3C"/>
+  </struct>
+
+  <cluster apiMaturity="provisional">
+    <name>Demand Response Load Control</name>
+    <domain>Energy</domain>
+    <description>This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control.</description>
+    <code>0x0096</code>
+    <define>DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER</define>
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+    <globalAttribute side="either" code="0xFFFD" value="4"/>
+
+    <attribute side="server" code="0x0000" define="LOAD_CONTROL_PROGRAMS" type="ARRAY" entryType="LoadControlProgramStruct" writable="false">LoadControlPrograms</attribute>
+    <attribute side="server" code="0x0001" define="NUMBER_OF_LOAD_CONTROL_PROGRAMS" type="int8u" min="5" writable="false" default="5">NumberOfLoadControlPrograms</attribute>
+    <attribute side="server" code="0x0002" define="LOAD_CONTROL_EVENTS" type="ARRAY" entryType="LoadControlEventStruct" writable="false">Events</attribute>
+    <attribute side="server" code="0x0003" define="LOAD_CONTROL_ACTIVE_EVENTS" type="ARRAY" entryType="LoadControlEventStruct" writable="false">ActiveEvents</attribute>
+    <attribute side="server" code="0x0004" define="NUMBER_OF_EVENTS_PER_PROGRAM" type="int8u" min="10" writable="false" default="10">NumberOfEventsPerProgram</attribute>
+    <attribute side="server" code="0x0005" define="NUMBER_OF_TRANSITIONS" type="int8u" min="3" writable="false" default="3">NumberOfTransitions</attribute>
+    <attribute side="server" code="0x0006" define="DEFAULT_RANDOM_START" type="int8u" min="0" max="0x3C" default="0x1E" writable="true">
+      <description>DefaultRandomStart</description>
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0007" define="DEFAULT_RANDOM_DURATION" type="int8u" min="0" max="0x3C" default="0" writable="true">
+      <description>DefaultRandomDuration</description>
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+    </attribute>
+
+    <command source="client" code="0x00" name="RegisterLoadControlProgramRequest" optional="false">
+      <description>
+        Upon receipt, this SHALL insert a new LoadControlProgramStruct into LoadControlPrograms, or if the ProgramID matches an existing LoadControlProgramStruct, then the provider SHALL be updated with the provided values.
+      </description>
+      <arg name="LoadControlProgram" type="LoadControlProgramStruct"/>
+    </command>
+    <command source="client" code="0x01" name="UnregisterLoadControlProgramRequest" optional="false">
+      <description>
+        Upon receipt, this SHALL remove a the LoadControlProgramStruct from LoadControlPrograms with the matching ProgramID.
+      </description>
+      <arg name="LoadControlProgramID" type="octet_string" length="16"/>
+    </command>
+    <command source="client" code="0x02" name="AddLoadControlEventRequest" optional="false">
+      <description>
+        On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event.
+      </description>
+      <arg name="Event" type="LoadControlEventStruct"/>
+    </command>
+    <command source="client" code="0x03" name="RemoveLoadControlEventRequest" optional="false">
+      <description>
+        Upon receipt, this SHALL remove the LoadControlEventStruct with the matching EventID from LoadEventPrograms.
+      </description>
+      <arg name="EventID" type="octet_string" length="16"/>
+      <arg name="CancelControl" type="CancelControlBitmap"/>
+    </command>
+    <command source="client" code="0x04" name="ClearLoadControlEventsRequest" optional="true">
+      <!-- Note: Maybe this command needs to have fields?  Who knows!
+           Spec does not define anything about it other than its existence.
+           See https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/8514 -->
+      <description>
+        Upon receipt, this SHALL clear all the load control events.
+      </description>
+    </command>
+
+    <event side="server" code="0x00" name="LoadControlEventStatusChange" priority="info" optional="false">
+      <description>This event SHALL be generated when the status of a LoadControlEventStruct changes.</description>
+      <field id="0" name="EventID" type="octet_string" length="16"/>
+      <field id="1" name="TransitionIndex" type="int8u" isNullable="true"/>
+      <field id="2" name="Status" type="LoadControlEventStatusEnum"/>
+      <field id="3" name="Criticality" type="CriticalityLevelEnum"/>
+      <field id="4" name="Control" type="EventControlBitmap"/>
+      <field id="5" name="TemperatureControl" type="TemperatureControlStruct" isNullable="true" optional="true" />
+      <field id="6" name="AverageLoadControl" type="AverageLoadControlStruct" isNullable="true" optional="true" />
+      <field id="7" name="DutyCycleControl" type="DutyCycleControlStruct" isNullable="true" optional="true" />
+      <field id="8" name="PowerSavingsControl" type="PowerSavingsControlStruct" isNullable="true" optional="true" />
+      <field id="9" name="HeatingSourceControl" type="HeatingSourceControlStruct" isNullable="true" optional="true" />
+      <!-- Spec has an invalid field ID that cannot be used, so not enabling the Signature field for now.  See
+           https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/8515 -->
+      <!-- <field id="0xFF" name="Signature" type="octet_string" length="48" isNullable="true"/> -->
+    </event>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml
new file mode 100644
index 00000000000000..8eed118f9ef953
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="Energy Management"/>
+  <enum name="StateEnum" type="enum8" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <item name="NotPluggedIn" value="0x00"/>
+    <item name="PluggedInNoDemand" value="0x01"/>
+    <item name="PluggedInDemand" value="0x02"/>
+    <item name="PluggedInCharging" value="0x03"/>
+    <item name="PluggedInDischarging" value="0x04"/>
+    <item name="SessionEnding" value="0x05"/>
+    <item name="Fault" value="0x06"/>
+  </enum>
+  <enum name="SupplyStateEnum" type="enum8" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <item name="Disabled" value="0x00"/>
+    <item name="ChargingEnabled" value="0x01"/>
+    <item name="DischargingEnabled" value="0x02"/>
+    <item name="DisabledError" value="0x03"/>
+    <item name="DisabledDiagnostics" value="0x04"/>
+  </enum>
+  <enum name="FaultStateEnum" type="enum8" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <item name="NoError" value="0x00"/>
+    <item name="MeterFailure" value="0x01"/>
+    <item name="OverVoltage" value="0x02"/>
+    <item name="UnderVoltage" value="0x03"/>
+    <item name="OverCurrent" value="0x04"/>
+    <item name="ContactWetFailure" value="0x05"/>
+    <item name="ContactDryFailure" value="0x06"/>
+    <item name="GroundFault" value="0x07"/>
+    <item name="PowerLoss" value="0x08"/>
+    <item name="PowerQuality" value="0x09"/>
+    <item name="PilotShortCircuit" value="0x0A"/>
+    <item name="EmergencyStop" value="0x0B"/>
+    <item name="EVDisconnected" value="0x0C"/>
+    <item name="WrongPowerSupply" value="0x0D"/>
+    <item name="LiveNeutralSwap" value="0x0E"/>
+    <item name="OverTemperature" value="0x0F"/>
+    <item name="Other" value="0xFF"/>
+  </enum>
+  <enum name="EnergyTransferStoppedReasonEnum" type="enum8" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <item name="EVStopped" value="0x00"/>
+    <item name="EVSEStopped" value="0x01"/>
+    <item name="Other" value="0x02"/>
+  </enum>
+  <bitmap name="TargetDayOfWeekBitmap" type="bitmap8" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <field name="Sunday" mask="0x01"/>
+    <field name="Monday" mask="0x02"/>
+    <field name="Tuesday" mask="0x04"/>
+    <field name="Wednesday" mask="0x08"/>
+    <field name="Thursday" mask="0x10"/>
+    <field name="Friday" mask="0x20"/>
+    <field name="Saturday" mask="0x40"/>
+  </bitmap>
+  <struct name="ChargingTargetStruct" apiMaturity="provisional">
+    <cluster code="0x0099"/>
+    <item fieldId="0" name="TargetTime" type="int16u" min="0" max="1439"/>
+    <item fieldId="1" name="TargetSoC" type="percent" optional="true"/>
+    <item fieldId="2" name="AddedEnergy" type="int64s" min="0" max="500000000" optional="true"/>
+  </struct>
+  <cluster apiMaturity="provisional">
+    <name>Energy EVSE</name>
+    <domain>Energy Management</domain>
+    <code>0x0099</code>
+    <define>ENERGY_EVSE_CLUSTER</define>
+    <client init="false" tick="false">true</client>
+    <server init="false" tick="false">true</server>
+    <description>Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management.</description>
+    
+    <globalAttribute side="server" code="0xFFFD" value="2" />
+
+    <!--Attributes-->
+    <attribute code="0x0000" side="server" type="StateEnum" define="STATE" isNullable="true" writable="false" optional="false">State</attribute>
+    <attribute code="0x0001" side="server" type="SupplyStateEnum" define="SUPPLY_STATE" writable="false" optional="false">SupplyState</attribute>
+    <attribute code="0x0002" side="server" type="FaultStateEnum" define="FAULT_STATE" writable="false" optional="false">FaultState</attribute>
+    <attribute code="0x0003" side="server" type="epoch_s" define="CHARGING_ENABLED_UNTIL" isNullable="true" default="0" max="0xFFFFFFFE" writable="false" optional="false">ChargingEnabledUntil</attribute>
+    <!--Conformance feature V2X - for now optional-->
+    <attribute code="0x0004" side="server" type="epoch_s" define="DISCHARGING_ENABLED_UNTIL" isNullable="true" default="0" max="0xFFFFFFFE" writable="false" optional="true">DischargingEnabledUntil</attribute>
+    <attribute code="0x0005" side="server" type="int64s" define="CIRCUIT_CAPACITY" default="0" min="0" max="80000" writable="false" optional="false">CircuitCapacity</attribute>
+    <attribute code="0x0006" side="server" type="int64s" define="MINIMUM_CHARGE_CURRENT" default="6000" min="0" max="80000" writable="false" optional="false">MinimumChargeCurrent</attribute>
+    <attribute code="0x0007" side="server" type="int64s" define="MAXIMUM_CHARGE_CURRENT" default="0" min="0" max="80000" writable="false" optional="false">MaximumChargeCurrent</attribute>
+    <!--Conformance feature V2X - for now optional-->
+    <attribute code="0x0008" side="server" type="int64s" define="MAXIMUM_DISCHARGE_CURRENT" default="0" min="0" max="80000" writable="false" optional="true">MaximumDischargeCurrent</attribute>
+    <attribute code="0x0009" side="server" type="int64s" define="USER_MAXIMUM_CHARGE_CURRENT" default="0" writable="true" optional="true">
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+      <description>UserMaximumChargeCurrent</description>
+    </attribute>
+    <attribute code="0x000A" side="server" type="elapsed_s" define="RANDOMIZATION_DELAY_WINDOW" default="600" writable="true" optional="true">
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+      <description>RandomizationDelayWindow</description>
+    </attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0021" side="server" type="int8u" define="NUMBER_OF_WEEKLY_TARGETS" default="0" writable="false" optional="true">NumberOfWeeklyTargets</attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0022" side="server" type="int8u" define="NUMBER_OF_DAILY_TARGETS" default="1" writable="false" optional="true">NumberOfDailyTargets</attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0023" side="server" type="epoch_s" define="NEXT_CHARGE_START_TIME" isNullable="true" max="0xFFFFFFFE" writable="false" optional="true">NextChargeStartTime</attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0024" side="server" type="epoch_s" define="NEXT_CHARGE_TARGET_TIME" isNullable="true" max="0xFFFFFFFE" writable="false" optional="true">NextChargeTargetTime</attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0025" side="server" type="int64s" define="NEXT_CHARGE_REQUIRED_ENERGY" isNullable="true" min="0" max="500000000" writable="false" optional="true">NextChargeRequiredEnergy</attribute>
+    <!--Conformance feature PREF - for now optional-->
+    <attribute code="0x0026" side="server" type="percent" define="NEXT_CHARGE_TARGET_SOC" isNullable="true" max="100" writable="false" optional="true">NextChargeTargetSoC</attribute>
+    <!--Conformance feature [PREF] - for now optional-->
+    <attribute code="0x0027" side="server" type="int16u" define="APPROXIMATE_EV_EFFICIENCY" isNullable="true" default="0xFFFF" max="0xFFFE" writable="true" optional="true">
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+      <description>ApproximateEVEfficiency</description>
+    </attribute>
+    <!--Conformance feature SOC - for now optional-->
+    <attribute code="0x0030" side="server" type="percent" define="STATE_OF_CHARGE" isNullable="true" max="100" writable="false" optional="true">StateOfCharge</attribute>
+    <!--Conformance feature SOC - for now optional-->
+    <attribute code="0x0031" side="server" type="int64s" define="BATTERY_CAPACITY" isNullable="true" min="0" max="500000000" writable="false" optional="true">BatteryCapacity</attribute>
+    <!--Conformance feature PNC - for now optional-->
+    <attribute code="0x0032" side="server" type="char_string" define="VEHICLE_ID" isNullable="true" length="32" writable="false" optional="true">VehicleID</attribute>
+    <attribute code="0x0040" side="server" type="int32u" define="SESSION_ID" isNullable="true" default="0" min="1" max="0xFFFFFFFF" writable="false" optional="false">SessionID</attribute>
+    <attribute code="0x0041" side="server" type="elapsed_s" define="SESSION_DURATION" default="0" writable="false" optional="false">SessionDuration</attribute>
+    <attribute code="0x0042" side="server" type="int64s" define="SESSION_ENERGY_CHARGED" default="0" min="0" max="500000000" writable="false" optional="false">SessionEnergyCharged</attribute>
+    <!--Conformance feature V2X - for now optional-->
+    <attribute code="0x0043" side="server" type="int64s" define="SESSION_ENERGY_DISCHARGED" default="0" min="0" max="500000000" writable="false" optional="true">SessionEnergyDischarged</attribute>
+    <command source="client" code="0x0001" name="Disable" optional="false" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <description>Allows a client to disable the EVSE from charging and discharging.</description>
+    </command>
+    <command source="client" code="0x0002" name="EnableCharging" optional="false" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <arg name="ChargingEnabledUntil" type="epoch_s" max="0xFFFFFFFE" isNullable="true"/>
+      <arg name="MinimumChargeCurrent" type="int64s" min="0" max="80000"/>
+      <arg name="MaximumChargeCurrent" type="int64s" min="0" max="80000"/>
+      <description>Allows a client to enable the EVSE to charge an EV.</description>
+    </command>
+    <command source="client" code="0x0003" name="EnableDischarging" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <arg name="DischargingEnabledUntil" type="epoch_s" max="0xFFFFFFFE" isNullable="true"/>
+      <arg name="MaximumDischargeCurrent" type="int64s" min="0" max="80000"/>
+      <description>Allows a client to enable the EVSE to discharge an EV.</description>
+    </command>
+    <command source="client" code="0x0004" name="StartDiagnostics" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <description>Allows a client to put the EVSE into a self-diagnostics mode.</description>
+    </command>
+    <command source="client" code="0x0005" name="SetTargets" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <arg name="DayOfWeekforSequence" type="TargetDayOfWeekBitmap"/>
+      <arg name="ChargingTargets" array="true" type="ChargingTargetStruct"/>
+      <description>Allows a client to set the user specified charging targets.</description>
+    </command>
+    <command source="client" code="0x0006" name="GetTargets" optional="true" response="GetTargetsResponse" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <arg name="DaysToReturn" type="TargetDayOfWeekBitmap"/>
+      <description>Allows a client to retrieve the user specified charging targets.</description>
+    </command>
+    <command source="client" code="0x0007" name="ClearTargets" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
+      <access op="invoke" privilege="operate"/>
+      <description>Allows a client to clear all stored charging targets.</description>
+    </command>
+    <command source="server" code="0x0000" name="GetTargetsResponse" optional="true" apiMaturity="provisional">
+      <arg name="DayOfWeekforSequence" type="TargetDayOfWeekBitmap"/>
+      <arg name="ChargingTargets" array="true" type="ChargingTargetStruct"/>
+      <description>The GetTargetsResponse is sent in response to the GetTargets Command.</description>
+    </command>
+    <event code="0x0000" name="EVConnected" priority="info" side="server" apiMaturity="provisional">
+      <description>EVConnected</description>
+      <field id="0" name="SessionID" type="int32u" min="1" max="0xFFFFFFFF" apiMaturity="provisional"/>
+    </event>
+    <event code="0x0001" name="EVNotDetected" priority="info" side="server" apiMaturity="provisional">
+      <description>EVNotDetected</description>
+      <field id="0" name="SessionID" type="int32u" min="1" max="0xFFFFFFFF" apiMaturity="provisional"/>
+      <field id="1" name="State" type="StateEnum" apiMaturity="provisional"/>
+      <field id="2" name="SessionDuration" type="elapsed_s" apiMaturity="provisional"/>
+      <field id="3" name="SessionEnergyCharged" type="int64s" min="0" max="500000000" apiMaturity="provisional"/>
+      <field id="4" name="SessionEnergyDischarged" type="int64s" min="0" max="500000000" optional="true" apiMaturity="provisional"/>
+    </event>
+    <event code="0x0002" name="EnergyTransferStarted" priority="info" side="server" apiMaturity="provisional">
+      <description>EnergyTransferStarted</description>
+      <field id="0" name="SessionID" type="int32u" min="1" max="0xFFFFFFFF" apiMaturity="provisional"/>
+      <field id="1" name="State" type="StateEnum" apiMaturity="provisional"/>
+      <field id="2" name="MaximumCurrent" type="int64s" min="0" max="80000" apiMaturity="provisional"/>
+    </event>
+    <event code="0x0003" name="EnergyTransferStopped" priority="info" side="server" apiMaturity="provisional">
+      <description>EnergyTransferStopped</description>
+      <field id="0" name="SessionID" type="int32u" min="1" max="0xFFFFFFFF" apiMaturity="provisional"/>
+      <field id="1" name="State" type="StateEnum" apiMaturity="provisional"/>
+      <field id="2" name="Reason" type="EnergyTransferStoppedReasonEnum" apiMaturity="provisional"/>
+      <field id="4" name="EnergyTransferred" type="int64s" min="0" max="500000000" apiMaturity="provisional"/>
+    </event>
+    <event code="0x0004" name="Fault" priority="critical" side="server" apiMaturity="provisional">
+      <description>Fault</description>
+      <field id="0" name="SessionID" type="int32u" min="1" max="0xFFFFFFFF" apiMaturity="provisional"/>
+      <field id="1" name="State" type="StateEnum" apiMaturity="provisional"/>
+      <field id="2" name="FaultStatePreviousState" type="FaultStateEnum" apiMaturity="provisional"/>
+      <field id="4" name="FaultStateCurrentState" type="FaultStateEnum" apiMaturity="provisional"/>
+    </event>
+    <event code="0x0005" name="RFID" priority="info" side="server" apiMaturity="provisional" optional="true">
+      <description>RFID</description>
+      <field id="0" name="UID" type="octet_string" length="10" apiMaturity="provisional"/>
+    </event>
+  </cluster>
+  <bitmap name="Feature" type="bitmap32">
+    <cluster code="0x0099"/>
+    <field name="ChargingPreferences" mask="0x1"/>
+    <field name="SoCReporting" mask="0x2"/>
+    <field name="PlugAndCharge" mask="0x4"/>
+    <field name="RFID" mask="0x8"/>
+    <field name="V2X" mask="0x10"/>
+  </bitmap>
+</configurator>
\ No newline at end of file
diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
index 3c30d960f18fe7..ad6279b2ef65e2 100644
--- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
@@ -44,8 +44,8 @@ limitations under the License.
     <item name="Off/Low/High" value="0x01"/>
     <item name="Off/Low/Med/High/Auto" value="0x02"/>
     <item name="Off/Low/High/Auto" value="0x03"/>
-    <item name="Off/On/Auto" value="0x04"/>
-    <item name="Off/On" value="0x05"/>
+    <item name="Off/High/Auto" value="0x04"/>
+    <item name="Off/High" value="0x05"/>
   </enum>
 
   <bitmap name="RockBitmap" type="bitmap8">
@@ -86,7 +86,7 @@ limitations under the License.
     <globalAttribute side="either" code="0xFFFD" value="4"/>
 
     <attribute side="server" code="0x0000" define="FAN_MODE" type="FanModeEnum" min="0" max="6" writable="true" default="0" optional="false">FanMode</attribute>
-    <attribute side="server" code="0x0001" define="FAN_MODE_SEQUENCE" type="FanModeSequenceEnum" min="0" max="5" writable="true" default="2" optional="false">FanModeSequence</attribute>
+    <attribute side="server" code="0x0001" define="FAN_MODE_SEQUENCE" type="FanModeSequenceEnum" min="0" max="5" writable="false" default="2" optional="false">FanModeSequence</attribute>
     <attribute side="server" code="0x0002" define="PERCENT_SETTING" type="percent" min="0" max="100" writable="true" default="0" isNullable="true" optional="false">PercentSetting</attribute>
     <attribute side="server" code="0x0003" define="PERCENT_CURRENT" type="percent" min="0" max="100" writable="false" default="0" optional="false">PercentCurrent</attribute>
     <attribute side="server" code="0x0004" define="SPEED_MAX" type="int8u" min="1" max="100" writable="false" default="1" optional="true">SpeedMax</attribute>
@@ -104,6 +104,5 @@ limitations under the License.
       <arg name="Wrap" type="boolean" optional="true"/>
       <arg name="LowestOff" type="boolean" optional="true"/>
     </command>
-
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml
index a307d0c192a6b9..eabc56a4d95916 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml
@@ -60,12 +60,12 @@ limitations under the License.
     <command source="server" code="0x01" name="ArmFailSafeResponse" optional="false" cli="chip fabric_commissioning armfailsaferesponse">
       <description>Success/failure response for ArmFailSafe command</description>
       <arg name="ErrorCode" type="CommissioningErrorEnum"/>
-      <arg name="DebugText" type="char_string"/>
+      <arg name="DebugText" type="char_string" length="128"/>
     </command>
     <command source="client" code="0x02" name="SetRegulatoryConfig" response="SetRegulatoryConfigResponse" cli="chip fabric_commissioning setregulatoryconfig">
       <description>Set the regulatory configuration to be used during commissioning</description>
       <arg name="NewRegulatoryConfig" type="RegulatoryLocationTypeEnum"/>
-      <arg name="CountryCode" type="char_string"/>
+      <arg name="CountryCode" type="char_string" length="2"/>
       <arg name="Breadcrumb" type="int64u"/>
       <access op="invoke" privilege="administer"/>
     </command>
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
index 4e0e9b5cafdfe2..7bc52936563263 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
@@ -38,7 +38,7 @@ limitations under the License.
     <item name="ThreadFault" value="0x03"/>
     <item name="NFCFault" value="0x04"/>
     <item name="BLEFault" value="0x05"/>
-    <item name="EthernetFault" value="0x06"/>    
+    <item name="EthernetFault" value="0x06"/>
   </enum>
   <enum name="NetworkFaultEnum" type="enum8">
     <cluster code="0x0033"/>
@@ -56,7 +56,7 @@ limitations under the License.
     <item name="HardwareWatchdogReset" value="0x04"/>
     <item name="SoftwareUpdateCompleted" value="0x05"/>
     <item name="SoftwareReset" value="0x06"/>
-  </enum>  
+  </enum>
   <enum name="InterfaceTypeEnum" type="enum8">
     <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
@@ -67,15 +67,15 @@ limitations under the License.
   </enum>
   <struct name="NetworkInterface">
     <cluster code="0x0033"/>
-    <item name="Name" type="char_string" length="32"/>
-    <item name="IsOperational" type="boolean"/>
-    <item name="OffPremiseServicesReachableIPv4" type="boolean" isNullable="true"/>
-    <item name="OffPremiseServicesReachableIPv6" type="boolean" isNullable="true"/>
+    <item code="0x00" name="Name" type="char_string" length="32"/>
+    <item code="0x01" name="IsOperational" type="boolean"/>
+    <item code="0x02" name="OffPremiseServicesReachableIPv4" type="boolean" isNullable="true"/>
+    <item code="0x03" name="OffPremiseServicesReachableIPv6" type="boolean" isNullable="true"/>
     <!-- TODO(#14075): HWADR not supported yet -->
-    <item name="HardwareAddress" type="octet_string" length="8"/>
-    <item name="IPv4Addresses" type="octet_string" array="true"/>
-    <item name="IPv6Addresses" type="octet_string" array="true"/>
-    <item name="Type" type="InterfaceTypeEnum"/>
+    <item code="0x04" name="HardwareAddress" type="octet_string" length="8"/>
+    <item code="0x05" name="IPv4Addresses" type="octet_string" array="true"/>
+    <item code="0x06" name="IPv6Addresses" type="octet_string" array="true"/>
+    <item code="0x07" name="Type" type="InterfaceTypeEnum"/>
   </struct>
   <cluster>
     <domain>General</domain>
@@ -83,8 +83,9 @@ limitations under the License.
     <code>0x0033</code>
     <define>GENERAL_DIAGNOSTICS_CLUSTER</define>
     <description>The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.</description>
-    <attribute side="server" code="0x00" define="NETWORK_INTERFACES" type="ARRAY" entryType="NetworkInterface" length="254" writable="false" optional="false">NetworkInterfaces</attribute>
+    <attribute side="server" code="0x00" define="NETWORK_INTERFACES" type="ARRAY" entryType="NetworkInterface" length="8" writable="false" optional="false">NetworkInterfaces</attribute>
     <attribute side="server" code="0x01" define="REBOOT_COUNT" type="int16u" writable="false" default="0x0000" optional="false">RebootCount</attribute>
+    <!-- TODO(#30023): Make Uptime conditionally mandatory at rev >= 2 -->
     <attribute side="server" code="0x02" define="UP_TIME" type="int64u" writable="false" default="0x0000000000000000" optional="true">UpTime</attribute>
     <attribute side="server" code="0x03" define="TOTAL_OPERATIONAL_HOURS" type="int32u" writable="false" default="0x00000000" optional="true">TotalOperationalHours</attribute>
     <attribute side="server" code="0x04" define="BOOT_REASONS" type="BootReasonEnum" writable="false" optional="true">BootReason</attribute>
@@ -92,7 +93,15 @@ limitations under the License.
     <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="RadioFaultEnum" writable="false" optional="true">ActiveRadioFaults</attribute>
     <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultEnum" writable="false" optional="true">ActiveNetworkFaults</attribute>
     <attribute side="server" code="0x08" define="TEST_EVENT_TRIGGERS_ENABLED" type="boolean" writable="false" optional="false">TestEventTriggersEnabled</attribute>
-    <attribute side="server" code="0x09" define="AVERAGE_WEAR_COUNT" type="int32u" writable="false" default="0x00000000" optional="true">AverageWearCount</attribute>
+    <!--
+        WARNING !!!!! Attribute 0x0009 (previously AverageWearCount, see #30002/#29285)
+        was previously mistakenly added in SDK without being in spec and WAS REMOVED.
+
+        Previously (disallowed):
+        <attribute side="server" code="0x09" define="AVERAGE_WEAR_COUNT" type="int32u" writable="false" default="0x00000000" optional="true">AverageWearCount</attribute>
+
+         ====== ID 0x0009 is reserved, do not use ======
+    -->
 
     <command source="client" code="0x00" name="TestEventTrigger" optional="false">
       <description>Provide a means for certification tests to trigger some test-plan-specific events</description>
@@ -101,6 +110,16 @@ limitations under the License.
       <access op="invoke" role="manage"/>
     </command>
 
+    <command source="client" code="0x01" name="TimeSnapshot" response="TimeSnapshotResponse" optional="false" apiMaturity="provisional">
+      <description>Take a snapshot of system time and epoch time.</description>
+    </command>
+
+    <command source="server" code="0x02" name="TimeSnapshotResponse" optional="false" apiMaturity="provisional">
+      <description>Response for the TimeSnapshot command.</description>
+      <arg name="SystemTimeUs" type="systime_us" optional="false"/>
+      <arg name="UTCTimeUs" type="epoch_us" isNullable="true" optional="false"/>
+    </command>
+
     <event side="server" code="0x00" name="HardwareFaultChange" priority="critical" optional="true">
       <description>Indicate a change in the set of hardware faults currently detected by the Node.</description>
       <field id="0" name="Current" type="HardwareFaultEnum" array="true"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
index 90a335b46b1988..26af706cd62b78 100644
--- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
@@ -81,7 +81,7 @@ limitations under the License.
         <attribute side="server" code="0x07" define="USER_ACTIVE_MODE_TRIGGER_INSTRUCTION" type="char_string" length="128" writable="false" optional="true" isNullable="false">UserActiveModeTriggerInstruction</attribute>
 
         <command source="client" code="0x00" name="RegisterClient" response="RegisterClientResponse" isFabricScoped="true" optional="true">
-            <description> Register a client to the end device </description>
+            <description>Register a client to the end device</description>
             <arg name="CheckInNodeID" type="node_id" optional="false"/>
             <arg name="MonitoredSubject" type="int64u" optional="false"/>
             <arg name="Key" type="octet_string" length="16" optional="false"/>
@@ -89,21 +89,26 @@ limitations under the License.
             <access op="invoke" privilege="manage"/>
         </command>
 
-        <command source="server" code="0x01" name="RegisterClientResponse" optional="false" disableDefaultResponse="true">
-            <description> RegisterClient response command </description>
+        <command source="server" code="0x01" name="RegisterClientResponse" optional="true" disableDefaultResponse="true">
+            <description>RegisterClient response command</description>
             <arg name="ICDCounter" type="int32u" isNullable="false"/>
         </command>
 
         <command source="client" code="0x02" name="UnregisterClient" isFabricScoped="true" optional="true">
-            <description> Unregister a client from an end device </description>
+            <description>Unregister a client from an end device</description>
             <arg name="CheckInNodeID" type="node_id"/>
             <arg name="VerificationKey" type="octet_string" length="16" optional="true"/>
             <access op="invoke" privilege="manage"/>
         </command>
 
-        <command source="client" code="0x03" name="StayActiveRequest" optional="true">
+        <command source="client" code="0x03" name="StayActiveRequest" response="StayActiveResponse" optional="true">
             <description>Request the end device to stay in Active Mode for an additional ActiveModeThreshold</description>
             <access op="invoke" privilege="manage"/>
         </command>
+
+        <command source="server" code="0x04" name="StayActiveResponse" optional="true" disableDefaultResponse="true">
+            <description>StayActiveRequest response command</description>
+            <arg name="PromisedActiveDuration" type="int32u" isNullable="false"/>
+        </command>
     </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
index 37fdfec1abcfbd..d4f6ffbba9a742 100644
--- a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
@@ -27,24 +27,24 @@ limitations under the License.
 
     <command source="client" code="0x00" name="SendKey" response="SendKeyResponse" optional="false">
       <description>Upon receipt, this SHALL process a keycode as input to the media device.</description>
-      <arg name="KeyCode" type="CecKeyCode"/>
+      <arg name="KeyCode" type="CECKeyCodeEnum"/>
     </command>
 
     <command source="server" code="0x01" name="SendKeyResponse" optional="false">
       <description>This command SHALL be generated in response to a SendKey Request command.</description>
-      <arg name="Status" type="KeypadInputStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
     </command>
 
   </cluster>
 
-  <enum name="KeypadInputStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x0509"/>
     <item name="Success" value="0x00"/>
     <item name="UnsupportedKey" value="0x01"/>
     <item name="InvalidKeyInCurrentState" value="0x02"/>
   </enum>
 
-  <enum name="CecKeyCode" type="enum8">
+  <enum name="CECKeyCodeEnum" type="enum8">
     <cluster code="0x0509"/>
     <item name="Select" value="0x00"/>
     <item name="Up" value="0x01"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml
new file mode 100644
index 00000000000000..5c4df5d79a282a
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<configurator>
+    <domain name="CHIP" />
+
+    <enum name="DrynessLevelEnum" type="enum8">
+        <cluster code="0x004A" />
+        <item name="Low" value="0x0" />
+        <item name="Normal" value="0x1" />
+        <item name="Extra" value="0x2" />
+        <item name="Max" value="0x3" />
+    </enum>
+
+    <cluster>
+        <domain>Appliances</domain>
+        <name>Laundry Dryer Controls</name>
+        <code>0x004A</code>
+        <define>LAUNDRY_DRYER_CONTROLS_CLUSTER</define>
+        <client init="false" tick="false">true</client>
+        <server init="false" tick="false">true</server>
+        <description>This cluster supports remotely monitoring and controling the different typs of
+            functionality available to a drying device, such as a laundry dryer.</description>
+
+        <globalAttribute side="server" code="0xFFFD" value="1" />
+
+        <attribute side="server" code="0x0000" define="SUPPORTED_DRYNESS_LEVELS" type="ARRAY" entryType="DrynessLevelEnum" writable="false" isNullable="false" optional="false" min="0x01" max="0x04">SupportedDrynessLevels</attribute>
+        <attribute side="server" code="0x0001" define="SELECTED_DRYNESS_LEVEL" type="DrynessLevelEnum"      writable="true"  isNullable="true"   optional="false">SelectedDrynessLevel</attribute>
+    </cluster>
+</configurator> 
\ No newline at end of file
diff --git a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml
index b0f562076979a8..dca3fb6f3532d1 100644
--- a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml
@@ -22,21 +22,21 @@ limitations under the License.
       <field name="OnOff" mask="0x1"/>
       <field name="Lighting" mask="0x2"/>
       <field name="Frequency" mask="0x4"/>
-  </bitmap>  
+  </bitmap>
 
-  <enum name="MoveMode" type="enum8">
+  <enum name="MoveModeEnum" type="enum8">
     <cluster code="0x0008"/>
     <item name="Up" value="0x0"/>
     <item name="Down" value="0x1"/>
   </enum>
 
-  <enum name="StepMode" type="enum8">
+  <enum name="StepModeEnum" type="enum8">
     <cluster code="0x0008"/>
     <item name="Up" value="0x0"/>
     <item name="Down" value="0x1"/>
   </enum>
 
-  <bitmap name="LevelControlOptions" type="bitmap8">
+  <bitmap name="OptionsBitmap" type="bitmap8">
     <cluster code="0x0008"/>
     <field name="ExecuteIfOff" mask="0x1"/>
     <field name="CoupleColorTempToLevel" mask="0x02"/>
@@ -67,7 +67,7 @@ limitations under the License.
     <attribute side="server" code="0x0012" define="ON_TRANSITION_TIME"            type="int16u"               isNullable="true"         writable="true"                     optional="true">OnTransitionTime</attribute>
     <attribute side="server" code="0x0013" define="OFF_TRANSITION_TIME"           type="int16u"               isNullable="true"         writable="true"                     optional="true">OffTransitionTime</attribute>
     <attribute side="server" code="0x0014" define="DEFAULT_MOVE_RATE"             type="int8u"                isNullable="true"         writable="true"                     optional="true">DefaultMoveRate</attribute>
-    <attribute side="server" code="0x000F" define="OPTIONS"                       type="LevelControlOptions"  min="0x00" max="0x03"     writable="true"  default="0x00"     optional="false">Options</attribute>
+    <attribute side="server" code="0x000F" define="OPTIONS"                       type="OptionsBitmap"  min="0x00" max="0x03"     writable="true"  default="0x00"     optional="false">Options</attribute>
     <attribute side="server" code="0x4000" define="START_UP_CURRENT_LEVEL"        type="int8u"                isNullable="true"         writable="true"                     optional="true">
       <description>StartUpCurrentLevel</description>
       <access op="read" role="view"/>
@@ -80,37 +80,37 @@ limitations under the License.
       </description>
       <arg name="Level"           type="int8u"/>
       <arg name="TransitionTime"  type="int16u" isNullable="true"/>
-      <arg name="OptionsMask"     type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask"     type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x01" name="Move" optional="false" cli="zcl level-control move">
       <description>
         Command description for Move
       </description>
-      <arg name="MoveMode" type="MoveMode"/>
+      <arg name="MoveMode" type="MoveModeEnum"/>
       <arg name="Rate" type="int8u" isNullable="true"/>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x02" name="Step" optional="false" cli="zcl level-control step">
       <description>
         Command description for Step
       </description>
-      <arg name="StepMode" type="StepMode"/>
+      <arg name="StepMode" type="StepModeEnum"/>
       <arg name="StepSize" type="int8u"/>
       <arg name="TransitionTime" type="int16u" isNullable="true"/>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x03" name="Stop" optional="false" cli="zcl level-control stop">
       <description>
         Command description for Stop
       </description>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x04" name="MoveToLevelWithOnOff" optional="false" cli="zcl level-control o-mv-to-level">
@@ -119,37 +119,37 @@ limitations under the License.
       </description>
       <arg name="Level"           type="int8u"/>
       <arg name="TransitionTime"  type="int16u" isNullable="true"/>
-      <arg name="OptionsMask"     type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask"     type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x05" name="MoveWithOnOff" optional="false" cli="zcl level-control o-move">
       <description>
         Command description for MoveWithOnOff
       </description>
-      <arg name="MoveMode" type="MoveMode"/>
+      <arg name="MoveMode" type="MoveModeEnum"/>
       <arg name="Rate" type="int8u" isNullable="true"/>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x06" name="StepWithOnOff" optional="false" cli="zcl level-control o-step">
       <description>
         Command description for StepWithOnOff
       </description>
-      <arg name="StepMode" type="StepMode"/>
+      <arg name="StepMode" type="StepModeEnum"/>
       <arg name="StepSize" type="int8u"/>
       <arg name="TransitionTime" type="int16u" isNullable="true"/>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x07" name="StopWithOnOff" optional="false" cli="zcl level-control o-stop">
       <description>
         Command description for StopWithOnOff
       </description>
-      <arg name="OptionsMask" type="LevelControlOptions"/>
-      <arg name="OptionsOverride" type="LevelControlOptions"/>
+      <arg name="OptionsMask" type="OptionsBitmap"/>
+      <arg name="OptionsOverride" type="OptionsBitmap"/>
     </command>
 
     <command source="client" code="0x08" name="MoveToClosestFrequency" optional="true">
diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
index 0c69e5eb349a76..aa8a5083a29903 100644
--- a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
@@ -28,7 +28,10 @@ limitations under the License.
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc</description>
     <!-- Base data types -->
-    <attribute side="server" code="0x00" define="ACTIVE_LOCALE" type="char_string" length="35" writable="true" optional="false">ActiveLocale</attribute>
+    <attribute side="server" code="0x00" define="ACTIVE_LOCALE" type="char_string" length="35" writable="true" optional="false">
+      <description>ActiveLocale</description>
+      <access op="write" privilege="manage"/>
+    </attribute>
     <attribute side="server" code="0x01" define="SUPPORTED_LOCALES" type="ARRAY" entryType="char_string" length="254" writable="false" optional="false">SupportedLocales</attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index c84b6db29c83aa..7322e116444776 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -84,6 +84,7 @@ limitations under the License.
             <include cluster="Ethernet Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="WiFi Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Thread Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="ICD Management" client="false" server="false" clientLocked="true" serverLocked="false"></include>
         </clusters>
     </deviceType>
     <deviceType>
@@ -1998,6 +1999,24 @@ limitations under the License.
             <include cluster="Temperature Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>
+    </deviceType>
+        <deviceType>
+        <name>MA-laundry-dryer</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Laundry Dryer</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x007C</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="On/Off" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="Laundry Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="Laundry Dryer Controls" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="Temperature Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+        </clusters>
     </deviceType>
     <deviceType>
         <name>MA-robotic-vacuum-cleaner</name>
@@ -2031,6 +2050,54 @@ limitations under the License.
             <include cluster="Refrigerator And Temperature Controlled Cabinet Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
         </clusters>
     </deviceType>
+    <deviceType>
+        <name>MA-boolean-sensor</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Boolean Sensor</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x0041</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Boolean State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireAttribute>TAG_LIST</requireAttribute>
+            </include>
+        </clusters>
+    </deviceType>
+    <deviceType>
+        <name>MA-valve</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Valve</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x0042</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Valve Configuration and Control" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+        </clusters>
+    </deviceType>
+    <deviceType>
+        <name>MA-water-leak-detector</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Water Leak Detector</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x0043</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <superset>Matter Boolean Sensor</superset>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Boolean State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Boolean Sensor Configuration" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireAttribute>TAG_LIST</requireAttribute>
+            </include>
+        </clusters>
+    </deviceType>
     <deviceType>
         <name>MA-all-clusters-app</name>
         <domain>CHIP</domain>
diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
index 495160b10b473c..d6b6b1782769fd 100644
--- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
@@ -25,6 +25,7 @@ limitations under the License.
     <server init="false" tick="false">true</server>
 
     <description>This cluster provides an interface for controlling the Input Selector on a media device such as a TV.</description>
+
     <attribute side="server" code="0x0000" define="MEDIA_INPUT_LIST"          type="ARRAY" entryType="InputInfoStruct" length="254"           writable="false" optional="false">InputList</attribute>
     <attribute side="server" code="0x0001" define="MEDIA_INPUT_CURRENT_INPUT" type="int8u" default="0x00"              min="0x00" max="0xFF"  writable="false" optional="false">CurrentInput</attribute>
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml
index ecf7e3c7317256..23ab5f6fd7b3e5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml
@@ -84,7 +84,7 @@ limitations under the License.
 
     <command source="server" code="0x0A" name="PlaybackResponse" optional="false">
       <description>This command SHALL be generated in response to various Playback Request commands.</description>
-      <arg name="Status" type="MediaPlaybackStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
       <arg name="Data"   type="char_string" optional="true"/>
     </command>
 
@@ -104,7 +104,7 @@ limitations under the License.
     <item name="Buffering"  value="0x03"/>
   </enum>
 
-  <enum name="MediaPlaybackStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x0506"/>
     <item name="Success"                value="0x00"/>
     <item name="InvalidStateForCommand" value="0x01"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml
new file mode 100644
index 00000000000000..e6cb38e39a1efc
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+
+  <cluster apiMaturity="provisional">
+    <name>Microwave Oven Control</name>
+    <domain>Appliances</domain>
+    <description>Attributes and commands for configuring the microwave oven control, and reporting cooking stats.</description>
+    <code>0x005F</code>
+    <define>MICROWAVE_OVEN_CONTROL_CLUSTER</define>
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+    <attribute side="server" code="0x0001" define="COOK_TIME" type="elapsed_s" default="30" writable="false" optional="false">CookTime</attribute>
+    <attribute side="server" code="0x0002" define="POWER_SETTING" type="int8u" default="100" writable="false" optional="false">PowerSetting</attribute>
+    <attribute side="server" code="0x0003" define="MIN_POWER" type="int8u" default="10" writable="false" optional="true">MinPower</attribute>
+    <attribute side="server" code="0x0004" define="MAX_POWER" type="int8u" default="100" writable="false" optional="true">MaxPower</attribute>
+    <attribute side="server" code="0x0005" define="POWERSTEP" type="int8u" default="10" writable="false" optional="true">PowerStep</attribute>
+
+    <command source="client" code="0x00" name="SetCookingParameters" optional="false">
+        <description>Set Cooking Parameters</description>
+        <arg name="CookMode" type="int8u" optional="true"/>
+        <arg name="CookTime" type="elapsed_s" optional="true"/>
+        <arg name="PowerSetting" type="int8u" min="MIN_POWER" max="MAX_POWER" optional="true"/>
+    </command>
+    <command source="client" code="0x01" name="AddMoreTime" optional="true">
+        <description>Add More Cooking Time</description>
+        <arg name="TimeToAdd" type="elapsed_s" optional="false"/>
+    </command>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml
new file mode 100644
index 00000000000000..2d5f09201f4218
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+
+  <enum name="ModeTag" type="enum16">
+    <cluster code="0x005E"/>
+    <item value="0x4000" name="Normal"/>
+    <item value="0x4001" name="Defrost"/>
+  </enum>
+
+  <cluster  apiMaturity="provisional">
+    <domain>General</domain>
+    <name>Microwave Oven Mode</name>
+    <code>0x005E</code>
+    <define>MICROWAVE_OVEN_MODE_CLUSTER</define>
+    <client init="false" tick="false">true</client>
+    <server init="false" tick="false">true</server>
+    <description>Attributes and commands for selecting a mode from a list of supported options.</description>
+    <globalAttribute side="either" code="0xFFFD" value="1"/>
+    <!-- Base data types -->
+    <attribute side="server" code="0x0000" define="SUPPORTED_MODES"  type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
+    <attribute side="server" code="0x0001" define="CURRENT_MODE"     type="int8u"                              writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml
index 9b22387cfc0bd2..9d31baf004f7e5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml
@@ -29,6 +29,8 @@ This is because zap does not currently support generating code for clusters that
     <cluster code="0x0054"/>
     <cluster code="0x0055"/>
     <cluster code="0x0059"/>
+    <cluster code="0x005E"/>
+    <cluster code="0x0049"/>
     <!-- MfgCode has been deprecated -->
     <item name="MfgCode" type="vendor_id" optional="true"/>
     <item name="Value"   type="enum16"    optional="false"/>
@@ -40,6 +42,8 @@ This is because zap does not currently support generating code for clusters that
     <cluster code="0x0054"/>
     <cluster code="0x0055"/>
     <cluster code="0x0059"/>
+    <cluster code="0x005E"/>
+    <cluster code="0x0049"/>
     <item name="Label"    type="char_string"                length="64" optional="false"/>
     <item name="Mode"     type="int8u"                                  optional="false"/>
     <item name="ModeTags" type="ModeTagStruct" array="true" length="8"  optional="false"/>
@@ -85,6 +89,8 @@ This is because zap does not currently support generating code for clusters that
     <cluster code="0x0054"/>
     <cluster code="0x0055"/>
     <cluster code="0x0059"/>
+    <cluster code="0x005E"/>
+    <cluster code="0x0049"/>
     <field name="OnOff" mask="0x1"/>
   </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
index 5063f3241053bc..56e98e16d27a6a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
@@ -48,6 +48,7 @@ limitations under the License.
         <field name="WPA-PERSONAL" mask="0x4"/>
         <field name="WPA2-PERSONAL" mask="0x8"/>
         <field name="WPA3-PERSONAL" mask="0x10"/>
+        <field name="WPA3-Matter-PDC" mask="0x20"/>
     </bitmap>
 
     <bitmap name="ThreadCapabilitiesBitmap" type="bitmap16" apiMaturity="provisional">
@@ -83,6 +84,8 @@ limitations under the License.
         <cluster code="0x0031"/>
         <item name="NetworkID" type="octet_string" length="32"/>
         <item name="Connected" type="boolean"/>
+        <item name="NetworkIdentifier" type="octet_string" length="20" optional="true" isNullable="true"/>
+        <item name="ClientIdentifier" type="octet_string" length="20" optional="true" isNullable="true"/>
     </struct>
 
     <bitmap name="Feature" type="bitmap32">
@@ -90,6 +93,7 @@ limitations under the License.
       <field name="WiFiNetworkInterface" mask="0x1"/>
       <field name="ThreadNetworkInterface" mask="0x2"/>
       <field name="EthernetNetworkInterface" mask="0x4"/>
+      <field name="PerDeviceCredentials" mask="0x8"/>
     </bitmap>
 
     <cluster>
@@ -138,13 +142,13 @@ limitations under the License.
           <description>ThreadVersion</description>
         </attribute>
 
-        <command source="client" code="0x00" name="ScanNetworks" optional="false" response="ScanNetworksResponse" cli="chip network_commissioning scannetworks">
+        <command source="client" code="0x00" name="ScanNetworks" optional="true" response="ScanNetworksResponse" cli="chip network_commissioning scannetworks">
             <description>Detemine the set of networks the device sees as available.</description>
             <arg name="SSID" type="octet_string" length="32" isNullable="true" optional="true"/>
             <arg name="Breadcrumb" type="int64u" optional="true"/>
             <access op="invoke" privilege="administer"/>
         </command>
-        <command source="server" code="0x01" name="ScanNetworksResponse" optional="false" cli="chip network_commissioning scannetworksresponse">
+        <command source="server" code="0x01" name="ScanNetworksResponse" optional="true" cli="chip network_commissioning scannetworksresponse">
             <description>Relay the set of networks the device sees as available back to the client.</description>
             <arg name="NetworkingStatus" type="NetworkCommissioningStatusEnum"/>
             <arg name="DebugText" type="char_string" optional="true"/>
@@ -155,7 +159,10 @@ limitations under the License.
             <description>Add or update the credentials for a given Wi-Fi network.</description>
             <arg name="SSID" type="octet_string" length="32"/>
             <arg name="Credentials" type="octet_string" length="64"/>
-            <arg name="breadcrumb" type="int64u" optional="true"/>
+            <arg name="Breadcrumb" type="int64u" optional="true"/>
+            <arg name="NetworkIdentity" type="octet_string" length="140" optional="true"/>
+            <arg name="ClientIdentifier" type="octet_string" length="20" optional="true"/>
+            <arg name="PossessionNonce" type="octet_string" length="32" optional="true"/>
             <access op="invoke" privilege="administer"/>
         </command>
         <command source="client" code="0x03" name="AddOrUpdateThreadNetwork" optional="true" response="NetworkConfigResponse" cli="chip network_commissioning addorupdatethreadnetwork">
@@ -164,7 +171,7 @@ limitations under the License.
             <arg name="Breadcrumb" type="int64u" optional="true"/>
             <access op="invoke" privilege="administer"/>
         </command>
-        <command source="client" code="0x04" name="RemoveNetwork" optional="false" response="NetworkConfigResponse" cli="chip network_commissioning removenetwork">
+        <command source="client" code="0x04" name="RemoveNetwork" optional="true" response="NetworkConfigResponse" cli="chip network_commissioning removenetwork">
             <description>Remove the definition of a given network (including its credentials).</description>
             <arg name="NetworkID" type="octet_string" length="32"/>
             <arg name="Breadcrumb" type="int64u" optional="true"/>
@@ -175,25 +182,38 @@ limitations under the License.
             <arg name="NetworkingStatus" type="NetworkCommissioningStatusEnum"/>
             <arg name="DebugText" type="char_string" length="512" optional="true" />
             <arg name="NetworkIndex" type="int8u" optional="true" />
+            <arg name="ClientIdentity" type="octet_string" length="140" optional="true"/>
+            <arg name="PossessionSignature" type="octet_string" length="64" optional="true"/>
         </command>
-        <command source="client" code="0x06" name="ConnectNetwork" optional="false" response="ConnectNetworkResponse" cli="chip network_commissioning connectnetwork">
+        <command source="client" code="0x06" name="ConnectNetwork" optional="true" response="ConnectNetworkResponse" cli="chip network_commissioning connectnetwork">
             <description>Connect to the specified network, using previously-defined credentials.</description>
             <arg name="NetworkID" type="octet_string" length="32"/>
             <arg name="Breadcrumb" type="int64u" optional="true"/>
             <access op="invoke" privilege="administer"/>
         </command>
-        <command source="server" code="0x07" name="ConnectNetworkResponse" optional="false" cli="chip network_commissioning connectnetworkresponse">
+        <command source="server" code="0x07" name="ConnectNetworkResponse" optional="true" cli="chip network_commissioning connectnetworkresponse">
             <description>Command that indicates whether we have succcessfully connected to a network.</description>
             <arg name="NetworkingStatus" type="NetworkCommissioningStatusEnum"/>
             <arg name="DebugText" type="char_string" optional="true"/>
             <arg name="ErrorValue" type="int32s" isNullable="true"/>
         </command>
-        <command source="client" code="0x08" name="ReorderNetwork" optional="false" response="NetworkConfigResponse" cli="chip network_commissioning connectnetwork">
+        <command source="client" code="0x08" name="ReorderNetwork" optional="true" response="NetworkConfigResponse" cli="chip network_commissioning connectnetwork">
             <description>Modify the order in which networks will be presented in the Networks attribute.</description>
             <arg name="NetworkID" type="octet_string" length="32"/>
             <arg name="NetworkIndex" type="int8u"/>
             <arg name="Breadcrumb" type="int64u" optional="true"/>
             <access op="invoke" privilege="administer"/>
         </command>
+        <command source="client" code="0x09" name="QueryIdentity" optional="true" response="QueryIdentityResponse" cli="chip network_commissioning queryidentity">
+            <description>Retrieve details about and optionally proof of possession of a network client identity.</description>
+            <arg name="KeyIdentifier" type="OCTET_STRING" length="20"/>
+            <arg name="PossessionNonce" type="OCTET_STRING" length="32" optional="true"/>
+            <access op="invoke" privilege="administer"/>
+        </command>
+        <command source="server" code="0x0a" name="QueryIdentityResponse" optional="true">
+            <description>Command that contains details about a network client identity and optionally a proof of possession.</description>
+            <arg name="Identity" type="OCTET_STRING" length="140"/>
+            <arg name="PossessionSignature" type="OCTET_STRING" length="64" optional="true"/>
+        </command>
     </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml
index 20074f4728d8df..b5b5aa913229e8 100644
--- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ limitations under the License.
     <code>0x0006</code>
     <define>ON_OFF_CLUSTER</define>
     <description>Attributes and commands for switching devices between 'On' and 'Off' states.</description>
-    <globalAttribute side="either" code="0xFFFD" value="5"/>
+    <globalAttribute side="either" code="0xFFFD" value="6"/>
 
     <attribute side="server" code="0x0000" define="ON_OFF"               type="boolean" default="0" reportable="true"              >OnOff</attribute>
     <attribute side="server" code="0x4000" define="GLOBAL_SCENE_CONTROL" type="boolean" default="1"                 optional="true">GlobalSceneControl</attribute>
@@ -80,7 +80,7 @@ limitations under the License.
     <command source="client" code="0x40" name="OffWithEffect" optional="true">
       <description>The OffWithEffect command allows devices to be turned off using enhanced ways of fading.</description>
       <arg name="EffectIdentifier" type="EffectIdentifierEnum"/>
-      <arg name="EffectVariant" type="int8u"/>
+      <arg name="EffectVariant" type="enum8"/>
     </command>
 
     <command source="client" code="0x41" name="OnWithRecallGlobalScene" optional="true">
@@ -99,5 +99,6 @@ limitations under the License.
     <cluster code="0x0006" />
     <field name="Lighting" mask="0x01" />
     <field name="DeadFrontBehavior" mask="0x02" />
+    <field name="OffOnly" mask="0x04" />
   </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml
index 4b9b3ec27c5933..e3f7581b52f829 100644
--- a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml
@@ -19,6 +19,7 @@ limitations under the License.
 
   <enum name="OperationalStateEnum" type="enum8">
     <cluster code="0x0060"/>
+    <cluster code="0x0048"/>
     <item name="Stopped" value="0x00"/>
     <item name="Running" value="0x01"/>
     <item name="Paused"  value="0x02"/>
@@ -27,6 +28,7 @@ limitations under the License.
 
   <enum name="ErrorStateEnum" type="enum8">
     <cluster code="0x0060"/>
+    <cluster code="0x0048"/>
     <item name="NoError"                    value="0x00"/>
     <item name="UnableToStartOrResume"      value="0x01"/>
     <item name="UnableToCompleteOperation"  value="0x02"/>
@@ -36,6 +38,7 @@ limitations under the License.
   <struct name="OperationalStateStruct">
     <cluster code="0x0060"/>
     <cluster code="0x0061"/>
+    <cluster code="0x0048"/>
     <item name="OperationalStateID"    type="enum8" optional="false"/>
     <item name="OperationalStateLabel" type="char_string" optional="true" length="64"/>
   </struct>
@@ -43,6 +46,7 @@ limitations under the License.
   <struct name="ErrorStateStruct">
     <cluster code="0x0060"/>
     <cluster code="0x0061"/>
+    <cluster code="0x0048"/>
     <item name="ErrorStateID" type="enum8" optional="false" />
     <item name="ErrorStateLabel" type="char_string" optional="true" length="64" />
     <item name="ErrorStateDetails" type="char_string" optional="true" length="64" />
diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml
new file mode 100644
index 00000000000000..2305667a44f8a0
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+  <cluster apiMaturity="provisional">
+    <domain>Appliances</domain>
+    <name>Oven Cavity Operational State</name>
+    <code>0x0048</code>
+    <define>OPERATIONAL_STATE_OVEN_CLUSTER</define>
+    <client init="false" tick="false">true</client>
+    <server init="false" tick="false">true</server>
+    <description>This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven.</description>
+
+    <globalAttribute side="either" code="0xFFFD" value="1"/>
+
+    <attribute side="server" code="0x0000" define="PHASE_LIST"              type="ARRAY" entryType="char_string"                                     writable="false" isNullable="true"  optional="false">PhaseList</attribute>
+    <attribute side="server" code="0x0001" define="CURRENT_PHASE"           type="int8u"                                    min="0x00" max="0x1F"    writable="false" isNullable="true"  optional="false">CurrentPhase</attribute>
+    <attribute side="server" code="0x0002" define="COUNTDOWN_TIME"          type="elapsed_s"                                min="0x00" max="259200"  writable="false" isNullable="true"  optional="true">CountdownTime</attribute>
+    <attribute side="server" code="0x0003" define="OPERATIONAL_STATE_LIST"  type="ARRAY" entryType="OperationalStateStruct"                          writable="false"                    optional="false">OperationalStateList</attribute>
+    <attribute side="server" code="0x0004" define="OPERATIONAL_STATE"       type="OperationalStateEnum"                                              writable="false"                    optional="false">OperationalState</attribute>
+    <attribute side="server" code="0x0005" define="OPERATIONAL_ERROR"       type="ErrorStateStruct"                                                  writable="false"                    optional="false">OperationalError</attribute>
+
+    <command source="client" code="0x00" name="Pause" response="OperationalCommandResponse" optional="true">
+      <description>Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.</description>
+    </command>
+
+    <command source="client" code="0x01" name="Stop" response="OperationalCommandResponse" optional="true">
+      <description>Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.</description>
+    </command>
+
+    <command source="client" code="0x02" name="Start" response="OperationalCommandResponse" optional="true">
+      <description>Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.</description>
+    </command>
+
+    <command source="client" code="0x03" name="Resume" response="OperationalCommandResponse" optional="true">
+      <description>Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).</description>
+    </command>
+
+    <command source="server" code="0x04" name="OperationalCommandResponse" optional="true">
+      <description>This command SHALL be generated in response to any of the Start, Stop, Pause, or Resume commands.</description>
+      <arg name="CommandResponseState" type="ErrorStateStruct"/>
+    </command>
+
+    <event side="server" code="0x00" priority="critical" name="OperationalError" optional="false">
+      <description>OperationalError</description>
+      <field id="0" name="ErrorState" type="ErrorStateStruct" />
+    </event>
+
+     <event side="server" code="0x01" priority="info" name="OperationCompletion" optional="true">
+      <description>OperationCompletion</description>
+      <field id="0" name="CompletionErrorCode"  type="enum8" />
+      <field id="1" name="TotalOperationalTime" type="elapsed_s" isNullable="true" optional="true"/>
+      <field id="2" name="PausedTime"           type="elapsed_s" isNullable="true" optional="true"/>
+    </event>
+  </cluster>
+</configurator>
\ No newline at end of file
diff --git a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml
new file mode 100644
index 00000000000000..e12d37d267e9c5
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+
+  <enum name="ModeTag" type="enum16">
+    <cluster code="0x0049"/>
+    <item value="0x4000" name="Bake"/>
+    <item value="0x4001" name="Convection"/>
+    <item value="0x4002" name="Grill"/>
+    <item value="0x4003" name="Roast"/>
+    <item value="0x4004" name="Clean"/>
+    <item value="0x4005" name="Convection Bake"/>
+    <item value="0x4006" name="Convection Roast"/>
+    <item value="0x4007" name="Warming"/>
+    <item value="0x4008" name="Proofing"/>
+  </enum>
+
+  <cluster apiMaturity="provisional">
+    <domain>General</domain>
+    <name>Oven Mode</name>
+    <code>0x0049</code>
+    <define>OVEN_MODE_CLUSTER</define>
+    <client init="false" tick="false">true</client>
+    <server init="false" tick="false">true</server>
+    <description>Attributes and commands for selecting a mode from a list of supported options.</description>
+    <globalAttribute side="either" code="0xFFFD" value="1"/>
+    <!-- Base data types -->
+    <attribute side="server" code="0x0000" define="SUPPORTED_MODES"  type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
+    <attribute side="server" code="0x0001" define="CURRENT_MODE"     type="int8u"                              writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
+    <attribute side="server" code="0x0002" define="START_UP_MODE"    type="int8u"                              writable="true"  optional="true"  isNullable="true">StartUpMode</attribute>
+    <attribute side="server" code="0x0003" define="ON_MODE"          type="int8u"                              writable="true"  optional="true"  isNullable="true">OnMode</attribute>
+
+    <!-- Commands -->
+    <command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
+      <description>
+        This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+      </description>
+      <arg name="NewMode" type="int8u" optional="false"/>
+    </command>
+
+    <command source="server" code="0x01" name="ChangeToModeResponse" disableDefaultResponse="true" optional="false">
+      <description>
+        This command is sent by the device on receipt of the ChangeToModeWithStatus command.
+      </description>
+      <arg name="Status"     type="enum8"                   optional="false"/>
+      <arg name="StatusText" type="char_string" lenght="64" optional="true"/>
+    </command>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
index 347762b8d4cedd..994cdb78969a88 100644
--- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
@@ -26,6 +26,6 @@ limitations under the License.
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
-    <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="int8u" length="6" writable="false" optional="false">Sources</attribute>
+    <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="endpoint_no" length="6" writable="false" optional="false">Sources</attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml
index 43b63e67409b37..b8bcbc1243a1dd 100644
--- a/src/app/zap-templates/zcl/data-model/chip/scene.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml
@@ -15,11 +15,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
-  <bitmap name="ScenesCopyMode" type="bitmap8">
+  <bitmap name="NameSupportBitmap" type="BITMAP8">
+      <cluster code="0x0005"/>
+      <field name="SceneNames" mask="0x80"/>
+  </bitmap>
+
+  <bitmap name="CopyModeBitmap" type="BITMAP8">
     <cluster code="0x0005"/>
     <field name="CopyAllScenes" mask="0x01"/>
   </bitmap>
 
+  <struct name="SceneInfoStruct" isFabricScoped="true">
+    <cluster code="0x0005"/>
+    <item name="SceneCount" type="int8u" optional="false"/>
+    <item name="CurrentScene" type="int8u" optional="false" isFabricSensitive="true"/>
+    <item name="CurrentGroup" type="group_id" optional="false" isFabricSensitive="true"/>
+    <item name="SceneValid" type="boolean" optional="false" isFabricSensitive="true"/>
+    <item name="RemainingCapacity" type="int8u" optional="false"/>
+  </struct>
+
   <struct name="AttributeValuePair">
     <cluster code="0x0005"/>
     <item name="AttributeID" type="attrib_id" optional="false"/>
@@ -43,14 +57,14 @@ limitations under the License.
     <server tick="false" init="false">true</server>
     <globalAttribute side="either" code="0xFFFD" value="5"/>
    
-    <attribute side="server" code="0x0000" define="SCENE_COUNT" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="false">SceneCount</attribute>
-    <attribute side="server" code="0x0001" define="CURRENT_SCENE" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="false">CurrentScene</attribute>
-    <attribute side="server" code="0x0002" define="CURRENT_GROUP" type="group_id" min="0x0000" max="0xFFF7" writable="false" default="0x0000" optional="false">CurrentGroup</attribute>
-    <attribute side="server" code="0x0003" define="SCENE_VALID" type="boolean" min="0x00" max="0x01" writable="false" default="0x00" optional="false">SceneValid</attribute>
-    <attribute side="server" code="0x0004" define="SCENE_NAME_SUPPORT" type="bitmap8" min="0x00" max="0x80" writable="false" default="0x00" optional="false">NameSupport</attribute>
+    <attribute side="server" code="0x0000" define="SCENE_COUNT" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">SceneCount</attribute>
+    <attribute side="server" code="0x0001" define="CURRENT_SCENE" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">CurrentScene</attribute>
+    <attribute side="server" code="0x0002" define="CURRENT_GROUP" type="group_id" min="0x0000" max="0xFFF7" writable="false" default="0x0000" optional="true">CurrentGroup</attribute>
+    <attribute side="server" code="0x0003" define="SCENE_VALID" type="boolean" min="0x00" max="0x01" writable="false" default="0x00" optional="true">SceneValid</attribute>
+    <attribute side="server" code="0x0004" define="SCENE_NAME_SUPPORT" type="NameSupportBitmap" min="0x00" max="0x80" writable="false" default="0x00" optional="false">NameSupport</attribute>
     <attribute side="server" code="0x0005" define="LAST_CONFIGURED_BY" type="node_id" writable="false" isNullable="true" optional="true">LastConfiguredBy</attribute>
     <attribute side="server" code="0x0006" define="SCENE_TABLE_SIZE" type="int16u" min="16" default="16" writable="false" optional="false">SceneTableSize</attribute>
-    <attribute side="server" code="0x0007" define="REMAINING_CAPACITY" type="int8u" writable="false" optional="false">RemainingCapacity</attribute>
+    <attribute side="server" code="0x0007" define="FABRIC_SCENE_INFO" type="ARRAY" entryType="SceneInfoStruct" writable="false" optional="false">FabricSceneInfo</attribute>
     <command source="client" code="0x00" name="AddScene" response="AddSceneResponse" isFabricScoped="true" optional="false" cli="chip scenes add">
       <description>
         Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "AttributeValue": VALUE}]}'
@@ -134,7 +148,7 @@ limitations under the License.
       <description>
         Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair.
       </description>
-      <arg name="Mode" type="ScenesCopyMode"/>
+      <arg name="Mode" type="CopyModeBitmap"/>
       <arg name="GroupIdentifierFrom" type="group_id"/>
       <arg name="SceneIdentifierFrom" type="int8u"/>
       <arg name="GroupIdentifierTo" type="group_id"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml
index adfa5dbc808190..0daa3817da96a4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,12 +35,12 @@ limitations under the License.
 
     <command source="server" code="0x01" name="NavigateTargetResponse" optional="false">
       <description>This command SHALL be generated in response to NavigateTarget commands.</description>
-      <arg name="Status" type="TargetNavigatorStatusEnum"/>
+      <arg name="Status" type="StatusEnum"/>
       <arg name="Data"   type="char_string" optional="true"/>
     </command>
   </cluster>
 
-  <enum name="TargetNavigatorStatusEnum" type="enum8">
+  <enum name="StatusEnum" type="enum8">
     <cluster code="0x0505"/>
     <item name="Success"        value="0x00"/>
     <item name="TargetNotFound" value="0x01"/>
@@ -50,6 +50,6 @@ limitations under the License.
   <struct name="TargetInfoStruct">
     <cluster code="0x0505"/>
     <item name="Identifier" type="int8u"/>
-    <item name="Name"       type="char_string" length="32"/>
+    <item name="Name"       type="char_string"/>
   </struct>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
index e24738ead95da0..d141743fafde56 100644
--- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
@@ -24,9 +24,9 @@ limitations under the License.
     <define>TEMPERATURE_MEASUREMENT_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
-    <attribute side="server" code="0x0000" define="TEMP_MEASURED_VALUE" type="int16s" min="0x954d" max="0x7fff" writable="false" isNullable="true" optional="false">MeasuredValue</attribute>
-    <attribute side="server" code="0x0001" define="TEMP_MIN_MEASURED_VALUE" type="int16s" min="0x954d" max="0x7ffe" writable="false" isNullable="true" default="0x8000" optional="false">MinMeasuredValue</attribute>
-    <attribute side="server" code="0x0002" define="TEMP_MAX_MEASURED_VALUE" type="int16s" min="0x954e" max="0x7fff" writable="false" isNullable="true" default="0x8000" optional="false">MaxMeasuredValue</attribute>
+    <attribute side="server" code="0x0000" define="TEMP_MEASURED_VALUE" type="temperature" min="0x954d" max="0x7fff" writable="false" isNullable="true" optional="false">MeasuredValue</attribute>
+    <attribute side="server" code="0x0001" define="TEMP_MIN_MEASURED_VALUE" type="temperature" min="0x954d" max="0x7ffe" writable="false" isNullable="true" default="0x8000" optional="false">MinMeasuredValue</attribute>
+    <attribute side="server" code="0x0002" define="TEMP_MAX_MEASURED_VALUE" type="temperature" min="0x954e" max="0x7fff" writable="false" isNullable="true" default="0x8000" optional="false">MaxMeasuredValue</attribute>
     <attribute side="server" code="0x0003" define="TEMP_TOLERANCE" type="int16u" min="0" max="0x0800" writable="false" default="0" optional="true">Tolerance</attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml
index fdf670540fa11d..cd3491cc079024 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml
@@ -29,18 +29,41 @@ limitations under the License.
 
     <globalAttribute side="either" code="0xFFFD" value="2"/>
 
-    <attribute side="server" code="0x0000" define="TEMPERATURE_DISPLAY_MODE" type="enum8" min="0x00" max="0x01" writable="true" default="0x00" optional="false">TemperatureDisplayMode</attribute>
+    <attribute side="server" code="0x0000" define="TEMPERATURE_DISPLAY_MODE" type="TemperatureDisplayModeEnum" min="0x00" max="0x01" writable="true" default="0x00" optional="false">TemperatureDisplayMode</attribute>
 
-    <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="enum8" min="0x00" max="0x05" writable="true" default="0x00" optional="false">
+    <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="KeypadLockoutEnum" min="0x00" max="0x05" writable="true" default="0x00" optional="false">
       <description>KeypadLockout</description>
       <access op="read" role="view"/>
       <access op="write" role="manage"/>
     </attribute>
 
-    <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="enum8" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">
+    <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="ScheduleProgrammingVisibilityEnum" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">
       <description>ScheduleProgrammingVisibility</description>
       <access op="read" role="view"/>
       <access op="write" role="manage"/>
     </attribute>
   </cluster>
+
+  <enum name="KeypadLockoutEnum" type="enum8">
+    <cluster code="0x0204"/>
+    <item name="NoLockout" value="0x00"/>
+    <item name="Lockout1" value="0x01"/>
+    <item name="Lockout2" value="0x02"/>
+    <item name="Lockout3" value="0x03"/>
+    <item name="Lockout4" value="0x04"/>
+    <item name="Lockout5" value="0x05"/>
+  </enum>
+
+  <enum name="ScheduleProgrammingVisibilityEnum" type="enum8">
+    <cluster code="0x0204"/>
+    <item name="ScheduleProgrammingPermitted" value="0x00"/>
+    <item name="ScheduleProgrammingDenied" value="0x01"/>
+  </enum>
+
+  <enum name="TemperatureDisplayModeEnum" type="enum8">
+    <cluster code="0x0204"/>
+    <item name="Celsius" value="0x00"/>
+    <item name="Fahrenheit" value="0x01"/>
+  </enum>
+
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
index 3f6d5eb81bdf2d..6f1f83e0f9aa87 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
@@ -101,10 +101,10 @@ limitations under the License.
     <attribute side="server" code="0x07" define="NEIGHBOR_TABLE" type="ARRAY" entryType="NeighborTableStruct" length="254" writable="false" optional="false">NeighborTable</attribute>
     <attribute side="server" code="0x08" define="ROUTE_TABLE" type="ARRAY" entryType="RouteTableStruct" length="254" writable="false" optional="false">RouteTable</attribute>
     <attribute side="server" code="0x09" define="PARTITION_ID" type="int32u" min="0x00000000" max="0xFFFFFFFF" writable="false" isNullable="true" optional="false">PartitionId</attribute>
-    <attribute side="server" code="0x0A" define="WEIGHTING" type="int8u" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">Weighting</attribute>
-    <attribute side="server" code="0x0B" define="DATA_VERSION" type="int8u" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">DataVersion</attribute>
-    <attribute side="server" code="0x0C" define="STABLE_DATA_VERSION" type="int8u" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">StableDataVersion</attribute>
-    <attribute side="server" code="0x0D" define="LEADER_ROUTER_ID" type="int8u" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">LeaderRouterId</attribute>
+    <attribute side="server" code="0x0A" define="WEIGHTING" type="int16u" max="0xFF" writable="false"  isNullable="true" optional="false">Weighting</attribute>
+    <attribute side="server" code="0x0B" define="DATA_VERSION" type="int16u" max="0xFF" writable="false"  isNullable="true" optional="false">DataVersion</attribute>
+    <attribute side="server" code="0x0C" define="STABLE_DATA_VERSION" type="int16u" max="0xFF" writable="false"  isNullable="true" optional="false">StableDataVersion</attribute>
+    <attribute side="server" code="0x0D" define="LEADER_ROUTER_ID" type="int8u" min="0x00" max="62" writable="false"  isNullable="true" optional="false">LeaderRouterId</attribute>
     <attribute side="server" code="0x0E" define="DETACHED_ROLE_COUNT" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">DetachedRoleCount</attribute>
     <attribute side="server" code="0x0F" define="CHILD_ROLE_COUNT" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">ChildRoleCount</attribute>
     <attribute side="server" code="0x10" define="ROUTER_ROLE_COUNT" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">RouterRoleCount</attribute>
@@ -156,6 +156,7 @@ limitations under the License.
     <attribute side="server" code="0x3E" define="ACTIVE_THREAD_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultEnum" length="4" writable="false" optional="false">ActiveNetworkFaultsList</attribute>
     <command source="client" code="0x00" name="ResetCounts" optional="true" cli="chip thread_network_diagnostics resetcounts">
       <description>Reception of this command SHALL reset the OverrunCount attributes to 0</description>
+      <access op="invoke" privilege="manage"/>
     </command>
     <event side="server" code="0x00" name="ConnectionStatus" priority="info" optional="true">
       <description>Indicate that a Node’s connection status to a Thread network has changed</description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml
index e9c48e985b0216..07b91eb1f60fb0 100644
--- a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml
@@ -54,8 +54,14 @@ limitations under the License.
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format.</description>
     <!-- Base data types -->
-    <attribute side="server" code="0x00" define="HOUR_FORMAT" type="HourFormatEnum" min="0x00" max="0x01" writable="true" optional="false">HourFormat</attribute>
-    <attribute side="server" code="0x01" define="ACTIVE_CALENDAR_TYPE" type="CalendarTypeEnum" writable="true" optional="true">ActiveCalendarType</attribute>
+    <attribute side="server" code="0x00" define="HOUR_FORMAT" type="HourFormatEnum" min="0x00" max="0x01" writable="true" optional="false">
+        <description>HourFormat</description>
+        <access op="write" role="manage" />
+    </attribute>
+    <attribute side="server" code="0x01" define="ACTIVE_CALENDAR_TYPE" type="CalendarTypeEnum" writable="true" optional="true">
+        <description>ActiveCalendarType</description>
+        <access op="write" role="manage" />
+    </attribute>
     <attribute side="server" code="0x02" define="SUPPORTED_CALENDAR_TYPES" type="ARRAY" entryType="CalendarTypeEnum" writable="false" optional="true">SupportedCalendarTypes</attribute>  
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml
new file mode 100644
index 00000000000000..07f2aa1f822cf7
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<configurator>
+    <domain name="CHIP" />
+
+    <bitmap name="Feature" type="bitmap32">
+        <cluster code="0x0047"/>
+        <field mask="0x01" name="Reset"/>
+    </bitmap>
+
+    <enum name="TimerStatusEnum" type="enum8">
+        <cluster code="0x0047" />
+        <item name="Running" value="0x0" />
+        <item name="Paused" value="0x1" />
+        <item name="Expired" value="0x2" />
+        <item name="Ready" value="0x3" />
+    </enum>
+
+    <cluster apiMaturity="provisional">
+        <domain>General</domain>
+        <name>Timer</name>
+        <code>0x0047</code>
+        <define>TIMER_CLUSTER</define>
+        <client init="false" tick="false">true</client>
+        <server init="false" tick="false">true</server>
+        <description>This cluster supports creating a simple timer functionality.</description>
+
+        <globalAttribute side="server" code="0xFFFD" value="1" />
+
+        <attribute side="server" code="0x0000" define="SET_TIME" type="elapsed_s"  writable="false" isNullable="false" optional="false">SetTime</attribute>
+        <attribute side="server" code="0x0001" define="TIME_REMAINING" type="elapsed_s"  writable="false"  isNullable="false"   optional="false">TimeRemaining</attribute>
+        <attribute side="server" code="0x0002" define="TIMER_STATE" type="TimerStatusEnum"  writable="false"  isNullable="false"   optional="false">TimerState</attribute>
+
+        <command source="client" code="0x00" name="SetTimer"  optional="false">
+             <description>
+             This command is used to set the timer.
+            </description>
+            <arg name="NewTime" type="elapsed_s" optional="false"/>
+         </command>
+
+        <command source="client" code="0x01" name="ResetTimer" optional="true">
+            <description>
+            This command is used to reset the timer to the original value.
+            </description>
+        </command>
+
+        <command source="client" code="0x02" name="AddTime" optional="false">
+            <description>
+            This command is used to add time to the existing timer.
+            </description>
+            <arg name="AdditionalTime"     type="elapsed_s"  optional="false"/>
+        </command>
+
+        <command source="client" code="0x03" name="ReduceTime"  optional="true">
+            <description>
+            This command is used to reduce time on the existing timer.
+            </description>
+            <arg name="TimeReduction"     type="elapsed_s"   optional="false"/>
+        </command>
+    </cluster>
+</configurator>
\ No newline at end of file
diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
index 22dfff577636f7..febb19ed595e36 100644
--- a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
@@ -35,7 +35,10 @@ limitations under the License.
       mechanism by which they can be configured to use a user’s preferred unit.</description>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
     <!-- Base data types -->
-    <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnitEnum" min="0" max="2" writable="true" optional="true">TemperatureUnit</attribute>
+    <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnitEnum" min="0" max="2" writable="true" optional="true">
+        <description>TemperatureUnit</description>
+        <access op="write" role="manage"/>
+    </attribute>
   </cluster>
   <bitmap name="Feature" type="bitmap32">
     <cluster code="0x002d"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml
new file mode 100644
index 00000000000000..d4207d6f116e2f
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+
+  <bitmap name="Feature" type="bitmap32">
+    <cluster code="0x0081"/>
+    <field name="TimeSync" mask="0x1"/>
+    <field name="Level" mask="0x2"/>
+  </bitmap>
+
+  <bitmap name="ValveFaultBitmap" type="bitmap16">
+    <cluster code="0x0081"/>
+    <field name="GeneralFault" mask="0x1"/>
+    <field name="Blocked" mask="0x2"/>
+    <field name="Leaking" mask="0x4"/>
+  </bitmap>
+
+  <enum name="ValveStateEnum" type="enum8">
+    <cluster code="0x0081"/>
+    <item name="Open" value="0x0"/>
+    <item name="Closed" value="0x1"/>
+  </enum>
+
+  <cluster apiMaturity="provisional">
+    <name>Valve Configuration and Control</name>
+    <domain>HVAC</domain>
+    <code>0x0081</code>
+    <define>VALVE_CONFIGURATION_AND_CONTROL_CLUSTER</define>
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+    <description>This cluster is used to configure a valve.</description>
+    <globalAttribute side="either" code="0xFFFD" value="1"/>
+
+    <!-- min max definition for attribute size larger than 2 bytes is not allowed by zap codegen https://github.com/project-chip/zap/issues/1187 -->
+    <!-- Therefore, this check needs to be done in code. -->
+    <attribute side="server" code="0x0000" define="OPEN_DURATION" type="elapsed_s" isNullable="true" writable="true" optional="false">
+      <description>OpenDuration</description>
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0001" define="AUTO_CLOSE_TIME" type="epoch_us" isNullable="true" writable="false" optional="true">AutoCloseTime</attribute>
+    <attribute side="server" code="0x0002" define="REMAINING_DURATION" type="elapsed_s" isNullable="true" writable="false" optional="true">RemainingDuration</attribute>
+    <attribute side="server" code="0x0003" define="CURRENT_STATE" type="ValveStateEnum" isNullable="true" writable="false" optional="false">CurrentState</attribute>
+    <attribute side="server" code="0x0004" define="TARGET_STATE" type="ValveStateEnum" isNullable="true" writable="false" optional="false">TargetState</attribute>
+    <attribute side="server" code="0x0005" define="START_UP_STATE" type="ValveStateEnum" isNullable="false" writable="true" optional="true">
+      <description>StartUpState</description>
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0006" define="CURRENT_LEVEL" type="percent" isNullable="true" min="0" max="100" writable="false" optional="true">CurrentLevel</attribute>
+    <attribute side="server" code="0x0007" define="TARGET_LEVEL" type="percent" isNullable="true" min="0" max="100" writable="false" optional="true">TargetLevel</attribute>
+    <attribute side="server" code="0x0008" define="OPEN_LEVEL" type="percent" isNullable="true" min="1" max="100" writable="true" default="100" optional="true">
+      <description>OpenLevel</description>
+      <access op="read" privilege="view"/>
+      <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0009" define="VALVE_FAULT" type="ValveFaultBitmap" isNullable="false" writable="false" optional="true">ValveFault</attribute>
+
+    <command source="client" code="0x00" name="Open" optional="false">
+      <description>This command is used to set the valve to its fully open position.</description>
+      <arg name="OpenDuration" type="elapsed_s" optional="true"/>
+    </command>
+
+    <command source="client" code="0x01" name="Close" optional="false">
+      <description>This command is used to set the valve to its fully closed position.</description>
+    </command>
+
+    <command source="client" code="0x02" name="SetLevel" optional="true">
+      <description>This command is used to set the valve to a specific level.</description>
+      <arg name="Level" type="percent"/>
+      <arg name="OpenDuration" type="elapsed_s" optional="true"/>
+    </command>
+
+    <event side="server" code="0x00" priority="info" name="ValveStateChanged" optional="true">
+      <description>This event SHALL be generated when the valve changes state, either opens or closes.</description>
+      <field id="0" name="ValveState" type="ValveStateEnum"/>
+    </event>
+
+    <event side="server" code="0x01" priority="info" name="ValveFault" optional="true">
+      <description>This event SHALL be generated when the valve registers a fault.</description>
+      <field id="0" name="ValveFault" type="ValveFaultBitmap"/>
+    </event>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml
index e9ad2ea7d5ec5b..c250eb2874413d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,6 +24,10 @@ limitations under the License.
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <description>This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol.</description>
-    <attribute side="server" code="0x0000" define="WAKE_ON_LAN_MAC_ADDRESS" type="char_string" length="32" writable="false" optional="true">MACAddress</attribute>
+
+    <global side="either" code="0xFFFD" value="1"/>
+
+    <attribute side="server" code="0x0000" define="WAKE_ON_LAN_MAC_ADDRESS" type="char_string" length="12" writable="false" optional="true">MACAddress</attribute>
+    <attribute apiMaturity="provisional" side="server" code="0x0001" define="LINK_LOCAL_ADDRESS" type="octet_string" length="16" writable="false" optional="true">LinkLocalAddress</attribute>
   </cluster>
-</configurator>
\ No newline at end of file
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml
index 65e177285a3978..a2d0ca758de91e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml
@@ -23,7 +23,7 @@ limitations under the License.
     <item name="WEP" value="0x02"/>
     <item name="WPA" value="0x03"/>
     <item name="WPA2" value="0x04"/>
-    <item name="WPA3" value="0x05"/>    
+    <item name="WPA3" value="0x05"/>
   </enum>
   <enum name="WiFiVersionEnum" type="enum8">
     <cluster code="0x0036"/>
@@ -80,12 +80,12 @@ limitations under the License.
     </event>
     <event side="server" code="0x01" name="AssociationFailure" priority="info" optional="true">
       <description>Indicate that a Node has failed to connect, or reconnect, to a Wi-Fi access point.</description>
-      <field id="0" name="AssociationFailure" type="AssociationFailureCauseEnum"/>
-      <field id="1" name="Status" type="int16u"/>      
+      <field id="0" name="AssociationFailureCause" type="AssociationFailureCauseEnum"/>
+      <field id="1" name="Status" type="int16u"/>
     </event>
     <event side="server" code="0x02" name="ConnectionStatus" priority="info" optional="true">
       <description>Indicate that a Node’s connection status to a Wi-Fi network has changed.</description>
       <field id="0" name="ConnectionStatus" type="ConnectionStatusEnum"/>
-    </event>                  
+    </event>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml b/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml
index af51f6a53aba27..ce3f7494c76d2d 100644
--- a/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml
@@ -30,18 +30,6 @@ limitations under the License.
     <field name="positionFailure" mask="0x08"/>
   </bitmap>
 
-  <enum name="BarrierControlBarrierPosition" type="int8u">
-    <item name="Closed" value="0"/>
-    <item name="Open" value="100"/>
-    <item name="Unknown" value="0xFF"/>
-  </enum>
-
-  <enum name="BarrierControlMovingState" type="enum8">
-    <item name="Stopped" value="0x00"/>
-    <item name="Closing" value="0x01"/>
-    <item name="Opening" value="0x02"/>
-  </enum>
-
   <cluster>
     <name>Barrier Control</name>
     <domain>Closures</domain>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml b/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
deleted file mode 100644
index 9e3523063eb7c3..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="ColorControlOptions" type="bitmap8">
-    <item name="ExecuteIfOff" value="0x1"/>
-  </enum>
-
-  <enum name="EnhancedColorMode" type="enum8">
-    <item name="CurrentHueAndCurrentSaturation" value="0x00"/>
-    <item name="CurrentXAndCurrentY" value="0x01"/>
-    <item name="ColorTemperature" value="0x02"/>
-    <item name="EnhancedCurrentHueAndCurrentSaturation" value="0x03"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/manufacturers.xml b/src/app/zap-templates/zcl/data-model/manufacturers.xml
index 35314522c26d39..2efcb5f74ddb4c 100644
--- a/src/app/zap-templates/zcl/data-model/manufacturers.xml
+++ b/src/app/zap-templates/zcl/data-model/manufacturers.xml
@@ -177,7 +177,6 @@ Note:
   <mapping code="0x1097" translation="SyChip/Murata"/>
   <mapping code="0x1098" translation="OpenPeak"/>
   <mapping code="0x1099" translation="PassiveSystems"/>
-  <mapping code="0x109B" translation="Pioneer Corp"/>
   <mapping code="0x109A" translation="MMB Research"/>
   <mapping code="0x109B" translation="Leviton Manufacturing Company"/>
   <mapping code="0x109C" translation="Korea Electric Power Data Network Co., Ltd."/>
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 543a902517da97..720a6514804268 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -24,6 +24,7 @@
         "barrier-control-cluster.xml",
         "basic-information-cluster.xml",
         "binding-cluster.xml",
+        "boolean-sensor-configuration-cluster.xml",
         "boolean-state-cluster.xml",
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
@@ -37,8 +38,12 @@
         "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",
         "electrical-measurement-cluster.xml",
+        "energy-evse-cluster.xml",
         "ethernet-network-diagnostics-cluster.xml",
         "fan-control-cluster.xml",
         "fault-injection-cluster.xml",
@@ -55,6 +60,7 @@
         "input-output-value-clusters.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",
@@ -69,7 +75,9 @@
         "onoff-switch-configuration-cluster.xml",
         "operational-credentials-cluster.xml",
         "operational-state-cluster.xml",
+        "operational-state-oven-cluster.xml",
         "operational-state-rvc-cluster.xml",
+        "oven-mode-cluster.xml",
         "pressure-measurement-cluster.xml",
         "power-source-cluster.xml",
         "power-source-configuration-cluster.xml",
@@ -98,15 +106,16 @@
         "thread-network-diagnostics-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",
         "wifi-network-diagnostics-cluster.xml",
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
-        "types/color-control.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
@@ -158,7 +167,9 @@
             "SerialNumber",
             "UniqueID",
             "CapabilityMinima",
-            "ProductAppearance"
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Descriptor": ["ClusterRevision"],
@@ -187,8 +198,7 @@
             "RebootCount",
             "UpTime",
             "TotalOperationalHours",
-            "BootReason",
-            "AverageWearCount"
+            "BootReason"
         ],
         "Group Key Management": [
             "ClusterRevision",
@@ -218,7 +228,6 @@
             "FeatureMap",
             "ThreadMetrics"
         ],
-        "Scenes": ["SceneCount", "RemainingCapacity"],
         "Unit Testing": [
             "struct_attr",
             "nullable_struct",
@@ -325,6 +334,7 @@
             "OnMode",
             "FeatureMap"
         ],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Laundry Washer Mode": [
             "SupportedModes",
             "CurrentMode",
@@ -363,6 +373,12 @@
             "CurrentPhase",
             "CountdownTime"
         ],
+        "Oven Cavity Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
         "Activated Carbon Filter Monitoring": [
             "Condition",
             "DegradationDirection",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index c047c56557e2fa..9fe43e38eada59 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -23,6 +23,7 @@
         "barrier-control-cluster.xml",
         "basic-information-cluster.xml",
         "binding-cluster.xml",
+        "boolean-sensor-configuration-cluster.xml",
         "boolean-state-cluster.xml",
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
@@ -36,8 +37,11 @@
         "diagnostic-logs-cluster.xml",
         "dishwasher-alarm-cluster.xml",
         "dishwasher-mode-cluster.xml",
+        "microwave-oven-mode-cluster.xml",
         "door-lock-cluster.xml",
+        "drlc-cluster.xml",
         "electrical-measurement-cluster.xml",
+        "energy-evse-cluster.xml",
         "ethernet-network-diagnostics-cluster.xml",
         "fan-control-cluster.xml",
         "fault-injection-cluster.xml",
@@ -54,6 +58,7 @@
         "input-output-value-clusters.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",
@@ -67,7 +72,9 @@
         "onoff-switch-configuration-cluster.xml",
         "operational-credentials-cluster.xml",
         "operational-state-cluster.xml",
+        "operational-state-oven-cluster.xml",
         "operational-state-rvc-cluster.xml",
+        "oven-mode-cluster.xml",
         "pressure-measurement-cluster.xml",
         "power-source-cluster.xml",
         "power-source-configuration-cluster.xml",
@@ -89,6 +96,7 @@
         "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",
@@ -96,15 +104,16 @@
         "thread-network-diagnostics-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",
         "wifi-network-diagnostics-cluster.xml",
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
-        "types/color-control.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
@@ -156,7 +165,9 @@
             "SerialNumber",
             "UniqueID",
             "CapabilityMinima",
-            "ProductAppearance"
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Descriptor": ["ClusterRevision"],
@@ -185,8 +196,7 @@
             "RebootCount",
             "UpTime",
             "TotalOperationalHours",
-            "BootReason",
-            "AverageWearCount"
+            "BootReason"
         ],
         "Group Key Management": [
             "ClusterRevision",
@@ -216,7 +226,6 @@
             "FeatureMap",
             "ThreadMetrics"
         ],
-        "Scenes": ["SceneCount", "RemainingCapacity"],
         "Unit Testing": [
             "struct_attr",
             "nullable_struct",
@@ -323,6 +332,7 @@
             "OnMode",
             "FeatureMap"
         ],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Laundry Washer Mode": [
             "SupportedModes",
             "CurrentMode",
@@ -361,6 +371,12 @@
             "CurrentPhase",
             "CountdownTime"
         ],
+        "Oven Cavity Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
         "Activated Carbon Filter Monitoring": [
             "Condition",
             "DegradationDirection",
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 61b2d99f5433e0..d3556f225fc0cb 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -15,6 +15,7 @@
         "BASIC_INFORMATION_CLUSTER": [],
         "BINARY_INPUT_BASIC_CLUSTER": [],
         "BINDING_CLUSTER": [],
+        "BOOLEAN_SENSOR_CONFIGURATION_CLUSTER": [],
         "BOOLEAN_STATE_CLUSTER": [],
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
         "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
@@ -29,8 +30,10 @@
         "DIAGNOSTIC_LOGS_CLUSTER": [],
         "DISHWASHER_ALARM_CLUSTER": [],
         "DISHWASHER_MODE_CLUSTER": [],
+        "MICROWAVE_OVEN_MODE_CLUSTER": [],
         "DOOR_LOCK_CLUSTER": [],
         "ELECTRICAL_MEASUREMENT_CLUSTER": [],
+        "ENERGY_EVSE_CLUSTER": [],
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
         "FAN_CONTROL_CLUSTER": [],
         "FAULT_INJECTION_CLUSTER": [],
@@ -53,6 +56,7 @@
         "LOW_POWER_CLUSTER": [],
         "MEDIA_INPUT_CLUSTER": [],
         "MEDIA_PLAYBACK_CLUSTER": [],
+        "MICROWAVE_OVEN_CONTROL_CLUSTER": [],
         "MODE_SELECT_CLUSTER": [],
         "NETWORK_COMMISSIONING_CLUSTER": [],
         "SAMPLE_MEI_CLUSTER": [],
@@ -62,10 +66,12 @@
         "ON_OFF_SWITCH_CONFIGURATION_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": [],
@@ -102,13 +108,16 @@
         "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": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
         "WINDOW_COVERING_CLUSTER": [],
         "ZLL_COMMISSIONING_CLUSTER": []
@@ -133,6 +142,7 @@
         "BASIC_INFORMATION_CLUSTER": ["basic-information"],
         "BINARY_INPUT_BASIC_CLUSTER": [],
         "BINDING_CLUSTER": ["bindings"],
+        "BOOLEAN_SENSOR_CONFIGURATION_CLUSTER": [],
         "BOOLEAN_STATE_CLUSTER": [],
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
             "bridged-device-basic-information-server"
@@ -152,8 +162,10 @@
         "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"],
         "ELECTRICAL_MEASUREMENT_CLUSTER": [],
+        "ENERGY_EVSE_CLUSTER": ["energy-evse-server"],
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
             "ethernet-network-diagnostics-server"
         ],
@@ -182,6 +194,7 @@
         "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"],
         "MODE_SELECT_CLUSTER": ["mode-select-server"],
         "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"],
         "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
@@ -193,10 +206,12 @@
         "ON_OFF_SWITCH_CONFIGURATION_CLUSTER": [],
         "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"
         ],
@@ -251,12 +266,14 @@
         "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": [],
         "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"],
         "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
diff --git a/src/ble/BUILD.gn b/src/ble/BUILD.gn
index 34450c03c4a8ee..a9f2f07419f77f 100644
--- a/src/ble/BUILD.gn
+++ b/src/ble/BUILD.gn
@@ -42,6 +42,8 @@ buildconfig_header("ble_buildconfig") {
     defines +=
         [ "BLE_PLATFORM_CONFIG_INCLUDE=${chip_ble_platform_config_include}" ]
   }
+
+  visibility = [ ":ble_config_header" ]
 }
 
 source_set("ble_config_header") {
@@ -49,10 +51,11 @@ source_set("ble_config_header") {
 
   public_configs = [ "${chip_root}/src:includes" ]
 
-  public_deps = [
+  public_deps = [ "${chip_root}/src/system:system_config_header" ]
+
+  deps = [
     ":ble_buildconfig",
     "${chip_root}/src/platform:platform_buildconfig",
-    "${chip_root}/src/system:system_config_header",
   ]
 }
 
@@ -65,7 +68,6 @@ if (chip_config_network_layer_ble) {
       "BLEEndPoint.h",
       "Ble.h",
       "BleApplicationDelegate.h",
-      "BleConfig.h",
       "BleConnectionDelegate.h",
       "BleError.cpp",
       "BleError.h",
diff --git a/src/controller/AbstractDnssdDiscoveryController.h b/src/controller/AbstractDnssdDiscoveryController.h
index 788102282bd86d..6e50d7b40c89ca 100644
--- a/src/controller/AbstractDnssdDiscoveryController.h
+++ b/src/controller/AbstractDnssdDiscoveryController.h
@@ -39,8 +39,7 @@ namespace Controller {
 class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::CommissioningResolveDelegate
 {
 public:
-    AbstractDnssdDiscoveryController() {}
-    ~AbstractDnssdDiscoveryController() override { mDNSResolver.Shutdown(); }
+    explicit AbstractDnssdDiscoveryController(Dnssd::Resolver * resolver = nullptr) : mDNSResolver(resolver) {}
 
     void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
     CHIP_ERROR StopDiscovery() { return mDNSResolver.StopDiscovery(); };
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index b97b4d544b7b4e..075c5eeb243b23 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -27,6 +27,8 @@ namespace chip {
 namespace Controller {
 
 using namespace chip::app::Clusters;
+using chip::app::DataModel::MakeNullable;
+using chip::app::DataModel::NullNullable;
 
 AutoCommissioner::AutoCommissioner()
 {
@@ -87,7 +89,9 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
          IsUnsafeSpan(params.GetAttestationSignature(), mParams.GetAttestationSignature()) ||
          IsUnsafeSpan(params.GetPAI(), mParams.GetPAI()) || IsUnsafeSpan(params.GetDAC(), mParams.GetDAC()) ||
          IsUnsafeSpan(params.GetTimeZone(), mParams.GetTimeZone()) ||
-         IsUnsafeSpan(params.GetDSTOffsets(), mParams.GetDSTOffsets()));
+         IsUnsafeSpan(params.GetDSTOffsets(), mParams.GetDSTOffsets()) ||
+         (params.GetDefaultNTP().HasValue() && !params.GetDefaultNTP().Value().IsNull() &&
+          params.GetDefaultNTP().Value().Value().data() != mDefaultNtp));
 
     mParams = params;
 
@@ -194,16 +198,36 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
         for (size_t i = 0; i < size; ++i)
         {
             mTimeZoneBuf[i] = params.GetTimeZone().Value()[i];
-            if (mTimeZoneBuf[i].name.HasValue())
+            if (params.GetTimeZone().Value()[i].name.HasValue() &&
+                params.GetTimeZone().Value()[i].name.Value().size() <= kMaxTimeZoneNameLen)
             {
                 auto span = MutableCharSpan(mTimeZoneNames[i], kMaxTimeZoneNameLen);
-                CopyCharSpanToMutableCharSpan(mTimeZoneBuf[i].name.Value(), span);
+                // The buffer backing "span" is statically allocated and is of size kMaxSupportedTimeZones, so this should never
+                // fail.
+                CopyCharSpanToMutableCharSpan(params.GetTimeZone().Value()[i].name.Value(), span);
                 mTimeZoneBuf[i].name.SetValue(span);
             }
+            else
+            {
+                mTimeZoneBuf[i].name.ClearValue();
+            }
         }
         auto list = app::DataModel::List<app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>(mTimeZoneBuf, size);
         mParams.SetTimeZone(list);
     }
+    if (params.GetDefaultNTP().HasValue())
+    {
+        ChipLogProgress(Controller, "Setting Default NTP from parameters");
+        // This parameter is an optional nullable, so we need to go two levels deep here.
+        if (!params.GetDefaultNTP().Value().IsNull() && params.GetDefaultNTP().Value().Value().size() <= kMaxDefaultNtpSize)
+        {
+            // The buffer backing "span" is statically allocated and is of size kMaxDefaultNtpSize.
+            auto span = MutableCharSpan(mDefaultNtp, kMaxDefaultNtpSize);
+            CopyCharSpanToMutableCharSpan(params.GetDefaultNTP().Value().Value(), span);
+            auto default_ntp = MakeNullable(CharSpan(mDefaultNtp, params.GetDefaultNTP().Value().Value().size()));
+            mParams.SetDefaultNTP(default_ntp);
+        }
+    }
 
     return CHIP_NO_ERROR;
 }
@@ -663,35 +687,32 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
             mNeedsDST = false;
             break;
         case CommissioningStage::kReadCommissioningInfo2: {
-            bool shouldReadCommissioningInfo2 =
-                mParams.GetCheckForMatchingFabric() || (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore);
-            if (shouldReadCommissioningInfo2)
+
+            if (!report.Is<ReadCommissioningInfo2>())
             {
-                if (!report.Is<ReadCommissioningInfo2>())
-                {
-                    ChipLogError(
-                        Controller,
-                        "[BUG] Should read commissioning info (part 2), but report is not ReadCommissioningInfo2. THIS IS A BUG.");
-                }
+                ChipLogError(
+                    Controller,
+                    "[BUG] Should read commissioning info (part 2), but report is not ReadCommissioningInfo2. THIS IS A BUG.");
+            }
 
-                ReadCommissioningInfo2 commissioningInfo = report.Get<ReadCommissioningInfo2>();
+            ReadCommissioningInfo2 commissioningInfo = report.Get<ReadCommissioningInfo2>();
+            mParams.SetSupportsConcurrentConnection(commissioningInfo.supportsConcurrentConnection);
 
-                if (mParams.GetCheckForMatchingFabric())
+            if (mParams.GetCheckForMatchingFabric())
+            {
+                chip::NodeId nodeId = commissioningInfo.nodeId;
+                if (nodeId != kUndefinedNodeId)
                 {
-                    chip::NodeId nodeId = commissioningInfo.nodeId;
-                    if (nodeId != kUndefinedNodeId)
-                    {
-                        mParams.SetRemoteNodeId(nodeId);
-                    }
+                    mParams.SetRemoteNodeId(nodeId);
                 }
+            }
 
-                if (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore)
+            if (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore)
+            {
+                if (commissioningInfo.isIcd)
                 {
-                    if (commissioningInfo.isIcd)
-                    {
-                        mNeedIcdRegistraion = true;
-                        ChipLogDetail(Controller, "AutoCommissioner: Device is ICD");
-                    }
+                    mNeedIcdRegistraion = true;
+                    ChipLogDetail(Controller, "AutoCommissioner: Device is ICD");
                 }
             }
             break;
diff --git a/src/controller/AutoCommissioner.h b/src/controller/AutoCommissioner.h
index 2e13445a113f5d..f86ebead1d011a 100644
--- a/src/controller/AutoCommissioner.h
+++ b/src/controller/AutoCommissioner.h
@@ -113,6 +113,9 @@ class AutoCommissioner : public CommissioningDelegate
     static constexpr size_t kMaxSupportedDstStructs = 10;
     app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type mDstOffsetsBuf[kMaxSupportedDstStructs];
 
+    static constexpr size_t kMaxDefaultNtpSize = 128;
+    char mDefaultNtp[kMaxDefaultNtpSize];
+
     bool mNeedsNetworkSetup = false;
     ReadCommissioningInfo mDeviceCommissioningInfo;
     bool mNeedsDST = false;
diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h
index fd355e6f0d473c..f442190c0fc200 100644
--- a/src/controller/CHIPCluster.h
+++ b/src/controller/CHIPCluster.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "app/ConcreteCommandPath.h"
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/DeviceProxy.h>
 #include <app/util/error-mapping.h>
 #include <controller/InvokeInteraction.h>
diff --git a/src/controller/CHIPCommissionableNodeController.cpp b/src/controller/CHIPCommissionableNodeController.cpp
index fdcf1f7e2649b9..d187cc1289a851 100644
--- a/src/controller/CHIPCommissionableNodeController.cpp
+++ b/src/controller/CHIPCommissionableNodeController.cpp
@@ -32,30 +32,12 @@ CHIP_ERROR CommissionableNodeController::DiscoverCommissioners(Dnssd::DiscoveryF
 {
     ReturnErrorOnFailure(SetUpNodeDiscovery());
 
-    if (mResolver == nullptr)
-    {
 #if CONFIG_DEVICE_LAYER
-        mDNSResolver.Shutdown(); // reset if already inited
-        ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
+    mDNSResolver.Shutdown(); // reset if already inited
+    ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
 #endif
-        mDNSResolver.SetCommissioningDelegate(this);
-        return mDNSResolver.DiscoverCommissioners(discoveryFilter);
-    }
-
-#if CONFIG_DEVICE_LAYER
-    ReturnErrorOnFailure(mResolver->Init(DeviceLayer::UDPEndPointManager()));
-#endif
-    return mResolver->DiscoverCommissioners(discoveryFilter);
-}
-
-CHIP_ERROR CommissionableNodeController::StopDiscovery()
-{
-    if (mResolver == nullptr)
-    {
-        return AbstractDnssdDiscoveryController::StopDiscovery();
-    }
-
-    return mResolver->StopDiscovery();
+    mDNSResolver.SetCommissioningDelegate(this);
+    return mDNSResolver.DiscoverCommissioners(discoveryFilter);
 }
 
 CommissionableNodeController::~CommissionableNodeController()
diff --git a/src/controller/CHIPCommissionableNodeController.h b/src/controller/CHIPCommissionableNodeController.h
index e573ba6fc4b5e9..5c9f57919a2897 100644
--- a/src/controller/CHIPCommissionableNodeController.h
+++ b/src/controller/CHIPCommissionableNodeController.h
@@ -36,14 +36,12 @@ namespace Controller {
 class DLL_EXPORT CommissionableNodeController : public AbstractDnssdDiscoveryController
 {
 public:
-    CommissionableNodeController(chip::Dnssd::Resolver * resolver = nullptr) : mResolver(resolver) {}
+    CommissionableNodeController(chip::Dnssd::Resolver * resolver = nullptr) : AbstractDnssdDiscoveryController(resolver) {}
     ~CommissionableNodeController() override;
 
     void RegisterDeviceDiscoveryDelegate(DeviceDiscoveryDelegate * delegate) { mDeviceDiscoveryDelegate = delegate; }
     CHIP_ERROR DiscoverCommissioners(Dnssd::DiscoveryFilter discoveryFilter = Dnssd::DiscoveryFilter());
 
-    CHIP_ERROR StopDiscovery();
-
     /**
      * @return
      *   Pointer to DiscoveredNodeData at index idx in the list of commissioners discovered
@@ -57,7 +55,6 @@ class DLL_EXPORT CommissionableNodeController : public AbstractDnssdDiscoveryCon
     DiscoveredNodeList GetDiscoveredNodes() override { return DiscoveredNodeList(mDiscoveredCommissioners); }
 
 private:
-    Dnssd::Resolver * mResolver = nullptr;
     Dnssd::DiscoveredNodeData mDiscoveredCommissioners[CHIP_DEVICE_CONFIG_MAX_DISCOVERED_NODES];
 };
 
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 87301129dbe743..a23dd9cb19cd45 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -35,7 +35,6 @@
 // module header, comes first
 #include <controller/CHIPDeviceController.h>
 
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 
@@ -74,8 +73,6 @@
 #include <transport/raw/BLE.h>
 #endif
 
-#include <app/util/af-enums.h>
-
 #include <errno.h>
 #include <inttypes.h>
 #include <memory>
@@ -1018,8 +1015,6 @@ CHIP_ERROR DeviceCommissioner::SendCertificateChainRequestCommand(DeviceProxy *
     OperationalCredentials::Commands::CertificateChainRequest::Type request;
     request.certificateType = static_cast<OperationalCredentials::CertificateChainTypeEnum>(certificateType);
     return SendCommand(device, request, OnCertificateChainResponse, OnCertificateChainFailureResponse, timeout);
-
-    return CHIP_NO_ERROR;
 }
 
 void DeviceCommissioner::OnCertificateChainFailureResponse(void * context, CHIP_ERROR error)
@@ -1616,6 +1611,27 @@ void OnBasicFailure(void * context, CHIP_ERROR error)
     commissioner->CommissioningStageComplete(error);
 }
 
+static void NonConcurrentTimeout(void * context, CHIP_ERROR error)
+{
+    if (error == CHIP_ERROR_TIMEOUT)
+    {
+        ChipLogProgress(Controller, "Non-concurrent mode: Expected NetworkResponse Timeout, do nothing");
+    }
+    else
+    {
+        ChipLogProgress(Controller, "Non-concurrent mode: Received failure response %" CHIP_ERROR_FORMAT, error.Format());
+    }
+}
+
+static void NonConcurrentNetworkResponse(void * context,
+                                         const NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & data)
+{
+    // In Non Concurrent mode the commissioning network should have been shut down and not sent the
+    // ConnectNetworkResponse. In case it does send it this handles the message
+    ChipLogError(Controller, "Non-concurrent Mode : Received Unexpected ConnectNetwork response, ignoring. Status=%u",
+                 to_underlying(data.networkingStatus));
+}
+
 void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId, const CompletionStatus & completionStatus)
 {
     commissioningCompletionStatus = completionStatus;
@@ -1651,8 +1667,16 @@ void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId
         ChipLogProgress(Controller, "Expiring failsafe on proxy %p", proxy);
         mDeviceBeingCommissioned = proxy;
         // We actually want to do the same thing on success or failure because we're already in a failure state
-        SendCommand(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure,
-                    /* timeout = */ NullOptional);
+        CHIP_ERROR err = SendCommand(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure,
+                                     /* timeout = */ NullOptional);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just pretend like the
+            // command errored out async.
+            ChipLogError(Controller, "Failed to send command to disarm fail-safe: %" CHIP_ERROR_FORMAT, err.Format());
+            DisarmDone();
+            return;
+        }
     }
 }
 
@@ -2108,6 +2132,16 @@ void DeviceCommissioner::ParseCommissioningInfo2()
     ReadCommissioningInfo2 info;
     CHIP_ERROR return_err = CHIP_NO_ERROR;
 
+    using namespace chip::app::Clusters::GeneralCommissioning::Attributes;
+    CHIP_ERROR err =
+        mAttributeCache->Get<SupportsConcurrentConnection::TypeInfo>(kRootEndpointId, info.supportsConcurrentConnection);
+    if (err != CHIP_NO_ERROR)
+    {
+        // May not be present so don't return the error code, non fatal, default concurrent
+        ChipLogError(Controller, "Failed to read SupportsConcurrentConnection: %" CHIP_ERROR_FORMAT, err.Format());
+        info.supportsConcurrentConnection = true;
+    }
+
     return_err = ParseFabrics(info);
 
     if (return_err == CHIP_NO_ERROR)
@@ -2203,7 +2237,10 @@ CHIP_ERROR DeviceCommissioner::ParseICDInfo(ReadCommissioningInfo2 & info)
     }
     else if (err == CHIP_ERROR_KEY_NOT_FOUND)
     {
+        // This key is optional so not an error
+        err        = CHIP_NO_ERROR;
         info.isIcd = false;
+        err        = CHIP_NO_ERROR;
     }
     else if (err == CHIP_ERROR_IM_STATUS_CODE_RECEIVED)
     {
@@ -2391,7 +2428,7 @@ void DeviceCommissioner::SendCommissioningReadRequest(DeviceProxy * proxy, Optio
     CHIP_ERROR err = readClient->SendRequest(readParams);
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(Controller, "Failed to send read request for networking clusters");
+        ChipLogError(Controller, "Failed to send read request: %" CHIP_ERROR_FORMAT, err.Format());
         CommissioningStageComplete(err);
         return;
     }
@@ -2435,8 +2472,9 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
     }
     break;
     case CommissioningStage::kReadCommissioningInfo: {
-        ChipLogProgress(Controller, "Sending request for commissioning information");
+        ChipLogProgress(Controller, "Sending read request for commissioning information");
         // NOTE: this array cannot have more than 9 entries, since the spec mandates that server only needs to support 9
+        // See R1.1, 2.11.2 Interaction Model Limits
         app::AttributePathParams readPaths[9];
         // Read all the feature maps for all the networking clusters on any endpoint to determine what is supported
         readPaths[0] = app::AttributePathParams(app::Clusters::NetworkCommissioning::Id,
@@ -2466,11 +2504,16 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
     }
     break;
     case CommissioningStage::kReadCommissioningInfo2: {
-        ChipLogProgress(Controller, "Sending request for commissioning information -- Part 2");
-
         size_t numberOfAttributes = 0;
         // This is done in a separate step since we've already used up all the available read paths in the previous read step
-        app::AttributePathParams readPaths[9];
+        // NOTE: this array cannot have more than 9 entries, since the spec mandates that server only needs to support 9
+        // See R1.1, 2.11.2 Interaction Model Limits
+        app::AttributePathParams readPaths[3];
+
+        // Mandatory attribute
+        readPaths[numberOfAttributes++] =
+            app::AttributePathParams(endpoint, app::Clusters::GeneralCommissioning::Id,
+                                     app::Clusters::GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id);
 
         // Read the current fabrics
         if (params.GetCheckForMatchingFabric())
@@ -2485,36 +2528,30 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
                 app::AttributePathParams(endpoint, IcdManagement::Id, IcdManagement::Attributes::FeatureMap::Id);
         }
 
-        // Current implementation makes sense when we only have a few attributes to read with conditions. Should revisit this if we
-        // are adding more attributes here.
-
-        if (numberOfAttributes == 0)
-        {
-            // We don't actually want to do this step, so just bypass it
-            ChipLogProgress(Controller, "kReadCommissioningInfo2 step called without parameter set, skipping");
-            CommissioningStageComplete(CHIP_NO_ERROR);
-        }
-        else
-        {
-            SendCommissioningReadRequest(proxy, timeout, readPaths, numberOfAttributes);
-        }
+        SendCommissioningReadRequest(proxy, timeout, readPaths, numberOfAttributes);
     }
     break;
     case CommissioningStage::kConfigureUTCTime: {
         TimeSynchronization::Commands::SetUTCTime::Type request;
         uint64_t kChipEpochUsSinceUnixEpoch = static_cast<uint64_t>(kChipEpochSecondsSinceUnixEpoch) * chip::kMicrosecondsPerSecond;
         System::Clock::Microseconds64 utcTime;
-        if (System::SystemClock().GetClock_RealTime(utcTime) == CHIP_NO_ERROR && utcTime.count() > kChipEpochUsSinceUnixEpoch)
-        {
-            request.UTCTime = utcTime.count() - kChipEpochUsSinceUnixEpoch;
-            // For now, we assume a seconds granularity
-            request.granularity = TimeSynchronization::GranularityEnum::kSecondsGranularity;
-            SendCommand(proxy, request, OnBasicSuccess, OnSetUTCError, endpoint, timeout);
-        }
-        else
+        if (System::SystemClock().GetClock_RealTime(utcTime) != CHIP_NO_ERROR || utcTime.count() <= kChipEpochUsSinceUnixEpoch)
         {
             // We have no time to give, but that's OK, just complete this stage
             CommissioningStageComplete(CHIP_NO_ERROR);
+            return;
+        }
+
+        request.UTCTime = utcTime.count() - kChipEpochUsSinceUnixEpoch;
+        // For now, we assume a seconds granularity
+        request.granularity = TimeSynchronization::GranularityEnum::kSecondsGranularity;
+        CHIP_ERROR err      = SendCommand(proxy, request, OnBasicSuccess, OnSetUTCError, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SetUTCTime command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
         }
         break;
     }
@@ -2527,7 +2564,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
         TimeSynchronization::Commands::SetTimeZone::Type request;
         request.timeZone = params.GetTimeZone().Value();
-        SendCommand(proxy, request, OnSetTimeZoneResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err   = SendCommand(proxy, request, OnSetTimeZoneResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SetTimeZone command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
     }
     case CommissioningStage::kConfigureDSTOffset: {
@@ -2539,7 +2583,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
         TimeSynchronization::Commands::SetDSTOffset::Type request;
         request.DSTOffset = params.GetDSTOffsets().Value();
-        SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err    = SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SetDSTOffset command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
     }
     case CommissioningStage::kConfigureDefaultNTP: {
@@ -2551,7 +2602,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
         TimeSynchronization::Commands::SetDefaultNTP::Type request;
         request.defaultNTP = params.GetDefaultNTP().Value();
-        SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err     = SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SetDefaultNTP command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
     }
     case CommissioningStage::kScanNetworks: {
@@ -2561,7 +2619,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             request.ssid.Emplace(params.GetWiFiCredentials().Value().ssid);
         }
         request.breadcrumb.Emplace(breadcrumb);
-        SendCommand(proxy, request, OnScanNetworksResponse, OnScanNetworksFailure, endpoint, timeout);
+        CHIP_ERROR err = SendCommand(proxy, request, OnScanNetworksResponse, OnScanNetworksFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send ScanNetworks command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
     }
     case CommissioningStage::kNeedsNetworkCreds: {
@@ -2621,18 +2686,43 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         request.newRegulatoryConfig = regulatoryConfig;
         request.countryCode         = countryCode;
         request.breadcrumb          = breadcrumb;
-        SendCommand(proxy, request, OnSetRegulatoryConfigResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err              = SendCommand(proxy, request, OnSetRegulatoryConfigResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SetRegulatoryConfig command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
-    case CommissioningStage::kSendPAICertificateRequest:
+    case CommissioningStage::kSendPAICertificateRequest: {
         ChipLogProgress(Controller, "Sending request for PAI certificate");
-        SendCertificateChainRequestCommand(proxy, CertificateType::kPAI, timeout);
+        CHIP_ERROR err = SendCertificateChainRequestCommand(proxy, CertificateType::kPAI, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send CertificateChainRequest command to get PAI: %" CHIP_ERROR_FORMAT,
+                         err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
-    case CommissioningStage::kSendDACCertificateRequest:
+    }
+    case CommissioningStage::kSendDACCertificateRequest: {
         ChipLogProgress(Controller, "Sending request for DAC certificate");
-        SendCertificateChainRequestCommand(proxy, CertificateType::kDAC, timeout);
+        CHIP_ERROR err = SendCertificateChainRequestCommand(proxy, CertificateType::kDAC, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send CertificateChainRequest command to get DAC: %" CHIP_ERROR_FORMAT,
+                         err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
-    case CommissioningStage::kSendAttestationRequest:
+    }
+    case CommissioningStage::kSendAttestationRequest: {
         ChipLogProgress(Controller, "Sending Attestation Request to the device.");
         if (!params.GetAttestationNonce().HasValue())
         {
@@ -2640,8 +2730,16 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        SendAttestationRequestCommand(proxy, params.GetAttestationNonce().Value(), timeout);
+        CHIP_ERROR err = SendAttestationRequestCommand(proxy, params.GetAttestationNonce().Value(), timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send AttestationRequest command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
+    }
     case CommissioningStage::kAttestationVerification: {
         ChipLogProgress(Controller, "Verifying attestation");
         if (!params.GetAttestationElements().HasValue() || !params.GetAttestationSignature().HasValue() ||
@@ -2667,15 +2765,23 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
     }
     break;
-    case CommissioningStage::kSendOpCertSigningRequest:
+    case CommissioningStage::kSendOpCertSigningRequest: {
         if (!params.GetCSRNonce().HasValue())
         {
             ChipLogError(Controller, "No CSR nonce found");
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        SendOperationalCertificateSigningRequestCommand(proxy, params.GetCSRNonce().Value(), timeout);
+        CHIP_ERROR err = SendOperationalCertificateSigningRequestCommand(proxy, params.GetCSRNonce().Value(), timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send CSR request: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
+    }
     case CommissioningStage::kValidateCSR: {
         if (!params.GetNOCChainGenerationParameters().HasValue() || !params.GetDAC().HasValue() || !params.GetCSRNonce().HasValue())
         {
@@ -2691,6 +2797,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             ChipLogError(Controller, "Unable to validate CSR");
         }
         CommissioningStageComplete(err);
+        return;
     }
     break;
     case CommissioningStage::kGenerateNOCChain: {
@@ -2724,7 +2831,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         CHIP_ERROR err = SendTrustedRootCertificate(proxy, params.GetRootCert().Value(), timeout);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Controller, "Error sending trusted root certificate: %s", err.AsString());
+            ChipLogError(Controller, "Error sending trusted root certificate: %" CHIP_ERROR_FORMAT, err.Format());
             CommissioningStageComplete(err);
             return;
         }
@@ -2744,16 +2851,24 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
     }
     break;
-    case CommissioningStage::kSendNOC:
+    case CommissioningStage::kSendNOC: {
         if (!params.GetNoc().HasValue() || !params.GetIpk().HasValue() || !params.GetAdminSubject().HasValue())
         {
             ChipLogError(Controller, "AddNOC contents not specified");
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        SendOperationalCertificate(proxy, params.GetNoc().Value(), params.GetIcac(), params.GetIpk().Value(),
-                                   params.GetAdminSubject().Value(), timeout);
+        CHIP_ERROR err = SendOperationalCertificate(proxy, params.GetNoc().Value(), params.GetIcac(), params.GetIpk().Value(),
+                                                    params.GetAdminSubject().Value(), timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Error sending operational certificate: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
+    }
     case CommissioningStage::kConfigureTrustedTimeSource: {
         if (!params.GetTrustedTimeSource().HasValue())
         {
@@ -2763,7 +2878,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         }
         TimeSynchronization::Commands::SetTrustedTimeSource::Type request;
         request.trustedTimeSource = params.GetTrustedTimeSource().Value();
-        SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err            = SendCommand(proxy, request, OnBasicSuccess, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send SendTrustedTimeSource command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
         break;
     }
     case CommissioningStage::kWiFiNetworkSetup: {
@@ -2778,7 +2900,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         request.ssid        = params.GetWiFiCredentials().Value().ssid;
         request.credentials = params.GetWiFiCredentials().Value().credentials;
         request.breadcrumb.Emplace(breadcrumb);
-        SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err = SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send AddOrUpdateWiFiNetwork command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
     case CommissioningStage::kThreadNetworkSetup: {
@@ -2791,7 +2920,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type request;
         request.operationalDataset = params.GetThreadOperationalDataset().Value();
         request.breadcrumb.Emplace(breadcrumb);
-        SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err = SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send AddOrUpdateThreadNetwork command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
     case CommissioningStage::kFailsafeBeforeWiFiEnable:
@@ -2812,7 +2948,38 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         NetworkCommissioning::Commands::ConnectNetwork::Type request;
         request.networkID = params.GetWiFiCredentials().Value().ssid;
         request.breadcrumb.Emplace(breadcrumb);
-        SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
+
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo::Type supportsConcurrentConnection;
+        supportsConcurrentConnection = params.GetSupportsConcurrentConnection().Value();
+        ChipLogProgress(Controller, "SendCommand kWiFiNetworkEnable, supportsConcurrentConnection=%d",
+                        supportsConcurrentConnection);
+        if (supportsConcurrentConnection)
+        {
+            err = SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
+        }
+        else
+        {
+            // Concurrent Connections not allowed. Send the ConnectNetwork command but do not wait for the
+            // ConnectNetworkResponse on the Commissioning network as it will not be present. Log the expected timeout
+            // and run what would have been in the onConnectNetworkResponse callback.
+            err = SendCommand(proxy, request, NonConcurrentNetworkResponse, NonConcurrentTimeout, endpoint, NullOptional);
+            if (err == CHIP_NO_ERROR)
+            {
+                // As there will be no ConnectNetworkResponse, it is an implicit kSuccess so a default report is fine
+                CommissioningDelegate::CommissioningReport report;
+                CommissioningStageComplete(CHIP_NO_ERROR, report);
+                return;
+            }
+        }
+
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send WiFi ConnectNetwork command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
     case CommissioningStage::kThreadNetworkEnable: {
@@ -2829,7 +2996,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         NetworkCommissioning::Commands::ConnectNetwork::Type request;
         request.networkID = extendedPanId;
         request.breadcrumb.Emplace(breadcrumb);
-        SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err = SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send Thread ConnectNetwork command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
     case CommissioningStage::kFindOperational: {
@@ -2855,7 +3029,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
     break;
     case CommissioningStage::kSendComplete: {
         GeneralCommissioning::Commands::CommissioningComplete::Type request;
-        SendCommand(proxy, request, OnCommissioningCompleteResponse, OnBasicFailure, endpoint, timeout);
+        CHIP_ERROR err = SendCommand(proxy, request, OnCommissioningCompleteResponse, OnBasicFailure, endpoint, timeout);
+        if (err != CHIP_NO_ERROR)
+        {
+            // We won't get any async callbacks here, so just complete our stage.
+            ChipLogError(Controller, "Failed to send CommissioningComplete command: %" CHIP_ERROR_FORMAT, err.Format());
+            CommissioningStageComplete(err);
+            return;
+        }
     }
     break;
     case CommissioningStage::kCleanup:
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index 9d6a9d6f5a897c..2919096977f1ac 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/CASEClientPool.h>
 #include <app/CASESessionManager.h>
 #include <app/ClusterStateCache.h>
diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
index bb95f5eb8fe8f2..2919a026701bd0 100644
--- a/src/controller/CommissioningDelegate.h
+++ b/src/controller/CommissioningDelegate.h
@@ -35,7 +35,7 @@ enum CommissioningStage : uint8_t
     kError,
     kSecurePairing,              ///< Establish a PASE session with the device
     kReadCommissioningInfo,      ///< Query General Commissioning Attributes, Network Features and Time Synchronization Cluster
-    kReadCommissioningInfo2,     ///< Query ICD state, check for matching fabric
+    kReadCommissioningInfo2,     ///< Query SupportsConcurrentConnection, ICD state, check for matching fabric
     kArmFailsafe,                ///< Send ArmFailSafe (0x30:0) command to the device
     kConfigRegulatory,           ///< Send SetRegulatoryConfig (0x30:2) command to the device
     kConfigureUTCTime,           ///< SetUTCTime if the DUT has a time cluster
@@ -144,6 +144,10 @@ class CommissioningParameters
         return mDeviceRegulatoryLocation;
     }
 
+    // Value to determine whether the node supports Concurrent Connections as read from the GeneralCommissioning cluster.
+    // In the AutoCommissioner, this is automatically set from from the kReadCommissioningInfo2 stage.
+    Optional<bool> GetSupportsConcurrentConnection() const { return mSupportsConcurrentConnection; }
+
     // The country code to be used for the node, if set.
     Optional<CharSpan> GetCountryCode() const { return mCountryCode; }
 
@@ -305,6 +309,12 @@ class CommissioningParameters
         return *this;
     }
 
+    CommissioningParameters & SetSupportsConcurrentConnection(bool concurrentConnection)
+    {
+        mSupportsConcurrentConnection.SetValue(concurrentConnection);
+        return *this;
+    }
+
     // The lifetime of the buffer countryCode is pointing to should exceed the
     // lifetime of CommissioningParameters object.
     CommissioningParameters & SetCountryCode(CharSpan countryCode)
@@ -527,6 +537,7 @@ class CommissioningParameters
         mDAC.ClearValue();
         mTimeZone.ClearValue();
         mDSTOffsets.ClearValue();
+        mDefaultNTP.ClearValue();
     }
 
 private:
@@ -560,6 +571,7 @@ class CommissioningParameters
     Optional<uint16_t> mRemoteProductId;
     Optional<app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum> mDefaultRegulatoryLocation;
     Optional<app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum> mLocationCapability;
+    Optional<bool> mSupportsConcurrentConnection;
     CompletionStatus completionStatus;
     Credentials::DeviceAttestationDelegate * mDeviceAttestationDelegate =
         nullptr; // Delegate to handle device attestation failures during commissioning
@@ -652,9 +664,10 @@ struct ReadCommissioningInfo
 
 struct ReadCommissioningInfo2
 {
-    NodeId nodeId               = kUndefinedNodeId;
-    bool isIcd                  = false;
-    bool checkInProtocolSupport = false;
+    NodeId nodeId                     = kUndefinedNodeId;
+    bool isIcd                        = false;
+    bool checkInProtocolSupport       = false;
+    bool supportsConcurrentConnection = true;
 };
 
 struct TimeZoneResponseInfo
@@ -687,7 +700,7 @@ class CommissioningDelegate
 public:
     virtual ~CommissioningDelegate(){};
     /* CommissioningReport is returned after each commissioning step is completed. The reports for each step are:
-     * kReadCommissioningInfo - ReadCommissioningInfo
+     * kReadCommissioningInfo: ReadCommissioningInfo
      * kReadCommissioningInfo2: ReadCommissioningInfo2
      * kArmFailsafe: CommissioningErrorInfo if there is an error
      * kConfigRegulatory: CommissioningErrorInfo if there is an error
diff --git a/src/controller/CommissioningWindowOpener.cpp b/src/controller/CommissioningWindowOpener.cpp
index cfe0fe6bc03864..7cc4fbe0de5adf 100644
--- a/src/controller/CommissioningWindowOpener.cpp
+++ b/src/controller/CommissioningWindowOpener.cpp
@@ -126,7 +126,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(NodeId deviceId, S
 CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindowInternal(Messaging::ExchangeManager & exchangeMgr,
                                                                       const SessionHandle & sessionHandle)
 {
-    ChipLogProgress(Controller, "OpenCommissioningWindow for device ID %" PRIu64, mNodeId);
+    ChipLogProgress(Controller, "OpenCommissioningWindow for device ID 0x" ChipLogFormatX64, ChipLogValueX64(mNodeId));
 
     constexpr EndpointId kAdministratorCommissioningClusterEndpoint = 0;
 
diff --git a/src/controller/ExampleOperationalCredentialsIssuer.cpp b/src/controller/ExampleOperationalCredentialsIssuer.cpp
index 132f111a18c3e0..09a9a5a99bc9bb 100644
--- a/src/controller/ExampleOperationalCredentialsIssuer.cpp
+++ b/src/controller/ExampleOperationalCredentialsIssuer.cpp
@@ -348,8 +348,7 @@ CHIP_ERROR ExampleOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan
         ReturnErrorOnFailure(reader.Next());
     }
 
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == AnonymousTag(), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, AnonymousTag()));
 
     TLVType containerType;
     ReturnErrorOnFailure(reader.EnterContainer(containerType));
diff --git a/src/controller/ReadInteraction.h b/src/controller/ReadInteraction.h
index f6254f3df4cee4..8eae6613ddf10e 100644
--- a/src/controller/ReadInteraction.h
+++ b/src/controller/ReadInteraction.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/InteractionModelEngine.h>
 #include <app/ReadPrepareParams.h>
diff --git a/src/controller/TypedReadCallback.h b/src/controller/TypedReadCallback.h
index 7823ad312123b1..000b5d51d522ce 100644
--- a/src/controller/TypedReadCallback.h
+++ b/src/controller/TypedReadCallback.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AppBuildConfig.h>
+#include <app/AppConfig.h>
 #include <app/BufferedReadCallback.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/data-model/Decode.h>
diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
index f5044d61711df8..3d9d1723ad8f72 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -114,12 +114,18 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/DishwasherAlarmClient-ReadImpl.cpp",
       "jni/DishwasherModeClient-InvokeSubscribeImpl.cpp",
       "jni/DishwasherModeClient-ReadImpl.cpp",
+      "jni/MicrowaveOvenModeClient-InvokeSubscribeImpl.cpp",
+      "jni/MicrowaveOvenModeClient-ReadImpl.cpp",
+      "jni/MicrowaveOvenControlClient-InvokeSubscribeImpl.cpp",
+      "jni/MicrowaveOvenControlClient-ReadImpl.cpp",
       "jni/DoorLockClient-InvokeSubscribeImpl.cpp",
       "jni/DoorLockClient-ReadImpl.cpp",
       "jni/ElectricalMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/ElectricalMeasurementClient-ReadImpl.cpp",
       "jni/EthernetNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp",
       "jni/EthernetNetworkDiagnosticsClient-ReadImpl.cpp",
+      "jni/EnergyEvseClient-InvokeSubscribeImpl.cpp",
+      "jni/EnergyEvseClient-ReadImpl.cpp",
       "jni/FanControlClient-InvokeSubscribeImpl.cpp",
       "jni/FanControlClient-ReadImpl.cpp",
       "jni/FaultInjectionClient-InvokeSubscribeImpl.cpp",
@@ -176,10 +182,14 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/OperationalCredentialsClient-ReadImpl.cpp",
       "jni/OperationalStateClient-InvokeSubscribeImpl.cpp",
       "jni/OperationalStateClient-ReadImpl.cpp",
+      "jni/OvenCavityOperationalStateClient-InvokeSubscribeImpl.cpp",
+      "jni/OvenCavityOperationalStateClient-ReadImpl.cpp",
       "jni/OtaSoftwareUpdateProviderClient-InvokeSubscribeImpl.cpp",
       "jni/OtaSoftwareUpdateProviderClient-ReadImpl.cpp",
       "jni/OtaSoftwareUpdateRequestorClient-InvokeSubscribeImpl.cpp",
       "jni/OtaSoftwareUpdateRequestorClient-ReadImpl.cpp",
+      "jni/OvenModeClient-InvokeSubscribeImpl.cpp",
+      "jni/OvenModeClient-ReadImpl.cpp",
       "jni/OzoneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/OzoneConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/Pm10ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
@@ -244,6 +254,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/TimeFormatLocalizationClient-ReadImpl.cpp",
       "jni/TimeSynchronizationClient-InvokeSubscribeImpl.cpp",
       "jni/TimeSynchronizationClient-ReadImpl.cpp",
+      "jni/TimerClient-InvokeSubscribeImpl.cpp",
+      "jni/TimerClient-ReadImpl.cpp",
       "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/UnitLocalizationClient-InvokeSubscribeImpl.cpp",
@@ -256,6 +268,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/WakeOnLanClient-ReadImpl.cpp",
       "jni/LaundryWasherControlsClient-InvokeSubscribeImpl.cpp",
       "jni/LaundryWasherControlsClient-ReadImpl.cpp",
+      "jni/LaundryDryerControlsClient-InvokeSubscribeImpl.cpp",
+      "jni/LaundryDryerControlsClient-ReadImpl.cpp",
       "jni/WiFiNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp",
       "jni/WiFiNetworkDiagnosticsClient-ReadImpl.cpp",
       "jni/WindowCoveringClient-InvokeSubscribeImpl.cpp",
@@ -264,7 +278,7 @@ if (current_os == "android" || matter_enable_java_compilation) {
 
     deps = [
       ":data_model",
-      "${chip_root}/src/platform:platform_buildconfig",
+      "${chip_root}/src/platform:platform_config_header",
     ]
 
     public_configs = [ ":java-build-config" ]
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index ac1a41fba7c22c..dd84ac5f02f55b 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -3,6 +3,8 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
+  revision 4;
+
   enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
@@ -51,6 +53,8 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
+  revision 4;
+
   bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
@@ -126,6 +130,12 @@ client cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional client cluster Scenes = 5 {
+  revision 5;
+
+  bitmap CopyModeBitmap : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -133,8 +143,8 @@ provisional client cluster Scenes = 5 {
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : bitmap8 {
-    kCopyAllScenes = 0x1;
+  bitmap NameSupportBitmap : bitmap8 {
+    kSceneNames = 0x80;
   }
 
   struct AttributeValuePair {
@@ -147,14 +157,23 @@ provisional client cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  fabric_scoped struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    fabric_sensitive int8u currentScene = 1;
+    fabric_sensitive group_id currentGroup = 2;
+    fabric_sensitive boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute optional int8u sceneCount = 0;
+  readonly attribute optional int8u currentScene = 1;
+  readonly attribute optional group_id currentGroup = 2;
+  readonly attribute optional boolean sceneValid = 3;
+  readonly attribute NameSupportBitmap nameSupport = 4;
   readonly attribute optional nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -267,7 +286,7 @@ provisional client cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     int8u sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;
@@ -304,6 +323,8 @@ provisional client cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
+  revision 6;
+
   enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
@@ -328,6 +349,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -348,7 +370,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -373,6 +395,8 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for configuring On/Off switching devices. */
 client cluster OnOffSwitchConfiguration = 7 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute enum8 switchType = 0;
   attribute enum8 switchActions = 16;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -385,12 +409,14 @@ client cluster OnOffSwitchConfiguration = 7 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 client cluster LevelControl = 8 {
-  enum MoveMode : enum8 {
+  revision 5;
+
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -401,7 +427,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -413,7 +439,7 @@ client cluster LevelControl = 8 {
   readonly attribute optional int16u currentFrequency = 4;
   readonly attribute optional int16u minFrequency = 5;
   readonly attribute optional int16u maxFrequency = 6;
-  attribute LevelControlOptions options = 15;
+  attribute OptionsBitmap options = 15;
   attribute optional int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
   attribute optional nullable int16u onTransitionTime = 18;
@@ -430,55 +456,55 @@ client cluster LevelControl = 8 {
   request struct MoveToLevelRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToLevelWithOnOffRequest {
     int8u level = 0;
     nullable int16u transitionTime = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
+    MoveModeEnum moveMode = 0;
     nullable int8u rate = 1;
-    LevelControlOptions optionsMask = 2;
-    LevelControlOptions optionsOverride = 3;
+    OptionsBitmap optionsMask = 2;
+    OptionsBitmap optionsOverride = 3;
   }
 
   request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
+    StepModeEnum stepMode = 0;
     int8u stepSize = 1;
     nullable int16u transitionTime = 2;
-    LevelControlOptions optionsMask = 3;
-    LevelControlOptions optionsOverride = 4;
+    OptionsBitmap optionsMask = 3;
+    OptionsBitmap optionsOverride = 4;
   }
 
   request struct StopWithOnOffRequest {
-    LevelControlOptions optionsMask = 0;
-    LevelControlOptions optionsOverride = 1;
+    OptionsBitmap optionsMask = 0;
+    OptionsBitmap optionsOverride = 1;
   }
 
   request struct MoveToClosestFrequencyRequest {
@@ -508,6 +534,8 @@ client cluster LevelControl = 8 {
 
 /** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
 client cluster BinaryInputBasic = 15 {
+  revision 1; // NOTE: Default/not specifically set
+
   attribute optional char_string<16> activeText = 4;
   attribute optional char_string<16> description = 28;
   attribute optional char_string<16> inactiveText = 46;
@@ -527,6 +555,8 @@ client cluster BinaryInputBasic = 15 {
 
 /** Cluster to control pulse width modulation */
 provisional client cluster PulseWidthModulation = 28 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -537,6 +567,8 @@ provisional client cluster PulseWidthModulation = 28 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 client cluster Descriptor = 29 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
@@ -568,6 +600,8 @@ client cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 client cluster Binding = 30 {
+  revision 1; // NOTE: Default/not specifically set
+
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
     optional group_id group = 2;
@@ -590,6 +624,8 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
@@ -660,6 +696,8 @@ client cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 client cluster Actions = 37 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
@@ -837,6 +875,8 @@ client cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 client cluster BasicInformation = 40 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -916,6 +956,8 @@ client cluster BasicInformation = 40 {
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
+  readonly attribute int32u specificationVersion = 21;
+  readonly attribute int16u maxPathsPerInvoke = 22;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -928,6 +970,8 @@ client cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
@@ -1002,6 +1046,8 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 client cluster OtaSoftwareUpdateRequestor = 42 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
@@ -1081,7 +1127,9 @@ client cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 client cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1096,6 +1144,8 @@ client cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 client cluster TimeFormatLocalization = 44 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
@@ -1120,8 +1170,8 @@ client cluster TimeFormatLocalization = 44 {
     kCalendarFormat = 0x1;
   }
 
-  attribute HourFormatEnum hourFormat = 0;
-  attribute optional CalendarTypeEnum activeCalendarType = 1;
+  attribute access(write: manage) HourFormatEnum hourFormat = 0;
+  attribute access(write: manage) optional CalendarTypeEnum activeCalendarType = 1;
   readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1136,6 +1186,8 @@ client cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 client cluster UnitLocalization = 45 {
+  revision 1;
+
   enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
@@ -1146,7 +1198,7 @@ client cluster UnitLocalization = 45 {
     kTemperatureUnit = 0x1;
   }
 
-  attribute optional TempUnitEnum temperatureUnit = 0;
+  attribute access(write: manage) optional TempUnitEnum temperatureUnit = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1157,7 +1209,9 @@ client cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a Device's power system. */
 client cluster PowerSourceConfiguration = 46 {
-  readonly attribute int8u sources[] = 0;
+  revision 1;
+
+  readonly attribute endpoint_no sources[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1168,6 +1222,8 @@ client cluster PowerSourceConfiguration = 46 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 client cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
@@ -1425,6 +1481,8 @@ client cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
@@ -1463,12 +1521,12 @@ client cluster GeneralCommissioning = 48 {
 
   response struct ArmFailSafeResponse = 1 {
     CommissioningErrorEnum errorCode = 0;
-    char_string debugText = 1;
+    char_string<128> debugText = 1;
   }
 
   request struct SetRegulatoryConfigRequest {
     RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
-    char_string countryCode = 1;
+    char_string<2> countryCode = 1;
     int64u breadcrumb = 2;
   }
 
@@ -1492,6 +1550,8 @@ client cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 client cluster NetworkCommissioning = 49 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
@@ -1521,6 +1581,7 @@ client cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1537,11 +1598,14 @@ client cluster NetworkCommissioning = 49 {
     kWPAPersonal = 0x4;
     kWPA2Personal = 0x8;
     kWPA3Personal = 0x10;
+    kWPA3MatterPDC = 0x20;
   }
 
   struct NetworkInfoStruct {
     octet_string<32> networkID = 0;
     boolean connected = 1;
+    optional nullable octet_string<20> networkIdentifier = 2;
+    optional nullable octet_string<20> clientIdentifier = 3;
   }
 
   struct ThreadInterfaceScanResultStruct {
@@ -1598,6 +1662,9 @@ client cluster NetworkCommissioning = 49 {
     octet_string<32> ssid = 0;
     octet_string<64> credentials = 1;
     optional int64u breadcrumb = 2;
+    optional octet_string<140> networkIdentity = 3;
+    optional octet_string<20> clientIdentifier = 4;
+    optional octet_string<32> possessionNonce = 5;
   }
 
   request struct AddOrUpdateThreadNetworkRequest {
@@ -1614,6 +1681,8 @@ client cluster NetworkCommissioning = 49 {
     NetworkCommissioningStatusEnum networkingStatus = 0;
     optional char_string<512> debugText = 1;
     optional int8u networkIndex = 2;
+    optional octet_string<140> clientIdentity = 3;
+    optional octet_string<64> possessionSignature = 4;
   }
 
   request struct ConnectNetworkRequest {
@@ -1633,6 +1702,16 @@ client cluster NetworkCommissioning = 49 {
     optional int64u breadcrumb = 2;
   }
 
+  request struct QueryIdentityRequest {
+    OCTET_STRING<20> keyIdentifier = 0;
+    optional OCTET_STRING<32> possessionNonce = 1;
+  }
+
+  response struct QueryIdentityResponse = 10 {
+    OCTET_STRING<140> identity = 0;
+    optional OCTET_STRING<64> possessionSignature = 1;
+  }
+
   /** Detemine the set of networks the device sees as available. */
   command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
   /** Add or update the credentials for a given Wi-Fi network. */
@@ -1645,10 +1724,14 @@ client cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
   /** Modify the order in which networks will be presented in the Networks attribute. */
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  /** Retrieve details about and optionally proof of possession of a network client identity. */
+  command access(invoke: administer) QueryIdentity(QueryIdentityRequest): QueryIdentityResponse = 9;
 }
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 client cluster DiagnosticLogs = 50 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
@@ -1694,6 +1777,8 @@ client cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster GeneralDiagnostics = 51 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
@@ -1782,7 +1867,6 @@ client cluster GeneralDiagnostics = 51 {
   readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
   readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute optional int32u averageWearCount = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1795,12 +1879,21 @@ client cluster GeneralDiagnostics = 51 {
     int64u eventTrigger = 1;
   }
 
+  response struct TimeSnapshotResponse = 2 {
+    systime_us systemTimeUs = 0;
+    nullable epoch_us UTCTimeUs = 1;
+  }
+
   /** Provide a means for certification tests to trigger some test-plan-specific events */
   command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  /** Take a snapshot of system time and epoch time. */
+  command TimeSnapshot(): TimeSnapshotResponse = 1;
 }
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster SoftwareDiagnostics = 52 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kWatermarks = 0x1;
   }
@@ -1836,6 +1929,8 @@ client cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
@@ -1934,9 +2029,9 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute NeighborTableStruct neighborTable[] = 7;
   readonly attribute RouteTableStruct routeTable[] = 8;
   readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int16u weighting = 10;
+  readonly attribute nullable int16u dataVersion = 11;
+  readonly attribute nullable int16u stableDataVersion = 12;
   readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute optional int16u detachedRoleCount = 14;
   readonly attribute optional int16u childRoleCount = 15;
@@ -1995,11 +2090,13 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int16u clusterRevision = 65533;
 
   /** Reception of this command SHALL reset the OverrunCount attributes to 0 */
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster WiFiNetworkDiagnostics = 54 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
@@ -2041,7 +2138,7 @@ client cluster WiFiNetworkDiagnostics = 54 {
   }
 
   info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailure = 0;
+    AssociationFailureCauseEnum associationFailureCause = 0;
     int16u status = 1;
   }
 
@@ -2075,6 +2172,8 @@ client cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster EthernetNetworkDiagnostics = 55 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
@@ -2115,6 +2214,8 @@ client cluster EthernetNetworkDiagnostics = 55 {
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 client cluster TimeSynchronization = 56 {
+  revision 2;
+
   enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
@@ -2264,6 +2365,8 @@ client cluster TimeSynchronization = 56 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 client cluster BridgedDeviceBasicInformation = 57 {
+  revision 3;
+
   enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
@@ -2344,6 +2447,8 @@ client cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
@@ -2395,6 +2500,8 @@ client cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 client cluster AdministratorCommissioning = 60 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
@@ -2443,6 +2550,8 @@ client cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
@@ -2567,6 +2676,8 @@ client cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 client cluster GroupKeyManagement = 63 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
@@ -2644,6 +2755,8 @@ client cluster GroupKeyManagement = 63 {
 /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
 labels. */
 client cluster FixedLabel = 64 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2660,6 +2773,8 @@ client cluster FixedLabel = 64 {
 
 /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
 client cluster UserLabel = 65 {
+  revision 1; // NOTE: Default/not specifically set
+
   struct LabelStruct {
     char_string<16> label = 0;
     char_string<16> value = 1;
@@ -2676,6 +2791,8 @@ client cluster UserLabel = 65 {
 
 /** Cluster to control Proxy Configuration */
 client cluster ProxyConfiguration = 66 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2686,6 +2803,8 @@ client cluster ProxyConfiguration = 66 {
 
 /** Cluster to control Proxy Discovery */
 client cluster ProxyDiscovery = 67 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2696,6 +2815,8 @@ client cluster ProxyDiscovery = 67 {
 
 /** Cluster to control Proxy Valid */
 client cluster ProxyValid = 68 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2706,6 +2827,8 @@ client cluster ProxyValid = 68 {
 
 /** This cluster provides an interface to a boolean state called StateValue. */
 client cluster BooleanState = 69 {
+  revision 1;
+
   info event StateChange = 0 {
     boolean stateValue = 0;
   }
@@ -2721,6 +2844,8 @@ client cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 client cluster IcdManagement = 70 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
@@ -2784,16 +2909,213 @@ client cluster IcdManagement = 70 {
     optional octet_string<16> verificationKey = 1;
   }
 
+  response struct StayActiveResponse = 4 {
+    int32u promisedActiveDuration = 0;
+  }
+
   /** Register a client to the end device */
   fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
   /** Unregister a client from an end device */
   fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
   /** Request the end device to stay in Active Mode for an additional ActiveModeThreshold */
-  command access(invoke: manage) StayActiveRequest(): DefaultSuccess = 3;
+  command access(invoke: manage) StayActiveRequest(): StayActiveResponse = 3;
+}
+
+/** This cluster supports creating a simple timer functionality. */
+provisional client cluster Timer = 71 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum TimerStatusEnum : enum8 {
+    kRunning = 0;
+    kPaused = 1;
+    kExpired = 2;
+    kReady = 3;
+  }
+
+  bitmap Feature : bitmap32 {
+    kReset = 0x1;
+  }
+
+  readonly attribute elapsed_s setTime = 0;
+  readonly attribute elapsed_s timeRemaining = 1;
+  readonly attribute TimerStatusEnum timerState = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetTimerRequest {
+    elapsed_s newTime = 0;
+  }
+
+  request struct AddTimeRequest {
+    elapsed_s additionalTime = 0;
+  }
+
+  request struct ReduceTimeRequest {
+    elapsed_s timeReduction = 0;
+  }
+
+  /** This command is used to set the timer. */
+  command SetTimer(SetTimerRequest): DefaultSuccess = 0;
+  /** This command is used to reset the timer to the original value. */
+  command ResetTimer(): DefaultSuccess = 1;
+  /** This command is used to add time to the existing timer. */
+  command AddTime(AddTimeRequest): DefaultSuccess = 2;
+  /** This command is used to reduce time on the existing timer. */
+  command ReduceTime(ReduceTimeRequest): DefaultSuccess = 3;
+}
+
+/** This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven. */
+provisional client cluster OvenCavityOperationalState = 72 {
+  revision 1;
+
+  enum ErrorStateEnum : enum8 {
+    kNoError = 0;
+    kUnableToStartOrResume = 1;
+    kUnableToCompleteOperation = 2;
+    kCommandInvalidInState = 3;
+  }
+
+  enum OperationalStateEnum : enum8 {
+    kStopped = 0;
+    kRunning = 1;
+    kPaused = 2;
+    kError = 3;
+  }
+
+  struct ErrorStateStruct {
+    enum8 errorStateID = 0;
+    optional char_string<64> errorStateLabel = 1;
+    optional char_string<64> errorStateDetails = 2;
+  }
+
+  struct OperationalStateStruct {
+    enum8 operationalStateID = 0;
+    optional char_string<64> operationalStateLabel = 1;
+  }
+
+  critical event OperationalError = 0 {
+    ErrorStateStruct errorState = 0;
+  }
+
+  info event OperationCompletion = 1 {
+    enum8 completionErrorCode = 0;
+    optional nullable elapsed_s totalOperationalTime = 1;
+    optional nullable elapsed_s pausedTime = 2;
+  }
+
+  readonly attribute nullable char_string phaseList[] = 0;
+  readonly attribute nullable int8u currentPhase = 1;
+  readonly attribute optional nullable elapsed_s countdownTime = 2;
+  readonly attribute OperationalStateStruct operationalStateList[] = 3;
+  readonly attribute OperationalStateEnum operationalState = 4;
+  readonly attribute ErrorStateStruct operationalError = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  response struct OperationalCommandResponse = 4 {
+    ErrorStateStruct commandResponseState = 0;
+  }
+
+  /** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
+  command Pause(): OperationalCommandResponse = 0;
+  /** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
+  command Stop(): OperationalCommandResponse = 1;
+  /** Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started. */
+  command Start(): OperationalCommandResponse = 2;
+  /** Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press). */
+  command Resume(): OperationalCommandResponse = 3;
+}
+
+/** Attributes and commands for selecting a mode from a list of supported options. */
+provisional client cluster OvenMode = 73 {
+  revision 1;
+
+  enum ModeTag : enum16 {
+    kBake = 16384;
+    kConvection = 16385;
+    kGrill = 16386;
+    kRoast = 16387;
+    kClean = 16388;
+    kConvectionBake = 16389;
+    kConvectionRoast = 16390;
+    kWarming = 16391;
+    kProofing = 16392;
+  }
+
+  bitmap Feature : bitmap32 {
+    kOnOff = 0x1;
+  }
+
+  struct ModeTagStruct {
+    optional vendor_id mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<64> label = 0;
+    int8u mode = 1;
+    ModeTagStruct modeTags[] = 2;
+  }
+
+  readonly attribute ModeOptionStruct supportedModes[] = 0;
+  readonly attribute int8u currentMode = 1;
+  attribute optional nullable int8u startUpMode = 2;
+  attribute optional nullable int8u onMode = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeToModeRequest {
+    int8u newMode = 0;
+  }
+
+  response struct ChangeToModeResponse = 1 {
+    enum8 status = 0;
+    optional char_string statusText = 1;
+  }
+
+  /** This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
+  command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
+}
+
+/** This cluster supports remotely monitoring and controling the different typs of
+            functionality available to a drying device, such as a laundry dryer. */
+client cluster LaundryDryerControls = 74 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum DrynessLevelEnum : enum8 {
+    kLow = 0;
+    kNormal = 1;
+    kExtra = 2;
+    kMax = 3;
+  }
+
+  readonly attribute DrynessLevelEnum supportedDrynessLevels[] = 0;
+  attribute nullable DrynessLevelEnum selectedDrynessLevel = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
+  revision 2;
+
   bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
@@ -2832,6 +3154,8 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster LaundryWasherMode = 81 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kNormal = 16384;
     kDelicate = 16385;
@@ -2881,6 +3205,8 @@ client cluster LaundryWasherMode = 81 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kRapidCool = 16384;
     kRapidFreeze = 16385;
@@ -2928,6 +3254,8 @@ client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
 
 /** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
 client cluster LaundryWasherControls = 83 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum NumberOfRinsesEnum : enum8 {
     kNone = 0;
     kNormal = 1;
@@ -2954,6 +3282,8 @@ client cluster LaundryWasherControls = 83 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RvcRunMode = 84 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
@@ -3011,6 +3341,8 @@ client cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RvcCleanMode = 85 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
@@ -3062,6 +3394,8 @@ client cluster RvcCleanMode = 85 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 client cluster TemperatureControl = 86 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
@@ -3092,6 +3426,8 @@ client cluster TemperatureControl = 86 {
 
 /** Attributes and commands for configuring the Refrigerator alarm. */
 client cluster RefrigeratorAlarm = 87 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap AlarmMap : bitmap32 {
     kDoorOpen = 0x1;
   }
@@ -3116,6 +3452,8 @@ client cluster RefrigeratorAlarm = 87 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster DishwasherMode = 89 {
+  revision 2;
+
   enum ModeTag : enum16 {
     kNormal = 16384;
     kHeavy = 16385;
@@ -3164,6 +3502,8 @@ client cluster DishwasherMode = 89 {
 
 /** Attributes for reporting air quality classification */
 client cluster AirQuality = 91 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
@@ -3192,6 +3532,8 @@ client cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 client cluster SmokeCoAlarm = 92 {
+  revision 1;
+
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
@@ -3302,6 +3644,8 @@ client cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 client cluster DishwasherAlarm = 93 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap AlarmMap : bitmap32 {
     kInflowError = 0x1;
     kDrainError = 0x2;
@@ -3347,8 +3691,76 @@ client cluster DishwasherAlarm = 93 {
   command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
 }
 
+/** Attributes and commands for selecting a mode from a list of supported options. */
+provisional client cluster MicrowaveOvenMode = 94 {
+  revision 1;
+
+  enum ModeTag : enum16 {
+    kNormal = 16384;
+    kDefrost = 16385;
+  }
+
+  bitmap Feature : bitmap32 {
+    kOnOff = 0x1;
+  }
+
+  struct ModeTagStruct {
+    optional vendor_id mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<64> label = 0;
+    int8u mode = 1;
+    ModeTagStruct modeTags[] = 2;
+  }
+
+  readonly attribute ModeOptionStruct supportedModes[] = 0;
+  readonly attribute int8u currentMode = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */
+provisional client cluster MicrowaveOvenControl = 95 {
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute elapsed_s cookTime = 1;
+  readonly attribute int8u powerSetting = 2;
+  readonly attribute optional int8u minPower = 3;
+  readonly attribute optional int8u maxPower = 4;
+  readonly attribute optional int8u powerStep = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetCookingParametersRequest {
+    optional int8u cookMode = 0;
+    optional elapsed_s cookTime = 1;
+    optional int8u powerSetting = 2;
+  }
+
+  request struct AddMoreTimeRequest {
+    elapsed_s timeToAdd = 0;
+  }
+
+  /** Set Cooking Parameters */
+  command SetCookingParameters(SetCookingParametersRequest): DefaultSuccess = 0;
+  /** Add More Cooking Time */
+  command AddMoreTime(AddMoreTimeRequest): DefaultSuccess = 1;
+}
+
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 client cluster OperationalState = 96 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
@@ -3413,6 +3825,8 @@ client cluster OperationalState = 96 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 client cluster RvcOperationalState = 97 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
@@ -3480,6 +3894,8 @@ client cluster RvcOperationalState = 97 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 client cluster HepaFilterMonitoring = 113 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -3529,6 +3945,8 @@ client cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 client cluster ActivatedCarbonFilterMonitoring = 114 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
@@ -3576,8 +3994,498 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
   command ResetCondition(): DefaultSuccess = 0;
 }
 
+/** This cluster is used to configure a boolean sensor. */
+provisional client cluster BooleanSensorConfiguration = 128 {
+  revision 1;
+
+  enum SensitivityEnum : enum8 {
+    kHigh = 0;
+    kStandard = 1;
+    kLow = 2;
+  }
+
+  bitmap AlarmModeBitmap : bitmap8 {
+    kVisual = 0x1;
+    kAudible = 0x2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kVisual = 0x1;
+    kAudible = 0x2;
+    kAlarmSuppress = 0x4;
+    kSensitivityLevel = 0x8;
+  }
+
+  info event AlarmsStateChanged = 0 {
+    AlarmModeBitmap alarmsActive = 0;
+    optional AlarmModeBitmap alarmsSuppressed = 1;
+  }
+
+  info event SensorFault = 1 {
+  }
+
+  attribute optional SensitivityEnum sensitivityLevel = 0;
+  readonly attribute optional AlarmModeBitmap alarmsActive = 1;
+  readonly attribute optional AlarmModeBitmap alarmsSuppressed = 2;
+  attribute optional AlarmModeBitmap alarmsEnabled = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SuppressRequestRequest {
+    AlarmModeBitmap alarmsToSuppress = 0;
+  }
+
+  /** This command is used to suppress the specified alarm. */
+  command SuppressRequest(SuppressRequestRequest): DefaultSuccess = 0;
+}
+
+/** This cluster is used to configure a valve. */
+provisional client cluster ValveConfigurationAndControl = 129 {
+  revision 1;
+
+  enum ValveStateEnum : enum8 {
+    kOpen = 0;
+    kClosed = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kTimeSync = 0x1;
+    kLevel = 0x2;
+  }
+
+  bitmap ValveFaultBitmap : bitmap16 {
+    kGeneralFault = 0x1;
+    kBlocked = 0x2;
+    kLeaking = 0x4;
+  }
+
+  info event ValveStateChanged = 0 {
+    ValveStateEnum valveState = 0;
+  }
+
+  info event ValveFault = 1 {
+    ValveFaultBitmap valveFault = 0;
+  }
+
+  attribute access(write: manage) nullable elapsed_s openDuration = 0;
+  readonly attribute optional nullable epoch_us autoCloseTime = 1;
+  readonly attribute optional nullable elapsed_s remainingDuration = 2;
+  readonly attribute nullable ValveStateEnum currentState = 3;
+  readonly attribute nullable ValveStateEnum targetState = 4;
+  attribute access(write: manage) optional ValveStateEnum startUpState = 5;
+  readonly attribute optional nullable percent currentLevel = 6;
+  readonly attribute optional nullable percent targetLevel = 7;
+  attribute access(write: manage) optional nullable percent openLevel = 8;
+  readonly attribute optional ValveFaultBitmap valveFault = 9;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenRequest {
+    optional elapsed_s openDuration = 0;
+  }
+
+  request struct SetLevelRequest {
+    percent level = 0;
+    optional elapsed_s openDuration = 1;
+  }
+
+  /** This command is used to set the valve to its fully open position. */
+  command Open(OpenRequest): DefaultSuccess = 0;
+  /** This command is used to set the valve to its fully closed position. */
+  command Close(): DefaultSuccess = 1;
+  /** This command is used to set the valve to a specific level. */
+  command SetLevel(SetLevelRequest): DefaultSuccess = 2;
+}
+
+/** This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control. */
+provisional client cluster DemandResponseLoadControl = 150 {
+  revision 4;
+
+  enum CriticalityLevelEnum : enum8 {
+    kUnknown = 0;
+    kGreen = 1;
+    kLevel1 = 2;
+    kLevel2 = 3;
+    kLevel3 = 4;
+    kLevel4 = 5;
+    kLevel5 = 6;
+    kEmergency = 7;
+    kPlannedOutage = 8;
+    kServiceDisconnect = 9;
+  }
+
+  enum HeatingSourceEnum : enum8 {
+    kAny = 0;
+    kElectric = 1;
+    kNonElectric = 2;
+  }
+
+  enum LoadControlEventChangeSourceEnum : enum8 {
+    kAutomatic = 0;
+    kUserAction = 1;
+  }
+
+  enum LoadControlEventStatusEnum : enum8 {
+    kUnknown = 0;
+    kReceived = 1;
+    kInProgress = 2;
+    kCompleted = 3;
+    kOptedOut = 4;
+    kOptedIn = 5;
+    kCanceled = 6;
+    kSuperseded = 7;
+    kPartialOptedOut = 8;
+    kPartialOptedIn = 9;
+    kNoParticipation = 10;
+    kUnavailable = 11;
+    kFailed = 12;
+  }
+
+  bitmap CancelControlBitmap : bitmap16 {
+    kRandomEnd = 0x1;
+  }
+
+  bitmap DeviceClassBitmap : bitmap32 {
+    kHVAC = 0x1;
+    kStripHeater = 0x2;
+    kWaterHeater = 0x4;
+    kPoolPump = 0x8;
+    kSmartAppliance = 0x10;
+    kIrrigationPump = 0x20;
+    kCommercialLoad = 0x40;
+    kResidentialLoad = 0x80;
+    kExteriorLighting = 0x100;
+    kInteriorLighting = 0x200;
+    kEV = 0x400;
+    kGenerationSystem = 0x800;
+    kSmartInverter = 0x1000;
+    kEVSE = 0x2000;
+    kRESU = 0x4000;
+    kEMS = 0x8000;
+    kSEM = 0x10000;
+  }
+
+  bitmap EventControlBitmap : bitmap16 {
+    kRandomStart = 0x1;
+  }
+
+  bitmap EventTransitionControlBitmap : bitmap16 {
+    kRandomDuration = 0x1;
+    kIgnoreOptOut = 0x2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kEnrollmentGroups = 0x1;
+    kTemperatureOffset = 0x2;
+    kTemperatureSetpoint = 0x4;
+    kLoadAdjustment = 0x8;
+    kDutyCycle = 0x10;
+    kPowerSavings = 0x20;
+    kHeatingSource = 0x40;
+  }
+
+  struct HeatingSourceControlStruct {
+    HeatingSourceEnum heatingSource = 0;
+  }
+
+  struct PowerSavingsControlStruct {
+    percent powerSavings = 0;
+  }
+
+  struct DutyCycleControlStruct {
+    percent dutyCycle = 0;
+  }
+
+  struct AverageLoadControlStruct {
+    int8s loadAdjustment = 0;
+  }
+
+  struct TemperatureControlStruct {
+    optional nullable int16u coolingTempOffset = 0;
+    optional nullable int16u heatingtTempOffset = 1;
+    optional nullable temperature coolingTempSetpoint = 2;
+    optional nullable temperature heatingTempSetpoint = 3;
+  }
+
+  struct LoadControlEventTransitionStruct {
+    int16u duration = 0;
+    EventTransitionControlBitmap control = 1;
+    optional TemperatureControlStruct temperatureControl = 2;
+    optional AverageLoadControlStruct averageLoadControl = 3;
+    optional DutyCycleControlStruct dutyCycleControl = 4;
+    optional PowerSavingsControlStruct powerSavingsControl = 5;
+    optional HeatingSourceControlStruct heatingSourceControl = 6;
+  }
+
+  struct LoadControlEventStruct {
+    octet_string<16> eventID = 0;
+    nullable octet_string<16> programID = 1;
+    EventControlBitmap control = 2;
+    DeviceClassBitmap deviceClass = 3;
+    optional int8u enrollmentGroup = 4;
+    CriticalityLevelEnum criticality = 5;
+    nullable epoch_s startTime = 6;
+    LoadControlEventTransitionStruct transitions[] = 7;
+  }
+
+  struct LoadControlProgramStruct {
+    octet_string<16> programID = 0;
+    long_char_string<32> name = 1;
+    nullable int8u enrollmentGroup = 2;
+    nullable int8u randomStartMinutes = 3;
+    nullable int8u randomDurationMinutes = 4;
+  }
+
+  info event LoadControlEventStatusChange = 0 {
+    octet_string eventID = 0;
+    nullable int8u transitionIndex = 1;
+    LoadControlEventStatusEnum status = 2;
+    CriticalityLevelEnum criticality = 3;
+    EventControlBitmap control = 4;
+    optional nullable TemperatureControlStruct temperatureControl = 5;
+    optional nullable AverageLoadControlStruct averageLoadControl = 6;
+    optional nullable DutyCycleControlStruct dutyCycleControl = 7;
+    optional nullable PowerSavingsControlStruct powerSavingsControl = 8;
+    optional nullable HeatingSourceControlStruct heatingSourceControl = 9;
+  }
+
+  readonly attribute LoadControlProgramStruct loadControlPrograms[] = 0;
+  readonly attribute int8u numberOfLoadControlPrograms = 1;
+  readonly attribute LoadControlEventStruct events[] = 2;
+  readonly attribute LoadControlEventStruct activeEvents[] = 3;
+  readonly attribute int8u numberOfEventsPerProgram = 4;
+  readonly attribute int8u numberOfTransitions = 5;
+  attribute access(write: manage) int8u defaultRandomStart = 6;
+  attribute access(write: manage) int8u defaultRandomDuration = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RegisterLoadControlProgramRequestRequest {
+    LoadControlProgramStruct loadControlProgram = 0;
+  }
+
+  request struct UnregisterLoadControlProgramRequestRequest {
+    octet_string<16> loadControlProgramID = 0;
+  }
+
+  request struct AddLoadControlEventRequestRequest {
+    LoadControlEventStruct event = 0;
+  }
+
+  request struct RemoveLoadControlEventRequestRequest {
+    octet_string<16> eventID = 0;
+    CancelControlBitmap cancelControl = 1;
+  }
+
+  /** Upon receipt, this SHALL insert a new LoadControlProgramStruct into LoadControlPrograms, or if the ProgramID matches an existing LoadControlProgramStruct, then the provider SHALL be updated with the provided values. */
+  command RegisterLoadControlProgramRequest(RegisterLoadControlProgramRequestRequest): DefaultSuccess = 0;
+  /** Upon receipt, this SHALL remove a the LoadControlProgramStruct from LoadControlPrograms with the matching ProgramID. */
+  command UnregisterLoadControlProgramRequest(UnregisterLoadControlProgramRequestRequest): DefaultSuccess = 1;
+  /** On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event. */
+  command AddLoadControlEventRequest(AddLoadControlEventRequestRequest): DefaultSuccess = 2;
+  /** Upon receipt, this SHALL remove the LoadControlEventStruct with the matching EventID from LoadEventPrograms. */
+  command RemoveLoadControlEventRequest(RemoveLoadControlEventRequestRequest): DefaultSuccess = 3;
+  /** Upon receipt, this SHALL clear all the load control events. */
+  command ClearLoadControlEventsRequest(): DefaultSuccess = 4;
+}
+
+/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
+provisional client cluster EnergyEvse = 153 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum EnergyTransferStoppedReasonEnum : enum8 {
+    kEVStopped = 0;
+    kEVSEStopped = 1;
+    kOther = 2;
+  }
+
+  enum FaultStateEnum : enum8 {
+    kNoError = 0;
+    kMeterFailure = 1;
+    kOverVoltage = 2;
+    kUnderVoltage = 3;
+    kOverCurrent = 4;
+    kContactWetFailure = 5;
+    kContactDryFailure = 6;
+    kGroundFault = 7;
+    kPowerLoss = 8;
+    kPowerQuality = 9;
+    kPilotShortCircuit = 10;
+    kEmergencyStop = 11;
+    kEVDisconnected = 12;
+    kWrongPowerSupply = 13;
+    kLiveNeutralSwap = 14;
+    kOverTemperature = 15;
+    kOther = 255;
+  }
+
+  enum StateEnum : enum8 {
+    kNotPluggedIn = 0;
+    kPluggedInNoDemand = 1;
+    kPluggedInDemand = 2;
+    kPluggedInCharging = 3;
+    kPluggedInDischarging = 4;
+    kSessionEnding = 5;
+    kFault = 6;
+  }
+
+  enum SupplyStateEnum : enum8 {
+    kDisabled = 0;
+    kChargingEnabled = 1;
+    kDischargingEnabled = 2;
+    kDisabledError = 3;
+    kDisabledDiagnostics = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kChargingPreferences = 0x1;
+    kSoCReporting = 0x2;
+    kPlugAndCharge = 0x4;
+    kRFID = 0x8;
+    kV2X = 0x10;
+  }
+
+  bitmap TargetDayOfWeekBitmap : bitmap8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
+
+  struct ChargingTargetStruct {
+    int16u targetTime = 0;
+    optional percent targetSoC = 1;
+    optional int64s addedEnergy = 2;
+  }
+
+  info event EVConnected = 0 {
+    int32u sessionID = 0;
+  }
+
+  info event EVNotDetected = 1 {
+    int32u sessionID = 0;
+    StateEnum state = 1;
+    elapsed_s sessionDuration = 2;
+    int64s sessionEnergyCharged = 3;
+    optional int64s sessionEnergyDischarged = 4;
+  }
+
+  info event EnergyTransferStarted = 2 {
+    int32u sessionID = 0;
+    StateEnum state = 1;
+    int64s maximumCurrent = 2;
+  }
+
+  info event EnergyTransferStopped = 3 {
+    int32u sessionID = 0;
+    StateEnum state = 1;
+    EnergyTransferStoppedReasonEnum reason = 2;
+    int64s energyTransferred = 4;
+  }
+
+  critical event Fault = 4 {
+    int32u sessionID = 0;
+    StateEnum state = 1;
+    FaultStateEnum faultStatePreviousState = 2;
+    FaultStateEnum faultStateCurrentState = 4;
+  }
+
+  info event RFID = 5 {
+    octet_string uid = 0;
+  }
+
+  readonly attribute nullable StateEnum state = 0;
+  readonly attribute SupplyStateEnum supplyState = 1;
+  readonly attribute FaultStateEnum faultState = 2;
+  readonly attribute nullable epoch_s chargingEnabledUntil = 3;
+  readonly attribute optional nullable epoch_s dischargingEnabledUntil = 4;
+  readonly attribute int64s circuitCapacity = 5;
+  readonly attribute int64s minimumChargeCurrent = 6;
+  readonly attribute int64s maximumChargeCurrent = 7;
+  readonly attribute optional int64s maximumDischargeCurrent = 8;
+  attribute access(write: manage) optional int64s userMaximumChargeCurrent = 9;
+  attribute access(write: manage) optional elapsed_s randomizationDelayWindow = 10;
+  readonly attribute optional int8u numberOfWeeklyTargets = 33;
+  readonly attribute optional int8u numberOfDailyTargets = 34;
+  readonly attribute optional nullable epoch_s nextChargeStartTime = 35;
+  readonly attribute optional nullable epoch_s nextChargeTargetTime = 36;
+  readonly attribute optional nullable int64s nextChargeRequiredEnergy = 37;
+  readonly attribute optional nullable percent nextChargeTargetSoC = 38;
+  attribute access(write: manage) optional nullable int16u approximateEVEfficiency = 39;
+  readonly attribute optional nullable percent stateOfCharge = 48;
+  readonly attribute optional nullable int64s batteryCapacity = 49;
+  readonly attribute optional nullable char_string<32> vehicleID = 50;
+  readonly attribute nullable int32u sessionID = 64;
+  readonly attribute elapsed_s sessionDuration = 65;
+  readonly attribute int64s sessionEnergyCharged = 66;
+  readonly attribute optional int64s sessionEnergyDischarged = 67;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  response struct GetTargetsResponse = 0 {
+    TargetDayOfWeekBitmap dayOfWeekforSequence = 0;
+    ChargingTargetStruct chargingTargets[] = 1;
+  }
+
+  request struct EnableChargingRequest {
+    nullable epoch_s chargingEnabledUntil = 0;
+    int64s minimumChargeCurrent = 1;
+    int64s maximumChargeCurrent = 2;
+  }
+
+  request struct EnableDischargingRequest {
+    nullable epoch_s dischargingEnabledUntil = 0;
+    int64s maximumDischargeCurrent = 1;
+  }
+
+  request struct SetTargetsRequest {
+    TargetDayOfWeekBitmap dayOfWeekforSequence = 0;
+    ChargingTargetStruct chargingTargets[] = 1;
+  }
+
+  request struct GetTargetsRequest {
+    TargetDayOfWeekBitmap daysToReturn = 0;
+  }
+
+  /** Allows a client to disable the EVSE from charging and discharging. */
+  timed command Disable(): DefaultSuccess = 1;
+  /** Allows a client to enable the EVSE to charge an EV. */
+  timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
+  /** Allows a client to enable the EVSE to discharge an EV. */
+  timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
+  /** Allows a client to put the EVSE into a self-diagnostics mode. */
+  timed command StartDiagnostics(): DefaultSuccess = 4;
+  /** Allows a client to set the user specified charging targets. */
+  timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
+  /** Allows a client to retrieve the user specified charging targets. */
+  timed command GetTargets(GetTargetsRequest): GetTargetsResponse = 6;
+  /** Allows a client to clear all stored charging targets. */
+  timed command ClearTargets(): DefaultSuccess = 7;
+}
+
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
+  revision 7;
+
   enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
@@ -4198,6 +5106,8 @@ client cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 client cluster WindowCovering = 258 {
+  revision 5;
+
   enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
@@ -4349,6 +5259,8 @@ client cluster WindowCovering = 258 {
 
 /** This cluster provides control of a barrier (garage door). */
 client cluster BarrierControl = 259 {
+  revision 1; // NOTE: Default/not specifically set
+
   bitmap BarrierControlCapabilities : bitmap8 {
     kPartialBarrier = 0x1;
   }
@@ -4389,6 +5301,8 @@ client cluster BarrierControl = 259 {
 
 /** An interface for configuring and controlling pumps. */
 client cluster PumpConfigurationAndControl = 512 {
+  revision 3;
+
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
@@ -4511,6 +5425,8 @@ client cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
+  revision 6;
+
   enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
@@ -4668,6 +5584,8 @@ client cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional client cluster FanControl = 514 {
+  revision 4;
+
   enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
@@ -4688,8 +5606,8 @@ provisional client cluster FanControl = 514 {
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
     kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+    kOffHighAuto = 4;
+    kOffHigh = 5;
   }
 
   enum StepDirectionEnum : enum8 {
@@ -4718,7 +5636,7 @@ provisional client cluster FanControl = 514 {
   }
 
   attribute FanModeEnum fanMode = 0;
-  attribute FanModeSequenceEnum fanModeSequence = 1;
+  readonly attribute FanModeSequenceEnum fanModeSequence = 1;
   attribute nullable percent percentSetting = 2;
   readonly attribute percent percentCurrent = 3;
   readonly attribute optional int8u speedMax = 4;
@@ -4748,9 +5666,30 @@ provisional client cluster FanControl = 514 {
 
 /** An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). */
 client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) optional enum8 scheduleProgrammingVisibility = 2;
+  revision 2;
+
+  enum KeypadLockoutEnum : enum8 {
+    kNoLockout = 0;
+    kLockout1 = 1;
+    kLockout2 = 2;
+    kLockout3 = 3;
+    kLockout4 = 4;
+    kLockout5 = 5;
+  }
+
+  enum ScheduleProgrammingVisibilityEnum : enum8 {
+    kScheduleProgrammingPermitted = 0;
+    kScheduleProgrammingDenied = 1;
+  }
+
+  enum TemperatureDisplayModeEnum : enum8 {
+    kCelsius = 0;
+    kFahrenheit = 1;
+  }
+
+  attribute TemperatureDisplayModeEnum temperatureDisplayMode = 0;
+  attribute access(write: manage) KeypadLockoutEnum keypadLockout = 1;
+  attribute access(write: manage) optional ScheduleProgrammingVisibilityEnum scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4761,6 +5700,8 @@ client cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
+  revision 6;
+
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
@@ -5079,6 +6020,8 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional client cluster BallastConfiguration = 769 {
+  revision 4;
+
   bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
@@ -5112,6 +6055,8 @@ provisional client cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 client cluster IlluminanceMeasurement = 1024 {
+  revision 3;
+
   enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
@@ -5132,9 +6077,11 @@ client cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute optional int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -5146,6 +6093,8 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 client cluster PressureMeasurement = 1027 {
+  revision 3;
+
   bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
@@ -5169,6 +6118,8 @@ client cluster PressureMeasurement = 1027 {
 
 /** Attributes and commands for configuring the measurement of flow, and reporting flow measurements. */
 client cluster FlowMeasurement = 1028 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5183,6 +6134,8 @@ client cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
 client cluster RelativeHumidityMeasurement = 1029 {
+  revision 3;
+
   readonly attribute nullable int16u measuredValue = 0;
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
@@ -5197,6 +6150,8 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
+  revision 3;
+
   enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
@@ -5236,6 +6191,8 @@ client cluster OccupancySensing = 1030 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5291,6 +6248,8 @@ client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 client cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5346,6 +6305,8 @@ client cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5401,6 +6362,8 @@ client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 client cluster OzoneConcentrationMeasurement = 1045 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5456,6 +6419,8 @@ client cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 client cluster Pm25ConcentrationMeasurement = 1066 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5511,6 +6476,8 @@ client cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 client cluster FormaldehydeConcentrationMeasurement = 1067 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5566,6 +6533,8 @@ client cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 client cluster Pm1ConcentrationMeasurement = 1068 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5621,6 +6590,8 @@ client cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 client cluster Pm10ConcentrationMeasurement = 1069 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5676,6 +6647,8 @@ client cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5731,6 +6704,8 @@ client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 client cluster RadonConcentrationMeasurement = 1071 {
+  revision 3;
+
   enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
@@ -5786,7 +6761,10 @@ client cluster RadonConcentrationMeasurement = 1071 {
 
 /** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
 client cluster WakeOnLan = 1283 {
-  readonly attribute optional char_string<32> MACAddress = 0;
+  revision 1; // NOTE: Default/not specifically set
+
+  readonly attribute optional char_string<12> MACAddress = 0;
+  readonly attribute optional octet_string<16> linkLocalAddress = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5797,16 +6775,18 @@ client cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : enum8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
@@ -5842,7 +6822,7 @@ client cluster Channel = 1284 {
   }
 
   response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5865,7 +6845,9 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
 client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5873,7 +6855,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5891,7 +6873,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5901,14 +6883,7 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : enum8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
@@ -5917,6 +6892,15 @@ client cluster MediaPlayback = 1286 {
     kBuffering = 3;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
   bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
@@ -5950,7 +6934,7 @@ client cluster MediaPlayback = 1286 {
   }
 
   response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5984,6 +6968,8 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
@@ -6040,6 +7026,8 @@ client cluster MediaInput = 1287 {
 
 /** This cluster provides an interface for managing low power mode on a device. */
 client cluster LowPower = 1288 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6053,7 +7041,9 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum CECKeyCodeEnum : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -6142,7 +7132,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -6162,11 +7152,11 @@ client cluster KeypadInput = 1289 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+    CECKeyCodeEnum keyCode = 0;
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -6175,11 +7165,7 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : enum8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
+  revision 1; // NOTE: Default/not specifically set
 
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
@@ -6203,12 +7189,18 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kURLNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
   bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : bitmap32 {
+  bitmap SupportedProtocolsBitmap : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6220,13 +7212,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct AdditionalInfoStruct {
-    char_string name = 0;
-    char_string value = 1;
+    char_string<256> name = 0;
+    char_string<8192> value = 1;
   }
 
   struct ParameterStruct {
     ParameterEnum type = 0;
-    char_string value = 1;
+    char_string<1024> value = 1;
     optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
@@ -6235,13 +7227,13 @@ client cluster ContentLauncher = 1290 {
   }
 
   struct StyleInformationStruct {
-    optional char_string imageURL = 0;
-    optional char_string color = 1;
+    optional char_string<8192> imageURL = 0;
+    optional char_string<9> color = 1;
     optional DimensionStruct size = 2;
   }
 
   struct BrandingInformationStruct {
-    char_string providerName = 0;
+    char_string<256> providerName = 0;
     optional StyleInformationStruct background = 1;
     optional StyleInformationStruct logo = 2;
     optional StyleInformationStruct progressBar = 3;
@@ -6250,7 +7242,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   readonly attribute optional char_string acceptHeader[] = 0;
-  attribute optional bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute optional SupportedProtocolsBitmap supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6271,7 +7263,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6283,6 +7275,8 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
@@ -6328,7 +7322,9 @@ client cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : enum8 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
@@ -6349,7 +7345,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   readonly attribute optional int16u catalogList[] = 0;
-  attribute optional nullable ApplicationEPStruct currentApp = 1;
+  readonly attribute optional nullable ApplicationEPStruct currentApp = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6371,7 +7367,7 @@ client cluster ApplicationLauncher = 1292 {
   }
 
   response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
+    StatusEnum status = 0;
     optional octet_string data = 1;
   }
 
@@ -6385,6 +7381,8 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
@@ -6415,6 +7413,8 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
 client cluster AccountLogin = 1294 {
+  revision 1; // NOTE: Default/not specifically set
+
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6436,15 +7436,17 @@ client cluster AccountLogin = 1294 {
   }
 
   /** Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. */
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  fabric timed command access(invoke: administer) GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
   /** Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. */
-  timed command Login(LoginRequest): DefaultSuccess = 2;
+  fabric timed command access(invoke: administer) Login(LoginRequest): DefaultSuccess = 2;
   /** The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. */
-  timed command Logout(): DefaultSuccess = 3;
+  fabric timed command Logout(): DefaultSuccess = 3;
 }
 
 /** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
 client cluster ElectricalMeasurement = 2820 {
+  revision 3;
+
   readonly attribute optional bitmap32 measurementType = 0;
   readonly attribute optional int16s dcVoltage = 256;
   readonly attribute optional int16s dcVoltageMin = 257;
@@ -6610,6 +7612,8 @@ client cluster ElectricalMeasurement = 2820 {
 
 /** The Test Cluster is meant to validate the generated code */
 internal client cluster UnitTesting = 4294048773 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -7056,6 +8060,8 @@ internal client cluster UnitTesting = 4294048773 {
 
 /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */
 internal client cluster FaultInjection = 4294048774 {
+  revision 1; // NOTE: Default/not specifically set
+
   enum FaultType : enum8 {
     kUnspecified = 0;
     kSystemFault = 1;
@@ -7093,6 +8099,8 @@ internal client cluster FaultInjection = 4294048774 {
 
 /** The Sample MEI cluster showcases a cluster manufacturer extensions */
 client cluster SampleMei = 4294048800 {
+  revision 1; // NOTE: Default/not specifically set
+
   attribute boolean flipFlop = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 69823c343442e1..27f884a5ed8e9d 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1946,6 +1946,75 @@
               "source": "client",
               "isIncoming": 0,
               "isEnabled": 1
+            },
+            {
+              "name": "StayActiveResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Timer",
+          "code": 71,
+          "mfgCode": null,
+          "define": "TIMER_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "SetTimer",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTime",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -1983,6 +2052,151 @@
             }
           ]
         },
+        {
+          "name": "Oven Cavity Operational State",
+          "code": 72,
+          "mfgCode": null,
+          "define": "OPERATIONAL_STATE_OVEN_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Oven Mode",
+          "code": 73,
+          "mfgCode": null,
+          "define": "OVEN_MODE_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "ChangeToMode",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ChangeToModeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Laundry Dryer Controls",
+          "code": 74,
+          "mfgCode": null,
+          "define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Mode Select",
           "code": 80,
@@ -2601,6 +2815,49 @@
             }
           ]
         },
+        {
+          "name": "Microwave Oven Mode",
+          "code": 94,
+          "mfgCode": null,
+          "define": "MICROWAVE_OVEN_MODE_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Operational State",
           "code": 96,
@@ -2811,6 +3068,67 @@
             }
           ]
         },
+        {
+          "name": "Energy EVSE",
+          "code": 153,
+          "mfgCode": null,
+          "define": "ENERGY_EVSE_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "Disable",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "EnableCharging",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Door Lock",
           "code": 257,
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
index 93344a5e1bc7eb..fd6b043beacb34 100644
--- a/src/controller/java/AndroidCallbacks.cpp
+++ b/src/controller/java/AndroidCallbacks.cpp
@@ -197,14 +197,25 @@ void ReportCallback::OnReportBegin()
 
 void ReportCallback::OnDeallocatePaths(app::ReadPrepareParams && aReadPrepareParams)
 {
-    if (aReadPrepareParams.mpAttributePathParamsList != nullptr)
+    if (aReadPrepareParams.mpAttributePathParamsList != nullptr && aReadPrepareParams.mAttributePathParamsListSize != 0)
     {
         delete[] aReadPrepareParams.mpAttributePathParamsList;
+        aReadPrepareParams.mpAttributePathParamsList    = nullptr;
+        aReadPrepareParams.mAttributePathParamsListSize = 0;
     }
 
-    if (aReadPrepareParams.mpEventPathParamsList != nullptr)
+    if (aReadPrepareParams.mpEventPathParamsList != nullptr && aReadPrepareParams.mEventPathParamsListSize != 0)
     {
         delete[] aReadPrepareParams.mpEventPathParamsList;
+        aReadPrepareParams.mpEventPathParamsList    = nullptr;
+        aReadPrepareParams.mEventPathParamsListSize = 0;
+    }
+
+    if (aReadPrepareParams.mpDataVersionFilterList != nullptr && aReadPrepareParams.mDataVersionFilterListSize != 0)
+    {
+        delete[] aReadPrepareParams.mpDataVersionFilterList;
+        aReadPrepareParams.mpDataVersionFilterList    = nullptr;
+        aReadPrepareParams.mDataVersionFilterListSize = 0;
     }
 }
 
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 9d1484e9d32e2b..1a601ba8504dbc 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -509,6 +509,53 @@ CHIP_ERROR AndroidDeviceControllerWrapper::UpdateAttestationTrustStoreBridge(job
     return err;
 }
 
+CHIP_ERROR AndroidDeviceControllerWrapper::StartOTAProvider(jobject otaProviderDelegate)
+{
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    OTAProviderDelegateBridge * otaProviderBridge = new OTAProviderDelegateBridge();
+    auto systemState                              = DeviceControllerFactory::GetInstance().GetSystemState();
+
+    VerifyOrExit(otaProviderBridge != nullptr, err = CHIP_ERROR_NO_MEMORY);
+
+    err = otaProviderBridge->Init(systemState->SystemLayer(), systemState->ExchangeMgr(), otaProviderDelegate);
+    VerifyOrExit(err == CHIP_NO_ERROR,
+                 ChipLogError(Controller, "OTA Provider Initialize Error : %" CHIP_ERROR_FORMAT, err.Format()));
+
+    mOtaProviderBridge = otaProviderBridge;
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        if (otaProviderBridge != nullptr)
+        {
+            delete otaProviderBridge;
+            otaProviderBridge = nullptr;
+        }
+    }
+    return err;
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif
+}
+
+CHIP_ERROR AndroidDeviceControllerWrapper::FinishOTAProvider()
+{
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+    if (mOtaProviderBridge != nullptr)
+    {
+        mOtaProviderBridge->Shutdown();
+        delete mOtaProviderBridge;
+
+        mOtaProviderBridge = nullptr;
+    }
+
+    return CHIP_NO_ERROR;
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif
+}
+
 void AndroidDeviceControllerWrapper::OnStatusUpdate(chip::Controller::DevicePairingDelegate::Status status)
 {
     chip::DeviceLayer::StackUnlock unlock;
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
index 5e35214b620b67..d78d4803a697c0 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.h
+++ b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -43,6 +43,9 @@
 #include "AndroidOperationalCredentialsIssuer.h"
 #include "AttestationTrustStoreBridge.h"
 #include "DeviceAttestationDelegateBridge.h"
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+#include "OTAProviderDelegateBridge.h"
+#endif
 
 /**
  * This class contains all relevant information for the JNI view of CHIPDeviceController
@@ -191,6 +194,10 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
 
     CHIP_ERROR UpdateAttestationTrustStoreBridge(jobject attestationTrustStoreDelegate);
 
+    CHIP_ERROR StartOTAProvider(jobject otaProviderDelegate);
+
+    CHIP_ERROR FinishOTAProvider();
+
 private:
     using ChipDeviceControllerPtr = std::unique_ptr<chip::Controller::DeviceCommissioner>;
 
@@ -232,6 +239,9 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
     DeviceAttestationDelegateBridge * mDeviceAttestationDelegateBridge        = nullptr;
     AttestationTrustStoreBridge * mAttestationTrustStoreBridge                = nullptr;
     chip::Credentials::DeviceAttestationVerifier * mDeviceAttestationVerifier = nullptr;
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+    OTAProviderDelegateBridge * mOtaProviderBridge = nullptr;
+#endif
 
     AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller,
 #ifdef JAVA_MATTER_CONTROLLER_TEST
diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp
index 063ba5dfb6cdc3..1cfa9d28d25960 100644
--- a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp
+++ b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp
@@ -186,8 +186,7 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::CallbackGenerateNOCChain(const B
         ReturnErrorOnFailure(reader.Next());
     }
 
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == AnonymousTag(), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, AnonymousTag()));
 
     TLVType containerType;
     ReturnErrorOnFailure(reader.EnterContainer(containerType));
@@ -335,8 +334,7 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::LocalGenerateNOCChain(const Byte
         ReturnErrorOnFailure(reader.Next());
     }
 
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == AnonymousTag(), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, AnonymousTag()));
 
     TLVType containerType;
     ReturnErrorOnFailure(reader.EnterContainer(containerType));
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index ee5ead80b18b38..4d09f611bc4267 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -80,24 +80,19 @@ shared_library("jni") {
     ]
   }
 
-  if (matter_enable_java_generated_api) {
+  if (chip_build_controller_dynamic_server) {
     sources += [
-      "CHIPDefaultCallbacks.cpp",
-      "CHIPDefaultCallbacks.h",
-      "zap-generated/CHIPClustersWrite-JNI.cpp",
-      "zap-generated/CHIPInvokeCallbacks.cpp",
-      "zap-generated/CHIPInvokeCallbacks.h",
-      "zap-generated/CHIPReadCallbacks.cpp",
+      "BdxOTASender.cpp",
+      "BdxOTASender.h",
+      "OTAProviderDelegateBridge.cpp",
+      "OTAProviderDelegateBridge.h",
     ]
 
-    deps += [
-      "${chip_root}/src/controller/data_model",
-      "${chip_root}/src/controller/data_model:java-jni-sources",
+    defines += [
+      "CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
+      "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER",
     ]
-  }
 
-  if (chip_build_controller_dynamic_server) {
-    defines += [ "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER" ]
     deps += [ "${chip_root}/src/controller:nodatamodel" ]
   }
 
@@ -110,6 +105,8 @@ shared_library("jni") {
     ]
 
     include_dirs = java_matter_controller_dependent_paths
+    include_dirs += [ "${chip_root}/zzz_generated/controller-clusters" ]
+
     deps += [ "${chip_root}/third_party/inipp" ]
 
     if (current_os == "mac") {
@@ -177,7 +174,7 @@ if (chip_link_tests) {
 }
 
 kotlin_library("tlv") {
-  output_name = "libCHIPTlv.jar"
+  output_name = "libMatterTlv.jar"
 
   sources = [
     "src/matter/tlv/Element.kt",
@@ -236,7 +233,7 @@ kotlin_library("tlv_read_write_test") {
 }
 
 kotlin_library("jsontlv") {
-  output_name = "libCHIPJson.jar"
+  output_name = "libMatterJson.jar"
 
   deps = [
     ":tlv",
@@ -328,9 +325,7 @@ kotlin_library("chipcluster") {
 
   deps = [ ":tlv" ]
 
-  sources = [ "src/chip/devicecontroller/cluster/TlvReaderExtension.kt" ]
-
-  sources += structs_sources
+  sources = structs_sources
   sources += eventstructs_sources
 
   kotlinc_flags = [ "-Xlint:deprecation" ]
@@ -355,10 +350,14 @@ kotlin_library("chipcluster_test") {
 }
 
 kotlin_library("kotlin_matter_controller") {
+  import(
+      "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni")
+
   output_name = "KotlinMatterController.jar"
 
   deps = [
     ":java",
+    ":tlv",
     "${chip_root}/third_party/java_deps:annotation",
   ]
 
@@ -375,6 +374,9 @@ kotlin_library("kotlin_matter_controller") {
     "src/matter/controller/model/States.kt",
   ]
 
+  sources += matter_structs_sources
+  sources += matter_eventstructs_sources
+
   if (matter_enable_java_compilation) {
     deps += [
       "${chip_root}/third_party/java_deps:json",
@@ -444,6 +446,7 @@ android_library("java") {
     "src/chip/devicecontroller/KeypairDelegate.java",
     "src/chip/devicecontroller/NetworkCredentials.java",
     "src/chip/devicecontroller/NetworkLocation.java",
+    "src/chip/devicecontroller/OTAProviderDelegate.java",
     "src/chip/devicecontroller/OpenCommissioningCallback.java",
     "src/chip/devicecontroller/OperationalKeyConfig.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
@@ -462,6 +465,7 @@ android_library("java") {
     "src/chip/devicecontroller/model/ChipEventPath.java",
     "src/chip/devicecontroller/model/ChipPathId.java",
     "src/chip/devicecontroller/model/ClusterState.java",
+    "src/chip/devicecontroller/model/DataVersionFilter.java",
     "src/chip/devicecontroller/model/EndpointState.java",
     "src/chip/devicecontroller/model/EventState.java",
     "src/chip/devicecontroller/model/InvokeElement.java",
@@ -486,6 +490,7 @@ android_library("java") {
       "src/chip/clusterinfo/CommandResponseInfo.java",
       "src/chip/clusterinfo/DelegatedClusterCallback.java",
       "src/chip/clusterinfo/InteractionInfo.java",
+      "src/chip/devicecontroller/ChipTLVType.java",
     ]
   }
 
diff --git a/src/controller/java/BaseCHIPCluster-JNI.cpp b/src/controller/java/BaseCHIPCluster-JNI.cpp
index 830e757c46faf6..780ad8ff736655 100644
--- a/src/controller/java/BaseCHIPCluster-JNI.cpp
+++ b/src/controller/java/BaseCHIPCluster-JNI.cpp
@@ -1,59 +1,383 @@
-#include <controller/CHIPCluster.h>
 #include <jni.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/TLV.h>
 #include <lib/support/JniReferences.h>
-#include <platform/PlatformManager.h>
+#include <lib/support/JniTypeWrappers.h>
 
 #define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
     extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
 
-JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlong clusterPtr)
+#define CHIP_TLV_WRITER_BUFFER_SIZE 1024
+
+jobject decodeValueFromTLV(JNIEnv * env, chip::TLV::TLVReader * data);
+static CHIP_ERROR encodeTLVFromValue(JNIEnv * env, jobject jObject, chip::TLV::TLVWriter & writer, chip::TLV::Tag tag);
+
+jobject decodeValueFromTLV(JNIEnv * env, chip::TLV::TLVReader * data)
 {
-    chip::DeviceLayer::StackLock lock;
-    chip::Controller::ClusterBase * cluster = reinterpret_cast<chip::Controller::ClusterBase *>(clusterPtr);
-    if (cluster != nullptr)
+    chip::TLV::TLVType dataTLVType = data->GetType();
+    switch (dataTLVType)
     {
-        delete cluster;
+    case chip::TLV::kTLVType_SignedInteger: {
+        int64_t val;
+        CHIP_ERROR err = data->Get(val);
+        VerifyOrReturnValue(
+            err == CHIP_NO_ERROR, nullptr,
+            ChipLogError(Controller, "Error: TLV signed integer decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        jclass intTypeCls     = env->FindClass("chip/devicecontroller/ChipTLVType$IntType");
+        jmethodID constructor = env->GetMethodID(intTypeCls, "<init>", "(J)V");
+        return env->NewObject(intTypeCls, constructor, static_cast<jlong>(val));
+    }
+    case chip::TLV::kTLVType_UnsignedInteger: {
+        uint64_t val;
+        CHIP_ERROR err = data->Get(val);
+        VerifyOrReturnValue(
+            err == CHIP_NO_ERROR, nullptr,
+            ChipLogError(Controller, "Error: TLV unsigned integer decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        jclass uintTypeCls    = env->FindClass("chip/devicecontroller/ChipTLVType$UIntType");
+        jmethodID constructor = env->GetMethodID(uintTypeCls, "<init>", "(J)V");
+        return env->NewObject(uintTypeCls, constructor, static_cast<jlong>(val));
+    }
+    case chip::TLV::kTLVType_Boolean: {
+        bool val;
+        CHIP_ERROR err = data->Get(val);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: TLV boolean decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        jclass booleanTypeCls = env->FindClass("chip/devicecontroller/ChipTLVType$BooleanType");
+        jmethodID constructor = env->GetMethodID(booleanTypeCls, "<init>", "(Z)V");
+        return env->NewObject(booleanTypeCls, constructor, static_cast<jboolean>(val));
+    }
+    case chip::TLV::kTLVType_FloatingPointNumber: {
+        // Try float first
+        float floatValue;
+        CHIP_ERROR err = data->Get(floatValue);
+        if (err == CHIP_NO_ERROR)
+        {
+            jclass floatTypeCls   = env->FindClass("chip/devicecontroller/ChipTLVType$FloatType");
+            jmethodID constructor = env->GetMethodID(floatTypeCls, "<init>", "(F)V");
+            return env->NewObject(floatTypeCls, constructor, static_cast<jfloat>(floatValue));
+        }
+        double val;
+        err = data->Get(val);
+        VerifyOrReturnValue(
+            err == CHIP_NO_ERROR, nullptr,
+            ChipLogError(Controller, "Error: TLV floating point decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        jclass doubleTypeCls        = env->FindClass("chip/devicecontroller/ChipTLVType$DoubleType");
+        jmethodID doubleConstructor = env->GetMethodID(doubleTypeCls, "<init>", "(D)V");
+        return env->NewObject(doubleTypeCls, doubleConstructor, static_cast<jdouble>(val));
+    }
+    case chip::TLV::kTLVType_UTF8String: {
+        chip::CharSpan stringValue;
+        CHIP_ERROR err = data->Get(stringValue);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: TLV UTF8String decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        chip::UtfString stringObj(env, stringValue);
+        jclass stringTypeCls  = env->FindClass("chip/devicecontroller/ChipTLVType$StringType");
+        jmethodID constructor = env->GetMethodID(stringTypeCls, "<init>", "(Ljava/lang/String;)V");
+        return env->NewObject(stringTypeCls, constructor, stringObj.jniValue());
+    }
+    case chip::TLV::kTLVType_ByteString: {
+        chip::ByteSpan bytesValue;
+        CHIP_ERROR err = data->Get(bytesValue);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: TLV ByteString decoding failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        chip::ByteArray byteArrayObj(env, bytesValue);
+        jclass stringTypeCls  = env->FindClass("chip/devicecontroller/ChipTLVType$ByteArrayType");
+        jmethodID constructor = env->GetMethodID(stringTypeCls, "<init>", "([B)V");
+        return env->NewObject(stringTypeCls, constructor, byteArrayObj.jniValue());
+    }
+    case chip::TLV::kTLVType_Null: {
+        jclass nullTypeCls    = env->FindClass("chip/devicecontroller/ChipTLVType$NullType");
+        jmethodID constructor = env->GetMethodID(nullTypeCls, "<init>", "()V");
+        return env->NewObject(nullTypeCls, constructor);
+    }
+    case chip::TLV::kTLVType_Structure:
+    case chip::TLV::kTLVType_Array: {
+        chip::TLV::TLVType tlvType;
+        CHIP_ERROR err = data->EnterContainer(tlvType);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: TLV container entering failed : %" CHIP_ERROR_FORMAT, err.Format()));
+
+        jobject arrayLists;
+        err = chip::JniReferences::GetInstance().CreateArrayList(arrayLists);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: Create ArrayList object failed : %" CHIP_ERROR_FORMAT, err.Format()));
+
+        while ((err = data->Next()) == CHIP_NO_ERROR)
+        {
+            chip::TLV::Tag tag = data->GetTag();
+            jobject value      = decodeValueFromTLV(env, data);
+            VerifyOrReturnValue(
+                value != nullptr, nullptr,
+                ChipLogError(Controller, "Error when decoding TLV container of type : %" CHIP_ERROR_FORMAT, err.Format()));
+
+            jobject jValue = nullptr;
+            if (dataTLVType == chip::TLV::kTLVType_Structure)
+            {
+                uint64_t tagNum = TagNumFromTag(tag);
+
+                jclass structElementCls = env->FindClass("chip/devicecontroller/ChipTLVType$StructElement");
+                jmethodID constructor =
+                    env->GetMethodID(structElementCls, "<init>", "(JLchip/devicecontroller/ChipTLVType$BaseTLVType;)V");
+
+                jValue = env->NewObject(structElementCls, constructor, static_cast<jlong>(tagNum), value);
+            }
+            else
+            {
+                jValue = value;
+            }
+            err = chip::JniReferences::GetInstance().AddToList(arrayLists, jValue);
+            VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                                ChipLogError(Controller, "Error: Add ArrayList object failed : %" CHIP_ERROR_FORMAT, err.Format()));
+        }
+        if (err != CHIP_END_OF_TLV)
+        {
+            ChipLogError(Controller, "Error: TLV container decoding failed: %" CHIP_ERROR_FORMAT, err.Format());
+            return nullptr;
+        }
+
+        err = data->ExitContainer(tlvType);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
+                            ChipLogError(Controller, "Error: TLV container exiting failed: %" CHIP_ERROR_FORMAT, err.Format()));
+
+        jclass typeCls = nullptr;
+        if (dataTLVType == chip::TLV::kTLVType_Structure)
+        {
+            typeCls = env->FindClass("chip/devicecontroller/ChipTLVType$StructType");
+        }
+        else
+        {
+            typeCls = env->FindClass("chip/devicecontroller/ChipTLVType$ArrayType");
+        }
+        jmethodID constructor = env->GetMethodID(typeCls, "<init>", "(Ljava/util/ArrayList;)V");
+        return env->NewObject(typeCls, constructor, arrayLists);
+    }
+    default:
+        ChipLogError(Controller, "Error: Unsupported TLV type for conversion : %u", data->GetType());
+        return nullptr;
     }
 }
 
-JNI_METHOD(jobject, BaseChipCluster, getCommandTimeout)
-(JNIEnv * env, jobject self, jlong clusterPtr)
+static bool isEqualTLVType(JNIEnv * env, const char * typeName, jobject tlvType)
 {
-    chip::DeviceLayer::StackLock lock;
-    chip::Controller::ClusterBase * cluster = reinterpret_cast<chip::Controller::ClusterBase *>(clusterPtr);
+    jclass tlvEnum = env->FindClass("chip/devicecontroller/ChipTLVType$TLVType");
 
-    chip::Optional<chip::System::Clock::Timeout> timeout = cluster->GetCommandTimeout();
-    if (!timeout.HasValue())
-    {
-        jobject emptyOptional = nullptr;
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, emptyOptional);
-        return emptyOptional;
-    }
+    jfieldID enumFieldID = env->GetStaticFieldID(tlvEnum, typeName, "Lchip/devicecontroller/ChipTLVType$TLVType;");
+    jobject enumObj      = env->GetStaticObjectField(tlvEnum, enumFieldID);
+
+    jmethodID equalsMethodID = env->GetMethodID(tlvEnum, "equals", "(Ljava/lang/Object;)Z");
 
-    jobject timeoutOptional = nullptr;
-    jobject timeoutBoxed    = nullptr;
-    jlong timeoutPrimitive  = static_cast<jlong>(timeout.Value().count());
-    chip::JniReferences::GetInstance().CreateBoxedObject("java/lang/Long", "(J)V", timeoutPrimitive, timeoutBoxed);
-    chip::JniReferences::GetInstance().CreateOptional(timeoutBoxed, timeoutOptional);
-    return timeoutOptional;
+    return (env->CallBooleanMethod(enumObj, equalsMethodID, tlvType) == JNI_TRUE);
 }
 
-JNI_METHOD(void, BaseChipCluster, setCommandTimeout)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject timeoutOptional)
+static CHIP_ERROR encodeTLVFromValue(JNIEnv * env, jobject jValue, chip::TLV::TLVWriter & writer, chip::TLV::Tag tag)
 {
-    chip::DeviceLayer::StackLock lock;
-    chip::Controller::ClusterBase * cluster = reinterpret_cast<chip::Controller::ClusterBase *>(clusterPtr);
+    jmethodID getTypeMethod  = nullptr;
+    jmethodID getValueMethod = nullptr;
+    ReturnLogErrorOnFailure(chip::JniReferences::GetInstance().FindMethod(
+        env, jValue, "type", "()Lchip/devicecontroller/ChipTLVType$TLVType;", &getTypeMethod));
 
-    jobject boxedLong = nullptr;
-    chip::JniReferences::GetInstance().GetOptionalValue(timeoutOptional, boxedLong);
+    jobject jType = env->CallObjectMethod(jValue, getTypeMethod);
+    if (jType == nullptr)
+    {
+        ChipLogError(Controller, "Error: Object to encode is corrupt");
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    if (isEqualTLVType(env, "UInt", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$UIntType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()J");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jlong value = env->CallLongMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        return writer.Put(tag, static_cast<uint64_t>(value));
+    }
+    if (isEqualTLVType(env, "Int", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$IntType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()J");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jlong value = env->CallLongMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        return writer.Put(tag, static_cast<int64_t>(value));
+    }
+    if (isEqualTLVType(env, "Boolean", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$BooleanType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()Z");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jboolean value = env->CallBooleanMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        return writer.Put(tag, static_cast<bool>(value));
+    }
+    if (isEqualTLVType(env, "Float", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$FloatType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()F");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
 
-    if (boxedLong != nullptr)
+        jfloat value = env->CallFloatMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        return writer.Put(tag, static_cast<float>(value));
+    }
+    if (isEqualTLVType(env, "Double", jType))
     {
-        jlong timeoutMillis = chip::JniReferences::GetInstance().LongToPrimitive(boxedLong);
-        cluster->SetCommandTimeout(chip::MakeOptional(chip::System::Clock::Milliseconds32(static_cast<uint64_t>(timeoutMillis))));
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$DoubleType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()D");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jdouble value = env->CallDoubleMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        return writer.Put(tag, static_cast<double>(value));
     }
-    else
+    if (isEqualTLVType(env, "Null", jType))
     {
-        cluster->SetCommandTimeout(chip::NullOptional);
+        return writer.PutNull(tag);
     }
+    if (isEqualTLVType(env, "String", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$StringType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()Ljava/lang/String;");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jstring value = (jstring) env->CallObjectMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        chip::JniUtfString jniString(env, value);
+
+        return writer.PutString(tag, jniString.c_str());
+    }
+    if (isEqualTLVType(env, "ByteArray", jType))
+    {
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$ByteArrayType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "()[B");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jbyteArray value = (jbyteArray) env->CallObjectMethod(jValue, getValueMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        chip::JniByteArray jniByteArray(env, value);
+
+        return writer.Put(tag, jniByteArray.byteSpan());
+    }
+    if (isEqualTLVType(env, "Struct", jType))
+    {
+        jmethodID getSizeMethod = nullptr;
+
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$StructType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        getSizeMethod = env->GetMethodID(typeClass, "size", "()I");
+        VerifyOrReturnError(getSizeMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "(I)Lchip/devicecontroller/ChipTLVType$StructElement;");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jclass elementClass = env->FindClass("chip/devicecontroller/ChipTLVType$StructElement");
+        VerifyOrReturnError(elementClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+        jmethodID getcontextTagNumMethod = env->GetMethodID(elementClass, "contextTagNum", "()J");
+        VerifyOrReturnError(getcontextTagNumMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+        jmethodID getElementValueMethod =
+            env->GetMethodID(elementClass, "value", "()Lchip/devicecontroller/ChipTLVType$BaseTLVType;");
+        VerifyOrReturnError(getElementValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jint size = env->CallIntMethod(jValue, getSizeMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        chip::TLV::TLVType outer;
+        ReturnErrorOnFailure(writer.StartContainer(tag, chip::TLV::kTLVType_Structure, outer));
+        for (int i = 0; i < static_cast<int>(size); i++)
+        {
+            jobject eachElement = env->CallObjectMethod(jValue, getValueMethod, static_cast<jint>(i));
+            VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            jlong jEachTag = env->CallLongMethod(eachElement, getcontextTagNumMethod);
+            VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            jobject jEachValue = env->CallObjectMethod(eachElement, getElementValueMethod);
+            VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            uint64_t tagValue       = static_cast<uint64_t>(jEachTag);
+            chip::TLV::Tag innerTag = chip::TLV::ContextTag(static_cast<uint8_t>(tagValue));
+            ReturnErrorOnFailure(encodeTLVFromValue(env, jEachValue, writer, innerTag));
+        }
+        ReturnErrorOnFailure(writer.EndContainer(outer));
+        return CHIP_NO_ERROR;
+    }
+    if (isEqualTLVType(env, "Array", jType))
+    {
+        jmethodID getSizeMethod = nullptr;
+
+        jclass typeClass = env->FindClass("chip/devicecontroller/ChipTLVType$ArrayType");
+        VerifyOrReturnError(typeClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+
+        getSizeMethod = env->GetMethodID(typeClass, "size", "()I");
+        VerifyOrReturnError(getSizeMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+        getValueMethod = env->GetMethodID(typeClass, "value", "(I)Lchip/devicecontroller/ChipTLVType$BaseTLVType;");
+        VerifyOrReturnError(getValueMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
+
+        jint size = env->CallIntMethod(jValue, getSizeMethod);
+        VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        chip::TLV::TLVType outer;
+        ReturnErrorOnFailure(writer.StartContainer(tag, chip::TLV::kTLVType_Array, outer));
+        for (int i = 0; i < static_cast<int>(size); i++)
+        {
+            jobject eachValue = env->CallObjectMethod(jValue, getValueMethod, static_cast<jint>(i));
+            VerifyOrReturnLogError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            ReturnErrorOnFailure(encodeTLVFromValue(env, eachValue, writer, chip::TLV::AnonymousTag()));
+        }
+        ReturnErrorOnFailure(writer.EndContainer(outer));
+        return CHIP_NO_ERROR;
+    }
+    if (isEqualTLVType(env, "Empty", jType))
+    {
+        // For optional Value
+        return CHIP_NO_ERROR;
+    }
+
+    ChipLogError(Controller, "Error: Unsupported type to encode");
+    return CHIP_ERROR_INVALID_ARGUMENT;
+}
+
+JNI_METHOD(jbyteArray, BaseChipCluster, encodeToTlv)(JNIEnv * env, jclass clazz, jobject value)
+{
+    VerifyOrReturnValue(value != nullptr, nullptr, ChipLogError(Controller, "invalid parameter: value is null"));
+    chip::TLV::TLVWriter writer;
+    uint8_t buffer[CHIP_TLV_WRITER_BUFFER_SIZE];
+    jbyteArray tlv = nullptr;
+    writer.Init(buffer, sizeof(buffer));
+
+    CHIP_ERROR err = encodeTLVFromValue(env, value, writer, chip::TLV::AnonymousTag());
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr, ChipLogError(Controller, "Encode Error: %" CHIP_ERROR_FORMAT, err.Format()));
+
+    err = chip::JniReferences::GetInstance().N2J_ByteArray(env, buffer, writer.GetLengthWritten(), tlv);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr, ChipLogError(Controller, "JNI Error: %" CHIP_ERROR_FORMAT, err.Format()));
+
+    return tlv;
+}
+
+JNI_METHOD(jobject, BaseChipCluster, decodeFromTlv)(JNIEnv * env, jclass clazz, jbyteArray tlvBytesObj)
+{
+    VerifyOrReturnValue(tlvBytesObj != nullptr, nullptr, ChipLogError(Controller, "invalid parameter: tlvBytesObj is null"));
+    chip::JniByteArray tlvBytesObjBytes(env, tlvBytesObj);
+
+    chip::TLV::TLVReader reader;
+    reader.Init(tlvBytesObjBytes.byteSpan());
+    VerifyOrReturnValue(reader.Next() == CHIP_NO_ERROR, nullptr, ChipLogError(Controller, "TLV Parsing is wrong"));
+
+    return decodeValueFromTLV(env, &reader);
 }
diff --git a/src/controller/java/BdxOTASender.cpp b/src/controller/java/BdxOTASender.cpp
new file mode 100644
index 00000000000000..294d8ebc0f88a5
--- /dev/null
+++ b/src/controller/java/BdxOTASender.cpp
@@ -0,0 +1,413 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+#include "BdxOTASender.h"
+
+#include <lib/support/CHIPJNIError.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+#include <platform/LockTracker.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::bdx;
+using Protocols::InteractionModel::Status;
+
+// TODO Expose a method onto the delegate to make that configurable.
+constexpr uint32_t kMaxBdxBlockSize = 1024;
+
+// Since the BDX timeout is 5 minutes and we are starting this after query image is available and before the BDX init comes,
+// we just double the timeout to give enough time for the BDX init to come in a reasonable amount of time.
+constexpr System::Clock::Timeout kBdxInitReceivedTimeout = System::Clock::Seconds16(10 * 60);
+
+constexpr System::Clock::Timeout kBdxTimeout        = System::Clock::Seconds16(5 * 60); // OTA Spec mandates >= 5 minutes
+constexpr System::Clock::Timeout kBdxPollIntervalMs = System::Clock::Milliseconds32(50);
+constexpr bdx::TransferRole kBdxRole                = bdx::TransferRole::kSender;
+
+CHIP_ERROR BdxOTASender::PrepareForTransfer(FabricIndex fabricIndex, NodeId nodeId)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mExchangeMgr != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mSystemLayer != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    ReturnErrorOnFailure(ConfigureState(fabricIndex, nodeId));
+
+    BitFlags<bdx::TransferControlFlags> flags(bdx::TransferControlFlags::kReceiverDrive);
+    return Responder::PrepareForTransfer(mSystemLayer, kBdxRole, flags, kMaxBdxBlockSize, kBdxTimeout, kBdxPollIntervalMs);
+}
+
+CHIP_ERROR BdxOTASender::Init(System::Layer * systemLayer, Messaging::ExchangeManager * exchangeMgr)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mSystemLayer == nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mExchangeMgr == nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(systemLayer != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(exchangeMgr != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    exchangeMgr->RegisterUnsolicitedMessageHandlerForProtocol(Protocols::BDX::Id, this);
+
+    mSystemLayer = systemLayer;
+    mExchangeMgr = exchangeMgr;
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BdxOTASender::Shutdown()
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mSystemLayer != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mExchangeMgr != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    mExchangeMgr->UnregisterUnsolicitedMessageHandlerForProtocol(Protocols::BDX::Id);
+    ResetState();
+
+    mExchangeMgr = nullptr;
+    mSystemLayer = nullptr;
+
+    return CHIP_NO_ERROR;
+}
+
+void BdxOTASender::ResetState()
+{
+    assertChipStackLockedByCurrentThread();
+    if (mNodeId != kUndefinedNodeId && mFabricIndex != kUndefinedFabricIndex)
+    {
+        ChipLogProgress(Controller,
+                        "Resetting state for OTA Provider; no longer providing an update for node id 0x" ChipLogFormatX64
+                        ", fabric index %u",
+                        ChipLogValueX64(mNodeId), mFabricIndex);
+    }
+    else
+    {
+        ChipLogProgress(Controller, "Resetting state for OTA Provider");
+    }
+    if (mSystemLayer)
+    {
+        mSystemLayer->CancelTimer(HandleBdxInitReceivedTimeoutExpired, this);
+    }
+    // TODO: Check if this can be removed. It seems like we can close the exchange context and reset transfer regardless.
+    if (!mInitialized)
+    {
+        return;
+    }
+    Responder::ResetTransfer();
+    ++mTransferGeneration;
+    mFabricIndex = kUndefinedFabricIndex;
+    mNodeId      = kUndefinedNodeId;
+
+    if (mExchangeCtx != nullptr)
+    {
+        mExchangeCtx->Close();
+        mExchangeCtx = nullptr;
+    }
+
+    mInitialized = false;
+}
+
+CHIP_ERROR BdxOTASender::OnMessageToSend(TransferSession::OutputEvent & event)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mExchangeCtx != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mOtaDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    Messaging::SendFlags sendFlags;
+
+    // All messages sent from the Sender expect a response, except for a StatusReport which would indicate an error and
+    // the end of the transfer.
+    if (!event.msgTypeData.HasMessageType(Protocols::SecureChannel::MsgType::StatusReport))
+    {
+        sendFlags.Set(Messaging::SendMessageFlags::kExpectResponse);
+    }
+
+    auto & msgTypeData = event.msgTypeData;
+    // If there's an error sending the message, close the exchange and call ResetState.
+    // TODO: If we can remove the !mInitialized check in ResetState(), just calling ResetState() will suffice here.
+    CHIP_ERROR err =
+        mExchangeCtx->SendMessage(msgTypeData.ProtocolId, msgTypeData.MessageType, std::move(event.MsgData), sendFlags);
+    if (err != CHIP_NO_ERROR)
+    {
+        mExchangeCtx->Close();
+        mExchangeCtx = nullptr;
+        ResetState();
+    }
+    else if (event.msgTypeData.HasMessageType(Protocols::SecureChannel::MsgType::StatusReport))
+    {
+        // If the send was successful for a status report, since we are not expecting a response the exchange context is
+        // already closed. We need to null out the reference to avoid having a dangling pointer.
+        mExchangeCtx = nullptr;
+        ResetState();
+    }
+    return err;
+}
+
+bdx::StatusCode BdxOTASender::GetBdxStatusCodeFromChipError(CHIP_ERROR err)
+{
+    if (err == CHIP_ERROR_INCORRECT_STATE)
+    {
+        return bdx::StatusCode::kUnexpectedMessage;
+    }
+    if (err == CHIP_ERROR_INVALID_ARGUMENT)
+    {
+        return bdx::StatusCode::kBadMessageContents;
+    }
+    return bdx::StatusCode::kUnknown;
+}
+
+CHIP_ERROR BdxOTASender::OnTransferSessionBegin(TransferSession::OutputEvent & event)
+{
+    assertChipStackLockedByCurrentThread();
+    // Once we receive the BDX init, cancel the BDX Init timeout and start the BDX session
+    if (mSystemLayer)
+    {
+        mSystemLayer->CancelTimer(HandleBdxInitReceivedTimeoutExpired, this);
+    }
+
+    VerifyOrReturnError(mFabricIndex != kUndefinedFabricIndex, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mNodeId != kUndefinedNodeId, CHIP_ERROR_INCORRECT_STATE);
+    uint16_t fdl = 0;
+
+    const uint8_t * fd = mTransfer.GetFileDesignator(fdl);
+    VerifyOrReturnError(fdl <= bdx::kMaxFileDesignatorLen, CHIP_ERROR_INVALID_ARGUMENT);
+    CharSpan fileDesignatorSpan(Uint8::to_const_char(fd), fdl);
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    JniLocalReferenceManager manager(env);
+    UtfString fileDesignator(env, fileDesignatorSpan);
+
+    uint64_t offset = mTransfer.GetStartOffset();
+
+    jmethodID handleBDXTransferSessionBeginMethod;
+    CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mOtaDelegate, "handleBDXTransferSessionBegin",
+                                                             "(JLjava/lang/String;J)V", &handleBDXTransferSessionBeginMethod);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err, ChipLogError(Controller, "Could not find handleBDXTransferSessionBegin method"));
+
+    env->CallVoidMethod(mOtaDelegate, handleBDXTransferSessionBeginMethod, static_cast<jlong>(mNodeId), fileDesignator.jniValue(),
+                        static_cast<jlong>(offset));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+
+    TransferSession::TransferAcceptData acceptData;
+    acceptData.ControlMode  = bdx::TransferControlFlags::kReceiverDrive;
+    acceptData.MaxBlockSize = mTransfer.GetTransferBlockSize();
+    acceptData.StartOffset  = mTransfer.GetStartOffset();
+    acceptData.Length       = mTransfer.GetTransferLength();
+
+    LogErrorOnFailure(mTransfer.AcceptTransfer(acceptData));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BdxOTASender::OnTransferSessionEnd(TransferSession::OutputEvent & event)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mFabricIndex != kUndefinedFabricIndex, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mNodeId != kUndefinedNodeId, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mOtaDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    if (event.EventType == TransferSession::OutputEventType::kTransferTimeout)
+    {
+        error = CHIP_ERROR_TIMEOUT;
+    }
+    else if (event.EventType != TransferSession::OutputEventType::kAckEOFReceived)
+    {
+        error = CHIP_ERROR_INTERNAL;
+    }
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    jmethodID handleBDXTransferSessionEndMethod;
+    CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mOtaDelegate, "handleBDXTransferSessionEnd", "(JJ)V",
+                                                             &handleBDXTransferSessionEndMethod);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err, ChipLogError(Controller, "Could not find handleBDXTransferSessionEnd method"));
+
+    env->CallVoidMethod(mOtaDelegate, handleBDXTransferSessionEndMethod, static_cast<jlong>(error.AsInteger()),
+                        static_cast<jlong>(mNodeId));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+
+    ResetState();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BdxOTASender::OnBlockQuery(TransferSession::OutputEvent & event)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturnError(mFabricIndex != kUndefinedFabricIndex, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mNodeId != kUndefinedNodeId, CHIP_ERROR_INCORRECT_STATE);
+
+    uint16_t blockSize  = mTransfer.GetTransferBlockSize();
+    uint32_t blockIndex = mTransfer.GetNextBlockNum();
+
+    uint64_t bytesToSkip = 0;
+    if (event.EventType == TransferSession::OutputEventType::kQueryWithSkipReceived)
+    {
+        bytesToSkip = event.bytesToSkip.BytesToSkip;
+    }
+
+    // uint64_t transferGeneration = mTransferGeneration;
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    JniLocalReferenceManager manager(env);
+    jmethodID handleBDXQueryMethod;
+    CHIP_ERROR err = JniReferences::GetInstance().FindMethod(
+        env, mOtaDelegate, "handleBDXQuery", "(JIJJ)Lchip/devicecontroller/OTAProviderDelegate$BDXData;", &handleBDXQueryMethod);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err, ChipLogError(Controller, "Could not find handleBDXQuery method"));
+
+    jobject bdxData =
+        env->CallObjectMethod(mOtaDelegate, handleBDXQueryMethod, static_cast<jlong>(mNodeId), static_cast<jint>(blockSize),
+                              static_cast<jlong>(blockIndex), static_cast<jlong>(bytesToSkip));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+
+    if (bdxData == nullptr)
+    {
+        LogErrorOnFailure(mTransfer.AbortTransfer(bdx::StatusCode::kUnknown));
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    jmethodID getDataMethod;
+    err = JniReferences::GetInstance().FindMethod(env, bdxData, "getData", "()[B", &getDataMethod);
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+
+    jmethodID isEOFMethod;
+    err = JniReferences::GetInstance().FindMethod(env, bdxData, "isEOF", "()Z", &isEOFMethod);
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+    jbyteArray jData = (jbyteArray) env->CallObjectMethod(bdxData, getDataMethod);
+    jboolean jIsEOF  = env->CallBooleanMethod(bdxData, isEOFMethod);
+
+    JniByteArray data(env, jData);
+
+    TransferSession::BlockData blockData;
+    blockData.Data   = static_cast<const uint8_t *>(data.byteSpan().data());
+    blockData.Length = static_cast<size_t>(data.byteSpan().size());
+    blockData.IsEof  = jIsEOF == JNI_TRUE;
+
+    err = mTransfer.PrepareBlock(blockData);
+    if (CHIP_NO_ERROR != err)
+    {
+        LogErrorOnFailure(err);
+        LogErrorOnFailure(mTransfer.AbortTransfer(bdx::StatusCode::kUnknown));
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+void BdxOTASender::HandleTransferSessionOutput(TransferSession::OutputEvent & event)
+{
+    VerifyOrReturn(mOtaDelegate != nullptr);
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    switch (event.EventType)
+    {
+    case TransferSession::OutputEventType::kInitReceived:
+        err = OnTransferSessionBegin(event);
+        if (err != CHIP_NO_ERROR)
+        {
+            LogErrorOnFailure(mTransfer.AbortTransfer(GetBdxStatusCodeFromChipError(err)));
+        }
+        break;
+    case TransferSession::OutputEventType::kStatusReceived:
+        ChipLogError(BDX, "Got StatusReport %x", static_cast<uint16_t>(event.statusData.statusCode));
+        FALLTHROUGH;
+    case TransferSession::OutputEventType::kAckEOFReceived:
+    case TransferSession::OutputEventType::kInternalError:
+    case TransferSession::OutputEventType::kTransferTimeout:
+        err = OnTransferSessionEnd(event);
+        break;
+    case TransferSession::OutputEventType::kQueryWithSkipReceived:
+    case TransferSession::OutputEventType::kQueryReceived:
+        err = OnBlockQuery(event);
+        break;
+    case TransferSession::OutputEventType::kMsgToSend:
+        err = OnMessageToSend(event);
+        break;
+    case TransferSession::OutputEventType::kNone:
+    case TransferSession::OutputEventType::kAckReceived:
+        // Nothing to do.
+        break;
+    case TransferSession::OutputEventType::kAcceptReceived:
+    case TransferSession::OutputEventType::kBlockReceived:
+    default:
+        // Should never happens.
+        chipDie();
+        break;
+    }
+    LogErrorOnFailure(err);
+}
+
+CHIP_ERROR BdxOTASender::ConfigureState(chip::FabricIndex fabricIndex, chip::NodeId nodeId)
+{
+    assertChipStackLockedByCurrentThread();
+
+    if (mInitialized)
+    {
+        // Prevent a new node connection since another is active.
+        VerifyOrReturnError(mFabricIndex == fabricIndex && mNodeId == nodeId, CHIP_ERROR_BUSY);
+
+        // Reset stale connection from the same Node if exists.
+        ResetState();
+    }
+
+    // Start a timer to track whether we receive a BDX init after a successful query image in a reasonable amount of time
+    CHIP_ERROR err = mSystemLayer->StartTimer(kBdxInitReceivedTimeout, HandleBdxInitReceivedTimeoutExpired, this);
+    LogErrorOnFailure(err);
+
+    mFabricIndex = fabricIndex;
+    mNodeId      = nodeId;
+
+    mInitialized = true;
+
+    return CHIP_NO_ERROR;
+}
diff --git a/src/controller/java/BdxOTASender.h b/src/controller/java/BdxOTASender.h
new file mode 100644
index 00000000000000..b4130540d43ec5
--- /dev/null
+++ b/src/controller/java/BdxOTASender.h
@@ -0,0 +1,78 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+#pragma once
+
+#include <jni.h>
+#include <messaging/ExchangeMgr.h>
+#include <protocols/bdx/BdxUri.h>
+#include <protocols/bdx/TransferFacilitator.h>
+
+constexpr uint32_t kMaxBDXURILen = 256;
+
+class BdxOTASender : public chip::bdx::Responder
+{
+public:
+    BdxOTASender(jobject otaDelegate) : mOtaDelegate(otaDelegate) {}
+
+    ~BdxOTASender() {}
+
+    CHIP_ERROR PrepareForTransfer(chip::FabricIndex fabricIndex, chip::NodeId nodeId);
+
+    CHIP_ERROR Init(chip::System::Layer * systemLayer, chip::Messaging::ExchangeManager * exchangeMgr);
+
+    CHIP_ERROR Shutdown();
+
+    void ResetState();
+
+private:
+    /**
+     * Timer callback called when we don't receive a BDX init within a reasonable time after a successful QueryImage response.
+     */
+    static void HandleBdxInitReceivedTimeoutExpired(chip::System::Layer * systemLayer, void * state)
+    {
+        VerifyOrReturn(state != nullptr);
+        static_cast<BdxOTASender *>(state)->ResetState();
+    }
+
+    CHIP_ERROR OnMessageToSend(chip::bdx::TransferSession::OutputEvent & event);
+
+    chip::bdx::StatusCode GetBdxStatusCodeFromChipError(CHIP_ERROR err);
+
+    CHIP_ERROR OnTransferSessionBegin(chip::bdx::TransferSession::OutputEvent & event);
+
+    CHIP_ERROR OnTransferSessionEnd(chip::bdx::TransferSession::OutputEvent & event);
+
+    CHIP_ERROR OnBlockQuery(chip::bdx::TransferSession::OutputEvent & event);
+
+    void HandleTransferSessionOutput(chip::bdx::TransferSession::OutputEvent & event) override;
+
+    CHIP_ERROR ConfigureState(chip::FabricIndex fabricIndex, chip::NodeId nodeId);
+
+    bool mInitialized                               = false;
+    chip::FabricIndex mFabricIndex                  = chip::kUndefinedFabricIndex;
+    chip::NodeId mNodeId                            = chip::kUndefinedNodeId;
+    chip::Messaging::ExchangeManager * mExchangeMgr = nullptr;
+
+    jobject mOtaDelegate = nullptr;
+
+    // Since we are a singleton, we get reused across transfers, but also have
+    // async calls that can happen.  The transfer generation keeps track of
+    // which transfer we are currently doing, so we can ignore async calls
+    // attached to no-longer-running transfers.
+    uint64_t mTransferGeneration = 0;
+};
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index f2db96360a3f5a..93a4e239a9b9ae 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -30,6 +30,7 @@
 #include <lib/support/JniTypeWrappers.h>
 
 #include <app/AttributePathParams.h>
+#include <app/DataVersionFilter.h>
 #include <app/InteractionModelEngine.h>
 #include <app/ReadClient.h>
 #include <app/WriteClient.h>
@@ -93,6 +94,10 @@ CHIP_ERROR ParseAttributePath(jobject attributePath, EndpointId & outEndpointId,
 static CHIP_ERROR ParseEventPathList(jobject eventPathList, std::vector<app::EventPathParams> & outEventPathParamsList);
 CHIP_ERROR ParseEventPath(jobject eventPath, EndpointId & outEndpointId, ClusterId & outClusterId, EventId & outEventId,
                           bool & outIsUrgent);
+CHIP_ERROR ParseDataVersionFilter(jobject dataVersionFilter, EndpointId & outEndpointId, ClusterId & outClusterId,
+                                  DataVersion & outDataVersion);
+static CHIP_ERROR ParseDataVersionFilterList(jobject dataVersionFilterList,
+                                             std::vector<app::DataVersionFilter> & outDataVersionFilterList);
 static CHIP_ERROR IsWildcardChipPathId(jobject chipPathId, bool & isWildcard);
 
 namespace {
@@ -545,6 +550,48 @@ JNI_METHOD(void, setAttestationTrustStoreDelegate)
     }
 }
 
+JNI_METHOD(void, startOTAProvider)(JNIEnv * env, jobject self, jlong handle, jobject otaProviderDelegate)
+{
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrExit(wrapper != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+
+    ChipLogProgress(Controller, "startOTAProvider() called");
+    err = wrapper->StartOTAProvider(otaProviderDelegate);
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "Failed to start OTA Provider. : %" CHIP_ERROR_FORMAT, err.Format());
+        JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
+    }
+#endif
+}
+
+JNI_METHOD(void, finishOTAProvider)(JNIEnv * env, jobject self, jlong handle)
+{
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrExit(wrapper != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+
+    ChipLogProgress(Controller, "finishOTAProvider() called");
+
+    err = wrapper->FinishOTAProvider();
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "Failed to finish OTA Provider. : %" CHIP_ERROR_FORMAT, err.Format());
+        JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
+    }
+#endif
+}
+
 JNI_METHOD(void, commissionDevice)
 (JNIEnv * env, jobject self, jlong handle, jlong deviceId, jbyteArray csrNonce, jobject networkCredentials)
 {
@@ -2050,14 +2097,16 @@ JNI_METHOD(jobject, computePaseVerifier)
 }
 
 JNI_METHOD(void, subscribe)
-(JNIEnv * env, jobject self, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributePathList, jobject eventPathList,
- jint minInterval, jint maxInterval, jboolean keepSubscriptions, jboolean isFabricFiltered, jint imTimeoutMs, jobject eventMin)
+(JNIEnv * env, jclass clz, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributePathList, jobject eventPathList,
+ jobject dataVersionFilterList, jint minInterval, jint maxInterval, jboolean keepSubscriptions, jboolean isFabricFiltered,
+ jint imTimeoutMs, jobject eventMin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err               = CHIP_NO_ERROR;
     app::ReadClient * readClient = nullptr;
     jint numAttributePaths       = 0;
     jint numEventPaths           = 0;
+    jint numDataVersionFilters   = 0;
     auto callback                = reinterpret_cast<ReportCallback *>(callbackHandle);
     DeviceProxy * device         = reinterpret_cast<DeviceProxy *>(devicePtr);
     if (device == nullptr)
@@ -2099,6 +2148,30 @@ JNI_METHOD(void, subscribe)
         attributePaths.release();
     }
 
+    if (dataVersionFilterList != nullptr)
+    {
+        SuccessOrExit(err = JniReferences::GetInstance().GetListSize(dataVersionFilterList, numDataVersionFilters));
+    }
+
+    if (numDataVersionFilters > 0)
+    {
+        std::unique_ptr<chip::app::DataVersionFilter[]> dataVersionFilters(new chip::app::DataVersionFilter[numDataVersionFilters]);
+        for (uint8_t i = 0; i < numDataVersionFilters; i++)
+        {
+            jobject dataVersionFilterItem = nullptr;
+            SuccessOrExit(err = JniReferences::GetInstance().GetListItem(dataVersionFilterList, i, dataVersionFilterItem));
+
+            EndpointId endpointId;
+            ClusterId clusterId;
+            DataVersion dataVersion;
+            SuccessOrExit(err = ParseDataVersionFilter(dataVersionFilterItem, endpointId, clusterId, dataVersion));
+            dataVersionFilters[i] = chip::app::DataVersionFilter(endpointId, clusterId, dataVersion);
+        }
+        params.mpDataVersionFilterList    = dataVersionFilters.get();
+        params.mDataVersionFilterListSize = numDataVersionFilters;
+        dataVersionFilters.release();
+    }
+
     if (eventMin != nullptr)
     {
         params.mEventNumber.SetValue(static_cast<chip::EventNumber>(JniReferences::GetInstance().LongToPrimitive(eventMin)));
@@ -2159,8 +2232,8 @@ JNI_METHOD(void, subscribe)
 }
 
 JNI_METHOD(void, read)
-(JNIEnv * env, jobject self, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributePathList, jobject eventPathList,
- jboolean isFabricFiltered, jint imTimeoutMs, jobject eventMin)
+(JNIEnv * env, jclass clz, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributePathList, jobject eventPathList,
+ jobject dataVersionFilterList, jboolean isFabricFiltered, jint imTimeoutMs, jobject eventMin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2168,6 +2241,7 @@ JNI_METHOD(void, read)
     auto callback = reinterpret_cast<ReportCallback *>(callbackHandle);
     std::vector<app::AttributePathParams> attributePathParamsList;
     std::vector<app::EventPathParams> eventPathParamsList;
+    std::vector<app::DataVersionFilter> versionList;
     app::ReadClient * readClient = nullptr;
     DeviceProxy * device         = reinterpret_cast<DeviceProxy *>(devicePtr);
     if (device == nullptr)
@@ -2180,11 +2254,17 @@ JNI_METHOD(void, read)
 
     SuccessOrExit(err = ParseAttributePathList(attributePathList, attributePathParamsList));
     SuccessOrExit(err = ParseEventPathList(eventPathList, eventPathParamsList));
+    SuccessOrExit(err = ParseDataVersionFilterList(dataVersionFilterList, versionList));
     VerifyOrExit(attributePathParamsList.size() != 0 || eventPathParamsList.size() != 0, err = CHIP_ERROR_INVALID_ARGUMENT);
     params.mpAttributePathParamsList    = attributePathParamsList.data();
     params.mAttributePathParamsListSize = attributePathParamsList.size();
     params.mpEventPathParamsList        = eventPathParamsList.data();
     params.mEventPathParamsListSize     = eventPathParamsList.size();
+    if (versionList.size() != 0)
+    {
+        params.mpDataVersionFilterList    = versionList.data();
+        params.mDataVersionFilterListSize = versionList.size();
+    }
 
     params.mIsFabricFiltered = (isFabricFiltered != JNI_FALSE);
     params.mTimeout          = imTimeoutMs != 0 ? System::Clock::Milliseconds32(imTimeoutMs) : System::Clock::kZero;
@@ -2253,7 +2333,7 @@ CHIP_ERROR PutPreencodedWriteAttribute(app::WriteClient & writeClient, app::Conc
 }
 
 JNI_METHOD(void, write)
-(JNIEnv * env, jobject self, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributeList, jint timedRequestTimeoutMs,
+(JNIEnv * env, jclass clz, jlong handle, jlong callbackHandle, jlong devicePtr, jobject attributeList, jint timedRequestTimeoutMs,
  jint imTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
@@ -2419,7 +2499,7 @@ CHIP_ERROR PutPreencodedInvokeRequest(app::CommandSender & commandSender, app::C
 }
 
 JNI_METHOD(void, invoke)
-(JNIEnv * env, jobject self, jlong handle, jlong callbackHandle, jlong devicePtr, jobject invokeElement, jint timedRequestTimeoutMs,
+(JNIEnv * env, jclass clz, jlong handle, jlong callbackHandle, jlong devicePtr, jobject invokeElement, jint timedRequestTimeoutMs,
  jint imTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
@@ -2703,6 +2783,66 @@ CHIP_ERROR ParseEventPath(jobject eventPath, EndpointId & outEndpointId, Cluster
     return CHIP_NO_ERROR;
 }
 
+/**
+ * Takes objects in dataVersionFilterList, converts them to app:DataVersionFilter, and appends them to outDataVersionFilterList.
+ */
+CHIP_ERROR ParseDataVersionFilterList(jobject dataVersionFilterList, std::vector<app::DataVersionFilter> & outDataVersionFilterList)
+{
+    jint listSize;
+
+    if (dataVersionFilterList == nullptr)
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(dataVersionFilterList, listSize));
+
+    for (uint8_t i = 0; i < listSize; i++)
+    {
+        jobject dataVersionFilterItem = nullptr;
+        ReturnErrorOnFailure(JniReferences::GetInstance().GetListItem(dataVersionFilterList, i, dataVersionFilterItem));
+
+        EndpointId endpointId;
+        ClusterId clusterId;
+        DataVersion dataVersion;
+        ReturnErrorOnFailure(ParseDataVersionFilter(dataVersionFilterItem, endpointId, clusterId, dataVersion));
+        outDataVersionFilterList.push_back(app::DataVersionFilter(endpointId, clusterId, dataVersion));
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ParseDataVersionFilter(jobject versionFilter, EndpointId & outEndpointId, ClusterId & outClusterId,
+                                  DataVersion & outDataVersion)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    jmethodID getEndpointIdMethod  = nullptr;
+    jmethodID getClusterIdMethod   = nullptr;
+    jmethodID getDataVersionMethod = nullptr;
+
+    ReturnErrorOnFailure(JniReferences::GetInstance().FindMethod(
+        env, versionFilter, "getEndpointId", "()Lchip/devicecontroller/model/ChipPathId;", &getEndpointIdMethod));
+    ReturnErrorOnFailure(JniReferences::GetInstance().FindMethod(
+        env, versionFilter, "getClusterId", "()Lchip/devicecontroller/model/ChipPathId;", &getClusterIdMethod));
+    ReturnErrorOnFailure(
+        JniReferences::GetInstance().FindMethod(env, versionFilter, "getDataVersion", "()J", &getDataVersionMethod));
+
+    jobject endpointIdObj = env->CallObjectMethod(versionFilter, getEndpointIdMethod);
+    VerifyOrReturnError(endpointIdObj != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    uint32_t endpointId = 0;
+    ReturnErrorOnFailure(GetChipPathIdValue(endpointIdObj, kInvalidEndpointId, endpointId));
+    outEndpointId        = static_cast<EndpointId>(endpointId);
+    jobject clusterIdObj = env->CallObjectMethod(versionFilter, getClusterIdMethod);
+    VerifyOrReturnError(clusterIdObj != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    uint32_t clusterId = 0;
+    ReturnErrorOnFailure(GetChipPathIdValue(clusterIdObj, kInvalidClusterId, clusterId));
+    outClusterId = static_cast<ClusterId>(clusterId);
+
+    outDataVersion = static_cast<DataVersion>(env->CallLongMethod(versionFilter, getDataVersionMethod));
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR GetChipPathIdValue(jobject chipPathId, uint32_t wildcardValue, uint32_t & outValue)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
diff --git a/src/controller/java/DeviceAttestationDelegateBridge.h b/src/controller/java/DeviceAttestationDelegateBridge.h
index 258a53528eb4e3..214c5d78ec95ae 100644
--- a/src/controller/java/DeviceAttestationDelegateBridge.h
+++ b/src/controller/java/DeviceAttestationDelegateBridge.h
@@ -17,7 +17,7 @@
 
 #include <jni.h>
 #include <lib/core/NodeId.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #include <credentials/attestation_verifier/DeviceAttestationDelegate.h>
 
diff --git a/src/controller/java/OTAProviderDelegateBridge.cpp b/src/controller/java/OTAProviderDelegateBridge.cpp
new file mode 100644
index 00000000000000..dfde8ff7c79836
--- /dev/null
+++ b/src/controller/java/OTAProviderDelegateBridge.cpp
@@ -0,0 +1,422 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+#include "OTAProviderDelegateBridge.h"
+
+#include <app/clusters/ota-provider/ota-provider.h>
+#include <app/data-model/List.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
+using namespace chip::app::Clusters::OtaSoftwareUpdateProvider::Commands;
+
+constexpr EndpointId kOtaProviderEndpoint = 0;
+
+// Time in seconds after which the requestor should retry calling query image if
+// busy status is receieved.  The spec minimum is 2 minutes, but in practice OTA
+// generally takes a lot longer than that and devices only retry a few times
+// before giving up.  Default to 10 minutes for now, until we have a better
+// system of computing an expected completion time for the currently-running
+// OTA.
+constexpr uint32_t kDelayedActionTimeSeconds = 600;
+
+OTAProviderDelegateBridge::~OTAProviderDelegateBridge()
+{
+    mBdxOTASender->ResetState();
+    Clusters::OTAProvider::SetDelegate(kOtaProviderEndpoint, nullptr);
+    mBdxOTASender = nullptr;
+}
+
+CHIP_ERROR OTAProviderDelegateBridge::Init(chip::System::Layer * systemLayer, chip::Messaging::ExchangeManager * exchangeManager,
+                                           jobject otaProviderDelegate)
+{
+    ReturnLogErrorOnFailure(mOtaProviderDelegate.Init(otaProviderDelegate));
+
+    Clusters::OTAProvider::SetDelegate(kOtaProviderEndpoint, this);
+    mBdxOTASender = std::make_unique<BdxOTASender>(mOtaProviderDelegate.ObjectRef());
+    return mBdxOTASender->Init(systemLayer, exchangeManager);
+}
+
+void OTAProviderDelegateBridge::Shutdown()
+{
+    VerifyOrReturn(mBdxOTASender != nullptr, ChipLogError(Controller, "BdxOTASender is null"));
+    CHIP_ERROR err = mBdxOTASender->Shutdown();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogProgress(Controller, "OTAProviderDelegateBridge-Shutdown : %" CHIP_ERROR_FORMAT, err.Format());
+    }
+}
+
+void GenerateUpdateToken(uint8_t * buf, size_t bufSize)
+{
+    for (size_t i = 0; i < bufSize; ++i)
+    {
+        buf[i] = chip::Crypto::GetRandU8();
+    }
+}
+
+void OTAProviderDelegateBridge::sendOTAQueryFailure(uint8_t status)
+{
+    VerifyOrReturn(mOtaProviderDelegate.HasValidObjectRef(), ChipLogError(Controller, "mOtaProviderDelegate is null"));
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    jobject otaProviderDelegate = mOtaProviderDelegate.ObjectRef();
+    jmethodID handleOTAQueryFailureMethod;
+    CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, otaProviderDelegate, "handleOTAQueryFailure", "(I)V",
+                                                             &handleOTAQueryFailureMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find handleOTAQueryFailure method"));
+
+    env->CallVoidMethod(otaProviderDelegate, handleOTAQueryFailureMethod, static_cast<jint>(status));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return;
+    }
+    return;
+}
+void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                 const QueryImage::DecodableType & commandData)
+{
+    assertChipStackLockedByCurrentThread();
+
+    VerifyOrReturn(mOtaProviderDelegate.HasValidObjectRef(),
+                   commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure));
+
+    VerifyOrReturn(mBdxOTASender != nullptr, commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    chip::JniLocalReferenceManager manager(env);
+
+    jobject otaProviderDelegate      = nullptr;
+    jmethodID handleQueryImageMethod = nullptr;
+
+    jobject boxedHardwareVersion     = nullptr;
+    jobject boxedLocation            = nullptr;
+    jobject boxedRequestorCanConsent = nullptr;
+    jobject boxedMetadataForProvider = nullptr;
+    jobject jResponse                = nullptr;
+
+    jmethodID getSoftwareVersionMethod       = nullptr;
+    jmethodID getSoftwareVersionStringMethod = nullptr;
+    jmethodID getFilePathMethod              = nullptr;
+
+    jobject jSoftwareVersion       = nullptr;
+    jstring jSoftwareVersionString = nullptr;
+    jstring jFilePath              = nullptr;
+
+    bool hasUpdate = false;
+    Commands::QueryImageResponse::Type response;
+    Commands::QueryImageResponse::Type errorResponse;
+    errorResponse.status = OTAQueryStatus::kNotAvailable;
+
+    char uriBuffer[kMaxBDXURILen];
+    MutableCharSpan uri(uriBuffer);
+
+    NodeId nodeId = commandObj->GetSubjectDescriptor().subject;
+
+    FabricIndex fabricIndex  = commandObj->GetAccessingFabricIndex();
+    ScopedNodeId ourNodeId   = commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession()->GetLocalScopedNodeId();
+    VendorId vendorId        = commandData.vendorID;
+    uint16_t productId       = commandData.productID;
+    uint32_t softwareVersion = commandData.softwareVersion;
+    DataModel::DecodableList<OTADownloadProtocol> protocolsSupported = commandData.protocolsSupported;
+    Optional<uint16_t> hardwareVersion                               = commandData.hardwareVersion;
+    Optional<chip::CharSpan> location                                = commandData.location;
+    Optional<bool> requestorCanConsent                               = commandData.requestorCanConsent;
+    Optional<chip::ByteSpan> metadataForProvider                     = commandData.metadataForProvider;
+
+    bool isBDXProtocolSupported = false;
+
+    auto iterator = commandData.protocolsSupported.begin();
+    while (iterator.Next())
+    {
+        OTADownloadProtocol protocol = iterator.GetValue();
+        if (protocol == OTADownloadProtocol::kBDXSynchronous)
+        {
+            isBDXProtocolSupported = true;
+            break;
+        }
+    }
+
+    ConcreteCommandPath cachedCommandPath(commandPath.mEndpointId, commandPath.mClusterId, commandPath.mCommandId);
+
+    // The logic we are following here is if none of the protocols supported by the requestor are supported by us, we
+    // can't transfer the image even if we had an image available and we would return a Protocol Not Supported status.
+    // Assumption here is the requestor would send us a list of all the protocols it supports. If one/more of the
+    // protocols supported by the requestor are supported by us, we check if an image is not available due to various
+    // reasons - image not available, delegate reporting busy, we will respond with the status in the delegate response.
+    // If update is available, we try to prepare for transfer and build the uri in the response with a status of Image
+    // Available
+
+    // If the protocol requested is not supported, return status - Protocol Not Supported
+    if (!isBDXProtocolSupported)
+    {
+        errorResponse.status = OTAQueryStatus::kDownloadProtocolNotSupported;
+        err                  = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+        ExitNow();
+    }
+
+    otaProviderDelegate = mOtaProviderDelegate.ObjectRef();
+    err                 = JniReferences::GetInstance().FindMethod(env, otaProviderDelegate, "handleQueryImage",
+                                                                  "(IIJLjava/lang/Integer;Ljava/lang/String;Ljava/lang/Boolean;[B)Lchip/"
+                                                                                  "devicecontroller/OTAProviderDelegate$QueryImageResponse;",
+                                                                  &handleQueryImageMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find handleQueryImage method"));
+
+    if (hardwareVersion.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            "java/lang/Integer", "(I)V", static_cast<jint>(hardwareVersion.Value()), boxedHardwareVersion);
+    }
+
+    if (location.HasValue())
+    {
+        boxedLocation = env->NewStringUTF(std::string(location.Value().data(), location.Value().size()).c_str());
+    }
+
+    if (requestorCanConsent.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(
+            "java/lang/Boolean", "(Z)V", requestorCanConsent.Value() ? JNI_TRUE : JNI_FALSE, boxedRequestorCanConsent);
+    }
+
+    if (metadataForProvider.HasValue())
+    {
+        jbyteArray boxedMetadataForProviderByteArray = env->NewByteArray(static_cast<jsize>(metadataForProvider.Value().size()));
+        env->SetByteArrayRegion(boxedMetadataForProviderByteArray, 0, static_cast<jsize>(metadataForProvider.Value().size()),
+                                reinterpret_cast<const jbyte *>(metadataForProvider.Value().data()));
+        boxedMetadataForProvider = boxedMetadataForProviderByteArray;
+    }
+
+    jResponse = env->CallObjectMethod(otaProviderDelegate, handleQueryImageMethod, static_cast<jint>(vendorId),
+                                      static_cast<jint>(productId), static_cast<jlong>(softwareVersion), boxedHardwareVersion,
+                                      boxedLocation, boxedRequestorCanConsent, boxedMetadataForProvider);
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        err = CHIP_JNI_ERROR_EXCEPTION_THROWN;
+        ExitNow();
+    }
+
+    hasUpdate = (jResponse != nullptr);
+    // If update is not available, return the delegate response
+    if (!hasUpdate)
+    {
+        errorResponse.status = OTAQueryStatus::kNotAvailable;
+        err                  = CHIP_ERROR_INTERNAL;
+        ExitNow();
+    }
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getSoftwareVersion", "()Ljava/lang/Long;",
+                                                  &getSoftwareVersionMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getSoftwareVersion method"));
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getSoftwareVersionString", "()Ljava/lang/String;",
+                                                  &getSoftwareVersionStringMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getSoftwareVersionString method"));
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getFilePath", "()Ljava/lang/String;", &getFilePathMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getFilePath method"));
+
+    jSoftwareVersion       = env->CallObjectMethod(jResponse, getSoftwareVersionMethod);
+    jSoftwareVersionString = (jstring) env->CallObjectMethod(jResponse, getSoftwareVersionStringMethod);
+    jFilePath              = (jstring) env->CallObjectMethod(jResponse, getFilePathMethod);
+
+    {
+        response.status = OTAQueryStatus::kUpdateAvailable;
+        if (jSoftwareVersion != nullptr)
+        {
+            response.softwareVersion.SetValue(
+                static_cast<uint32_t>(JniReferences::GetInstance().LongToPrimitive(jSoftwareVersion)));
+        }
+
+        JniUtfString jniSoftwareVersionString(env, jSoftwareVersionString);
+
+        if (jniSoftwareVersionString.c_str() != nullptr)
+        {
+            response.softwareVersionString.SetValue(jniSoftwareVersionString.charSpan());
+        }
+
+        JniUtfString jniFilePath(env, jFilePath);
+
+        GenerateUpdateToken(mToken, kUpdateTokenLen);
+
+        response.updateToken.SetValue(chip::ByteSpan(mToken, kUpdateTokenLen));
+        response.userConsentNeeded.SetValue(0);
+
+        err = mBdxOTASender->PrepareForTransfer(fabricIndex, nodeId);
+        if (CHIP_NO_ERROR != err)
+        {
+            // Handle busy error separately as we have a query image response status that maps to busy
+            if (err == CHIP_ERROR_BUSY)
+            {
+                ChipLogError(Controller, "Responding with Busy due to being in the middle of handling another BDX transfer");
+                errorResponse.status = OTAQueryStatus::kBusy;
+                errorResponse.delayedActionTime.SetValue(kDelayedActionTimeSeconds);
+                // We do not reset state when we get the busy error because that means we are locked in a BDX transfer
+                // session with another requestor when we get this query image request. We do not want to interrupt the
+                // ongoing transfer instead just respond to the second requestor with a busy status and a delayedActionTime
+                // in which the requestor can retry.
+                ExitNow();
+            }
+            LogErrorOnFailure(err);
+            commandObj->AddStatus(cachedCommandPath, StatusIB(err).mStatus);
+            // We need to reset state here to clean up any initialization we might have done including starting the BDX
+            // timeout timer while preparing for transfer if any failure occurs afterwards.
+            mBdxOTASender->ResetState();
+            return;
+        }
+        err = bdx::MakeURI(ourNodeId.GetNodeId(), jniFilePath.c_str() != nullptr ? jniFilePath.charSpan() : CharSpan(), uri);
+        if (CHIP_NO_ERROR != err)
+        {
+            LogErrorOnFailure(err);
+            commandObj->AddStatus(cachedCommandPath, StatusIB(err).mStatus);
+            mBdxOTASender->ResetState();
+            return;
+        }
+        response.imageURI.SetValue(uri);
+        commandObj->AddResponse(cachedCommandPath, response);
+    }
+    return;
+
+exit:
+    ChipLogError(Controller, "OTA Query Failure : %u, %" CHIP_ERROR_FORMAT, static_cast<uint8_t>(errorResponse.status),
+                 err.Format());
+    commandObj->AddResponse(cachedCommandPath, errorResponse);
+    sendOTAQueryFailure(static_cast<uint8_t>(errorResponse.status));
+}
+
+void OTAProviderDelegateBridge::HandleApplyUpdateRequest(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                         const ApplyUpdateRequest::DecodableType & commandData)
+{
+    assertChipStackLockedByCurrentThread();
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    NodeId nodeId  = kUndefinedNodeId;
+    ConcreteCommandPath cachedCommandPath(commandPath.mEndpointId, commandPath.mClusterId, commandPath.mCommandId);
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    jobject otaProviderDelegate = nullptr;
+    jobject jResponse           = nullptr;
+    jmethodID handleApplyUpdateRequestMethod;
+    jmethodID getActionMethod;
+    jmethodID getDelayedActionTimeMethod;
+
+    chip::JniLocalReferenceManager manager(env);
+
+    Commands::ApplyUpdateResponse::Type response;
+    Commands::ApplyUpdateResponse::Type errorResponse;
+    errorResponse.action            = ApplyUpdateActionEnum::kDiscontinue;
+    errorResponse.delayedActionTime = 0;
+
+    jint jAction             = 0;
+    jlong jDelayedActionTime = 0;
+
+    VerifyOrReturn(mOtaProviderDelegate.HasValidObjectRef(),
+                   commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure));
+
+    nodeId = commandObj->GetSubjectDescriptor().subject;
+
+    otaProviderDelegate = mOtaProviderDelegate.ObjectRef();
+
+    err = JniReferences::GetInstance().FindMethod(env, otaProviderDelegate, "handleApplyUpdateRequest",
+                                                  "(JJ)Lchip/devicecontroller/OTAProviderDelegate$ApplyUpdateResponse;",
+                                                  &handleApplyUpdateRequestMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find handleApplyUpdateRequest method"));
+
+    jResponse = env->CallObjectMethod(otaProviderDelegate, handleApplyUpdateRequestMethod, static_cast<jlong>(nodeId),
+                                      static_cast<jlong>(commandData.newVersion));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        err = CHIP_JNI_ERROR_EXCEPTION_THROWN;
+        ExitNow();
+    }
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getAction", "()I", &getActionMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getAction method"));
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getDelayedActionTime", "()J", &getDelayedActionTimeMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getDelayedActionTime method"));
+
+    jAction            = env->CallIntMethod(jResponse, getActionMethod);
+    jDelayedActionTime = env->CallLongMethod(jResponse, getDelayedActionTimeMethod);
+
+    response.action            = static_cast<OTAApplyUpdateAction>(jAction);
+    response.delayedActionTime = static_cast<uint32_t>(jDelayedActionTime);
+    commandObj->AddResponse(cachedCommandPath, response);
+    return;
+
+exit:
+    ChipLogError(Controller, "Apply Update Request Failure : %" CHIP_ERROR_FORMAT, err.Format());
+    commandObj->AddResponse(cachedCommandPath, errorResponse);
+}
+
+void OTAProviderDelegateBridge::HandleNotifyUpdateApplied(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                          const NotifyUpdateApplied::DecodableType & commandData)
+{
+    assertChipStackLockedByCurrentThread();
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrReturn(mOtaProviderDelegate.HasValidObjectRef(),
+                   commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure));
+
+    NodeId nodeId = commandObj->GetSubjectDescriptor().subject;
+
+    ConcreteCommandPath cachedCommandPath(commandPath.mEndpointId, commandPath.mClusterId, commandPath.mCommandId);
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    jobject otaProviderDelegate = mOtaProviderDelegate.ObjectRef();
+    jmethodID handleNotifyUpdateAppliedMethod;
+    err = JniReferences::GetInstance().FindMethod(env, otaProviderDelegate, "handleNotifyUpdateApplied", "(J)V",
+                                                  &handleNotifyUpdateAppliedMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find handleNotifyUpdateApplied method"));
+
+    env->CallVoidMethod(otaProviderDelegate, handleNotifyUpdateAppliedMethod, static_cast<jlong>(nodeId));
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Support, "Exception in call java method");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        err = CHIP_JNI_ERROR_EXCEPTION_THROWN;
+        ExitNow();
+    }
+
+    commandObj->AddStatus(cachedCommandPath, Protocols::InteractionModel::Status::Success);
+    return;
+
+exit:
+    ChipLogError(Controller, "Notify Update Applied Failure : %" CHIP_ERROR_FORMAT, err.Format());
+    commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure);
+}
diff --git a/src/controller/java/OTAProviderDelegateBridge.h b/src/controller/java/OTAProviderDelegateBridge.h
new file mode 100644
index 00000000000000..ae982cda2fa899
--- /dev/null
+++ b/src/controller/java/OTAProviderDelegateBridge.h
@@ -0,0 +1,68 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+#pragma once
+
+#include <jni.h>
+#include <lib/core/CHIPVendorIdentifiers.hpp>
+#include <lib/core/NodeId.h>
+#include <lib/support/JniTypeWrappers.h>
+
+#include <app/clusters/ota-provider/ota-provider-delegate.h>
+
+#include "BdxOTASender.h"
+
+constexpr uint8_t kUpdateTokenLen = 32;
+
+class OTAProviderDelegateBridge : public chip::app::Clusters::OTAProviderDelegate
+{
+public:
+    ~OTAProviderDelegateBridge() override;
+    CHIP_ERROR Init(chip::System::Layer * systemLayer, chip::Messaging::ExchangeManager * exchangeManager,
+                    jobject OTAProviderDelegate);
+    void Shutdown();
+
+    /**
+     * Called to handle a QueryImage command and is responsible for sending the response (if success) or status (if error). The
+     * caller is responsible for validating fields in the command.
+     */
+    void HandleQueryImage(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::DecodableType & commandData) override;
+    /**
+     * Called to handle an ApplyUpdateRequest command and is responsible for sending the response (if success) or status (if error).
+     * The caller is responsible for validating fields in the command.
+     */
+    void HandleApplyUpdateRequest(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::DecodableType & commandData) override;
+    /**
+     * Called to handle a NotifyUpdateApplied command and is responsible for sending the status. The caller is responsible for
+     * validating fields in the command.
+     */
+    void HandleNotifyUpdateApplied(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::DecodableType & commandData) override;
+
+private:
+    void sendOTAQueryFailure(uint8_t status);
+
+    chip::JniGlobalReference mOtaProviderDelegate;
+    std::unique_ptr<BdxOTASender> mBdxOTASender = nullptr;
+
+    uint8_t mToken[kUpdateTokenLen];
+};
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index 62c12f62001130..e0131169c1c4df 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -17,68 +17,84 @@
 
 package chip.devicecontroller;
 
+import chip.devicecontroller.model.AttributeState;
+import chip.devicecontroller.model.AttributeWriteRequest;
+import chip.devicecontroller.model.ChipAttributePath;
+import chip.devicecontroller.model.ChipEventPath;
+import chip.devicecontroller.model.ClusterState;
+import chip.devicecontroller.model.EndpointState;
+import chip.devicecontroller.model.InvokeElement;
+import chip.devicecontroller.model.NodeState;
+
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipClusters {
 
-  public interface DefaultClusterCallback {
+  public interface BaseClusterCallback {
+    void onError(Exception error);
+  }
+
+  public interface DefaultClusterCallback extends BaseClusterCallback {
     void onSuccess();
+  }
+
+  public interface BaseAttributeCallback {
     void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface CharStringAttributeCallback {
+  public interface CharStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for a CHAR_STRING attribute. */
     void onSuccess(String value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface OctetStringAttributeCallback {
+  public interface OctetStringAttributeCallback extends BaseAttributeCallback {
     /** Indicates a successful read for an OCTET_STRING attribute. */
     void onSuccess(byte[] value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface IntegerAttributeCallback {
+  public interface IntegerAttributeCallback extends BaseAttributeCallback {
     void onSuccess(int value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface LongAttributeCallback {
+  public interface LongAttributeCallback extends BaseAttributeCallback {
     void onSuccess(long value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface BooleanAttributeCallback {
+  public interface BooleanAttributeCallback extends BaseAttributeCallback {
     void onSuccess(boolean value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface FloatAttributeCallback {
+  public interface FloatAttributeCallback extends BaseAttributeCallback {
     void onSuccess(float value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
-  public interface DoubleAttributeCallback {
+  public interface DoubleAttributeCallback extends BaseAttributeCallback {
     void onSuccess(double value);
-    void onError(Exception error);
-    default void onSubscriptionEstablished(long subscriptionId) {}
   }
 
   public static abstract class BaseChipCluster {
     protected long chipClusterPtr;
 
-    public BaseChipCluster(long devicePtr, int endpointId) {
-      chipClusterPtr = initWithDevice(devicePtr, endpointId);
+    protected long devicePtr;
+    protected int endpointId;
+    protected long clusterId;
+
+    private Optional<Long> timeoutMillis = Optional.empty();
+
+    public BaseChipCluster(long devicePtr, int endpointId, long clusterId) {
+      this.devicePtr = devicePtr;
+      this.endpointId = endpointId;
+      this.clusterId = clusterId;
     }
 
     /**
@@ -87,22 +103,64 @@ public BaseChipCluster(long devicePtr, int endpointId) {
      * empty optional, the default timeout will be used.
      */
     public void setCommandTimeout(Optional<Long> timeoutMillis) {
-      setCommandTimeout(chipClusterPtr, timeoutMillis);
+      this.timeoutMillis = timeoutMillis;
     }
 
-    private native void setCommandTimeout(long clusterPtr, Optional<Long> timeoutMillis);
-
     /** Returns the current timeout (in milliseconds) for commands sent through this cluster. */
     public Optional<Long> getCommandTimeout() {
-      Optional<Long> timeout = getCommandTimeout(chipClusterPtr);
-      return timeout == null ? Optional.empty() : timeout;
+      return timeoutMillis == null ? Optional.empty() : timeoutMillis;
     }
 
-    private native Optional<Long> getCommandTimeout(long clusterPtr);
-
+    @Deprecated
     public abstract long initWithDevice(long devicePtr, int endpointId);
 
-    public native void deleteCluster(long chipClusterPtr);
+    protected void readAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        boolean isFabricFiltered) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(null, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.read(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, isFabricFiltered, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void writeAttribute(
+        WriteAttributesCallbackImpl callback,
+        long attributeId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      WriteAttributesCallbackJni jniCallback = new WriteAttributesCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      AttributeWriteRequest writeRequest = AttributeWriteRequest.newInstance(endpointId, clusterId, attributeId, tlv);
+      ChipDeviceController.write(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(writeRequest), timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    protected void subscribeAttribute(
+        ReportCallbackImpl callback,
+        long attributeId,
+        int minInterval,
+        int maxInterval) {
+      ReportCallbackJni jniCallback = new ReportCallbackJni(callback, callback, null);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId);
+      ChipDeviceController.subscribe(0, jniCallback.getCallbackHandle(), devicePtr, Arrays.asList(path), null, null, minInterval, maxInterval, false, true, timeoutMillis.orElse(0L).intValue(), null);
+    }
+
+    protected void invoke(
+        InvokeCallbackImpl callback,
+        long commandId,
+        BaseTLVType value,
+        int timedRequestTimeoutMs) {
+      InvokeCallbackJni jniCallback = new InvokeCallbackJni(callback);
+      byte[] tlv = encodeToTlv(value);
+      InvokeElement element = InvokeElement.newInstance(endpointId, clusterId, commandId, tlv, null);
+      ChipDeviceController.invoke(0, jniCallback.getCallbackHandle(), devicePtr, element, timedRequestTimeoutMs, timeoutMillis.orElse(0L).intValue());
+    }
+
+    private static native byte[] encodeToTlv(BaseTLVType value);
+
+    static native BaseTLVType decodeFromTlv(byte[] tlv);
+
+    @Deprecated
+    public void deleteCluster(long chipClusterPtr) {}
     
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
@@ -115,32186 +173,59509 @@ protected void finalize() throws Throwable {
     }
   }
 
+  abstract static class ReportCallbackImpl implements ReportCallback, SubscriptionEstablishedCallback {
+    private BaseAttributeCallback callback;
+    private ChipAttributePath path;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_ATTRIBUTE = 0x86;
+
+    ReportCallbackImpl(BaseAttributeCallback callback, ChipAttributePath path) {
+      this.callback = callback;
+      this.path = path;
+    }
+
+    @Override
+    public void onError(
+        @Nullable ChipAttributePath attributePath,
+        @Nullable ChipEventPath eventPath,
+        @Nonnull Exception e) {
+      callback.onError(e);
+    }
+
+    @Override
+    public void onReport(NodeState nodeState) {
+      if (nodeState == null) {
+        callback.onError(new ChipClusterException());
+        return;
+      }
+
+      EndpointState endpointState = nodeState.getEndpointState((int)path.getEndpointId().getId());
+      if (endpointState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      ClusterState clusterState = endpointState.getClusterState(path.getClusterId().getId());
+      if (clusterState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      AttributeState attributeState = clusterState.getAttributeState(path.getAttributeId().getId());
+      if (attributeState == null) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+        return;
+      }
+
+      byte[] tlv = attributeState.getTlv();
+      if (tlv == null) {
+          callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_ATTRIBUTE));
+          return;
+      }
+
+      onSuccess(tlv);
+    }
+
+    @Override
+    public void onSubscriptionEstablished(long subscriptionId) {
+      callback.onSubscriptionEstablished(subscriptionId);
+    }
+
+    public abstract void onSuccess(byte[] tlv);
+  }
+
+  static class WriteAttributesCallbackImpl implements WriteAttributesCallback {
+    private DefaultClusterCallback callback;
+
+    WriteAttributesCallbackImpl(DefaultClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onResponse(ChipAttributePath attributePath) {
+      callback.onSuccess();
+    }
+
+    @Override
+    public void onError(@Nullable ChipAttributePath attributePath, Exception e) {
+      callback.onError(e);
+    }
+  }
+
+  abstract static class InvokeCallbackImpl implements InvokeCallback {
+    private BaseClusterCallback callback;
+
+    private static final long CHIP_ERROR_UNSUPPORTED_COMMAND = 0x81;
+
+    InvokeCallbackImpl(BaseClusterCallback callback) {
+      this.callback = callback;
+    }
+
+    public void onError(Exception e) {
+      callback.onError(e);
+    }
+
+    public void onResponse(InvokeElement invokeElement, long successCode) {
+      byte[] tlv = invokeElement.getTlvByteArray();
+      if (tlv == null) {
+        onResponse(null);
+        return;
+      }
+      BaseTLVType value = BaseChipCluster.decodeFromTlv(tlv);
+      if (value == null || value.type() != TLVType.Struct) {
+        callback.onError(new ChipClusterException(CHIP_ERROR_UNSUPPORTED_COMMAND));
+        return;
+      }
+      onResponse((StructType)value);
+    }
+
+    public abstract void onResponse(StructType value);
+  }
+
   public static class IdentifyCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 3L;
 
+    private static final long IDENTIFY_TIME_ATTRIBUTE_ID = 0L;
+    private static final long IDENTIFY_TYPE_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public IdentifyCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void identify(DefaultClusterCallback callback, Integer identifyTime) {
-      identify(chipClusterPtr, callback, identifyTime, null);
+      identify(callback, identifyTime, 0);
     }
 
     public void identify(DefaultClusterCallback callback, Integer identifyTime, int timedInvokeTimeoutMs) {
-      identify(chipClusterPtr, callback, identifyTime, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long identifyTimeFieldID = 0L;
+      BaseTLVType identifyTimetlvValue = new UIntType(identifyTime);
+      elements.add(new StructElement(identifyTimeFieldID, identifyTimetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void triggerEffect(DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) {
-      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
+      triggerEffect(callback, effectIdentifier, effectVariant, 0);
     }
 
     public void triggerEffect(DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant, int timedInvokeTimeoutMs) {
-      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
-    }
+      final long commandId = 64L;
 
-    private native void identify(long chipClusterPtr, DefaultClusterCallback callback, Integer identifyTime, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long effectIdentifierFieldID = 0L;
+      BaseTLVType effectIdentifiertlvValue = new UIntType(effectIdentifier);
+      elements.add(new StructElement(effectIdentifierFieldID, effectIdentifiertlvValue));
 
-    private native void triggerEffect(long chipClusterPtr, DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant, @Nullable Integer timedInvokeTimeoutMs);
+      final long effectVariantFieldID = 1L;
+      BaseTLVType effectVarianttlvValue = new UIntType(effectVariant);
+      elements.add(new StructElement(effectVariantFieldID, effectVarianttlvValue));
 
-    public interface GeneratedCommandListAttributeCallback {
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readIdentifyTimeAttribute(
         IntegerAttributeCallback callback) {
-        readIdentifyTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDENTIFY_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, IDENTIFY_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeIdentifyTimeAttribute(chipClusterPtr, callback, value, null);
+      writeIdentifyTimeAttribute(callback, value, 0);
     }
 
     public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeIdentifyTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), IDENTIFY_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeIdentifyTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeIdentifyTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDENTIFY_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IDENTIFY_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readIdentifyTypeAttribute(
         IntegerAttributeCallback callback) {
-        readIdentifyTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDENTIFY_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, IDENTIFY_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeIdentifyTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeIdentifyTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDENTIFY_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IDENTIFY_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readIdentifyTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeIdentifyTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeIdentifyTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readIdentifyTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeIdentifyTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class GroupsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 4L;
 
+    private static final long NAME_SUPPORT_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public GroupsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void addGroup(AddGroupResponseCallback callback, Integer groupID, String groupName) {
-      addGroup(chipClusterPtr, callback, groupID, groupName, null);
+      addGroup(callback, groupID, groupName, 0);
     }
 
     public void addGroup(AddGroupResponseCallback callback, Integer groupID, String groupName, int timedInvokeTimeoutMs) {
-      addGroup(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long groupNameFieldID = 1L;
+      BaseTLVType groupNametlvValue = new StringType(groupName);
+      elements.add(new StructElement(groupNameFieldID, groupNametlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void viewGroup(ViewGroupResponseCallback callback, Integer groupID) {
-      viewGroup(chipClusterPtr, callback, groupID, null);
+      viewGroup(callback, groupID, 0);
     }
 
     public void viewGroup(ViewGroupResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
-      viewGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long groupNameFieldID = 2L;
+          String groupName = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupNameFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                groupName = castingValue.value(String.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, groupName);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void getGroupMembership(GetGroupMembershipResponseCallback callback, ArrayList<Integer> groupList) {
-      getGroupMembership(chipClusterPtr, callback, groupList, null);
+      getGroupMembership(callback, groupList, 0);
     }
 
     public void getGroupMembership(GetGroupMembershipResponseCallback callback, ArrayList<Integer> groupList, int timedInvokeTimeoutMs) {
-      getGroupMembership(chipClusterPtr, callback, groupList, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupListFieldID = 0L;
+      BaseTLVType groupListtlvValue = ArrayType.generateArrayType(groupList, (elementgroupList) -> new UIntType(elementgroupList));
+      elements.add(new StructElement(groupListFieldID, groupListtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long capacityFieldID = 0L;
+          @Nullable Integer capacity = null;
+          final long groupListFieldID = 1L;
+          ArrayList<Integer> groupList = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == capacityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                capacity = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupListFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                groupList = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(capacity, groupList);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeGroup(RemoveGroupResponseCallback callback, Integer groupID) {
-      removeGroup(chipClusterPtr, callback, groupID, null);
+      removeGroup(callback, groupID, 0);
     }
 
     public void removeGroup(RemoveGroupResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
-      removeGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeAllGroups(DefaultClusterCallback callback) {
-      removeAllGroups(chipClusterPtr, callback, null);
+      removeAllGroups(callback, 0);
     }
 
     public void removeAllGroups(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      removeAllGroups(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addGroupIfIdentifying(DefaultClusterCallback callback, Integer groupID, String groupName) {
-      addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, null);
+      addGroupIfIdentifying(callback, groupID, groupName, 0);
     }
 
     public void addGroupIfIdentifying(DefaultClusterCallback callback, Integer groupID, String groupName, int timedInvokeTimeoutMs) {
-      addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
-    }
-
-    private native void addGroup(long chipClusterPtr, AddGroupResponseCallback callback, Integer groupID, String groupName, @Nullable Integer timedInvokeTimeoutMs);
+      final long commandId = 5L;
 
-    private native void viewGroup(long chipClusterPtr, ViewGroupResponseCallback callback, Integer groupID, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
 
-    private native void getGroupMembership(long chipClusterPtr, GetGroupMembershipResponseCallback callback, ArrayList<Integer> groupList, @Nullable Integer timedInvokeTimeoutMs);
+      final long groupNameFieldID = 1L;
+      BaseTLVType groupNametlvValue = new StringType(groupName);
+      elements.add(new StructElement(groupNameFieldID, groupNametlvValue));
 
-    private native void removeGroup(long chipClusterPtr, RemoveGroupResponseCallback callback, Integer groupID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeAllGroups(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addGroupIfIdentifying(long chipClusterPtr, DefaultClusterCallback callback, Integer groupID, String groupName, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface AddGroupResponseCallback {
+    public interface AddGroupResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID);
-      void onError(Exception error);
     }
 
-    public interface ViewGroupResponseCallback {
+    public interface ViewGroupResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, String groupName);
-      void onError(Exception error);
     }
 
-    public interface GetGroupMembershipResponseCallback {
+    public interface GetGroupMembershipResponseCallback extends BaseClusterCallback {
       void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList);
-      void onError(Exception error);
     }
 
-    public interface RemoveGroupResponseCallback {
+    public interface RemoveGroupResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID);
-      void onError(Exception error);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readNameSupportAttribute(
         IntegerAttributeCallback callback) {
-        readNameSupportAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NAME_SUPPORT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NAME_SUPPORT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNameSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NAME_SUPPORT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NAME_SUPPORT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readNameSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeNameSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ScenesCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 5L;
 
+    private static final long SCENE_COUNT_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_SCENE_ATTRIBUTE_ID = 1L;
+    private static final long CURRENT_GROUP_ATTRIBUTE_ID = 2L;
+    private static final long SCENE_VALID_ATTRIBUTE_ID = 3L;
+    private static final long NAME_SUPPORT_ATTRIBUTE_ID = 4L;
+    private static final long LAST_CONFIGURED_BY_ATTRIBUTE_ID = 5L;
+    private static final long SCENE_TABLE_SIZE_ATTRIBUTE_ID = 6L;
+    private static final long FABRIC_SCENE_INFO_ATTRIBUTE_ID = 7L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ScenesCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void addScene(AddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
-      addScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, null);
+      addScene(callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, 0);
     }
 
     public void addScene(AddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets, int timedInvokeTimeoutMs) {
-      addScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      final long sceneNameFieldID = 3L;
+      BaseTLVType sceneNametlvValue = new StringType(sceneName);
+      elements.add(new StructElement(sceneNameFieldID, sceneNametlvValue));
+
+      final long extensionFieldSetsFieldID = 4L;
+      BaseTLVType extensionFieldSetstlvValue = ArrayType.generateArrayType(extensionFieldSets, (elementextensionFieldSets) -> elementextensionFieldSets.encodeTlv());
+      elements.add(new StructElement(extensionFieldSetsFieldID, extensionFieldSetstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void viewScene(ViewSceneResponseCallback callback, Integer groupID, Integer sceneID) {
-      viewScene(chipClusterPtr, callback, groupID, sceneID, null);
+      viewScene(callback, groupID, sceneID, 0);
     }
 
     public void viewScene(ViewSceneResponseCallback callback, Integer groupID, Integer sceneID, int timedInvokeTimeoutMs) {
-      viewScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          final long transitionTimeFieldID = 3L;
+          Optional<Integer> transitionTime = Optional.empty();
+          final long sceneNameFieldID = 4L;
+          Optional<String> sceneName = Optional.empty();
+          final long extensionFieldSetsFieldID = 5L;
+          Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == transitionTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                transitionTime = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == sceneNameFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                sceneName = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == extensionFieldSetsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                extensionFieldSets = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ScenesClusterExtensionFieldSet.decodeTlv(elementcastingValue)));
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID, transitionTime, sceneName, extensionFieldSets);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeScene(RemoveSceneResponseCallback callback, Integer groupID, Integer sceneID) {
-      removeScene(chipClusterPtr, callback, groupID, sceneID, null);
+      removeScene(callback, groupID, sceneID, 0);
     }
 
     public void removeScene(RemoveSceneResponseCallback callback, Integer groupID, Integer sceneID, int timedInvokeTimeoutMs) {
-      removeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupID) {
-      removeAllScenes(chipClusterPtr, callback, groupID, null);
+      removeAllScenes(callback, groupID, 0);
     }
 
     public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
-      removeAllScenes(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void storeScene(StoreSceneResponseCallback callback, Integer groupID, Integer sceneID) {
-      storeScene(chipClusterPtr, callback, groupID, sceneID, null);
+      storeScene(callback, groupID, sceneID, 0);
     }
 
     public void storeScene(StoreSceneResponseCallback callback, Integer groupID, Integer sceneID, int timedInvokeTimeoutMs) {
-      storeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void recallScene(DefaultClusterCallback callback, Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime) {
-      recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, null);
+      recallScene(callback, groupID, sceneID, transitionTime, 0);
     }
 
     public void recallScene(DefaultClusterCallback callback, Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime, int timedInvokeTimeoutMs) {
-      recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, timedInvokeTimeoutMs);
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = transitionTime != null ? transitionTime.<BaseTLVType>map((nonOptionaltransitionTime) -> new UIntType(nonOptionaltransitionTime)).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupID) {
-      getSceneMembership(chipClusterPtr, callback, groupID, null);
+      getSceneMembership(callback, groupID, 0);
     }
 
     public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
-      getSceneMembership(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long capacityFieldID = 1L;
+          @Nullable Integer capacity = null;
+          final long groupIDFieldID = 2L;
+          Integer groupID = null;
+          final long sceneListFieldID = 3L;
+          Optional<ArrayList<Integer>> sceneList = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == capacityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                capacity = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneListFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                sceneList = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+              }
+            }
+          }
+          callback.onSuccess(status, capacity, groupID, sceneList);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void enhancedAddScene(EnhancedAddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
-      enhancedAddScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, null);
+      enhancedAddScene(callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, 0);
     }
 
     public void enhancedAddScene(EnhancedAddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets, int timedInvokeTimeoutMs) {
-      enhancedAddScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, timedInvokeTimeoutMs);
+      final long commandId = 64L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      final long sceneNameFieldID = 3L;
+      BaseTLVType sceneNametlvValue = new StringType(sceneName);
+      elements.add(new StructElement(sceneNameFieldID, sceneNametlvValue));
+
+      final long extensionFieldSetsFieldID = 4L;
+      BaseTLVType extensionFieldSetstlvValue = ArrayType.generateArrayType(extensionFieldSets, (elementextensionFieldSets) -> elementextensionFieldSets.encodeTlv());
+      elements.add(new StructElement(extensionFieldSetsFieldID, extensionFieldSetstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void enhancedViewScene(EnhancedViewSceneResponseCallback callback, Integer groupID, Integer sceneID) {
-      enhancedViewScene(chipClusterPtr, callback, groupID, sceneID, null);
+      enhancedViewScene(callback, groupID, sceneID, 0);
     }
 
     public void enhancedViewScene(EnhancedViewSceneResponseCallback callback, Integer groupID, Integer sceneID, int timedInvokeTimeoutMs) {
-      enhancedViewScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+      final long commandId = 65L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupIDFieldID = 0L;
+      BaseTLVType groupIDtlvValue = new UIntType(groupID);
+      elements.add(new StructElement(groupIDFieldID, groupIDtlvValue));
+
+      final long sceneIDFieldID = 1L;
+      BaseTLVType sceneIDtlvValue = new UIntType(sceneID);
+      elements.add(new StructElement(sceneIDFieldID, sceneIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIDFieldID = 1L;
+          Integer groupID = null;
+          final long sceneIDFieldID = 2L;
+          Integer sceneID = null;
+          final long transitionTimeFieldID = 3L;
+          Optional<Integer> transitionTime = Optional.empty();
+          final long sceneNameFieldID = 4L;
+          Optional<String> sceneName = Optional.empty();
+          final long extensionFieldSetsFieldID = 5L;
+          Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneID = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == transitionTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                transitionTime = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == sceneNameFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                sceneName = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == extensionFieldSetsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                extensionFieldSets = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ScenesClusterExtensionFieldSet.decodeTlv(elementcastingValue)));
+              }
+            }
+          }
+          callback.onSuccess(status, groupID, sceneID, transitionTime, sceneName, extensionFieldSets);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void copyScene(CopySceneResponseCallback callback, Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo) {
-      copyScene(chipClusterPtr, callback, mode, groupIdentifierFrom, sceneIdentifierFrom, groupIdentifierTo, sceneIdentifierTo, null);
+      copyScene(callback, mode, groupIdentifierFrom, sceneIdentifierFrom, groupIdentifierTo, sceneIdentifierTo, 0);
     }
 
     public void copyScene(CopySceneResponseCallback callback, Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo, int timedInvokeTimeoutMs) {
-      copyScene(chipClusterPtr, callback, mode, groupIdentifierFrom, sceneIdentifierFrom, groupIdentifierTo, sceneIdentifierTo, timedInvokeTimeoutMs);
-    }
-
-    private native void addScene(long chipClusterPtr, AddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void viewScene(long chipClusterPtr, ViewSceneResponseCallback callback, Integer groupID, Integer sceneID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeScene(long chipClusterPtr, RemoveSceneResponseCallback callback, Integer groupID, Integer sceneID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeAllScenes(long chipClusterPtr, RemoveAllScenesResponseCallback callback, Integer groupID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void storeScene(long chipClusterPtr, StoreSceneResponseCallback callback, Integer groupID, Integer sceneID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void recallScene(long chipClusterPtr, DefaultClusterCallback callback, Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void getSceneMembership(long chipClusterPtr, GetSceneMembershipResponseCallback callback, Integer groupID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedAddScene(long chipClusterPtr, EnhancedAddSceneResponseCallback callback, Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedViewScene(long chipClusterPtr, EnhancedViewSceneResponseCallback callback, Integer groupID, Integer sceneID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void copyScene(long chipClusterPtr, CopySceneResponseCallback callback, Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface AddSceneResponseCallback {
+      final long commandId = 66L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long modeFieldID = 0L;
+      BaseTLVType modetlvValue = new UIntType(mode);
+      elements.add(new StructElement(modeFieldID, modetlvValue));
+
+      final long groupIdentifierFromFieldID = 1L;
+      BaseTLVType groupIdentifierFromtlvValue = new UIntType(groupIdentifierFrom);
+      elements.add(new StructElement(groupIdentifierFromFieldID, groupIdentifierFromtlvValue));
+
+      final long sceneIdentifierFromFieldID = 2L;
+      BaseTLVType sceneIdentifierFromtlvValue = new UIntType(sceneIdentifierFrom);
+      elements.add(new StructElement(sceneIdentifierFromFieldID, sceneIdentifierFromtlvValue));
+
+      final long groupIdentifierToFieldID = 3L;
+      BaseTLVType groupIdentifierTotlvValue = new UIntType(groupIdentifierTo);
+      elements.add(new StructElement(groupIdentifierToFieldID, groupIdentifierTotlvValue));
+
+      final long sceneIdentifierToFieldID = 4L;
+      BaseTLVType sceneIdentifierTotlvValue = new UIntType(sceneIdentifierTo);
+      elements.add(new StructElement(sceneIdentifierToFieldID, sceneIdentifierTotlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long groupIdentifierFromFieldID = 1L;
+          Integer groupIdentifierFrom = null;
+          final long sceneIdentifierFromFieldID = 2L;
+          Integer sceneIdentifierFrom = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == groupIdentifierFromFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                groupIdentifierFrom = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == sceneIdentifierFromFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                sceneIdentifierFrom = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, groupIdentifierFrom, sceneIdentifierFrom);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface AddSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID);
-      void onError(Exception error);
     }
 
-    public interface ViewSceneResponseCallback {
+    public interface ViewSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
-      void onError(Exception error);
     }
 
-    public interface RemoveSceneResponseCallback {
+    public interface RemoveSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID);
-      void onError(Exception error);
     }
 
-    public interface RemoveAllScenesResponseCallback {
+    public interface RemoveAllScenesResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID);
-      void onError(Exception error);
     }
 
-    public interface StoreSceneResponseCallback {
+    public interface StoreSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID);
-      void onError(Exception error);
     }
 
-    public interface GetSceneMembershipResponseCallback {
+    public interface GetSceneMembershipResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, @Nullable Integer capacity, Integer groupID, Optional<ArrayList<Integer>> sceneList);
-      void onError(Exception error);
     }
 
-    public interface EnhancedAddSceneResponseCallback {
+    public interface EnhancedAddSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID);
-      void onError(Exception error);
     }
 
-    public interface EnhancedViewSceneResponseCallback {
+    public interface EnhancedViewSceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
-      void onError(Exception error);
     }
 
-    public interface CopySceneResponseCallback {
+    public interface CopySceneResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Integer groupIdentifierFrom, Integer sceneIdentifierFrom);
-      void onError(Exception error);
     }
 
-    public interface LastConfiguredByAttributeCallback {
+    public interface LastConfiguredByAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface FabricSceneInfoAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.ScenesClusterSceneInfoStruct> value);
+    }
+
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSceneCountAttribute(
         IntegerAttributeCallback callback) {
-        readSceneCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCENE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSceneCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSceneCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCENE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentSceneAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentSceneAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SCENE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_SCENE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentSceneAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentSceneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SCENE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_SCENE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentGroupAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentGroupAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_GROUP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_GROUP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentGroupAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentGroupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_GROUP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_GROUP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSceneValidAttribute(
         BooleanAttributeCallback callback) {
-        readSceneValidAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_VALID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCENE_VALID_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSceneValidAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSceneValidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_VALID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCENE_VALID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNameSupportAttribute(
         IntegerAttributeCallback callback) {
-        readNameSupportAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NAME_SUPPORT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NAME_SUPPORT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNameSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NAME_SUPPORT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NAME_SUPPORT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastConfiguredByAttribute(
         LastConfiguredByAttributeCallback callback) {
-        readLastConfiguredByAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CONFIGURED_BY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_CONFIGURED_BY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLastConfiguredByAttribute(
         LastConfiguredByAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastConfiguredByAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CONFIGURED_BY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_CONFIGURED_BY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSceneTableSizeAttribute(
         IntegerAttributeCallback callback) {
-        readSceneTableSizeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_TABLE_SIZE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCENE_TABLE_SIZE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSceneTableSizeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSceneTableSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCENE_TABLE_SIZE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCENE_TABLE_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRemainingCapacityAttribute(
-        IntegerAttributeCallback callback) {
-        readRemainingCapacityAttribute(chipClusterPtr, callback);
+    public void readFabricSceneInfoAttribute(
+        FabricSceneInfoAttributeCallback callback) {
+      readFabricSceneInfoAttributeWithFabricFilter(callback, true);
     }
 
-    public void subscribeRemainingCapacityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRemainingCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readFabricSceneInfoAttributeWithFabricFilter(
+        FabricSceneInfoAttributeCallback callback, boolean isFabricFiltered) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRIC_SCENE_INFO_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ScenesClusterSceneInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FABRIC_SCENE_INFO_ATTRIBUTE_ID, isFabricFiltered);
+    }
+
+    public void subscribeFabricSceneInfoAttribute(
+        FabricSceneInfoAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRIC_SCENE_INFO_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ScenesClusterSceneInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FABRIC_SCENE_INFO_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSceneCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSceneCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentSceneAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentSceneAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentGroupAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentGroupAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSceneValidAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeSceneValidAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNameSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeNameSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLastConfiguredByAttribute(long chipClusterPtr, LastConfiguredByAttributeCallback callback);
-
-    private native void subscribeLastConfiguredByAttribute(long chipClusterPtr, LastConfiguredByAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSceneTableSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSceneTableSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRemainingCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRemainingCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class OnOffCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 6L;
 
+    private static final long ON_OFF_ATTRIBUTE_ID = 0L;
+    private static final long GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID = 16384L;
+    private static final long ON_TIME_ATTRIBUTE_ID = 16385L;
+    private static final long OFF_WAIT_TIME_ATTRIBUTE_ID = 16386L;
+    private static final long START_UP_ON_OFF_ATTRIBUTE_ID = 16387L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public OnOffCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void off(DefaultClusterCallback callback) {
-      off(chipClusterPtr, callback, null);
+      off(callback, 0);
     }
 
     public void off(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      off(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void on(DefaultClusterCallback callback) {
-      on(chipClusterPtr, callback, null);
+      on(callback, 0);
     }
 
     public void on(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      on(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void toggle(DefaultClusterCallback callback) {
-      toggle(chipClusterPtr, callback, null);
+      toggle(callback, 0);
     }
 
     public void toggle(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      toggle(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void offWithEffect(DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) {
-      offWithEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
+      offWithEffect(callback, effectIdentifier, effectVariant, 0);
     }
 
     public void offWithEffect(DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant, int timedInvokeTimeoutMs) {
-      offWithEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
+      final long commandId = 64L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long effectIdentifierFieldID = 0L;
+      BaseTLVType effectIdentifiertlvValue = new UIntType(effectIdentifier);
+      elements.add(new StructElement(effectIdentifierFieldID, effectIdentifiertlvValue));
+
+      final long effectVariantFieldID = 1L;
+      BaseTLVType effectVarianttlvValue = new UIntType(effectVariant);
+      elements.add(new StructElement(effectVariantFieldID, effectVarianttlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void onWithRecallGlobalScene(DefaultClusterCallback callback) {
-      onWithRecallGlobalScene(chipClusterPtr, callback, null);
+      onWithRecallGlobalScene(callback, 0);
     }
 
     public void onWithRecallGlobalScene(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      onWithRecallGlobalScene(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 65L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void onWithTimedOff(DefaultClusterCallback callback, Integer onOffControl, Integer onTime, Integer offWaitTime) {
-      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, null);
+      onWithTimedOff(callback, onOffControl, onTime, offWaitTime, 0);
     }
 
     public void onWithTimedOff(DefaultClusterCallback callback, Integer onOffControl, Integer onTime, Integer offWaitTime, int timedInvokeTimeoutMs) {
-      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, timedInvokeTimeoutMs);
-    }
-
-    private native void off(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      final long commandId = 66L;
 
-    private native void on(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long onOffControlFieldID = 0L;
+      BaseTLVType onOffControltlvValue = new UIntType(onOffControl);
+      elements.add(new StructElement(onOffControlFieldID, onOffControltlvValue));
 
-    private native void toggle(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      final long onTimeFieldID = 1L;
+      BaseTLVType onTimetlvValue = new UIntType(onTime);
+      elements.add(new StructElement(onTimeFieldID, onTimetlvValue));
 
-    private native void offWithEffect(long chipClusterPtr, DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant, @Nullable Integer timedInvokeTimeoutMs);
+      final long offWaitTimeFieldID = 2L;
+      BaseTLVType offWaitTimetlvValue = new UIntType(offWaitTime);
+      elements.add(new StructElement(offWaitTimeFieldID, offWaitTimetlvValue));
 
-    private native void onWithRecallGlobalScene(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void onWithTimedOff(long chipClusterPtr, DefaultClusterCallback callback, Integer onOffControl, Integer onTime, Integer offWaitTime, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface StartUpOnOffAttributeCallback {
+    public interface StartUpOnOffAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readOnOffAttribute(
         BooleanAttributeCallback callback) {
-        readOnOffAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_OFF_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_OFF_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOnOffAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_OFF_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_OFF_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGlobalSceneControlAttribute(
         BooleanAttributeCallback callback) {
-        readGlobalSceneControlAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGlobalSceneControlAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGlobalSceneControlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnTimeAttribute(
         IntegerAttributeCallback callback) {
-        readOnTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnTimeAttribute(chipClusterPtr, callback, value, null);
+      writeOnTimeAttribute(callback, value, 0);
     }
 
     public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOffWaitTimeAttribute(
         IntegerAttributeCallback callback) {
-        readOffWaitTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OFF_WAIT_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OFF_WAIT_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOffWaitTimeAttribute(chipClusterPtr, callback, value, null);
+      writeOffWaitTimeAttribute(callback, value, 0);
     }
 
     public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOffWaitTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OFF_WAIT_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOffWaitTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOffWaitTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OFF_WAIT_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OFF_WAIT_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStartUpOnOffAttribute(
         StartUpOnOffAttributeCallback callback) {
-        readStartUpOnOffAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_ON_OFF_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_ON_OFF_ATTRIBUTE_ID, true);
     }
 
     public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpOnOffAttribute(chipClusterPtr, callback, value, null);
+      writeStartUpOnOffAttribute(callback, value, 0);
     }
 
     public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpOnOffAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_ON_OFF_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeStartUpOnOffAttribute(
         StartUpOnOffAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_ON_OFF_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_ON_OFF_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGlobalSceneControlAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeGlobalSceneControlAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOffWaitTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOffWaitTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOffWaitTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartUpOnOffAttribute(long chipClusterPtr, StartUpOnOffAttributeCallback callback);
-
-    private native void writeStartUpOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeStartUpOnOffAttribute(long chipClusterPtr, StartUpOnOffAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 7L;
 
+    private static final long SWITCH_TYPE_ATTRIBUTE_ID = 0L;
+    private static final long SWITCH_ACTIONS_ATTRIBUTE_ID = 16L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public OnOffSwitchConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSwitchTypeAttribute(
         IntegerAttributeCallback callback) {
-        readSwitchTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SWITCH_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SWITCH_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSwitchTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSwitchTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SWITCH_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SWITCH_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSwitchActionsAttribute(
         IntegerAttributeCallback callback) {
-        readSwitchActionsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SWITCH_ACTIONS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SWITCH_ACTIONS_ATTRIBUTE_ID, true);
     }
 
     public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSwitchActionsAttribute(chipClusterPtr, callback, value, null);
+      writeSwitchActionsAttribute(callback, value, 0);
     }
 
     public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSwitchActionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SWITCH_ACTIONS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSwitchActionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSwitchActionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SWITCH_ACTIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SWITCH_ACTIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readSwitchTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class LevelControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 8L;
 
-    private native void subscribeSwitchTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long CURRENT_LEVEL_ATTRIBUTE_ID = 0L;
+    private static final long REMAINING_TIME_ATTRIBUTE_ID = 1L;
+    private static final long MIN_LEVEL_ATTRIBUTE_ID = 2L;
+    private static final long MAX_LEVEL_ATTRIBUTE_ID = 3L;
+    private static final long CURRENT_FREQUENCY_ATTRIBUTE_ID = 4L;
+    private static final long MIN_FREQUENCY_ATTRIBUTE_ID = 5L;
+    private static final long MAX_FREQUENCY_ATTRIBUTE_ID = 6L;
+    private static final long OPTIONS_ATTRIBUTE_ID = 15L;
+    private static final long ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID = 16L;
+    private static final long ON_LEVEL_ATTRIBUTE_ID = 17L;
+    private static final long ON_TRANSITION_TIME_ATTRIBUTE_ID = 18L;
+    private static final long OFF_TRANSITION_TIME_ATTRIBUTE_ID = 19L;
+    private static final long DEFAULT_MOVE_RATE_ATTRIBUTE_ID = 20L;
+    private static final long START_UP_CURRENT_LEVEL_ATTRIBUTE_ID = 16384L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readSwitchActionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public LevelControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void writeSwitchActionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeSwitchActionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void moveToLevel(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToLevel(callback, level, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void moveToLevel(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long levelFieldID = 0L;
+      BaseTLVType leveltlvValue = new UIntType(level);
+      elements.add(new StructElement(levelFieldID, leveltlvValue));
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = transitionTime != null ? new UIntType(transitionTime) : new NullType();
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void move(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride) {
+      move(callback, moveMode, rate, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void move(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = rate != null ? new UIntType(rate) : new NullType();
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-  public static class LevelControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 8L;
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public LevelControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void step(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      step(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void step(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    public void moveToLevel(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToLevel(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    public void moveToLevel(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToLevel(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    public void move(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride) {
-      move(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = transitionTime != null ? new UIntType(transitionTime) : new NullType();
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void move(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      move(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void step(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void step(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void stop(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
-      stop(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+      stop(callback, optionsMask, optionsOverride, 0);
     }
 
     public void stop(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stop(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long optionsMaskFieldID = 0L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
+
+      final long optionsOverrideFieldID = 1L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void moveToLevelWithOnOff(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
+      moveToLevelWithOnOff(callback, level, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     public void moveToLevelWithOnOff(DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long levelFieldID = 0L;
+      BaseTLVType leveltlvValue = new UIntType(level);
+      elements.add(new StructElement(levelFieldID, leveltlvValue));
+
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = transitionTime != null ? new UIntType(transitionTime) : new NullType();
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
+
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void moveWithOnOff(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride) {
-      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+      moveWithOnOff(callback, moveMode, rate, optionsMask, optionsOverride, 0);
     }
 
     public void moveWithOnOff(DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
+
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = rate != null ? new UIntType(rate) : new NullType();
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
+
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
+
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void stepWithOnOff(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+      stepWithOnOff(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     public void stepWithOnOff(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long commandId = 6L;
 
-    public void stopWithOnOff(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
-      stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    public void stopWithOnOff(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    public void moveToClosestFrequency(DefaultClusterCallback callback, Integer frequency) {
-      moveToClosestFrequency(chipClusterPtr, callback, frequency, null);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = transitionTime != null ? new UIntType(transitionTime) : new NullType();
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void moveToClosestFrequency(DefaultClusterCallback callback, Integer frequency, int timedInvokeTimeoutMs) {
-      moveToClosestFrequency(chipClusterPtr, callback, frequency, timedInvokeTimeoutMs);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
+
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    private native void moveToLevel(long chipClusterPtr, DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void stopWithOnOff(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
+      stopWithOnOff(callback, optionsMask, optionsOverride, 0);
+    }
 
-    private native void move(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void stopWithOnOff(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
 
-    private native void step(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long optionsMaskFieldID = 0L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void stop(long chipClusterPtr, DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long optionsOverrideFieldID = 1L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void moveToLevelWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void moveWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void moveToClosestFrequency(DefaultClusterCallback callback, Integer frequency) {
+      moveToClosestFrequency(callback, frequency, 0);
+    }
 
-    private native void stepWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void moveToClosestFrequency(DefaultClusterCallback callback, Integer frequency, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
 
-    private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long frequencyFieldID = 0L;
+      BaseTLVType frequencytlvValue = new UIntType(frequency);
+      elements.add(new StructElement(frequencyFieldID, frequencytlvValue));
 
-    private native void moveToClosestFrequency(long chipClusterPtr, DefaultClusterCallback callback, Integer frequency, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface CurrentLevelAttributeCallback {
+    public interface CurrentLevelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OnLevelAttributeCallback {
+    public interface OnLevelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OnTransitionTimeAttributeCallback {
+    public interface OnTransitionTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OffTransitionTimeAttributeCallback {
+    public interface OffTransitionTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DefaultMoveRateAttributeCallback {
+    public interface DefaultMoveRateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface StartUpCurrentLevelAttributeCallback {
+    public interface StartUpCurrentLevelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readCurrentLevelAttribute(
         CurrentLevelAttributeCallback callback) {
-        readCurrentLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentLevelAttribute(
         CurrentLevelAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRemainingTimeAttribute(
         IntegerAttributeCallback callback) {
-        readRemainingTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REMAINING_TIME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRemainingTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REMAINING_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinLevelAttribute(
         IntegerAttributeCallback callback) {
-        readMinLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxLevelAttribute(
         IntegerAttributeCallback callback) {
-        readMaxLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentFrequencyAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentFrequencyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_FREQUENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_FREQUENCY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentFrequencyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_FREQUENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_FREQUENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinFrequencyAttribute(
         IntegerAttributeCallback callback) {
-        readMinFrequencyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_FREQUENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_FREQUENCY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinFrequencyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_FREQUENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_FREQUENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxFrequencyAttribute(
         IntegerAttributeCallback callback) {
-        readMaxFrequencyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FREQUENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_FREQUENCY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxFrequencyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FREQUENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_FREQUENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOptionsAttribute(
         IntegerAttributeCallback callback) {
-        readOptionsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, true);
     }
 
     public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, null);
+      writeOptionsAttribute(callback, value, 0);
     }
 
     public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPTIONS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOptionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnOffTransitionTimeAttribute(
         IntegerAttributeCallback callback) {
-        readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+      writeOnOffTransitionTimeAttribute(callback, value, 0);
     }
 
     public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnOffTransitionTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnLevelAttribute(
         OnLevelAttributeCallback callback) {
-        readOnLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnLevelAttribute(chipClusterPtr, callback, value, null);
+      writeOnLevelAttribute(callback, value, 0);
     }
 
     public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnLevelAttribute(
         OnLevelAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnTransitionTimeAttribute(
         OnTransitionTimeAttributeCallback callback) {
-        readOnTransitionTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_TRANSITION_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+      writeOnTransitionTimeAttribute(callback, value, 0);
     }
 
     public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_TRANSITION_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnTransitionTimeAttribute(
         OnTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_TRANSITION_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOffTransitionTimeAttribute(
         OffTransitionTimeAttributeCallback callback) {
-        readOffTransitionTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OFF_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OFF_TRANSITION_TIME_ATTRIBUTE_ID, true);
     }
 
     public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+      writeOffTransitionTimeAttribute(callback, value, 0);
     }
 
     public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OFF_TRANSITION_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOffTransitionTimeAttribute(
         OffTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OFF_TRANSITION_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OFF_TRANSITION_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDefaultMoveRateAttribute(
         DefaultMoveRateAttributeCallback callback) {
-        readDefaultMoveRateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_MOVE_RATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_MOVE_RATE_ATTRIBUTE_ID, true);
     }
 
     public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value) {
-        writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, null);
+      writeDefaultMoveRateAttribute(callback, value, 0);
     }
 
     public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_MOVE_RATE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeDefaultMoveRateAttribute(
         DefaultMoveRateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDefaultMoveRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_MOVE_RATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_MOVE_RATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStartUpCurrentLevelAttribute(
         StartUpCurrentLevelAttributeCallback callback) {
-        readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_CURRENT_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_CURRENT_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, null);
+      writeStartUpCurrentLevelAttribute(callback, value, 0);
     }
 
     public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_CURRENT_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeStartUpCurrentLevelAttribute(
         StartUpCurrentLevelAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_CURRENT_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_CURRENT_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readCurrentLevelAttribute(long chipClusterPtr, CurrentLevelAttributeCallback callback);
-
-    private native void subscribeCurrentLevelAttribute(long chipClusterPtr, CurrentLevelAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRemainingTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRemainingTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMinFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnOffTransitionTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnOffTransitionTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnLevelAttribute(long chipClusterPtr, OnLevelAttributeCallback callback);
-
-    private native void writeOnLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnLevelAttribute(long chipClusterPtr, OnLevelAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnTransitionTimeAttribute(long chipClusterPtr, OnTransitionTimeAttributeCallback callback);
-
-    private native void writeOnTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnTransitionTimeAttribute(long chipClusterPtr, OnTransitionTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOffTransitionTimeAttribute(long chipClusterPtr, OffTransitionTimeAttributeCallback callback);
-
-    private native void writeOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOffTransitionTimeAttribute(long chipClusterPtr, OffTransitionTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDefaultMoveRateAttribute(long chipClusterPtr, DefaultMoveRateAttributeCallback callback);
-
-    private native void writeDefaultMoveRateAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeDefaultMoveRateAttribute(long chipClusterPtr, DefaultMoveRateAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartUpCurrentLevelAttribute(long chipClusterPtr, StartUpCurrentLevelAttributeCallback callback);
-
-    private native void writeStartUpCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeStartUpCurrentLevelAttribute(long chipClusterPtr, StartUpCurrentLevelAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class BinaryInputBasicCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 15L;
 
+    private static final long ACTIVE_TEXT_ATTRIBUTE_ID = 4L;
+    private static final long DESCRIPTION_ATTRIBUTE_ID = 28L;
+    private static final long INACTIVE_TEXT_ATTRIBUTE_ID = 46L;
+    private static final long OUT_OF_SERVICE_ATTRIBUTE_ID = 81L;
+    private static final long POLARITY_ATTRIBUTE_ID = 84L;
+    private static final long PRESENT_VALUE_ATTRIBUTE_ID = 85L;
+    private static final long RELIABILITY_ATTRIBUTE_ID = 103L;
+    private static final long STATUS_FLAGS_ATTRIBUTE_ID = 111L;
+    private static final long APPLICATION_TYPE_ATTRIBUTE_ID = 256L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public BinaryInputBasicCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readActiveTextAttribute(
         CharStringAttributeCallback callback) {
-        readActiveTextAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_TEXT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_TEXT_ATTRIBUTE_ID, true);
     }
 
     public void writeActiveTextAttribute(DefaultClusterCallback callback, String value) {
-        writeActiveTextAttribute(chipClusterPtr, callback, value, null);
+      writeActiveTextAttribute(callback, value, 0);
     }
 
     public void writeActiveTextAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeActiveTextAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_TEXT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeActiveTextAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_TEXT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_TEXT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDescriptionAttribute(
         CharStringAttributeCallback callback) {
-        readDescriptionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, true);
     }
 
     public void writeDescriptionAttribute(DefaultClusterCallback callback, String value) {
-        writeDescriptionAttribute(chipClusterPtr, callback, value, null);
+      writeDescriptionAttribute(callback, value, 0);
     }
 
     public void writeDescriptionAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeDescriptionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DESCRIPTION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeDescriptionAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readInactiveTextAttribute(
         CharStringAttributeCallback callback) {
-        readInactiveTextAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INACTIVE_TEXT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INACTIVE_TEXT_ATTRIBUTE_ID, true);
     }
 
     public void writeInactiveTextAttribute(DefaultClusterCallback callback, String value) {
-        writeInactiveTextAttribute(chipClusterPtr, callback, value, null);
+      writeInactiveTextAttribute(callback, value, 0);
     }
 
     public void writeInactiveTextAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeInactiveTextAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INACTIVE_TEXT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeInactiveTextAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInactiveTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INACTIVE_TEXT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INACTIVE_TEXT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOutOfServiceAttribute(
         BooleanAttributeCallback callback) {
-        readOutOfServiceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUT_OF_SERVICE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OUT_OF_SERVICE_ATTRIBUTE_ID, true);
     }
 
     public void writeOutOfServiceAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeOutOfServiceAttribute(chipClusterPtr, callback, value, null);
+      writeOutOfServiceAttribute(callback, value, 0);
     }
 
     public void writeOutOfServiceAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeOutOfServiceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OUT_OF_SERVICE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOutOfServiceAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOutOfServiceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUT_OF_SERVICE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OUT_OF_SERVICE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPolarityAttribute(
         IntegerAttributeCallback callback) {
-        readPolarityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POLARITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POLARITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribePolarityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePolarityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POLARITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POLARITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPresentValueAttribute(
         BooleanAttributeCallback callback) {
-        readPresentValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRESENT_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRESENT_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void writePresentValueAttribute(DefaultClusterCallback callback, Boolean value) {
-        writePresentValueAttribute(chipClusterPtr, callback, value, null);
+      writePresentValueAttribute(callback, value, 0);
     }
 
     public void writePresentValueAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writePresentValueAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PRESENT_VALUE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePresentValueAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePresentValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRESENT_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRESENT_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readReliabilityAttribute(
         IntegerAttributeCallback callback) {
-        readReliabilityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RELIABILITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RELIABILITY_ATTRIBUTE_ID, true);
     }
 
     public void writeReliabilityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeReliabilityAttribute(chipClusterPtr, callback, value, null);
+      writeReliabilityAttribute(callback, value, 0);
     }
 
     public void writeReliabilityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeReliabilityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RELIABILITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeReliabilityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReliabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RELIABILITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RELIABILITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStatusFlagsAttribute(
         IntegerAttributeCallback callback) {
-        readStatusFlagsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_FLAGS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATUS_FLAGS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeStatusFlagsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStatusFlagsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_FLAGS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATUS_FLAGS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readApplicationTypeAttribute(
         LongAttributeCallback callback) {
-        readApplicationTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPLICATION_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeApplicationTypeAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPLICATION_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readActiveTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+  public static class PulseWidthModulationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 28L;
 
-    private native void writeActiveTextAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeActiveTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public PulseWidthModulationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void writeDescriptionAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readInactiveTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeInactiveTextAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeInactiveTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readOutOfServiceAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeOutOfServiceAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeOutOfServiceAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPolarityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePolarityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPresentValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribePresentValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readReliabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeReliabilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeReliabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStatusFlagsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeStatusFlagsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readApplicationTypeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeApplicationTypeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class PulseWidthModulationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 28L;
-
-    public PulseWidthModulationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class DescriptorCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 29L;
 
+    private static final long DEVICE_TYPE_LIST_ATTRIBUTE_ID = 0L;
+    private static final long SERVER_LIST_ATTRIBUTE_ID = 1L;
+    private static final long CLIENT_LIST_ATTRIBUTE_ID = 2L;
+    private static final long PARTS_LIST_ATTRIBUTE_ID = 3L;
+    private static final long TAG_LIST_ATTRIBUTE_ID = 4L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public DescriptorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface DeviceTypeListAttributeCallback {
+    public interface DeviceTypeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.DescriptorClusterDeviceTypeStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ServerListAttributeCallback {
+    public interface ServerListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ClientListAttributeCallback {
+    public interface ClientListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PartsListAttributeCallback {
+    public interface PartsListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface TagListAttributeCallback {
+    public interface TagListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.DescriptorClusterSemanticTagStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readDeviceTypeListAttribute(
         DeviceTypeListAttributeCallback callback) {
-        readDeviceTypeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_TYPE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DescriptorClusterDeviceTypeStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEVICE_TYPE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDeviceTypeListAttribute(
         DeviceTypeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDeviceTypeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_TYPE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DescriptorClusterDeviceTypeStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEVICE_TYPE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readServerListAttribute(
         ServerListAttributeCallback callback) {
-        readServerListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERVER_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SERVER_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeServerListAttribute(
         ServerListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeServerListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERVER_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SERVER_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClientListAttribute(
         ClientListAttributeCallback callback) {
-        readClientListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLIENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLIENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClientListAttribute(
         ClientListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClientListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLIENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLIENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPartsListAttribute(
         PartsListAttributeCallback callback) {
-        readPartsListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTS_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PARTS_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribePartsListAttribute(
         PartsListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePartsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTS_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PARTS_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTagListAttribute(
         TagListAttributeCallback callback) {
-        readTagListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TAG_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DescriptorClusterSemanticTagStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TAG_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTagListAttribute(
         TagListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTagListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TAG_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DescriptorClusterSemanticTagStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TAG_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readDeviceTypeListAttribute(long chipClusterPtr, DeviceTypeListAttributeCallback callback);
-
-    private native void subscribeDeviceTypeListAttribute(long chipClusterPtr, DeviceTypeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readServerListAttribute(long chipClusterPtr, ServerListAttributeCallback callback);
-
-    private native void subscribeServerListAttribute(long chipClusterPtr, ServerListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClientListAttribute(long chipClusterPtr, ClientListAttributeCallback callback);
-
-    private native void subscribeClientListAttribute(long chipClusterPtr, ClientListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPartsListAttribute(long chipClusterPtr, PartsListAttributeCallback callback);
-
-    private native void subscribePartsListAttribute(long chipClusterPtr, PartsListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTagListAttribute(long chipClusterPtr, TagListAttributeCallback callback);
-
-    private native void subscribeTagListAttribute(long chipClusterPtr, TagListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class BindingCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 30L;
 
+    private static final long BINDING_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public BindingCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface BindingAttributeCallback {
+    public interface BindingAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.BindingClusterTargetStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readBindingAttribute(
         BindingAttributeCallback callback) {
-        readBindingAttribute(chipClusterPtr, callback, true);
+      readBindingAttributeWithFabricFilter(callback, true);
     }
 
     public void readBindingAttributeWithFabricFilter(
         BindingAttributeCallback callback, boolean isFabricFiltered) {
-        readBindingAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BINDING_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.BindingClusterTargetStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BINDING_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void writeBindingAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value) {
-        writeBindingAttribute(chipClusterPtr, callback, value, null);
+      writeBindingAttribute(callback, value, 0);
     }
 
     public void writeBindingAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value, int timedWriteTimeoutMs) {
-        writeBindingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BINDING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeBindingAttribute(
         BindingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBindingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BINDING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.BindingClusterTargetStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BINDING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readBindingAttribute(long chipClusterPtr, BindingAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void writeBindingAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeBindingAttribute(long chipClusterPtr, BindingAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class AccessControlCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 31L;
 
+    private static final long ACL_ATTRIBUTE_ID = 0L;
+    private static final long EXTENSION_ATTRIBUTE_ID = 1L;
+    private static final long SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID = 2L;
+    private static final long TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID = 3L;
+    private static final long ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID = 4L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public AccessControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface AclAttributeCallback {
+    public interface AclAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntryStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ExtensionAttributeCallback {
+    public interface ExtensionAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readAclAttribute(
         AclAttributeCallback callback) {
-        readAclAttribute(chipClusterPtr, callback, true);
+      readAclAttributeWithFabricFilter(callback, true);
     }
 
     public void readAclAttributeWithFabricFilter(
         AclAttributeCallback callback, boolean isFabricFiltered) {
-        readAclAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACL_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AccessControlClusterAccessControlEntryStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACL_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void writeAclAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value) {
-        writeAclAttribute(chipClusterPtr, callback, value, null);
+      writeAclAttribute(callback, value, 0);
     }
 
     public void writeAclAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value, int timedWriteTimeoutMs) {
-        writeAclAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ACL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeAclAttribute(
         AclAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAclAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AccessControlClusterAccessControlEntryStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readExtensionAttribute(
         ExtensionAttributeCallback callback) {
-        readExtensionAttribute(chipClusterPtr, callback, true);
+      readExtensionAttributeWithFabricFilter(callback, true);
     }
 
     public void readExtensionAttributeWithFabricFilter(
         ExtensionAttributeCallback callback, boolean isFabricFiltered) {
-        readExtensionAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXTENSION_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EXTENSION_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void writeExtensionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value) {
-        writeExtensionAttribute(chipClusterPtr, callback, value, null);
+      writeExtensionAttribute(callback, value, 0);
     }
 
     public void writeExtensionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value, int timedWriteTimeoutMs) {
-        writeExtensionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), EXTENSION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeExtensionAttribute(
         ExtensionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExtensionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXTENSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EXTENSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSubjectsPerAccessControlEntryAttribute(
         IntegerAttributeCallback callback) {
-        readSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSubjectsPerAccessControlEntryAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTargetsPerAccessControlEntryAttribute(
         IntegerAttributeCallback callback) {
-        readTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTargetsPerAccessControlEntryAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAccessControlEntriesPerFabricAttribute(
         IntegerAttributeCallback callback) {
-        readAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAccessControlEntriesPerFabricAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readAclAttribute(long chipClusterPtr, AclAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void writeAclAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeAclAttribute(long chipClusterPtr, AclAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readExtensionAttribute(long chipClusterPtr, ExtensionAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void writeExtensionAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeExtensionAttribute(long chipClusterPtr, ExtensionAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSubjectsPerAccessControlEntryAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSubjectsPerAccessControlEntryAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTargetsPerAccessControlEntryAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTargetsPerAccessControlEntryAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAccessControlEntriesPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeAccessControlEntriesPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ActionsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 37L;
 
+    private static final long ACTION_LIST_ATTRIBUTE_ID = 0L;
+    private static final long ENDPOINT_LISTS_ATTRIBUTE_ID = 1L;
+    private static final long SETUP_U_R_L_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ActionsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void instantAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      instantAction(chipClusterPtr, callback, actionID, invokeID, null);
+      instantAction(callback, actionID, invokeID, 0);
     }
 
     public void instantAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      instantAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void instantActionWithTransition(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Integer transitionTime) {
-      instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime, null);
+      instantActionWithTransition(callback, actionID, invokeID, transitionTime, 0);
     }
 
     public void instantActionWithTransition(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Integer transitionTime, int timedInvokeTimeoutMs) {
-      instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void startAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      startAction(chipClusterPtr, callback, actionID, invokeID, null);
+      startAction(callback, actionID, invokeID, 0);
     }
 
     public void startAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      startAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void startActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+      startActionWithDuration(callback, actionID, invokeID, duration, 0);
     }
 
     public void startActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, int timedInvokeTimeoutMs) {
-      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      final long durationFieldID = 2L;
+      BaseTLVType durationtlvValue = new UIntType(duration);
+      elements.add(new StructElement(durationFieldID, durationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void stopAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      stopAction(chipClusterPtr, callback, actionID, invokeID, null);
+      stopAction(callback, actionID, invokeID, 0);
     }
 
     public void stopAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      stopAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void pauseAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      pauseAction(chipClusterPtr, callback, actionID, invokeID, null);
+      pauseAction(callback, actionID, invokeID, 0);
     }
 
     public void pauseAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      pauseAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void pauseActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+      pauseActionWithDuration(callback, actionID, invokeID, duration, 0);
     }
 
     public void pauseActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, int timedInvokeTimeoutMs) {
-      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      final long durationFieldID = 2L;
+      BaseTLVType durationtlvValue = new UIntType(duration);
+      elements.add(new StructElement(durationFieldID, durationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void resumeAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      resumeAction(chipClusterPtr, callback, actionID, invokeID, null);
+      resumeAction(callback, actionID, invokeID, 0);
     }
 
     public void resumeAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      resumeAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void enableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      enableAction(chipClusterPtr, callback, actionID, invokeID, null);
+      enableAction(callback, actionID, invokeID, 0);
     }
 
     public void enableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      enableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
+
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void enableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+      enableActionWithDuration(callback, actionID, invokeID, duration, 0);
     }
 
     public void enableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, int timedInvokeTimeoutMs) {
-      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
-    }
+      final long commandId = 9L;
 
-    public void disableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      disableAction(chipClusterPtr, callback, actionID, invokeID, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
 
-    public void disableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
-      disableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
-    }
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
 
-    public void disableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
-    }
+      final long durationFieldID = 2L;
+      BaseTLVType durationtlvValue = new UIntType(duration);
+      elements.add(new StructElement(durationFieldID, durationtlvValue));
 
-    public void disableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, int timedInvokeTimeoutMs) {
-      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    private native void instantAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void instantActionWithTransition(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Integer transitionTime, @Nullable Integer timedInvokeTimeoutMs);
+    public void disableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      disableAction(callback, actionID, invokeID, 0);
+    }
 
-    private native void startAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+    public void disableAction(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, int timedInvokeTimeoutMs) {
+      final long commandId = 10L;
 
-    private native void startActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
 
-    private native void stopAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
 
-    private native void pauseAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void pauseActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, @Nullable Integer timedInvokeTimeoutMs);
+    public void disableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
+      disableActionWithDuration(callback, actionID, invokeID, duration, 0);
+    }
 
-    private native void resumeAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+    public void disableActionWithDuration(DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, int timedInvokeTimeoutMs) {
+      final long commandId = 11L;
 
-    private native void enableAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long actionIDFieldID = 0L;
+      BaseTLVType actionIDtlvValue = new UIntType(actionID);
+      elements.add(new StructElement(actionIDFieldID, actionIDtlvValue));
 
-    private native void enableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, @Nullable Integer timedInvokeTimeoutMs);
+      final long invokeIDFieldID = 1L;
+      BaseTLVType invokeIDtlvValue = invokeID.<BaseTLVType>map((nonOptionalinvokeID) -> new UIntType(nonOptionalinvokeID)).orElse(new EmptyType());
+      elements.add(new StructElement(invokeIDFieldID, invokeIDtlvValue));
 
-    private native void disableAction(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, @Nullable Integer timedInvokeTimeoutMs);
+      final long durationFieldID = 2L;
+      BaseTLVType durationtlvValue = new UIntType(duration);
+      elements.add(new StructElement(durationFieldID, durationtlvValue));
 
-    private native void disableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface ActionListAttributeCallback {
+    public interface ActionListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ActionsClusterActionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EndpointListsAttributeCallback {
+    public interface EndpointListsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ActionsClusterEndpointListStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readActionListAttribute(
         ActionListAttributeCallback callback) {
-        readActionListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTION_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActionsClusterActionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTION_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActionListAttribute(
         ActionListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActionListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTION_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActionsClusterActionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTION_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEndpointListsAttribute(
         EndpointListsAttributeCallback callback) {
-        readEndpointListsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENDPOINT_LISTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActionsClusterEndpointListStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENDPOINT_LISTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEndpointListsAttribute(
         EndpointListsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndpointListsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENDPOINT_LISTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActionsClusterEndpointListStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENDPOINT_LISTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSetupURLAttribute(
         CharStringAttributeCallback callback) {
-        readSetupURLAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_U_R_L_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SETUP_U_R_L_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSetupURLAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetupURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_U_R_L_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SETUP_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readActionListAttribute(long chipClusterPtr, ActionListAttributeCallback callback);
-
-    private native void subscribeActionListAttribute(long chipClusterPtr, ActionListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEndpointListsAttribute(long chipClusterPtr, EndpointListsAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEndpointListsAttribute(long chipClusterPtr, EndpointListsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSetupURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeSetupURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class BasicInformationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 40L;
 
+    private static final long DATA_MODEL_REVISION_ATTRIBUTE_ID = 0L;
+    private static final long VENDOR_NAME_ATTRIBUTE_ID = 1L;
+    private static final long VENDOR_I_D_ATTRIBUTE_ID = 2L;
+    private static final long PRODUCT_NAME_ATTRIBUTE_ID = 3L;
+    private static final long PRODUCT_I_D_ATTRIBUTE_ID = 4L;
+    private static final long NODE_LABEL_ATTRIBUTE_ID = 5L;
+    private static final long LOCATION_ATTRIBUTE_ID = 6L;
+    private static final long HARDWARE_VERSION_ATTRIBUTE_ID = 7L;
+    private static final long HARDWARE_VERSION_STRING_ATTRIBUTE_ID = 8L;
+    private static final long SOFTWARE_VERSION_ATTRIBUTE_ID = 9L;
+    private static final long SOFTWARE_VERSION_STRING_ATTRIBUTE_ID = 10L;
+    private static final long MANUFACTURING_DATE_ATTRIBUTE_ID = 11L;
+    private static final long PART_NUMBER_ATTRIBUTE_ID = 12L;
+    private static final long PRODUCT_U_R_L_ATTRIBUTE_ID = 13L;
+    private static final long PRODUCT_LABEL_ATTRIBUTE_ID = 14L;
+    private static final long SERIAL_NUMBER_ATTRIBUTE_ID = 15L;
+    private static final long LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID = 16L;
+    private static final long REACHABLE_ATTRIBUTE_ID = 17L;
+    private static final long UNIQUE_I_D_ATTRIBUTE_ID = 18L;
+    private static final long CAPABILITY_MINIMA_ATTRIBUTE_ID = 19L;
+    private static final long PRODUCT_APPEARANCE_ATTRIBUTE_ID = 20L;
+    private static final long SPECIFICATION_VERSION_ATTRIBUTE_ID = 21L;
+    private static final long MAX_PATHS_PER_INVOKE_ATTRIBUTE_ID = 22L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public BasicInformationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void mfgSpecificPing(DefaultClusterCallback callback) {
-      mfgSpecificPing(chipClusterPtr, callback, null);
+      mfgSpecificPing(callback, 0);
     }
 
     public void mfgSpecificPing(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      mfgSpecificPing(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void mfgSpecificPing(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface CapabilityMinimaAttributeCallback {
+    public interface CapabilityMinimaAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.BasicInformationClusterCapabilityMinimaStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ProductAppearanceAttributeCallback {
+    public interface ProductAppearanceAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.BasicInformationClusterProductAppearanceStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readDataModelRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readDataModelRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DATA_MODEL_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DATA_MODEL_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDataModelRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDataModelRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DATA_MODEL_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DATA_MODEL_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readVendorNameAttribute(
         CharStringAttributeCallback callback) {
-        readVendorNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeVendorNameAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readVendorIDAttribute(
         IntegerAttributeCallback callback) {
-        readVendorIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeVendorIDAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductNameAttribute(
         CharStringAttributeCallback callback) {
-        readProductNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_NAME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_NAME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductNameAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductIDAttribute(
         IntegerAttributeCallback callback) {
-        readProductIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductIDAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNodeLabelAttribute(
         CharStringAttributeCallback callback) {
-        readNodeLabelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NODE_LABEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NODE_LABEL_ATTRIBUTE_ID, true);
     }
 
     public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
-        writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+      writeNodeLabelAttribute(callback, value, 0);
     }
 
     public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NODE_LABEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeNodeLabelAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NODE_LABEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NODE_LABEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLocationAttribute(
         CharStringAttributeCallback callback) {
-        readLocationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCATION_ATTRIBUTE_ID, true);
     }
 
     public void writeLocationAttribute(DefaultClusterCallback callback, String value) {
-        writeLocationAttribute(chipClusterPtr, callback, value, null);
+      writeLocationAttribute(callback, value, 0);
     }
 
     public void writeLocationAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLocationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LOCATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLocationAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHardwareVersionAttribute(
         IntegerAttributeCallback callback) {
-        readHardwareVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARDWARE_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeHardwareVersionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHardwareVersionStringAttribute(
         CharStringAttributeCallback callback) {
-        readHardwareVersionStringAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARDWARE_VERSION_STRING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeHardwareVersionStringAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_VERSION_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSoftwareVersionAttribute(
         LongAttributeCallback callback) {
-        readSoftwareVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOFTWARE_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSoftwareVersionAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOFTWARE_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSoftwareVersionStringAttribute(
         CharStringAttributeCallback callback) {
-        readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSoftwareVersionStringAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readManufacturingDateAttribute(
         CharStringAttributeCallback callback) {
-        readManufacturingDateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MANUFACTURING_DATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MANUFACTURING_DATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeManufacturingDateAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MANUFACTURING_DATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MANUFACTURING_DATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPartNumberAttribute(
         CharStringAttributeCallback callback) {
-        readPartNumberAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PART_NUMBER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PART_NUMBER_ATTRIBUTE_ID, true);
     }
 
     public void subscribePartNumberAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PART_NUMBER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PART_NUMBER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductURLAttribute(
         CharStringAttributeCallback callback) {
-        readProductURLAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_U_R_L_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductURLAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductLabelAttribute(
         CharStringAttributeCallback callback) {
-        readProductLabelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_LABEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_LABEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductLabelAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_LABEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_LABEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSerialNumberAttribute(
         CharStringAttributeCallback callback) {
-        readSerialNumberAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERIAL_NUMBER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SERIAL_NUMBER_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSerialNumberAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERIAL_NUMBER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SERIAL_NUMBER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLocalConfigDisabledAttribute(
         BooleanAttributeCallback callback) {
-        readLocalConfigDisabledAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID, true);
     }
 
     public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, null);
+      writeLocalConfigDisabledAttribute(callback, value, 0);
     }
 
     public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLocalConfigDisabledAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalConfigDisabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readReachableAttribute(
         BooleanAttributeCallback callback) {
-        readReachableAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACHABLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACHABLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeReachableAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACHABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACHABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUniqueIDAttribute(
         CharStringAttributeCallback callback) {
-        readUniqueIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNIQUE_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUniqueIDAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNIQUE_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCapabilityMinimaAttribute(
         CapabilityMinimaAttributeCallback callback) {
-        readCapabilityMinimaAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPABILITY_MINIMA_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BasicInformationClusterCapabilityMinimaStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CAPABILITY_MINIMA_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCapabilityMinimaAttribute(
         CapabilityMinimaAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCapabilityMinimaAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPABILITY_MINIMA_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BasicInformationClusterCapabilityMinimaStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CAPABILITY_MINIMA_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductAppearanceAttribute(
         ProductAppearanceAttributeCallback callback) {
-        readProductAppearanceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_APPEARANCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BasicInformationClusterProductAppearanceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_APPEARANCE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductAppearanceAttribute(
         ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductAppearanceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_APPEARANCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BasicInformationClusterProductAppearanceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_APPEARANCE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSpecificationVersionAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPECIFICATION_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPECIFICATION_VERSION_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeSpecificationVersionAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPECIFICATION_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPECIFICATION_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readMaxPathsPerInvokeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PATHS_PER_INVOKE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_PATHS_PER_INVOKE_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMaxPathsPerInvokeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PATHS_PER_INVOKE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_PATHS_PER_INVOKE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readDataModelRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDataModelRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeProductIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNodeLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeNodeLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeNodeLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLocationAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeLocationAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeLocationAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeHardwareVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeHardwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoftwareVersionAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeSoftwareVersionAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoftwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeSoftwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readManufacturingDateAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeManufacturingDateAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPartNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribePartNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSerialNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeSerialNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLocalConfigDisabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writeLocalConfigDisabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeLocalConfigDisabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readReachableAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeReachableAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUniqueIDAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeUniqueIDAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCapabilityMinimaAttribute(long chipClusterPtr, CapabilityMinimaAttributeCallback callback);
-
-    private native void subscribeCapabilityMinimaAttribute(long chipClusterPtr, CapabilityMinimaAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductAppearanceAttribute(long chipClusterPtr, ProductAppearanceAttributeCallback callback);
-
-    private native void subscribeProductAppearanceAttribute(long chipClusterPtr, ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 41L;
 
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public OtaSoftwareUpdateProviderCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void queryImage(QueryImageResponseCallback callback, Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider) {
-      queryImage(chipClusterPtr, callback, vendorID, productID, softwareVersion, protocolsSupported, hardwareVersion, location, requestorCanConsent, metadataForProvider, null);
+      queryImage(callback, vendorID, productID, softwareVersion, protocolsSupported, hardwareVersion, location, requestorCanConsent, metadataForProvider, 0);
     }
 
     public void queryImage(QueryImageResponseCallback callback, Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider, int timedInvokeTimeoutMs) {
-      queryImage(chipClusterPtr, callback, vendorID, productID, softwareVersion, protocolsSupported, hardwareVersion, location, requestorCanConsent, metadataForProvider, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long vendorIDFieldID = 0L;
+      BaseTLVType vendorIDtlvValue = new UIntType(vendorID);
+      elements.add(new StructElement(vendorIDFieldID, vendorIDtlvValue));
+
+      final long productIDFieldID = 1L;
+      BaseTLVType productIDtlvValue = new UIntType(productID);
+      elements.add(new StructElement(productIDFieldID, productIDtlvValue));
+
+      final long softwareVersionFieldID = 2L;
+      BaseTLVType softwareVersiontlvValue = new UIntType(softwareVersion);
+      elements.add(new StructElement(softwareVersionFieldID, softwareVersiontlvValue));
+
+      final long protocolsSupportedFieldID = 3L;
+      BaseTLVType protocolsSupportedtlvValue = ArrayType.generateArrayType(protocolsSupported, (elementprotocolsSupported) -> new UIntType(elementprotocolsSupported));
+      elements.add(new StructElement(protocolsSupportedFieldID, protocolsSupportedtlvValue));
+
+      final long hardwareVersionFieldID = 4L;
+      BaseTLVType hardwareVersiontlvValue = hardwareVersion.<BaseTLVType>map((nonOptionalhardwareVersion) -> new UIntType(nonOptionalhardwareVersion)).orElse(new EmptyType());
+      elements.add(new StructElement(hardwareVersionFieldID, hardwareVersiontlvValue));
+
+      final long locationFieldID = 5L;
+      BaseTLVType locationtlvValue = location.<BaseTLVType>map((nonOptionallocation) -> new StringType(nonOptionallocation)).orElse(new EmptyType());
+      elements.add(new StructElement(locationFieldID, locationtlvValue));
+
+      final long requestorCanConsentFieldID = 6L;
+      BaseTLVType requestorCanConsenttlvValue = requestorCanConsent.<BaseTLVType>map((nonOptionalrequestorCanConsent) -> new BooleanType(nonOptionalrequestorCanConsent)).orElse(new EmptyType());
+      elements.add(new StructElement(requestorCanConsentFieldID, requestorCanConsenttlvValue));
+
+      final long metadataForProviderFieldID = 7L;
+      BaseTLVType metadataForProvidertlvValue = metadataForProvider.<BaseTLVType>map((nonOptionalmetadataForProvider) -> new ByteArrayType(nonOptionalmetadataForProvider)).orElse(new EmptyType());
+      elements.add(new StructElement(metadataForProviderFieldID, metadataForProvidertlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long delayedActionTimeFieldID = 1L;
+          Optional<Long> delayedActionTime = Optional.empty();
+          final long imageURIFieldID = 2L;
+          Optional<String> imageURI = Optional.empty();
+          final long softwareVersionFieldID = 3L;
+          Optional<Long> softwareVersion = Optional.empty();
+          final long softwareVersionStringFieldID = 4L;
+          Optional<String> softwareVersionString = Optional.empty();
+          final long updateTokenFieldID = 5L;
+          Optional<byte[]> updateToken = Optional.empty();
+          final long userConsentNeededFieldID = 6L;
+          Optional<Boolean> userConsentNeeded = Optional.empty();
+          final long metadataForRequestorFieldID = 7L;
+          Optional<byte[]> metadataForRequestor = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == delayedActionTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                delayedActionTime = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == imageURIFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                imageURI = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == softwareVersionFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                softwareVersion = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == softwareVersionStringFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                softwareVersionString = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == updateTokenFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                updateToken = Optional.of(castingValue.value(byte[].class));
+              }
+            } else if (element.contextTagNum() == userConsentNeededFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                userConsentNeeded = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == metadataForRequestorFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                metadataForRequestor = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(status, delayedActionTime, imageURI, softwareVersion, softwareVersionString, updateToken, userConsentNeeded, metadataForRequestor);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void applyUpdateRequest(ApplyUpdateResponseCallback callback, byte[] updateToken, Long newVersion) {
-      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, null);
+      applyUpdateRequest(callback, updateToken, newVersion, 0);
     }
 
     public void applyUpdateRequest(ApplyUpdateResponseCallback callback, byte[] updateToken, Long newVersion, int timedInvokeTimeoutMs) {
-      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long updateTokenFieldID = 0L;
+      BaseTLVType updateTokentlvValue = new ByteArrayType(updateToken);
+      elements.add(new StructElement(updateTokenFieldID, updateTokentlvValue));
+
+      final long newVersionFieldID = 1L;
+      BaseTLVType newVersiontlvValue = new UIntType(newVersion);
+      elements.add(new StructElement(newVersionFieldID, newVersiontlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long actionFieldID = 0L;
+          Integer action = null;
+          final long delayedActionTimeFieldID = 1L;
+          Long delayedActionTime = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == actionFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                action = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == delayedActionTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                delayedActionTime = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(action, delayedActionTime);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void notifyUpdateApplied(DefaultClusterCallback callback, byte[] updateToken, Long softwareVersion) {
-      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, null);
+      notifyUpdateApplied(callback, updateToken, softwareVersion, 0);
     }
 
     public void notifyUpdateApplied(DefaultClusterCallback callback, byte[] updateToken, Long softwareVersion, int timedInvokeTimeoutMs) {
-      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, timedInvokeTimeoutMs);
-    }
+      final long commandId = 4L;
 
-    private native void queryImage(long chipClusterPtr, QueryImageResponseCallback callback, Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long updateTokenFieldID = 0L;
+      BaseTLVType updateTokentlvValue = new ByteArrayType(updateToken);
+      elements.add(new StructElement(updateTokenFieldID, updateTokentlvValue));
 
-    private native void applyUpdateRequest(long chipClusterPtr, ApplyUpdateResponseCallback callback, byte[] updateToken, Long newVersion, @Nullable Integer timedInvokeTimeoutMs);
+      final long softwareVersionFieldID = 1L;
+      BaseTLVType softwareVersiontlvValue = new UIntType(softwareVersion);
+      elements.add(new StructElement(softwareVersionFieldID, softwareVersiontlvValue));
 
-    private native void notifyUpdateApplied(long chipClusterPtr, DefaultClusterCallback callback, byte[] updateToken, Long softwareVersion, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface QueryImageResponseCallback {
+    public interface QueryImageResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Optional<Long> delayedActionTime, Optional<String> imageURI, Optional<Long> softwareVersion, Optional<String> softwareVersionString, Optional<byte[]> updateToken, Optional<Boolean> userConsentNeeded, Optional<byte[]> metadataForRequestor);
-      void onError(Exception error);
     }
 
-    public interface ApplyUpdateResponseCallback {
+    public interface ApplyUpdateResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer action, Long delayedActionTime);
-      void onError(Exception error);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 42L;
 
+    private static final long DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID = 0L;
+    private static final long UPDATE_POSSIBLE_ATTRIBUTE_ID = 1L;
+    private static final long UPDATE_STATE_ATTRIBUTE_ID = 2L;
+    private static final long UPDATE_STATE_PROGRESS_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public OtaSoftwareUpdateRequestorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void announceOTAProvider(DefaultClusterCallback callback, Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint) {
-      announceOTAProvider(chipClusterPtr, callback, providerNodeID, vendorID, announcementReason, metadataForNode, endpoint, null);
+      announceOTAProvider(callback, providerNodeID, vendorID, announcementReason, metadataForNode, endpoint, 0);
     }
 
     public void announceOTAProvider(DefaultClusterCallback callback, Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint, int timedInvokeTimeoutMs) {
-      announceOTAProvider(chipClusterPtr, callback, providerNodeID, vendorID, announcementReason, metadataForNode, endpoint, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long providerNodeIDFieldID = 0L;
+      BaseTLVType providerNodeIDtlvValue = new UIntType(providerNodeID);
+      elements.add(new StructElement(providerNodeIDFieldID, providerNodeIDtlvValue));
+
+      final long vendorIDFieldID = 1L;
+      BaseTLVType vendorIDtlvValue = new UIntType(vendorID);
+      elements.add(new StructElement(vendorIDFieldID, vendorIDtlvValue));
+
+      final long announcementReasonFieldID = 2L;
+      BaseTLVType announcementReasontlvValue = new UIntType(announcementReason);
+      elements.add(new StructElement(announcementReasonFieldID, announcementReasontlvValue));
 
-    private native void announceOTAProvider(long chipClusterPtr, DefaultClusterCallback callback, Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint, @Nullable Integer timedInvokeTimeoutMs);
+      final long metadataForNodeFieldID = 3L;
+      BaseTLVType metadataForNodetlvValue = metadataForNode.<BaseTLVType>map((nonOptionalmetadataForNode) -> new ByteArrayType(nonOptionalmetadataForNode)).orElse(new EmptyType());
+      elements.add(new StructElement(metadataForNodeFieldID, metadataForNodetlvValue));
 
-    public interface DefaultOTAProvidersAttributeCallback {
+      final long endpointFieldID = 4L;
+      BaseTLVType endpointtlvValue = new UIntType(endpoint);
+      elements.add(new StructElement(endpointFieldID, endpointtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface DefaultOTAProvidersAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface UpdateStateProgressAttributeCallback {
+    public interface UpdateStateProgressAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readDefaultOTAProvidersAttribute(
         DefaultOTAProvidersAttributeCallback callback) {
-        readDefaultOTAProvidersAttribute(chipClusterPtr, callback, true);
+      readDefaultOTAProvidersAttributeWithFabricFilter(callback, true);
     }
 
     public void readDefaultOTAProvidersAttributeWithFabricFilter(
         DefaultOTAProvidersAttributeCallback callback, boolean isFabricFiltered) {
-        readDefaultOTAProvidersAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value) {
-        writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, null);
+      writeDefaultOTAProvidersAttribute(callback, value, 0);
     }
 
     public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value, int timedWriteTimeoutMs) {
-        writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeDefaultOTAProvidersAttribute(
         DefaultOTAProvidersAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDefaultOTAProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUpdatePossibleAttribute(
         BooleanAttributeCallback callback) {
-        readUpdatePossibleAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_POSSIBLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UPDATE_POSSIBLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUpdatePossibleAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUpdatePossibleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_POSSIBLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UPDATE_POSSIBLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUpdateStateAttribute(
         IntegerAttributeCallback callback) {
-        readUpdateStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UPDATE_STATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUpdateStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUpdateStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UPDATE_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUpdateStateProgressAttribute(
         UpdateStateProgressAttributeCallback callback) {
-        readUpdateStateProgressAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_STATE_PROGRESS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UPDATE_STATE_PROGRESS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUpdateStateProgressAttribute(
         UpdateStateProgressAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUpdateStateProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UPDATE_STATE_PROGRESS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UPDATE_STATE_PROGRESS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readDefaultOTAProvidersAttribute(long chipClusterPtr, DefaultOTAProvidersAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void writeDefaultOTAProvidersAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeDefaultOTAProvidersAttribute(long chipClusterPtr, DefaultOTAProvidersAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUpdatePossibleAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeUpdatePossibleAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUpdateStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeUpdateStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUpdateStateProgressAttribute(long chipClusterPtr, UpdateStateProgressAttributeCallback callback);
-
-    private native void subscribeUpdateStateProgressAttribute(long chipClusterPtr, UpdateStateProgressAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class LocalizationConfigurationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 43L;
 
+    private static final long ACTIVE_LOCALE_ATTRIBUTE_ID = 0L;
+    private static final long SUPPORTED_LOCALES_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public LocalizationConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface SupportedLocalesAttributeCallback {
+    public interface SupportedLocalesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readActiveLocaleAttribute(
         CharStringAttributeCallback callback) {
-        readActiveLocaleAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_LOCALE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_LOCALE_ATTRIBUTE_ID, true);
     }
 
     public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value) {
-        writeActiveLocaleAttribute(chipClusterPtr, callback, value, null);
+      writeActiveLocaleAttribute(callback, value, 0);
     }
 
     public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeActiveLocaleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_LOCALE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeActiveLocaleAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveLocaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_LOCALE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_LOCALE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedLocalesAttribute(
         SupportedLocalesAttributeCallback callback) {
-        readSupportedLocalesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_LOCALES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_LOCALES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedLocalesAttribute(
         SupportedLocalesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedLocalesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_LOCALES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_LOCALES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readActiveLocaleAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeActiveLocaleAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeActiveLocaleAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedLocalesAttribute(long chipClusterPtr, SupportedLocalesAttributeCallback callback);
-
-    private native void subscribeSupportedLocalesAttribute(long chipClusterPtr, SupportedLocalesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class TimeFormatLocalizationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 44L;
 
+    private static final long HOUR_FORMAT_ATTRIBUTE_ID = 0L;
+    private static final long ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID = 1L;
+    private static final long SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public TimeFormatLocalizationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface SupportedCalendarTypesAttributeCallback {
+    public interface SupportedCalendarTypesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readHourFormatAttribute(
         IntegerAttributeCallback callback) {
-        readHourFormatAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HOUR_FORMAT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HOUR_FORMAT_ATTRIBUTE_ID, true);
     }
 
     public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value) {
-        writeHourFormatAttribute(chipClusterPtr, callback, value, null);
+      writeHourFormatAttribute(callback, value, 0);
     }
 
     public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeHourFormatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), HOUR_FORMAT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeHourFormatAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHourFormatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HOUR_FORMAT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HOUR_FORMAT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveCalendarTypeAttribute(
         IntegerAttributeCallback callback) {
-        readActiveCalendarTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, null);
+      writeActiveCalendarTypeAttribute(callback, value, 0);
     }
 
     public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeActiveCalendarTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveCalendarTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedCalendarTypesAttribute(
         SupportedCalendarTypesAttributeCallback callback) {
-        readSupportedCalendarTypesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedCalendarTypesAttribute(
         SupportedCalendarTypesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedCalendarTypesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readHourFormatAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeHourFormatAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeHourFormatAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveCalendarTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeActiveCalendarTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeActiveCalendarTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedCalendarTypesAttribute(long chipClusterPtr, SupportedCalendarTypesAttributeCallback callback);
-
-    private native void subscribeSupportedCalendarTypesAttribute(long chipClusterPtr, SupportedCalendarTypesAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class UnitLocalizationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 45L;
 
+    private static final long TEMPERATURE_UNIT_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public UnitLocalizationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readTemperatureUnitAttribute(
         IntegerAttributeCallback callback) {
-        readTemperatureUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEMPERATURE_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureUnitAttribute(chipClusterPtr, callback, value, null);
+      writeTemperatureUnitAttribute(callback, value, 0);
     }
 
     public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureUnitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), TEMPERATURE_UNIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeTemperatureUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEMPERATURE_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readTemperatureUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeTemperatureUnitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeTemperatureUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class PowerSourceConfigurationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 46L;
 
+    private static final long SOURCES_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public PowerSourceConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface SourcesAttributeCallback {
+    public interface SourcesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSourcesAttribute(
         SourcesAttributeCallback callback) {
-        readSourcesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOURCES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOURCES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSourcesAttribute(
         SourcesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSourcesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOURCES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOURCES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSourcesAttribute(long chipClusterPtr, SourcesAttributeCallback callback);
-
-    private native void subscribeSourcesAttribute(long chipClusterPtr, SourcesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class PowerSourceCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 47L;
 
+    private static final long STATUS_ATTRIBUTE_ID = 0L;
+    private static final long ORDER_ATTRIBUTE_ID = 1L;
+    private static final long DESCRIPTION_ATTRIBUTE_ID = 2L;
+    private static final long WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID = 3L;
+    private static final long WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID = 4L;
+    private static final long WIRED_CURRENT_TYPE_ATTRIBUTE_ID = 5L;
+    private static final long WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID = 6L;
+    private static final long WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID = 7L;
+    private static final long WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID = 8L;
+    private static final long WIRED_PRESENT_ATTRIBUTE_ID = 9L;
+    private static final long ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID = 10L;
+    private static final long BAT_VOLTAGE_ATTRIBUTE_ID = 11L;
+    private static final long BAT_PERCENT_REMAINING_ATTRIBUTE_ID = 12L;
+    private static final long BAT_TIME_REMAINING_ATTRIBUTE_ID = 13L;
+    private static final long BAT_CHARGE_LEVEL_ATTRIBUTE_ID = 14L;
+    private static final long BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID = 15L;
+    private static final long BAT_REPLACEABILITY_ATTRIBUTE_ID = 16L;
+    private static final long BAT_PRESENT_ATTRIBUTE_ID = 17L;
+    private static final long ACTIVE_BAT_FAULTS_ATTRIBUTE_ID = 18L;
+    private static final long BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID = 19L;
+    private static final long BAT_COMMON_DESIGNATION_ATTRIBUTE_ID = 20L;
+    private static final long BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID = 21L;
+    private static final long BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID = 22L;
+    private static final long BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID = 23L;
+    private static final long BAT_CAPACITY_ATTRIBUTE_ID = 24L;
+    private static final long BAT_QUANTITY_ATTRIBUTE_ID = 25L;
+    private static final long BAT_CHARGE_STATE_ATTRIBUTE_ID = 26L;
+    private static final long BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID = 27L;
+    private static final long BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID = 28L;
+    private static final long BAT_CHARGING_CURRENT_ATTRIBUTE_ID = 29L;
+    private static final long ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID = 30L;
+    private static final long ENDPOINT_LIST_ATTRIBUTE_ID = 31L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public PowerSourceCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface WiredAssessedInputVoltageAttributeCallback {
+    public interface WiredAssessedInputVoltageAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface WiredAssessedInputFrequencyAttributeCallback {
+    public interface WiredAssessedInputFrequencyAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface WiredAssessedCurrentAttributeCallback {
+    public interface WiredAssessedCurrentAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveWiredFaultsAttributeCallback {
+    public interface ActiveWiredFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BatVoltageAttributeCallback {
+    public interface BatVoltageAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BatPercentRemainingAttributeCallback {
+    public interface BatPercentRemainingAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BatTimeRemainingAttributeCallback {
+    public interface BatTimeRemainingAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveBatFaultsAttributeCallback {
+    public interface ActiveBatFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BatTimeToFullChargeAttributeCallback {
+    public interface BatTimeToFullChargeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BatChargingCurrentAttributeCallback {
+    public interface BatChargingCurrentAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveBatChargeFaultsAttributeCallback {
+    public interface ActiveBatChargeFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EndpointListAttributeCallback {
+    public interface EndpointListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readStatusAttribute(
         IntegerAttributeCallback callback) {
-        readStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATUS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOrderAttribute(
         IntegerAttributeCallback callback) {
-        readOrderAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ORDER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ORDER_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOrderAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOrderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ORDER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ORDER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDescriptionAttribute(
         CharStringAttributeCallback callback) {
-        readDescriptionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDescriptionAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredAssessedInputVoltageAttribute(
         WiredAssessedInputVoltageAttributeCallback callback) {
-        readWiredAssessedInputVoltageAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredAssessedInputVoltageAttribute(
         WiredAssessedInputVoltageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredAssessedInputVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredAssessedInputFrequencyAttribute(
         WiredAssessedInputFrequencyAttributeCallback callback) {
-        readWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredAssessedInputFrequencyAttribute(
         WiredAssessedInputFrequencyAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredCurrentTypeAttribute(
         IntegerAttributeCallback callback) {
-        readWiredCurrentTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_CURRENT_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_CURRENT_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredCurrentTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredCurrentTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_CURRENT_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_CURRENT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredAssessedCurrentAttribute(
         WiredAssessedCurrentAttributeCallback callback) {
-        readWiredAssessedCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredAssessedCurrentAttribute(
         WiredAssessedCurrentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredAssessedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredNominalVoltageAttribute(
         LongAttributeCallback callback) {
-        readWiredNominalVoltageAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredNominalVoltageAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredNominalVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredMaximumCurrentAttribute(
         LongAttributeCallback callback) {
-        readWiredMaximumCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredMaximumCurrentAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredMaximumCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiredPresentAttribute(
         BooleanAttributeCallback callback) {
-        readWiredPresentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_PRESENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIRED_PRESENT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiredPresentAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiredPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIRED_PRESENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIRED_PRESENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveWiredFaultsAttribute(
         ActiveWiredFaultsAttributeCallback callback) {
-        readActiveWiredFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveWiredFaultsAttribute(
         ActiveWiredFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveWiredFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatVoltageAttribute(
         BatVoltageAttributeCallback callback) {
-        readBatVoltageAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_VOLTAGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_VOLTAGE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatVoltageAttribute(
         BatVoltageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_VOLTAGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatPercentRemainingAttribute(
         BatPercentRemainingAttributeCallback callback) {
-        readBatPercentRemainingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_PERCENT_REMAINING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_PERCENT_REMAINING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatPercentRemainingAttribute(
         BatPercentRemainingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatPercentRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_PERCENT_REMAINING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_PERCENT_REMAINING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatTimeRemainingAttribute(
         BatTimeRemainingAttributeCallback callback) {
-        readBatTimeRemainingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_TIME_REMAINING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_TIME_REMAINING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatTimeRemainingAttribute(
         BatTimeRemainingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatTimeRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_TIME_REMAINING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_TIME_REMAINING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatChargeLevelAttribute(
         IntegerAttributeCallback callback) {
-        readBatChargeLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGE_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_CHARGE_LEVEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatChargeLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatChargeLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGE_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_CHARGE_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatReplacementNeededAttribute(
         BooleanAttributeCallback callback) {
-        readBatReplacementNeededAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatReplacementNeededAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatReplacementNeededAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatReplaceabilityAttribute(
         IntegerAttributeCallback callback) {
-        readBatReplaceabilityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEABILITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_REPLACEABILITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatReplaceabilityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatReplaceabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEABILITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_REPLACEABILITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatPresentAttribute(
         BooleanAttributeCallback callback) {
-        readBatPresentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_PRESENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_PRESENT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatPresentAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_PRESENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_PRESENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveBatFaultsAttribute(
         ActiveBatFaultsAttributeCallback callback) {
-        readActiveBatFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_BAT_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_BAT_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveBatFaultsAttribute(
         ActiveBatFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveBatFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_BAT_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_BAT_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatReplacementDescriptionAttribute(
         CharStringAttributeCallback callback) {
-        readBatReplacementDescriptionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatReplacementDescriptionAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatReplacementDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatCommonDesignationAttribute(
         IntegerAttributeCallback callback) {
-        readBatCommonDesignationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_COMMON_DESIGNATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_COMMON_DESIGNATION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatCommonDesignationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatCommonDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_COMMON_DESIGNATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_COMMON_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatANSIDesignationAttribute(
         CharStringAttributeCallback callback) {
-        readBatANSIDesignationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatANSIDesignationAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatANSIDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatIECDesignationAttribute(
         CharStringAttributeCallback callback) {
-        readBatIECDesignationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatIECDesignationAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatIECDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatApprovedChemistryAttribute(
         IntegerAttributeCallback callback) {
-        readBatApprovedChemistryAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatApprovedChemistryAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatApprovedChemistryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatCapacityAttribute(
         LongAttributeCallback callback) {
-        readBatCapacityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CAPACITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_CAPACITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatCapacityAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CAPACITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatQuantityAttribute(
         IntegerAttributeCallback callback) {
-        readBatQuantityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_QUANTITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_QUANTITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatQuantityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_QUANTITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_QUANTITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatChargeStateAttribute(
         IntegerAttributeCallback callback) {
-        readBatChargeStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGE_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_CHARGE_STATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatChargeStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatChargeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGE_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_CHARGE_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatTimeToFullChargeAttribute(
         BatTimeToFullChargeAttributeCallback callback) {
-        readBatTimeToFullChargeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatTimeToFullChargeAttribute(
         BatTimeToFullChargeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatTimeToFullChargeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatFunctionalWhileChargingAttribute(
         BooleanAttributeCallback callback) {
-        readBatFunctionalWhileChargingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatFunctionalWhileChargingAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatFunctionalWhileChargingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBatChargingCurrentAttribute(
         BatChargingCurrentAttributeCallback callback) {
-        readBatChargingCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGING_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BAT_CHARGING_CURRENT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBatChargingCurrentAttribute(
         BatChargingCurrentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatChargingCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_CHARGING_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BAT_CHARGING_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveBatChargeFaultsAttribute(
         ActiveBatChargeFaultsAttributeCallback callback) {
-        readActiveBatChargeFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveBatChargeFaultsAttribute(
         ActiveBatChargeFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveBatChargeFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEndpointListAttribute(
         EndpointListAttributeCallback callback) {
-        readEndpointListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENDPOINT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENDPOINT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEndpointListAttribute(
         EndpointListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndpointListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENDPOINT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENDPOINT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class GeneralCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 48L;
 
-    private native void readOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long BREADCRUMB_ATTRIBUTE_ID = 0L;
+    private static final long BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID = 1L;
+    private static final long REGULATORY_CONFIG_ATTRIBUTE_ID = 2L;
+    private static final long LOCATION_CAPABILITY_ATTRIBUTE_ID = 3L;
+    private static final long SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID = 4L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public GeneralCommissioningCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void armFailSafe(ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb) {
+      armFailSafe(callback, expiryLengthSeconds, breadcrumb, 0);
+    }
 
-    private native void readWiredAssessedInputVoltageAttribute(long chipClusterPtr, WiredAssessedInputVoltageAttributeCallback callback);
+    public void armFailSafe(ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long expiryLengthSecondsFieldID = 0L;
+      BaseTLVType expiryLengthSecondstlvValue = new UIntType(expiryLengthSeconds);
+      elements.add(new StructElement(expiryLengthSecondsFieldID, expiryLengthSecondstlvValue));
+
+      final long breadcrumbFieldID = 1L;
+      BaseTLVType breadcrumbtlvValue = new UIntType(breadcrumb);
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long errorCodeFieldID = 0L;
+          Integer errorCode = null;
+          final long debugTextFieldID = 1L;
+          String debugText = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == errorCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                errorCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = castingValue.value(String.class);
+              }
+            }
+          }
+          callback.onSuccess(errorCode, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeWiredAssessedInputVoltageAttribute(long chipClusterPtr, WiredAssessedInputVoltageAttributeCallback callback, int minInterval, int maxInterval);
+    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, Integer newRegulatoryConfig, String countryCode, Long breadcrumb) {
+      setRegulatoryConfig(callback, newRegulatoryConfig, countryCode, breadcrumb, 0);
+    }
 
-    private native void readWiredAssessedInputFrequencyAttribute(long chipClusterPtr, WiredAssessedInputFrequencyAttributeCallback callback);
+    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, Integer newRegulatoryConfig, String countryCode, Long breadcrumb, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newRegulatoryConfigFieldID = 0L;
+      BaseTLVType newRegulatoryConfigtlvValue = new UIntType(newRegulatoryConfig);
+      elements.add(new StructElement(newRegulatoryConfigFieldID, newRegulatoryConfigtlvValue));
+
+      final long countryCodeFieldID = 1L;
+      BaseTLVType countryCodetlvValue = new StringType(countryCode);
+      elements.add(new StructElement(countryCodeFieldID, countryCodetlvValue));
+
+      final long breadcrumbFieldID = 2L;
+      BaseTLVType breadcrumbtlvValue = new UIntType(breadcrumb);
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long errorCodeFieldID = 0L;
+          Integer errorCode = null;
+          final long debugTextFieldID = 1L;
+          String debugText = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == errorCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                errorCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = castingValue.value(String.class);
+              }
+            }
+          }
+          callback.onSuccess(errorCode, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeWiredAssessedInputFrequencyAttribute(long chipClusterPtr, WiredAssessedInputFrequencyAttributeCallback callback, int minInterval, int maxInterval);
+    public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
+      commissioningComplete(callback, 0);
+    }
 
-    private native void readWiredCurrentTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void commissioningComplete(CommissioningCompleteResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long errorCodeFieldID = 0L;
+          Integer errorCode = null;
+          final long debugTextFieldID = 1L;
+          String debugText = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == errorCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                errorCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = castingValue.value(String.class);
+              }
+            }
+          }
+          callback.onSuccess(errorCode, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ArmFailSafeResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer errorCode, String debugText);
+    }
 
-    private native void subscribeWiredCurrentTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SetRegulatoryConfigResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer errorCode, String debugText);
+    }
 
-    private native void readWiredAssessedCurrentAttribute(long chipClusterPtr, WiredAssessedCurrentAttributeCallback callback);
+    public interface CommissioningCompleteResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer errorCode, String debugText);
+    }
 
-    private native void subscribeWiredAssessedCurrentAttribute(long chipClusterPtr, WiredAssessedCurrentAttributeCallback callback, int minInterval, int maxInterval);
+    public interface BasicCommissioningInfoAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo value);
+    }
 
-    private native void readWiredNominalVoltageAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeWiredNominalVoltageAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readWiredMaximumCurrentAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeWiredMaximumCurrentAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readWiredPresentAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void readBreadcrumbAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BREADCRUMB_ATTRIBUTE_ID);
 
-    private native void subscribeWiredPresentAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BREADCRUMB_ATTRIBUTE_ID, true);
+    }
 
-    private native void readActiveWiredFaultsAttribute(long chipClusterPtr, ActiveWiredFaultsAttributeCallback callback);
+    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value) {
+      writeBreadcrumbAttribute(callback, value, 0);
+    }
 
-    private native void subscribeActiveWiredFaultsAttribute(long chipClusterPtr, ActiveWiredFaultsAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BREADCRUMB_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readBatVoltageAttribute(long chipClusterPtr, BatVoltageAttributeCallback callback);
+    public void subscribeBreadcrumbAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BREADCRUMB_ATTRIBUTE_ID);
 
-    private native void subscribeBatVoltageAttribute(long chipClusterPtr, BatVoltageAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BREADCRUMB_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readBatPercentRemainingAttribute(long chipClusterPtr, BatPercentRemainingAttributeCallback callback);
+    public void readBasicCommissioningInfoAttribute(
+        BasicCommissioningInfoAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID);
 
-    private native void subscribeBatPercentRemainingAttribute(long chipClusterPtr, BatPercentRemainingAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID, true);
+    }
 
-    private native void readBatTimeRemainingAttribute(long chipClusterPtr, BatTimeRemainingAttributeCallback callback);
+    public void subscribeBasicCommissioningInfoAttribute(
+        BasicCommissioningInfoAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID);
 
-    private native void subscribeBatTimeRemainingAttribute(long chipClusterPtr, BatTimeRemainingAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readBatChargeLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRegulatoryConfigAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REGULATORY_CONFIG_ATTRIBUTE_ID);
 
-    private native void subscribeBatChargeLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REGULATORY_CONFIG_ATTRIBUTE_ID, true);
+    }
 
-    private native void readBatReplacementNeededAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void subscribeRegulatoryConfigAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REGULATORY_CONFIG_ATTRIBUTE_ID);
 
-    private native void subscribeBatReplacementNeededAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatReplaceabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatReplaceabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatPresentAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeBatPresentAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveBatFaultsAttribute(long chipClusterPtr, ActiveBatFaultsAttributeCallback callback);
-
-    private native void subscribeActiveBatFaultsAttribute(long chipClusterPtr, ActiveBatFaultsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatReplacementDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeBatReplacementDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatCommonDesignationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatCommonDesignationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatANSIDesignationAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeBatANSIDesignationAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatIECDesignationAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeBatIECDesignationAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatApprovedChemistryAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatApprovedChemistryAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatCapacityAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeBatCapacityAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatQuantityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatQuantityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatChargeStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatChargeStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatTimeToFullChargeAttribute(long chipClusterPtr, BatTimeToFullChargeAttributeCallback callback);
-
-    private native void subscribeBatTimeToFullChargeAttribute(long chipClusterPtr, BatTimeToFullChargeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatFunctionalWhileChargingAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeBatFunctionalWhileChargingAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatChargingCurrentAttribute(long chipClusterPtr, BatChargingCurrentAttributeCallback callback);
-
-    private native void subscribeBatChargingCurrentAttribute(long chipClusterPtr, BatChargingCurrentAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveBatChargeFaultsAttribute(long chipClusterPtr, ActiveBatChargeFaultsAttributeCallback callback);
-
-    private native void subscribeActiveBatChargeFaultsAttribute(long chipClusterPtr, ActiveBatChargeFaultsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEndpointListAttribute(long chipClusterPtr, EndpointListAttributeCallback callback);
-
-    private native void subscribeEndpointListAttribute(long chipClusterPtr, EndpointListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class GeneralCommissioningCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 48L;
-
-    public GeneralCommissioningCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void armFailSafe(ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb) {
-      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, null);
-    }
-
-    public void armFailSafe(ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb, int timedInvokeTimeoutMs) {
-      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, Integer newRegulatoryConfig, String countryCode, Long breadcrumb) {
-      setRegulatoryConfig(chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, null);
-    }
-
-    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, Integer newRegulatoryConfig, String countryCode, Long breadcrumb, int timedInvokeTimeoutMs) {
-      setRegulatoryConfig(chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
-      commissioningComplete(chipClusterPtr, callback, null);
-    }
-
-    public void commissioningComplete(CommissioningCompleteResponseCallback callback, int timedInvokeTimeoutMs) {
-      commissioningComplete(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    private native void armFailSafe(long chipClusterPtr, ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void setRegulatoryConfig(long chipClusterPtr, SetRegulatoryConfigResponseCallback callback, Integer newRegulatoryConfig, String countryCode, Long breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void commissioningComplete(long chipClusterPtr, CommissioningCompleteResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ArmFailSafeResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
-      void onError(Exception error);
-    }
-
-    public interface SetRegulatoryConfigResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
-      void onError(Exception error);
-    }
-
-    public interface CommissioningCompleteResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
-      void onError(Exception error);
-    }
-
-    public interface BasicCommissioningInfoAttributeCallback {
-      void onSuccess(ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readBreadcrumbAttribute(
-        LongAttributeCallback callback) {
-        readBreadcrumbAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value) {
-        writeBreadcrumbAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeBreadcrumbAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeBreadcrumbAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBreadcrumbAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readBasicCommissioningInfoAttribute(
-        BasicCommissioningInfoAttributeCallback callback) {
-        readBasicCommissioningInfoAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBasicCommissioningInfoAttribute(
-        BasicCommissioningInfoAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBasicCommissioningInfoAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRegulatoryConfigAttribute(
-        IntegerAttributeCallback callback) {
-        readRegulatoryConfigAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRegulatoryConfigAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRegulatoryConfigAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REGULATORY_CONFIG_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
     public void readLocationCapabilityAttribute(
         IntegerAttributeCallback callback) {
-        readLocationCapabilityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCATION_CAPABILITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCATION_CAPABILITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLocationCapabilityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocationCapabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCATION_CAPABILITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCATION_CAPABILITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportsConcurrentConnectionAttribute(
         BooleanAttributeCallback callback) {
-        readSupportsConcurrentConnectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportsConcurrentConnectionAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportsConcurrentConnectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readBreadcrumbAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void writeBreadcrumbAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeBreadcrumbAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBasicCommissioningInfoAttribute(long chipClusterPtr, BasicCommissioningInfoAttributeCallback callback);
-
-    private native void subscribeBasicCommissioningInfoAttribute(long chipClusterPtr, BasicCommissioningInfoAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRegulatoryConfigAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRegulatoryConfigAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLocationCapabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLocationCapabilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportsConcurrentConnectionAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeSupportsConcurrentConnectionAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class NetworkCommissioningCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 49L;
 
+    private static final long MAX_NETWORKS_ATTRIBUTE_ID = 0L;
+    private static final long NETWORKS_ATTRIBUTE_ID = 1L;
+    private static final long SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID = 2L;
+    private static final long CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID = 3L;
+    private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 4L;
+    private static final long LAST_NETWORKING_STATUS_ATTRIBUTE_ID = 5L;
+    private static final long LAST_NETWORK_I_D_ATTRIBUTE_ID = 6L;
+    private static final long LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID = 7L;
+    private static final long SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID = 8L;
+    private static final long SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID = 9L;
+    private static final long THREAD_VERSION_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public NetworkCommissioningCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void scanNetworks(ScanNetworksResponseCallback callback, @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb) {
-      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, null);
+      scanNetworks(callback, ssid, breadcrumb, 0);
     }
 
     public void scanNetworks(ScanNetworksResponseCallback callback, @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback, byte[] ssid, byte[] credentials, Optional<Long> breadcrumb) {
-      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, null);
-    }
-
-    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback, byte[] ssid, byte[] credentials, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long ssidFieldID = 0L;
+      BaseTLVType ssidtlvValue = ssid != null ? ssid.<BaseTLVType>map((nonOptionalssid) -> new ByteArrayType(nonOptionalssid)).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(ssidFieldID, ssidtlvValue));
+
+      final long breadcrumbFieldID = 1L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long wiFiScanResultsFieldID = 2L;
+          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>> wiFiScanResults = Optional.empty();
+          final long threadScanResultsFieldID = 3L;
+          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>> threadScanResults = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == wiFiScanResultsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                wiFiScanResults = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct.decodeTlv(elementcastingValue)));
+              }
+            } else if (element.contextTagNum() == threadScanResultsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                threadScanResults = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct.decodeTlv(elementcastingValue)));
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, wiFiScanResults, threadScanResults);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback, byte[] ssid, byte[] credentials, Optional<Long> breadcrumb, Optional<byte[]> networkIdentity, Optional<byte[]> clientIdentifier, Optional<byte[]> possessionNonce) {
+      addOrUpdateWiFiNetwork(callback, ssid, credentials, breadcrumb, networkIdentity, clientIdentifier, possessionNonce, 0);
+    }
+
+    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback, byte[] ssid, byte[] credentials, Optional<Long> breadcrumb, Optional<byte[]> networkIdentity, Optional<byte[]> clientIdentifier, Optional<byte[]> possessionNonce, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long ssidFieldID = 0L;
+      BaseTLVType ssidtlvValue = new ByteArrayType(ssid);
+      elements.add(new StructElement(ssidFieldID, ssidtlvValue));
+
+      final long credentialsFieldID = 1L;
+      BaseTLVType credentialstlvValue = new ByteArrayType(credentials);
+      elements.add(new StructElement(credentialsFieldID, credentialstlvValue));
+
+      final long breadcrumbFieldID = 2L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      final long networkIdentityFieldID = 3L;
+      BaseTLVType networkIdentitytlvValue = networkIdentity.<BaseTLVType>map((nonOptionalnetworkIdentity) -> new ByteArrayType(nonOptionalnetworkIdentity)).orElse(new EmptyType());
+      elements.add(new StructElement(networkIdentityFieldID, networkIdentitytlvValue));
+
+      final long clientIdentifierFieldID = 4L;
+      BaseTLVType clientIdentifiertlvValue = clientIdentifier.<BaseTLVType>map((nonOptionalclientIdentifier) -> new ByteArrayType(nonOptionalclientIdentifier)).orElse(new EmptyType());
+      elements.add(new StructElement(clientIdentifierFieldID, clientIdentifiertlvValue));
+
+      final long possessionNonceFieldID = 5L;
+      BaseTLVType possessionNoncetlvValue = possessionNonce.<BaseTLVType>map((nonOptionalpossessionNonce) -> new ByteArrayType(nonOptionalpossessionNonce)).orElse(new EmptyType());
+      elements.add(new StructElement(possessionNonceFieldID, possessionNoncetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long networkIndexFieldID = 2L;
+          Optional<Integer> networkIndex = Optional.empty();
+          final long clientIdentityFieldID = 3L;
+          Optional<byte[]> clientIdentity = Optional.empty();
+          final long possessionSignatureFieldID = 4L;
+          Optional<byte[]> possessionSignature = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == networkIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == clientIdentityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                clientIdentity = Optional.of(castingValue.value(byte[].class));
+              }
+            } else if (element.contextTagNum() == possessionSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                possessionSignature = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, networkIndex, clientIdentity, possessionSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addOrUpdateThreadNetwork(NetworkConfigResponseCallback callback, byte[] operationalDataset, Optional<Long> breadcrumb) {
-      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, null);
+      addOrUpdateThreadNetwork(callback, operationalDataset, breadcrumb, 0);
     }
 
     public void addOrUpdateThreadNetwork(NetworkConfigResponseCallback callback, byte[] operationalDataset, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long operationalDatasetFieldID = 0L;
+      BaseTLVType operationalDatasettlvValue = new ByteArrayType(operationalDataset);
+      elements.add(new StructElement(operationalDatasetFieldID, operationalDatasettlvValue));
+
+      final long breadcrumbFieldID = 1L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long networkIndexFieldID = 2L;
+          Optional<Integer> networkIndex = Optional.empty();
+          final long clientIdentityFieldID = 3L;
+          Optional<byte[]> clientIdentity = Optional.empty();
+          final long possessionSignatureFieldID = 4L;
+          Optional<byte[]> possessionSignature = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == networkIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == clientIdentityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                clientIdentity = Optional.of(castingValue.value(byte[].class));
+              }
+            } else if (element.contextTagNum() == possessionSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                possessionSignature = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, networkIndex, clientIdentity, possessionSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeNetwork(NetworkConfigResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
-      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+      removeNetwork(callback, networkID, breadcrumb, 0);
     }
 
     public void removeNetwork(NetworkConfigResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long networkIDFieldID = 0L;
+      BaseTLVType networkIDtlvValue = new ByteArrayType(networkID);
+      elements.add(new StructElement(networkIDFieldID, networkIDtlvValue));
+
+      final long breadcrumbFieldID = 1L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long networkIndexFieldID = 2L;
+          Optional<Integer> networkIndex = Optional.empty();
+          final long clientIdentityFieldID = 3L;
+          Optional<byte[]> clientIdentity = Optional.empty();
+          final long possessionSignatureFieldID = 4L;
+          Optional<byte[]> possessionSignature = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == networkIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == clientIdentityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                clientIdentity = Optional.of(castingValue.value(byte[].class));
+              }
+            } else if (element.contextTagNum() == possessionSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                possessionSignature = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, networkIndex, clientIdentity, possessionSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void connectNetwork(ConnectNetworkResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
-      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+      connectNetwork(callback, networkID, breadcrumb, 0);
     }
 
     public void connectNetwork(ConnectNetworkResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long networkIDFieldID = 0L;
+      BaseTLVType networkIDtlvValue = new ByteArrayType(networkID);
+      elements.add(new StructElement(networkIDFieldID, networkIDtlvValue));
+
+      final long breadcrumbFieldID = 1L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long errorValueFieldID = 2L;
+          @Nullable Long errorValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == errorValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+                IntType castingValue = element.value(IntType.class);
+                errorValue = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, errorValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void reorderNetwork(NetworkConfigResponseCallback callback, byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb) {
-      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, null);
+      reorderNetwork(callback, networkID, networkIndex, breadcrumb, 0);
     }
 
     public void reorderNetwork(NetworkConfigResponseCallback callback, byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
-      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    private native void scanNetworks(long chipClusterPtr, ScanNetworksResponseCallback callback, @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addOrUpdateWiFiNetwork(long chipClusterPtr, NetworkConfigResponseCallback callback, byte[] ssid, byte[] credentials, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addOrUpdateThreadNetwork(long chipClusterPtr, NetworkConfigResponseCallback callback, byte[] operationalDataset, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeNetwork(long chipClusterPtr, NetworkConfigResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void connectNetwork(long chipClusterPtr, ConnectNetworkResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void reorderNetwork(long chipClusterPtr, NetworkConfigResponseCallback callback, byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ScanNetworksResponseCallback {
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long networkIDFieldID = 0L;
+      BaseTLVType networkIDtlvValue = new ByteArrayType(networkID);
+      elements.add(new StructElement(networkIDFieldID, networkIDtlvValue));
+
+      final long networkIndexFieldID = 1L;
+      BaseTLVType networkIndextlvValue = new UIntType(networkIndex);
+      elements.add(new StructElement(networkIndexFieldID, networkIndextlvValue));
+
+      final long breadcrumbFieldID = 2L;
+      BaseTLVType breadcrumbtlvValue = breadcrumb.<BaseTLVType>map((nonOptionalbreadcrumb) -> new UIntType(nonOptionalbreadcrumb)).orElse(new EmptyType());
+      elements.add(new StructElement(breadcrumbFieldID, breadcrumbtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long networkingStatusFieldID = 0L;
+          Integer networkingStatus = null;
+          final long debugTextFieldID = 1L;
+          Optional<String> debugText = Optional.empty();
+          final long networkIndexFieldID = 2L;
+          Optional<Integer> networkIndex = Optional.empty();
+          final long clientIdentityFieldID = 3L;
+          Optional<byte[]> clientIdentity = Optional.empty();
+          final long possessionSignatureFieldID = 4L;
+          Optional<byte[]> possessionSignature = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == networkingStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkingStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == networkIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                networkIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == clientIdentityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                clientIdentity = Optional.of(castingValue.value(byte[].class));
+              }
+            } else if (element.contextTagNum() == possessionSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                possessionSignature = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(networkingStatus, debugText, networkIndex, clientIdentity, possessionSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public void queryIdentity(QueryIdentityResponseCallback callback, byte[] keyIdentifier, Optional<byte[]> possessionNonce) {
+      queryIdentity(callback, keyIdentifier, possessionNonce, 0);
+    }
+
+    public void queryIdentity(QueryIdentityResponseCallback callback, byte[] keyIdentifier, Optional<byte[]> possessionNonce, int timedInvokeTimeoutMs) {
+      final long commandId = 9L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long keyIdentifierFieldID = 0L;
+      BaseTLVType keyIdentifiertlvValue = new ByteArrayType(keyIdentifier);
+      elements.add(new StructElement(keyIdentifierFieldID, keyIdentifiertlvValue));
+
+      final long possessionNonceFieldID = 1L;
+      BaseTLVType possessionNoncetlvValue = possessionNonce.<BaseTLVType>map((nonOptionalpossessionNonce) -> new ByteArrayType(nonOptionalpossessionNonce)).orElse(new EmptyType());
+      elements.add(new StructElement(possessionNonceFieldID, possessionNoncetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long identityFieldID = 0L;
+          byte[] identity = null;
+          final long possessionSignatureFieldID = 1L;
+          Optional<byte[]> possessionSignature = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == identityFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                identity = castingValue.value(byte[].class);
+              }
+            } else if (element.contextTagNum() == possessionSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                possessionSignature = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(identity, possessionSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ScanNetworksResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>> wiFiScanResults, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>> threadScanResults);
-      void onError(Exception error);
     }
 
-    public interface NetworkConfigResponseCallback {
-      void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex);
-      void onError(Exception error);
+    public interface NetworkConfigResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex, Optional<byte[]> clientIdentity, Optional<byte[]> possessionSignature);
     }
 
-    public interface ConnectNetworkResponseCallback {
+    public interface ConnectNetworkResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer networkingStatus, Optional<String> debugText, @Nullable Long errorValue);
-      void onError(Exception error);
     }
 
-    public interface NetworksAttributeCallback {
+    public interface QueryIdentityResponseCallback extends BaseClusterCallback {
+      void onSuccess(byte[] identity, Optional<byte[]> possessionSignature);
+    }
+
+    public interface NetworksAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LastNetworkingStatusAttributeCallback {
+    public interface LastNetworkingStatusAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LastNetworkIDAttributeCallback {
+    public interface LastNetworkIDAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable byte[] value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LastConnectErrorValueAttributeCallback {
+    public interface LastConnectErrorValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SupportedWiFiBandsAttributeCallback {
+    public interface SupportedWiFiBandsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMaxNetworksAttribute(
         IntegerAttributeCallback callback) {
-        readMaxNetworksAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_NETWORKS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_NETWORKS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxNetworksAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_NETWORKS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_NETWORKS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNetworksAttribute(
         NetworksAttributeCallback callback) {
-        readNetworksAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORKS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NETWORKS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNetworksAttribute(
         NetworksAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORKS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NETWORKS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readScanMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback) {
-        readScanMaxTimeSecondsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeScanMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScanMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readConnectMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback) {
-        readConnectMaxTimeSecondsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeConnectMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConnectMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readInterfaceEnabledAttribute(
         BooleanAttributeCallback callback) {
-        readInterfaceEnabledAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERFACE_ENABLED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INTERFACE_ENABLED_ATTRIBUTE_ID, true);
     }
 
     public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, null);
+      writeInterfaceEnabledAttribute(callback, value, 0);
     }
 
     public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INTERFACE_ENABLED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeInterfaceEnabledAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInterfaceEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERFACE_ENABLED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INTERFACE_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastNetworkingStatusAttribute(
         LastNetworkingStatusAttributeCallback callback) {
-        readLastNetworkingStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORKING_STATUS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_NETWORKING_STATUS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLastNetworkingStatusAttribute(
         LastNetworkingStatusAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastNetworkingStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORKING_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_NETWORKING_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastNetworkIDAttribute(
         LastNetworkIDAttributeCallback callback) {
-        readLastNetworkIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_NETWORK_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLastNetworkIDAttribute(
         LastNetworkIDAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastNetworkIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_NETWORK_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastConnectErrorValueAttribute(
         LastConnectErrorValueAttributeCallback callback) {
-        readLastConnectErrorValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLastConnectErrorValueAttribute(
         LastConnectErrorValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastConnectErrorValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedWiFiBandsAttribute(
         SupportedWiFiBandsAttributeCallback callback) {
-        readSupportedWiFiBandsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedWiFiBandsAttribute(
         SupportedWiFiBandsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedWiFiBandsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedThreadFeaturesAttribute(
         IntegerAttributeCallback callback) {
-        readSupportedThreadFeaturesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedThreadFeaturesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedThreadFeaturesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readThreadVersionAttribute(
         IntegerAttributeCallback callback) {
-        readThreadVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, THREAD_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeThreadVersionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThreadVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THREAD_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMaxNetworksAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeMaxNetworksAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class DiagnosticLogsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 50L;
 
-    private native void readNetworksAttribute(long chipClusterPtr, NetworksAttributeCallback callback);
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeNetworksAttribute(long chipClusterPtr, NetworksAttributeCallback callback, int minInterval, int maxInterval);
+    public DiagnosticLogsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readScanMaxTimeSecondsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeScanMaxTimeSecondsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator) {
+      retrieveLogsRequest(callback, intent, requestedProtocol, transferFileDesignator, 0);
+    }
 
-    private native void readConnectMaxTimeSecondsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long intentFieldID = 0L;
+      BaseTLVType intenttlvValue = new UIntType(intent);
+      elements.add(new StructElement(intentFieldID, intenttlvValue));
+
+      final long requestedProtocolFieldID = 1L;
+      BaseTLVType requestedProtocoltlvValue = new UIntType(requestedProtocol);
+      elements.add(new StructElement(requestedProtocolFieldID, requestedProtocoltlvValue));
+
+      final long transferFileDesignatorFieldID = 2L;
+      BaseTLVType transferFileDesignatortlvValue = transferFileDesignator.<BaseTLVType>map((nonOptionaltransferFileDesignator) -> new StringType(nonOptionaltransferFileDesignator)).orElse(new EmptyType());
+      elements.add(new StructElement(transferFileDesignatorFieldID, transferFileDesignatortlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long logContentFieldID = 1L;
+          byte[] logContent = null;
+          final long UTCTimeStampFieldID = 2L;
+          Optional<Long> UTCTimeStamp = Optional.empty();
+          final long timeSinceBootFieldID = 3L;
+          Optional<Long> timeSinceBoot = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == logContentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                logContent = castingValue.value(byte[].class);
+              }
+            } else if (element.contextTagNum() == UTCTimeStampFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                UTCTimeStamp = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == timeSinceBootFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                timeSinceBoot = Optional.of(castingValue.value(Long.class));
+              }
+            }
+          }
+          callback.onSuccess(status, logContent, UTCTimeStamp, timeSinceBoot);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface RetrieveLogsResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, byte[] logContent, Optional<Long> UTCTimeStamp, Optional<Long> timeSinceBoot);
+    }
 
-    private native void subscribeConnectMaxTimeSecondsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readInterfaceEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeInterfaceEnabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeInterfaceEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readLastNetworkingStatusAttribute(long chipClusterPtr, LastNetworkingStatusAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeLastNetworkingStatusAttribute(long chipClusterPtr, LastNetworkingStatusAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLastNetworkIDAttribute(long chipClusterPtr, LastNetworkIDAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeLastNetworkIDAttribute(long chipClusterPtr, LastNetworkIDAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readLastConnectErrorValueAttribute(long chipClusterPtr, LastConnectErrorValueAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeLastConnectErrorValueAttribute(long chipClusterPtr, LastConnectErrorValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readSupportedWiFiBandsAttribute(long chipClusterPtr, SupportedWiFiBandsAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeSupportedWiFiBandsAttribute(long chipClusterPtr, SupportedWiFiBandsAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readSupportedThreadFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeSupportedThreadFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readThreadVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeThreadVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class DiagnosticLogsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 50L;
-
-    public DiagnosticLogsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator) {
-      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null);
-    }
-
-    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator, int timedInvokeTimeoutMs) {
-      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, timedInvokeTimeoutMs);
-    }
-
-    private native void retrieveLogsRequest(long chipClusterPtr, RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface RetrieveLogsResponseCallback {
-      void onSuccess(Integer status, byte[] logContent, Optional<Long> UTCTimeStamp, Optional<Long> timeSinceBoot);
-      void onError(Exception error);
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class GeneralDiagnosticsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 51L;
 
+    private static final long NETWORK_INTERFACES_ATTRIBUTE_ID = 0L;
+    private static final long REBOOT_COUNT_ATTRIBUTE_ID = 1L;
+    private static final long UP_TIME_ATTRIBUTE_ID = 2L;
+    private static final long TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID = 3L;
+    private static final long BOOT_REASON_ATTRIBUTE_ID = 4L;
+    private static final long ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID = 5L;
+    private static final long ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID = 6L;
+    private static final long ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID = 7L;
+    private static final long TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID = 8L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public GeneralDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void testEventTrigger(DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger) {
-      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, null);
+      testEventTrigger(callback, enableKey, eventTrigger, 0);
     }
 
     public void testEventTrigger(DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger, int timedInvokeTimeoutMs) {
-      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs);
-    }
-
-    private native void testEventTrigger(long chipClusterPtr, DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface NetworkInterfacesAttributeCallback {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long enableKeyFieldID = 0L;
+      BaseTLVType enableKeytlvValue = new ByteArrayType(enableKey);
+      elements.add(new StructElement(enableKeyFieldID, enableKeytlvValue));
+
+      final long eventTriggerFieldID = 1L;
+      BaseTLVType eventTriggertlvValue = new UIntType(eventTrigger);
+      elements.add(new StructElement(eventTriggerFieldID, eventTriggertlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public void timeSnapshot(TimeSnapshotResponseCallback callback) {
+      timeSnapshot(callback, 0);
+    }
+
+    public void timeSnapshot(TimeSnapshotResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long systemTimeUsFieldID = 0L;
+          Long systemTimeUs = null;
+          final long UTCTimeUsFieldID = 1L;
+          @Nullable Long UTCTimeUs = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == systemTimeUsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                systemTimeUs = castingValue.value(Long.class);
+              }
+            } else if (element.contextTagNum() == UTCTimeUsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                UTCTimeUs = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(systemTimeUs, UTCTimeUs);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface TimeSnapshotResponseCallback extends BaseClusterCallback {
+      void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs);
+    }
+
+    public interface NetworkInterfacesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveHardwareFaultsAttributeCallback {
+    public interface ActiveHardwareFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveRadioFaultsAttributeCallback {
+    public interface ActiveRadioFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveNetworkFaultsAttributeCallback {
+    public interface ActiveNetworkFaultsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readNetworkInterfacesAttribute(
         NetworkInterfacesAttributeCallback callback) {
-        readNetworkInterfacesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORK_INTERFACES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NETWORK_INTERFACES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNetworkInterfacesAttribute(
         NetworkInterfacesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNetworkInterfacesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORK_INTERFACES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NETWORK_INTERFACES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRebootCountAttribute(
         IntegerAttributeCallback callback) {
-        readRebootCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REBOOT_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REBOOT_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRebootCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRebootCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REBOOT_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REBOOT_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUpTimeAttribute(
         LongAttributeCallback callback) {
-        readUpTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UP_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UP_TIME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUpTimeAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUpTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UP_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UP_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTotalOperationalHoursAttribute(
         LongAttributeCallback callback) {
-        readTotalOperationalHoursAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTotalOperationalHoursAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTotalOperationalHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBootReasonAttribute(
         IntegerAttributeCallback callback) {
-        readBootReasonAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BOOT_REASON_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BOOT_REASON_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBootReasonAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBootReasonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BOOT_REASON_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BOOT_REASON_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveHardwareFaultsAttribute(
         ActiveHardwareFaultsAttributeCallback callback) {
-        readActiveHardwareFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveHardwareFaultsAttribute(
         ActiveHardwareFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveHardwareFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveRadioFaultsAttribute(
         ActiveRadioFaultsAttributeCallback callback) {
-        readActiveRadioFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveRadioFaultsAttribute(
         ActiveRadioFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveRadioFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveNetworkFaultsAttribute(
         ActiveNetworkFaultsAttributeCallback callback) {
-        readActiveNetworkFaultsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveNetworkFaultsAttribute(
         ActiveNetworkFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveNetworkFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTestEventTriggersEnabledAttribute(
         BooleanAttributeCallback callback) {
-        readTestEventTriggersEnabledAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTestEventTriggersEnabledAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTestEventTriggersEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID);
 
-    public void readAverageWearCountAttribute(
-        LongAttributeCallback callback) {
-        readAverageWearCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAverageWearCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageWearCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readNetworkInterfacesAttribute(long chipClusterPtr, NetworkInterfacesAttributeCallback callback);
-
-    private native void subscribeNetworkInterfacesAttribute(long chipClusterPtr, NetworkInterfacesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRebootCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRebootCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTotalOperationalHoursAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTotalOperationalHoursAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBootReasonAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBootReasonAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveHardwareFaultsAttribute(long chipClusterPtr, ActiveHardwareFaultsAttributeCallback callback);
-
-    private native void subscribeActiveHardwareFaultsAttribute(long chipClusterPtr, ActiveHardwareFaultsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveRadioFaultsAttribute(long chipClusterPtr, ActiveRadioFaultsAttributeCallback callback);
-
-    private native void subscribeActiveRadioFaultsAttribute(long chipClusterPtr, ActiveRadioFaultsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveNetworkFaultsAttribute(long chipClusterPtr, ActiveNetworkFaultsAttributeCallback callback);
-
-    private native void subscribeActiveNetworkFaultsAttribute(long chipClusterPtr, ActiveNetworkFaultsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTestEventTriggersEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeTestEventTriggersEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageWearCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageWearCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 52L;
 
+    private static final long THREAD_METRICS_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_HEAP_FREE_ATTRIBUTE_ID = 1L;
+    private static final long CURRENT_HEAP_USED_ATTRIBUTE_ID = 2L;
+    private static final long CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void resetWatermarks(DefaultClusterCallback callback) {
-      resetWatermarks(chipClusterPtr, callback, null);
+      resetWatermarks(callback, 0);
     }
 
     public void resetWatermarks(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetWatermarks(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetWatermarks(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface ThreadMetricsAttributeCallback {
+    public interface ThreadMetricsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readThreadMetricsAttribute(
         ThreadMetricsAttributeCallback callback) {
-        readThreadMetricsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_METRICS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, THREAD_METRICS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeThreadMetricsAttribute(
         ThreadMetricsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThreadMetricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_METRICS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THREAD_METRICS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentHeapFreeAttribute(
         LongAttributeCallback callback) {
-        readCurrentHeapFreeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_FREE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_HEAP_FREE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentHeapFreeAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentHeapFreeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_FREE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_HEAP_FREE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentHeapUsedAttribute(
         LongAttributeCallback callback) {
-        readCurrentHeapUsedAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_USED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_HEAP_USED_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentHeapUsedAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentHeapUsedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_USED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_HEAP_USED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentHeapHighWatermarkAttribute(
         LongAttributeCallback callback) {
-        readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentHeapHighWatermarkAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readThreadMetricsAttribute(long chipClusterPtr, ThreadMetricsAttributeCallback callback);
-
-    private native void subscribeThreadMetricsAttribute(long chipClusterPtr, ThreadMetricsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentHeapFreeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeCurrentHeapFreeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentHeapUsedAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeCurrentHeapUsedAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentHeapHighWatermarkAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeCurrentHeapHighWatermarkAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 53L;
 
+    private static final long CHANNEL_ATTRIBUTE_ID = 0L;
+    private static final long ROUTING_ROLE_ATTRIBUTE_ID = 1L;
+    private static final long NETWORK_NAME_ATTRIBUTE_ID = 2L;
+    private static final long PAN_ID_ATTRIBUTE_ID = 3L;
+    private static final long EXTENDED_PAN_ID_ATTRIBUTE_ID = 4L;
+    private static final long MESH_LOCAL_PREFIX_ATTRIBUTE_ID = 5L;
+    private static final long OVERRUN_COUNT_ATTRIBUTE_ID = 6L;
+    private static final long NEIGHBOR_TABLE_ATTRIBUTE_ID = 7L;
+    private static final long ROUTE_TABLE_ATTRIBUTE_ID = 8L;
+    private static final long PARTITION_ID_ATTRIBUTE_ID = 9L;
+    private static final long WEIGHTING_ATTRIBUTE_ID = 10L;
+    private static final long DATA_VERSION_ATTRIBUTE_ID = 11L;
+    private static final long STABLE_DATA_VERSION_ATTRIBUTE_ID = 12L;
+    private static final long LEADER_ROUTER_ID_ATTRIBUTE_ID = 13L;
+    private static final long DETACHED_ROLE_COUNT_ATTRIBUTE_ID = 14L;
+    private static final long CHILD_ROLE_COUNT_ATTRIBUTE_ID = 15L;
+    private static final long ROUTER_ROLE_COUNT_ATTRIBUTE_ID = 16L;
+    private static final long LEADER_ROLE_COUNT_ATTRIBUTE_ID = 17L;
+    private static final long ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID = 18L;
+    private static final long PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID = 19L;
+    private static final long BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID = 20L;
+    private static final long PARENT_CHANGE_COUNT_ATTRIBUTE_ID = 21L;
+    private static final long TX_TOTAL_COUNT_ATTRIBUTE_ID = 22L;
+    private static final long TX_UNICAST_COUNT_ATTRIBUTE_ID = 23L;
+    private static final long TX_BROADCAST_COUNT_ATTRIBUTE_ID = 24L;
+    private static final long TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID = 25L;
+    private static final long TX_ACKED_COUNT_ATTRIBUTE_ID = 26L;
+    private static final long TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID = 27L;
+    private static final long TX_DATA_COUNT_ATTRIBUTE_ID = 28L;
+    private static final long TX_DATA_POLL_COUNT_ATTRIBUTE_ID = 29L;
+    private static final long TX_BEACON_COUNT_ATTRIBUTE_ID = 30L;
+    private static final long TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID = 31L;
+    private static final long TX_OTHER_COUNT_ATTRIBUTE_ID = 32L;
+    private static final long TX_RETRY_COUNT_ATTRIBUTE_ID = 33L;
+    private static final long TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID = 34L;
+    private static final long TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID = 35L;
+    private static final long TX_ERR_CCA_COUNT_ATTRIBUTE_ID = 36L;
+    private static final long TX_ERR_ABORT_COUNT_ATTRIBUTE_ID = 37L;
+    private static final long TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID = 38L;
+    private static final long RX_TOTAL_COUNT_ATTRIBUTE_ID = 39L;
+    private static final long RX_UNICAST_COUNT_ATTRIBUTE_ID = 40L;
+    private static final long RX_BROADCAST_COUNT_ATTRIBUTE_ID = 41L;
+    private static final long RX_DATA_COUNT_ATTRIBUTE_ID = 42L;
+    private static final long RX_DATA_POLL_COUNT_ATTRIBUTE_ID = 43L;
+    private static final long RX_BEACON_COUNT_ATTRIBUTE_ID = 44L;
+    private static final long RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID = 45L;
+    private static final long RX_OTHER_COUNT_ATTRIBUTE_ID = 46L;
+    private static final long RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID = 47L;
+    private static final long RX_DEST_ADDR_FILTERED_COUNT_ATTRIBUTE_ID = 48L;
+    private static final long RX_DUPLICATED_COUNT_ATTRIBUTE_ID = 49L;
+    private static final long RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID = 50L;
+    private static final long RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID = 51L;
+    private static final long RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID = 52L;
+    private static final long RX_ERR_SEC_COUNT_ATTRIBUTE_ID = 53L;
+    private static final long RX_ERR_FCS_COUNT_ATTRIBUTE_ID = 54L;
+    private static final long RX_ERR_OTHER_COUNT_ATTRIBUTE_ID = 55L;
+    private static final long ACTIVE_TIMESTAMP_ATTRIBUTE_ID = 56L;
+    private static final long PENDING_TIMESTAMP_ATTRIBUTE_ID = 57L;
+    private static final long DELAY_ATTRIBUTE_ID = 58L;
+    private static final long SECURITY_POLICY_ATTRIBUTE_ID = 59L;
+    private static final long CHANNEL_PAGE0_MASK_ATTRIBUTE_ID = 60L;
+    private static final long OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID = 61L;
+    private static final long ACTIVE_NETWORK_FAULTS_LIST_ATTRIBUTE_ID = 62L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ThreadNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void resetCounts(DefaultClusterCallback callback) {
-      resetCounts(chipClusterPtr, callback, null);
+      resetCounts(callback, 0);
     }
 
     public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface ChannelAttributeCallback {
+    public interface ChannelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface RoutingRoleAttributeCallback {
+    public interface RoutingRoleAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface NetworkNameAttributeCallback {
+    public interface NetworkNameAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable String value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PanIdAttributeCallback {
+    public interface PanIdAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ExtendedPanIdAttributeCallback {
+    public interface ExtendedPanIdAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MeshLocalPrefixAttributeCallback {
+    public interface MeshLocalPrefixAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable byte[] value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface NeighborTableAttributeCallback {
+    public interface NeighborTableAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface RouteTableAttributeCallback {
+    public interface RouteTableAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PartitionIdAttributeCallback {
+    public interface PartitionIdAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface WeightingAttributeCallback {
+    public interface WeightingAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DataVersionAttributeCallback {
+    public interface DataVersionAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface StableDataVersionAttributeCallback {
+    public interface StableDataVersionAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LeaderRouterIdAttributeCallback {
+    public interface LeaderRouterIdAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveTimestampAttributeCallback {
+    public interface ActiveTimestampAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PendingTimestampAttributeCallback {
+    public interface PendingTimestampAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DelayAttributeCallback {
+    public interface DelayAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SecurityPolicyAttributeCallback {
+    public interface SecurityPolicyAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ChannelPage0MaskAttributeCallback {
+    public interface ChannelPage0MaskAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable byte[] value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OperationalDatasetComponentsAttributeCallback {
+    public interface OperationalDatasetComponentsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ActiveNetworkFaultsListAttributeCallback {
+    public interface ActiveNetworkFaultsListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readChannelAttribute(
         ChannelAttributeCallback callback) {
-        readChannelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANNEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeChannelAttribute(
         ChannelAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChannelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANNEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRoutingRoleAttribute(
         RoutingRoleAttributeCallback callback) {
-        readRoutingRoleAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTING_ROLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ROUTING_ROLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRoutingRoleAttribute(
         RoutingRoleAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRoutingRoleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTING_ROLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ROUTING_ROLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNetworkNameAttribute(
         NetworkNameAttributeCallback callback) {
-        readNetworkNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORK_NAME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NETWORK_NAME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNetworkNameAttribute(
         NetworkNameAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNetworkNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NETWORK_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NETWORK_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPanIdAttribute(
         PanIdAttributeCallback callback) {
-        readPanIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_ID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PAN_ID_ATTRIBUTE_ID, true);
     }
 
     public void subscribePanIdAttribute(
         PanIdAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_ID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PAN_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readExtendedPanIdAttribute(
         ExtendedPanIdAttributeCallback callback) {
-        readExtendedPanIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXTENDED_PAN_ID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EXTENDED_PAN_ID_ATTRIBUTE_ID, true);
     }
 
     public void subscribeExtendedPanIdAttribute(
         ExtendedPanIdAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExtendedPanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXTENDED_PAN_ID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EXTENDED_PAN_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeshLocalPrefixAttribute(
         MeshLocalPrefixAttributeCallback callback) {
-        readMeshLocalPrefixAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MESH_LOCAL_PREFIX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MESH_LOCAL_PREFIX_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeshLocalPrefixAttribute(
         MeshLocalPrefixAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeshLocalPrefixAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MESH_LOCAL_PREFIX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MESH_LOCAL_PREFIX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOverrunCountAttribute(
         LongAttributeCallback callback) {
-        readOverrunCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOverrunCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNeighborTableAttribute(
         NeighborTableAttributeCallback callback) {
-        readNeighborTableAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEIGHBOR_TABLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEIGHBOR_TABLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNeighborTableAttribute(
         NeighborTableAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNeighborTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEIGHBOR_TABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEIGHBOR_TABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRouteTableAttribute(
         RouteTableAttributeCallback callback) {
-        readRouteTableAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTE_TABLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ROUTE_TABLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRouteTableAttribute(
         RouteTableAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRouteTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTE_TABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ROUTE_TABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPartitionIdAttribute(
         PartitionIdAttributeCallback callback) {
-        readPartitionIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTITION_ID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PARTITION_ID_ATTRIBUTE_ID, true);
     }
 
     public void subscribePartitionIdAttribute(
         PartitionIdAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePartitionIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTITION_ID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PARTITION_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWeightingAttribute(
         WeightingAttributeCallback callback) {
-        readWeightingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WEIGHTING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WEIGHTING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWeightingAttribute(
         WeightingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWeightingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WEIGHTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WEIGHTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDataVersionAttribute(
         DataVersionAttributeCallback callback) {
-        readDataVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DATA_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DATA_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDataVersionAttribute(
         DataVersionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DATA_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DATA_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStableDataVersionAttribute(
         StableDataVersionAttributeCallback callback) {
-        readStableDataVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STABLE_DATA_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STABLE_DATA_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeStableDataVersionAttribute(
         StableDataVersionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStableDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STABLE_DATA_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STABLE_DATA_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLeaderRouterIdAttribute(
         LeaderRouterIdAttributeCallback callback) {
-        readLeaderRouterIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEADER_ROUTER_ID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEADER_ROUTER_ID_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLeaderRouterIdAttribute(
         LeaderRouterIdAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLeaderRouterIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEADER_ROUTER_ID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEADER_ROUTER_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDetachedRoleCountAttribute(
         IntegerAttributeCallback callback) {
-        readDetachedRoleCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DETACHED_ROLE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DETACHED_ROLE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDetachedRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDetachedRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DETACHED_ROLE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DETACHED_ROLE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readChildRoleCountAttribute(
         IntegerAttributeCallback callback) {
-        readChildRoleCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHILD_ROLE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHILD_ROLE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeChildRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChildRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHILD_ROLE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHILD_ROLE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRouterRoleCountAttribute(
         IntegerAttributeCallback callback) {
-        readRouterRoleCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTER_ROLE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ROUTER_ROLE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRouterRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRouterRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROUTER_ROLE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ROUTER_ROLE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLeaderRoleCountAttribute(
         IntegerAttributeCallback callback) {
-        readLeaderRoleCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEADER_ROLE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEADER_ROLE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLeaderRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLeaderRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEADER_ROLE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEADER_ROLE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttachAttemptCountAttribute(
         IntegerAttributeCallback callback) {
-        readAttachAttemptCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttachAttemptCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPartitionIdChangeCountAttribute(
         IntegerAttributeCallback callback) {
-        readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePartitionIdChangeCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePartitionIdChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBetterPartitionAttachAttemptCountAttribute(
         IntegerAttributeCallback callback) {
-        readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBetterPartitionAttachAttemptCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readParentChangeCountAttribute(
         IntegerAttributeCallback callback) {
-        readParentChangeCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARENT_CHANGE_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PARENT_CHANGE_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeParentChangeCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeParentChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PARENT_CHANGE_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PARENT_CHANGE_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxTotalCountAttribute(
         LongAttributeCallback callback) {
-        readTxTotalCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_TOTAL_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_TOTAL_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxTotalCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_TOTAL_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_TOTAL_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxUnicastCountAttribute(
         LongAttributeCallback callback) {
-        readTxUnicastCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_UNICAST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_UNICAST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxUnicastCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_UNICAST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_UNICAST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxBroadcastCountAttribute(
         LongAttributeCallback callback) {
-        readTxBroadcastCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BROADCAST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_BROADCAST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxBroadcastCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BROADCAST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_BROADCAST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxAckRequestedCountAttribute(
         LongAttributeCallback callback) {
-        readTxAckRequestedCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxAckRequestedCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxAckedCountAttribute(
         LongAttributeCallback callback) {
-        readTxAckedCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ACKED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ACKED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxAckedCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxAckedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ACKED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ACKED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxNoAckRequestedCountAttribute(
         LongAttributeCallback callback) {
-        readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxNoAckRequestedCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxNoAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxDataCountAttribute(
         LongAttributeCallback callback) {
-        readTxDataCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DATA_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_DATA_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxDataCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DATA_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_DATA_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxDataPollCountAttribute(
         LongAttributeCallback callback) {
-        readTxDataPollCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DATA_POLL_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_DATA_POLL_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxDataPollCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DATA_POLL_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_DATA_POLL_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxBeaconCountAttribute(
         LongAttributeCallback callback) {
-        readTxBeaconCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BEACON_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_BEACON_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxBeaconCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BEACON_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_BEACON_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxBeaconRequestCountAttribute(
         LongAttributeCallback callback) {
-        readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxBeaconRequestCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxOtherCountAttribute(
         LongAttributeCallback callback) {
-        readTxOtherCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_OTHER_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_OTHER_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxOtherCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_OTHER_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_OTHER_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxRetryCountAttribute(
         LongAttributeCallback callback) {
-        readTxRetryCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_RETRY_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_RETRY_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxRetryCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxRetryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_RETRY_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_RETRY_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxDirectMaxRetryExpiryCountAttribute(
         LongAttributeCallback callback) {
-        readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxDirectMaxRetryExpiryCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxIndirectMaxRetryExpiryCountAttribute(
         LongAttributeCallback callback) {
-        readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxIndirectMaxRetryExpiryCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxErrCcaCountAttribute(
         LongAttributeCallback callback) {
-        readTxErrCcaCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_CCA_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ERR_CCA_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxErrCcaCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxErrCcaCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_CCA_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ERR_CCA_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxErrAbortCountAttribute(
         LongAttributeCallback callback) {
-        readTxErrAbortCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_ABORT_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ERR_ABORT_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxErrAbortCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxErrAbortCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_ABORT_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ERR_ABORT_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxErrBusyChannelCountAttribute(
         LongAttributeCallback callback) {
-        readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxErrBusyChannelCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxErrBusyChannelCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxTotalCountAttribute(
         LongAttributeCallback callback) {
-        readRxTotalCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_TOTAL_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_TOTAL_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxTotalCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_TOTAL_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_TOTAL_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxUnicastCountAttribute(
         LongAttributeCallback callback) {
-        readRxUnicastCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_UNICAST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_UNICAST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxUnicastCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_UNICAST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_UNICAST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxBroadcastCountAttribute(
         LongAttributeCallback callback) {
-        readRxBroadcastCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BROADCAST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_BROADCAST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxBroadcastCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BROADCAST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_BROADCAST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxDataCountAttribute(
         LongAttributeCallback callback) {
-        readRxDataCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DATA_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_DATA_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxDataCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DATA_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_DATA_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxDataPollCountAttribute(
         LongAttributeCallback callback) {
-        readRxDataPollCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DATA_POLL_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_DATA_POLL_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxDataPollCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DATA_POLL_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_DATA_POLL_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxBeaconCountAttribute(
         LongAttributeCallback callback) {
-        readRxBeaconCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BEACON_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_BEACON_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxBeaconCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BEACON_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_BEACON_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxBeaconRequestCountAttribute(
         LongAttributeCallback callback) {
-        readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxBeaconRequestCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxOtherCountAttribute(
         LongAttributeCallback callback) {
-        readRxOtherCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_OTHER_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_OTHER_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxOtherCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_OTHER_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_OTHER_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxAddressFilteredCountAttribute(
         LongAttributeCallback callback) {
-        readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxAddressFilteredCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxAddressFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxDestAddrFilteredCountAttribute(
         LongAttributeCallback callback) {
-        readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DEST_ADDR_FILTERED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_DEST_ADDR_FILTERED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxDestAddrFilteredCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxDestAddrFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DEST_ADDR_FILTERED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_DEST_ADDR_FILTERED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxDuplicatedCountAttribute(
         LongAttributeCallback callback) {
-        readRxDuplicatedCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DUPLICATED_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_DUPLICATED_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxDuplicatedCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxDuplicatedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_DUPLICATED_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_DUPLICATED_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrNoFrameCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrNoFrameCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrNoFrameCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrUnknownNeighborCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrUnknownNeighborCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrInvalidSrcAddrCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrInvalidSrcAddrCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrSecCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrSecCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_SEC_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_SEC_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrSecCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrSecCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_SEC_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_SEC_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrFcsCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrFcsCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_FCS_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_FCS_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrFcsCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrFcsCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_FCS_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_FCS_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRxErrOtherCountAttribute(
         LongAttributeCallback callback) {
-        readRxErrOtherCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_OTHER_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RX_ERR_OTHER_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRxErrOtherCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRxErrOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RX_ERR_OTHER_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RX_ERR_OTHER_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveTimestampAttribute(
         ActiveTimestampAttributeCallback callback) {
-        readActiveTimestampAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_TIMESTAMP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_TIMESTAMP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveTimestampAttribute(
         ActiveTimestampAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_TIMESTAMP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_TIMESTAMP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPendingTimestampAttribute(
         PendingTimestampAttributeCallback callback) {
-        readPendingTimestampAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PENDING_TIMESTAMP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PENDING_TIMESTAMP_ATTRIBUTE_ID, true);
     }
 
     public void subscribePendingTimestampAttribute(
         PendingTimestampAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePendingTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PENDING_TIMESTAMP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PENDING_TIMESTAMP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDelayAttribute(
         DelayAttributeCallback callback) {
-        readDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DELAY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DELAY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDelayAttribute(
         DelayAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DELAY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSecurityPolicyAttribute(
         SecurityPolicyAttributeCallback callback) {
-        readSecurityPolicyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SECURITY_POLICY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SECURITY_POLICY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSecurityPolicyAttribute(
         SecurityPolicyAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSecurityPolicyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SECURITY_POLICY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SECURITY_POLICY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readChannelPage0MaskAttribute(
         ChannelPage0MaskAttributeCallback callback) {
-        readChannelPage0MaskAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_PAGE0_MASK_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANNEL_PAGE0_MASK_ATTRIBUTE_ID, true);
     }
 
     public void subscribeChannelPage0MaskAttribute(
         ChannelPage0MaskAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChannelPage0MaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_PAGE0_MASK_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANNEL_PAGE0_MASK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOperationalDatasetComponentsAttribute(
         OperationalDatasetComponentsAttributeCallback callback) {
-        readOperationalDatasetComponentsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOperationalDatasetComponentsAttribute(
         OperationalDatasetComponentsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalDatasetComponentsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveNetworkFaultsListAttribute(
         ActiveNetworkFaultsListAttributeCallback callback) {
-        readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_NETWORK_FAULTS_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_NETWORK_FAULTS_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveNetworkFaultsListAttribute(
         ActiveNetworkFaultsListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveNetworkFaultsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_NETWORK_FAULTS_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_NETWORK_FAULTS_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readChannelAttribute(long chipClusterPtr, ChannelAttributeCallback callback);
-
-    private native void subscribeChannelAttribute(long chipClusterPtr, ChannelAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRoutingRoleAttribute(long chipClusterPtr, RoutingRoleAttributeCallback callback);
-
-    private native void subscribeRoutingRoleAttribute(long chipClusterPtr, RoutingRoleAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNetworkNameAttribute(long chipClusterPtr, NetworkNameAttributeCallback callback);
-
-    private native void subscribeNetworkNameAttribute(long chipClusterPtr, NetworkNameAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPanIdAttribute(long chipClusterPtr, PanIdAttributeCallback callback);
-
-    private native void subscribePanIdAttribute(long chipClusterPtr, PanIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readExtendedPanIdAttribute(long chipClusterPtr, ExtendedPanIdAttributeCallback callback);
-
-    private native void subscribeExtendedPanIdAttribute(long chipClusterPtr, ExtendedPanIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeshLocalPrefixAttribute(long chipClusterPtr, MeshLocalPrefixAttributeCallback callback);
-
-    private native void subscribeMeshLocalPrefixAttribute(long chipClusterPtr, MeshLocalPrefixAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOverrunCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeOverrunCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNeighborTableAttribute(long chipClusterPtr, NeighborTableAttributeCallback callback);
-
-    private native void subscribeNeighborTableAttribute(long chipClusterPtr, NeighborTableAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRouteTableAttribute(long chipClusterPtr, RouteTableAttributeCallback callback);
-
-    private native void subscribeRouteTableAttribute(long chipClusterPtr, RouteTableAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPartitionIdAttribute(long chipClusterPtr, PartitionIdAttributeCallback callback);
-
-    private native void subscribePartitionIdAttribute(long chipClusterPtr, PartitionIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWeightingAttribute(long chipClusterPtr, WeightingAttributeCallback callback);
-
-    private native void subscribeWeightingAttribute(long chipClusterPtr, WeightingAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDataVersionAttribute(long chipClusterPtr, DataVersionAttributeCallback callback);
-
-    private native void subscribeDataVersionAttribute(long chipClusterPtr, DataVersionAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStableDataVersionAttribute(long chipClusterPtr, StableDataVersionAttributeCallback callback);
-
-    private native void subscribeStableDataVersionAttribute(long chipClusterPtr, StableDataVersionAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLeaderRouterIdAttribute(long chipClusterPtr, LeaderRouterIdAttributeCallback callback);
-
-    private native void subscribeLeaderRouterIdAttribute(long chipClusterPtr, LeaderRouterIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDetachedRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDetachedRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readChildRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeChildRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRouterRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRouterRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLeaderRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLeaderRoleCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttachAttemptCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeAttachAttemptCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPartitionIdChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePartitionIdChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readParentChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeParentChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxTotalCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxTotalCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxUnicastCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxUnicastCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxBroadcastCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxBroadcastCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxAckRequestedCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxAckRequestedCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxAckedCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxAckedCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxNoAckRequestedCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxNoAckRequestedCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxDataCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxDataCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxDataPollCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxDataPollCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxBeaconCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxBeaconCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxBeaconRequestCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxBeaconRequestCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxRetryCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxRetryCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxErrCcaCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxErrCcaCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxErrAbortCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxErrAbortCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxErrBusyChannelCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxErrBusyChannelCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxTotalCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxTotalCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxUnicastCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxUnicastCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxBroadcastCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxBroadcastCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxDataCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxDataCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxDataPollCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxDataPollCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxBeaconCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxBeaconCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxBeaconRequestCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxBeaconRequestCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxAddressFilteredCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxAddressFilteredCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxDestAddrFilteredCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxDestAddrFilteredCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxDuplicatedCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxDuplicatedCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrNoFrameCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrNoFrameCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrUnknownNeighborCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrUnknownNeighborCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrSecCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrSecCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrFcsCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrFcsCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRxErrOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeRxErrOtherCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveTimestampAttribute(long chipClusterPtr, ActiveTimestampAttributeCallback callback);
-
-    private native void subscribeActiveTimestampAttribute(long chipClusterPtr, ActiveTimestampAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPendingTimestampAttribute(long chipClusterPtr, PendingTimestampAttributeCallback callback);
-
-    private native void subscribePendingTimestampAttribute(long chipClusterPtr, PendingTimestampAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDelayAttribute(long chipClusterPtr, DelayAttributeCallback callback);
-
-    private native void subscribeDelayAttribute(long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSecurityPolicyAttribute(long chipClusterPtr, SecurityPolicyAttributeCallback callback);
-
-    private native void subscribeSecurityPolicyAttribute(long chipClusterPtr, SecurityPolicyAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readChannelPage0MaskAttribute(long chipClusterPtr, ChannelPage0MaskAttributeCallback callback);
-
-    private native void subscribeChannelPage0MaskAttribute(long chipClusterPtr, ChannelPage0MaskAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOperationalDatasetComponentsAttribute(long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback);
-
-    private native void subscribeOperationalDatasetComponentsAttribute(long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveNetworkFaultsListAttribute(long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback);
-
-    private native void subscribeActiveNetworkFaultsListAttribute(long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 54L;
 
+    private static final long BSSID_ATTRIBUTE_ID = 0L;
+    private static final long SECURITY_TYPE_ATTRIBUTE_ID = 1L;
+    private static final long WI_FI_VERSION_ATTRIBUTE_ID = 2L;
+    private static final long CHANNEL_NUMBER_ATTRIBUTE_ID = 3L;
+    private static final long RSSI_ATTRIBUTE_ID = 4L;
+    private static final long BEACON_LOST_COUNT_ATTRIBUTE_ID = 5L;
+    private static final long BEACON_RX_COUNT_ATTRIBUTE_ID = 6L;
+    private static final long PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID = 7L;
+    private static final long PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID = 8L;
+    private static final long PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID = 9L;
+    private static final long PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID = 10L;
+    private static final long CURRENT_MAX_RATE_ATTRIBUTE_ID = 11L;
+    private static final long OVERRUN_COUNT_ATTRIBUTE_ID = 12L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public WiFiNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void resetCounts(DefaultClusterCallback callback) {
-      resetCounts(chipClusterPtr, callback, null);
+      resetCounts(callback, 0);
     }
 
     public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface BssidAttributeCallback {
+    public interface BssidAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable byte[] value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SecurityTypeAttributeCallback {
+    public interface SecurityTypeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface WiFiVersionAttributeCallback {
+    public interface WiFiVersionAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ChannelNumberAttributeCallback {
+    public interface ChannelNumberAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface RssiAttributeCallback {
+    public interface RssiAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BeaconLostCountAttributeCallback {
+    public interface BeaconLostCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BeaconRxCountAttributeCallback {
+    public interface BeaconRxCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PacketMulticastRxCountAttributeCallback {
+    public interface PacketMulticastRxCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PacketMulticastTxCountAttributeCallback {
+    public interface PacketMulticastTxCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PacketUnicastRxCountAttributeCallback {
+    public interface PacketUnicastRxCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PacketUnicastTxCountAttributeCallback {
+    public interface PacketUnicastTxCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CurrentMaxRateAttributeCallback {
+    public interface CurrentMaxRateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OverrunCountAttributeCallback {
+    public interface OverrunCountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readBssidAttribute(
         BssidAttributeCallback callback) {
-        readBssidAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BSSID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BSSID_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBssidAttribute(
         BssidAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBssidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BSSID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BSSID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSecurityTypeAttribute(
         SecurityTypeAttributeCallback callback) {
-        readSecurityTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SECURITY_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SECURITY_TYPE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSecurityTypeAttribute(
         SecurityTypeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSecurityTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SECURITY_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SECURITY_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWiFiVersionAttribute(
         WiFiVersionAttributeCallback callback) {
-        readWiFiVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WI_FI_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WI_FI_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWiFiVersionAttribute(
         WiFiVersionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWiFiVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WI_FI_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WI_FI_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readChannelNumberAttribute(
         ChannelNumberAttributeCallback callback) {
-        readChannelNumberAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_NUMBER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANNEL_NUMBER_ATTRIBUTE_ID, true);
     }
 
     public void subscribeChannelNumberAttribute(
         ChannelNumberAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChannelNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_NUMBER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANNEL_NUMBER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRssiAttribute(
         RssiAttributeCallback callback) {
-        readRssiAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RSSI_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RSSI_ATTRIBUTE_ID, true);
     }
 
     public void subscribeRssiAttribute(
         RssiAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRssiAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RSSI_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RSSI_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBeaconLostCountAttribute(
         BeaconLostCountAttributeCallback callback) {
-        readBeaconLostCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BEACON_LOST_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BEACON_LOST_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBeaconLostCountAttribute(
         BeaconLostCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBeaconLostCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BEACON_LOST_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BEACON_LOST_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBeaconRxCountAttribute(
         BeaconRxCountAttributeCallback callback) {
-        readBeaconRxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BEACON_RX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BEACON_RX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeBeaconRxCountAttribute(
         BeaconRxCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBeaconRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BEACON_RX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BEACON_RX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketMulticastRxCountAttribute(
         PacketMulticastRxCountAttributeCallback callback) {
-        readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketMulticastRxCountAttribute(
         PacketMulticastRxCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketMulticastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketMulticastTxCountAttribute(
         PacketMulticastTxCountAttributeCallback callback) {
-        readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketMulticastTxCountAttribute(
         PacketMulticastTxCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketMulticastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketUnicastRxCountAttribute(
         PacketUnicastRxCountAttributeCallback callback) {
-        readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketUnicastRxCountAttribute(
         PacketUnicastRxCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketUnicastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketUnicastTxCountAttribute(
         PacketUnicastTxCountAttributeCallback callback) {
-        readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketUnicastTxCountAttribute(
         PacketUnicastTxCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketUnicastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentMaxRateAttribute(
         CurrentMaxRateAttributeCallback callback) {
-        readCurrentMaxRateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MAX_RATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MAX_RATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentMaxRateAttribute(
         CurrentMaxRateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentMaxRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MAX_RATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MAX_RATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOverrunCountAttribute(
         OverrunCountAttributeCallback callback) {
-        readOverrunCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOverrunCountAttribute(
         OverrunCountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readBssidAttribute(long chipClusterPtr, BssidAttributeCallback callback);
-
-    private native void subscribeBssidAttribute(long chipClusterPtr, BssidAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSecurityTypeAttribute(long chipClusterPtr, SecurityTypeAttributeCallback callback);
-
-    private native void subscribeSecurityTypeAttribute(long chipClusterPtr, SecurityTypeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWiFiVersionAttribute(long chipClusterPtr, WiFiVersionAttributeCallback callback);
-
-    private native void subscribeWiFiVersionAttribute(long chipClusterPtr, WiFiVersionAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readChannelNumberAttribute(long chipClusterPtr, ChannelNumberAttributeCallback callback);
-
-    private native void subscribeChannelNumberAttribute(long chipClusterPtr, ChannelNumberAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRssiAttribute(long chipClusterPtr, RssiAttributeCallback callback);
-
-    private native void subscribeRssiAttribute(long chipClusterPtr, RssiAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBeaconLostCountAttribute(long chipClusterPtr, BeaconLostCountAttributeCallback callback);
-
-    private native void subscribeBeaconLostCountAttribute(long chipClusterPtr, BeaconLostCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBeaconRxCountAttribute(long chipClusterPtr, BeaconRxCountAttributeCallback callback);
-
-    private native void subscribeBeaconRxCountAttribute(long chipClusterPtr, BeaconRxCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketMulticastRxCountAttribute(long chipClusterPtr, PacketMulticastRxCountAttributeCallback callback);
-
-    private native void subscribePacketMulticastRxCountAttribute(long chipClusterPtr, PacketMulticastRxCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketMulticastTxCountAttribute(long chipClusterPtr, PacketMulticastTxCountAttributeCallback callback);
-
-    private native void subscribePacketMulticastTxCountAttribute(long chipClusterPtr, PacketMulticastTxCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketUnicastRxCountAttribute(long chipClusterPtr, PacketUnicastRxCountAttributeCallback callback);
-
-    private native void subscribePacketUnicastRxCountAttribute(long chipClusterPtr, PacketUnicastRxCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketUnicastTxCountAttribute(long chipClusterPtr, PacketUnicastTxCountAttributeCallback callback);
-
-    private native void subscribePacketUnicastTxCountAttribute(long chipClusterPtr, PacketUnicastTxCountAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readCurrentMaxRateAttribute(long chipClusterPtr, CurrentMaxRateAttributeCallback callback);
-
-    private native void subscribeCurrentMaxRateAttribute(long chipClusterPtr, CurrentMaxRateAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOverrunCountAttribute(long chipClusterPtr, OverrunCountAttributeCallback callback);
-
-    private native void subscribeOverrunCountAttribute(long chipClusterPtr, OverrunCountAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 55L;
 
+    private static final long P_H_Y_RATE_ATTRIBUTE_ID = 0L;
+    private static final long FULL_DUPLEX_ATTRIBUTE_ID = 1L;
+    private static final long PACKET_RX_COUNT_ATTRIBUTE_ID = 2L;
+    private static final long PACKET_TX_COUNT_ATTRIBUTE_ID = 3L;
+    private static final long TX_ERR_COUNT_ATTRIBUTE_ID = 4L;
+    private static final long COLLISION_COUNT_ATTRIBUTE_ID = 5L;
+    private static final long OVERRUN_COUNT_ATTRIBUTE_ID = 6L;
+    private static final long CARRIER_DETECT_ATTRIBUTE_ID = 7L;
+    private static final long TIME_SINCE_RESET_ATTRIBUTE_ID = 8L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public EthernetNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void resetCounts(DefaultClusterCallback callback) {
-      resetCounts(chipClusterPtr, callback, null);
+      resetCounts(callback, 0);
     }
 
     public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface PHYRateAttributeCallback {
+    public interface PHYRateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface FullDuplexAttributeCallback {
+    public interface FullDuplexAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Boolean value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CarrierDetectAttributeCallback {
+    public interface CarrierDetectAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Boolean value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readPHYRateAttribute(
         PHYRateAttributeCallback callback) {
-        readPHYRateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_H_Y_RATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_H_Y_RATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePHYRateAttribute(
         PHYRateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePHYRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_H_Y_RATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_H_Y_RATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFullDuplexAttribute(
         FullDuplexAttributeCallback callback) {
-        readFullDuplexAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FULL_DUPLEX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FULL_DUPLEX_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFullDuplexAttribute(
         FullDuplexAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFullDuplexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FULL_DUPLEX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FULL_DUPLEX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketRxCountAttribute(
         LongAttributeCallback callback) {
-        readPacketRxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_RX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_RX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketRxCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_RX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_RX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPacketTxCountAttribute(
         LongAttributeCallback callback) {
-        readPacketTxCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_TX_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PACKET_TX_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribePacketTxCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePacketTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PACKET_TX_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PACKET_TX_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTxErrCountAttribute(
         LongAttributeCallback callback) {
-        readTxErrCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TX_ERR_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTxErrCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTxErrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TX_ERR_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TX_ERR_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCollisionCountAttribute(
         LongAttributeCallback callback) {
-        readCollisionCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLLISION_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLLISION_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCollisionCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCollisionCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLLISION_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLLISION_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOverrunCountAttribute(
         LongAttributeCallback callback) {
-        readOverrunCountAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOverrunCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERRUN_COUNT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OVERRUN_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCarrierDetectAttribute(
         CarrierDetectAttributeCallback callback) {
-        readCarrierDetectAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CARRIER_DETECT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CARRIER_DETECT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCarrierDetectAttribute(
         CarrierDetectAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCarrierDetectAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CARRIER_DETECT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CARRIER_DETECT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTimeSinceResetAttribute(
         LongAttributeCallback callback) {
-        readTimeSinceResetAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_SINCE_RESET_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_SINCE_RESET_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTimeSinceResetAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimeSinceResetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_SINCE_RESET_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_SINCE_RESET_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readPHYRateAttribute(long chipClusterPtr, PHYRateAttributeCallback callback);
-
-    private native void subscribePHYRateAttribute(long chipClusterPtr, PHYRateAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFullDuplexAttribute(long chipClusterPtr, FullDuplexAttributeCallback callback);
-
-    private native void subscribeFullDuplexAttribute(long chipClusterPtr, FullDuplexAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketRxCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePacketRxCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPacketTxCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePacketTxCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTxErrCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTxErrCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCollisionCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeCollisionCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOverrunCountAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeOverrunCountAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readCarrierDetectAttribute(long chipClusterPtr, CarrierDetectAttributeCallback callback);
-
-    private native void subscribeCarrierDetectAttribute(long chipClusterPtr, CarrierDetectAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTimeSinceResetAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeTimeSinceResetAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class TimeSynchronizationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 56L;
 
+    private static final long U_T_C_TIME_ATTRIBUTE_ID = 0L;
+    private static final long GRANULARITY_ATTRIBUTE_ID = 1L;
+    private static final long TIME_SOURCE_ATTRIBUTE_ID = 2L;
+    private static final long TRUSTED_TIME_SOURCE_ATTRIBUTE_ID = 3L;
+    private static final long DEFAULT_N_T_P_ATTRIBUTE_ID = 4L;
+    private static final long TIME_ZONE_ATTRIBUTE_ID = 5L;
+    private static final long D_S_T_OFFSET_ATTRIBUTE_ID = 6L;
+    private static final long LOCAL_TIME_ATTRIBUTE_ID = 7L;
+    private static final long TIME_ZONE_DATABASE_ATTRIBUTE_ID = 8L;
+    private static final long N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID = 9L;
+    private static final long TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID = 10L;
+    private static final long D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID = 11L;
+    private static final long SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID = 12L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public TimeSynchronizationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void setUTCTime(DefaultClusterCallback callback, Long UTCTime, Integer granularity, Optional<Integer> timeSource) {
-      setUTCTime(chipClusterPtr, callback, UTCTime, granularity, timeSource, null);
+      setUTCTime(callback, UTCTime, granularity, timeSource, 0);
     }
 
     public void setUTCTime(DefaultClusterCallback callback, Long UTCTime, Integer granularity, Optional<Integer> timeSource, int timedInvokeTimeoutMs) {
-      setUTCTime(chipClusterPtr, callback, UTCTime, granularity, timeSource, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long UTCTimeFieldID = 0L;
+      BaseTLVType UTCTimetlvValue = new UIntType(UTCTime);
+      elements.add(new StructElement(UTCTimeFieldID, UTCTimetlvValue));
+
+      final long granularityFieldID = 1L;
+      BaseTLVType granularitytlvValue = new UIntType(granularity);
+      elements.add(new StructElement(granularityFieldID, granularitytlvValue));
+
+      final long timeSourceFieldID = 2L;
+      BaseTLVType timeSourcetlvValue = timeSource.<BaseTLVType>map((nonOptionaltimeSource) -> new UIntType(nonOptionaltimeSource)).orElse(new EmptyType());
+      elements.add(new StructElement(timeSourceFieldID, timeSourcetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void setTrustedTimeSource(DefaultClusterCallback callback, @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource) {
-      setTrustedTimeSource(chipClusterPtr, callback, trustedTimeSource, null);
+      setTrustedTimeSource(callback, trustedTimeSource, 0);
     }
 
     public void setTrustedTimeSource(DefaultClusterCallback callback, @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource, int timedInvokeTimeoutMs) {
-      setTrustedTimeSource(chipClusterPtr, callback, trustedTimeSource, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long trustedTimeSourceFieldID = 0L;
+      BaseTLVType trustedTimeSourcetlvValue = trustedTimeSource != null ? trustedTimeSource.encodeTlv() : new NullType();
+      elements.add(new StructElement(trustedTimeSourceFieldID, trustedTimeSourcetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void setTimeZone(SetTimeZoneResponseCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone) {
-      setTimeZone(chipClusterPtr, callback, timeZone, null);
+      setTimeZone(callback, timeZone, 0);
     }
 
     public void setTimeZone(SetTimeZoneResponseCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone, int timedInvokeTimeoutMs) {
-      setTimeZone(chipClusterPtr, callback, timeZone, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeZoneFieldID = 0L;
+      BaseTLVType timeZonetlvValue = ArrayType.generateArrayType(timeZone, (elementtimeZone) -> elementtimeZone.encodeTlv());
+      elements.add(new StructElement(timeZoneFieldID, timeZonetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long DSTOffsetRequiredFieldID = 0L;
+          Boolean DSTOffsetRequired = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == DSTOffsetRequiredFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                DSTOffsetRequired = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(DSTOffsetRequired);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void setDSTOffset(DefaultClusterCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset) {
-      setDSTOffset(chipClusterPtr, callback, DSTOffset, null);
+      setDSTOffset(callback, DSTOffset, 0);
     }
 
     public void setDSTOffset(DefaultClusterCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset, int timedInvokeTimeoutMs) {
-      setDSTOffset(chipClusterPtr, callback, DSTOffset, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long DSTOffsetFieldID = 0L;
+      BaseTLVType DSTOffsettlvValue = ArrayType.generateArrayType(DSTOffset, (elementDSTOffset) -> elementDSTOffset.encodeTlv());
+      elements.add(new StructElement(DSTOffsetFieldID, DSTOffsettlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void setDefaultNTP(DefaultClusterCallback callback, @Nullable String defaultNTP) {
-      setDefaultNTP(chipClusterPtr, callback, defaultNTP, null);
+      setDefaultNTP(callback, defaultNTP, 0);
     }
 
     public void setDefaultNTP(DefaultClusterCallback callback, @Nullable String defaultNTP, int timedInvokeTimeoutMs) {
-      setDefaultNTP(chipClusterPtr, callback, defaultNTP, timedInvokeTimeoutMs);
-    }
-
-    private native void setUTCTime(long chipClusterPtr, DefaultClusterCallback callback, Long UTCTime, Integer granularity, Optional<Integer> timeSource, @Nullable Integer timedInvokeTimeoutMs);
+      final long commandId = 5L;
 
-    private native void setTrustedTimeSource(long chipClusterPtr, DefaultClusterCallback callback, @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long defaultNTPFieldID = 0L;
+      BaseTLVType defaultNTPtlvValue = defaultNTP != null ? new StringType(defaultNTP) : new NullType();
+      elements.add(new StructElement(defaultNTPFieldID, defaultNTPtlvValue));
 
-    private native void setTimeZone(long chipClusterPtr, SetTimeZoneResponseCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void setDSTOffset(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void setDefaultNTP(long chipClusterPtr, DefaultClusterCallback callback, @Nullable String defaultNTP, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface SetTimeZoneResponseCallback {
+    public interface SetTimeZoneResponseCallback extends BaseClusterCallback {
       void onSuccess(Boolean DSTOffsetRequired);
-      void onError(Exception error);
     }
 
-    public interface UTCTimeAttributeCallback {
+    public interface UTCTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface TrustedTimeSourceAttributeCallback {
+    public interface TrustedTimeSourceAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DefaultNTPAttributeCallback {
+    public interface DefaultNTPAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable String value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface TimeZoneAttributeCallback {
+    public interface TimeZoneAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DSTOffsetAttributeCallback {
+    public interface DSTOffsetAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LocalTimeAttributeCallback {
+    public interface LocalTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readUTCTimeAttribute(
         UTCTimeAttributeCallback callback) {
-        readUTCTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, U_T_C_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, U_T_C_TIME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUTCTimeAttribute(
         UTCTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUTCTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, U_T_C_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, U_T_C_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGranularityAttribute(
         IntegerAttributeCallback callback) {
-        readGranularityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GRANULARITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GRANULARITY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGranularityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGranularityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GRANULARITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GRANULARITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTimeSourceAttribute(
         IntegerAttributeCallback callback) {
-        readTimeSourceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_SOURCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_SOURCE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTimeSourceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_SOURCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_SOURCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTrustedTimeSourceAttribute(
         TrustedTimeSourceAttributeCallback callback) {
-        readTrustedTimeSourceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRUSTED_TIME_SOURCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TRUSTED_TIME_SOURCE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTrustedTimeSourceAttribute(
         TrustedTimeSourceAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTrustedTimeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRUSTED_TIME_SOURCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TRUSTED_TIME_SOURCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDefaultNTPAttribute(
         DefaultNTPAttributeCallback callback) {
-        readDefaultNTPAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_N_T_P_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_N_T_P_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDefaultNTPAttribute(
         DefaultNTPAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDefaultNTPAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_N_T_P_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_N_T_P_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTimeZoneAttribute(
         TimeZoneAttributeCallback callback) {
-        readTimeZoneAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_ZONE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTimeZoneAttribute(
         TimeZoneAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimeZoneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_ZONE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDSTOffsetAttribute(
         DSTOffsetAttributeCallback callback) {
-        readDSTOffsetAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, D_S_T_OFFSET_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDSTOffsetAttribute(
         DSTOffsetAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDSTOffsetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, D_S_T_OFFSET_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLocalTimeAttribute(
         LocalTimeAttributeCallback callback) {
-        readLocalTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCAL_TIME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLocalTimeAttribute(
         LocalTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCAL_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTimeZoneDatabaseAttribute(
         IntegerAttributeCallback callback) {
-        readTimeZoneDatabaseAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_DATABASE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_ZONE_DATABASE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTimeZoneDatabaseAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimeZoneDatabaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_DATABASE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_ZONE_DATABASE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNTPServerAvailableAttribute(
         BooleanAttributeCallback callback) {
-        readNTPServerAvailableAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNTPServerAvailableAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNTPServerAvailableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTimeZoneListMaxSizeAttribute(
         IntegerAttributeCallback callback) {
-        readTimeZoneListMaxSizeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTimeZoneListMaxSizeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimeZoneListMaxSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDSTOffsetListMaxSizeAttribute(
         IntegerAttributeCallback callback) {
-        readDSTOffsetListMaxSizeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeDSTOffsetListMaxSizeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDSTOffsetListMaxSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportsDNSResolveAttribute(
         BooleanAttributeCallback callback) {
-        readSupportsDNSResolveAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportsDNSResolveAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportsDNSResolveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readUTCTimeAttribute(long chipClusterPtr, UTCTimeAttributeCallback callback);
-
-    private native void subscribeUTCTimeAttribute(long chipClusterPtr, UTCTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGranularityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeGranularityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTimeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTimeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTrustedTimeSourceAttribute(long chipClusterPtr, TrustedTimeSourceAttributeCallback callback);
-
-    private native void subscribeTrustedTimeSourceAttribute(long chipClusterPtr, TrustedTimeSourceAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDefaultNTPAttribute(long chipClusterPtr, DefaultNTPAttributeCallback callback);
-
-    private native void subscribeDefaultNTPAttribute(long chipClusterPtr, DefaultNTPAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTimeZoneAttribute(long chipClusterPtr, TimeZoneAttributeCallback callback);
-
-    private native void subscribeTimeZoneAttribute(long chipClusterPtr, TimeZoneAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDSTOffsetAttribute(long chipClusterPtr, DSTOffsetAttributeCallback callback);
-
-    private native void subscribeDSTOffsetAttribute(long chipClusterPtr, DSTOffsetAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLocalTimeAttribute(long chipClusterPtr, LocalTimeAttributeCallback callback);
-
-    private native void subscribeLocalTimeAttribute(long chipClusterPtr, LocalTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTimeZoneDatabaseAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTimeZoneDatabaseAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNTPServerAvailableAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeNTPServerAvailableAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTimeZoneListMaxSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTimeZoneListMaxSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDSTOffsetListMaxSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDSTOffsetListMaxSizeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportsDNSResolveAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeSupportsDNSResolveAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class BridgedDeviceBasicInformationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 57L;
 
+    private static final long VENDOR_NAME_ATTRIBUTE_ID = 1L;
+    private static final long VENDOR_I_D_ATTRIBUTE_ID = 2L;
+    private static final long PRODUCT_NAME_ATTRIBUTE_ID = 3L;
+    private static final long NODE_LABEL_ATTRIBUTE_ID = 5L;
+    private static final long HARDWARE_VERSION_ATTRIBUTE_ID = 7L;
+    private static final long HARDWARE_VERSION_STRING_ATTRIBUTE_ID = 8L;
+    private static final long SOFTWARE_VERSION_ATTRIBUTE_ID = 9L;
+    private static final long SOFTWARE_VERSION_STRING_ATTRIBUTE_ID = 10L;
+    private static final long MANUFACTURING_DATE_ATTRIBUTE_ID = 11L;
+    private static final long PART_NUMBER_ATTRIBUTE_ID = 12L;
+    private static final long PRODUCT_U_R_L_ATTRIBUTE_ID = 13L;
+    private static final long PRODUCT_LABEL_ATTRIBUTE_ID = 14L;
+    private static final long SERIAL_NUMBER_ATTRIBUTE_ID = 15L;
+    private static final long REACHABLE_ATTRIBUTE_ID = 17L;
+    private static final long UNIQUE_I_D_ATTRIBUTE_ID = 18L;
+    private static final long PRODUCT_APPEARANCE_ATTRIBUTE_ID = 20L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public BridgedDeviceBasicInformationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface ProductAppearanceAttributeCallback {
+    public interface ProductAppearanceAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readVendorNameAttribute(
         CharStringAttributeCallback callback) {
-        readVendorNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeVendorNameAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readVendorIDAttribute(
         IntegerAttributeCallback callback) {
-        readVendorIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeVendorIDAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductNameAttribute(
         CharStringAttributeCallback callback) {
-        readProductNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_NAME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_NAME_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductNameAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readNodeLabelAttribute(
         CharStringAttributeCallback callback) {
-        readNodeLabelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NODE_LABEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NODE_LABEL_ATTRIBUTE_ID, true);
     }
 
     public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
-        writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+      writeNodeLabelAttribute(callback, value, 0);
     }
 
     public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NODE_LABEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeNodeLabelAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NODE_LABEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NODE_LABEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHardwareVersionAttribute(
         IntegerAttributeCallback callback) {
-        readHardwareVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARDWARE_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeHardwareVersionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHardwareVersionStringAttribute(
         CharStringAttributeCallback callback) {
-        readHardwareVersionStringAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARDWARE_VERSION_STRING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeHardwareVersionStringAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_VERSION_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSoftwareVersionAttribute(
         LongAttributeCallback callback) {
-        readSoftwareVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOFTWARE_VERSION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSoftwareVersionAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOFTWARE_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSoftwareVersionStringAttribute(
         CharStringAttributeCallback callback) {
-        readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSoftwareVersionStringAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOFTWARE_VERSION_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readManufacturingDateAttribute(
         CharStringAttributeCallback callback) {
-        readManufacturingDateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MANUFACTURING_DATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MANUFACTURING_DATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeManufacturingDateAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MANUFACTURING_DATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MANUFACTURING_DATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPartNumberAttribute(
         CharStringAttributeCallback callback) {
-        readPartNumberAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PART_NUMBER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PART_NUMBER_ATTRIBUTE_ID, true);
     }
 
     public void subscribePartNumberAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PART_NUMBER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PART_NUMBER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductURLAttribute(
         CharStringAttributeCallback callback) {
-        readProductURLAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_U_R_L_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductURLAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductLabelAttribute(
         CharStringAttributeCallback callback) {
-        readProductLabelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_LABEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_LABEL_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductLabelAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_LABEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_LABEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSerialNumberAttribute(
         CharStringAttributeCallback callback) {
-        readSerialNumberAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERIAL_NUMBER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SERIAL_NUMBER_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSerialNumberAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SERIAL_NUMBER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SERIAL_NUMBER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readReachableAttribute(
         BooleanAttributeCallback callback) {
-        readReachableAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACHABLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACHABLE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeReachableAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACHABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACHABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUniqueIDAttribute(
         CharStringAttributeCallback callback) {
-        readUniqueIDAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNIQUE_I_D_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUniqueIDAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNIQUE_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readProductAppearanceAttribute(
         ProductAppearanceAttributeCallback callback) {
-        readProductAppearanceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_APPEARANCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_APPEARANCE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeProductAppearanceAttribute(
         ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductAppearanceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_APPEARANCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_APPEARANCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+  public static class SwitchCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 59L;
 
-    private native void subscribeVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long NUMBER_OF_POSITIONS_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_POSITION_ATTRIBUTE_ID = 1L;
+    private static final long MULTI_PRESS_MAX_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public SwitchCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readProductNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNodeLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeNodeLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeNodeLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeHardwareVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeHardwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoftwareVersionAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeSoftwareVersionAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoftwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeSoftwareVersionStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readManufacturingDateAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeManufacturingDateAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPartNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribePartNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductURLAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductLabelAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSerialNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeSerialNumberAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readReachableAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeReachableAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUniqueIDAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeUniqueIDAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductAppearanceAttribute(long chipClusterPtr, ProductAppearanceAttributeCallback callback);
-
-    private native void subscribeProductAppearanceAttribute(long chipClusterPtr, ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class SwitchCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 59L;
-
-    public SwitchCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readNumberOfPositionsAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfPositionsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_POSITIONS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_POSITIONS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeNumberOfPositionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfPositionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_POSITIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_POSITIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentPositionAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentPositionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentPositionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMultiPressMaxAttribute(
         IntegerAttributeCallback callback) {
-        readMultiPressMaxAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MULTI_PRESS_MAX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MULTI_PRESS_MAX_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMultiPressMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMultiPressMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MULTI_PRESS_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MULTI_PRESS_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readNumberOfPositionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeNumberOfPositionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMultiPressMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMultiPressMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class AdministratorCommissioningCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 60L;
 
+    private static final long WINDOW_STATUS_ATTRIBUTE_ID = 0L;
+    private static final long ADMIN_FABRIC_INDEX_ATTRIBUTE_ID = 1L;
+    private static final long ADMIN_VENDOR_ID_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public AdministratorCommissioningCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
 
     public void openCommissioningWindow(DefaultClusterCallback callback, Integer commissioningTimeout, byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt, int timedInvokeTimeoutMs) {
-      openCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, PAKEPasscodeVerifier, discriminator, iterations, salt, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long commissioningTimeoutFieldID = 0L;
+      BaseTLVType commissioningTimeouttlvValue = new UIntType(commissioningTimeout);
+      elements.add(new StructElement(commissioningTimeoutFieldID, commissioningTimeouttlvValue));
+
+      final long PAKEPasscodeVerifierFieldID = 1L;
+      BaseTLVType PAKEPasscodeVerifiertlvValue = new ByteArrayType(PAKEPasscodeVerifier);
+      elements.add(new StructElement(PAKEPasscodeVerifierFieldID, PAKEPasscodeVerifiertlvValue));
+
+      final long discriminatorFieldID = 2L;
+      BaseTLVType discriminatortlvValue = new UIntType(discriminator);
+      elements.add(new StructElement(discriminatorFieldID, discriminatortlvValue));
+
+      final long iterationsFieldID = 3L;
+      BaseTLVType iterationstlvValue = new UIntType(iterations);
+      elements.add(new StructElement(iterationsFieldID, iterationstlvValue));
+
+      final long saltFieldID = 4L;
+      BaseTLVType salttlvValue = new ByteArrayType(salt);
+      elements.add(new StructElement(saltFieldID, salttlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
 
     public void openBasicCommissioningWindow(DefaultClusterCallback callback, Integer commissioningTimeout, int timedInvokeTimeoutMs) {
-      openBasicCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, timedInvokeTimeoutMs);
-    }
+      final long commandId = 1L;
 
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long commissioningTimeoutFieldID = 0L;
+      BaseTLVType commissioningTimeouttlvValue = new UIntType(commissioningTimeout);
+      elements.add(new StructElement(commissioningTimeoutFieldID, commissioningTimeouttlvValue));
 
-    public void revokeCommissioning(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      revokeCommissioning(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    private native void openCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, Integer commissioningTimeout, byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt, @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void openBasicCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, Integer commissioningTimeout, @Nullable Integer timedInvokeTimeoutMs);
+    public void revokeCommissioning(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void revokeCommissioning(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface AdminFabricIndexAttributeCallback {
+    public interface AdminFabricIndexAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AdminVendorIdAttributeCallback {
+    public interface AdminVendorIdAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readWindowStatusAttribute(
         IntegerAttributeCallback callback) {
-        readWindowStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WINDOW_STATUS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WINDOW_STATUS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeWindowStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWindowStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WINDOW_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WINDOW_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAdminFabricIndexAttribute(
         AdminFabricIndexAttributeCallback callback) {
-        readAdminFabricIndexAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ADMIN_FABRIC_INDEX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ADMIN_FABRIC_INDEX_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAdminFabricIndexAttribute(
         AdminFabricIndexAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAdminFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ADMIN_FABRIC_INDEX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ADMIN_FABRIC_INDEX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAdminVendorIdAttribute(
         AdminVendorIdAttributeCallback callback) {
-        readAdminVendorIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ADMIN_VENDOR_ID_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ADMIN_VENDOR_ID_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAdminVendorIdAttribute(
         AdminVendorIdAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAdminVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ADMIN_VENDOR_ID_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ADMIN_VENDOR_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readWindowStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeWindowStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAdminFabricIndexAttribute(long chipClusterPtr, AdminFabricIndexAttributeCallback callback);
-
-    private native void subscribeAdminFabricIndexAttribute(long chipClusterPtr, AdminFabricIndexAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAdminVendorIdAttribute(long chipClusterPtr, AdminVendorIdAttributeCallback callback);
-
-    private native void subscribeAdminVendorIdAttribute(long chipClusterPtr, AdminVendorIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class OperationalCredentialsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 62L;
 
+    private static final long N_O_CS_ATTRIBUTE_ID = 0L;
+    private static final long FABRICS_ATTRIBUTE_ID = 1L;
+    private static final long SUPPORTED_FABRICS_ATTRIBUTE_ID = 2L;
+    private static final long COMMISSIONED_FABRICS_ATTRIBUTE_ID = 3L;
+    private static final long TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID = 4L;
+    private static final long CURRENT_FABRIC_INDEX_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public OperationalCredentialsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce) {
-      attestationRequest(chipClusterPtr, callback, attestationNonce, null);
+      attestationRequest(callback, attestationNonce, 0);
     }
 
     public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce, int timedInvokeTimeoutMs) {
-      attestationRequest(chipClusterPtr, callback, attestationNonce, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long attestationNonceFieldID = 0L;
+      BaseTLVType attestationNoncetlvValue = new ByteArrayType(attestationNonce);
+      elements.add(new StructElement(attestationNonceFieldID, attestationNoncetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long attestationElementsFieldID = 0L;
+          byte[] attestationElements = null;
+          final long attestationSignatureFieldID = 1L;
+          byte[] attestationSignature = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == attestationElementsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                attestationElements = castingValue.value(byte[].class);
+              }
+            } else if (element.contextTagNum() == attestationSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                attestationSignature = castingValue.value(byte[].class);
+              }
+            }
+          }
+          callback.onSuccess(attestationElements, attestationSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void certificateChainRequest(CertificateChainResponseCallback callback, Integer certificateType) {
-      certificateChainRequest(chipClusterPtr, callback, certificateType, null);
+      certificateChainRequest(callback, certificateType, 0);
     }
 
     public void certificateChainRequest(CertificateChainResponseCallback callback, Integer certificateType, int timedInvokeTimeoutMs) {
-      certificateChainRequest(chipClusterPtr, callback, certificateType, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long certificateTypeFieldID = 0L;
+      BaseTLVType certificateTypetlvValue = new UIntType(certificateType);
+      elements.add(new StructElement(certificateTypeFieldID, certificateTypetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long certificateFieldID = 0L;
+          byte[] certificate = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == certificateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                certificate = castingValue.value(byte[].class);
+              }
+            }
+          }
+          callback.onSuccess(certificate);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void CSRRequest(CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, null);
+      CSRRequest(callback, CSRNonce, isForUpdateNOC, 0);
     }
 
     public void CSRRequest(CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC, int timedInvokeTimeoutMs) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long CSRNonceFieldID = 0L;
+      BaseTLVType CSRNoncetlvValue = new ByteArrayType(CSRNonce);
+      elements.add(new StructElement(CSRNonceFieldID, CSRNoncetlvValue));
+
+      final long isForUpdateNOCFieldID = 1L;
+      BaseTLVType isForUpdateNOCtlvValue = isForUpdateNOC.<BaseTLVType>map((nonOptionalisForUpdateNOC) -> new BooleanType(nonOptionalisForUpdateNOC)).orElse(new EmptyType());
+      elements.add(new StructElement(isForUpdateNOCFieldID, isForUpdateNOCtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long NOCSRElementsFieldID = 0L;
+          byte[] NOCSRElements = null;
+          final long attestationSignatureFieldID = 1L;
+          byte[] attestationSignature = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == NOCSRElementsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                NOCSRElements = castingValue.value(byte[].class);
+              }
+            } else if (element.contextTagNum() == attestationSignatureFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                attestationSignature = castingValue.value(byte[].class);
+              }
+            }
+          }
+          callback.onSuccess(NOCSRElements, attestationSignature);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addNOC(NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId) {
-      addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminSubject, adminVendorId, null);
+      addNOC(callback, NOCValue, ICACValue, IPKValue, caseAdminSubject, adminVendorId, 0);
     }
 
     public void addNOC(NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId, int timedInvokeTimeoutMs) {
-      addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminSubject, adminVendorId, timedInvokeTimeoutMs);
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long NOCValueFieldID = 0L;
+      BaseTLVType NOCValuetlvValue = new ByteArrayType(NOCValue);
+      elements.add(new StructElement(NOCValueFieldID, NOCValuetlvValue));
+
+      final long ICACValueFieldID = 1L;
+      BaseTLVType ICACValuetlvValue = ICACValue.<BaseTLVType>map((nonOptionalICACValue) -> new ByteArrayType(nonOptionalICACValue)).orElse(new EmptyType());
+      elements.add(new StructElement(ICACValueFieldID, ICACValuetlvValue));
+
+      final long IPKValueFieldID = 2L;
+      BaseTLVType IPKValuetlvValue = new ByteArrayType(IPKValue);
+      elements.add(new StructElement(IPKValueFieldID, IPKValuetlvValue));
+
+      final long caseAdminSubjectFieldID = 3L;
+      BaseTLVType caseAdminSubjecttlvValue = new UIntType(caseAdminSubject);
+      elements.add(new StructElement(caseAdminSubjectFieldID, caseAdminSubjecttlvValue));
+
+      final long adminVendorIdFieldID = 4L;
+      BaseTLVType adminVendorIdtlvValue = new UIntType(adminVendorId);
+      elements.add(new StructElement(adminVendorIdFieldID, adminVendorIdtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusCodeFieldID = 0L;
+          Integer statusCode = null;
+          final long fabricIndexFieldID = 1L;
+          Optional<Integer> fabricIndex = Optional.empty();
+          final long debugTextFieldID = 2L;
+          Optional<String> debugText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                statusCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == fabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                fabricIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(statusCode, fabricIndex, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void updateNOC(NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue) {
-      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, null);
+      updateNOC(callback, NOCValue, ICACValue, 0);
     }
 
     public void updateNOC(NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue, int timedInvokeTimeoutMs) {
-      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, timedInvokeTimeoutMs);
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long NOCValueFieldID = 0L;
+      BaseTLVType NOCValuetlvValue = new ByteArrayType(NOCValue);
+      elements.add(new StructElement(NOCValueFieldID, NOCValuetlvValue));
+
+      final long ICACValueFieldID = 1L;
+      BaseTLVType ICACValuetlvValue = ICACValue.<BaseTLVType>map((nonOptionalICACValue) -> new ByteArrayType(nonOptionalICACValue)).orElse(new EmptyType());
+      elements.add(new StructElement(ICACValueFieldID, ICACValuetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusCodeFieldID = 0L;
+          Integer statusCode = null;
+          final long fabricIndexFieldID = 1L;
+          Optional<Integer> fabricIndex = Optional.empty();
+          final long debugTextFieldID = 2L;
+          Optional<String> debugText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                statusCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == fabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                fabricIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(statusCode, fabricIndex, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void updateFabricLabel(NOCResponseCallback callback, String label) {
-      updateFabricLabel(chipClusterPtr, callback, label, null);
+      updateFabricLabel(callback, label, 0);
     }
 
     public void updateFabricLabel(NOCResponseCallback callback, String label, int timedInvokeTimeoutMs) {
-      updateFabricLabel(chipClusterPtr, callback, label, timedInvokeTimeoutMs);
+      final long commandId = 9L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long labelFieldID = 0L;
+      BaseTLVType labeltlvValue = new StringType(label);
+      elements.add(new StructElement(labelFieldID, labeltlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusCodeFieldID = 0L;
+          Integer statusCode = null;
+          final long fabricIndexFieldID = 1L;
+          Optional<Integer> fabricIndex = Optional.empty();
+          final long debugTextFieldID = 2L;
+          Optional<String> debugText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                statusCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == fabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                fabricIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(statusCode, fabricIndex, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void removeFabric(NOCResponseCallback callback, Integer fabricIndex) {
-      removeFabric(chipClusterPtr, callback, fabricIndex, null);
+      removeFabric(callback, fabricIndex, 0);
     }
 
     public void removeFabric(NOCResponseCallback callback, Integer fabricIndex, int timedInvokeTimeoutMs) {
-      removeFabric(chipClusterPtr, callback, fabricIndex, timedInvokeTimeoutMs);
+      final long commandId = 10L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long fabricIndexFieldID = 0L;
+      BaseTLVType fabricIndextlvValue = new UIntType(fabricIndex);
+      elements.add(new StructElement(fabricIndexFieldID, fabricIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusCodeFieldID = 0L;
+          Integer statusCode = null;
+          final long fabricIndexFieldID = 1L;
+          Optional<Integer> fabricIndex = Optional.empty();
+          final long debugTextFieldID = 2L;
+          Optional<String> debugText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusCodeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                statusCode = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == fabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                fabricIndex = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == debugTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                debugText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(statusCode, fabricIndex, debugText);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCACertificate) {
-      addTrustedRootCertificate(chipClusterPtr, callback, rootCACertificate, null);
+      addTrustedRootCertificate(callback, rootCACertificate, 0);
     }
 
     public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCACertificate, int timedInvokeTimeoutMs) {
-      addTrustedRootCertificate(chipClusterPtr, callback, rootCACertificate, timedInvokeTimeoutMs);
-    }
-
-    private native void attestationRequest(long chipClusterPtr, AttestationResponseCallback callback, byte[] attestationNonce, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void certificateChainRequest(long chipClusterPtr, CertificateChainResponseCallback callback, Integer certificateType, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void CSRRequest(long chipClusterPtr, CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC, @Nullable Integer timedInvokeTimeoutMs);
+      final long commandId = 11L;
 
-    private native void addNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long rootCACertificateFieldID = 0L;
+      BaseTLVType rootCACertificatetlvValue = new ByteArrayType(rootCACertificate);
+      elements.add(new StructElement(rootCACertificateFieldID, rootCACertificatetlvValue));
 
-    private native void updateNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void updateFabricLabel(long chipClusterPtr, NOCResponseCallback callback, String label, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeFabric(long chipClusterPtr, NOCResponseCallback callback, Integer fabricIndex, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback callback, byte[] rootCACertificate, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface AttestationResponseCallback {
+    public interface AttestationResponseCallback extends BaseClusterCallback {
       void onSuccess(byte[] attestationElements, byte[] attestationSignature);
-      void onError(Exception error);
     }
 
-    public interface CertificateChainResponseCallback {
+    public interface CertificateChainResponseCallback extends BaseClusterCallback {
       void onSuccess(byte[] certificate);
-      void onError(Exception error);
     }
 
-    public interface CSRResponseCallback {
+    public interface CSRResponseCallback extends BaseClusterCallback {
       void onSuccess(byte[] NOCSRElements, byte[] attestationSignature);
-      void onError(Exception error);
     }
 
-    public interface NOCResponseCallback {
+    public interface NOCResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer statusCode, Optional<Integer> fabricIndex, Optional<String> debugText);
-      void onError(Exception error);
     }
 
-    public interface NOCsAttributeCallback {
+    public interface NOCsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface FabricsAttributeCallback {
+    public interface FabricsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface TrustedRootCertificatesAttributeCallback {
+    public interface TrustedRootCertificatesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<byte[]> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readNOCsAttribute(
         NOCsAttributeCallback callback) {
-        readNOCsAttribute(chipClusterPtr, callback, true);
+      readNOCsAttributeWithFabricFilter(callback, true);
     }
 
     public void readNOCsAttributeWithFabricFilter(
         NOCsAttributeCallback callback, boolean isFabricFiltered) {
-        readNOCsAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_O_CS_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalCredentialsClusterNOCStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, N_O_CS_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void subscribeNOCsAttribute(
         NOCsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNOCsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_O_CS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalCredentialsClusterNOCStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, N_O_CS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFabricsAttribute(
         FabricsAttributeCallback callback) {
-        readFabricsAttribute(chipClusterPtr, callback, true);
+      readFabricsAttributeWithFabricFilter(callback, true);
     }
 
     public void readFabricsAttributeWithFabricFilter(
         FabricsAttributeCallback callback, boolean isFabricFiltered) {
-        readFabricsAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRICS_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FABRICS_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void subscribeFabricsAttribute(
         FabricsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRICS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FABRICS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedFabricsAttribute(
         IntegerAttributeCallback callback) {
-        readSupportedFabricsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_FABRICS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_FABRICS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedFabricsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_FABRICS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_FABRICS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCommissionedFabricsAttribute(
         IntegerAttributeCallback callback) {
-        readCommissionedFabricsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONED_FABRICS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COMMISSIONED_FABRICS_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCommissionedFabricsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCommissionedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONED_FABRICS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COMMISSIONED_FABRICS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readTrustedRootCertificatesAttribute(
         TrustedRootCertificatesAttributeCallback callback) {
-        readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeTrustedRootCertificatesAttribute(
         TrustedRootCertificatesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTrustedRootCertificatesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentFabricIndexAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentFabricIndexAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_FABRIC_INDEX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_FABRIC_INDEX_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentFabricIndexAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_FABRIC_INDEX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_FABRIC_INDEX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readNOCsAttribute(long chipClusterPtr, NOCsAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void subscribeNOCsAttribute(long chipClusterPtr, NOCsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFabricsAttribute(long chipClusterPtr, FabricsAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void subscribeFabricsAttribute(long chipClusterPtr, FabricsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedFabricsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSupportedFabricsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCommissionedFabricsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCommissionedFabricsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTrustedRootCertificatesAttribute(long chipClusterPtr, TrustedRootCertificatesAttributeCallback callback);
-
-    private native void subscribeTrustedRootCertificatesAttribute(long chipClusterPtr, TrustedRootCertificatesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentFabricIndexAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentFabricIndexAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class GroupKeyManagementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 63L;
 
+    private static final long GROUP_KEY_MAP_ATTRIBUTE_ID = 0L;
+    private static final long GROUP_TABLE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID = 2L;
+    private static final long MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public GroupKeyManagementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void keySetWrite(DefaultClusterCallback callback, ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet) {
-      keySetWrite(chipClusterPtr, callback, groupKeySet, null);
+      keySetWrite(callback, groupKeySet, 0);
     }
 
     public void keySetWrite(DefaultClusterCallback callback, ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet, int timedInvokeTimeoutMs) {
-      keySetWrite(chipClusterPtr, callback, groupKeySet, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupKeySetFieldID = 0L;
+      BaseTLVType groupKeySettlvValue = groupKeySet.encodeTlv();
+      elements.add(new StructElement(groupKeySetFieldID, groupKeySettlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void keySetRead(KeySetReadResponseCallback callback, Integer groupKeySetID) {
-      keySetRead(chipClusterPtr, callback, groupKeySetID, null);
+      keySetRead(callback, groupKeySetID, 0);
     }
 
     public void keySetRead(KeySetReadResponseCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
-      keySetRead(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupKeySetIDFieldID = 0L;
+      BaseTLVType groupKeySetIDtlvValue = new UIntType(groupKeySetID);
+      elements.add(new StructElement(groupKeySetIDFieldID, groupKeySetIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long groupKeySetFieldID = 0L;
+          ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == groupKeySetFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                groupKeySet = ChipStructs.GroupKeyManagementClusterGroupKeySetStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(groupKeySet);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void keySetRemove(DefaultClusterCallback callback, Integer groupKeySetID) {
-      keySetRemove(chipClusterPtr, callback, groupKeySetID, null);
+      keySetRemove(callback, groupKeySetID, 0);
     }
 
     public void keySetRemove(DefaultClusterCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
-      keySetRemove(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long groupKeySetIDFieldID = 0L;
+      BaseTLVType groupKeySetIDtlvValue = new UIntType(groupKeySetID);
+      elements.add(new StructElement(groupKeySetIDFieldID, groupKeySetIDtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback) {
-      keySetReadAllIndices(chipClusterPtr, callback, null);
+      keySetReadAllIndices(callback, 0);
     }
 
     public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback, int timedInvokeTimeoutMs) {
-      keySetReadAllIndices(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    private native void keySetWrite(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetRead(long chipClusterPtr, KeySetReadResponseCallback callback, Integer groupKeySetID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetRemove(long chipClusterPtr, DefaultClusterCallback callback, Integer groupKeySetID, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetReadAllIndices(long chipClusterPtr, KeySetReadAllIndicesResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface KeySetReadResponseCallback {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long groupKeySetIDsFieldID = 0L;
+          ArrayList<Integer> groupKeySetIDs = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == groupKeySetIDsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                groupKeySetIDs = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(groupKeySetIDs);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface KeySetReadResponseCallback extends BaseClusterCallback {
       void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet);
-      void onError(Exception error);
     }
 
-    public interface KeySetReadAllIndicesResponseCallback {
+    public interface KeySetReadAllIndicesResponseCallback extends BaseClusterCallback {
       void onSuccess(ArrayList<Integer> groupKeySetIDs);
-      void onError(Exception error);
     }
 
-    public interface GroupKeyMapAttributeCallback {
+    public interface GroupKeyMapAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GroupTableAttributeCallback {
+    public interface GroupTableAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGroupKeyMapAttribute(
         GroupKeyMapAttributeCallback callback) {
-        readGroupKeyMapAttribute(chipClusterPtr, callback, true);
+      readGroupKeyMapAttributeWithFabricFilter(callback, true);
     }
 
     public void readGroupKeyMapAttributeWithFabricFilter(
         GroupKeyMapAttributeCallback callback, boolean isFabricFiltered) {
-        readGroupKeyMapAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUP_KEY_MAP_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GROUP_KEY_MAP_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void writeGroupKeyMapAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value) {
-        writeGroupKeyMapAttribute(chipClusterPtr, callback, value, null);
+      writeGroupKeyMapAttribute(callback, value, 0);
     }
 
     public void writeGroupKeyMapAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value, int timedWriteTimeoutMs) {
-        writeGroupKeyMapAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), GROUP_KEY_MAP_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeGroupKeyMapAttribute(
         GroupKeyMapAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGroupKeyMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUP_KEY_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GROUP_KEY_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGroupTableAttribute(
         GroupTableAttributeCallback callback) {
-        readGroupTableAttribute(chipClusterPtr, callback, true);
+      readGroupTableAttributeWithFabricFilter(callback, true);
     }
 
     public void readGroupTableAttributeWithFabricFilter(
         GroupTableAttributeCallback callback, boolean isFabricFiltered) {
-        readGroupTableAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUP_TABLE_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GROUP_TABLE_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void subscribeGroupTableAttribute(
         GroupTableAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGroupTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUP_TABLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GROUP_TABLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxGroupsPerFabricAttribute(
         IntegerAttributeCallback callback) {
-        readMaxGroupsPerFabricAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxGroupsPerFabricAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxGroupsPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxGroupKeysPerFabricAttribute(
         IntegerAttributeCallback callback) {
-        readMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxGroupKeysPerFabricAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGroupKeyMapAttribute(long chipClusterPtr, GroupKeyMapAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void writeGroupKeyMapAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeGroupKeyMapAttribute(long chipClusterPtr, GroupKeyMapAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGroupTableAttribute(long chipClusterPtr, GroupTableAttributeCallback callback, boolean isFabricFiltered);
-
-    private native void subscribeGroupTableAttribute(long chipClusterPtr, GroupTableAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxGroupsPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxGroupsPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxGroupKeysPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxGroupKeysPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class FixedLabelCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 64L;
 
+    private static final long LABEL_LIST_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public FixedLabelCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface LabelListAttributeCallback {
+    public interface LabelListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readLabelListAttribute(
         LabelListAttributeCallback callback) {
-        readLabelListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LABEL_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.FixedLabelClusterLabelStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LABEL_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLabelListAttribute(
         LabelListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LABEL_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.FixedLabelClusterLabelStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LABEL_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readLabelListAttribute(long chipClusterPtr, LabelListAttributeCallback callback);
-
-    private native void subscribeLabelListAttribute(long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class UserLabelCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 65L;
 
+    private static final long LABEL_LIST_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public UserLabelCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface LabelListAttributeCallback {
+    public interface LabelListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readLabelListAttribute(
         LabelListAttributeCallback callback) {
-        readLabelListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LABEL_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UserLabelClusterLabelStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LABEL_LIST_ATTRIBUTE_ID, true);
     }
 
     public void writeLabelListAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value) {
-        writeLabelListAttribute(chipClusterPtr, callback, value, null);
+      writeLabelListAttribute(callback, value, 0);
     }
 
     public void writeLabelListAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value, int timedWriteTimeoutMs) {
-        writeLabelListAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LABEL_LIST_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLabelListAttribute(
         LabelListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LABEL_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UserLabelClusterLabelStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LABEL_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readLabelListAttribute(long chipClusterPtr, LabelListAttributeCallback callback);
-
-    private native void writeLabelListAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeLabelListAttribute(long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ProxyConfigurationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 66L;
 
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ProxyConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ProxyDiscoveryCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 67L;
 
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ProxyDiscoveryCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class ProxyValidCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 68L;
 
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public ProxyValidCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class BooleanStateCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 69L;
 
+    private static final long STATE_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public BooleanStateCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readStateValueAttribute(
         BooleanAttributeCallback callback) {
-        readStateValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATE_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeStateValueAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATE_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readStateValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeStateValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class IcdManagementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 70L;
 
+    private static final long IDLE_MODE_DURATION_ATTRIBUTE_ID = 0L;
+    private static final long ACTIVE_MODE_DURATION_ATTRIBUTE_ID = 1L;
+    private static final long ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID = 2L;
+    private static final long REGISTERED_CLIENTS_ATTRIBUTE_ID = 3L;
+    private static final long I_C_D_COUNTER_ATTRIBUTE_ID = 4L;
+    private static final long CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID = 5L;
+    private static final long USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID = 6L;
+    private static final long USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID = 7L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public IcdManagementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey) {
-      registerClient(chipClusterPtr, callback, checkInNodeID, monitoredSubject, key, verificationKey, null);
+      registerClient(callback, checkInNodeID, monitoredSubject, key, verificationKey, 0);
     }
 
     public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey, int timedInvokeTimeoutMs) {
-      registerClient(chipClusterPtr, callback, checkInNodeID, monitoredSubject, key, verificationKey, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long checkInNodeIDFieldID = 0L;
+      BaseTLVType checkInNodeIDtlvValue = new UIntType(checkInNodeID);
+      elements.add(new StructElement(checkInNodeIDFieldID, checkInNodeIDtlvValue));
+
+      final long monitoredSubjectFieldID = 1L;
+      BaseTLVType monitoredSubjecttlvValue = new UIntType(monitoredSubject);
+      elements.add(new StructElement(monitoredSubjectFieldID, monitoredSubjecttlvValue));
+
+      final long keyFieldID = 2L;
+      BaseTLVType keytlvValue = new ByteArrayType(key);
+      elements.add(new StructElement(keyFieldID, keytlvValue));
+
+      final long verificationKeyFieldID = 3L;
+      BaseTLVType verificationKeytlvValue = verificationKey.<BaseTLVType>map((nonOptionalverificationKey) -> new ByteArrayType(nonOptionalverificationKey)).orElse(new EmptyType());
+      elements.add(new StructElement(verificationKeyFieldID, verificationKeytlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long ICDCounterFieldID = 0L;
+          Long ICDCounter = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == ICDCounterFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                ICDCounter = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(ICDCounter);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void unregisterClient(DefaultClusterCallback callback, Long checkInNodeID, Optional<byte[]> verificationKey) {
-      unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, null);
+      unregisterClient(callback, checkInNodeID, verificationKey, 0);
     }
 
     public void unregisterClient(DefaultClusterCallback callback, Long checkInNodeID, Optional<byte[]> verificationKey, int timedInvokeTimeoutMs) {
-      unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, timedInvokeTimeoutMs);
-    }
-
-    public void stayActiveRequest(DefaultClusterCallback callback) {
-      stayActiveRequest(chipClusterPtr, callback, null);
-    }
-
-    public void stayActiveRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      stayActiveRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long checkInNodeIDFieldID = 0L;
+      BaseTLVType checkInNodeIDtlvValue = new UIntType(checkInNodeID);
+      elements.add(new StructElement(checkInNodeIDFieldID, checkInNodeIDtlvValue));
+
+      final long verificationKeyFieldID = 1L;
+      BaseTLVType verificationKeytlvValue = verificationKey.<BaseTLVType>map((nonOptionalverificationKey) -> new ByteArrayType(nonOptionalverificationKey)).orElse(new EmptyType());
+      elements.add(new StructElement(verificationKeyFieldID, verificationKeytlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public void stayActiveRequest(StayActiveResponseCallback callback) {
+      stayActiveRequest(callback, 0);
+    }
+
+    public void stayActiveRequest(StayActiveResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long promisedActiveDurationFieldID = 0L;
+          Long promisedActiveDuration = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == promisedActiveDurationFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                promisedActiveDuration = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(promisedActiveDuration);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface RegisterClientResponseCallback extends BaseClusterCallback {
+      void onSuccess(Long ICDCounter);
     }
 
-    private native void registerClient(long chipClusterPtr, RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void unregisterClient(long chipClusterPtr, DefaultClusterCallback callback, Long checkInNodeID, Optional<byte[]> verificationKey, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stayActiveRequest(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface RegisterClientResponseCallback {
-      void onSuccess(Long ICDCounter);
-      void onError(Exception error);
+    public interface StayActiveResponseCallback extends BaseClusterCallback {
+      void onSuccess(Long promisedActiveDuration);
     }
 
-    public interface RegisteredClientsAttributeCallback {
+    public interface RegisteredClientsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readIdleModeDurationAttribute(
         LongAttributeCallback callback) {
-        readIdleModeDurationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDLE_MODE_DURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, IDLE_MODE_DURATION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeIdleModeDurationAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeIdleModeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IDLE_MODE_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IDLE_MODE_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveModeDurationAttribute(
         LongAttributeCallback callback) {
-        readActiveModeDurationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_MODE_DURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_MODE_DURATION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveModeDurationAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveModeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_MODE_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_MODE_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readActiveModeThresholdAttribute(
         IntegerAttributeCallback callback) {
-        readActiveModeThresholdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID, true);
     }
 
     public void subscribeActiveModeThresholdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveModeThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRegisteredClientsAttribute(
         RegisteredClientsAttributeCallback callback) {
-        readRegisteredClientsAttribute(chipClusterPtr, callback, true);
+      readRegisteredClientsAttributeWithFabricFilter(callback, true);
     }
 
     public void readRegisteredClientsAttributeWithFabricFilter(
         RegisteredClientsAttributeCallback callback, boolean isFabricFiltered) {
-        readRegisteredClientsAttribute(chipClusterPtr, callback, isFabricFiltered);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REGISTERED_CLIENTS_ATTRIBUTE_ID);
 
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REGISTERED_CLIENTS_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
     public void subscribeRegisteredClientsAttribute(
         RegisteredClientsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRegisteredClientsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REGISTERED_CLIENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REGISTERED_CLIENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readICDCounterAttribute(
         LongAttributeCallback callback) {
-        readICDCounterAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, I_C_D_COUNTER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, I_C_D_COUNTER_ATTRIBUTE_ID, true);
     }
 
     public void subscribeICDCounterAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeICDCounterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, I_C_D_COUNTER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, I_C_D_COUNTER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClientsSupportedPerFabricAttribute(
         IntegerAttributeCallback callback) {
-        readClientsSupportedPerFabricAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClientsSupportedPerFabricAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClientsSupportedPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUserActiveModeTriggerHintAttribute(
         LongAttributeCallback callback) {
-        readUserActiveModeTriggerHintAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUserActiveModeTriggerHintAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUserActiveModeTriggerHintAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUserActiveModeTriggerInstructionAttribute(
         CharStringAttributeCallback callback) {
-        readUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUserActiveModeTriggerInstructionAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readIdleModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeIdleModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+  public static class TimerCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 71L;
 
-    private native void readActiveModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private static final long SET_TIME_ATTRIBUTE_ID = 0L;
+    private static final long TIME_REMAINING_ATTRIBUTE_ID = 1L;
+    private static final long TIMER_STATE_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeActiveModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public TimerCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readActiveModeThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeActiveModeThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void setTimer(DefaultClusterCallback callback, Long newTime) {
+      setTimer(callback, newTime, 0);
+    }
 
-    private native void readRegisteredClientsAttribute(long chipClusterPtr, RegisteredClientsAttributeCallback callback, boolean isFabricFiltered);
+    public void setTimer(DefaultClusterCallback callback, Long newTime, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeRegisteredClientsAttribute(long chipClusterPtr, RegisteredClientsAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newTimeFieldID = 0L;
+      BaseTLVType newTimetlvValue = new UIntType(newTime);
+      elements.add(new StructElement(newTimeFieldID, newTimetlvValue));
 
-    private native void readICDCounterAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeICDCounterAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void resetTimer(DefaultClusterCallback callback) {
+      resetTimer(callback, 0);
+    }
 
-    private native void readClientsSupportedPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void resetTimer(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeClientsSupportedPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void addTime(DefaultClusterCallback callback, Long additionalTime) {
+      addTime(callback, additionalTime, 0);
+    }
 
-    private native void subscribeUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void addTime(DefaultClusterCallback callback, Long additionalTime, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void readUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long additionalTimeFieldID = 0L;
+      BaseTLVType additionalTimetlvValue = new UIntType(additionalTime);
+      elements.add(new StructElement(additionalTimeFieldID, additionalTimetlvValue));
 
-    private native void subscribeUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void reduceTime(DefaultClusterCallback callback, Long timeReduction) {
+      reduceTime(callback, timeReduction, 0);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void reduceTime(DefaultClusterCallback callback, Long timeReduction, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeReductionFieldID = 0L;
+      BaseTLVType timeReductiontlvValue = new UIntType(timeReduction);
+      elements.add(new StructElement(timeReductionFieldID, timeReductiontlvValue));
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readSetTimeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SET_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SET_TIME_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeSetTimeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SET_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SET_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class ModeSelectCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 80L;
+    public void readTimeRemainingAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_REMAINING_ATTRIBUTE_ID);
 
-    public ModeSelectCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIME_REMAINING_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeTimeRemainingAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_REMAINING_ATTRIBUTE_ID);
 
-    public void changeToMode(DefaultClusterCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIME_REMAINING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void changeToMode(DefaultClusterCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    public void readTimerStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIMER_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIMER_STATE_ATTRIBUTE_ID, true);
     }
 
-    private native void changeToMode(long chipClusterPtr, DefaultClusterCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeTimerStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIMER_STATE_ATTRIBUTE_ID);
 
-    public interface StandardNamespaceAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIMER_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface StartUpModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface OnModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readDescriptionAttribute(
-        CharStringAttributeCallback callback) {
-        readDescriptionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDescriptionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStandardNamespaceAttribute(
-        StandardNamespaceAttributeCallback callback) {
-        readStandardNamespaceAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeStandardNamespaceAttribute(
-        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStandardNamespaceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSupportedModesAttribute(
-        SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSupportedModesAttribute(
-        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCurrentModeAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStartUpModeAttribute(
-        StartUpModeAttributeCallback callback) {
-        readStartUpModeAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeStartUpModeAttribute(
-        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readOnModeAttribute(
-        OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeOnModeAttribute(
-        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeDescriptionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStandardNamespaceAttribute(long chipClusterPtr, StandardNamespaceAttributeCallback callback);
-
-    private native void subscribeStandardNamespaceAttribute(long chipClusterPtr, StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
-
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback);
-
-    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
-
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+  public static class OvenCavityOperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 72L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long PHASE_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_PHASE_ATTRIBUTE_ID = 1L;
+    private static final long COUNTDOWN_TIME_ATTRIBUTE_ID = 2L;
+    private static final long OPERATIONAL_STATE_LIST_ATTRIBUTE_ID = 3L;
+    private static final long OPERATIONAL_STATE_ATTRIBUTE_ID = 4L;
+    private static final long OPERATIONAL_ERROR_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public OvenCavityOperationalStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void pause(OperationalCommandResponseCallback callback) {
+      pause(callback, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-  public static class LaundryWasherModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 81L;
+    public void stop(OperationalCommandResponseCallback callback) {
+      stop(callback, 0);
+    }
 
-    public LaundryWasherModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void start(OperationalCommandResponseCallback callback) {
+      start(callback, 0);
+    }
 
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+    public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    public void resume(OperationalCommandResponseCallback callback) {
+      resume(callback, 0);
     }
 
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
+    public void resume(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface OperationalCommandResponseCallback extends BaseClusterCallback {
+      void onSuccess(ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState);
+    }
+
+    public interface PhaseListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable List<String> value);
+    }
 
-    public interface ChangeToModeResponseCallback {
-      void onSuccess(Integer status, Optional<String> statusText);
-      void onError(Exception error);
+    public interface CurrentPhaseAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface CountdownTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface StartUpModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface OperationalStateListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.OvenCavityOperationalStateClusterOperationalStateStruct> value);
     }
 
-    public interface OnModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface OperationalErrorAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readSupportedModesAttribute(
-        SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
+    public void readPhaseListAttribute(
+        PhaseListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSupportedModesAttribute(
-        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePhaseListAttribute(
+        PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentModeAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
+    public void readCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readStartUpModeAttribute(
-        StartUpModeAttributeCallback callback) {
-        readStartUpModeAttribute(chipClusterPtr, callback);
+    public void readCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OvenCavityOperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeStartUpModeAttribute(
-        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OvenCavityOperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOnModeAttribute(
-        OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
+    public void readOperationalStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeOperationalStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOnModeAttribute(
-        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
-
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback);
-
-    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
-
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class RefrigeratorAndTemperatureControlledCabinetModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 82L;
+  public static class OvenModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 73L;
 
-    public RefrigeratorAndTemperatureControlledCabinetModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long START_UP_MODE_ATTRIBUTE_ID = 2L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public OvenModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+      changeToMode(callback, newMode, 0);
     }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
-    }
-
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ChangeToModeResponseCallback {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Optional<String> statusText);
-      void onError(Exception error);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.OvenModeClusterModeOptionStruct> value);
     }
 
-    public interface StartUpModeAttributeCallback {
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OnModeAttributeCallback {
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSupportedModesAttribute(
         SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedModesAttribute(
         SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentModeAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStartUpModeAttribute(
         StartUpModeAttributeCallback callback) {
-        readStartUpModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, true);
     }
 
     public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+      writeStartUpModeAttribute(callback, value, 0);
     }
 
     public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeStartUpModeAttribute(
         StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnModeAttribute(
         OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
+      writeOnModeAttribute(callback, value, 0);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnModeAttribute(
         OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
+  public static class LaundryDryerControlsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 74L;
 
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID = 0L;
+    private static final long SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback);
-
-    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
-
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class LaundryWasherControlsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 83L;
-
-    public LaundryWasherControlsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    public LaundryDryerControlsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface SpinSpeedsAttributeCallback {
-      void onSuccess(List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface SpinSpeedCurrentAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public interface SupportedRinsesAttributeCallback {
+    public interface SupportedDrynessLevelsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface SelectedDrynessLevelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readSpinSpeedsAttribute(
-        SpinSpeedsAttributeCallback callback) {
-        readSpinSpeedsAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSpinSpeedsAttribute(
-        SpinSpeedsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpinSpeedsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readSpinSpeedCurrentAttribute(
-        SpinSpeedCurrentAttributeCallback callback) {
-        readSpinSpeedCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void readSupportedDrynessLevelsAttribute(
+        SupportedDrynessLevelsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID);
 
-    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID, true);
     }
 
-    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeSupportedDrynessLevelsAttribute(
+        SupportedDrynessLevelsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID);
 
-    public void subscribeSpinSpeedCurrentAttribute(
-        SpinSpeedCurrentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpinSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_DRYNESS_LEVELS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfRinsesAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfRinsesAttribute(chipClusterPtr, callback);
-    }
+    public void readSelectedDrynessLevelAttribute(
+        SelectedDrynessLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID);
 
-    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, true);
     }
 
-    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeSelectedDrynessLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSelectedDrynessLevelAttribute(callback, value, 0);
     }
 
-    public void subscribeNumberOfRinsesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfRinsesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSelectedDrynessLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readSupportedRinsesAttribute(
-        SupportedRinsesAttributeCallback callback) {
-        readSupportedRinsesAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSelectedDrynessLevelAttribute(
+        SelectedDrynessLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID);
 
-    public void subscribeSupportedRinsesAttribute(
-        SupportedRinsesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedRinsesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SELECTED_DRYNESS_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSpinSpeedsAttribute(long chipClusterPtr, SpinSpeedsAttributeCallback callback);
-
-    private native void subscribeSpinSpeedsAttribute(long chipClusterPtr, SpinSpeedsAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSpinSpeedCurrentAttribute(long chipClusterPtr, SpinSpeedCurrentAttributeCallback callback);
-
-    private native void writeSpinSpeedCurrentAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSpinSpeedCurrentAttribute(long chipClusterPtr, SpinSpeedCurrentAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNumberOfRinsesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeNumberOfRinsesAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeNumberOfRinsesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedRinsesAttribute(long chipClusterPtr, SupportedRinsesAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeSupportedRinsesAttribute(long chipClusterPtr, SupportedRinsesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+  public static class ModeSelectCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 80L;
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private static final long DESCRIPTION_ATTRIBUTE_ID = 0L;
+    private static final long STANDARD_NAMESPACE_ATTRIBUTE_ID = 1L;
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 2L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 3L;
+    private static final long START_UP_MODE_ATTRIBUTE_ID = 4L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public ModeSelectCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void changeToMode(DefaultClusterCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void changeToMode(DefaultClusterCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface StandardNamespaceAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> value);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-  public static class RvcRunModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 84L;
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    public RvcRunModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
+    public void readDescriptionAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
 
-    public interface ChangeToModeResponseCallback {
-      void onSuccess(Integer status, Optional<String> statusText);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, true);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DESCRIPTION_ATTRIBUTE_ID);
 
-    public interface OnModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DESCRIPTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STANDARD_NAMESPACE_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STANDARD_NAMESPACE_ATTRIBUTE_ID, true);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STANDARD_NAMESPACE_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STANDARD_NAMESPACE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedModesAttribute(
         SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ModeSelectClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedModesAttribute(
         SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ModeSelectClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentModeAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+        StartUpModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, true);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(callback, value, 0);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnModeAttribute(
         OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
+      writeOnModeAttribute(callback, value, 0);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnModeAttribute(
         OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
-
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
-
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class RvcCleanModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 85L;
+  public static class LaundryWasherModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 81L;
 
-    public RvcCleanModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long START_UP_MODE_ATTRIBUTE_ID = 2L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public LaundryWasherModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+      changeToMode(callback, newMode, 0);
     }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
     }
 
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ChangeToModeResponseCallback {
-      void onSuccess(Integer status, Optional<String> statusText);
-      void onError(Exception error);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> value);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface OnModeAttributeCallback {
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSupportedModesAttribute(
         SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedModesAttribute(
         SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentModeAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+        StartUpModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, true);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(callback, value, 0);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnModeAttribute(
         OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
+      writeOnModeAttribute(callback, value, 0);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnModeAttribute(
         OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
+  public static class RefrigeratorAndTemperatureControlledCabinetModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 82L;
 
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long START_UP_MODE_ATTRIBUTE_ID = 2L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public RefrigeratorAndTemperatureControlledCabinetModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
+    }
 
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+    }
 
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> value);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class TemperatureControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 86L;
-
-    public TemperatureControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel) {
-      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, null);
-    }
+    public void readSupportedModesAttribute(
+        SupportedModesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    public void setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel, int timedInvokeTimeoutMs) {
-      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
-    private native void setTemperature(long chipClusterPtr, DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    public interface SupportedTemperatureLevelsAttributeCallback {
-      void onSuccess(List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readCurrentModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTemperatureSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readTemperatureSetpointAttribute(chipClusterPtr, callback);
-    }
+    public void readStartUpModeAttribute(
+        StartUpModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
 
-    public void subscribeTemperatureSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void readMinTemperatureAttribute(
-        IntegerAttributeCallback callback) {
-        readMinTemperatureAttribute(chipClusterPtr, callback);
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(callback, value, 0);
     }
 
-    public void subscribeMinTemperatureAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readMaxTemperatureAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxTemperatureAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
 
-    public void subscribeMaxTemperatureAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readStepAttribute(
-        IntegerAttributeCallback callback) {
-        readStepAttribute(chipClusterPtr, callback);
-    }
+    public void readOnModeAttribute(
+        OnModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
 
-    public void subscribeStepAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStepAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void readSelectedTemperatureLevelAttribute(
-        IntegerAttributeCallback callback) {
-        readSelectedTemperatureLevelAttribute(chipClusterPtr, callback);
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(callback, value, 0);
     }
 
-    public void subscribeSelectedTemperatureLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSelectedTemperatureLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readSupportedTemperatureLevelsAttribute(
-        SupportedTemperatureLevelsAttributeCallback callback) {
-        readSupportedTemperatureLevelsAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
 
-    public void subscribeSupportedTemperatureLevelsAttribute(
-        SupportedTemperatureLevelsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedTemperatureLevelsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readTemperatureSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTemperatureSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeMinTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStepAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeStepAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class LaundryWasherControlsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 83L;
 
-    private native void readSelectedTemperatureLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long SPIN_SPEEDS_ATTRIBUTE_ID = 0L;
+    private static final long SPIN_SPEED_CURRENT_ATTRIBUTE_ID = 1L;
+    private static final long NUMBER_OF_RINSES_ATTRIBUTE_ID = 2L;
+    private static final long SUPPORTED_RINSES_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeSelectedTemperatureLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public LaundryWasherControlsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readSupportedTemperatureLevelsAttribute(long chipClusterPtr, SupportedTemperatureLevelsAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeSupportedTemperatureLevelsAttribute(long chipClusterPtr, SupportedTemperatureLevelsAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SpinSpeedsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<String> value);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface SpinSpeedCurrentAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SupportedRinsesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Integer> value);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readSpinSpeedsAttribute(
+        SpinSpeedsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEEDS_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPIN_SPEEDS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeSpinSpeedsAttribute(
+        SpinSpeedsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEEDS_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPIN_SPEEDS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readSpinSpeedCurrentAttribute(
+        SpinSpeedCurrentAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEED_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPIN_SPEED_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-  public static class RefrigeratorAlarmCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 87L;
+    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSpinSpeedCurrentAttribute(callback, value, 0);
+    }
 
-    public RefrigeratorAlarmCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SPIN_SPEED_CURRENT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeSpinSpeedCurrentAttribute(
+        SpinSpeedCurrentAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEED_CURRENT_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPIN_SPEED_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readNumberOfRinsesAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RINSES_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_RINSES_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNumberOfRinsesAttribute(callback, value, 0);
     }
 
-    public void readMaskAttribute(
-        LongAttributeCallback callback) {
-        readMaskAttribute(chipClusterPtr, callback);
+    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NUMBER_OF_RINSES_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMaskAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeNumberOfRinsesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RINSES_ATTRIBUTE_ID);
 
-    public void readStateAttribute(
-        LongAttributeCallback callback) {
-        readStateAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_RINSES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeStateAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readSupportedRinsesAttribute(
+        SupportedRinsesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_RINSES_ATTRIBUTE_ID);
 
-    public void readSupportedAttribute(
-        LongAttributeCallback callback) {
-        readSupportedAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_RINSES_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSupportedAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSupportedRinsesAttribute(
+        SupportedRinsesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_RINSES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_RINSES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMaskAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeMaskAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readStateAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeStateAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeSupportedAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class DishwasherModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 89L;
+  public static class RvcRunModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 84L;
 
-    public DishwasherModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public RvcRunModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+      changeToMode(callback, newMode, 0);
     }
 
     public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
-    }
-
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ChangeToModeResponseCallback {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Optional<String> statusText);
-      void onError(Exception error);
-    }
-
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface StartUpModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> value);
     }
 
-    public interface OnModeAttributeCallback {
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readSupportedModesAttribute(
         SupportedModesAttributeCallback callback) {
-        readSupportedModesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcRunModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedModesAttribute(
         SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcRunModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readCurrentModeAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeCurrentModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStartUpModeAttribute(
-        StartUpModeAttributeCallback callback) {
-        readStartUpModeAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeStartUpModeAttribute(
-        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOnModeAttribute(
         OnModeAttributeCallback callback) {
-        readOnModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, null);
+      writeOnModeAttribute(callback, value, 0);
     }
 
     public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeOnModeAttribute(
         OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback);
+  public static class RvcCleanModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 85L;
 
-    private native void subscribeSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public RvcCleanModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeCurrentModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
+    }
 
-    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+    }
 
-    private native void subscribeStartUpModeAttribute(long chipClusterPtr, StartUpModeAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> value);
+    }
 
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readSupportedModesAttribute(
+        SupportedModesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcCleanModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcCleanModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class AirQualityCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 91L;
+    public void readCurrentModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public AirQualityCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readOnModeAttribute(
+        OnModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(callback, value, 0);
     }
 
-    public void readAirQualityAttribute(
-        IntegerAttributeCallback callback) {
-        readAirQualityAttribute(chipClusterPtr, callback);
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAirQualityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAirQualityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readAirQualityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAirQualityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+  public static class TemperatureControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 86L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private static final long TEMPERATURE_SETPOINT_ATTRIBUTE_ID = 0L;
+    private static final long MIN_TEMPERATURE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_TEMPERATURE_ATTRIBUTE_ID = 2L;
+    private static final long STEP_ATTRIBUTE_ID = 3L;
+    private static final long SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID = 4L;
+    private static final long SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public TemperatureControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel) {
+      setTemperature(callback, targetTemperature, targetTemperatureLevel, 0);
+    }
 
-  public static class SmokeCoAlarmCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 92L;
+    public void setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public SmokeCoAlarmCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long targetTemperatureFieldID = 0L;
+      BaseTLVType targetTemperaturetlvValue = targetTemperature.<BaseTLVType>map((nonOptionaltargetTemperature) -> new IntType(nonOptionaltargetTemperature)).orElse(new EmptyType());
+      elements.add(new StructElement(targetTemperatureFieldID, targetTemperaturetlvValue));
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+      final long targetTemperatureLevelFieldID = 1L;
+      BaseTLVType targetTemperatureLeveltlvValue = targetTemperatureLevel.<BaseTLVType>map((nonOptionaltargetTemperatureLevel) -> new UIntType(nonOptionaltargetTemperatureLevel)).orElse(new EmptyType());
+      elements.add(new StructElement(targetTemperatureLevelFieldID, targetTemperatureLeveltlvValue));
 
-    public void selfTestRequest(DefaultClusterCallback callback) {
-      selfTestRequest(chipClusterPtr, callback, null);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void selfTestRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      selfTestRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface SupportedTemperatureLevelsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<String> value);
     }
 
-    private native void selfTestRequest(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readExpressedStateAttribute(
+    public void readTemperatureSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readExpressedStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeExpressedStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpressedStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_ATTRIBUTE_ID);
 
-    public void readSmokeStateAttribute(
-        IntegerAttributeCallback callback) {
-        readSmokeStateAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEMPERATURE_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSmokeStateAttribute(
+    public void subscribeTemperatureSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSmokeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_ATTRIBUTE_ID);
 
-    public void readCOStateAttribute(
-        IntegerAttributeCallback callback) {
-        readCOStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCOStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCOStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEMPERATURE_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBatteryAlertAttribute(
+    public void readMinTemperatureAttribute(
         IntegerAttributeCallback callback) {
-        readBatteryAlertAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBatteryAlertAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatteryAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_TEMPERATURE_ATTRIBUTE_ID);
 
-    public void readDeviceMutedAttribute(
-        IntegerAttributeCallback callback) {
-        readDeviceMutedAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_TEMPERATURE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDeviceMutedAttribute(
+    public void subscribeMinTemperatureAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDeviceMutedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readTestInProgressAttribute(
-        BooleanAttributeCallback callback) {
-        readTestInProgressAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeTestInProgressAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTestInProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readHardwareFaultAlertAttribute(
-        BooleanAttributeCallback callback) {
-        readHardwareFaultAlertAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_TEMPERATURE_ATTRIBUTE_ID);
 
-    public void subscribeHardwareFaultAlertAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareFaultAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEndOfServiceAlertAttribute(
+    public void readMaxTemperatureAttribute(
         IntegerAttributeCallback callback) {
-        readEndOfServiceAlertAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeEndOfServiceAlertAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndOfServiceAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_TEMPERATURE_ATTRIBUTE_ID);
 
-    public void readInterconnectSmokeAlarmAttribute(
-        IntegerAttributeCallback callback) {
-        readInterconnectSmokeAlarmAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_TEMPERATURE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeInterconnectSmokeAlarmAttribute(
+    public void subscribeMaxTemperatureAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInterconnectSmokeAlarmAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_TEMPERATURE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readInterconnectCOAlarmAttribute(
+    public void readStepAttribute(
         IntegerAttributeCallback callback) {
-        readInterconnectCOAlarmAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STEP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STEP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeInterconnectCOAlarmAttribute(
+    public void subscribeStepAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInterconnectCOAlarmAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STEP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STEP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readContaminationStateAttribute(
+    public void readSelectedTemperatureLevelAttribute(
         IntegerAttributeCallback callback) {
-        readContaminationStateAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID);
 
-    public void subscribeContaminationStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeContaminationStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID, true);
     }
 
-    public void readSmokeSensitivityLevelAttribute(
-        IntegerAttributeCallback callback) {
-        readSmokeSensitivityLevelAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSelectedTemperatureLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID);
 
-    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readSupportedTemperatureLevelsAttribute(
+        SupportedTemperatureLevelsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID);
 
-    public void subscribeSmokeSensitivityLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID, true);
     }
 
-    public void readExpiryDateAttribute(
-        LongAttributeCallback callback) {
-        readExpiryDateAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSupportedTemperatureLevelsAttribute(
+        SupportedTemperatureLevelsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID);
 
-    public void subscribeExpiryDateAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpiryDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readExpressedStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeExpressedStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSmokeStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSmokeStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCOStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCOStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatteryAlertAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBatteryAlertAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDeviceMutedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDeviceMutedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readTestInProgressAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeTestInProgressAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareFaultAlertAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeHardwareFaultAlertAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEndOfServiceAlertAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeEndOfServiceAlertAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readInterconnectSmokeAlarmAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeInterconnectSmokeAlarmAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readInterconnectCOAlarmAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeInterconnectCOAlarmAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readContaminationStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeContaminationStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSmokeSensitivityLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeSmokeSensitivityLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSmokeSensitivityLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readExpiryDateAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeExpiryDateAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class DishwasherAlarmCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 93L;
-
-    public DishwasherAlarmCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void reset(DefaultClusterCallback callback, Long alarms) {
-      reset(chipClusterPtr, callback, alarms, null);
-    }
+  public static class RefrigeratorAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 87L;
 
-    public void reset(DefaultClusterCallback callback, Long alarms, int timedInvokeTimeoutMs) {
-      reset(chipClusterPtr, callback, alarms, timedInvokeTimeoutMs);
-    }
+    private static final long MASK_ATTRIBUTE_ID = 0L;
+    private static final long STATE_ATTRIBUTE_ID = 2L;
+    private static final long SUPPORTED_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void modifyEnabledAlarms(DefaultClusterCallback callback, Long mask) {
-      modifyEnabledAlarms(chipClusterPtr, callback, mask, null);
+    public RefrigeratorAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void modifyEnabledAlarms(DefaultClusterCallback callback, Long mask, int timedInvokeTimeoutMs) {
-      modifyEnabledAlarms(chipClusterPtr, callback, mask, timedInvokeTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    private native void reset(long chipClusterPtr, DefaultClusterCallback callback, Long alarms, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void modifyEnabledAlarms(long chipClusterPtr, DefaultClusterCallback callback, Long mask, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMaskAttribute(
         LongAttributeCallback callback) {
-        readMaskAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MASK_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaskAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLatchAttribute(
-        LongAttributeCallback callback) {
-        readLatchAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
 
-    public void subscribeLatchAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLatchAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MASK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readStateAttribute(
         LongAttributeCallback callback) {
-        readStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeStateAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSupportedAttribute(
         LongAttributeCallback callback) {
-        readSupportedAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_ATTRIBUTE_ID, true);
     }
 
     public void subscribeSupportedAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMaskAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeMaskAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLatchAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeLatchAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStateAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeStateAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeSupportedAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class OperationalStateCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 96L;
+  public static class DishwasherModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 89L;
 
-    public OperationalStateCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long START_UP_MODE_ATTRIBUTE_ID = 2L;
+    private static final long ON_MODE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public DishwasherModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void pause(OperationalCommandResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
     }
 
-    public void stop(OperationalCommandResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long newModeFieldID = 0L;
+      BaseTLVType newModetlvValue = new UIntType(newMode);
+      elements.add(new StructElement(newModeFieldID, newModetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long statusTextFieldID = 1L;
+          Optional<String> statusText = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusTextFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                statusText = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, statusText);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface ChangeToModeResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
     }
 
-    public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> value);
     }
 
-    public void start(OperationalCommandResponseCallback callback) {
-      start(chipClusterPtr, callback, null);
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      start(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void resume(OperationalCommandResponseCallback callback) {
-      resume(chipClusterPtr, callback, null);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void resume(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      resume(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    private native void pause(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stop(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void start(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void resume(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface OperationalCommandResponseCallback {
-      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState);
-      void onError(Exception error);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface PhaseListAttributeCallback {
-      void onSuccess(@Nullable List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface CurrentPhaseAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readSupportedModesAttribute(
+        SupportedModesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    public interface CountdownTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DishwasherModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
     }
 
-    public interface OperationalStateListAttributeCallback {
-      void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    public interface OperationalErrorAttributeCallback {
-      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DishwasherModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readCurrentModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhaseListAttribute(
-        PhaseListAttributeCallback callback) {
-        readPhaseListAttribute(chipClusterPtr, callback);
-    }
+    public void readStartUpModeAttribute(
+        StartUpModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
 
-    public void subscribePhaseListAttribute(
-        PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void readCurrentPhaseAttribute(
-        CurrentPhaseAttributeCallback callback) {
-        readCurrentPhaseAttribute(chipClusterPtr, callback);
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(callback, value, 0);
     }
 
-    public void subscribeCurrentPhaseAttribute(
-        CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readCountdownTimeAttribute(
-        CountdownTimeAttributeCallback callback) {
-        readCountdownTimeAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_MODE_ATTRIBUTE_ID);
 
-    public void subscribeCountdownTimeAttribute(
-        CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOperationalStateListAttribute(
-        OperationalStateListAttributeCallback callback) {
-        readOperationalStateListAttribute(chipClusterPtr, callback);
-    }
+    public void readOnModeAttribute(
+        OnModeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
 
-    public void subscribeOperationalStateListAttribute(
-        OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void readOperationalStateAttribute(
-        IntegerAttributeCallback callback) {
-        readOperationalStateAttribute(chipClusterPtr, callback);
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(callback, value, 0);
     }
 
-    public void subscribeOperationalStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ON_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readOperationalErrorAttribute(
-        OperationalErrorAttributeCallback callback) {
-        readOperationalErrorAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ON_MODE_ATTRIBUTE_ID);
 
-    public void subscribeOperationalErrorAttribute(
-        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalErrorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ON_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readPhaseListAttribute(long chipClusterPtr, PhaseListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribePhaseListAttribute(long chipClusterPtr, PhaseListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void readCurrentPhaseAttribute(long chipClusterPtr, CurrentPhaseAttributeCallback callback);
+  public static class AirQualityCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 91L;
 
-    private native void subscribeCurrentPhaseAttribute(long chipClusterPtr, CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long AIR_QUALITY_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readCountdownTimeAttribute(long chipClusterPtr, CountdownTimeAttributeCallback callback);
+    public AirQualityCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeCountdownTimeAttribute(long chipClusterPtr, CountdownTimeAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readOperationalStateListAttribute(long chipClusterPtr, OperationalStateListAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeOperationalStateListAttribute(long chipClusterPtr, OperationalStateListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readOperationalStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeOperationalStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback);
+    public void readAirQualityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIR_QUALITY_ATTRIBUTE_ID);
 
-    private native void subscribeOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AIR_QUALITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeAirQualityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIR_QUALITY_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AIR_QUALITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-  public static class RvcOperationalStateCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 97L;
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public RvcOperationalStateCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void pause(OperationalCommandResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void stop(OperationalCommandResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void start(OperationalCommandResponseCallback callback) {
-      start(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      start(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void resume(OperationalCommandResponseCallback callback) {
-      resume(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void resume(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      resume(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void pause(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void stop(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void start(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void resume(long chipClusterPtr, OperationalCommandResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+  public static class SmokeCoAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 92L;
 
-    public interface OperationalCommandResponseCallback {
-      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState);
-      void onError(Exception error);
-    }
+    private static final long EXPRESSED_STATE_ATTRIBUTE_ID = 0L;
+    private static final long SMOKE_STATE_ATTRIBUTE_ID = 1L;
+    private static final long C_O_STATE_ATTRIBUTE_ID = 2L;
+    private static final long BATTERY_ALERT_ATTRIBUTE_ID = 3L;
+    private static final long DEVICE_MUTED_ATTRIBUTE_ID = 4L;
+    private static final long TEST_IN_PROGRESS_ATTRIBUTE_ID = 5L;
+    private static final long HARDWARE_FAULT_ALERT_ATTRIBUTE_ID = 6L;
+    private static final long END_OF_SERVICE_ALERT_ATTRIBUTE_ID = 7L;
+    private static final long INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID = 8L;
+    private static final long INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID = 9L;
+    private static final long CONTAMINATION_STATE_ATTRIBUTE_ID = 10L;
+    private static final long SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID = 11L;
+    private static final long EXPIRY_DATE_ATTRIBUTE_ID = 12L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public interface PhaseListAttributeCallback {
-      void onSuccess(@Nullable List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public SmokeCoAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public interface CurrentPhaseAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public interface CountdownTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void selfTestRequest(DefaultClusterCallback callback) {
+      selfTestRequest(callback, 0);
     }
 
-    public interface OperationalStateListAttributeCallback {
-      void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void selfTestRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public interface OperationalErrorAttributeCallback {
-      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readPhaseListAttribute(
-        PhaseListAttributeCallback callback) {
-        readPhaseListAttribute(chipClusterPtr, callback);
-    }
+    public void readExpressedStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPRESSED_STATE_ATTRIBUTE_ID);
 
-    public void subscribePhaseListAttribute(
-        PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EXPRESSED_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void readCurrentPhaseAttribute(
-        CurrentPhaseAttributeCallback callback) {
-        readCurrentPhaseAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeExpressedStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPRESSED_STATE_ATTRIBUTE_ID);
 
-    public void subscribeCurrentPhaseAttribute(
-        CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EXPRESSED_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCountdownTimeAttribute(
-        CountdownTimeAttributeCallback callback) {
-        readCountdownTimeAttribute(chipClusterPtr, callback);
-    }
+    public void readSmokeStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_STATE_ATTRIBUTE_ID);
 
-    public void subscribeCountdownTimeAttribute(
-        CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SMOKE_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void readOperationalStateListAttribute(
-        OperationalStateListAttributeCallback callback) {
-        readOperationalStateListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSmokeStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_STATE_ATTRIBUTE_ID);
 
-    public void subscribeOperationalStateListAttribute(
-        OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SMOKE_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOperationalStateAttribute(
+    public void readCOStateAttribute(
         IntegerAttributeCallback callback) {
-        readOperationalStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, C_O_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, C_O_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOperationalStateAttribute(
+    public void subscribeCOStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, C_O_STATE_ATTRIBUTE_ID);
 
-    public void readOperationalErrorAttribute(
-        OperationalErrorAttributeCallback callback) {
-        readOperationalErrorAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, C_O_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeOperationalErrorAttribute(
-        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalErrorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    public void readBatteryAlertAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_ALERT_ATTRIBUTE_ID);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BATTERY_ALERT_ATTRIBUTE_ID, true);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeBatteryAlertAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_ALERT_ATTRIBUTE_ID);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BATTERY_ALERT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
+    public void readDeviceMutedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_MUTED_ATTRIBUTE_ID);
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEVICE_MUTED_ATTRIBUTE_ID, true);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeDeviceMutedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_MUTED_ATTRIBUTE_ID);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEVICE_MUTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    public void readTestInProgressAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_IN_PROGRESS_ATTRIBUTE_ID);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEST_IN_PROGRESS_ATTRIBUTE_ID, true);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeTestInProgressAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_IN_PROGRESS_ATTRIBUTE_ID);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEST_IN_PROGRESS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readPhaseListAttribute(long chipClusterPtr, PhaseListAttributeCallback callback);
-
-    private native void subscribePhaseListAttribute(long chipClusterPtr, PhaseListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentPhaseAttribute(long chipClusterPtr, CurrentPhaseAttributeCallback callback);
-
-    private native void subscribeCurrentPhaseAttribute(long chipClusterPtr, CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCountdownTimeAttribute(long chipClusterPtr, CountdownTimeAttributeCallback callback);
-
-    private native void subscribeCountdownTimeAttribute(long chipClusterPtr, CountdownTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOperationalStateListAttribute(long chipClusterPtr, OperationalStateListAttributeCallback callback);
-
-    private native void subscribeOperationalStateListAttribute(long chipClusterPtr, OperationalStateListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOperationalStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeOperationalStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback);
-
-    private native void subscribeOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class HepaFilterMonitoringCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 113L;
+    public void readHardwareFaultAlertAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID);
 
-    public HepaFilterMonitoringCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void resetCondition(DefaultClusterCallback callback) {
-      resetCondition(chipClusterPtr, callback, null);
-    }
+    public void subscribeHardwareFaultAlertAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID);
 
-    public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void resetCondition(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readEndOfServiceAlertAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_OF_SERVICE_ALERT_ATTRIBUTE_ID);
 
-    public interface LastChangedTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, END_OF_SERVICE_ALERT_ATTRIBUTE_ID, true);
     }
 
-    public interface ReplacementProductListAttributeCallback {
-      void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeEndOfServiceAlertAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_OF_SERVICE_ALERT_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, END_OF_SERVICE_ALERT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readInterconnectSmokeAlarmAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeInterconnectSmokeAlarmAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readConditionAttribute(
+    public void readInterconnectCOAlarmAttribute(
         IntegerAttributeCallback callback) {
-        readConditionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeConditionAttribute(
+    public void subscribeInterconnectCOAlarmAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDegradationDirectionAttribute(
+    public void readContaminationStateAttribute(
         IntegerAttributeCallback callback) {
-        readDegradationDirectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTAMINATION_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONTAMINATION_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDegradationDirectionAttribute(
+    public void subscribeContaminationStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTAMINATION_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONTAMINATION_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readChangeIndicationAttribute(
+    public void readSmokeSensitivityLevelAttribute(
         IntegerAttributeCallback callback) {
-        readChangeIndicationAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID);
 
-    public void subscribeChangeIndicationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID, true);
     }
 
-    public void readInPlaceIndicatorAttribute(
-        BooleanAttributeCallback callback) {
-        readInPlaceIndicatorAttribute(chipClusterPtr, callback);
+    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSmokeSensitivityLevelAttribute(callback, value, 0);
     }
 
-    public void subscribeInPlaceIndicatorAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readLastChangedTimeAttribute(
-        LastChangedTimeAttributeCallback callback) {
-        readLastChangedTimeAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSmokeSensitivityLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID);
 
-    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readExpiryDateAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRY_DATE_ATTRIBUTE_ID);
 
-    public void subscribeLastChangedTimeAttribute(
-        LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EXPIRY_DATE_ATTRIBUTE_ID, true);
     }
 
-    public void readReplacementProductListAttribute(
-        ReplacementProductListAttributeCallback callback) {
-        readReplacementProductListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeExpiryDateAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRY_DATE_ATTRIBUTE_ID);
 
-    public void subscribeReplacementProductListAttribute(
-        ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EXPIRY_DATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readConditionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeConditionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDegradationDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDegradationDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readChangeIndicationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeChangeIndicationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readInPlaceIndicatorAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeInPlaceIndicatorAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLastChangedTimeAttribute(long chipClusterPtr, LastChangedTimeAttributeCallback callback);
-
-    private native void writeLastChangedTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeLastChangedTimeAttribute(long chipClusterPtr, LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readReplacementProductListAttribute(long chipClusterPtr, ReplacementProductListAttributeCallback callback);
-
-    private native void subscribeReplacementProductListAttribute(long chipClusterPtr, ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+  public static class DishwasherAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 93L;
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long MASK_ATTRIBUTE_ID = 0L;
+    private static final long LATCH_ATTRIBUTE_ID = 1L;
+    private static final long STATE_ATTRIBUTE_ID = 2L;
+    private static final long SUPPORTED_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public DishwasherAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-  public static class ActivatedCarbonFilterMonitoringCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 114L;
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public ActivatedCarbonFilterMonitoringCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void reset(DefaultClusterCallback callback, Long alarms) {
+      reset(callback, alarms, 0);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void reset(DefaultClusterCallback callback, Long alarms, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public void resetCondition(DefaultClusterCallback callback) {
-      resetCondition(chipClusterPtr, callback, null);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long alarmsFieldID = 0L;
+      BaseTLVType alarmstlvValue = new UIntType(alarms);
+      elements.add(new StructElement(alarmsFieldID, alarmstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void modifyEnabledAlarms(DefaultClusterCallback callback, Long mask) {
+      modifyEnabledAlarms(callback, mask, 0);
     }
 
-    private native void resetCondition(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void modifyEnabledAlarms(DefaultClusterCallback callback, Long mask, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    public interface LastChangedTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long maskFieldID = 0L;
+      BaseTLVType masktlvValue = new UIntType(mask);
+      elements.add(new StructElement(maskFieldID, masktlvValue));
 
-    public interface ReplacementProductListAttributeCallback {
-      void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readConditionAttribute(
-        IntegerAttributeCallback callback) {
-        readConditionAttribute(chipClusterPtr, callback);
-    }
+    public void readMaskAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
 
-    public void subscribeConditionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MASK_ATTRIBUTE_ID, true);
     }
 
-    public void readDegradationDirectionAttribute(
-        IntegerAttributeCallback callback) {
-        readDegradationDirectionAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeMaskAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
 
-    public void subscribeDegradationDirectionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MASK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readChangeIndicationAttribute(
-        IntegerAttributeCallback callback) {
-        readChangeIndicationAttribute(chipClusterPtr, callback);
-    }
+    public void readLatchAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LATCH_ATTRIBUTE_ID);
 
-    public void subscribeChangeIndicationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LATCH_ATTRIBUTE_ID, true);
     }
 
-    public void readInPlaceIndicatorAttribute(
-        BooleanAttributeCallback callback) {
-        readInPlaceIndicatorAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLatchAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LATCH_ATTRIBUTE_ID);
 
-    public void subscribeInPlaceIndicatorAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LATCH_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLastChangedTimeAttribute(
-        LastChangedTimeAttributeCallback callback) {
-        readLastChangedTimeAttribute(chipClusterPtr, callback);
-    }
+    public void readStateAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
 
-    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATE_ATTRIBUTE_ID, true);
     }
 
-    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeStateAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
 
-    public void subscribeLastChangedTimeAttribute(
-        LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readReplacementProductListAttribute(
-        ReplacementProductListAttributeCallback callback) {
-        readReplacementProductListAttribute(chipClusterPtr, callback);
+    public void readSupportedAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeReplacementProductListAttribute(
-        ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSupportedAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readConditionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeConditionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void readDegradationDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class MicrowaveOvenModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 94L;
 
-    private native void subscribeDegradationDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long SUPPORTED_MODES_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_MODE_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readChangeIndicationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public MicrowaveOvenModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeChangeIndicationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readInPlaceIndicatorAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> value);
+    }
 
-    private native void subscribeInPlaceIndicatorAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readLastChangedTimeAttribute(long chipClusterPtr, LastChangedTimeAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeLastChangedTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeLastChangedTimeAttribute(long chipClusterPtr, LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readReplacementProductListAttribute(long chipClusterPtr, ReplacementProductListAttributeCallback callback);
+    public void readSupportedModesAttribute(
+        SupportedModesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeReplacementProductListAttribute(long chipClusterPtr, ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readCurrentModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-  public static class DoorLockCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 257L;
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public DoorLockCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void lockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
-      lockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void unlockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
-      unlockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void unlockWithTimeout(DefaultClusterCallback callback, Integer timeout, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
-      unlockWithTimeout(chipClusterPtr, callback, timeout, PINCode, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void setWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute) {
-      setWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, daysMask, startHour, startMinute, endHour, endMinute, null);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void setWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute, int timedInvokeTimeoutMs) {
-      setWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, daysMask, startHour, startMinute, endHour, endMinute, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
-      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
-      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void setYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime) {
-      setYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, null);
-    }
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void setYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime, int timedInvokeTimeoutMs) {
-      setYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
-    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
-    }
+  public static class MicrowaveOvenControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 95L;
 
-    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
-    }
+    private static final long COOK_TIME_ATTRIBUTE_ID = 1L;
+    private static final long POWER_SETTING_ATTRIBUTE_ID = 2L;
+    private static final long MIN_POWER_ATTRIBUTE_ID = 3L;
+    private static final long MAX_POWER_ATTRIBUTE_ID = 4L;
+    private static final long POWER_STEP_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode) {
-      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, null);
+    public MicrowaveOvenControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, int timedInvokeTimeoutMs) {
-      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, timedInvokeTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    public void setCookingParameters(DefaultClusterCallback callback, Optional<Integer> cookMode, Optional<Long> cookTime, Optional<Integer> powerSetting) {
+      setCookingParameters(callback, cookMode, cookTime, powerSetting, 0);
     }
 
-    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
-    }
+    public void setCookingParameters(DefaultClusterCallback callback, Optional<Integer> cookMode, Optional<Long> cookTime, Optional<Integer> powerSetting, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long cookModeFieldID = 0L;
+      BaseTLVType cookModetlvValue = cookMode.<BaseTLVType>map((nonOptionalcookMode) -> new UIntType(nonOptionalcookMode)).orElse(new EmptyType());
+      elements.add(new StructElement(cookModeFieldID, cookModetlvValue));
 
-    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
-    }
+      final long cookTimeFieldID = 1L;
+      BaseTLVType cookTimetlvValue = cookTime.<BaseTLVType>map((nonOptionalcookTime) -> new UIntType(nonOptionalcookTime)).orElse(new EmptyType());
+      elements.add(new StructElement(cookTimeFieldID, cookTimetlvValue));
 
+      final long powerSettingFieldID = 2L;
+      BaseTLVType powerSettingtlvValue = powerSetting.<BaseTLVType>map((nonOptionalpowerSetting) -> new UIntType(nonOptionalpowerSetting)).orElse(new EmptyType());
+      elements.add(new StructElement(powerSettingFieldID, powerSettingtlvValue));
 
-    public void setUser(DefaultClusterCallback callback, Integer operationType, Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, int timedInvokeTimeoutMs) {
-      setUser(chipClusterPtr, callback, operationType, userIndex, userName, userUniqueID, userStatus, userType, credentialRule, timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void getUser(GetUserResponseCallback callback, Integer userIndex) {
-      getUser(chipClusterPtr, callback, userIndex, null);
+    public void addMoreTime(DefaultClusterCallback callback, Long timeToAdd) {
+      addMoreTime(callback, timeToAdd, 0);
     }
 
-    public void getUser(GetUserResponseCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      getUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
-    }
+    public void addMoreTime(DefaultClusterCallback callback, Long timeToAdd, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeToAddFieldID = 0L;
+      BaseTLVType timeToAddtlvValue = new UIntType(timeToAdd);
+      elements.add(new StructElement(timeToAddFieldID, timeToAddtlvValue));
 
-    public void clearUser(DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    public void setCredential(SetCredentialResponseCallback callback, Integer operationType, ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @Nullable Integer userType, int timedInvokeTimeoutMs) {
-      setCredential(chipClusterPtr, callback, operationType, credential, credentialData, userIndex, userStatus, userType, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential) {
-      getCredentialStatus(chipClusterPtr, callback, credential, null);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
-      getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
+    public void readCookTimeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COOK_TIME_ATTRIBUTE_ID);
 
-    public void clearCredential(DefaultClusterCallback callback, @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
-      clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COOK_TIME_ATTRIBUTE_ID, true);
     }
 
+    public void subscribeCookTimeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COOK_TIME_ATTRIBUTE_ID);
 
-    public void unboltDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
-      unboltDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COOK_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void lockDoor(long chipClusterPtr, DefaultClusterCallback callback, Optional<byte[]> PINCode, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPowerSettingAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_SETTING_ATTRIBUTE_ID);
 
-    private native void unlockDoor(long chipClusterPtr, DefaultClusterCallback callback, Optional<byte[]> PINCode, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_SETTING_ATTRIBUTE_ID, true);
+    }
 
-    private native void unlockWithTimeout(long chipClusterPtr, DefaultClusterCallback callback, Integer timeout, Optional<byte[]> PINCode, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribePowerSettingAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_SETTING_ATTRIBUTE_ID);
 
-    private native void setWeekDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void getWeekDaySchedule(long chipClusterPtr, GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void readMinPowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_POWER_ATTRIBUTE_ID);
 
-    private native void clearWeekDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void setYearDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMinPowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_POWER_ATTRIBUTE_ID);
 
-    private native void getYearDaySchedule(long chipClusterPtr, GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void clearYearDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void readMaxPowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_POWER_ATTRIBUTE_ID);
 
-    private native void setHolidaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void getHolidaySchedule(long chipClusterPtr, GetHolidayScheduleResponseCallback callback, Integer holidayIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMaxPowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_POWER_ATTRIBUTE_ID);
 
-    private native void clearHolidaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer holidayIndex, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void setUser(long chipClusterPtr, DefaultClusterCallback callback, Integer operationType, Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPowerStepAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_STEP_ATTRIBUTE_ID);
 
-    private native void getUser(long chipClusterPtr, GetUserResponseCallback callback, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_STEP_ATTRIBUTE_ID, true);
+    }
 
-    private native void clearUser(long chipClusterPtr, DefaultClusterCallback callback, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribePowerStepAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_STEP_ATTRIBUTE_ID);
 
-    private native void setCredential(long chipClusterPtr, SetCredentialResponseCallback callback, Integer operationType, ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_STEP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void getCredentialStatus(long chipClusterPtr, GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void clearCredential(long chipClusterPtr, DefaultClusterCallback callback, @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void unboltDoor(long chipClusterPtr, DefaultClusterCallback callback, Optional<byte[]> PINCode, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface GetWeekDayScheduleResponseCallback {
-      void onSuccess(Integer weekDayIndex, Integer userIndex, Integer status, Optional<Integer> daysMask, Optional<Integer> startHour, Optional<Integer> startMinute, Optional<Integer> endHour, Optional<Integer> endMinute);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GetYearDayScheduleResponseCallback {
-      void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime);
-      void onError(Exception error);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface GetHolidayScheduleResponseCallback {
-      void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface GetUserResponseCallback {
-      void onSuccess(Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> credentials, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextUserIndex);
-      void onError(Exception error);
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface SetCredentialResponseCallback {
-      void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GetCredentialStatusResponseCallback {
-      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);
-      void onError(Exception error);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface LockStateAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface DoorStateAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLockStateAttribute(
-        LockStateAttributeCallback callback) {
-        readLockStateAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLockStateAttribute(
-        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLockTypeAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readLockTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLockTypeAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readActuatorEnabledAttribute(
-        BooleanAttributeCallback callback) {
-        readActuatorEnabledAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeActuatorEnabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActuatorEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class OperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 96L;
 
-    public void readDoorStateAttribute(
-        DoorStateAttributeCallback callback) {
-        readDoorStateAttribute(chipClusterPtr, callback);
-    }
+    private static final long PHASE_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_PHASE_ATTRIBUTE_ID = 1L;
+    private static final long COUNTDOWN_TIME_ATTRIBUTE_ID = 2L;
+    private static final long OPERATIONAL_STATE_LIST_ATTRIBUTE_ID = 3L;
+    private static final long OPERATIONAL_STATE_ATTRIBUTE_ID = 4L;
+    private static final long OPERATIONAL_ERROR_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void subscribeDoorStateAttribute(
-        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public OperationalStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readDoorOpenEventsAttribute(
-        LongAttributeCallback callback) {
-        readDoorOpenEventsAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value) {
-        writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, null);
+    public void pause(OperationalCommandResponseCallback callback) {
+      pause(callback, 0);
     }
 
-    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeDoorOpenEventsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stop(OperationalCommandResponseCallback callback) {
+      stop(callback, 0);
     }
 
-    public void readDoorClosedEventsAttribute(
-        LongAttributeCallback callback) {
-        readDoorClosedEventsAttribute(chipClusterPtr, callback);
+    public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value) {
-        writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, null);
+    public void start(OperationalCommandResponseCallback callback) {
+      start(callback, 0);
     }
 
-    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeDoorClosedEventsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorClosedEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void resume(OperationalCommandResponseCallback callback) {
+      resume(callback, 0);
     }
 
-    public void readOpenPeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readOpenPeriodAttribute(chipClusterPtr, callback);
+    public void resume(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.OperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface OperationalCommandResponseCallback extends BaseClusterCallback {
+      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState);
     }
 
-    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    public interface PhaseListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable List<String> value);
     }
 
-    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface CurrentPhaseAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeOpenPeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOpenPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CountdownTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readNumberOfTotalUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback);
+    public interface OperationalStateListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> value);
     }
 
-    public void subscribeNumberOfTotalUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface OperationalErrorAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value);
     }
 
-    public void readNumberOfPINUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeNumberOfPINUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readNumberOfRFIDUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeNumberOfRFIDUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
-    }
+    public void readPhaseListAttribute(
+        PhaseListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
 
-    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    public void subscribePhaseListAttribute(
+        PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
 
-    public void readNumberOfHolidaySchedulesSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
 
-    public void readMaxPINCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxPINCodeLengthAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeMaxPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
 
-    public void readMinPINCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMinPINCodeLengthAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
 
-    public void readMaxRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxRFIDCodeLengthAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeMaxRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
 
-    public void readMinRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMinRFIDCodeLengthAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.OperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCredentialRulesSupportAttribute(
+    public void readOperationalStateAttribute(
         IntegerAttributeCallback callback) {
-        readCredentialRulesSupportAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCredentialRulesSupportAttribute(
+    public void subscribeOperationalStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCredentialRulesSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
 
-    public void readNumberOfCredentialsSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
 
-    public void readLanguageAttribute(
-        CharStringAttributeCallback callback) {
-        readLanguageAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.OperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, true);
     }
 
-    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
-        writeLanguageAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
 
-    public void writeLanguageAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLanguageAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.OperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeLanguageAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLanguageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readLEDSettingsAttribute(
-        IntegerAttributeCallback callback) {
-        readLEDSettingsAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLEDSettingsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLEDSettingsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeLEDSettingsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLEDSettingsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readAutoRelockTimeAttribute(
-        LongAttributeCallback callback) {
-        readAutoRelockTimeAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAutoRelockTimeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAutoRelockTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void readSoundVolumeAttribute(
-        IntegerAttributeCallback callback) {
-        readSoundVolumeAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSoundVolumeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSoundVolumeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeSoundVolumeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoundVolumeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void readOperatingModeAttribute(
-        IntegerAttributeCallback callback) {
-        readOperatingModeAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOperatingModeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOperatingModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeOperatingModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperatingModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void readSupportedOperatingModesAttribute(
-        IntegerAttributeCallback callback) {
-        readSupportedOperatingModesAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSupportedOperatingModesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedOperatingModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDefaultConfigurationRegisterAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readDefaultConfigurationRegisterAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDefaultConfigurationRegisterAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDefaultConfigurationRegisterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readEnableLocalProgrammingAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableLocalProgrammingAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, null);
-    }
+  public static class RvcOperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 97L;
 
-    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private static final long PHASE_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_PHASE_ATTRIBUTE_ID = 1L;
+    private static final long COUNTDOWN_TIME_ATTRIBUTE_ID = 2L;
+    private static final long OPERATIONAL_STATE_LIST_ATTRIBUTE_ID = 3L;
+    private static final long OPERATIONAL_STATE_ATTRIBUTE_ID = 4L;
+    private static final long OPERATIONAL_ERROR_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void subscribeEnableLocalProgrammingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableLocalProgrammingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public RvcOperationalStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readEnableOneTouchLockingAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableOneTouchLockingAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, null);
+    public void pause(OperationalCommandResponseCallback callback) {
+      pause(callback, 0);
     }
 
-    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.RvcOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeEnableOneTouchLockingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableOneTouchLockingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stop(OperationalCommandResponseCallback callback) {
+      stop(callback, 0);
     }
 
-    public void readEnableInsideStatusLEDAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableInsideStatusLEDAttribute(chipClusterPtr, callback);
+    public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.RvcOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, null);
+    public void start(OperationalCommandResponseCallback callback) {
+      start(callback, 0);
     }
 
-    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.RvcOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeEnableInsideStatusLEDAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void resume(OperationalCommandResponseCallback callback) {
+      resume(callback, 0);
     }
 
-    public void readEnablePrivacyModeButtonAttribute(
-        BooleanAttributeCallback callback) {
-        readEnablePrivacyModeButtonAttribute(chipClusterPtr, callback);
+    public void resume(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long commandResponseStateFieldID = 0L;
+          ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == commandResponseStateFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                commandResponseState = ChipStructs.RvcOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(commandResponseState);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface OperationalCommandResponseCallback extends BaseClusterCallback {
+      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, null);
+    public interface PhaseListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable List<String> value);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface CurrentPhaseAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeEnablePrivacyModeButtonAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CountdownTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readLocalProgrammingFeaturesAttribute(
-        IntegerAttributeCallback callback) {
-        readLocalProgrammingFeaturesAttribute(chipClusterPtr, callback);
+    public interface OperationalStateListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> value);
     }
 
-    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, null);
+    public interface OperationalErrorAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value);
     }
 
-    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeLocalProgrammingFeaturesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readWrongCodeEntryLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readWrongCodeEntryLimitAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readPhaseListAttribute(
+        PhaseListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
 
-    public void subscribeWrongCodeEntryLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readUserCodeTemporaryDisableTimeAttribute(
-        IntegerAttributeCallback callback) {
-        readUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback);
-    }
+    public void subscribePhaseListAttribute(
+        PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_LIST_ATTRIBUTE_ID);
 
-    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHASE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
 
-    public void subscribeUserCodeTemporaryDisableTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, true);
     }
 
-    public void readSendPINOverTheAirAttribute(
-        BooleanAttributeCallback callback) {
-        readSendPINOverTheAirAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_PHASE_ATTRIBUTE_ID);
 
-    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeSendPINOverTheAirAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_PHASE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeSendPINOverTheAirAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
 
-    public void subscribeSendPINOverTheAirAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSendPINOverTheAirAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void readRequirePINforRemoteOperationAttribute(
-        BooleanAttributeCallback callback) {
-        readRequirePINforRemoteOperationAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUNTDOWN_TIME_ATTRIBUTE_ID);
 
-    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COUNTDOWN_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRequirePINforRemoteOperationAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readExpiringUserTimeoutAttribute(
+    public void readOperationalStateAttribute(
         IntegerAttributeCallback callback) {
-        readExpiringUserTimeoutAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value) {
-        writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeOperationalStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.RvcOperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeExpiringUserTimeoutAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpiringUserTimeoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.RvcOperationalStateClusterErrorStateStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_ERROR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readLockStateAttribute(long chipClusterPtr, LockStateAttributeCallback callback);
-
-    private native void subscribeLockStateAttribute(long chipClusterPtr, LockStateAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void readLockTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class HepaFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 113L;
 
-    private native void subscribeLockTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long CONDITION_ATTRIBUTE_ID = 0L;
+    private static final long DEGRADATION_DIRECTION_ATTRIBUTE_ID = 1L;
+    private static final long CHANGE_INDICATION_ATTRIBUTE_ID = 2L;
+    private static final long IN_PLACE_INDICATOR_ATTRIBUTE_ID = 3L;
+    private static final long LAST_CHANGED_TIME_ATTRIBUTE_ID = 4L;
+    private static final long REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readActuatorEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public HepaFilterMonitoringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeActuatorEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readDoorStateAttribute(long chipClusterPtr, DoorStateAttributeCallback callback);
+    public void resetCondition(DefaultClusterCallback callback) {
+      resetCondition(callback, 0);
+    }
 
-    private native void subscribeDoorStateAttribute(long chipClusterPtr, DoorStateAttributeCallback callback, int minInterval, int maxInterval);
+    public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void readDoorOpenEventsAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void writeDoorOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public interface LastChangedTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void subscribeDoorOpenEventsAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface ReplacementProductListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> value);
+    }
 
-    private native void readDoorClosedEventsAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeDoorClosedEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeDoorClosedEventsAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readConditionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
 
-    private native void subscribeOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONDITION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfTotalUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeConditionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfTotalUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONDITION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNumberOfPINUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readDegradationDirectionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfPINUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeDegradationDirectionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readChangeIndicationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfYearDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeChangeIndicationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
 
-    private native void subscribeMaxPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeMinPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_CHANGED_TIME_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxRFIDCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeLastChangedTimeAttribute(callback, value, 0);
+    }
 
-    private native void subscribeMaxRFIDCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAST_CHANGED_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readMinRFIDCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeMinRFIDCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_CHANGED_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readCredentialRulesSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeCredentialRulesSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfCredentialsSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfCredentialsSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readLanguageAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeLanguageAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeLanguageAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readLEDSettingsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeLEDSettingsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeLEDSettingsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAutoRelockTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeAutoRelockTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeAutoRelockTimeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void readSoundVolumeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeSoundVolumeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeSoundVolumeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readOperatingModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void writeOperatingModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeOperatingModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void readSupportedOperatingModesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeSupportedOperatingModesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void readDefaultConfigurationRegisterAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeDefaultConfigurationRegisterAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void readEnableLocalProgrammingAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeEnableLocalProgrammingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeEnableLocalProgrammingAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEnableOneTouchLockingAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void writeEnableOneTouchLockingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeEnableOneTouchLockingAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+  public static class ActivatedCarbonFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 114L;
 
-    private native void readEnableInsideStatusLEDAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    private static final long CONDITION_ATTRIBUTE_ID = 0L;
+    private static final long DEGRADATION_DIRECTION_ATTRIBUTE_ID = 1L;
+    private static final long CHANGE_INDICATION_ATTRIBUTE_ID = 2L;
+    private static final long IN_PLACE_INDICATOR_ATTRIBUTE_ID = 3L;
+    private static final long LAST_CHANGED_TIME_ATTRIBUTE_ID = 4L;
+    private static final long REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID = 5L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void writeEnableInsideStatusLEDAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public ActivatedCarbonFilterMonitoringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeEnableInsideStatusLEDAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readEnablePrivacyModeButtonAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void resetCondition(DefaultClusterCallback callback) {
+      resetCondition(callback, 0);
+    }
 
-    private native void writeEnablePrivacyModeButtonAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeEnablePrivacyModeButtonAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readLocalProgrammingFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface LastChangedTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void writeLocalProgrammingFeaturesAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface ReplacementProductListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> value);
+    }
 
-    private native void subscribeLocalProgrammingFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readWrongCodeEntryLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeWrongCodeEntryLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeWrongCodeEntryLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readConditionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
 
-    private native void writeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONDITION_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeConditionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
 
-    private native void readSendPINOverTheAirAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONDITION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeSendPINOverTheAirAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void readDegradationDirectionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
 
-    private native void subscribeSendPINOverTheAirAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRequirePINforRemoteOperationAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void subscribeDegradationDirectionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
 
-    private native void writeRequirePINforRemoteOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeRequirePINforRemoteOperationAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void readChangeIndicationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
 
-    private native void readExpiringUserTimeoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeExpiringUserTimeoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeChangeIndicationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
 
-    private native void subscribeExpiringUserTimeoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAST_CHANGED_TIME_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeLastChangedTimeAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAST_CHANGED_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAST_CHANGED_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID, true);
+    }
 
-  public static class WindowCoveringCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 258L;
+    public void subscribeReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
 
-    public WindowCoveringCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void upOrOpen(DefaultClusterCallback callback) {
-      upOrOpen(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      upOrOpen(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void downOrClose(DefaultClusterCallback callback) {
-      downOrClose(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void downOrClose(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      downOrClose(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void stopMotion(DefaultClusterCallback callback) {
-      stopMotion(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      stopMotion(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, timedInvokeTimeoutMs);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, timedInvokeTimeoutMs);
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, timedInvokeTimeoutMs);
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, timedInvokeTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void downOrClose(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void stopMotion(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void goToLiftValue(long chipClusterPtr, DefaultClusterCallback callback, Integer liftValue, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void goToLiftPercentage(long chipClusterPtr, DefaultClusterCallback callback, Integer liftPercent100thsValue, @Nullable Integer timedInvokeTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void goToTiltValue(long chipClusterPtr, DefaultClusterCallback callback, Integer tiltValue, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void goToTiltPercentage(long chipClusterPtr, DefaultClusterCallback callback, Integer tiltPercent100thsValue, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public interface CurrentPositionLiftAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public interface CurrentPositionTiltAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+  public static class BooleanSensorConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 128L;
 
-    public interface CurrentPositionLiftPercentageAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    private static final long SENSITIVITY_LEVEL_ATTRIBUTE_ID = 0L;
+    private static final long ALARMS_ACTIVE_ATTRIBUTE_ID = 1L;
+    private static final long ALARMS_SUPPRESSED_ATTRIBUTE_ID = 2L;
+    private static final long ALARMS_ENABLED_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public interface CurrentPositionTiltPercentageAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public BooleanSensorConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public interface TargetPositionLiftPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public interface TargetPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void suppressRequest(DefaultClusterCallback callback, Integer alarmsToSuppress) {
+      suppressRequest(callback, alarmsToSuppress, 0);
     }
 
-    public interface CurrentPositionLiftPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void suppressRequest(DefaultClusterCallback callback, Integer alarmsToSuppress, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public interface CurrentPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long alarmsToSuppressFieldID = 0L;
+      BaseTLVType alarmsToSuppresstlvValue = new UIntType(alarmsToSuppress);
+      elements.add(new StructElement(alarmsToSuppressFieldID, alarmsToSuppresstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readTypeAttribute(
+    public void readSensitivityLevelAttribute(
         IntegerAttributeCallback callback) {
-        readTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SENSITIVITY_LEVEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SENSITIVITY_LEVEL_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSensitivityLevelAttribute(callback, value, 0);
     }
 
-    public void readPhysicalClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback) {
-        readPhysicalClosedLimitLiftAttribute(chipClusterPtr, callback);
+    public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SENSITIVITY_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePhysicalClosedLimitLiftAttribute(
+    public void subscribeSensitivityLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SENSITIVITY_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SENSITIVITY_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhysicalClosedLimitTiltAttribute(
+    public void readAlarmsActiveAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ACTIVE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALARMS_ACTIVE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePhysicalClosedLimitTiltAttribute(
+    public void subscribeAlarmsActiveAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ACTIVE_ATTRIBUTE_ID);
 
-    public void readCurrentPositionLiftAttribute(
-        CurrentPositionLiftAttributeCallback callback) {
-        readCurrentPositionLiftAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALARMS_ACTIVE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeCurrentPositionLiftAttribute(
-        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAlarmsSuppressedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_SUPPRESSED_ATTRIBUTE_ID);
 
-    public void readCurrentPositionTiltAttribute(
-        CurrentPositionTiltAttributeCallback callback) {
-        readCurrentPositionTiltAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALARMS_SUPPRESSED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentPositionTiltAttribute(
-        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAlarmsSuppressedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_SUPPRESSED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALARMS_SUPPRESSED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfActuationsLiftAttribute(
+    public void readAlarmsEnabledAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfActuationsLiftAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ENABLED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALARMS_ENABLED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNumberOfActuationsLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeAlarmsEnabledAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAlarmsEnabledAttribute(callback, value, 0);
     }
 
-    public void readNumberOfActuationsTiltAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfActuationsTiltAttribute(chipClusterPtr, callback);
+    public void writeAlarmsEnabledAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ALARMS_ENABLED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNumberOfActuationsTiltAttribute(
+    public void subscribeAlarmsEnabledAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfActuationsTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ENABLED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALARMS_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readConfigStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readConfigStatusAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeConfigStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConfigStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback) {
-        readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback) {
-        readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOperationalStatusAttribute(
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readOperationalStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOperationalStatusAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void readTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback) {
-        readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+  public static class ValveConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 129L;
+
+    private static final long OPEN_DURATION_ATTRIBUTE_ID = 0L;
+    private static final long AUTO_CLOSE_TIME_ATTRIBUTE_ID = 1L;
+    private static final long REMAINING_DURATION_ATTRIBUTE_ID = 2L;
+    private static final long CURRENT_STATE_ATTRIBUTE_ID = 3L;
+    private static final long TARGET_STATE_ATTRIBUTE_ID = 4L;
+    private static final long START_UP_STATE_ATTRIBUTE_ID = 5L;
+    private static final long CURRENT_LEVEL_ATTRIBUTE_ID = 6L;
+    private static final long TARGET_LEVEL_ATTRIBUTE_ID = 7L;
+    private static final long OPEN_LEVEL_ATTRIBUTE_ID = 8L;
+    private static final long VALVE_FAULT_ATTRIBUTE_ID = 9L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public ValveConfigurationAndControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void subscribeTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void readTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback) {
-        readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+    public void open(DefaultClusterCallback callback, Optional<Long> openDuration) {
+      open(callback, openDuration, 0);
     }
 
-    public void subscribeTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void open(DefaultClusterCallback callback, Optional<Long> openDuration, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long openDurationFieldID = 0L;
+      BaseTLVType openDurationtlvValue = openDuration.<BaseTLVType>map((nonOptionalopenDuration) -> new UIntType(nonOptionalopenDuration)).orElse(new EmptyType());
+      elements.add(new StructElement(openDurationFieldID, openDurationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readEndProductTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readEndProductTypeAttribute(chipClusterPtr, callback);
+    public void close(DefaultClusterCallback callback) {
+      close(callback, 0);
     }
 
-    public void subscribeEndProductTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndProductTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void close(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback) {
-        readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+    public void setLevel(DefaultClusterCallback callback, Integer level, Optional<Long> openDuration) {
+      setLevel(callback, level, openDuration, 0);
     }
 
-    public void subscribeCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void setLevel(DefaultClusterCallback callback, Integer level, Optional<Long> openDuration, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long levelFieldID = 0L;
+      BaseTLVType leveltlvValue = new UIntType(level);
+      elements.add(new StructElement(levelFieldID, leveltlvValue));
+
+      final long openDurationFieldID = 1L;
+      BaseTLVType openDurationtlvValue = openDuration.<BaseTLVType>map((nonOptionalopenDuration) -> new UIntType(nonOptionalopenDuration)).orElse(new EmptyType());
+      elements.add(new StructElement(openDurationFieldID, openDurationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback) {
-        readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+    public interface OpenDurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AutoCloseTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readInstalledOpenLimitLiftAttribute(
-        IntegerAttributeCallback callback) {
-        readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
+    public interface RemainingDurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeInstalledOpenLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledOpenLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readInstalledClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback) {
-        readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
+    public interface TargetStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeInstalledClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentLevelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readInstalledOpenLimitTiltAttribute(
-        IntegerAttributeCallback callback) {
-        readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
+    public interface TargetLevelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeInstalledOpenLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledOpenLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface OpenLevelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readInstalledClosedLimitTiltAttribute(
-        IntegerAttributeCallback callback) {
-        readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeInstalledClosedLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readModeAttribute(
-        IntegerAttributeCallback callback) {
-        readModeAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeModeAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOpenDurationAttribute(
+        OpenDurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_DURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPEN_DURATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOpenDurationAttribute(DefaultClusterCallback callback, Long value) {
+      writeOpenDurationAttribute(callback, value, 0);
     }
 
-    public void readSafetyStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readSafetyStatusAttribute(chipClusterPtr, callback);
+    public void writeOpenDurationAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPEN_DURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOpenDurationAttribute(
+        OpenDurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPEN_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readAutoCloseTimeAttribute(
+        AutoCloseTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_CLOSE_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AUTO_CLOSE_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAutoCloseTimeAttribute(
+        AutoCloseTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_CLOSE_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AUTO_CLOSE_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readRemainingDurationAttribute(
+        RemainingDurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_DURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REMAINING_DURATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRemainingDurationAttribute(
+        RemainingDurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REMAINING_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+    public void readCurrentStateAttribute(
+        CurrentStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentStateAttribute(
+        CurrentStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+    public void readTargetStateAttribute(
+        TargetStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetStateAttribute(
+        TargetStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readStartUpStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeStartUpStateAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpStateAttribute(callback, value, 0);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void writeStartUpStateAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_STATE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribeStartUpStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readCurrentLevelAttribute(
+        CurrentLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPhysicalClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentLevelAttribute(
+        CurrentLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribePhysicalClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPhysicalClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readTargetLevelAttribute(
+        TargetLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribePhysicalClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readCurrentPositionLiftAttribute(long chipClusterPtr, CurrentPositionLiftAttributeCallback callback);
+    public void subscribeTargetLevelAttribute(
+        TargetLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionLiftAttribute(long chipClusterPtr, CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readCurrentPositionTiltAttribute(long chipClusterPtr, CurrentPositionTiltAttributeCallback callback);
+    public void readOpenLevelAttribute(
+        OpenLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionTiltAttribute(long chipClusterPtr, CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPEN_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfActuationsLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeOpenLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenLevelAttribute(callback, value, 0);
+    }
 
-    private native void subscribeNumberOfActuationsLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeOpenLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPEN_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readNumberOfActuationsTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeOpenLevelAttribute(
+        OpenLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfActuationsTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPEN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readConfigStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readValveFaultAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VALVE_FAULT_ATTRIBUTE_ID);
 
-    private native void subscribeConfigStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VALVE_FAULT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readCurrentPositionLiftPercentageAttribute(long chipClusterPtr, CurrentPositionLiftPercentageAttributeCallback callback);
+    public void subscribeValveFaultAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VALVE_FAULT_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionLiftPercentageAttribute(long chipClusterPtr, CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VALVE_FAULT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readCurrentPositionTiltPercentageAttribute(long chipClusterPtr, CurrentPositionTiltPercentageAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionTiltPercentageAttribute(long chipClusterPtr, CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readOperationalStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeOperationalStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, TargetPositionLiftPercent100thsAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, TargetPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, TargetPositionTiltPercent100thsAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, TargetPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEndProductTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeEndProductTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, CurrentPositionLiftPercent100thsAttributeCallback callback);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, CurrentPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, CurrentPositionTiltPercent100thsAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, CurrentPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readInstalledOpenLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeInstalledOpenLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInstalledClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeInstalledClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readInstalledOpenLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeInstalledOpenLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInstalledClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeInstalledClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void writeModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class DemandResponseLoadControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 150L;
 
-    private native void readSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 0L;
+    private static final long NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 1L;
+    private static final long EVENTS_ATTRIBUTE_ID = 2L;
+    private static final long ACTIVE_EVENTS_ATTRIBUTE_ID = 3L;
+    private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 4L;
+    private static final long NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID = 5L;
+    private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 6L;
+    private static final long DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID = 7L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public DemandResponseLoadControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram) {
+      registerLoadControlProgramRequest(callback, loadControlProgram, 0);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long loadControlProgramFieldID = 0L;
+      BaseTLVType loadControlProgramtlvValue = loadControlProgram.encodeTlv();
+      elements.add(new StructElement(loadControlProgramFieldID, loadControlProgramtlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void unregisterLoadControlProgramRequest(DefaultClusterCallback callback, byte[] loadControlProgramID) {
+      unregisterLoadControlProgramRequest(callback, loadControlProgramID, 0);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void unregisterLoadControlProgramRequest(DefaultClusterCallback callback, byte[] loadControlProgramID, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long loadControlProgramIDFieldID = 0L;
+      BaseTLVType loadControlProgramIDtlvValue = new ByteArrayType(loadControlProgramID);
+      elements.add(new StructElement(loadControlProgramIDFieldID, loadControlProgramIDtlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event) {
+      addLoadControlEventRequest(callback, event, 0);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long eventFieldID = 0L;
+      BaseTLVType eventtlvValue = event.encodeTlv();
+      elements.add(new StructElement(eventFieldID, eventtlvValue));
 
-  public static class BarrierControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 259L;
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public BarrierControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void removeLoadControlEventRequest(DefaultClusterCallback callback, byte[] eventID, Integer cancelControl) {
+      removeLoadControlEventRequest(callback, eventID, cancelControl, 0);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void removeLoadControlEventRequest(DefaultClusterCallback callback, byte[] eventID, Integer cancelControl, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, null);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long eventIDFieldID = 0L;
+      BaseTLVType eventIDtlvValue = new ByteArrayType(eventID);
+      elements.add(new StructElement(eventIDFieldID, eventIDtlvValue));
+
+      final long cancelControlFieldID = 1L;
+      BaseTLVType cancelControltlvValue = new UIntType(cancelControl);
+      elements.add(new StructElement(cancelControlFieldID, cancelControltlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, timedInvokeTimeoutMs);
+    public void clearLoadControlEventsRequest(DefaultClusterCallback callback) {
+      clearLoadControlEventsRequest(callback, 0);
     }
 
-    public void barrierControlStop(DefaultClusterCallback callback) {
-      barrierControlStop(chipClusterPtr, callback, null);
+    public void clearLoadControlEventsRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      barrierControlStop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface LoadControlProgramsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value);
     }
 
-    private native void barrierControlGoToPercent(long chipClusterPtr, DefaultClusterCallback callback, Integer percentOpen, @Nullable Integer timedInvokeTimeoutMs);
+    public interface EventsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value);
+    }
 
-    private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public interface ActiveEventsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value);
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readBarrierMovingStateAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierMovingStateAttribute(chipClusterPtr, callback);
-    }
+    public void readLoadControlProgramsAttribute(
+        LoadControlProgramsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
 
-    public void subscribeBarrierMovingStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierMovingStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID, true);
     }
 
-    public void readBarrierSafetyStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLoadControlProgramsAttribute(
+        LoadControlProgramsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
 
-    public void subscribeBarrierSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBarrierCapabilitiesAttribute(
+    public void readNumberOfLoadControlProgramsAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierCapabilitiesAttribute(
+    public void subscribeNumberOfLoadControlProgramsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBarrierOpenEventsAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierOpenEventsAttribute(chipClusterPtr, callback);
-    }
+    public void readEventsAttribute(
+        EventsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENTS_ATTRIBUTE_ID);
 
-    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeEventsAttribute(
+        EventsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENTS_ATTRIBUTE_ID);
 
-    public void subscribeBarrierOpenEventsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBarrierCloseEventsAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierCloseEventsAttribute(chipClusterPtr, callback);
-    }
+    public void readActiveEventsAttribute(
+        ActiveEventsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);
 
-    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeActiveEventsAttribute(
+        ActiveEventsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);
 
-    public void subscribeBarrierCloseEventsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBarrierCommandOpenEventsAttribute(
+    public void readNumberOfEventsPerProgramAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierCommandOpenEventsAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, value, null);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID);
 
-    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierCommandOpenEventsAttribute(
+    public void subscribeNumberOfEventsPerProgramAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID);
 
-    public void readBarrierCommandCloseEventsAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierCommandCloseEventsAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfTransitionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID);
 
-    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierCommandCloseEventsAttribute(
+    public void subscribeNumberOfTransitionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBarrierOpenPeriodAttribute(
+    public void readDefaultRandomStartAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierOpenPeriodAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_START_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_RANDOM_START_ATTRIBUTE_ID, true);
     }
 
-    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    public void writeDefaultRandomStartAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultRandomStartAttribute(callback, value, 0);
     }
 
-    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeDefaultRandomStartAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_RANDOM_START_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeBarrierOpenPeriodAttribute(
+    public void subscribeDefaultRandomStartAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierOpenPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_START_ATTRIBUTE_ID);
 
-    public void readBarrierClosePeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierClosePeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_RANDOM_START_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierClosePeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readDefaultRandomDurationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID);
 
-    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierClosePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierClosePeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierClosePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeDefaultRandomDurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultRandomDurationAttribute(callback, value, 0);
     }
 
-    public void readBarrierPositionAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierPositionAttribute(chipClusterPtr, callback);
+    public void writeDefaultRandomDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeBarrierPositionAttribute(
+    public void subscribeDefaultRandomDurationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readBarrierMovingStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBarrierMovingStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readBarrierSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBarrierSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBarrierCapabilitiesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeBarrierCapabilitiesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBarrierOpenEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeBarrierOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeBarrierOpenEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBarrierCloseEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeBarrierCloseEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeBarrierCloseEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBarrierCommandOpenEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeBarrierCommandOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeBarrierCommandOpenEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBarrierCommandCloseEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void writeBarrierCommandCloseEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+  public static class EnergyEvseCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 153L;
+
+    private static final long STATE_ATTRIBUTE_ID = 0L;
+    private static final long SUPPLY_STATE_ATTRIBUTE_ID = 1L;
+    private static final long FAULT_STATE_ATTRIBUTE_ID = 2L;
+    private static final long CHARGING_ENABLED_UNTIL_ATTRIBUTE_ID = 3L;
+    private static final long DISCHARGING_ENABLED_UNTIL_ATTRIBUTE_ID = 4L;
+    private static final long CIRCUIT_CAPACITY_ATTRIBUTE_ID = 5L;
+    private static final long MINIMUM_CHARGE_CURRENT_ATTRIBUTE_ID = 6L;
+    private static final long MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID = 7L;
+    private static final long MAXIMUM_DISCHARGE_CURRENT_ATTRIBUTE_ID = 8L;
+    private static final long USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID = 9L;
+    private static final long RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID = 10L;
+    private static final long NUMBER_OF_WEEKLY_TARGETS_ATTRIBUTE_ID = 33L;
+    private static final long NUMBER_OF_DAILY_TARGETS_ATTRIBUTE_ID = 34L;
+    private static final long NEXT_CHARGE_START_TIME_ATTRIBUTE_ID = 35L;
+    private static final long NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID = 36L;
+    private static final long NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID = 37L;
+    private static final long NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID = 38L;
+    private static final long APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID = 39L;
+    private static final long STATE_OF_CHARGE_ATTRIBUTE_ID = 48L;
+    private static final long BATTERY_CAPACITY_ATTRIBUTE_ID = 49L;
+    private static final long VEHICLE_I_D_ATTRIBUTE_ID = 50L;
+    private static final long SESSION_I_D_ATTRIBUTE_ID = 64L;
+    private static final long SESSION_DURATION_ATTRIBUTE_ID = 65L;
+    private static final long SESSION_ENERGY_CHARGED_ATTRIBUTE_ID = 66L;
+    private static final long SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID = 67L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public EnergyEvseCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeBarrierCommandCloseEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readBarrierOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeBarrierOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void disable(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeBarrierOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readBarrierClosePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeBarrierClosePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void enableCharging(DefaultClusterCallback callback, @Nullable Long chargingEnabledUntil, Long minimumChargeCurrent, Long maximumChargeCurrent, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void subscribeBarrierClosePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long chargingEnabledUntilFieldID = 0L;
+      BaseTLVType chargingEnabledUntiltlvValue = chargingEnabledUntil != null ? new UIntType(chargingEnabledUntil) : new NullType();
+      elements.add(new StructElement(chargingEnabledUntilFieldID, chargingEnabledUntiltlvValue));
 
-    private native void readBarrierPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long minimumChargeCurrentFieldID = 1L;
+      BaseTLVType minimumChargeCurrenttlvValue = new IntType(minimumChargeCurrent);
+      elements.add(new StructElement(minimumChargeCurrentFieldID, minimumChargeCurrenttlvValue));
 
-    private native void subscribeBarrierPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long maximumChargeCurrentFieldID = 2L;
+      BaseTLVType maximumChargeCurrenttlvValue = new IntType(maximumChargeCurrent);
+      elements.add(new StructElement(maximumChargeCurrentFieldID, maximumChargeCurrenttlvValue));
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void enableDischarging(DefaultClusterCallback callback, @Nullable Long dischargingEnabledUntil, Long maximumDischargeCurrent, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long dischargingEnabledUntilFieldID = 0L;
+      BaseTLVType dischargingEnabledUntiltlvValue = dischargingEnabledUntil != null ? new UIntType(dischargingEnabledUntil) : new NullType();
+      elements.add(new StructElement(dischargingEnabledUntilFieldID, dischargingEnabledUntiltlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      final long maximumDischargeCurrentFieldID = 1L;
+      BaseTLVType maximumDischargeCurrenttlvValue = new IntType(maximumDischargeCurrent);
+      elements.add(new StructElement(maximumDischargeCurrentFieldID, maximumDischargeCurrenttlvValue));
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void startDiagnostics(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void setTargets(DefaultClusterCallback callback, Integer dayOfWeekforSequence, ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long dayOfWeekforSequenceFieldID = 0L;
+      BaseTLVType dayOfWeekforSequencetlvValue = new UIntType(dayOfWeekforSequence);
+      elements.add(new StructElement(dayOfWeekforSequenceFieldID, dayOfWeekforSequencetlvValue));
 
-  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 512L;
+      final long chargingTargetsFieldID = 1L;
+      BaseTLVType chargingTargetstlvValue = ArrayType.generateArrayType(chargingTargets, (elementchargingTargets) -> elementchargingTargets.encodeTlv());
+      elements.add(new StructElement(chargingTargetsFieldID, chargingTargetstlvValue));
 
-    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface MaxPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void getTargets(GetTargetsResponseCallback callback, Integer daysToReturn, int timedInvokeTimeoutMs) {
+      final long commandId = 6L;
 
-    public interface MaxSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long daysToReturnFieldID = 0L;
+      BaseTLVType daysToReturntlvValue = new UIntType(daysToReturn);
+      elements.add(new StructElement(daysToReturnFieldID, daysToReturntlvValue));
 
-    public interface MaxFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long dayOfWeekforSequenceFieldID = 0L;
+          Integer dayOfWeekforSequence = null;
+          final long chargingTargetsFieldID = 1L;
+          ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == dayOfWeekforSequenceFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                dayOfWeekforSequence = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == chargingTargetsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                chargingTargets = castingValue.map((elementcastingValue) -> ChipStructs.EnergyEvseClusterChargingTargetStruct.decodeTlv(elementcastingValue));
+              }
+            }
+          }
+          callback.onSuccess(dayOfWeekforSequence, chargingTargets);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface MinConstPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
 
-    public interface MaxConstPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void clearTargets(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface MinCompPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetTargetsResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer dayOfWeekforSequence, ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets);
     }
 
-    public interface MaxCompPressureAttributeCallback {
+    public interface StateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinConstSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface ChargingEnabledUntilAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface MaxConstSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface DischargingEnabledUntilAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface MinConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface NextChargeStartTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface MaxConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface NextChargeTargetTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface MinConstTempAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface NextChargeRequiredEnergyAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface MaxConstTempAttributeCallback {
+    public interface NextChargeTargetSoCAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CapacityAttributeCallback {
+    public interface ApproximateEVEfficiencyAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SpeedAttributeCallback {
+    public interface StateOfChargeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LifetimeRunningHoursAttributeCallback {
+    public interface BatteryCapacityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PowerAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface VehicleIDAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable String value);
     }
 
-    public interface LifetimeEnergyConsumedAttributeCallback {
+    public interface SessionIDAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readMaxPressureAttribute(
-        MaxPressureAttributeCallback callback) {
-        readMaxPressureAttribute(chipClusterPtr, callback);
-    }
+    public void readStateAttribute(
+        StateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
 
-    public void subscribeMaxPressureAttribute(
-        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATE_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxSpeedAttribute(
-        MaxSpeedAttributeCallback callback) {
-        readMaxSpeedAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeStateAttribute(
+        StateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_ATTRIBUTE_ID);
 
-    public void subscribeMaxSpeedAttribute(
-        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxFlowAttribute(
-        MaxFlowAttributeCallback callback) {
-        readMaxFlowAttribute(chipClusterPtr, callback);
+    public void readSupplyStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPLY_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPLY_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxFlowAttribute(
-        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSupplyStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPLY_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPLY_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinConstPressureAttribute(
-        MinConstPressureAttributeCallback callback) {
-        readMinConstPressureAttribute(chipClusterPtr, callback);
+    public void readFaultStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAULT_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FAULT_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinConstPressureAttribute(
-        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFaultStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAULT_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FAULT_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxConstPressureAttribute(
-        MaxConstPressureAttributeCallback callback) {
-        readMaxConstPressureAttribute(chipClusterPtr, callback);
+    public void readChargingEnabledUntilAttribute(
+        ChargingEnabledUntilAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHARGING_ENABLED_UNTIL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHARGING_ENABLED_UNTIL_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxConstPressureAttribute(
-        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeChargingEnabledUntilAttribute(
+        ChargingEnabledUntilAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHARGING_ENABLED_UNTIL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHARGING_ENABLED_UNTIL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinCompPressureAttribute(
-        MinCompPressureAttributeCallback callback) {
-        readMinCompPressureAttribute(chipClusterPtr, callback);
+    public void readDischargingEnabledUntilAttribute(
+        DischargingEnabledUntilAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DISCHARGING_ENABLED_UNTIL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DISCHARGING_ENABLED_UNTIL_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinCompPressureAttribute(
-        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDischargingEnabledUntilAttribute(
+        DischargingEnabledUntilAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DISCHARGING_ENABLED_UNTIL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DISCHARGING_ENABLED_UNTIL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxCompPressureAttribute(
-        MaxCompPressureAttributeCallback callback) {
-        readMaxCompPressureAttribute(chipClusterPtr, callback);
+    public void readCircuitCapacityAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CIRCUIT_CAPACITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CIRCUIT_CAPACITY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxCompPressureAttribute(
-        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCircuitCapacityAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CIRCUIT_CAPACITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CIRCUIT_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinConstSpeedAttribute(
-        MinConstSpeedAttributeCallback callback) {
-        readMinConstSpeedAttribute(chipClusterPtr, callback);
+    public void readMinimumChargeCurrentAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MINIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MINIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinConstSpeedAttribute(
-        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinimumChargeCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MINIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MINIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxConstSpeedAttribute(
-        MaxConstSpeedAttributeCallback callback) {
-        readMaxConstSpeedAttribute(chipClusterPtr, callback);
+    public void readMaximumChargeCurrentAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxConstSpeedAttribute(
-        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaximumChargeCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinConstFlowAttribute(
-        MinConstFlowAttributeCallback callback) {
-        readMinConstFlowAttribute(chipClusterPtr, callback);
+    public void readMaximumDischargeCurrentAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAXIMUM_DISCHARGE_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAXIMUM_DISCHARGE_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinConstFlowAttribute(
-        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaximumDischargeCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAXIMUM_DISCHARGE_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAXIMUM_DISCHARGE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxConstFlowAttribute(
-        MaxConstFlowAttributeCallback callback) {
-        readMaxConstFlowAttribute(chipClusterPtr, callback);
+    public void readUserMaximumChargeCurrentAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxConstFlowAttribute(
-        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUserMaximumChargeCurrentAttribute(DefaultClusterCallback callback, Long value) {
+      writeUserMaximumChargeCurrentAttribute(callback, value, 0);
     }
 
-    public void readMinConstTempAttribute(
-        MinConstTempAttributeCallback callback) {
-        readMinConstTempAttribute(chipClusterPtr, callback);
+    public void writeUserMaximumChargeCurrentAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMinConstTempAttribute(
-        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeUserMaximumChargeCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, USER_MAXIMUM_CHARGE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxConstTempAttribute(
-        MaxConstTempAttributeCallback callback) {
-        readMaxConstTempAttribute(chipClusterPtr, callback);
+    public void readRandomizationDelayWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxConstTempAttribute(
-        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRandomizationDelayWindowAttribute(DefaultClusterCallback callback, Long value) {
+      writeRandomizationDelayWindowAttribute(callback, value, 0);
     }
 
-    public void readPumpStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readPumpStatusAttribute(chipClusterPtr, callback);
+    public void writeRandomizationDelayWindowAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePumpStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRandomizationDelayWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RANDOMIZATION_DELAY_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEffectiveOperationModeAttribute(
+    public void readNumberOfWeeklyTargetsAttribute(
         IntegerAttributeCallback callback) {
-        readEffectiveOperationModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TARGETS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_WEEKLY_TARGETS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeEffectiveOperationModeAttribute(
+    public void subscribeNumberOfWeeklyTargetsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEffectiveOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TARGETS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_WEEKLY_TARGETS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEffectiveControlModeAttribute(
+    public void readNumberOfDailyTargetsAttribute(
         IntegerAttributeCallback callback) {
-        readEffectiveControlModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TARGETS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_DAILY_TARGETS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeEffectiveControlModeAttribute(
+    public void subscribeNumberOfDailyTargetsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEffectiveControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TARGETS_ATTRIBUTE_ID);
 
-    public void readCapacityAttribute(
-        CapacityAttributeCallback callback) {
-        readCapacityAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_DAILY_TARGETS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeCapacityAttribute(
-        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readNextChargeStartTimeAttribute(
+        NextChargeStartTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_START_TIME_ATTRIBUTE_ID);
 
-    public void readSpeedAttribute(
-        SpeedAttributeCallback callback) {
-        readSpeedAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEXT_CHARGE_START_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSpeedAttribute(
-        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeNextChargeStartTimeAttribute(
+        NextChargeStartTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_START_TIME_ATTRIBUTE_ID);
 
-    public void readLifetimeRunningHoursAttribute(
-        LifetimeRunningHoursAttributeCallback callback) {
-        readLifetimeRunningHoursAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEXT_CHARGE_START_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNextChargeTargetTimeAttribute(
+        NextChargeTargetTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID);
 
-    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLifetimeRunningHoursAttribute(
-        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLifetimeRunningHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNextChargeTargetTimeAttribute(
+        NextChargeTargetTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPowerAttribute(
-        PowerAttributeCallback callback) {
-        readPowerAttribute(chipClusterPtr, callback);
+    public void readNextChargeRequiredEnergyAttribute(
+        NextChargeRequiredEnergyAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePowerAttribute(
-        PowerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNextChargeRequiredEnergyAttribute(
+        NextChargeRequiredEnergyAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback) {
-        readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
+    public void readNextChargeTargetSoCAttribute(
+        NextChargeTargetSoCAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID, true);
     }
 
-    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
-        writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeNextChargeTargetSoCAttribute(
+        NextChargeTargetSoCAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readApproximateEVEfficiencyAttribute(
+        ApproximateEVEfficiencyAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeApproximateEVEfficiencyAttribute(DefaultClusterCallback callback, Integer value) {
+      writeApproximateEVEfficiencyAttribute(callback, value, 0);
     }
 
-    public void readOperationModeAttribute(
-        IntegerAttributeCallback callback) {
-        readOperationModeAttribute(chipClusterPtr, callback);
+    public void writeApproximateEVEfficiencyAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOperationModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeApproximateEVEfficiencyAttribute(
+        ApproximateEVEfficiencyAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readStateOfChargeAttribute(
+        StateOfChargeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_OF_CHARGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATE_OF_CHARGE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStateOfChargeAttribute(
+        StateOfChargeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATE_OF_CHARGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATE_OF_CHARGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readControlModeAttribute(
-        IntegerAttributeCallback callback) {
-        readControlModeAttribute(chipClusterPtr, callback);
+    public void readBatteryCapacityAttribute(
+        BatteryCapacityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_CAPACITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BATTERY_CAPACITY_ATTRIBUTE_ID, true);
     }
 
-    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeControlModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeBatteryCapacityAttribute(
+        BatteryCapacityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_CAPACITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BATTERY_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeControlModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readVehicleIDAttribute(
+        VehicleIDAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VEHICLE_I_D_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeControlModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeVehicleIDAttribute(
+        VehicleIDAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VEHICLE_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSessionIDAttribute(
+        SessionIDAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SESSION_I_D_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeSessionIDAttribute(
+        SessionIDAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_I_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SESSION_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSessionDurationAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_DURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SESSION_DURATION_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeSessionDurationAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SESSION_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSessionEnergyChargedAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ENERGY_CHARGED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SESSION_ENERGY_CHARGED_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeSessionEnergyChargedAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ENERGY_CHARGED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SESSION_ENERGY_CHARGED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSessionEnergyDischargedAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeSessionEnergyDischargedAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
+
+  public static class DoorLockCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 257L;
+
+    private static final long LOCK_STATE_ATTRIBUTE_ID = 0L;
+    private static final long LOCK_TYPE_ATTRIBUTE_ID = 1L;
+    private static final long ACTUATOR_ENABLED_ATTRIBUTE_ID = 2L;
+    private static final long DOOR_STATE_ATTRIBUTE_ID = 3L;
+    private static final long DOOR_OPEN_EVENTS_ATTRIBUTE_ID = 4L;
+    private static final long DOOR_CLOSED_EVENTS_ATTRIBUTE_ID = 5L;
+    private static final long OPEN_PERIOD_ATTRIBUTE_ID = 6L;
+    private static final long NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID = 17L;
+    private static final long NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID = 18L;
+    private static final long NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID = 19L;
+    private static final long NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID = 20L;
+    private static final long NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID = 21L;
+    private static final long NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID = 22L;
+    private static final long MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID = 23L;
+    private static final long MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID = 24L;
+    private static final long MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID = 25L;
+    private static final long MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID = 26L;
+    private static final long CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID = 27L;
+    private static final long NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID = 28L;
+    private static final long LANGUAGE_ATTRIBUTE_ID = 33L;
+    private static final long L_E_D_SETTINGS_ATTRIBUTE_ID = 34L;
+    private static final long AUTO_RELOCK_TIME_ATTRIBUTE_ID = 35L;
+    private static final long SOUND_VOLUME_ATTRIBUTE_ID = 36L;
+    private static final long OPERATING_MODE_ATTRIBUTE_ID = 37L;
+    private static final long SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID = 38L;
+    private static final long DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID = 39L;
+    private static final long ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID = 40L;
+    private static final long ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID = 41L;
+    private static final long ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID = 42L;
+    private static final long ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID = 43L;
+    private static final long LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID = 44L;
+    private static final long WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID = 48L;
+    private static final long USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID = 49L;
+    private static final long SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID = 50L;
+    private static final long REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID = 51L;
+    private static final long EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID = 53L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public DoorLockCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
+
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    private native void readMaxPressureAttribute(long chipClusterPtr, MaxPressureAttributeCallback callback);
 
-    private native void subscribeMaxPressureAttribute(long chipClusterPtr, MaxPressureAttributeCallback callback, int minInterval, int maxInterval);
+    public void lockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long PINCodeFieldID = 0L;
+      BaseTLVType PINCodetlvValue = PINCode.<BaseTLVType>map((nonOptionalPINCode) -> new ByteArrayType(nonOptionalPINCode)).orElse(new EmptyType());
+      elements.add(new StructElement(PINCodeFieldID, PINCodetlvValue));
 
-    private native void readMaxSpeedAttribute(long chipClusterPtr, MaxSpeedAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeMaxSpeedAttribute(long chipClusterPtr, MaxSpeedAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxFlowAttribute(long chipClusterPtr, MaxFlowAttributeCallback callback);
+    public void unlockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeMaxFlowAttribute(long chipClusterPtr, MaxFlowAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long PINCodeFieldID = 0L;
+      BaseTLVType PINCodetlvValue = PINCode.<BaseTLVType>map((nonOptionalPINCode) -> new ByteArrayType(nonOptionalPINCode)).orElse(new EmptyType());
+      elements.add(new StructElement(PINCodeFieldID, PINCodetlvValue));
 
-    private native void readMinConstPressureAttribute(long chipClusterPtr, MinConstPressureAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeMinConstPressureAttribute(long chipClusterPtr, MinConstPressureAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxConstPressureAttribute(long chipClusterPtr, MaxConstPressureAttributeCallback callback);
+    public void unlockWithTimeout(DefaultClusterCallback callback, Integer timeout, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void subscribeMaxConstPressureAttribute(long chipClusterPtr, MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeoutFieldID = 0L;
+      BaseTLVType timeouttlvValue = new UIntType(timeout);
+      elements.add(new StructElement(timeoutFieldID, timeouttlvValue));
 
-    private native void readMinCompPressureAttribute(long chipClusterPtr, MinCompPressureAttributeCallback callback);
+      final long PINCodeFieldID = 1L;
+      BaseTLVType PINCodetlvValue = PINCode.<BaseTLVType>map((nonOptionalPINCode) -> new ByteArrayType(nonOptionalPINCode)).orElse(new EmptyType());
+      elements.add(new StructElement(PINCodeFieldID, PINCodetlvValue));
 
-    private native void subscribeMinCompPressureAttribute(long chipClusterPtr, MinCompPressureAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readMaxCompPressureAttribute(long chipClusterPtr, MaxCompPressureAttributeCallback callback);
+    public void setWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute) {
+      setWeekDaySchedule(callback, weekDayIndex, userIndex, daysMask, startHour, startMinute, endHour, endMinute, 0);
+    }
 
-    private native void subscribeMaxCompPressureAttribute(long chipClusterPtr, MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval);
+    public void setWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute, int timedInvokeTimeoutMs) {
+      final long commandId = 11L;
 
-    private native void readMinConstSpeedAttribute(long chipClusterPtr, MinConstSpeedAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long weekDayIndexFieldID = 0L;
+      BaseTLVType weekDayIndextlvValue = new UIntType(weekDayIndex);
+      elements.add(new StructElement(weekDayIndexFieldID, weekDayIndextlvValue));
 
-    private native void subscribeMinConstSpeedAttribute(long chipClusterPtr, MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void readMaxConstSpeedAttribute(long chipClusterPtr, MaxConstSpeedAttributeCallback callback);
+      final long daysMaskFieldID = 2L;
+      BaseTLVType daysMasktlvValue = new UIntType(daysMask);
+      elements.add(new StructElement(daysMaskFieldID, daysMasktlvValue));
 
-    private native void subscribeMaxConstSpeedAttribute(long chipClusterPtr, MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval);
+      final long startHourFieldID = 3L;
+      BaseTLVType startHourtlvValue = new UIntType(startHour);
+      elements.add(new StructElement(startHourFieldID, startHourtlvValue));
 
-    private native void readMinConstFlowAttribute(long chipClusterPtr, MinConstFlowAttributeCallback callback);
+      final long startMinuteFieldID = 4L;
+      BaseTLVType startMinutetlvValue = new UIntType(startMinute);
+      elements.add(new StructElement(startMinuteFieldID, startMinutetlvValue));
 
-    private native void subscribeMinConstFlowAttribute(long chipClusterPtr, MinConstFlowAttributeCallback callback, int minInterval, int maxInterval);
+      final long endHourFieldID = 5L;
+      BaseTLVType endHourtlvValue = new UIntType(endHour);
+      elements.add(new StructElement(endHourFieldID, endHourtlvValue));
 
-    private native void readMaxConstFlowAttribute(long chipClusterPtr, MaxConstFlowAttributeCallback callback);
+      final long endMinuteFieldID = 6L;
+      BaseTLVType endMinutetlvValue = new UIntType(endMinute);
+      elements.add(new StructElement(endMinuteFieldID, endMinutetlvValue));
 
-    private native void subscribeMaxConstFlowAttribute(long chipClusterPtr, MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readMinConstTempAttribute(long chipClusterPtr, MinConstTempAttributeCallback callback);
+    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
+      getWeekDaySchedule(callback, weekDayIndex, userIndex, 0);
+    }
 
-    private native void subscribeMinConstTempAttribute(long chipClusterPtr, MinConstTempAttributeCallback callback, int minInterval, int maxInterval);
+    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 12L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long weekDayIndexFieldID = 0L;
+      BaseTLVType weekDayIndextlvValue = new UIntType(weekDayIndex);
+      elements.add(new StructElement(weekDayIndexFieldID, weekDayIndextlvValue));
+
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long weekDayIndexFieldID = 0L;
+          Integer weekDayIndex = null;
+          final long userIndexFieldID = 1L;
+          Integer userIndex = null;
+          final long statusFieldID = 2L;
+          Integer status = null;
+          final long daysMaskFieldID = 3L;
+          Optional<Integer> daysMask = Optional.empty();
+          final long startHourFieldID = 4L;
+          Optional<Integer> startHour = Optional.empty();
+          final long startMinuteFieldID = 5L;
+          Optional<Integer> startMinute = Optional.empty();
+          final long endHourFieldID = 6L;
+          Optional<Integer> endHour = Optional.empty();
+          final long endMinuteFieldID = 7L;
+          Optional<Integer> endMinute = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == weekDayIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                weekDayIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == userIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == daysMaskFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                daysMask = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == startHourFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                startHour = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == startMinuteFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                startMinute = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == endHourFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                endHour = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == endMinuteFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                endMinute = Optional.of(castingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, endMinute);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readMaxConstTempAttribute(long chipClusterPtr, MaxConstTempAttributeCallback callback);
+    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
+      clearWeekDaySchedule(callback, weekDayIndex, userIndex, 0);
+    }
 
-    private native void subscribeMaxConstTempAttribute(long chipClusterPtr, MaxConstTempAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 13L;
 
-    private native void readPumpStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long weekDayIndexFieldID = 0L;
+      BaseTLVType weekDayIndextlvValue = new UIntType(weekDayIndex);
+      elements.add(new StructElement(weekDayIndexFieldID, weekDayIndextlvValue));
 
-    private native void subscribePumpStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void readEffectiveOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeEffectiveOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void setYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime) {
+      setYearDaySchedule(callback, yearDayIndex, userIndex, localStartTime, localEndTime, 0);
+    }
 
-    private native void readEffectiveControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void setYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime, int timedInvokeTimeoutMs) {
+      final long commandId = 14L;
 
-    private native void subscribeEffectiveControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long yearDayIndexFieldID = 0L;
+      BaseTLVType yearDayIndextlvValue = new UIntType(yearDayIndex);
+      elements.add(new StructElement(yearDayIndexFieldID, yearDayIndextlvValue));
 
-    private native void readCapacityAttribute(long chipClusterPtr, CapacityAttributeCallback callback);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void subscribeCapacityAttribute(long chipClusterPtr, CapacityAttributeCallback callback, int minInterval, int maxInterval);
+      final long localStartTimeFieldID = 2L;
+      BaseTLVType localStartTimetlvValue = new UIntType(localStartTime);
+      elements.add(new StructElement(localStartTimeFieldID, localStartTimetlvValue));
 
-    private native void readSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback callback);
+      final long localEndTimeFieldID = 3L;
+      BaseTLVType localEndTimetlvValue = new UIntType(localEndTime);
+      elements.add(new StructElement(localEndTimeFieldID, localEndTimetlvValue));
 
-    private native void subscribeSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readLifetimeRunningHoursAttribute(long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback);
+    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
+      getYearDaySchedule(callback, yearDayIndex, userIndex, 0);
+    }
 
-    private native void writeLifetimeRunningHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 15L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long yearDayIndexFieldID = 0L;
+      BaseTLVType yearDayIndextlvValue = new UIntType(yearDayIndex);
+      elements.add(new StructElement(yearDayIndexFieldID, yearDayIndextlvValue));
+
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long yearDayIndexFieldID = 0L;
+          Integer yearDayIndex = null;
+          final long userIndexFieldID = 1L;
+          Integer userIndex = null;
+          final long statusFieldID = 2L;
+          Integer status = null;
+          final long localStartTimeFieldID = 3L;
+          Optional<Long> localStartTime = Optional.empty();
+          final long localEndTimeFieldID = 4L;
+          Optional<Long> localEndTime = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == yearDayIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                yearDayIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == userIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == localStartTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                localStartTime = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == localEndTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                localEndTime = Optional.of(castingValue.value(Long.class));
+              }
+            }
+          }
+          callback.onSuccess(yearDayIndex, userIndex, status, localStartTime, localEndTime);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeLifetimeRunningHoursAttribute(long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
+      clearYearDaySchedule(callback, yearDayIndex, userIndex, 0);
+    }
 
-    private native void readPowerAttribute(long chipClusterPtr, PowerAttributeCallback callback);
+    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 16L;
 
-    private native void subscribePowerAttribute(long chipClusterPtr, PowerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long yearDayIndexFieldID = 0L;
+      BaseTLVType yearDayIndextlvValue = new UIntType(yearDayIndex);
+      elements.add(new StructElement(yearDayIndexFieldID, yearDayIndextlvValue));
 
-    private native void readLifetimeEnergyConsumedAttribute(long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void writeLifetimeEnergyConsumedAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeLifetimeEnergyConsumedAttribute(long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval);
+    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode) {
+      setHolidaySchedule(callback, holidayIndex, localStartTime, localEndTime, operatingMode, 0);
+    }
 
-    private native void readOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, int timedInvokeTimeoutMs) {
+      final long commandId = 17L;
 
-    private native void writeOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long holidayIndexFieldID = 0L;
+      BaseTLVType holidayIndextlvValue = new UIntType(holidayIndex);
+      elements.add(new StructElement(holidayIndexFieldID, holidayIndextlvValue));
 
-    private native void subscribeOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long localStartTimeFieldID = 1L;
+      BaseTLVType localStartTimetlvValue = new UIntType(localStartTime);
+      elements.add(new StructElement(localStartTimeFieldID, localStartTimetlvValue));
 
-    private native void readControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long localEndTimeFieldID = 2L;
+      BaseTLVType localEndTimetlvValue = new UIntType(localEndTime);
+      elements.add(new StructElement(localEndTimeFieldID, localEndTimetlvValue));
 
-    private native void writeControlModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      final long operatingModeFieldID = 3L;
+      BaseTLVType operatingModetlvValue = new UIntType(operatingMode);
+      elements.add(new StructElement(operatingModeFieldID, operatingModetlvValue));
 
-    private native void subscribeControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
+      getHolidaySchedule(callback, holidayIndex, 0);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 18L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long holidayIndexFieldID = 0L;
+      BaseTLVType holidayIndextlvValue = new UIntType(holidayIndex);
+      elements.add(new StructElement(holidayIndexFieldID, holidayIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long holidayIndexFieldID = 0L;
+          Integer holidayIndex = null;
+          final long statusFieldID = 1L;
+          Integer status = null;
+          final long localStartTimeFieldID = 2L;
+          Optional<Long> localStartTime = Optional.empty();
+          final long localEndTimeFieldID = 3L;
+          Optional<Long> localEndTime = Optional.empty();
+          final long operatingModeFieldID = 4L;
+          Optional<Integer> operatingMode = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == holidayIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                holidayIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == localStartTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                localStartTime = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == localEndTimeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                localEndTime = Optional.of(castingValue.value(Long.class));
+              }
+            } else if (element.contextTagNum() == operatingModeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                operatingMode = Optional.of(castingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(holidayIndex, status, localStartTime, localEndTime, operatingMode);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
+      clearHolidaySchedule(callback, holidayIndex, 0);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 19L;
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long holidayIndexFieldID = 0L;
+      BaseTLVType holidayIndextlvValue = new UIntType(holidayIndex);
+      elements.add(new StructElement(holidayIndexFieldID, holidayIndextlvValue));
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void setUser(DefaultClusterCallback callback, Integer operationType, Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, int timedInvokeTimeoutMs) {
+      final long commandId = 26L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long operationTypeFieldID = 0L;
+      BaseTLVType operationTypetlvValue = new UIntType(operationType);
+      elements.add(new StructElement(operationTypeFieldID, operationTypetlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long userNameFieldID = 2L;
+      BaseTLVType userNametlvValue = userName != null ? new StringType(userName) : new NullType();
+      elements.add(new StructElement(userNameFieldID, userNametlvValue));
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      final long userUniqueIDFieldID = 3L;
+      BaseTLVType userUniqueIDtlvValue = userUniqueID != null ? new UIntType(userUniqueID) : new NullType();
+      elements.add(new StructElement(userUniqueIDFieldID, userUniqueIDtlvValue));
 
-  public static class ThermostatCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 513L;
+      final long userStatusFieldID = 4L;
+      BaseTLVType userStatustlvValue = userStatus != null ? new UIntType(userStatus) : new NullType();
+      elements.add(new StructElement(userStatusFieldID, userStatustlvValue));
 
-    public ThermostatCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+      final long userTypeFieldID = 5L;
+      BaseTLVType userTypetlvValue = userType != null ? new UIntType(userType) : new NullType();
+      elements.add(new StructElement(userTypeFieldID, userTypetlvValue));
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+      final long credentialRuleFieldID = 6L;
+      BaseTLVType credentialRuletlvValue = credentialRule != null ? new UIntType(credentialRule) : new NullType();
+      elements.add(new StructElement(credentialRuleFieldID, credentialRuletlvValue));
 
-    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, null);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, timedInvokeTimeoutMs);
+    public void getUser(GetUserResponseCallback callback, Integer userIndex) {
+      getUser(callback, userIndex, 0);
     }
 
-    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
-      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, null);
+    public void getUser(GetUserResponseCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 27L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long userIndexFieldID = 0L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long userIndexFieldID = 0L;
+          Integer userIndex = null;
+          final long userNameFieldID = 1L;
+          @Nullable String userName = null;
+          final long userUniqueIDFieldID = 2L;
+          @Nullable Long userUniqueID = null;
+          final long userStatusFieldID = 3L;
+          @Nullable Integer userStatus = null;
+          final long userTypeFieldID = 4L;
+          @Nullable Integer userType = null;
+          final long credentialRuleFieldID = 5L;
+          @Nullable Integer credentialRule = null;
+          final long credentialsFieldID = 6L;
+          @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> credentials = null;
+          final long creatorFabricIndexFieldID = 7L;
+          @Nullable Integer creatorFabricIndex = null;
+          final long lastModifiedFabricIndexFieldID = 8L;
+          @Nullable Integer lastModifiedFabricIndex = null;
+          final long nextUserIndexFieldID = 9L;
+          @Nullable Integer nextUserIndex = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == userIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == userNameFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                userName = castingValue.value(String.class);
+              }
+            } else if (element.contextTagNum() == userUniqueIDFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userUniqueID = castingValue.value(Long.class);
+              }
+            } else if (element.contextTagNum() == userStatusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userStatus = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == userTypeFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userType = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == credentialRuleFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                credentialRule = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == credentialsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                credentials = castingValue.map((elementcastingValue) -> ChipStructs.DoorLockClusterCredentialStruct.decodeTlv(elementcastingValue));
+              }
+            } else if (element.contextTagNum() == creatorFabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                creatorFabricIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == lastModifiedFabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                lastModifiedFabricIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == nextUserIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                nextUserIndex = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(userIndex, userName, userUniqueID, userStatus, userType, credentialRule, credentials, creatorFabricIndex, lastModifiedFabricIndex, nextUserIndex);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions, int timedInvokeTimeoutMs) {
-      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, timedInvokeTimeoutMs);
-    }
 
-    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, null);
-    }
+    public void clearUser(DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 29L;
 
-    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn, int timedInvokeTimeoutMs) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long userIndexFieldID = 0L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void clearWeeklySchedule(DefaultClusterCallback callback) {
-      clearWeeklySchedule(chipClusterPtr, callback, null);
+
+    public void setCredential(SetCredentialResponseCallback callback, Integer operationType, ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @Nullable Integer userType, int timedInvokeTimeoutMs) {
+      final long commandId = 34L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long operationTypeFieldID = 0L;
+      BaseTLVType operationTypetlvValue = new UIntType(operationType);
+      elements.add(new StructElement(operationTypeFieldID, operationTypetlvValue));
+
+      final long credentialFieldID = 1L;
+      BaseTLVType credentialtlvValue = credential.encodeTlv();
+      elements.add(new StructElement(credentialFieldID, credentialtlvValue));
+
+      final long credentialDataFieldID = 2L;
+      BaseTLVType credentialDatatlvValue = new ByteArrayType(credentialData);
+      elements.add(new StructElement(credentialDataFieldID, credentialDatatlvValue));
+
+      final long userIndexFieldID = 3L;
+      BaseTLVType userIndextlvValue = userIndex != null ? new UIntType(userIndex) : new NullType();
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
+
+      final long userStatusFieldID = 4L;
+      BaseTLVType userStatustlvValue = userStatus != null ? new UIntType(userStatus) : new NullType();
+      elements.add(new StructElement(userStatusFieldID, userStatustlvValue));
+
+      final long userTypeFieldID = 5L;
+      BaseTLVType userTypetlvValue = userType != null ? new UIntType(userType) : new NullType();
+      elements.add(new StructElement(userTypeFieldID, userTypetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long userIndexFieldID = 1L;
+          @Nullable Integer userIndex = null;
+          final long nextCredentialIndexFieldID = 2L;
+          @Nullable Integer nextCredentialIndex = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == userIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == nextCredentialIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                nextCredentialIndex = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status, userIndex, nextCredentialIndex);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void clearWeeklySchedule(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      clearWeeklySchedule(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential) {
+      getCredentialStatus(callback, credential, 0);
     }
 
-    private native void setpointRaiseLower(long chipClusterPtr, DefaultClusterCallback callback, Integer mode, Integer amount, @Nullable Integer timedInvokeTimeoutMs);
+    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
+      final long commandId = 36L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long credentialFieldID = 0L;
+      BaseTLVType credentialtlvValue = credential.encodeTlv();
+      elements.add(new StructElement(credentialFieldID, credentialtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long credentialExistsFieldID = 0L;
+          Boolean credentialExists = null;
+          final long userIndexFieldID = 1L;
+          @Nullable Integer userIndex = null;
+          final long creatorFabricIndexFieldID = 2L;
+          @Nullable Integer creatorFabricIndex = null;
+          final long lastModifiedFabricIndexFieldID = 3L;
+          @Nullable Integer lastModifiedFabricIndex = null;
+          final long nextCredentialIndexFieldID = 4L;
+          @Nullable Integer nextCredentialIndex = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == credentialExistsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                credentialExists = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == userIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                userIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == creatorFabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                creatorFabricIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == lastModifiedFabricIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                lastModifiedFabricIndex = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == nextCredentialIndexFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                nextCredentialIndex = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, nextCredentialIndex);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void setWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions, @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void getWeeklySchedule(long chipClusterPtr, GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn, @Nullable Integer timedInvokeTimeoutMs);
+    public void clearCredential(DefaultClusterCallback callback, @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
+      final long commandId = 38L;
 
-    private native void clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long credentialFieldID = 0L;
+      BaseTLVType credentialtlvValue = credential != null ? credential.encodeTlv() : new NullType();
+      elements.add(new StructElement(credentialFieldID, credentialtlvValue));
 
-    public interface GetWeeklyScheduleResponseCallback {
-      void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
-      void onError(Exception error);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface LocalTemperatureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
 
-    public interface OutdoorTemperatureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void unboltDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 39L;
 
-    public interface TemperatureSetpointHoldDurationAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long PINCodeFieldID = 0L;
+      BaseTLVType PINCodetlvValue = PINCode.<BaseTLVType>map((nonOptionalPINCode) -> new ByteArrayType(nonOptionalPINCode)).orElse(new EmptyType());
+      elements.add(new StructElement(PINCodeFieldID, PINCodetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface SetpointChangeAmountAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetWeekDayScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer weekDayIndex, Integer userIndex, Integer status, Optional<Integer> daysMask, Optional<Integer> startHour, Optional<Integer> startMinute, Optional<Integer> endHour, Optional<Integer> endMinute);
     }
 
-    public interface OccupiedSetbackAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetYearDayScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime);
     }
 
-    public interface OccupiedSetbackMinAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetHolidayScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode);
     }
 
-    public interface OccupiedSetbackMaxAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetUserResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> credentials, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextUserIndex);
     }
 
-    public interface UnoccupiedSetbackAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface SetCredentialResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
     }
 
-    public interface UnoccupiedSetbackMinAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface GetCredentialStatusResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);
     }
 
-    public interface UnoccupiedSetbackMaxAttributeCallback {
+    public interface LockStateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ACCoilTemperatureAttributeCallback {
+    public interface DoorStateAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readLocalTemperatureAttribute(
-        LocalTemperatureAttributeCallback callback) {
-        readLocalTemperatureAttribute(chipClusterPtr, callback);
-    }
+    public void readLockStateAttribute(
+        LockStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_STATE_ATTRIBUTE_ID);
 
-    public void subscribeLocalTemperatureAttribute(
-        LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCK_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void readOutdoorTemperatureAttribute(
-        OutdoorTemperatureAttributeCallback callback) {
-        readOutdoorTemperatureAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLockStateAttribute(
+        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_STATE_ATTRIBUTE_ID);
 
-    public void subscribeOutdoorTemperatureAttribute(
-        OutdoorTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOutdoorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCK_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOccupancyAttribute(
+    public void readLockTypeAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCK_TYPE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupancyAttribute(
+    public void subscribeLockTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCK_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAbsMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readActuatorEnabledAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTUATOR_ENABLED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTUATOR_ENABLED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAbsMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeActuatorEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTUATOR_ENABLED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTUATOR_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAbsMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readDoorStateAttribute(
+        DoorStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DOOR_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAbsMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDoorStateAttribute(
+        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DOOR_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAbsMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readDoorOpenEventsAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_OPEN_EVENTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DOOR_OPEN_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAbsMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorOpenEventsAttribute(callback, value, 0);
     }
 
-    public void readAbsMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DOOR_OPEN_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAbsMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDoorOpenEventsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_OPEN_EVENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DOOR_OPEN_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPICoolingDemandAttribute(
-        IntegerAttributeCallback callback) {
-        readPICoolingDemandAttribute(chipClusterPtr, callback);
+    public void readDoorClosedEventsAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_CLOSED_EVENTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DOOR_CLOSED_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePICoolingDemandAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePICoolingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorClosedEventsAttribute(callback, value, 0);
     }
 
-    public void readPIHeatingDemandAttribute(
-        IntegerAttributeCallback callback) {
-        readPIHeatingDemandAttribute(chipClusterPtr, callback);
+    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), DOOR_CLOSED_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePIHeatingDemandAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIHeatingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDoorClosedEventsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_CLOSED_EVENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DOOR_CLOSED_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readHVACSystemTypeConfigurationAttribute(
+    public void readOpenPeriodAttribute(
         IntegerAttributeCallback callback) {
-        readHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_PERIOD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPEN_PERIOD_ATTRIBUTE_ID, true);
     }
 
-    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, null);
+    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenPeriodAttribute(callback, value, 0);
     }
 
-    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPEN_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeHVACSystemTypeConfigurationAttribute(
+    public void subscribeOpenPeriodAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_PERIOD_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPEN_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLocalTemperatureCalibrationAttribute(
+    public void readNumberOfTotalUsersSupportedAttribute(
         IntegerAttributeCallback callback) {
-        readLocalTemperatureCalibrationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeNumberOfTotalUsersSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readNumberOfPINUsersSupportedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLocalTemperatureCalibrationAttribute(
+    public void subscribeNumberOfPINUsersSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOccupiedCoolingSetpointAttribute(
+    public void readNumberOfRFIDUsersSupportedAttribute(
         IntegerAttributeCallback callback) {
-        readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID);
 
-    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeOccupiedCoolingSetpointAttribute(
+    public void subscribeNumberOfRFIDUsersSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID);
 
-    public void readOccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupiedHeatingSetpointAttribute(
+    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void readUnoccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUnoccupiedCoolingSetpointAttribute(
+    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void readUnoccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfHolidaySchedulesSupportedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID);
 
-    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUnoccupiedHeatingSetpointAttribute(
+    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinHeatSetpointLimitAttribute(
+    public void readMaxPINCodeLengthAttribute(
         IntegerAttributeCallback callback) {
-        readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, true);
     }
 
-    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMaxPINCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMinPINCodeLengthAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinHeatSetpointLimitAttribute(
+    public void subscribeMinPINCodeLengthAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxHeatSetpointLimitAttribute(
+    public void readMaxRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback) {
-        readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, true);
     }
 
-    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMaxRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMinRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxHeatSetpointLimitAttribute(
+    public void subscribeMinRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinCoolSetpointLimitAttribute(
+    public void readCredentialRulesSupportAttribute(
         IntegerAttributeCallback callback) {
-        readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID, true);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeCredentialRulesSupportAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readNumberOfCredentialsSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinCoolSetpointLimitAttribute(
+    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readLanguageAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LANGUAGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LANGUAGE_ATTRIBUTE_ID, true);
     }
 
-    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
+      writeLanguageAttribute(callback, value, 0);
     }
 
-    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LANGUAGE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLanguageAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LANGUAGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LANGUAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinSetpointDeadBandAttribute(
+    public void readLEDSettingsAttribute(
         IntegerAttributeCallback callback) {
-        readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, L_E_D_SETTINGS_ATTRIBUTE_ID, true);
     }
 
-    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, null);
+    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLEDSettingsAttribute(callback, value, 0);
     }
 
-    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), L_E_D_SETTINGS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMinSetpointDeadBandAttribute(
+    public void subscribeLEDSettingsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinSetpointDeadBandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, L_E_D_SETTINGS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRemoteSensingAttribute(
-        IntegerAttributeCallback callback) {
-        readRemoteSensingAttribute(chipClusterPtr, callback);
+    public void readAutoRelockTimeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_RELOCK_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AUTO_RELOCK_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRemoteSensingAttribute(chipClusterPtr, callback, value, null);
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeAutoRelockTimeAttribute(callback, value, 0);
     }
 
-    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRemoteSensingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AUTO_RELOCK_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeRemoteSensingAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRemoteSensingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAutoRelockTimeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_RELOCK_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AUTO_RELOCK_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readControlSequenceOfOperationAttribute(
+    public void readSoundVolumeAttribute(
         IntegerAttributeCallback callback) {
-        readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOUND_VOLUME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SOUND_VOLUME_ATTRIBUTE_ID, true);
     }
 
-    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, null);
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSoundVolumeAttribute(callback, value, 0);
     }
 
-    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SOUND_VOLUME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeControlSequenceOfOperationAttribute(
+    public void subscribeSoundVolumeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeControlSequenceOfOperationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOUND_VOLUME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOUND_VOLUME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readSystemModeAttribute(
+    public void readOperatingModeAttribute(
         IntegerAttributeCallback callback) {
-        readSystemModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATING_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATING_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSystemModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperatingModeAttribute(callback, value, 0);
     }
 
-    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSystemModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPERATING_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeSystemModeAttribute(
+    public void subscribeOperatingModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSystemModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATING_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATING_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readThermostatRunningModeAttribute(
+    public void readSupportedOperatingModesAttribute(
         IntegerAttributeCallback callback) {
-        readThermostatRunningModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeThermostatRunningModeAttribute(
+    public void subscribeSupportedOperatingModesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatRunningModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readStartOfWeekAttribute(
+    public void readDefaultConfigurationRegisterAttribute(
         IntegerAttributeCallback callback) {
-        readStartOfWeekAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeStartOfWeekAttribute(
+    public void subscribeDefaultConfigurationRegisterAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartOfWeekAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfWeeklyTransitionsAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
+    public void readEnableLocalProgrammingAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNumberOfWeeklyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableLocalProgrammingAttribute(callback, value, 0);
     }
 
-    public void readNumberOfDailyTransitionsAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
+    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNumberOfDailyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfDailyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEnableLocalProgrammingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTemperatureSetpointHoldAttribute(
-        IntegerAttributeCallback callback) {
-        readTemperatureSetpointHoldAttribute(chipClusterPtr, callback);
+    public void readEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID, true);
     }
 
-    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, null);
+    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableOneTouchLockingAttribute(callback, value, 0);
     }
 
-    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeTemperatureSetpointHoldAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTemperatureSetpointHoldDurationAttribute(
-        TemperatureSetpointHoldDurationAttributeCallback callback) {
-        readTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback);
+    public void readEnableInsideStatusLEDAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, true);
     }
 
-    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, null);
+    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableInsideStatusLEDAttribute(callback, value, 0);
     }
 
-    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeTemperatureSetpointHoldDurationAttribute(
-        TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEnableInsideStatusLEDAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readThermostatProgrammingOperationModeAttribute(
-        IntegerAttributeCallback callback) {
-        readThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback);
+    public void readEnablePrivacyModeButtonAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID, true);
     }
 
-    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnablePrivacyModeButtonAttribute(callback, value, 0);
     }
 
-    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeThermostatProgrammingOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEnablePrivacyModeButtonAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readThermostatRunningStateAttribute(
+    public void readLocalProgrammingFeaturesAttribute(
         IntegerAttributeCallback callback) {
-        readThermostatRunningStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeThermostatRunningStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatRunningStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalProgrammingFeaturesAttribute(callback, value, 0);
     }
 
-    public void readSetpointChangeSourceAttribute(
-        IntegerAttributeCallback callback) {
-        readSetpointChangeSourceAttribute(chipClusterPtr, callback);
+    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeSetpointChangeSourceAttribute(
+    public void subscribeLocalProgrammingFeaturesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID);
 
-    public void readSetpointChangeAmountAttribute(
-        SetpointChangeAmountAttributeCallback callback) {
-        readSetpointChangeAmountAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeSetpointChangeAmountAttribute(
-        SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeAmountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readWrongCodeEntryLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID);
 
-    public void readSetpointChangeSourceTimestampAttribute(
-        LongAttributeCallback callback) {
-        readSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSetpointChangeSourceTimestampAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWrongCodeEntryLimitAttribute(callback, value, 0);
     }
 
-    public void readOccupiedSetbackAttribute(
-        OccupiedSetbackAttributeCallback callback) {
-        readOccupiedSetbackAttribute(chipClusterPtr, callback);
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeWrongCodeEntryLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID);
 
-    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeOccupiedSetbackAttribute(
-        OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readUserCodeTemporaryDisableTimeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID);
 
-    public void readOccupiedSetbackMinAttribute(
-        OccupiedSetbackMinAttributeCallback callback) {
-        readOccupiedSetbackMinAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupiedSetbackMinAttribute(
-        OccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUserCodeTemporaryDisableTimeAttribute(callback, value, 0);
     }
 
-    public void readOccupiedSetbackMaxAttribute(
-        OccupiedSetbackMaxAttributeCallback callback) {
-        readOccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeOccupiedSetbackMaxAttribute(
-        OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeUserCodeTemporaryDisableTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readUnoccupiedSetbackAttribute(
-        UnoccupiedSetbackAttributeCallback callback) {
-        readUnoccupiedSetbackAttribute(chipClusterPtr, callback);
+    public void readSendPINOverTheAirAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, true);
     }
 
-    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
+    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeSendPINOverTheAirAttribute(callback, value, 0);
     }
 
-    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeUnoccupiedSetbackAttribute(
-        UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSendPINOverTheAirAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readUnoccupiedSetbackMinAttribute(
-        UnoccupiedSetbackMinAttributeCallback callback) {
-        readUnoccupiedSetbackMinAttribute(chipClusterPtr, callback);
+    public void readRequirePINforRemoteOperationAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUnoccupiedSetbackMinAttribute(
-        UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeRequirePINforRemoteOperationAttribute(callback, value, 0);
     }
 
-    public void readUnoccupiedSetbackMaxAttribute(
-        UnoccupiedSetbackMaxAttributeCallback callback) {
-        readUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeUnoccupiedSetbackMaxAttribute(
-        UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRequirePINforRemoteOperationAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEmergencyHeatDeltaAttribute(
+    public void readExpiringUserTimeoutAttribute(
         IntegerAttributeCallback callback) {
-        readEmergencyHeatDeltaAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID, true);
     }
 
-    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value) {
-        writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, null);
+    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeExpiringUserTimeoutAttribute(callback, value, 0);
     }
 
-    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeEmergencyHeatDeltaAttribute(
+    public void subscribeExpiringUserTimeoutAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readACTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readACTypeAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACTypeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeACTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readACCapacityAttribute(
-        IntegerAttributeCallback callback) {
-        readACCapacityAttribute(chipClusterPtr, callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCapacityAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCapacityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeACCapacityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readACRefrigerantTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readACRefrigerantTypeAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACRefrigerantTypeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACRefrigerantTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeACRefrigerantTypeAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACRefrigerantTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void readACCompressorTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readACCompressorTypeAttribute(chipClusterPtr, callback);
+  public static class WindowCoveringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 258L;
+
+    private static final long TYPE_ATTRIBUTE_ID = 0L;
+    private static final long PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID = 1L;
+    private static final long PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID = 2L;
+    private static final long CURRENT_POSITION_LIFT_ATTRIBUTE_ID = 3L;
+    private static final long CURRENT_POSITION_TILT_ATTRIBUTE_ID = 4L;
+    private static final long NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID = 5L;
+    private static final long NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID = 6L;
+    private static final long CONFIG_STATUS_ATTRIBUTE_ID = 7L;
+    private static final long CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID = 8L;
+    private static final long CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID = 9L;
+    private static final long OPERATIONAL_STATUS_ATTRIBUTE_ID = 10L;
+    private static final long TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID = 11L;
+    private static final long TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID = 12L;
+    private static final long END_PRODUCT_TYPE_ATTRIBUTE_ID = 13L;
+    private static final long CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID = 14L;
+    private static final long CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID = 15L;
+    private static final long INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID = 16L;
+    private static final long INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID = 17L;
+    private static final long INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID = 18L;
+    private static final long INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID = 19L;
+    private static final long MODE_ATTRIBUTE_ID = 23L;
+    private static final long SAFETY_STATUS_ATTRIBUTE_ID = 26L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public WindowCoveringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCompressorTypeAttribute(chipClusterPtr, callback, value, null);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCompressorTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void upOrOpen(DefaultClusterCallback callback) {
+      upOrOpen(callback, 0);
     }
 
-    public void subscribeACCompressorTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCompressorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readACErrorCodeAttribute(
-        LongAttributeCallback callback) {
-        readACErrorCodeAttribute(chipClusterPtr, callback);
+    public void downOrClose(DefaultClusterCallback callback) {
+      downOrClose(callback, 0);
     }
 
-    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) {
-        writeACErrorCodeAttribute(chipClusterPtr, callback, value, null);
+    public void downOrClose(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeACErrorCodeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void stopMotion(DefaultClusterCallback callback) {
+      stopMotion(callback, 0);
     }
 
-    public void subscribeACErrorCodeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACErrorCodeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readACLouverPositionAttribute(
-        IntegerAttributeCallback callback) {
-        readACLouverPositionAttribute(chipClusterPtr, callback);
+    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
+      goToLiftValue(callback, liftValue, 0);
     }
 
-    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACLouverPositionAttribute(chipClusterPtr, callback, value, null);
+    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long liftValueFieldID = 0L;
+      BaseTLVType liftValuetlvValue = new UIntType(liftValue);
+      elements.add(new StructElement(liftValueFieldID, liftValuetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACLouverPositionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue) {
+      goToLiftPercentage(callback, liftPercent100thsValue, 0);
     }
 
-    public void subscribeACLouverPositionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACLouverPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long liftPercent100thsValueFieldID = 0L;
+      BaseTLVType liftPercent100thsValuetlvValue = new UIntType(liftPercent100thsValue);
+      elements.add(new StructElement(liftPercent100thsValueFieldID, liftPercent100thsValuetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readACCoilTemperatureAttribute(
-        ACCoilTemperatureAttributeCallback callback) {
-        readACCoilTemperatureAttribute(chipClusterPtr, callback);
+    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
+      goToTiltValue(callback, tiltValue, 0);
     }
 
-    public void subscribeACCoilTemperatureAttribute(
-        ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCoilTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tiltValueFieldID = 0L;
+      BaseTLVType tiltValuetlvValue = new UIntType(tiltValue);
+      elements.add(new StructElement(tiltValueFieldID, tiltValuetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readACCapacityformatAttribute(
-        IntegerAttributeCallback callback) {
-        readACCapacityformatAttribute(chipClusterPtr, callback);
+    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
+      goToTiltPercentage(callback, tiltPercent100thsValue, 0);
     }
 
-    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCapacityformatAttribute(chipClusterPtr, callback, value, null);
+    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tiltPercent100thsValueFieldID = 0L;
+      BaseTLVType tiltPercent100thsValuetlvValue = new UIntType(tiltPercent100thsValue);
+      elements.add(new StructElement(tiltPercent100thsValueFieldID, tiltPercent100thsValuetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCapacityformatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface CurrentPositionLiftAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeACCapacityformatAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCapacityformatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentPositionTiltAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public interface CurrentPositionLiftPercentageAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentPositionTiltPercentageAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public interface TargetPositionLiftPercent100thsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface TargetPositionTiltPercent100thsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+    public interface CurrentPositionLiftPercent100thsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentPositionTiltPercent100thsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readClusterRevisionAttribute(
+    public void readTypeAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TYPE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribeTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readLocalTemperatureAttribute(long chipClusterPtr, LocalTemperatureAttributeCallback callback);
+    public void readPhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribeLocalTemperatureAttribute(long chipClusterPtr, LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readOutdoorTemperatureAttribute(long chipClusterPtr, OutdoorTemperatureAttributeCallback callback);
+    public void subscribePhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribeOutdoorTemperatureAttribute(long chipClusterPtr, OutdoorTemperatureAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAbsMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeAbsMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribeAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_LIFT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAbsMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribeAbsMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_TILT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPICoolingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_ATTRIBUTE_ID);
 
-    private native void subscribePICoolingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_TILT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPIHeatingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribePIHeatingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readHVACSystemTypeConfigurationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID);
 
-    private native void writeHVACSystemTypeConfigurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeHVACSystemTypeConfigurationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID);
 
-    private native void readLocalTemperatureCalibrationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeLocalTemperatureCalibrationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeLocalTemperatureCalibrationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readOccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readConfigStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONFIG_STATUS_ATTRIBUTE_ID);
 
-    private native void writeOccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONFIG_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeOccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeConfigStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONFIG_STATUS_ATTRIBUTE_ID);
 
-    private native void readOccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONFIG_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeOccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeOccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID);
 
-    private native void writeUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID);
 
-    private native void readUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readOperationalStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATUS_ATTRIBUTE_ID);
 
-    private native void writeMinHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeOperationalStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATUS_ATTRIBUTE_ID);
 
-    private native void readMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATIONAL_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeMaxHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void subscribeMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void writeMinCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeMaxCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinSetpointDeadBandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeMinSetpointDeadBandAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMinSetpointDeadBandAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRemoteSensingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeRemoteSensingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeRemoteSensingAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readControlSequenceOfOperationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeControlSequenceOfOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeControlSequenceOfOperationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSystemModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSystemModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readThermostatRunningModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeThermostatRunningModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartOfWeekAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeStartOfWeekAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNumberOfWeeklyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeNumberOfWeeklyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNumberOfDailyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeNumberOfDailyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTemperatureSetpointHoldAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeTemperatureSetpointHoldAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeTemperatureSetpointHoldAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, TemperatureSetpointHoldDurationAttributeCallback callback);
+    public void readTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void writeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void readThermostatProgrammingOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeThermostatProgrammingOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readEndProductTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_PRODUCT_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribeThermostatProgrammingOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, END_PRODUCT_TYPE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readThermostatRunningStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeEndProductTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_PRODUCT_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribeThermostatRunningStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, END_PRODUCT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readSetpointChangeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void subscribeSetpointChangeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readSetpointChangeAmountAttribute(long chipClusterPtr, SetpointChangeAmountAttributeCallback callback);
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void subscribeSetpointChangeAmountAttribute(long chipClusterPtr, SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readSetpointChangeSourceTimestampAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void subscribeSetpointChangeSourceTimestampAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readOccupiedSetbackAttribute(long chipClusterPtr, OccupiedSetbackAttributeCallback callback);
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
 
-    private native void writeOccupiedSetbackAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeOccupiedSetbackAttribute(long chipClusterPtr, OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval);
+    public void readInstalledOpenLimitLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void readOccupiedSetbackMinAttribute(long chipClusterPtr, OccupiedSetbackMinAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeOccupiedSetbackMinAttribute(long chipClusterPtr, OccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInstalledOpenLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void readOccupiedSetbackMaxAttribute(long chipClusterPtr, OccupiedSetbackMaxAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeOccupiedSetbackMaxAttribute(long chipClusterPtr, OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval);
+    public void readInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void readUnoccupiedSetbackAttribute(long chipClusterPtr, UnoccupiedSetbackAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeUnoccupiedSetbackAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    private native void subscribeUnoccupiedSetbackAttribute(long chipClusterPtr, UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readUnoccupiedSetbackMinAttribute(long chipClusterPtr, UnoccupiedSetbackMinAttributeCallback callback);
+    public void readInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeUnoccupiedSetbackMinAttribute(long chipClusterPtr, UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readUnoccupiedSetbackMaxAttribute(long chipClusterPtr, UnoccupiedSetbackMaxAttributeCallback callback);
+    public void subscribeInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void subscribeUnoccupiedSetbackMaxAttribute(long chipClusterPtr, UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEmergencyHeatDeltaAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void writeEmergencyHeatDeltaAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeEmergencyHeatDeltaAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
 
-    private native void readACTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeACTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MODE_ATTRIBUTE_ID);
 
-    private native void subscribeACTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readACCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeModeAttribute(callback, value, 0);
+    }
 
-    private native void writeACCapacityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeACCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MODE_ATTRIBUTE_ID);
 
-    private native void readACRefrigerantTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeACRefrigerantTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readSafetyStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAFETY_STATUS_ATTRIBUTE_ID);
 
-    private native void subscribeACRefrigerantTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SAFETY_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readACCompressorTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeSafetyStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAFETY_STATUS_ATTRIBUTE_ID);
 
-    private native void writeACCompressorTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SAFETY_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeACCompressorTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readACErrorCodeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeACErrorCodeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeACErrorCodeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readACLouverPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeACLouverPositionAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeACLouverPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readACCoilTemperatureAttribute(long chipClusterPtr, ACCoilTemperatureAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeACCoilTemperatureAttribute(long chipClusterPtr, ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void readACCapacityformatAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeACCapacityformatAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeACCapacityformatAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class FanControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 514L;
+  public static class BarrierControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 259L;
 
-    public FanControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long BARRIER_MOVING_STATE_ATTRIBUTE_ID = 1L;
+    private static final long BARRIER_SAFETY_STATUS_ATTRIBUTE_ID = 2L;
+    private static final long BARRIER_CAPABILITIES_ATTRIBUTE_ID = 3L;
+    private static final long BARRIER_OPEN_EVENTS_ATTRIBUTE_ID = 4L;
+    private static final long BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID = 5L;
+    private static final long BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID = 6L;
+    private static final long BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID = 7L;
+    private static final long BARRIER_OPEN_PERIOD_ATTRIBUTE_ID = 8L;
+    private static final long BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID = 9L;
+    private static final long BARRIER_POSITION_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public BarrierControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff) {
-      step(chipClusterPtr, callback, direction, wrap, lowestOff, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff, int timedInvokeTimeoutMs) {
-      step(chipClusterPtr, callback, direction, wrap, lowestOff, timedInvokeTimeoutMs);
+    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
+      barrierControlGoToPercent(callback, percentOpen, 0);
     }
 
-    private native void step(long chipClusterPtr, DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff, @Nullable Integer timedInvokeTimeoutMs);
+    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public interface PercentSettingAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long percentOpenFieldID = 0L;
+      BaseTLVType percentOpentlvValue = new UIntType(percentOpen);
+      elements.add(new StructElement(percentOpenFieldID, percentOpentlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface SpeedSettingAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void barrierControlStop(DefaultClusterCallback callback) {
+      barrierControlStop(callback, 0);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readFanModeAttribute(
-        IntegerAttributeCallback callback) {
-        readFanModeAttribute(chipClusterPtr, callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeFanModeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readBarrierMovingStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_MOVING_STATE_ATTRIBUTE_ID);
 
-    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeFanModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_MOVING_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFanModeAttribute(
+    public void subscribeBarrierMovingStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFanModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_MOVING_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_MOVING_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFanModeSequenceAttribute(
+    public void readBarrierSafetyStatusAttribute(
         IntegerAttributeCallback callback) {
-        readFanModeSequenceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID, true);
     }
 
-    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value) {
-        writeFanModeSequenceAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeBarrierSafetyStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeFanModeSequenceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readBarrierCapabilitiesAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CAPABILITIES_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_CAPABILITIES_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFanModeSequenceAttribute(
+    public void subscribeBarrierCapabilitiesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFanModeSequenceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CAPABILITIES_ATTRIBUTE_ID);
 
-    public void readPercentSettingAttribute(
-        PercentSettingAttributeCallback callback) {
-        readPercentSettingAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_CAPABILITIES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writePercentSettingAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readBarrierOpenEventsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID);
 
-    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePercentSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePercentSettingAttribute(
-        PercentSettingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePercentSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenEventsAttribute(callback, value, 0);
     }
 
-    public void readPercentCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readPercentCurrentAttribute(chipClusterPtr, callback);
+    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_OPEN_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePercentCurrentAttribute(
+    public void subscribeBarrierOpenEventsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePercentCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readSpeedMaxAttribute(
+    public void readBarrierCloseEventsAttribute(
         IntegerAttributeCallback callback) {
-        readSpeedMaxAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    public void subscribeSpeedMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void readSpeedSettingAttribute(
-        SpeedSettingAttributeCallback callback) {
-        readSpeedSettingAttribute(chipClusterPtr, callback);
+    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCloseEventsAttribute(callback, value, 0);
     }
 
-    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSpeedSettingAttribute(chipClusterPtr, callback, value, null);
+    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSpeedSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeBarrierCloseEventsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    public void subscribeSpeedSettingAttribute(
-        SpeedSettingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readSpeedCurrentAttribute(
+    public void readBarrierCommandOpenEventsAttribute(
         IntegerAttributeCallback callback) {
-        readSpeedCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSpeedCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandOpenEventsAttribute(callback, value, 0);
     }
 
-    public void readRockSupportAttribute(
-        IntegerAttributeCallback callback) {
-        readRockSupportAttribute(chipClusterPtr, callback);
+    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeRockSupportAttribute(
+    public void subscribeBarrierCommandOpenEventsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRockSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRockSettingAttribute(
+    public void readBarrierCommandCloseEventsAttribute(
         IntegerAttributeCallback callback) {
-        readRockSettingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRockSettingAttribute(chipClusterPtr, callback, value, null);
+    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandCloseEventsAttribute(callback, value, 0);
     }
 
-    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRockSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeRockSettingAttribute(
+    public void subscribeBarrierCommandCloseEventsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRockSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readWindSupportAttribute(
+    public void readBarrierOpenPeriodAttribute(
         IntegerAttributeCallback callback) {
-        readWindSupportAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeWindSupportAttribute(
+    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenPeriodAttribute(callback, value, 0);
+    }
+
+    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_OPEN_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeBarrierOpenPeriodAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWindSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readWindSettingAttribute(
+    public void readBarrierClosePeriodAttribute(
         IntegerAttributeCallback callback) {
-        readWindSettingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID, true);
     }
 
-    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWindSettingAttribute(chipClusterPtr, callback, value, null);
+    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierClosePeriodAttribute(callback, value, 0);
     }
 
-    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWindSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeWindSettingAttribute(
+    public void subscribeBarrierClosePeriodAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWindSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID);
 
-    public void readAirflowDirectionAttribute(
-        IntegerAttributeCallback callback) {
-        readAirflowDirectionAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value) {
-        writeAirflowDirectionAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readBarrierPositionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_POSITION_ATTRIBUTE_ID);
 
-    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeAirflowDirectionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BARRIER_POSITION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAirflowDirectionAttribute(
+    public void subscribeBarrierPositionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAirflowDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_POSITION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_POSITION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readFanModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void writeFanModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 512L;
 
-    private native void subscribeFanModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long MAX_PRESSURE_ATTRIBUTE_ID = 0L;
+    private static final long MAX_SPEED_ATTRIBUTE_ID = 1L;
+    private static final long MAX_FLOW_ATTRIBUTE_ID = 2L;
+    private static final long MIN_CONST_PRESSURE_ATTRIBUTE_ID = 3L;
+    private static final long MAX_CONST_PRESSURE_ATTRIBUTE_ID = 4L;
+    private static final long MIN_COMP_PRESSURE_ATTRIBUTE_ID = 5L;
+    private static final long MAX_COMP_PRESSURE_ATTRIBUTE_ID = 6L;
+    private static final long MIN_CONST_SPEED_ATTRIBUTE_ID = 7L;
+    private static final long MAX_CONST_SPEED_ATTRIBUTE_ID = 8L;
+    private static final long MIN_CONST_FLOW_ATTRIBUTE_ID = 9L;
+    private static final long MAX_CONST_FLOW_ATTRIBUTE_ID = 10L;
+    private static final long MIN_CONST_TEMP_ATTRIBUTE_ID = 11L;
+    private static final long MAX_CONST_TEMP_ATTRIBUTE_ID = 12L;
+    private static final long PUMP_STATUS_ATTRIBUTE_ID = 16L;
+    private static final long EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID = 17L;
+    private static final long EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID = 18L;
+    private static final long CAPACITY_ATTRIBUTE_ID = 19L;
+    private static final long SPEED_ATTRIBUTE_ID = 20L;
+    private static final long LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID = 21L;
+    private static final long POWER_ATTRIBUTE_ID = 22L;
+    private static final long LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID = 23L;
+    private static final long OPERATION_MODE_ATTRIBUTE_ID = 32L;
+    private static final long CONTROL_MODE_ATTRIBUTE_ID = 33L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readFanModeSequenceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void writeFanModeSequenceAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeFanModeSequenceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxPressureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readPercentSettingAttribute(long chipClusterPtr, PercentSettingAttributeCallback callback);
+    public interface MaxSpeedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void writePercentSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface MaxFlowAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribePercentSettingAttribute(long chipClusterPtr, PercentSettingAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinConstPressureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readPercentCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface MaxConstPressureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribePercentCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinCompPressureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readSpeedMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface MaxCompPressureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeSpeedMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinConstSpeedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readSpeedSettingAttribute(long chipClusterPtr, SpeedSettingAttributeCallback callback);
+    public interface MaxConstSpeedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void writeSpeedSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface MinConstFlowAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeSpeedSettingAttribute(long chipClusterPtr, SpeedSettingAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxConstFlowAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readSpeedCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface MinConstTempAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeSpeedCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxConstTempAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readRockSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface CapacityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeRockSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SpeedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readRockSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface LifetimeRunningHoursAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void writeRockSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface PowerAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void subscribeRockSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface LifetimeEnergyConsumedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void readWindSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeWindSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readWindSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writeWindSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeWindSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMaxPressureAttribute(
+        MaxPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESSURE_ATTRIBUTE_ID);
 
-    private native void readAirflowDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_PRESSURE_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeAirflowDirectionAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeMaxPressureAttribute(
+        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESSURE_ATTRIBUTE_ID);
 
-    private native void subscribeAirflowDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SPEED_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_SPEED_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SPEED_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readMaxFlowAttribute(
+        MaxFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FLOW_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_FLOW_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeMaxFlowAttribute(
+        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FLOW_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_FLOW_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_CONST_PRESSURE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_CONST_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 516L;
+    public void readMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_CONST_PRESSURE_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_CONST_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COMP_PRESSURE_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_COMP_PRESSURE_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COMP_PRESSURE_ATTRIBUTE_ID);
 
-    public void readTemperatureDisplayModeAttribute(
-        IntegerAttributeCallback callback) {
-        readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_COMP_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COMP_PRESSURE_ATTRIBUTE_ID);
 
-    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_COMP_PRESSURE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTemperatureDisplayModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureDisplayModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COMP_PRESSURE_ATTRIBUTE_ID);
 
-    public void readKeypadLockoutAttribute(
-        IntegerAttributeCallback callback) {
-        readKeypadLockoutAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_COMP_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
-        writeKeypadLockoutAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_SPEED_ATTRIBUTE_ID);
 
-    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeKeypadLockoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_CONST_SPEED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeKeypadLockoutAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeKeypadLockoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_SPEED_ATTRIBUTE_ID);
 
-    public void readScheduleProgrammingVisibilityAttribute(
-        IntegerAttributeCallback callback) {
-        readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_CONST_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_SPEED_ATTRIBUTE_ID);
 
-    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_CONST_SPEED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeScheduleProgrammingVisibilityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_SPEED_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_CONST_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_FLOW_ATTRIBUTE_ID);
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_CONST_FLOW_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_FLOW_ATTRIBUTE_ID);
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_CONST_FLOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_FLOW_ATTRIBUTE_ID);
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_CONST_FLOW_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_FLOW_ATTRIBUTE_ID);
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_CONST_FLOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinConstTempAttribute(
+        MinConstTempAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_TEMP_ATTRIBUTE_ID);
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_CONST_TEMP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMinConstTempAttribute(
+        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_TEMP_ATTRIBUTE_ID);
 
-    private native void readTemperatureDisplayModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_CONST_TEMP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeTemperatureDisplayModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_TEMP_ATTRIBUTE_ID);
 
-    private native void subscribeTemperatureDisplayModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_CONST_TEMP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readKeypadLockoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_TEMP_ATTRIBUTE_ID);
 
-    private native void writeKeypadLockoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_CONST_TEMP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeKeypadLockoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readPumpStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PUMP_STATUS_ATTRIBUTE_ID);
 
-    private native void readScheduleProgrammingVisibilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PUMP_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribePumpStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PUMP_STATUS_ATTRIBUTE_ID);
 
-    private native void subscribeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PUMP_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readEffectiveOperationModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeEffectiveOperationModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readEffectiveControlModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeEffectiveControlModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readCapacityAttribute(
+        CapacityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPACITY_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CAPACITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCapacityAttribute(
+        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPACITY_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class ColorControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 768L;
+    public void readSpeedAttribute(
+        SpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_ATTRIBUTE_ID);
 
-    public ColorControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPEED_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeSpeedAttribute(
+        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_ATTRIBUTE_ID);
 
-    public void moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void readLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID);
 
-    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID, true);
     }
 
-    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeRunningHoursAttribute(callback, value, 0);
     }
 
-    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void subscribeLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID);
 
-    public void moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void readPowerAttribute(
+        PowerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_ATTRIBUTE_ID);
 
-    public void moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_ATTRIBUTE_ID, true);
     }
 
-    public void moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void subscribePowerAttribute(
+        PowerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_ATTRIBUTE_ID);
 
-    public void stepSaturation(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void stepSaturation(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void readLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID);
 
-    public void moveToHueAndSaturation(DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID, true);
     }
 
-    public void moveToHueAndSaturation(DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeEnergyConsumedAttribute(callback, value, 0);
     }
 
-    public void moveToColor(DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, null);
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void moveToColor(DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+    public void subscribeLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID);
 
-    public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readOperationModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATION_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATION_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void stepColor(DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, null);
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperationModeAttribute(callback, value, 0);
     }
 
-    public void stepColor(DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPERATION_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, null);
+    public void subscribeOperationModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATION_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATION_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readControlModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONTROL_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void enhancedMoveToHue(DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, null);
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlModeAttribute(callback, value, 0);
     }
 
-    public void enhancedMoveToHue(DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), CONTROL_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    public void subscribeControlModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONTROL_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void enhancedStepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void enhancedStepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void colorLoopSet(DefaultClusterCallback callback, Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride) {
-      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, null);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void colorLoopSet(DefaultClusterCallback callback, Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void moveColorTemperature(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
-      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void moveColorTemperature(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void stepColorTemperature(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
-      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, null);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void stepColorTemperature(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+  public static class ThermostatCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 513L;
+
+    private static final long LOCAL_TEMPERATURE_ATTRIBUTE_ID = 0L;
+    private static final long OUTDOOR_TEMPERATURE_ATTRIBUTE_ID = 1L;
+    private static final long OCCUPANCY_ATTRIBUTE_ID = 2L;
+    private static final long ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID = 3L;
+    private static final long ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID = 4L;
+    private static final long ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 5L;
+    private static final long ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 6L;
+    private static final long P_I_COOLING_DEMAND_ATTRIBUTE_ID = 7L;
+    private static final long P_I_HEATING_DEMAND_ATTRIBUTE_ID = 8L;
+    private static final long H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID = 9L;
+    private static final long LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID = 16L;
+    private static final long OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID = 17L;
+    private static final long OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID = 18L;
+    private static final long UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID = 19L;
+    private static final long UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID = 20L;
+    private static final long MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID = 21L;
+    private static final long MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID = 22L;
+    private static final long MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 23L;
+    private static final long MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 24L;
+    private static final long MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID = 25L;
+    private static final long REMOTE_SENSING_ATTRIBUTE_ID = 26L;
+    private static final long CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID = 27L;
+    private static final long SYSTEM_MODE_ATTRIBUTE_ID = 28L;
+    private static final long THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID = 30L;
+    private static final long START_OF_WEEK_ATTRIBUTE_ID = 32L;
+    private static final long NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID = 33L;
+    private static final long NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID = 34L;
+    private static final long TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID = 35L;
+    private static final long TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID = 36L;
+    private static final long THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID = 37L;
+    private static final long THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID = 41L;
+    private static final long SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID = 48L;
+    private static final long SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID = 49L;
+    private static final long SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID = 50L;
+    private static final long OCCUPIED_SETBACK_ATTRIBUTE_ID = 52L;
+    private static final long OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID = 53L;
+    private static final long OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID = 54L;
+    private static final long UNOCCUPIED_SETBACK_ATTRIBUTE_ID = 55L;
+    private static final long UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID = 56L;
+    private static final long UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID = 57L;
+    private static final long EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID = 58L;
+    private static final long A_C_TYPE_ATTRIBUTE_ID = 64L;
+    private static final long A_C_CAPACITY_ATTRIBUTE_ID = 65L;
+    private static final long A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID = 66L;
+    private static final long A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID = 67L;
+    private static final long A_C_ERROR_CODE_ATTRIBUTE_ID = 68L;
+    private static final long A_C_LOUVER_POSITION_ATTRIBUTE_ID = 69L;
+    private static final long A_C_COIL_TEMPERATURE_ATTRIBUTE_ID = 70L;
+    private static final long A_C_CAPACITYFORMAT_ATTRIBUTE_ID = 71L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public ThermostatCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    private native void moveToHue(long chipClusterPtr, DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void moveHue(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
+      setpointRaiseLower(callback, mode, amount, 0);
+    }
 
-    private native void stepHue(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void moveToSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long modeFieldID = 0L;
+      BaseTLVType modetlvValue = new UIntType(mode);
+      elements.add(new StructElement(modeFieldID, modetlvValue));
 
-    private native void moveSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long amountFieldID = 1L;
+      BaseTLVType amounttlvValue = new IntType(amount);
+      elements.add(new StructElement(amountFieldID, amounttlvValue));
 
-    private native void stepSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void moveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
+      setWeeklySchedule(callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, 0);
+    }
 
-    private native void moveToColor(long chipClusterPtr, DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void moveColor(long chipClusterPtr, DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long numberOfTransitionsForSequenceFieldID = 0L;
+      BaseTLVType numberOfTransitionsForSequencetlvValue = new UIntType(numberOfTransitionsForSequence);
+      elements.add(new StructElement(numberOfTransitionsForSequenceFieldID, numberOfTransitionsForSequencetlvValue));
 
-    private native void stepColor(long chipClusterPtr, DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long dayOfWeekForSequenceFieldID = 1L;
+      BaseTLVType dayOfWeekForSequencetlvValue = new UIntType(dayOfWeekForSequence);
+      elements.add(new StructElement(dayOfWeekForSequenceFieldID, dayOfWeekForSequencetlvValue));
 
-    private native void moveToColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long modeForSequenceFieldID = 2L;
+      BaseTLVType modeForSequencetlvValue = new UIntType(modeForSequence);
+      elements.add(new StructElement(modeForSequenceFieldID, modeForSequencetlvValue));
 
-    private native void enhancedMoveToHue(long chipClusterPtr, DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long transitionsFieldID = 3L;
+      BaseTLVType transitionstlvValue = ArrayType.generateArrayType(transitions, (elementtransitions) -> elementtransitions.encodeTlv());
+      elements.add(new StructElement(transitionsFieldID, transitionstlvValue));
 
-    private native void enhancedMoveHue(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void enhancedStepHue(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
+      getWeeklySchedule(callback, daysToReturn, modeToReturn, 0);
+    }
 
-    private native void enhancedMoveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long daysToReturnFieldID = 0L;
+      BaseTLVType daysToReturntlvValue = new UIntType(daysToReturn);
+      elements.add(new StructElement(daysToReturnFieldID, daysToReturntlvValue));
+
+      final long modeToReturnFieldID = 1L;
+      BaseTLVType modeToReturntlvValue = new UIntType(modeToReturn);
+      elements.add(new StructElement(modeToReturnFieldID, modeToReturntlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long numberOfTransitionsForSequenceFieldID = 0L;
+          Integer numberOfTransitionsForSequence = null;
+          final long dayOfWeekForSequenceFieldID = 1L;
+          Integer dayOfWeekForSequence = null;
+          final long modeForSequenceFieldID = 2L;
+          Integer modeForSequence = null;
+          final long transitionsFieldID = 3L;
+          ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == numberOfTransitionsForSequenceFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                numberOfTransitionsForSequence = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dayOfWeekForSequenceFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                dayOfWeekForSequence = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == modeForSequenceFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                modeForSequence = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == transitionsFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                transitions = castingValue.map((elementcastingValue) -> ChipStructs.ThermostatClusterThermostatScheduleTransition.decodeTlv(elementcastingValue));
+              }
+            }
+          }
+          callback.onSuccess(numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void colorLoopSet(long chipClusterPtr, DefaultClusterCallback callback, Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void clearWeeklySchedule(DefaultClusterCallback callback) {
+      clearWeeklySchedule(callback, 0);
+    }
 
-    private native void stopMoveStep(long chipClusterPtr, DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public void clearWeeklySchedule(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void moveColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void stepColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetWeeklyScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
+    }
 
-    public interface NumberOfPrimariesAttributeCallback {
+    public interface LocalTemperatureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary1IntensityAttributeCallback {
+    public interface OutdoorTemperatureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary2IntensityAttributeCallback {
+    public interface TemperatureSetpointHoldDurationAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary3IntensityAttributeCallback {
+    public interface SetpointChangeAmountAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary4IntensityAttributeCallback {
+    public interface OccupiedSetbackAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary5IntensityAttributeCallback {
+    public interface OccupiedSetbackMinAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary6IntensityAttributeCallback {
+    public interface OccupiedSetbackMaxAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointRIntensityAttributeCallback {
+    public interface UnoccupiedSetbackAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointGIntensityAttributeCallback {
+    public interface UnoccupiedSetbackMinAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointBIntensityAttributeCallback {
+    public interface UnoccupiedSetbackMaxAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface StartUpColorTemperatureMiredsAttributeCallback {
+    public interface ACCoilTemperatureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readCurrentHueAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentHueAttribute(chipClusterPtr, callback);
+    public void readLocalTemperatureAttribute(
+        LocalTemperatureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TEMPERATURE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCAL_TEMPERATURE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLocalTemperatureAttribute(
+        LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TEMPERATURE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCAL_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentSaturationAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentSaturationAttribute(chipClusterPtr, callback);
+    public void readOutdoorTemperatureAttribute(
+        OutdoorTemperatureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUTDOOR_TEMPERATURE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OUTDOOR_TEMPERATURE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentSaturationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOutdoorTemperatureAttribute(
+        OutdoorTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUTDOOR_TEMPERATURE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OUTDOOR_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRemainingTimeAttribute(
+    public void readOccupancyAttribute(
         IntegerAttributeCallback callback) {
-        readRemainingTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPANCY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRemainingTimeAttribute(
+    public void subscribeOccupancyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPANCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentXAttribute(
+    public void readAbsMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentXAttribute(
+    public void subscribeAbsMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentYAttribute(
+    public void readAbsMaxHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentYAttribute(
+    public void subscribeAbsMaxHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDriftCompensationAttribute(
+    public void readAbsMinCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readDriftCompensationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDriftCompensationAttribute(
+    public void subscribeAbsMinCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDriftCompensationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCompensationTextAttribute(
-        CharStringAttributeCallback callback) {
-        readCompensationTextAttribute(chipClusterPtr, callback);
+    public void readAbsMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCompensationTextAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAbsMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorTemperatureMiredsAttribute(
+    public void readPICoolingDemandAttribute(
         IntegerAttributeCallback callback) {
-        readColorTemperatureMiredsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_COOLING_DEMAND_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_I_COOLING_DEMAND_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorTemperatureMiredsAttribute(
+    public void subscribePICoolingDemandAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_COOLING_DEMAND_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_I_COOLING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorModeAttribute(
+    public void readPIHeatingDemandAttribute(
         IntegerAttributeCallback callback) {
-        readColorModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_HEATING_DEMAND_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_I_HEATING_DEMAND_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorModeAttribute(
+    public void subscribePIHeatingDemandAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_HEATING_DEMAND_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_I_HEATING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOptionsAttribute(
+    public void readHVACSystemTypeConfigurationAttribute(
         IntegerAttributeCallback callback) {
-        readOptionsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, true);
     }
 
-    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, null);
+    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeHVACSystemTypeConfigurationAttribute(callback, value, 0);
     }
 
-    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeOptionsAttribute(
+    public void subscribeHVACSystemTypeConfigurationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfPrimariesAttribute(
-        NumberOfPrimariesAttributeCallback callback) {
-        readNumberOfPrimariesAttribute(chipClusterPtr, callback);
+    public void readLocalTemperatureCalibrationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNumberOfPrimariesAttribute(
-        NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalTemperatureCalibrationAttribute(callback, value, 0);
     }
 
-    public void readPrimary1XAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary1XAttribute(chipClusterPtr, callback);
+    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary1XAttribute(
+    public void subscribeLocalTemperatureCalibrationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary1YAttribute(
+    public void readOccupiedCoolingSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary1YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePrimary1YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedCoolingSetpointAttribute(callback, value, 0);
     }
 
-    public void readPrimary1IntensityAttribute(
-        Primary1IntensityAttributeCallback callback) {
-        readPrimary1IntensityAttribute(chipClusterPtr, callback);
+    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary1IntensityAttribute(
-        Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOccupiedCoolingSetpointAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary2XAttribute(
+    public void readOccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary2XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePrimary2XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedHeatingSetpointAttribute(callback, value, 0);
     }
 
-    public void readPrimary2YAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary2YAttribute(chipClusterPtr, callback);
+    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary2YAttribute(
+    public void subscribeOccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary2IntensityAttribute(
-        Primary2IntensityAttributeCallback callback) {
-        readPrimary2IntensityAttribute(chipClusterPtr, callback);
+    public void readUnoccupiedCoolingSetpointAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePrimary2IntensityAttribute(
-        Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedCoolingSetpointAttribute(callback, value, 0);
     }
 
-    public void readPrimary3XAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary3XAttribute(chipClusterPtr, callback);
+    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary3XAttribute(
+    public void subscribeUnoccupiedCoolingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary3YAttribute(
+    public void readUnoccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary3YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePrimary3YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedHeatingSetpointAttribute(callback, value, 0);
     }
 
-    public void readPrimary3IntensityAttribute(
-        Primary3IntensityAttributeCallback callback) {
-        readPrimary3IntensityAttribute(chipClusterPtr, callback);
+    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary3IntensityAttribute(
-        Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeUnoccupiedHeatingSetpointAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary4XAttribute(
+    public void readMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary4XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePrimary4XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinHeatSetpointLimitAttribute(callback, value, 0);
     }
 
-    public void readPrimary4YAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary4YAttribute(chipClusterPtr, callback);
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePrimary4YAttribute(
+    public void subscribeMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary4IntensityAttribute(
-        Primary4IntensityAttributeCallback callback) {
-        readPrimary4IntensityAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void subscribePrimary4IntensityAttribute(
-        Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary5XAttribute(
+    public void readMaxHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary5XAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void subscribePrimary5XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void readPrimary5YAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary5YAttribute(chipClusterPtr, callback);
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxHeatSetpointLimitAttribute(callback, value, 0);
     }
 
-    public void subscribePrimary5YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readPrimary5IntensityAttribute(
-        Primary5IntensityAttributeCallback callback) {
-        readPrimary5IntensityAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void subscribePrimary5IntensityAttribute(
-        Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPrimary6XAttribute(
+    public void readMinCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary6XAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void subscribePrimary6XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void readPrimary6YAttribute(
-        IntegerAttributeCallback callback) {
-        readPrimary6YAttribute(chipClusterPtr, callback);
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinCoolSetpointLimitAttribute(callback, value, 0);
     }
 
-    public void subscribePrimary6YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readPrimary6IntensityAttribute(
-        Primary6IntensityAttributeCallback callback) {
-        readPrimary6IntensityAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void subscribePrimary6IntensityAttribute(
-        Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readWhitePointXAttribute(
+    public void readMaxCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readWhitePointXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWhitePointXAttribute(chipClusterPtr, callback, value, null);
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxCoolSetpointLimitAttribute(callback, value, 0);
     }
 
-    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWhitePointXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeWhitePointXAttribute(
+    public void subscribeMaxCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWhitePointXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readWhitePointYAttribute(
+    public void readMinSetpointDeadBandAttribute(
         IntegerAttributeCallback callback) {
-        readWhitePointYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID, true);
     }
 
-    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWhitePointYAttribute(chipClusterPtr, callback, value, null);
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinSetpointDeadBandAttribute(callback, value, 0);
     }
 
-    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWhitePointYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeWhitePointYAttribute(
+    public void subscribeMinSetpointDeadBandAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWhitePointYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorPointRXAttribute(
+    public void readRemoteSensingAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointRXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMOTE_SENSING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REMOTE_SENSING_ATTRIBUTE_ID, true);
     }
 
-    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRXAttribute(chipClusterPtr, callback, value, null);
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRemoteSensingAttribute(callback, value, 0);
     }
 
-    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), REMOTE_SENSING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeColorPointRXAttribute(
+    public void subscribeRemoteSensingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMOTE_SENSING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REMOTE_SENSING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorPointRYAttribute(
+    public void readControlSequenceOfOperationAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointRYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID, true);
     }
 
-    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRYAttribute(chipClusterPtr, callback, value, null);
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlSequenceOfOperationAttribute(callback, value, 0);
     }
 
-    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeColorPointRYAttribute(
+    public void subscribeControlSequenceOfOperationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID);
 
-    public void readColorPointRIntensityAttribute(
-        ColorPointRIntensityAttributeCallback callback) {
-        readColorPointRIntensityAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readSystemModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SYSTEM_MODE_ATTRIBUTE_ID);
 
-    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SYSTEM_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointRIntensityAttribute(
-        ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSystemModeAttribute(callback, value, 0);
     }
 
-    public void readColorPointGXAttribute(
-        IntegerAttributeCallback callback) {
-        readColorPointGXAttribute(chipClusterPtr, callback);
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SYSTEM_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGXAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeSystemModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SYSTEM_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SYSTEM_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readThermostatRunningModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointGXAttribute(
+    public void subscribeThermostatRunningModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID);
 
-    public void readColorPointGYAttribute(
-        IntegerAttributeCallback callback) {
-        readColorPointGYAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGYAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readStartOfWeekAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_OF_WEEK_ATTRIBUTE_ID);
 
-    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_OF_WEEK_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointGYAttribute(
+    public void subscribeStartOfWeekAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_OF_WEEK_ATTRIBUTE_ID);
 
-    public void readColorPointGIntensityAttribute(
-        ColorPointGIntensityAttributeCallback callback) {
-        readColorPointGIntensityAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_OF_WEEK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID);
 
-    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointGIntensityAttribute(
-        ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID);
 
-    public void readColorPointBXAttribute(
-        IntegerAttributeCallback callback) {
-        readColorPointBXAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBXAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfDailyTransitionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID);
 
-    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointBXAttribute(
+    public void subscribeNumberOfDailyTransitionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorPointBYAttribute(
+    public void readTemperatureSetpointHoldAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointBYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID, true);
     }
 
-    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBYAttribute(chipClusterPtr, callback, value, null);
+    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldAttribute(callback, value, 0);
     }
 
-    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeColorPointBYAttribute(
+    public void subscribeTemperatureSetpointHoldAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID);
 
-    public void readColorPointBIntensityAttribute(
-        ColorPointBIntensityAttributeCallback callback) {
-        readColorPointBIntensityAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readTemperatureSetpointHoldDurationAttribute(
+        TemperatureSetpointHoldDurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID);
 
-    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorPointBIntensityAttribute(
-        ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldDurationAttribute(callback, value, 0);
     }
 
-    public void readEnhancedCurrentHueAttribute(
-        IntegerAttributeCallback callback) {
-        readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
+    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeEnhancedCurrentHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnhancedCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTemperatureSetpointHoldDurationAttribute(
+        TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEnhancedColorModeAttribute(
+    public void readThermostatProgrammingOperationModeAttribute(
         IntegerAttributeCallback callback) {
-        readEnhancedColorModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeEnhancedColorModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnhancedColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeThermostatProgrammingOperationModeAttribute(callback, value, 0);
     }
 
-    public void readColorLoopActiveAttribute(
-        IntegerAttributeCallback callback) {
-        readColorLoopActiveAttribute(chipClusterPtr, callback);
+    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeColorLoopActiveAttribute(
+    public void subscribeThermostatProgrammingOperationModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorLoopDirectionAttribute(
+    public void readThermostatRunningStateAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopDirectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorLoopDirectionAttribute(
+    public void subscribeThermostatRunningStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readColorLoopTimeAttribute(
+    public void readSetpointChangeSourceAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorLoopTimeAttribute(
+    public void subscribeSetpointChangeSourceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID);
 
-    public void readColorLoopStartEnhancedHueAttribute(
-        IntegerAttributeCallback callback) {
-        readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeColorLoopStartEnhancedHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readSetpointChangeAmountAttribute(
+        SetpointChangeAmountAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID);
 
-    public void readColorLoopStoredEnhancedHueAttribute(
-        IntegerAttributeCallback callback) {
-        readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorLoopStoredEnhancedHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeSetpointChangeAmountAttribute(
+        SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID);
 
-    public void readColorCapabilitiesAttribute(
-        IntegerAttributeCallback callback) {
-        readColorCapabilitiesAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeColorCapabilitiesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readSetpointChangeSourceTimestampAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID);
 
-    public void readColorTempPhysicalMinMiredsAttribute(
-        IntegerAttributeCallback callback) {
-        readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeColorTempPhysicalMinMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeSetpointChangeSourceTimestampAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID);
 
-    public void readColorTempPhysicalMaxMiredsAttribute(
-        IntegerAttributeCallback callback) {
-        readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeColorTempPhysicalMaxMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readOccupiedSetbackAttribute(
+        OccupiedSetbackAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    public void readCoupleColorTempToLevelMinMiredsAttribute(
-        IntegerAttributeCallback callback) {
-        readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPIED_SETBACK_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCoupleColorTempToLevelMinMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedSetbackAttribute(callback, value, 0);
     }
 
-    public void readStartUpColorTemperatureMiredsAttribute(
-        StartUpColorTemperatureMiredsAttributeCallback callback) {
-        readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
+    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OCCUPIED_SETBACK_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeOccupiedSetbackAttribute(
+        OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_SETBACK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeStartUpColorTemperatureMiredsAttribute(
-        StartUpColorTemperatureMiredsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readOccupiedSetbackMinAttribute(
+        OccupiedSetbackMinAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOccupiedSetbackMinAttribute(
+        OccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    public void readOccupiedSetbackMaxAttribute(
+        OccupiedSetbackMaxAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, true);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeOccupiedSetbackMaxAttribute(
+        OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    public void readUnoccupiedSetbackAttribute(
+        UnoccupiedSetbackAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNOCCUPIED_SETBACK_ATTRIBUTE_ID, true);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedSetbackAttribute(callback, value, 0);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), UNOCCUPIED_SETBACK_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeUnoccupiedSetbackAttribute(
+        UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNOCCUPIED_SETBACK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readUnoccupiedSetbackMinAttribute(
+        UnoccupiedSetbackMinAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void readCurrentSaturationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeCurrentSaturationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeUnoccupiedSetbackMinAttribute(
+        UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void readRemainingTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeRemainingTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readUnoccupiedSetbackMaxAttribute(
+        UnoccupiedSetbackMaxAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void readCurrentXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeCurrentXAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeUnoccupiedSetbackMaxAttribute(
+        UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void readCurrentYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeCurrentYAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readEmergencyHeatDeltaAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID);
 
-    private native void readDriftCompensationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeDriftCompensationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEmergencyHeatDeltaAttribute(callback, value, 0);
+    }
 
-    private native void readCompensationTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeCompensationTextAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeEmergencyHeatDeltaAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID);
 
-    private native void readColorTemperatureMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeColorTemperatureMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readACTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID);
 
-    private native void readColorModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_TYPE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeColorModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACTypeAttribute(callback, value, 0);
+    }
 
-    private native void readOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeACTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribeOptionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNumberOfPrimariesAttribute(long chipClusterPtr, NumberOfPrimariesAttributeCallback callback);
+    public void readACCapacityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfPrimariesAttribute(long chipClusterPtr, NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_CAPACITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary1XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary1XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_CAPACITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readPrimary1YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACCapacityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID);
 
-    private native void subscribePrimary1YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary1IntensityAttribute(long chipClusterPtr, Primary1IntensityAttributeCallback callback);
+    public void readACRefrigerantTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary1IntensityAttribute(long chipClusterPtr, Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary2XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACRefrigerantTypeAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary2XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readPrimary2YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACRefrigerantTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary2YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary2IntensityAttribute(long chipClusterPtr, Primary2IntensityAttributeCallback callback);
+    public void readACCompressorTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary2IntensityAttribute(long chipClusterPtr, Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary3XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCompressorTypeAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary3XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readPrimary3YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACCompressorTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary3YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary3IntensityAttribute(long chipClusterPtr, Primary3IntensityAttributeCallback callback);
+    public void readACErrorCodeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary3IntensityAttribute(long chipClusterPtr, Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_ERROR_CODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary4XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) {
+      writeACErrorCodeAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary4XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_ERROR_CODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readPrimary4YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACErrorCodeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary4YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_ERROR_CODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary4IntensityAttribute(long chipClusterPtr, Primary4IntensityAttributeCallback callback);
+    public void readACLouverPositionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID);
 
-    private native void subscribePrimary4IntensityAttribute(long chipClusterPtr, Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_LOUVER_POSITION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary5XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACLouverPositionAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary5XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_LOUVER_POSITION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readPrimary5YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACLouverPositionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID);
 
-    private native void subscribePrimary5YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_LOUVER_POSITION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary5IntensityAttribute(long chipClusterPtr, Primary5IntensityAttributeCallback callback);
+    public void readACCoilTemperatureAttribute(
+        ACCoilTemperatureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary5IntensityAttribute(long chipClusterPtr, Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary6XAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACCoilTemperatureAttribute(
+        ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID);
 
-    private native void subscribePrimary6XAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPrimary6YAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readACCapacityformatAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID);
 
-    private native void subscribePrimary6YAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, A_C_CAPACITYFORMAT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPrimary6IntensityAttribute(long chipClusterPtr, Primary6IntensityAttributeCallback callback);
+    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityformatAttribute(callback, value, 0);
+    }
 
-    private native void subscribePrimary6IntensityAttribute(long chipClusterPtr, Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_CAPACITYFORMAT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readWhitePointXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeACCapacityformatAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID);
 
-    private native void writeWhitePointXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_CAPACITYFORMAT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeWhitePointXAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readWhitePointYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeWhitePointYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeWhitePointYAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readColorPointRXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeColorPointRXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeColorPointRXAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readColorPointRYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeColorPointRYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeColorPointRYAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readColorPointRIntensityAttribute(long chipClusterPtr, ColorPointRIntensityAttributeCallback callback);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void writeColorPointRIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeColorPointRIntensityAttribute(long chipClusterPtr, ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void readColorPointGXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeColorPointGXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeColorPointGXAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readColorPointGYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void writeColorPointGYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeColorPointGYAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void readColorPointGIntensityAttribute(long chipClusterPtr, ColorPointGIntensityAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeColorPointGIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeColorPointGIntensityAttribute(long chipClusterPtr, ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readColorPointBXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void writeColorPointBXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeColorPointBXAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class FanControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 514L;
 
-    private native void readColorPointBYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long FAN_MODE_ATTRIBUTE_ID = 0L;
+    private static final long FAN_MODE_SEQUENCE_ATTRIBUTE_ID = 1L;
+    private static final long PERCENT_SETTING_ATTRIBUTE_ID = 2L;
+    private static final long PERCENT_CURRENT_ATTRIBUTE_ID = 3L;
+    private static final long SPEED_MAX_ATTRIBUTE_ID = 4L;
+    private static final long SPEED_SETTING_ATTRIBUTE_ID = 5L;
+    private static final long SPEED_CURRENT_ATTRIBUTE_ID = 6L;
+    private static final long ROCK_SUPPORT_ATTRIBUTE_ID = 7L;
+    private static final long ROCK_SETTING_ATTRIBUTE_ID = 8L;
+    private static final long WIND_SUPPORT_ATTRIBUTE_ID = 9L;
+    private static final long WIND_SETTING_ATTRIBUTE_ID = 10L;
+    private static final long AIRFLOW_DIRECTION_ATTRIBUTE_ID = 11L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void writeColorPointBYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public FanControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeColorPointBYAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readColorPointBIntensityAttribute(long chipClusterPtr, ColorPointBIntensityAttributeCallback callback);
+    public void step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff) {
+      step(callback, direction, wrap, lowestOff, 0);
+    }
 
-    private native void writeColorPointBIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeColorPointBIntensityAttribute(long chipClusterPtr, ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long directionFieldID = 0L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
 
-    private native void readEnhancedCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long wrapFieldID = 1L;
+      BaseTLVType wraptlvValue = wrap.<BaseTLVType>map((nonOptionalwrap) -> new BooleanType(nonOptionalwrap)).orElse(new EmptyType());
+      elements.add(new StructElement(wrapFieldID, wraptlvValue));
 
-    private native void subscribeEnhancedCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long lowestOffFieldID = 2L;
+      BaseTLVType lowestOfftlvValue = lowestOff.<BaseTLVType>map((nonOptionallowestOff) -> new BooleanType(nonOptionallowestOff)).orElse(new EmptyType());
+      elements.add(new StructElement(lowestOffFieldID, lowestOfftlvValue));
 
-    private native void readEnhancedColorModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeEnhancedColorModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface PercentSettingAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readColorLoopActiveAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface SpeedSettingAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeColorLoopActiveAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readColorLoopDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeColorLoopDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readColorLoopTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeColorLoopTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFanModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_ATTRIBUTE_ID);
 
-    private native void readColorLoopStartEnhancedHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FAN_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeColorLoopStartEnhancedHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeFanModeAttribute(callback, value, 0);
+    }
 
-    private native void readColorLoopStoredEnhancedHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), FAN_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeColorLoopStoredEnhancedHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFanModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_ATTRIBUTE_ID);
 
-    private native void readColorCapabilitiesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FAN_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeColorCapabilitiesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFanModeSequenceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_SEQUENCE_ATTRIBUTE_ID);
 
-    private native void readColorTempPhysicalMinMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FAN_MODE_SEQUENCE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeColorTempPhysicalMinMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFanModeSequenceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_SEQUENCE_ATTRIBUTE_ID);
 
-    private native void readColorTempPhysicalMaxMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FAN_MODE_SEQUENCE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeColorTempPhysicalMaxMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readPercentSettingAttribute(
+        PercentSettingAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_SETTING_ATTRIBUTE_ID);
 
-    private native void readCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PERCENT_SETTING_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writePercentSettingAttribute(callback, value, 0);
+    }
 
-    private native void readStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, StartUpColorTemperatureMiredsAttributeCallback callback);
+    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PERCENT_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribePercentSettingAttribute(
+        PercentSettingAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_SETTING_ATTRIBUTE_ID);
 
-    private native void subscribeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, StartUpColorTemperatureMiredsAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PERCENT_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readPercentCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PERCENT_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribePercentCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PERCENT_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readSpeedMaxAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPEED_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeSpeedMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readSpeedSettingAttribute(
+        SpeedSettingAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_SETTING_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPEED_SETTING_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSpeedSettingAttribute(callback, value, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SPEED_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-  public static class BallastConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 769L;
+    public void subscribeSpeedSettingAttribute(
+        SpeedSettingAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_SETTING_ATTRIBUTE_ID);
 
-    public BallastConfigurationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readSpeedCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_CURRENT_ATTRIBUTE_ID);
 
-    public interface IntrinsicBallastFactorAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SPEED_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public interface BallastFactorAdjustmentAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeSpeedCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_CURRENT_ATTRIBUTE_ID);
 
-    public interface LampRatedHoursAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface LampBurnHoursAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readRockSupportAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROCK_SUPPORT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ROCK_SUPPORT_ATTRIBUTE_ID, true);
     }
 
-    public interface LampBurnHoursTripPointAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeRockSupportAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROCK_SUPPORT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ROCK_SUPPORT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readRockSettingAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROCK_SETTING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ROCK_SETTING_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRockSettingAttribute(callback, value, 0);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ROCK_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeRockSettingAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ROCK_SETTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ROCK_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhysicalMinLevelAttribute(
+    public void readWindSupportAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalMinLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIND_SUPPORT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIND_SUPPORT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePhysicalMinLevelAttribute(
+    public void subscribeWindSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIND_SUPPORT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIND_SUPPORT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhysicalMaxLevelAttribute(
+    public void readWindSettingAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalMaxLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIND_SETTING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WIND_SETTING_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePhysicalMaxLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWindSettingAttribute(callback, value, 0);
     }
 
-    public void readBallastStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readBallastStatusAttribute(chipClusterPtr, callback);
+    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WIND_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeBallastStatusAttribute(
+    public void subscribeWindSettingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBallastStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WIND_SETTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WIND_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinLevelAttribute(
+    public void readAirflowDirectionAttribute(
         IntegerAttributeCallback callback) {
-        readMinLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIRFLOW_DIRECTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AIRFLOW_DIRECTION_ATTRIBUTE_ID, true);
     }
 
-    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinLevelAttribute(chipClusterPtr, callback, value, null);
+    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAirflowDirectionAttribute(callback, value, 0);
     }
 
-    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AIRFLOW_DIRECTION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMinLevelAttribute(
+    public void subscribeAirflowDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIRFLOW_DIRECTION_ATTRIBUTE_ID);
 
-    public void readMaxLevelAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxLevelAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AIRFLOW_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxLevelAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readIntrinsicBallastFactorAttribute(
-        IntrinsicBallastFactorAttributeCallback callback) {
-        readIntrinsicBallastFactorAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value) {
-        writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeIntrinsicBallastFactorAttribute(
-        IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readBallastFactorAdjustmentAttribute(
-        BallastFactorAdjustmentAttributeCallback callback) {
-        readBallastFactorAdjustmentAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBallastFactorAdjustmentAttribute(
-        BallastFactorAdjustmentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLampQuantityAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readLampQuantityAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void subscribeLampQuantityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void readLampTypeAttribute(
-        CharStringAttributeCallback callback) {
-        readLampTypeAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value) {
-        writeLampTypeAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLampTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 516L;
 
-    public void subscribeLampTypeAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private static final long TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID = 0L;
+    private static final long KEYPAD_LOCKOUT_ATTRIBUTE_ID = 1L;
+    private static final long SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void readLampManufacturerAttribute(
-        CharStringAttributeCallback callback) {
-        readLampManufacturerAttribute(chipClusterPtr, callback);
+    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value) {
-        writeLampManufacturerAttribute(chipClusterPtr, callback, value, null);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLampManufacturerAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeLampManufacturerAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampManufacturerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readLampRatedHoursAttribute(
-        LampRatedHoursAttributeCallback callback) {
-        readLampRatedHoursAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampRatedHoursAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampRatedHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID);
 
-    public void subscribeLampRatedHoursAttribute(
-        LampRatedHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampRatedHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void readLampBurnHoursAttribute(
-        LampBurnHoursAttributeCallback callback) {
-        readLampBurnHoursAttribute(chipClusterPtr, callback);
+    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureDisplayModeAttribute(callback, value, 0);
     }
 
-    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampBurnHoursAttribute(chipClusterPtr, callback, value, null);
+    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampBurnHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID);
 
-    public void subscribeLampBurnHoursAttribute(
-        LampBurnHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampBurnHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLampAlarmModeAttribute(
+    public void readKeypadLockoutAttribute(
         IntegerAttributeCallback callback) {
-        readLampAlarmModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, KEYPAD_LOCKOUT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, KEYPAD_LOCKOUT_ATTRIBUTE_ID, true);
     }
 
-    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLampAlarmModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeKeypadLockoutAttribute(callback, value, 0);
     }
 
-    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLampAlarmModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), KEYPAD_LOCKOUT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLampAlarmModeAttribute(
+    public void subscribeKeypadLockoutAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampAlarmModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, KEYPAD_LOCKOUT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, KEYPAD_LOCKOUT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLampBurnHoursTripPointAttribute(
-        LampBurnHoursTripPointAttributeCallback callback) {
-        readLampBurnHoursTripPointAttribute(chipClusterPtr, callback);
+    public void readScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID, true);
     }
 
-    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, null);
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeScheduleProgrammingVisibilityAttribute(callback, value, 0);
     }
 
-    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLampBurnHoursTripPointAttribute(
-        LampBurnHoursTripPointAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readPhysicalMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class ColorControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 768L;
 
-    private native void subscribePhysicalMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long CURRENT_HUE_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_SATURATION_ATTRIBUTE_ID = 1L;
+    private static final long REMAINING_TIME_ATTRIBUTE_ID = 2L;
+    private static final long CURRENT_X_ATTRIBUTE_ID = 3L;
+    private static final long CURRENT_Y_ATTRIBUTE_ID = 4L;
+    private static final long DRIFT_COMPENSATION_ATTRIBUTE_ID = 5L;
+    private static final long COMPENSATION_TEXT_ATTRIBUTE_ID = 6L;
+    private static final long COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID = 7L;
+    private static final long COLOR_MODE_ATTRIBUTE_ID = 8L;
+    private static final long OPTIONS_ATTRIBUTE_ID = 15L;
+    private static final long NUMBER_OF_PRIMARIES_ATTRIBUTE_ID = 16L;
+    private static final long PRIMARY1_X_ATTRIBUTE_ID = 17L;
+    private static final long PRIMARY1_Y_ATTRIBUTE_ID = 18L;
+    private static final long PRIMARY1_INTENSITY_ATTRIBUTE_ID = 19L;
+    private static final long PRIMARY2_X_ATTRIBUTE_ID = 21L;
+    private static final long PRIMARY2_Y_ATTRIBUTE_ID = 22L;
+    private static final long PRIMARY2_INTENSITY_ATTRIBUTE_ID = 23L;
+    private static final long PRIMARY3_X_ATTRIBUTE_ID = 25L;
+    private static final long PRIMARY3_Y_ATTRIBUTE_ID = 26L;
+    private static final long PRIMARY3_INTENSITY_ATTRIBUTE_ID = 27L;
+    private static final long PRIMARY4_X_ATTRIBUTE_ID = 32L;
+    private static final long PRIMARY4_Y_ATTRIBUTE_ID = 33L;
+    private static final long PRIMARY4_INTENSITY_ATTRIBUTE_ID = 34L;
+    private static final long PRIMARY5_X_ATTRIBUTE_ID = 36L;
+    private static final long PRIMARY5_Y_ATTRIBUTE_ID = 37L;
+    private static final long PRIMARY5_INTENSITY_ATTRIBUTE_ID = 38L;
+    private static final long PRIMARY6_X_ATTRIBUTE_ID = 40L;
+    private static final long PRIMARY6_Y_ATTRIBUTE_ID = 41L;
+    private static final long PRIMARY6_INTENSITY_ATTRIBUTE_ID = 42L;
+    private static final long WHITE_POINT_X_ATTRIBUTE_ID = 48L;
+    private static final long WHITE_POINT_Y_ATTRIBUTE_ID = 49L;
+    private static final long COLOR_POINT_R_X_ATTRIBUTE_ID = 50L;
+    private static final long COLOR_POINT_R_Y_ATTRIBUTE_ID = 51L;
+    private static final long COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID = 52L;
+    private static final long COLOR_POINT_G_X_ATTRIBUTE_ID = 54L;
+    private static final long COLOR_POINT_G_Y_ATTRIBUTE_ID = 55L;
+    private static final long COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID = 56L;
+    private static final long COLOR_POINT_B_X_ATTRIBUTE_ID = 58L;
+    private static final long COLOR_POINT_B_Y_ATTRIBUTE_ID = 59L;
+    private static final long COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID = 60L;
+    private static final long ENHANCED_CURRENT_HUE_ATTRIBUTE_ID = 16384L;
+    private static final long ENHANCED_COLOR_MODE_ATTRIBUTE_ID = 16385L;
+    private static final long COLOR_LOOP_ACTIVE_ATTRIBUTE_ID = 16386L;
+    private static final long COLOR_LOOP_DIRECTION_ATTRIBUTE_ID = 16387L;
+    private static final long COLOR_LOOP_TIME_ATTRIBUTE_ID = 16388L;
+    private static final long COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID = 16389L;
+    private static final long COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID = 16390L;
+    private static final long COLOR_CAPABILITIES_ATTRIBUTE_ID = 16394L;
+    private static final long COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID = 16395L;
+    private static final long COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID = 16396L;
+    private static final long COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID = 16397L;
+    private static final long START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID = 16400L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readPhysicalMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public ColorControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribePhysicalMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readBallastStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToHue(callback, hue, direction, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeBallastStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void readMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long hueFieldID = 0L;
+      BaseTLVType huetlvValue = new UIntType(hue);
+      elements.add(new StructElement(hueFieldID, huetlvValue));
 
-    private native void writeMinLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      final long directionFieldID = 1L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
 
-    private native void subscribeMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void readMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void writeMaxLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void subscribeMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readIntrinsicBallastFactorAttribute(long chipClusterPtr, IntrinsicBallastFactorAttributeCallback callback);
+    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveHue(callback, moveMode, rate, optionsMask, optionsOverride, 0);
+    }
 
-    private native void writeIntrinsicBallastFactorAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeIntrinsicBallastFactorAttribute(long chipClusterPtr, IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void readBallastFactorAdjustmentAttribute(long chipClusterPtr, BallastFactorAdjustmentAttributeCallback callback);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = new UIntType(rate);
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void writeBallastFactorAdjustmentAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeBallastFactorAdjustmentAttribute(long chipClusterPtr, BallastFactorAdjustmentAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readLampQuantityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeLampQuantityAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepHue(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readLampTypeAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void writeLampTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    private native void subscribeLampTypeAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    private native void readLampManufacturerAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void writeLampManufacturerAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeLampManufacturerAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readLampRatedHoursAttribute(long chipClusterPtr, LampRatedHoursAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void writeLampRatedHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToSaturation(callback, saturation, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeLampRatedHoursAttribute(long chipClusterPtr, LampRatedHoursAttributeCallback callback, int minInterval, int maxInterval);
+    public void moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void readLampBurnHoursAttribute(long chipClusterPtr, LampBurnHoursAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long saturationFieldID = 0L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
 
-    private native void writeLampBurnHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void subscribeLampBurnHoursAttribute(long chipClusterPtr, LampBurnHoursAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readLampAlarmModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void writeLampAlarmModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeLampAlarmModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveSaturation(callback, moveMode, rate, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readLampBurnHoursTripPointAttribute(long chipClusterPtr, LampBurnHoursTripPointAttributeCallback callback);
+    public void moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
 
-    private native void writeLampBurnHoursTripPointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void subscribeLampBurnHoursTripPointAttribute(long chipClusterPtr, LampBurnHoursTripPointAttributeCallback callback, int minInterval, int maxInterval);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = new UIntType(rate);
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void stepSaturation(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepSaturation(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void stepSaturation(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void moveToHueAndSaturation(DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToHueAndSaturation(callback, hue, saturation, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-  public static class IlluminanceMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1024L;
+    public void moveToHueAndSaturation(DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 6L;
 
-    public IlluminanceMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long hueFieldID = 0L;
+      BaseTLVType huetlvValue = new UIntType(hue);
+      elements.add(new StructElement(hueFieldID, huetlvValue));
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+      final long saturationFieldID = 1L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public interface LightSensorTypeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void moveToColor(DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToColor(callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void moveToColor(DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long colorXFieldID = 0L;
+      BaseTLVType colorXtlvValue = new UIntType(colorX);
+      elements.add(new StructElement(colorXFieldID, colorXtlvValue));
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long colorYFieldID = 1L;
+      BaseTLVType colorYtlvValue = new UIntType(colorY);
+      elements.add(new StructElement(colorYFieldID, colorYtlvValue));
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride) {
+      moveColor(callback, rateX, rateY, optionsMask, optionsOverride, 0);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
 
-    public void readToleranceAttribute(
-        IntegerAttributeCallback callback) {
-        readToleranceAttribute(chipClusterPtr, callback);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long rateXFieldID = 0L;
+      BaseTLVType rateXtlvValue = new IntType(rateX);
+      elements.add(new StructElement(rateXFieldID, rateXtlvValue));
 
-    public void subscribeToleranceAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLightSensorTypeAttribute(
-        LightSensorTypeAttributeCallback callback) {
-        readLightSensorTypeAttribute(chipClusterPtr, callback);
-    }
+      final long rateYFieldID = 1L;
+      BaseTLVType rateYtlvValue = new IntType(rateY);
+      elements.add(new StructElement(rateYFieldID, rateYtlvValue));
 
-    public void subscribeLightSensorTypeAttribute(
-        LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLightSensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void stepColor(DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepColor(callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void stepColor(DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 9L;
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepXFieldID = 0L;
+      BaseTLVType stepXtlvValue = new IntType(stepX);
+      elements.add(new StructElement(stepXFieldID, stepXtlvValue));
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long stepYFieldID = 1L;
+      BaseTLVType stepYtlvValue = new IntType(stepY);
+      elements.add(new StructElement(stepYFieldID, stepYtlvValue));
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToColorTemperature(callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 10L;
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long colorTemperatureMiredsFieldID = 0L;
+      BaseTLVType colorTemperatureMiredstlvValue = new UIntType(colorTemperatureMireds);
+      elements.add(new StructElement(colorTemperatureMiredsFieldID, colorTemperatureMiredstlvValue));
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public void enhancedMoveToHue(DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveToHue(callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void enhancedMoveToHue(DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 64L;
 
-    private native void subscribeToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long enhancedHueFieldID = 0L;
+      BaseTLVType enhancedHuetlvValue = new UIntType(enhancedHue);
+      elements.add(new StructElement(enhancedHueFieldID, enhancedHuetlvValue));
 
-    private native void readLightSensorTypeAttribute(long chipClusterPtr, LightSensorTypeAttributeCallback callback);
+      final long directionFieldID = 1L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
 
-    private native void subscribeLightSensorTypeAttribute(long chipClusterPtr, LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveHue(callback, moveMode, rate, optionsMask, optionsOverride, 0);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 65L;
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = new UIntType(rate);
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 2L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      final long optionsOverrideFieldID = 3L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void enhancedStepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedStepHue(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void enhancedStepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 66L;
 
-  public static class TemperatureMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1026L;
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    public TemperatureMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveToHueAndSaturation(callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 67L;
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long enhancedHueFieldID = 0L;
+      BaseTLVType enhancedHuetlvValue = new UIntType(enhancedHue);
+      elements.add(new StructElement(enhancedHueFieldID, enhancedHuetlvValue));
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+      final long saturationFieldID = 1L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+      final long optionsOverrideFieldID = 4L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void colorLoopSet(DefaultClusterCallback callback, Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride) {
+      colorLoopSet(callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, 0);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void colorLoopSet(DefaultClusterCallback callback, Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 68L;
 
-    public void readToleranceAttribute(
-        IntegerAttributeCallback callback) {
-        readToleranceAttribute(chipClusterPtr, callback);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long updateFlagsFieldID = 0L;
+      BaseTLVType updateFlagstlvValue = new UIntType(updateFlags);
+      elements.add(new StructElement(updateFlagsFieldID, updateFlagstlvValue));
 
-    public void subscribeToleranceAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long actionFieldID = 1L;
+      BaseTLVType actiontlvValue = new UIntType(action);
+      elements.add(new StructElement(actionFieldID, actiontlvValue));
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+      final long directionFieldID = 2L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long timeFieldID = 3L;
+      BaseTLVType timetlvValue = new UIntType(time);
+      elements.add(new StructElement(timeFieldID, timetlvValue));
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+      final long startHueFieldID = 4L;
+      BaseTLVType startHuetlvValue = new UIntType(startHue);
+      elements.add(new StructElement(startHueFieldID, startHuetlvValue));
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsMaskFieldID = 5L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
+      final long optionsOverrideFieldID = 6L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+    public void stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
+      stopMoveStep(callback, optionsMask, optionsOverride, 0);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 71L;
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long optionsMaskFieldID = 0L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      final long optionsOverrideFieldID = 1L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveColorTemperature(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
+      moveColorTemperature(callback, moveMode, rate, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, 0);
     }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    public void moveColorTemperature(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 75L;
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = new UIntType(rate);
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      final long colorTemperatureMinimumMiredsFieldID = 2L;
+      BaseTLVType colorTemperatureMinimumMiredstlvValue = new UIntType(colorTemperatureMinimumMireds);
+      elements.add(new StructElement(colorTemperatureMinimumMiredsFieldID, colorTemperatureMinimumMiredstlvValue));
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+      final long colorTemperatureMaximumMiredsFieldID = 3L;
+      BaseTLVType colorTemperatureMaximumMiredstlvValue = new UIntType(colorTemperatureMaximumMireds);
+      elements.add(new StructElement(colorTemperatureMaximumMiredsFieldID, colorTemperatureMaximumMiredstlvValue));
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 4L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long optionsOverrideFieldID = 5L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void subscribeToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void stepColorTemperature(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
+      stepColorTemperature(callback, stepMode, stepSize, transitionTime, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void stepColorTemperature(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 76L;
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      final long colorTemperatureMinimumMiredsFieldID = 3L;
+      BaseTLVType colorTemperatureMinimumMiredstlvValue = new UIntType(colorTemperatureMinimumMireds);
+      elements.add(new StructElement(colorTemperatureMinimumMiredsFieldID, colorTemperatureMinimumMiredstlvValue));
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      final long colorTemperatureMaximumMiredsFieldID = 4L;
+      BaseTLVType colorTemperatureMaximumMiredstlvValue = new UIntType(colorTemperatureMaximumMireds);
+      elements.add(new StructElement(colorTemperatureMaximumMiredsFieldID, colorTemperatureMaximumMiredstlvValue));
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 5L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      final long optionsOverrideFieldID = 6L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface NumberOfPrimariesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface Primary1IntensityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-  public static class PressureMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1027L;
+    public interface Primary2IntensityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    public PressureMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public interface Primary3IntensityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface Primary4IntensityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    public interface MeasuredValueAttributeCallback {
+    public interface Primary5IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface Primary6IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface ColorPointRIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ScaledValueAttributeCallback {
+    public interface ColorPointGIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinScaledValueAttributeCallback {
+    public interface ColorPointBIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxScaledValueAttributeCallback {
+    public interface StartUpColorTemperatureMiredsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readCurrentHueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_HUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentHueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_HUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_HUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readCurrentSaturationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SATURATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_SATURATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentSaturationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SATURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_SATURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readRemainingTimeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_TIME_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REMAINING_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRemainingTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMAINING_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REMAINING_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readToleranceAttribute(
+    public void readCurrentXAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_X_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_X_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribeCurrentXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readScaledValueAttribute(
-        ScaledValueAttributeCallback callback) {
-        readScaledValueAttribute(chipClusterPtr, callback);
+    public void readCurrentYAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_Y_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_Y_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeScaledValueAttribute(
-        ScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinScaledValueAttribute(
-        MinScaledValueAttributeCallback callback) {
-        readMinScaledValueAttribute(chipClusterPtr, callback);
+    public void readDriftCompensationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DRIFT_COMPENSATION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DRIFT_COMPENSATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinScaledValueAttribute(
-        MinScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDriftCompensationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DRIFT_COMPENSATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DRIFT_COMPENSATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxScaledValueAttribute(
-        MaxScaledValueAttributeCallback callback) {
-        readMaxScaledValueAttribute(chipClusterPtr, callback);
+    public void readCompensationTextAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMPENSATION_TEXT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COMPENSATION_TEXT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxScaledValueAttribute(
-        MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCompensationTextAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMPENSATION_TEXT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COMPENSATION_TEXT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readScaledToleranceAttribute(
+    public void readColorTemperatureMiredsAttribute(
         IntegerAttributeCallback callback) {
-        readScaledToleranceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeScaledToleranceAttribute(
+    public void subscribeColorTemperatureMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaledToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readScaleAttribute(
+    public void readColorModeAttribute(
         IntegerAttributeCallback callback) {
-        readScaleAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeScaleAttribute(
+    public void subscribeColorModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_MODE_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readOptionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOptionsAttribute(callback, value, 0);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPTIONS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOptionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPTIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPTIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    public void readNumberOfPrimariesAttribute(
+        NumberOfPrimariesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID, true);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeNumberOfPrimariesAttribute(
+        NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(
+    public void readPrimary1XAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_X_ATTRIBUTE_ID);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY1_X_ATTRIBUTE_ID, true);
     }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    public void subscribePrimary1XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_X_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_X_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public void readPrimary1YAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_Y_ATTRIBUTE_ID);
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY1_Y_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public void subscribePrimary1YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_Y_ATTRIBUTE_ID);
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_Y_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPrimary1IntensityAttribute(
+        Primary1IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY1_INTENSITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readScaledValueAttribute(long chipClusterPtr, ScaledValueAttributeCallback callback);
+    public void subscribePrimary1IntensityAttribute(
+        Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeScaledValueAttribute(long chipClusterPtr, ScaledValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinScaledValueAttribute(long chipClusterPtr, MinScaledValueAttributeCallback callback);
+    public void readPrimary2XAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_X_ATTRIBUTE_ID);
 
-    private native void subscribeMinScaledValueAttribute(long chipClusterPtr, MinScaledValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY2_X_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxScaledValueAttribute(long chipClusterPtr, MaxScaledValueAttributeCallback callback);
+    public void subscribePrimary2XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_X_ATTRIBUTE_ID);
 
-    private native void subscribeMaxScaledValueAttribute(long chipClusterPtr, MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_X_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readScaledToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPrimary2YAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_Y_ATTRIBUTE_ID);
 
-    private native void subscribeScaledToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY2_Y_ATTRIBUTE_ID, true);
+    }
 
-    private native void readScaleAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePrimary2YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_Y_ATTRIBUTE_ID);
 
-    private native void subscribeScaleAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_Y_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readPrimary2IntensityAttribute(
+        Primary2IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY2_INTENSITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribePrimary2IntensityAttribute(
+        Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readPrimary3XAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_X_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY3_X_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribePrimary3XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_X_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY3_X_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readPrimary3YAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_Y_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY3_Y_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePrimary3YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_Y_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY3_Y_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class FlowMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1028L;
+    public void readPrimary3IntensityAttribute(
+        Primary3IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_INTENSITY_ATTRIBUTE_ID);
 
-    public FlowMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY3_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribePrimary3IntensityAttribute(
+        Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_INTENSITY_ATTRIBUTE_ID);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY3_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readPrimary4XAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_X_ATTRIBUTE_ID);
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY4_X_ATTRIBUTE_ID, true);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribePrimary4XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_X_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY4_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readPrimary4YAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_Y_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY4_Y_ATTRIBUTE_ID, true);
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribePrimary4YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_Y_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY4_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void readPrimary4IntensityAttribute(
+        Primary4IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_INTENSITY_ATTRIBUTE_ID);
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY4_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribePrimary4IntensityAttribute(
+        Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_INTENSITY_ATTRIBUTE_ID);
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY4_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readToleranceAttribute(
+    public void readPrimary5XAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_X_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY5_X_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribePrimary5XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_X_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY5_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readPrimary5YAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_Y_ATTRIBUTE_ID);
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY5_Y_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribePrimary5YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_Y_ATTRIBUTE_ID);
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY5_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readPrimary5IntensityAttribute(
+        Primary5IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_INTENSITY_ATTRIBUTE_ID);
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY5_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary5IntensityAttribute(
+        Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_INTENSITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY5_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readPrimary6XAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_X_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY6_X_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary6XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY6_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(
+    public void readPrimary6YAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_Y_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY6_Y_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribePrimary6YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY6_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    public void readPrimary6IntensityAttribute(
+        Primary6IntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRIMARY6_INTENSITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public void subscribePrimary6IntensityAttribute(
+        Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_INTENSITY_ATTRIBUTE_ID);
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY6_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public void readWhitePointXAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_X_ATTRIBUTE_ID);
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WHITE_POINT_X_ATTRIBUTE_ID, true);
+    }
 
-    private native void readToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointXAttribute(callback, value, 0);
+    }
 
-    private native void subscribeToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WHITE_POINT_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeWhitePointXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_X_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WHITE_POINT_X_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readWhitePointYAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_Y_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WHITE_POINT_Y_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointYAttribute(callback, value, 0);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WHITE_POINT_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeWhitePointYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_Y_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WHITE_POINT_Y_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readColorPointRXAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_X_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_R_X_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRXAttribute(callback, value, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-  public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1029L;
+    public void subscribeColorPointRXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_X_ATTRIBUTE_ID);
 
-    public RelativeHumidityMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_R_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readColorPointRYAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_Y_ATTRIBUTE_ID);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_R_Y_ATTRIBUTE_ID, true);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRYAttribute(callback, value, 0);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeColorPointRYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_Y_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_R_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readColorPointRIntensityAttribute(
+        ColorPointRIntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRIntensityAttribute(callback, value, 0);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeColorPointRIntensityAttribute(
+        ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID);
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readColorPointGXAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_X_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_G_X_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGXAttribute(callback, value, 0);
     }
 
-    public void readToleranceAttribute(
-        IntegerAttributeCallback callback) {
-        readToleranceAttribute(chipClusterPtr, callback);
+    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribeColorPointGXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_X_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_G_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readColorPointGYAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_Y_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_G_Y_ATTRIBUTE_ID, true);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGYAttribute(callback, value, 0);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeColorPointGYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_Y_ATTRIBUTE_ID);
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_G_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    public void readColorPointGIntensityAttribute(
+        ColorPointGIntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGIntensityAttribute(callback, value, 0);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeColorPointGIntensityAttribute(
+        ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeToleranceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readColorPointBXAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_X_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_B_X_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBXAttribute(callback, value, 0);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeColorPointBXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_X_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_B_X_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readColorPointBYAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_Y_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_B_Y_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBYAttribute(callback, value, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-  public static class OccupancySensingCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1030L;
+    public void subscribeColorPointBYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_Y_ATTRIBUTE_ID);
 
-    public OccupancySensingCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_B_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readColorPointBIntensityAttribute(
+        ColorPointBIntensityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBIntensityAttribute(callback, value, 0);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeColorPointBIntensityAttribute(
+        ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOccupancyAttribute(
+    public void readEnhancedCurrentHueAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENHANCED_CURRENT_HUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENHANCED_CURRENT_HUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupancyAttribute(
+    public void subscribeEnhancedCurrentHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENHANCED_CURRENT_HUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENHANCED_CURRENT_HUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOccupancySensorTypeAttribute(
+    public void readEnhancedColorModeAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancySensorTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENHANCED_COLOR_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENHANCED_COLOR_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupancySensorTypeAttribute(
+    public void subscribeEnhancedColorModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancySensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENHANCED_COLOR_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENHANCED_COLOR_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readOccupancySensorTypeBitmapAttribute(
+    public void readColorLoopActiveAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_ACTIVE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_LOOP_ACTIVE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOccupancySensorTypeBitmapAttribute(
+    public void subscribeColorLoopActiveAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_ACTIVE_ATTRIBUTE_ID);
 
-    public void readPIROccupiedToUnoccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readPIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_LOOP_ACTIVE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorLoopDirectionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID);
 
-    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePIROccupiedToUnoccupiedDelayAttribute(
+    public void subscribeColorLoopDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID);
 
-    public void readPIRUnoccupiedToOccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readPIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorLoopTimeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_TIME_ATTRIBUTE_ID);
 
-    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_LOOP_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePIRUnoccupiedToOccupiedDelayAttribute(
+    public void subscribeColorLoopTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_TIME_ATTRIBUTE_ID);
 
-    public void readPIRUnoccupiedToOccupiedThresholdAttribute(
-        IntegerAttributeCallback callback) {
-        readPIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_LOOP_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorLoopStartEnhancedHueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID);
 
-    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePIRUnoccupiedToOccupiedThresholdAttribute(
+    public void subscribeColorLoopStartEnhancedHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID);
 
-    public void readUltrasonicOccupiedToUnoccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorLoopStoredEnhancedHueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID);
 
-    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+    public void subscribeColorLoopStoredEnhancedHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID);
 
-    public void readUltrasonicUnoccupiedToOccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorCapabilitiesAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_CAPABILITIES_ATTRIBUTE_ID);
 
-    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_CAPABILITIES_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+    public void subscribeColorCapabilitiesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_CAPABILITIES_ATTRIBUTE_ID);
 
-    public void readUltrasonicUnoccupiedToOccupiedThresholdAttribute(
-        IntegerAttributeCallback callback) {
-        readUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_CAPABILITIES_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorTempPhysicalMinMiredsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID);
 
-    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+    public void subscribeColorTempPhysicalMinMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID);
 
-    public void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readPhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readColorTempPhysicalMaxMiredsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID);
 
-    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+    public void subscribeColorTempPhysicalMaxMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID);
 
-    public void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
-        readPhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readCoupleColorTempToLevelMinMiredsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID);
 
-    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
+    public void subscribeCoupleColorTempToLevelMinMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-        IntegerAttributeCallback callback) {
-        readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+    public void readStartUpColorTemperatureMiredsAttribute(
+        StartUpColorTemperatureMiredsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID, true);
     }
 
-    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpColorTemperatureMiredsAttribute(callback, value, 0);
     }
 
-    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStartUpColorTemperatureMiredsAttribute(
+        StartUpColorTemperatureMiredsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class BallastConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 769L;
 
-    private native void subscribeOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID = 0L;
+    private static final long PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID = 1L;
+    private static final long BALLAST_STATUS_ATTRIBUTE_ID = 2L;
+    private static final long MIN_LEVEL_ATTRIBUTE_ID = 16L;
+    private static final long MAX_LEVEL_ATTRIBUTE_ID = 17L;
+    private static final long INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID = 20L;
+    private static final long BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID = 21L;
+    private static final long LAMP_QUANTITY_ATTRIBUTE_ID = 32L;
+    private static final long LAMP_TYPE_ATTRIBUTE_ID = 48L;
+    private static final long LAMP_MANUFACTURER_ATTRIBUTE_ID = 49L;
+    private static final long LAMP_RATED_HOURS_ATTRIBUTE_ID = 50L;
+    private static final long LAMP_BURN_HOURS_ATTRIBUTE_ID = 51L;
+    private static final long LAMP_ALARM_MODE_ATTRIBUTE_ID = 52L;
+    private static final long LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID = 53L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readOccupancySensorTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public BallastConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeOccupancySensorTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readOccupancySensorTypeBitmapAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface IntrinsicBallastFactorAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeOccupancySensorTypeBitmapAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface BallastFactorAdjustmentAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readPIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface LampRatedHoursAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void writePIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface LampBurnHoursAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void subscribePIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface LampBurnHoursTripPointAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
+    }
 
-    private native void readPIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writePIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribePIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writePIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readPhysicalMinLevelAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribePIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePhysicalMinLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID);
 
-    private native void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readPhysicalMaxLevelAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID);
 
-    private native void readUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribePhysicalMaxLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readBallastStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_STATUS_ATTRIBUTE_ID);
 
-    private native void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BALLAST_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeBallastStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_STATUS_ATTRIBUTE_ID);
 
-    private native void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BALLAST_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readMinLevelAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinLevelAttribute(callback, value, 0);
+    }
 
-    private native void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MIN_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeMinLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_LEVEL_ATTRIBUTE_ID);
 
-    private native void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readMaxLevelAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_LEVEL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxLevelAttribute(callback, value, 0);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MAX_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeMaxLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_LEVEL_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readIntrinsicBallastFactorAttribute(
+        IntrinsicBallastFactorAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value) {
+      writeIntrinsicBallastFactorAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeIntrinsicBallastFactorAttribute(
+        IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readBallastFactorAdjustmentAttribute(
+        BallastFactorAdjustmentAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID, true);
+    }
 
-  public static class CarbonMonoxideConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1036L;
+    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBallastFactorAdjustmentAttribute(callback, value, 0);
+    }
 
-    public CarbonMonoxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeBallastFactorAdjustmentAttribute(
+        BallastFactorAdjustmentAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readLampQuantityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_QUANTITY_ATTRIBUTE_ID);
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_QUANTITY_ATTRIBUTE_ID, true);
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeLampQuantityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_QUANTITY_ATTRIBUTE_ID);
 
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_QUANTITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readLampTypeAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_TYPE_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_TYPE_ATTRIBUTE_ID, true);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value) {
+      writeLampTypeAttribute(callback, value, 0);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLampTypeAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_TYPE_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readLampManufacturerAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_MANUFACTURER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_MANUFACTURER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value) {
+      writeLampManufacturerAttribute(callback, value, 0);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_MANUFACTURER_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLampManufacturerAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_MANUFACTURER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_MANUFACTURER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readLampRatedHoursAttribute(
+        LampRatedHoursAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_RATED_HOURS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_RATED_HOURS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampRatedHoursAttribute(callback, value, 0);
     }
 
-    public void readPeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_RATED_HOURS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLampRatedHoursAttribute(
+        LampRatedHoursAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_RATED_HOURS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_RATED_HOURS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readLampBurnHoursAttribute(
+        LampBurnHoursAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_BURN_HOURS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_BURN_HOURS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampBurnHoursAttribute(callback, value, 0);
     }
 
-    public void readAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_BURN_HOURS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLampBurnHoursAttribute(
+        LampBurnHoursAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_BURN_HOURS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_BURN_HOURS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readUncertaintyAttribute(
-        FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+    public void readLampAlarmModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_ALARM_MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_ALARM_MODE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUncertaintyAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLampAlarmModeAttribute(callback, value, 0);
     }
 
-    public void readMeasurementUnitAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_ALARM_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMeasurementUnitAttribute(
+    public void subscribeLampAlarmModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_ALARM_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_ALARM_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementMediumAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+    public void readLampBurnHoursTripPointAttribute(
+        LampBurnHoursTripPointAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementMediumAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampBurnHoursTripPointAttribute(callback, value, 0);
     }
 
-    public void readLevelValueAttribute(
-        IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLevelValueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLampBurnHoursTripPointAttribute(
+        LampBurnHoursTripPointAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
-
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class CarbonDioxideConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1037L;
+  public static class IlluminanceMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1024L;
 
-    public CarbonDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long TOLERANCE_ATTRIBUTE_ID = 3L;
+    private static final long LIGHT_SENSOR_TYPE_ATTRIBUTE_ID = 4L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public IlluminanceMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface LightSensorTypeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void readPeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribePeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readToleranceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    public void readPeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    public void readAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readLightSensorTypeAttribute(
+        LightSensorTypeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID);
 
-    public void readAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeLightSensorTypeAttribute(
+        LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID);
 
-    public void readUncertaintyAttribute(
-        FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeUncertaintyAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readMeasurementUnitAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementUnitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readMeasurementMediumAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeMeasurementMediumAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readLevelValueAttribute(
-        IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLevelValueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
+
+  public static class TemperatureMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1026L;
+
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long TOLERANCE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public TemperatureMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
+
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
+
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
+
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
+
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
+
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
+
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
+
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
+
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public void readToleranceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class NitrogenDioxideConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1043L;
+  public static class PressureMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1027L;
 
-    public NitrogenDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long TOLERANCE_ATTRIBUTE_ID = 3L;
+    private static final long SCALED_VALUE_ATTRIBUTE_ID = 16L;
+    private static final long MIN_SCALED_VALUE_ATTRIBUTE_ID = 17L;
+    private static final long MAX_SCALED_VALUE_ATTRIBUTE_ID = 18L;
+    private static final long SCALED_TOLERANCE_ATTRIBUTE_ID = 19L;
+    private static final long SCALE_ATTRIBUTE_ID = 20L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public PressureMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface ScaledValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MinScaledValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface MaxScaledValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
+
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void readPeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribePeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readToleranceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    public void readPeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    public void readAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readScaledValueAttribute(
+        ScaledValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALED_VALUE_ATTRIBUTE_ID);
 
-    public void readAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCALED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeScaledValueAttribute(
+        ScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCALED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readUncertaintyAttribute(
-        FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+    public void readMinScaledValueAttribute(
+        MinScaledValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SCALED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_SCALED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUncertaintyAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinScaledValueAttribute(
+        MinScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SCALED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_SCALED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementUnitAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+    public void readMaxScaledValueAttribute(
+        MaxScaledValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SCALED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_SCALED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementUnitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxScaledValueAttribute(
+        MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SCALED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_SCALED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementMediumAttribute(
+    public void readScaledToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALED_TOLERANCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCALED_TOLERANCE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementMediumAttribute(
+    public void subscribeScaledToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALED_TOLERANCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCALED_TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLevelValueAttribute(
+    public void readScaleAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SCALE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLevelValueAttribute(
+    public void subscribeScaleAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCALE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SCALE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+  public static class FlowMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1028L;
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long TOLERANCE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public FlowMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readToleranceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-  public static class OzoneConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1045L;
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public OzoneConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+  public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1029L;
+
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long TOLERANCE_ATTRIBUTE_ID = 3L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public RelativeHumidityMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readPeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void subscribePeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readPeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribePeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readUncertaintyAttribute(
-        FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUncertaintyAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementUnitAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementUnitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementMediumAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementMediumAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLevelValueAttribute(
+    public void readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLevelValueAttribute(
+    public void subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOLERANCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOLERANCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+  public static class OccupancySensingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1030L;
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long OCCUPANCY_ATTRIBUTE_ID = 0L;
+    private static final long OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID = 1L;
+    private static final long OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID = 2L;
+    private static final long P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 16L;
+    private static final long P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 17L;
+    private static final long P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 18L;
+    private static final long ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 32L;
+    private static final long ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 33L;
+    private static final long ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 34L;
+    private static final long PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 48L;
+    private static final long PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 49L;
+    private static final long PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 50L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public OccupancySensingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readOccupancyAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_ATTRIBUTE_ID);
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPANCY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public void subscribeOccupancyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_ATTRIBUTE_ID);
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPANCY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readOccupancySensorTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public void subscribeOccupancySensorTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID);
 
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readOccupancySensorTypeBitmapAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeOccupancySensorTypeBitmapAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPIROccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIROccupiedToUnoccupiedDelayAttribute(callback, value, 0);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribePIROccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readPIRUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIRUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribePIRUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPIRUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true);
+    }
 
-  public static class Pm25ConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1066L;
+    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIRUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
+    }
 
-    public Pm25ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribePIRUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readUltrasonicOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicOccupiedToUnoccupiedDelayAttribute(callback, value, 0);
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readUltrasonicUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
     }
 
-    public void readPeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribePeakMeasuredValueAttribute(
-        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
 
-    public void readPeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribePeakMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
 
-    public void readAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageMeasuredValueAttribute(
-        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactOccupiedToUnoccupiedDelayAttribute(callback, value, 0);
     }
 
-    public void readAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAverageMeasuredValueWindowAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readUncertaintyAttribute(
-        FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+    public void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeUncertaintyAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
     }
 
-    public void readMeasurementUnitAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeMeasurementUnitAttribute(
+    public void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasurementMediumAttribute(
+    public void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasurementMediumAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
     }
 
-    public void readLevelValueAttribute(
-        IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLevelValueAttribute(
+    public void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
-
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class FormaldehydeConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1067L;
+  public static class CarbonMonoxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1036L;
 
-    public FormaldehydeConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public CarbonMonoxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface MeasuredValueAttributeCallback {
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUncertaintyAttribute(
         FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUncertaintyAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
-
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class Pm1ConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1068L;
+  public static class CarbonDioxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1037L;
 
-    public Pm1ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public CarbonDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface MeasuredValueAttributeCallback {
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUncertaintyAttribute(
         FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUncertaintyAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+  public static class NitrogenDioxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1043L;
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public NitrogenDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class Pm10ConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1069L;
-
-    public Pm10ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface PeakMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AverageMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUncertaintyAttribute(
         FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUncertaintyAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
-
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1070L;
+  public static class OzoneConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1045L;
 
-    public TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public OzoneConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface MeasuredValueAttributeCallback {
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUncertaintyAttribute(
         FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUncertaintyAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
-
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class RadonConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1071L;
+  public static class Pm25ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1066L;
 
-    public RadonConcentrationMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public Pm25ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    public interface MeasuredValueAttributeCallback {
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface PeakMeasuredValueAttributeCallback {
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AverageMeasuredValueAttributeCallback {
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback) {
-        readMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasuredValueAttribute(
         MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback) {
-        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMinMeasuredValueAttribute(
         MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback) {
-        readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMaxMeasuredValueAttribute(
         MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback) {
-        readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueAttribute(
         PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribePeakMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback) {
-        readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueAttribute(
         AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback) {
-        readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAverageMeasuredValueWindowAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readUncertaintyAttribute(
         FloatAttributeCallback callback) {
-        readUncertaintyAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
     public void subscribeUncertaintyAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementUnitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementUnitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readMeasurementMediumAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
     public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readLevelValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, MeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+  public static class FormaldehydeConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1067L;
 
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public FormaldehydeConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeLevelValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readPeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readPeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class WakeOnLanCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1283L;
+    public void readAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public WakeOnLanCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readUncertaintyAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
-    public void readMACAddressAttribute(
-        CharStringAttributeCallback callback) {
-        readMACAddressAttribute(chipClusterPtr, callback);
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeMACAddressAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMACAddressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readMeasurementUnitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readMACAddressAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeMACAddressAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+  public static class Pm1ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1068L;
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public Pm1ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-  public static class ChannelCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1284L;
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public ChannelCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void changeChannel(ChangeChannelResponseCallback callback, String match) {
-      changeChannel(chipClusterPtr, callback, match, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void changeChannel(ChangeChannelResponseCallback callback, String match, int timedInvokeTimeoutMs) {
-      changeChannel(chipClusterPtr, callback, match, timedInvokeTimeoutMs);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) {
-      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, null);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber, int timedInvokeTimeoutMs) {
-      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, timedInvokeTimeoutMs);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void skipChannel(DefaultClusterCallback callback, Integer count) {
-      skipChannel(chipClusterPtr, callback, count, null);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void skipChannel(DefaultClusterCallback callback, Integer count, int timedInvokeTimeoutMs) {
-      skipChannel(chipClusterPtr, callback, count, timedInvokeTimeoutMs);
+    public void readPeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    private native void changeChannel(long chipClusterPtr, ChangeChannelResponseCallback callback, String match, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void changeChannelByNumber(long chipClusterPtr, DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void skipChannel(long chipClusterPtr, DefaultClusterCallback callback, Integer count, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public interface ChangeChannelResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public interface ChannelListAttributeCallback {
-      void onSuccess(List<ChipStructs.ChannelClusterChannelInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface LineupAttributeCallback {
-      void onSuccess(@Nullable ChipStructs.ChannelClusterLineupInfoStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public interface CurrentChannelAttributeCallback {
-      void onSuccess(@Nullable ChipStructs.ChannelClusterChannelInfoStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readUncertaintyAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readChannelListAttribute(
-        ChannelListAttributeCallback callback) {
-        readChannelListAttribute(chipClusterPtr, callback);
+    public void readMeasurementUnitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeChannelListAttribute(
-        ChannelListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLineupAttribute(
-        LineupAttributeCallback callback) {
-        readLineupAttribute(chipClusterPtr, callback);
+    public void readMeasurementMediumAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLineupAttribute(
-        LineupAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLineupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentChannelAttribute(
-        CurrentChannelAttributeCallback callback) {
-        readCurrentChannelAttribute(chipClusterPtr, callback);
+    public void readLevelValueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentChannelAttribute(
-        CurrentChannelAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentChannelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void readChannelListAttribute(long chipClusterPtr, ChannelListAttributeCallback callback);
+  public static class Pm10ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1069L;
 
-    private native void subscribeChannelListAttribute(long chipClusterPtr, ChannelListAttributeCallback callback, int minInterval, int maxInterval);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void readLineupAttribute(long chipClusterPtr, LineupAttributeCallback callback);
+    public Pm10ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeLineupAttribute(long chipClusterPtr, LineupAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readCurrentChannelAttribute(long chipClusterPtr, CurrentChannelAttributeCallback callback);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribeCurrentChannelAttribute(long chipClusterPtr, CurrentChannelAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
+
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-  public static class TargetNavigatorCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1285L;
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public TargetNavigatorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void navigateTarget(NavigateTargetResponseCallback callback, Integer target, Optional<String> data) {
-      navigateTarget(chipClusterPtr, callback, target, data, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void navigateTarget(NavigateTargetResponseCallback callback, Integer target, Optional<String> data, int timedInvokeTimeoutMs) {
-      navigateTarget(chipClusterPtr, callback, target, data, timedInvokeTimeoutMs);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void navigateTarget(long chipClusterPtr, NavigateTargetResponseCallback callback, Integer target, Optional<String> data, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public interface NavigateTargetResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public interface TargetListAttributeCallback {
-      void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readPeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTargetListAttribute(
-        TargetListAttributeCallback callback) {
-        readTargetListAttribute(chipClusterPtr, callback);
+    public void readAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTargetListAttribute(
-        TargetListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentTargetAttribute(
+    public void readUncertaintyAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentTargetAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentTargetAttribute(
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentTargetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readTargetListAttribute(long chipClusterPtr, TargetListAttributeCallback callback);
-
-    private native void subscribeTargetListAttribute(long chipClusterPtr, TargetListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentTargetAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentTargetAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class MediaPlaybackCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1286L;
+  public static class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1070L;
 
-    public MediaPlaybackCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void play(PlaybackResponseCallback callback) {
-      play(chipClusterPtr, callback, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void play(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      play(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void pause(PlaybackResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void pause(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void stop(PlaybackResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void stop(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void startOver(PlaybackResponseCallback callback) {
-      startOver(chipClusterPtr, callback, null);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void startOver(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      startOver(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void previous(PlaybackResponseCallback callback) {
-      previous(chipClusterPtr, callback, null);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void previous(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      previous(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void next(PlaybackResponseCallback callback) {
-      next(chipClusterPtr, callback, null);
-    }
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void next(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      next(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void rewind(PlaybackResponseCallback callback) {
-      rewind(chipClusterPtr, callback, null);
-    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void rewind(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      rewind(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void fastForward(PlaybackResponseCallback callback) {
-      fastForward(chipClusterPtr, callback, null);
-    }
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void fastForward(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      fastForward(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
-    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
-    }
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void seek(PlaybackResponseCallback callback, Long position) {
-      seek(chipClusterPtr, callback, position, null);
-    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void seek(PlaybackResponseCallback callback, Long position, int timedInvokeTimeoutMs) {
-      seek(chipClusterPtr, callback, position, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void play(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void pause(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void stop(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void startOver(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void previous(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readPeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    private native void next(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
+    }
 
-    private native void rewind(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    private native void fastForward(long chipClusterPtr, PlaybackResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void skipForward(long chipClusterPtr, PlaybackResponseCallback callback, Long deltaPositionMilliseconds, @Nullable Integer timedInvokeTimeoutMs);
+    public void readAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void skipBackward(long chipClusterPtr, PlaybackResponseCallback callback, Long deltaPositionMilliseconds, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void seek(long chipClusterPtr, PlaybackResponseCallback callback, Long position, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public interface PlaybackResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface StartTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public interface DurationAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public interface SampledPositionAttributeCallback {
-      void onSuccess(@Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public interface SeekRangeEndAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface SeekRangeStartAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readUncertaintyAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readMeasurementUnitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentStateAttribute(
+    public void readMeasurementMediumAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentStateAttribute(
+    public void subscribeMeasurementMediumAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
 
-    public void readStartTimeAttribute(
-        StartTimeAttributeCallback callback) {
-        readStartTimeAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeStartTimeAttribute(
-        StartTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readLevelValueAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
 
-    public void readDurationAttribute(
-        DurationAttributeCallback callback) {
-        readDurationAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDurationAttribute(
-        DurationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSampledPositionAttribute(
-        SampledPositionAttributeCallback callback) {
-        readSampledPositionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSampledPositionAttribute(
-        SampledPositionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSampledPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPlaybackSpeedAttribute(
-        FloatAttributeCallback callback) {
-        readPlaybackSpeedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePlaybackSpeedAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSeekRangeEndAttribute(
-        SeekRangeEndAttributeCallback callback) {
-        readSeekRangeEndAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSeekRangeEndAttribute(
-        SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSeekRangeStartAttribute(
-        SeekRangeStartAttributeCallback callback) {
-        readSeekRangeStartAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
 
-    public void subscribeSeekRangeStartAttribute(
-        SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSeekRangeStartAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readCurrentStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeCurrentStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  public static class RadonConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1071L;
 
-    private native void readStartTimeAttribute(long chipClusterPtr, StartTimeAttributeCallback callback);
+    private static final long MEASURED_VALUE_ATTRIBUTE_ID = 0L;
+    private static final long MIN_MEASURED_VALUE_ATTRIBUTE_ID = 1L;
+    private static final long MAX_MEASURED_VALUE_ATTRIBUTE_ID = 2L;
+    private static final long PEAK_MEASURED_VALUE_ATTRIBUTE_ID = 3L;
+    private static final long PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 4L;
+    private static final long AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID = 5L;
+    private static final long AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID = 6L;
+    private static final long UNCERTAINTY_ATTRIBUTE_ID = 7L;
+    private static final long MEASUREMENT_UNIT_ATTRIBUTE_ID = 8L;
+    private static final long MEASUREMENT_MEDIUM_ATTRIBUTE_ID = 9L;
+    private static final long LEVEL_VALUE_ATTRIBUTE_ID = 10L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeStartTimeAttribute(long chipClusterPtr, StartTimeAttributeCallback callback, int minInterval, int maxInterval);
+    public RadonConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readDurationAttribute(long chipClusterPtr, DurationAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeDurationAttribute(long chipClusterPtr, DurationAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readSampledPositionAttribute(long chipClusterPtr, SampledPositionAttributeCallback callback);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribeSampledPositionAttribute(long chipClusterPtr, SampledPositionAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPlaybackSpeedAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePlaybackSpeedAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readSeekRangeEndAttribute(long chipClusterPtr, SeekRangeEndAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeSeekRangeEndAttribute(long chipClusterPtr, SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readSeekRangeStartAttribute(long chipClusterPtr, SeekRangeStartAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeSeekRangeStartAttribute(long chipClusterPtr, SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class MediaInputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1287L;
+    public void readPeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public MediaInputCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void selectInput(DefaultClusterCallback callback, Integer index) {
-      selectInput(chipClusterPtr, callback, index, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void selectInput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectInput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
-    }
+    public void readPeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public void showInputStatus(DefaultClusterCallback callback) {
-      showInputStatus(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
     }
 
-    public void showInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      showInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public void hideInputStatus(DefaultClusterCallback callback) {
-      hideInputStatus(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PEAK_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void hideInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      hideInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    public void renameInput(DefaultClusterCallback callback, Integer index, String name) {
-      renameInput(chipClusterPtr, callback, index, name, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void renameInput(DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
-      renameInput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
-    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void selectInput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, true);
+    }
 
-    private native void renameInput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, String name, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID);
 
-    public interface InputListAttributeCallback {
-      void onSuccess(List<ChipStructs.MediaInputClusterInputInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_MEASURED_VALUE_WINDOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readUncertaintyAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNCERTAINTY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNCERTAINTY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readMeasurementUnitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_UNIT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_UNIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readInputListAttribute(
-        InputListAttributeCallback callback) {
-        readInputListAttribute(chipClusterPtr, callback);
+    public void readMeasurementMediumAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeInputListAttribute(
-        InputListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_MEDIUM_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_MEDIUM_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCurrentInputAttribute(
+    public void readLevelValueAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentInputAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeCurrentInputAttribute(
+    public void subscribeLevelValueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentInputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LEVEL_VALUE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LEVEL_VALUE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readInputListAttribute(long chipClusterPtr, InputListAttributeCallback callback);
-
-    private native void subscribeInputListAttribute(long chipClusterPtr, InputListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentInputAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentInputAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
-  public static class LowPowerCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1288L;
+  public static class WakeOnLanCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1283L;
 
-    public LowPowerCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    private static final long M_A_C_ADDRESS_ATTRIBUTE_ID = 0L;
+    private static final long LINK_LOCAL_ADDRESS_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public WakeOnLanCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void sleep(DefaultClusterCallback callback) {
-      sleep(chipClusterPtr, callback, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void sleep(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      sleep(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    private native void sleep(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GeneratedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void readMACAddressAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, M_A_C_ADDRESS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, M_A_C_ADDRESS_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeMACAddressAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, M_A_C_ADDRESS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, M_A_C_ADDRESS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readLinkLocalAddressAttribute(
+        OctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINK_LOCAL_ADDRESS_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LINK_LOCAL_ADDRESS_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeLinkLocalAddressAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINK_LOCAL_ADDRESS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LINK_LOCAL_ADDRESS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
+
+  public static class ChannelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1284L;
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private static final long CHANNEL_LIST_ATTRIBUTE_ID = 0L;
+    private static final long LINEUP_ATTRIBUTE_ID = 1L;
+    private static final long CURRENT_CHANNEL_ATTRIBUTE_ID = 2L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public ChannelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void changeChannel(ChangeChannelResponseCallback callback, String match) {
+      changeChannel(callback, match, 0);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void changeChannel(ChangeChannelResponseCallback callback, String match, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long matchFieldID = 0L;
+      BaseTLVType matchtlvValue = new StringType(match);
+      elements.add(new StructElement(matchFieldID, matchtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) {
+      changeChannelByNumber(callback, majorNumber, minorNumber, 0);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long majorNumberFieldID = 0L;
+      BaseTLVType majorNumbertlvValue = new UIntType(majorNumber);
+      elements.add(new StructElement(majorNumberFieldID, majorNumbertlvValue));
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      final long minorNumberFieldID = 1L;
+      BaseTLVType minorNumbertlvValue = new UIntType(minorNumber);
+      elements.add(new StructElement(minorNumberFieldID, minorNumbertlvValue));
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void skipChannel(DefaultClusterCallback callback, Integer count) {
+      skipChannel(callback, count, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void skipChannel(DefaultClusterCallback callback, Integer count, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-  public static class KeypadInputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1289L;
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long countFieldID = 0L;
+      BaseTLVType counttlvValue = new IntType(count);
+      elements.add(new StructElement(countFieldID, counttlvValue));
 
-    public KeypadInputCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface ChangeChannelResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> data);
+    }
 
-    public void sendKey(SendKeyResponseCallback callback, Integer keyCode) {
-      sendKey(chipClusterPtr, callback, keyCode, null);
+    public interface ChannelListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.ChannelClusterChannelInfoStruct> value);
     }
 
-    public void sendKey(SendKeyResponseCallback callback, Integer keyCode, int timedInvokeTimeoutMs) {
-      sendKey(chipClusterPtr, callback, keyCode, timedInvokeTimeoutMs);
+    public interface LineupAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ChannelClusterLineupInfoStruct value);
     }
 
-    private native void sendKey(long chipClusterPtr, SendKeyResponseCallback callback, Integer keyCode, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface SendKeyResponseCallback {
-      void onSuccess(Integer status);
-      void onError(Exception error);
+    public interface CurrentChannelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ChannelClusterChannelInfoStruct value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readChannelListAttribute(
+        ChannelListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ChannelClusterChannelInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHANNEL_LIST_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeChannelListAttribute(
+        ChannelListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANNEL_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.ChannelClusterChannelInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANNEL_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readLineupAttribute(
+        LineupAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINEUP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ChannelClusterLineupInfoStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LINEUP_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeLineupAttribute(
+        LineupAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINEUP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ChannelClusterLineupInfoStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LINEUP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readCurrentChannelAttribute(
+        CurrentChannelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_CHANNEL_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ChannelClusterChannelInfoStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_CHANNEL_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeCurrentChannelAttribute(
+        CurrentChannelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_CHANNEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ChannelClusterChannelInfoStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_CHANNEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class ContentLauncherCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1290L;
-
-    public ContentLauncherCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+  public static class TargetNavigatorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1285L;
 
-    public void launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
-    }
+    private static final long TARGET_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_TARGET_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data, int timedInvokeTimeoutMs) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, timedInvokeTimeoutMs);
+    public TargetNavigatorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void launchURL(LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void launchURL(LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation, int timedInvokeTimeoutMs) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, timedInvokeTimeoutMs);
+    public void navigateTarget(NavigateTargetResponseCallback callback, Integer target, Optional<String> data) {
+      navigateTarget(callback, target, data, 0);
     }
 
-    private native void launchContent(long chipClusterPtr, LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void launchURL(long chipClusterPtr, LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface LauncherResponseCallback {
+    public void navigateTarget(NavigateTargetResponseCallback callback, Integer target, Optional<String> data, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long targetFieldID = 0L;
+      BaseTLVType targettlvValue = new UIntType(target);
+      elements.add(new StructElement(targetFieldID, targettlvValue));
+
+      final long dataFieldID = 1L;
+      BaseTLVType datatlvValue = data.<BaseTLVType>map((nonOptionaldata) -> new StringType(nonOptionaldata)).orElse(new EmptyType());
+      elements.add(new StructElement(dataFieldID, datatlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface NavigateTargetResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Optional<String> data);
-      void onError(Exception error);
     }
 
-    public interface AcceptHeaderAttributeCallback {
-      void onSuccess(List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface TargetListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readAcceptHeaderAttribute(
-        AcceptHeaderAttributeCallback callback) {
-        readAcceptHeaderAttribute(chipClusterPtr, callback);
-    }
+    public void readTargetListAttribute(
+        TargetListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LIST_ATTRIBUTE_ID);
 
-    public void subscribeAcceptHeaderAttribute(
-        AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptHeaderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readSupportedStreamingProtocolsAttribute(
-        LongAttributeCallback callback) {
-        readSupportedStreamingProtocolsAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeTargetListAttribute(
+        TargetListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LIST_ATTRIBUTE_ID);
 
-    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value) {
-        writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readCurrentTargetAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_TARGET_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_TARGET_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSupportedStreamingProtocolsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentTargetAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_TARGET_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_TARGET_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readAcceptHeaderAttribute(long chipClusterPtr, AcceptHeaderAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptHeaderAttribute(long chipClusterPtr, AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedStreamingProtocolsAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void writeSupportedStreamingProtocolsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSupportedStreamingProtocolsAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+  public static class MediaPlaybackCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1286L;
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    private static final long CURRENT_STATE_ATTRIBUTE_ID = 0L;
+    private static final long START_TIME_ATTRIBUTE_ID = 1L;
+    private static final long DURATION_ATTRIBUTE_ID = 2L;
+    private static final long SAMPLED_POSITION_ATTRIBUTE_ID = 3L;
+    private static final long PLAYBACK_SPEED_ATTRIBUTE_ID = 4L;
+    private static final long SEEK_RANGE_END_ATTRIBUTE_ID = 5L;
+    private static final long SEEK_RANGE_START_ATTRIBUTE_ID = 6L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public MediaPlaybackCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void play(PlaybackResponseCallback callback) {
+      play(callback, 0);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void play(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void pause(PlaybackResponseCallback callback) {
+      pause(callback, 0);
+    }
 
-  public static class AudioOutputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1291L;
+    public void pause(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public AudioOutputCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void stop(PlaybackResponseCallback callback) {
+      stop(callback, 0);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void stop(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public void selectOutput(DefaultClusterCallback callback, Integer index) {
-      selectOutput(chipClusterPtr, callback, index, null);
+    public void startOver(PlaybackResponseCallback callback) {
+      startOver(callback, 0);
     }
 
-    public void selectOutput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectOutput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
+    public void startOver(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void renameOutput(DefaultClusterCallback callback, Integer index, String name) {
-      renameOutput(chipClusterPtr, callback, index, name, null);
+    public void previous(PlaybackResponseCallback callback) {
+      previous(callback, 0);
     }
 
-    public void renameOutput(DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
-      renameOutput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
+    public void previous(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    private native void selectOutput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, @Nullable Integer timedInvokeTimeoutMs);
+    public void next(PlaybackResponseCallback callback) {
+      next(callback, 0);
+    }
 
-    private native void renameOutput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, String name, @Nullable Integer timedInvokeTimeoutMs);
+    public void next(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface OutputListAttributeCallback {
-      void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void rewind(PlaybackResponseCallback callback) {
+      rewind(callback, 0);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void rewind(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void fastForward(PlaybackResponseCallback callback) {
+      fastForward(callback, 0);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void fastForward(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
+      skipForward(callback, deltaPositionMilliseconds, 0);
     }
 
-    public void readOutputListAttribute(
-        OutputListAttributeCallback callback) {
-        readOutputListAttribute(chipClusterPtr, callback);
+    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long deltaPositionMillisecondsFieldID = 0L;
+      BaseTLVType deltaPositionMillisecondstlvValue = new UIntType(deltaPositionMilliseconds);
+      elements.add(new StructElement(deltaPositionMillisecondsFieldID, deltaPositionMillisecondstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeOutputListAttribute(
-        OutputListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOutputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
+      skipBackward(callback, deltaPositionMilliseconds, 0);
     }
 
-    public void readCurrentOutputAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentOutputAttribute(chipClusterPtr, callback);
+    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
+      final long commandId = 9L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long deltaPositionMillisecondsFieldID = 0L;
+      BaseTLVType deltaPositionMillisecondstlvValue = new UIntType(deltaPositionMilliseconds);
+      elements.add(new StructElement(deltaPositionMillisecondsFieldID, deltaPositionMillisecondstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeCurrentOutputAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentOutputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void seek(PlaybackResponseCallback callback, Long position) {
+      seek(callback, position, 0);
     }
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void seek(PlaybackResponseCallback callback, Long position, int timedInvokeTimeoutMs) {
+      final long commandId = 11L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long positionFieldID = 0L;
+      BaseTLVType positiontlvValue = new UIntType(position);
+      elements.add(new StructElement(positionFieldID, positiontlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface PlaybackResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> data);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface StartTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public interface DurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface SampledPositionAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+    public interface SeekRangeEndAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface SeekRangeStartAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readClusterRevisionAttribute(
+    public void readCurrentStateAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_STATE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_STATE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribeCurrentStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_STATE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readOutputListAttribute(long chipClusterPtr, OutputListAttributeCallback callback);
+    public void readStartTimeAttribute(
+        StartTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeOutputListAttribute(long chipClusterPtr, OutputListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, START_TIME_ATTRIBUTE_ID, true);
+    }
 
-    private native void readCurrentOutputAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeStartTimeAttribute(
+        StartTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_TIME_ATTRIBUTE_ID);
 
-    private native void subscribeCurrentOutputAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readDurationAttribute(
+        DurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DURATION_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DURATION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeDurationAttribute(
+        DurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DURATION_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readSampledPositionAttribute(
+        SampledPositionAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAMPLED_POSITION_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SAMPLED_POSITION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeSampledPositionAttribute(
+        SampledPositionAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAMPLED_POSITION_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SAMPLED_POSITION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readPlaybackSpeedAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PLAYBACK_SPEED_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PLAYBACK_SPEED_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePlaybackSpeedAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PLAYBACK_SPEED_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PLAYBACK_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class ApplicationLauncherCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1292L;
+    public void readSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_END_ATTRIBUTE_ID);
 
-    public ApplicationLauncherCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SEEK_RANGE_END_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_END_ATTRIBUTE_ID);
 
-    public void launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data) {
-      launchApp(chipClusterPtr, callback, application, data, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SEEK_RANGE_END_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data, int timedInvokeTimeoutMs) {
-      launchApp(chipClusterPtr, callback, application, data, timedInvokeTimeoutMs);
-    }
+    public void readSeekRangeStartAttribute(
+        SeekRangeStartAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_START_ATTRIBUTE_ID);
 
-    public void stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
-      stopApp(chipClusterPtr, callback, application, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SEEK_RANGE_START_ATTRIBUTE_ID, true);
     }
 
-    public void stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, int timedInvokeTimeoutMs) {
-      stopApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
-    }
-
-    public void hideApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
-      hideApp(chipClusterPtr, callback, application, null);
-    }
-
-    public void hideApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, int timedInvokeTimeoutMs) {
-      hideApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
-    }
-
-    private native void launchApp(long chipClusterPtr, LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stopApp(long chipClusterPtr, LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void hideApp(long chipClusterPtr, LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface LauncherResponseCallback {
-      void onSuccess(Integer status, Optional<byte[]> data);
-      void onError(Exception error);
-    }
-
-    public interface CatalogListAttributeCallback {
-      void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface CurrentAppAttributeCallback {
-      void onSuccess(@Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readCatalogListAttribute(
-        CatalogListAttributeCallback callback) {
-        readCatalogListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCatalogListAttribute(
-        CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCurrentAppAttribute(
-        CurrentAppAttributeCallback callback) {
-        readCurrentAppAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeCurrentAppAttribute(DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value) {
-        writeCurrentAppAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeCurrentAppAttribute(DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value, int timedWriteTimeoutMs) {
-        writeCurrentAppAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeSeekRangeStartAttribute(
+        SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_START_ATTRIBUTE_ID);
 
-    public void subscribeCurrentAppAttribute(
-        CurrentAppAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentAppAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SEEK_RANGE_START_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readCatalogListAttribute(long chipClusterPtr, CatalogListAttributeCallback callback);
-
-    private native void subscribeCatalogListAttribute(long chipClusterPtr, CatalogListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void readCurrentAppAttribute(long chipClusterPtr, CurrentAppAttributeCallback callback);
+  public static class MediaInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1287L;
 
-    private native void writeCurrentAppAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value, @Nullable Integer timedWriteTimeoutMs);
+    private static final long INPUT_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_INPUT_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeCurrentAppAttribute(long chipClusterPtr, CurrentAppAttributeCallback callback, int minInterval, int maxInterval);
+    public MediaInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void selectInput(DefaultClusterCallback callback, Integer index) {
+      selectInput(callback, index, 0);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void selectInput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void showInputStatus(DefaultClusterCallback callback) {
+      showInputStatus(callback, 0);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void showInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void hideInputStatus(DefaultClusterCallback callback) {
+      hideInputStatus(callback, 0);
+    }
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void hideInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void renameInput(DefaultClusterCallback callback, Integer index, String name) {
+      renameInput(callback, index, name, 0);
+    }
 
-  public static class ApplicationBasicCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1293L;
+    public void renameInput(DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    public ApplicationBasicCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+      final long nameFieldID = 1L;
+      BaseTLVType nametlvValue = new StringType(name);
+      elements.add(new StructElement(nameFieldID, nametlvValue));
 
-    public interface ApplicationAttributeCallback {
-      void onSuccess(ChipStructs.ApplicationBasicClusterApplicationStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public interface AllowedVendorListAttributeCallback {
-      void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface InputListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.MediaInputClusterInputInfoStruct> value);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
-
-    public void readVendorNameAttribute(
-        CharStringAttributeCallback callback) {
-        readVendorNameAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeVendorNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readVendorIDAttribute(
-        IntegerAttributeCallback callback) {
-        readVendorIDAttribute(chipClusterPtr, callback);
-    }
+    public void readInputListAttribute(
+        InputListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INPUT_LIST_ATTRIBUTE_ID);
 
-    public void subscribeVendorIDAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.MediaInputClusterInputInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INPUT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readApplicationNameAttribute(
-        CharStringAttributeCallback callback) {
-        readApplicationNameAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeInputListAttribute(
+        InputListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INPUT_LIST_ATTRIBUTE_ID);
 
-    public void subscribeApplicationNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.MediaInputClusterInputInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INPUT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readProductIDAttribute(
+    public void readCurrentInputAttribute(
         IntegerAttributeCallback callback) {
-        readProductIDAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeProductIDAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readApplicationAttribute(
-        ApplicationAttributeCallback callback) {
-        readApplicationAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_INPUT_ATTRIBUTE_ID);
 
-    public void subscribeApplicationAttribute(
-        ApplicationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readStatusAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_INPUT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeStatusAttribute(
+    public void subscribeCurrentInputAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readApplicationVersionAttribute(
-        CharStringAttributeCallback callback) {
-        readApplicationVersionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeApplicationVersionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAllowedVendorListAttribute(
-        AllowedVendorListAttributeCallback callback) {
-        readAllowedVendorListAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_INPUT_ATTRIBUTE_ID);
 
-    public void subscribeAllowedVendorListAttribute(
-        AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAllowedVendorListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_INPUT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+  public static class LowPowerCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1288L;
 
-    private native void readVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeVendorIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public LowPowerCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readApplicationNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void subscribeApplicationNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void sleep(DefaultClusterCallback callback) {
+      sleep(callback, 0);
+    }
 
-    private native void readProductIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void sleep(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeProductIDAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void readApplicationAttribute(long chipClusterPtr, ApplicationAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeApplicationAttribute(long chipClusterPtr, ApplicationAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readApplicationVersionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeApplicationVersionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAllowedVendorListAttribute(long chipClusterPtr, AllowedVendorListAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAllowedVendorListAttribute(long chipClusterPtr, AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class AccountLoginCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1294L;
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public AccountLoginCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void getSetupPIN(GetSetupPINResponseCallback callback, String tempAccountIdentifier, int timedInvokeTimeoutMs) {
-      getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void login(DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN, int timedInvokeTimeoutMs) {
-      login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void logout(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      logout(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    private native void getSetupPIN(long chipClusterPtr, GetSetupPINResponseCallback callback, String tempAccountIdentifier, @Nullable Integer timedInvokeTimeoutMs);
+  public static class KeypadInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1289L;
 
-    private native void login(long chipClusterPtr, DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN, @Nullable Integer timedInvokeTimeoutMs);
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void logout(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public KeypadInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    public interface GetSetupPINResponseCallback {
-      void onSuccess(String setupPIN);
-      void onError(Exception error);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
+
+    public void sendKey(SendKeyResponseCallback callback, Integer keyCode) {
+      sendKey(callback, keyCode, 0);
+    }
+
+    public void sendKey(SendKeyResponseCallback callback, Integer keyCode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long keyCodeFieldID = 0L;
+      BaseTLVType keyCodetlvValue = new UIntType(keyCode);
+      elements.add(new StructElement(keyCodeFieldID, keyCodetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(status);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface SendKeyResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+  }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+  public static class ContentLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1290L;
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private static final long ACCEPT_HEADER_ATTRIBUTE_ID = 0L;
+    private static final long SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class ElectricalMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 2820L;
-
-    public ElectricalMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    public ContentLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void getProfileInfoCommand(DefaultClusterCallback callback) {
-      getProfileInfoCommand(chipClusterPtr, callback, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void getProfileInfoCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      getProfileInfoCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data) {
+      launchContent(callback, search, autoPlay, data, 0);
     }
 
-    public void getMeasurementProfileCommand(DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals) {
-      getMeasurementProfileCommand(chipClusterPtr, callback, attributeId, startTime, numberOfIntervals, null);
+    public void launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long searchFieldID = 0L;
+      BaseTLVType searchtlvValue = search.encodeTlv();
+      elements.add(new StructElement(searchFieldID, searchtlvValue));
+
+      final long autoPlayFieldID = 1L;
+      BaseTLVType autoPlaytlvValue = new BooleanType(autoPlay);
+      elements.add(new StructElement(autoPlayFieldID, autoPlaytlvValue));
+
+      final long dataFieldID = 2L;
+      BaseTLVType datatlvValue = data.<BaseTLVType>map((nonOptionaldata) -> new StringType(nonOptionaldata)).orElse(new EmptyType());
+      elements.add(new StructElement(dataFieldID, datatlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void getMeasurementProfileCommand(DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals, int timedInvokeTimeoutMs) {
-      getMeasurementProfileCommand(chipClusterPtr, callback, attributeId, startTime, numberOfIntervals, timedInvokeTimeoutMs);
+    public void launchURL(LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation) {
+      launchURL(callback, contentURL, displayString, brandingInformation, 0);
     }
 
-    private native void getProfileInfoCommand(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void launchURL(LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long contentURLFieldID = 0L;
+      BaseTLVType contentURLtlvValue = new StringType(contentURL);
+      elements.add(new StructElement(contentURLFieldID, contentURLtlvValue));
+
+      final long displayStringFieldID = 1L;
+      BaseTLVType displayStringtlvValue = displayString.<BaseTLVType>map((nonOptionaldisplayString) -> new StringType(nonOptionaldisplayString)).orElse(new EmptyType());
+      elements.add(new StructElement(displayStringFieldID, displayStringtlvValue));
+
+      final long brandingInformationFieldID = 2L;
+      BaseTLVType brandingInformationtlvValue = brandingInformation.<BaseTLVType>map((nonOptionalbrandingInformation) -> nonOptionalbrandingInformation.encodeTlv()).orElse(new EmptyType());
+      elements.add(new StructElement(brandingInformationFieldID, brandingInformationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<String> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                data = Optional.of(castingValue.value(String.class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface LauncherResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> data);
+    }
 
-    private native void getMeasurementProfileCommand(long chipClusterPtr, DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals, @Nullable Integer timedInvokeTimeoutMs);
+    public interface AcceptHeaderAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<String> value);
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public void readMeasurementTypeAttribute(
-        LongAttributeCallback callback) {
-        readMeasurementTypeAttribute(chipClusterPtr, callback);
-    }
+    public void readAcceptHeaderAttribute(
+        AcceptHeaderAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPT_HEADER_ATTRIBUTE_ID);
 
-    public void subscribeMeasurementTypeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasurementTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPT_HEADER_ATTRIBUTE_ID, true);
     }
 
-    public void readDcVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readDcVoltageAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeAcceptHeaderAttribute(
+        AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPT_HEADER_ATTRIBUTE_ID);
 
-    public void subscribeDcVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPT_HEADER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcVoltageMinAttribute(
-        IntegerAttributeCallback callback) {
-        readDcVoltageMinAttribute(chipClusterPtr, callback);
-    }
+    public void readSupportedStreamingProtocolsAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID);
 
-    public void subscribeDcVoltageMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID, true);
     }
 
-    public void readDcVoltageMaxAttribute(
-        IntegerAttributeCallback callback) {
-        readDcVoltageMaxAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeSupportedStreamingProtocolsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID);
 
-    public void subscribeDcVoltageMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readDcCurrentAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcCurrentMinAttribute(
-        IntegerAttributeCallback callback) {
-        readDcCurrentMinAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcCurrentMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcCurrentMaxAttribute(
-        IntegerAttributeCallback callback) {
-        readDcCurrentMaxAttribute(chipClusterPtr, callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcCurrentMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcPowerAttribute(
-        IntegerAttributeCallback callback) {
-        readDcPowerAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcPowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcPowerMinAttribute(
-        IntegerAttributeCallback callback) {
-        readDcPowerMinAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcPowerMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcPowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readDcPowerMaxAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readDcPowerMaxAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeDcPowerMaxAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcPowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readDcVoltageMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readDcVoltageMultiplierAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeDcVoltageMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcVoltageMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+  public static class AudioOutputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1291L;
+
+    private static final long OUTPUT_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_OUTPUT_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public AudioOutputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readDcVoltageDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readDcVoltageDivisorAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void subscribeDcVoltageDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcVoltageDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void selectOutput(DefaultClusterCallback callback, Integer index) {
+      selectOutput(callback, index, 0);
     }
 
-    public void readDcCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readDcCurrentMultiplierAttribute(chipClusterPtr, callback);
+    public void selectOutput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeDcCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void renameOutput(DefaultClusterCallback callback, Integer index, String name) {
+      renameOutput(callback, index, name, 0);
     }
 
-    public void readDcCurrentDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readDcCurrentDivisorAttribute(chipClusterPtr, callback);
+    public void renameOutput(DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
+
+      final long nameFieldID = 1L;
+      BaseTLVType nametlvValue = new StringType(name);
+      elements.add(new StructElement(nameFieldID, nametlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeDcCurrentDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcCurrentDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface OutputListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfoStruct> value);
     }
 
-    public void readDcPowerMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readDcPowerMultiplierAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeDcPowerMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcPowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readDcPowerDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readDcPowerDivisorAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeDcPowerDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDcPowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAcFrequencyAttribute(
-        IntegerAttributeCallback callback) {
-        readAcFrequencyAttribute(chipClusterPtr, callback);
+    public void readOutputListAttribute(
+        OutputListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUTPUT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AudioOutputClusterOutputInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OUTPUT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcFrequencyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOutputListAttribute(
+        OutputListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OUTPUT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.AudioOutputClusterOutputInfoStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OUTPUT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAcFrequencyMinAttribute(
+    public void readCurrentOutputAttribute(
         IntegerAttributeCallback callback) {
-        readAcFrequencyMinAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_OUTPUT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_OUTPUT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcFrequencyMinAttribute(
+    public void subscribeCurrentOutputAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcFrequencyMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_OUTPUT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_OUTPUT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAcFrequencyMaxAttribute(
-        IntegerAttributeCallback callback) {
-        readAcFrequencyMaxAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcFrequencyMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcFrequencyMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNeutralCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readNeutralCurrentAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNeutralCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNeutralCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTotalActivePowerAttribute(
-        LongAttributeCallback callback) {
-        readTotalActivePowerAttribute(chipClusterPtr, callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTotalActivePowerAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTotalActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTotalReactivePowerAttribute(
-        LongAttributeCallback callback) {
-        readTotalReactivePowerAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTotalReactivePowerAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTotalReactivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readTotalApparentPowerAttribute(
+    public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readTotalApparentPowerAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeTotalApparentPowerAttribute(
+    public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTotalApparentPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasured1stHarmonicCurrentAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readMeasured1stHarmonicCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeMeasured1stHarmonicCurrentAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured1stHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readMeasured3rdHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasured3rdHarmonicCurrentAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeMeasured3rdHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured3rdHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class ApplicationLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1292L;
 
-    public void readMeasured5thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasured5thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    private static final long CATALOG_LIST_ATTRIBUTE_ID = 0L;
+    private static final long CURRENT_APP_ATTRIBUTE_ID = 1L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public ApplicationLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void subscribeMeasured5thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured5thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void readMeasured7thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasured7thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public void launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data) {
+      launchApp(callback, application, data, 0);
     }
 
-    public void subscribeMeasured7thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured7thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long applicationFieldID = 0L;
+      BaseTLVType applicationtlvValue = application.<BaseTLVType>map((nonOptionalapplication) -> nonOptionalapplication.encodeTlv()).orElse(new EmptyType());
+      elements.add(new StructElement(applicationFieldID, applicationtlvValue));
+
+      final long dataFieldID = 1L;
+      BaseTLVType datatlvValue = data.<BaseTLVType>map((nonOptionaldata) -> new ByteArrayType(nonOptionaldata)).orElse(new EmptyType());
+      elements.add(new StructElement(dataFieldID, datatlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<byte[]> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                data = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readMeasured9thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasured9thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public void stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
+      stopApp(callback, application, 0);
     }
 
-    public void subscribeMeasured9thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured9thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long applicationFieldID = 0L;
+      BaseTLVType applicationtlvValue = application.<BaseTLVType>map((nonOptionalapplication) -> nonOptionalapplication.encodeTlv()).orElse(new EmptyType());
+      elements.add(new StructElement(applicationFieldID, applicationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<byte[]> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                data = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readMeasured11thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasured11thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public void hideApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
+      hideApp(callback, application, 0);
     }
 
-    public void subscribeMeasured11thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasured11thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void hideApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long applicationFieldID = 0L;
+      BaseTLVType applicationtlvValue = application.<BaseTLVType>map((nonOptionalapplication) -> nonOptionalapplication.encodeTlv()).orElse(new EmptyType());
+      elements.add(new StructElement(applicationFieldID, applicationtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long statusFieldID = 0L;
+          Integer status = null;
+          final long dataFieldID = 1L;
+          Optional<byte[]> data = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == statusFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                status = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == dataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                data = Optional.of(castingValue.value(byte[].class));
+              }
+            }
+          }
+          callback.onSuccess(status, data);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface LauncherResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<byte[]> data);
     }
 
-    public void readMeasuredPhase1stHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase1stHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public interface CatalogListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Integer> value);
     }
 
-    public void subscribeMeasuredPhase1stHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase1stHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentAppAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value);
     }
 
-    public void readMeasuredPhase3rdHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase3rdHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase3rdHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readMeasuredPhase5thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase5thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeMeasuredPhase5thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase5thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readMeasuredPhase7thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase7thHarmonicCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void readCatalogListAttribute(
+        CatalogListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CATALOG_LIST_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredPhase7thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase7thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CATALOG_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readMeasuredPhase9thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase9thHarmonicCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCatalogListAttribute(
+        CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CATALOG_LIST_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredPhase9thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase9thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CATALOG_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMeasuredPhase11thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readMeasuredPhase11thHarmonicCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void readCurrentAppAttribute(
+        CurrentAppAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_APP_ATTRIBUTE_ID);
 
-    public void subscribeMeasuredPhase11thHarmonicCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMeasuredPhase11thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_APP_ATTRIBUTE_ID, true);
     }
 
-    public void readAcFrequencyMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readAcFrequencyMultiplierAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentAppAttribute(
+        CurrentAppAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_APP_ATTRIBUTE_ID);
 
-    public void subscribeAcFrequencyMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcFrequencyMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_APP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAcFrequencyDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readAcFrequencyDivisorAttribute(chipClusterPtr, callback);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void subscribeAcFrequencyDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcFrequencyDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readPowerMultiplierAttribute(
-        LongAttributeCallback callback) {
-        readPowerMultiplierAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void subscribePowerMultiplierAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPowerDivisorAttribute(
-        LongAttributeCallback callback) {
-        readPowerDivisorAttribute(chipClusterPtr, callback);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void subscribePowerDivisorAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readHarmonicCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void subscribeHarmonicCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPhaseHarmonicCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readPhaseHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void subscribePhaseHarmonicCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhaseHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readInstantaneousVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readInstantaneousVoltageAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void subscribeInstantaneousVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstantaneousVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readInstantaneousLineCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readInstantaneousLineCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void subscribeInstantaneousLineCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstantaneousLineCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void readInstantaneousActiveCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readInstantaneousActiveCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void subscribeInstantaneousActiveCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstantaneousActiveCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readInstantaneousReactiveCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readInstantaneousReactiveCurrentAttribute(chipClusterPtr, callback);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void subscribeInstantaneousReactiveCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstantaneousReactiveCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void readInstantaneousPowerAttribute(
-        IntegerAttributeCallback callback) {
-        readInstantaneousPowerAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void subscribeInstantaneousPowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstantaneousPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readRmsVoltageMinAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageMinAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeRmsVoltageMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class ApplicationBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1293L;
 
-    public void readRmsVoltageMaxAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageMaxAttribute(chipClusterPtr, callback);
-    }
+    private static final long VENDOR_NAME_ATTRIBUTE_ID = 0L;
+    private static final long VENDOR_I_D_ATTRIBUTE_ID = 1L;
+    private static final long APPLICATION_NAME_ATTRIBUTE_ID = 2L;
+    private static final long PRODUCT_I_D_ATTRIBUTE_ID = 3L;
+    private static final long APPLICATION_ATTRIBUTE_ID = 4L;
+    private static final long STATUS_ATTRIBUTE_ID = 5L;
+    private static final long APPLICATION_VERSION_ATTRIBUTE_ID = 6L;
+    private static final long ALLOWED_VENDOR_LIST_ATTRIBUTE_ID = 7L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void subscribeRmsVoltageMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public ApplicationBasicCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readRmsCurrentAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void subscribeRmsCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface ApplicationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.ApplicationBasicClusterApplicationStruct value);
     }
 
-    public void readRmsCurrentMinAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMinAttribute(chipClusterPtr, callback);
+    public interface AllowedVendorListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Integer> value);
     }
 
-    public void subscribeRmsCurrentMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readRmsCurrentMaxAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMaxAttribute(chipClusterPtr, callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeRmsCurrentMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readActivePowerAttribute(
-        IntegerAttributeCallback callback) {
-        readActivePowerAttribute(chipClusterPtr, callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeActivePowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readVendorNameAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
 
-    public void readActivePowerMinAttribute(
-        IntegerAttributeCallback callback) {
-        readActivePowerMinAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerMaxAttribute(
+    public void readVendorIDAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerMaxAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMaxAttribute(
+    public void subscribeVendorIDAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID);
 
-    public void readReactivePowerAttribute(
-        IntegerAttributeCallback callback) {
-        readReactivePowerAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeReactivePowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReactivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readApplicationNameAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_NAME_ATTRIBUTE_ID);
 
-    public void readApparentPowerAttribute(
-        IntegerAttributeCallback callback) {
-        readApparentPowerAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPLICATION_NAME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeApparentPowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApparentPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeApplicationNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_NAME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPLICATION_NAME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPowerFactorAttribute(
+    public void readProductIDAttribute(
         IntegerAttributeCallback callback) {
-        readPowerFactorAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PRODUCT_I_D_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePowerFactorAttribute(
+    public void subscribeProductIDAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID);
 
-    public void readAverageRmsVoltageMeasurementPeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRODUCT_I_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readApplicationAttribute(
+        ApplicationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_ATTRIBUTE_ID);
 
-    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.ApplicationBasicClusterApplicationStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPLICATION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsVoltageMeasurementPeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeApplicationAttribute(
+        ApplicationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_ATTRIBUTE_ID);
 
-    public void readAverageRmsUnderVoltageCounterAttribute(
-        IntegerAttributeCallback callback) {
-        readAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.ApplicationBasicClusterApplicationStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPLICATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value) {
-        writeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_ATTRIBUTE_ID);
 
-    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STATUS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsUnderVoltageCounterAttribute(
+    public void subscribeStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STATUS_ATTRIBUTE_ID);
 
-    public void readRmsExtremeOverVoltagePeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readApplicationVersionAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_VERSION_ATTRIBUTE_ID);
 
-    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPLICATION_VERSION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeOverVoltagePeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeApplicationVersionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_VERSION_ATTRIBUTE_ID);
 
-    public void readRmsExtremeUnderVoltagePeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPLICATION_VERSION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readAllowedVendorListAttribute(
+        AllowedVendorListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID);
 
-    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeUnderVoltagePeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeAllowedVendorListAttribute(
+        AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID);
 
-    public void readRmsVoltageSagPeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageSagPeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSagPeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readRmsVoltageSwellPeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSwellPeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readAcVoltageMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readAcVoltageMultiplierAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAcVoltageMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcVoltageMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void readAcVoltageDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readAcVoltageDivisorAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcVoltageDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcVoltageDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void readAcCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readAcCurrentMultiplierAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAcCurrentMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void readAcCurrentDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readAcCurrentDivisorAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcCurrentDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcCurrentDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void readAcPowerMultiplierAttribute(
-        IntegerAttributeCallback callback) {
-        readAcPowerMultiplierAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAcPowerMultiplierAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcPowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void readAcPowerDivisorAttribute(
-        IntegerAttributeCallback callback) {
-        readAcPowerDivisorAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcPowerDivisorAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcPowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void readOverloadAlarmsMaskAttribute(
-        IntegerAttributeCallback callback) {
-        readOverloadAlarmsMaskAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOverloadAlarmsMaskAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readVoltageOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readVoltageOverloadAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void subscribeVoltageOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVoltageOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class AccountLoginCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1294L;
 
-    public void readCurrentOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readCurrentOverloadAttribute(chipClusterPtr, callback);
-    }
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void subscribeCurrentOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public AccountLoginCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readAcOverloadAlarmsMaskAttribute(
-        IntegerAttributeCallback callback) {
-        readAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
-        writeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, null);
-    }
 
-    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void getSetupPIN(GetSetupPINResponseCallback callback, String tempAccountIdentifier, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tempAccountIdentifierFieldID = 0L;
+      BaseTLVType tempAccountIdentifiertlvValue = new StringType(tempAccountIdentifier);
+      elements.add(new StructElement(tempAccountIdentifierFieldID, tempAccountIdentifiertlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long setupPINFieldID = 0L;
+          String setupPIN = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == setupPINFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                setupPIN = castingValue.value(String.class);
+              }
+            }
+          }
+          callback.onSuccess(setupPIN);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAcOverloadAlarmsMaskAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
 
-    public void readAcVoltageOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readAcVoltageOverloadAttribute(chipClusterPtr, callback);
-    }
+    public void login(DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    public void subscribeAcVoltageOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcVoltageOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tempAccountIdentifierFieldID = 0L;
+      BaseTLVType tempAccountIdentifiertlvValue = new StringType(tempAccountIdentifier);
+      elements.add(new StructElement(tempAccountIdentifierFieldID, tempAccountIdentifiertlvValue));
 
-    public void readAcCurrentOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readAcCurrentOverloadAttribute(chipClusterPtr, callback);
-    }
+      final long setupPINFieldID = 1L;
+      BaseTLVType setupPINtlvValue = new StringType(setupPIN);
+      elements.add(new StructElement(setupPINFieldID, setupPINtlvValue));
 
-    public void subscribeAcCurrentOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcCurrentOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readAcActivePowerOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readAcActivePowerOverloadAttribute(chipClusterPtr, callback);
-    }
 
-    public void subscribeAcActivePowerOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcActivePowerOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void logout(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readAcReactivePowerOverloadAttribute(
-        IntegerAttributeCallback callback) {
-        readAcReactivePowerOverloadAttribute(chipClusterPtr, callback);
+    public interface GetSetupPINResponseCallback extends BaseClusterCallback {
+      void onSuccess(String setupPIN);
     }
 
-    public void subscribeAcReactivePowerOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcReactivePowerOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAverageRmsOverVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readAverageRmsOverVoltageAttribute(chipClusterPtr, callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAverageRmsOverVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsOverVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAverageRmsUnderVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readAverageRmsUnderVoltageAttribute(chipClusterPtr, callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAverageRmsUnderVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsUnderVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readRmsExtremeOverVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsExtremeOverVoltageAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeOverVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeOverVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readRmsExtremeUnderVoltageAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsExtremeUnderVoltageAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeRmsExtremeUnderVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeUnderVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readRmsVoltageSagAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageSagAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSagAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSagAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageSwellAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageSwellAttribute(chipClusterPtr, callback);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSwellAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSwellAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLineCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readLineCurrentPhaseBAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLineCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLineCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActiveCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readActiveCurrentPhaseBAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActiveCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readReactiveCurrentPhaseBAttribute(
+    public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readReactiveCurrentPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeReactiveCurrentPhaseBAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReactiveCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void readRmsVoltagePhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltagePhaseBAttribute(chipClusterPtr, callback);
+  public static class ElectricalMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 2820L;
+
+    private static final long MEASUREMENT_TYPE_ATTRIBUTE_ID = 0L;
+    private static final long DC_VOLTAGE_ATTRIBUTE_ID = 256L;
+    private static final long DC_VOLTAGE_MIN_ATTRIBUTE_ID = 257L;
+    private static final long DC_VOLTAGE_MAX_ATTRIBUTE_ID = 258L;
+    private static final long DC_CURRENT_ATTRIBUTE_ID = 259L;
+    private static final long DC_CURRENT_MIN_ATTRIBUTE_ID = 260L;
+    private static final long DC_CURRENT_MAX_ATTRIBUTE_ID = 261L;
+    private static final long DC_POWER_ATTRIBUTE_ID = 262L;
+    private static final long DC_POWER_MIN_ATTRIBUTE_ID = 263L;
+    private static final long DC_POWER_MAX_ATTRIBUTE_ID = 264L;
+    private static final long DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID = 512L;
+    private static final long DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID = 513L;
+    private static final long DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID = 514L;
+    private static final long DC_CURRENT_DIVISOR_ATTRIBUTE_ID = 515L;
+    private static final long DC_POWER_MULTIPLIER_ATTRIBUTE_ID = 516L;
+    private static final long DC_POWER_DIVISOR_ATTRIBUTE_ID = 517L;
+    private static final long AC_FREQUENCY_ATTRIBUTE_ID = 768L;
+    private static final long AC_FREQUENCY_MIN_ATTRIBUTE_ID = 769L;
+    private static final long AC_FREQUENCY_MAX_ATTRIBUTE_ID = 770L;
+    private static final long NEUTRAL_CURRENT_ATTRIBUTE_ID = 771L;
+    private static final long TOTAL_ACTIVE_POWER_ATTRIBUTE_ID = 772L;
+    private static final long TOTAL_REACTIVE_POWER_ATTRIBUTE_ID = 773L;
+    private static final long TOTAL_APPARENT_POWER_ATTRIBUTE_ID = 774L;
+    private static final long MEASURED1ST_HARMONIC_CURRENT_ATTRIBUTE_ID = 775L;
+    private static final long MEASURED3RD_HARMONIC_CURRENT_ATTRIBUTE_ID = 776L;
+    private static final long MEASURED5TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 777L;
+    private static final long MEASURED7TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 778L;
+    private static final long MEASURED9TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 779L;
+    private static final long MEASURED11TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 780L;
+    private static final long MEASURED_PHASE1ST_HARMONIC_CURRENT_ATTRIBUTE_ID = 781L;
+    private static final long MEASURED_PHASE3RD_HARMONIC_CURRENT_ATTRIBUTE_ID = 782L;
+    private static final long MEASURED_PHASE5TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 783L;
+    private static final long MEASURED_PHASE7TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 784L;
+    private static final long MEASURED_PHASE9TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 785L;
+    private static final long MEASURED_PHASE11TH_HARMONIC_CURRENT_ATTRIBUTE_ID = 786L;
+    private static final long AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID = 1024L;
+    private static final long AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID = 1025L;
+    private static final long POWER_MULTIPLIER_ATTRIBUTE_ID = 1026L;
+    private static final long POWER_DIVISOR_ATTRIBUTE_ID = 1027L;
+    private static final long HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID = 1028L;
+    private static final long PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID = 1029L;
+    private static final long INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID = 1280L;
+    private static final long INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID = 1281L;
+    private static final long INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID = 1282L;
+    private static final long INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID = 1283L;
+    private static final long INSTANTANEOUS_POWER_ATTRIBUTE_ID = 1284L;
+    private static final long RMS_VOLTAGE_ATTRIBUTE_ID = 1285L;
+    private static final long RMS_VOLTAGE_MIN_ATTRIBUTE_ID = 1286L;
+    private static final long RMS_VOLTAGE_MAX_ATTRIBUTE_ID = 1287L;
+    private static final long RMS_CURRENT_ATTRIBUTE_ID = 1288L;
+    private static final long RMS_CURRENT_MIN_ATTRIBUTE_ID = 1289L;
+    private static final long RMS_CURRENT_MAX_ATTRIBUTE_ID = 1290L;
+    private static final long ACTIVE_POWER_ATTRIBUTE_ID = 1291L;
+    private static final long ACTIVE_POWER_MIN_ATTRIBUTE_ID = 1292L;
+    private static final long ACTIVE_POWER_MAX_ATTRIBUTE_ID = 1293L;
+    private static final long REACTIVE_POWER_ATTRIBUTE_ID = 1294L;
+    private static final long APPARENT_POWER_ATTRIBUTE_ID = 1295L;
+    private static final long POWER_FACTOR_ATTRIBUTE_ID = 1296L;
+    private static final long AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID = 1297L;
+    private static final long AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID = 1299L;
+    private static final long RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID = 1300L;
+    private static final long RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID = 1301L;
+    private static final long RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID = 1302L;
+    private static final long RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID = 1303L;
+    private static final long AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID = 1536L;
+    private static final long AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID = 1537L;
+    private static final long AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID = 1538L;
+    private static final long AC_CURRENT_DIVISOR_ATTRIBUTE_ID = 1539L;
+    private static final long AC_POWER_MULTIPLIER_ATTRIBUTE_ID = 1540L;
+    private static final long AC_POWER_DIVISOR_ATTRIBUTE_ID = 1541L;
+    private static final long OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID = 1792L;
+    private static final long VOLTAGE_OVERLOAD_ATTRIBUTE_ID = 1793L;
+    private static final long CURRENT_OVERLOAD_ATTRIBUTE_ID = 1794L;
+    private static final long AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID = 2048L;
+    private static final long AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID = 2049L;
+    private static final long AC_CURRENT_OVERLOAD_ATTRIBUTE_ID = 2050L;
+    private static final long AC_ACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID = 2051L;
+    private static final long AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID = 2052L;
+    private static final long AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID = 2053L;
+    private static final long AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID = 2054L;
+    private static final long RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID = 2055L;
+    private static final long RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID = 2056L;
+    private static final long RMS_VOLTAGE_SAG_ATTRIBUTE_ID = 2057L;
+    private static final long RMS_VOLTAGE_SWELL_ATTRIBUTE_ID = 2058L;
+    private static final long LINE_CURRENT_PHASE_B_ATTRIBUTE_ID = 2305L;
+    private static final long ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID = 2306L;
+    private static final long REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID = 2307L;
+    private static final long RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID = 2309L;
+    private static final long RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID = 2310L;
+    private static final long RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID = 2311L;
+    private static final long RMS_CURRENT_PHASE_B_ATTRIBUTE_ID = 2312L;
+    private static final long RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID = 2313L;
+    private static final long RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID = 2314L;
+    private static final long ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID = 2315L;
+    private static final long ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID = 2316L;
+    private static final long ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID = 2317L;
+    private static final long REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID = 2318L;
+    private static final long APPARENT_POWER_PHASE_B_ATTRIBUTE_ID = 2319L;
+    private static final long POWER_FACTOR_PHASE_B_ATTRIBUTE_ID = 2320L;
+    private static final long AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID = 2321L;
+    private static final long AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID = 2322L;
+    private static final long AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID = 2323L;
+    private static final long RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID = 2324L;
+    private static final long RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID = 2325L;
+    private static final long RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID = 2326L;
+    private static final long RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID = 2327L;
+    private static final long LINE_CURRENT_PHASE_C_ATTRIBUTE_ID = 2561L;
+    private static final long ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID = 2562L;
+    private static final long REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID = 2563L;
+    private static final long RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID = 2565L;
+    private static final long RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID = 2566L;
+    private static final long RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID = 2567L;
+    private static final long RMS_CURRENT_PHASE_C_ATTRIBUTE_ID = 2568L;
+    private static final long RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID = 2569L;
+    private static final long RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID = 2570L;
+    private static final long ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID = 2571L;
+    private static final long ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID = 2572L;
+    private static final long ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID = 2573L;
+    private static final long REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID = 2574L;
+    private static final long APPARENT_POWER_PHASE_C_ATTRIBUTE_ID = 2575L;
+    private static final long POWER_FACTOR_PHASE_C_ATTRIBUTE_ID = 2576L;
+    private static final long AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID = 2577L;
+    private static final long AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID = 2578L;
+    private static final long AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID = 2579L;
+    private static final long RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID = 2580L;
+    private static final long RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID = 2581L;
+    private static final long RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID = 2582L;
+    private static final long RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID = 2583L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
+    public ElectricalMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void subscribeRmsVoltagePhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltagePhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void readRmsVoltageMinPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageMinPhaseBAttribute(chipClusterPtr, callback);
+    public void getProfileInfoCommand(DefaultClusterCallback callback) {
+      getProfileInfoCommand(callback, 0);
     }
 
-    public void subscribeRmsVoltageMinPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void getProfileInfoCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readRmsVoltageMaxPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsVoltageMaxPhaseBAttribute(chipClusterPtr, callback);
+    public void getMeasurementProfileCommand(DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals) {
+      getMeasurementProfileCommand(callback, attributeId, startTime, numberOfIntervals, 0);
     }
 
-    public void subscribeRmsVoltageMaxPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void getMeasurementProfileCommand(DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long attributeIdFieldID = 0L;
+      BaseTLVType attributeIdtlvValue = new UIntType(attributeId);
+      elements.add(new StructElement(attributeIdFieldID, attributeIdtlvValue));
+
+      final long startTimeFieldID = 1L;
+      BaseTLVType startTimetlvValue = new UIntType(startTime);
+      elements.add(new StructElement(startTimeFieldID, startTimetlvValue));
+
+      final long numberOfIntervalsFieldID = 2L;
+      BaseTLVType numberOfIntervalstlvValue = new UIntType(numberOfIntervals);
+      elements.add(new StructElement(numberOfIntervalsFieldID, numberOfIntervalstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readRmsCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentPhaseBAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeRmsCurrentPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readRmsCurrentMinPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMinPhaseBAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeRmsCurrentMinPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readRmsCurrentMaxPhaseBAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMaxPhaseBAttribute(chipClusterPtr, callback);
+    public void readMeasurementTypeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_TYPE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASUREMENT_TYPE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsCurrentMaxPhaseBAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasurementTypeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASUREMENT_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASUREMENT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerPhaseBAttribute(
+    public void readDcVoltageAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_VOLTAGE_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerPhaseBAttribute(
+    public void subscribeDcVoltageAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerMinPhaseBAttribute(
+    public void readDcVoltageMinAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerMinPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MIN_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_VOLTAGE_MIN_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMinPhaseBAttribute(
+    public void subscribeDcVoltageMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MIN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_VOLTAGE_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerMaxPhaseBAttribute(
+    public void readDcVoltageMaxAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerMaxPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MAX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_VOLTAGE_MAX_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMaxPhaseBAttribute(
+    public void subscribeDcVoltageMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_VOLTAGE_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readReactivePowerPhaseBAttribute(
+    public void readDcCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readReactivePowerPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeReactivePowerPhaseBAttribute(
+    public void subscribeDcCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReactivePowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readApparentPowerPhaseBAttribute(
+    public void readDcCurrentMinAttribute(
         IntegerAttributeCallback callback) {
-        readApparentPowerPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MIN_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_CURRENT_MIN_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeApparentPowerPhaseBAttribute(
+    public void subscribeDcCurrentMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApparentPowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MIN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_CURRENT_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPowerFactorPhaseBAttribute(
+    public void readDcCurrentMaxAttribute(
         IntegerAttributeCallback callback) {
-        readPowerFactorPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MAX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_CURRENT_MAX_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePowerFactorPhaseBAttribute(
+    public void subscribeDcCurrentMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerFactorPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_CURRENT_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+    public void readDcPowerAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_POWER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+    public void subscribeDcPowerAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsOverVoltageCounterPhaseBAttribute(
+    public void readDcPowerMinAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsOverVoltageCounterPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MIN_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_POWER_MIN_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
+    public void subscribeDcPowerMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsOverVoltageCounterPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MIN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_POWER_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsUnderVoltageCounterPhaseBAttribute(
+    public void readDcPowerMaxAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsUnderVoltageCounterPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MAX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_POWER_MAX_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
+    public void subscribeDcPowerMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_POWER_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsExtremeOverVoltagePeriodPhaseBAttribute(
+    public void readDcVoltageMultiplierAttribute(
         IntegerAttributeCallback callback) {
-        readRmsExtremeOverVoltagePeriodPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
+    public void subscribeDcVoltageMultiplierAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+    public void readDcVoltageDivisorAttribute(
         IntegerAttributeCallback callback) {
-        readRmsExtremeUnderVoltagePeriodPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+    public void subscribeDcVoltageDivisorAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageSagPeriodPhaseBAttribute(
+    public void readDcCurrentMultiplierAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageSagPeriodPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSagPeriodPhaseBAttribute(
+    public void subscribeDcCurrentMultiplierAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSagPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageSwellPeriodPhaseBAttribute(
+    public void readDcCurrentDivisorAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageSwellPeriodPhaseBAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_DIVISOR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_CURRENT_DIVISOR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSwellPeriodPhaseBAttribute(
+    public void subscribeDcCurrentDivisorAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSwellPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_CURRENT_DIVISOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_CURRENT_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLineCurrentPhaseCAttribute(
+    public void readDcPowerMultiplierAttribute(
         IntegerAttributeCallback callback) {
-        readLineCurrentPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MULTIPLIER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_POWER_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLineCurrentPhaseCAttribute(
+    public void subscribeDcPowerMultiplierAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLineCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_MULTIPLIER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_POWER_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActiveCurrentPhaseCAttribute(
+    public void readDcPowerDivisorAttribute(
         IntegerAttributeCallback callback) {
-        readActiveCurrentPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_DIVISOR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DC_POWER_DIVISOR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActiveCurrentPhaseCAttribute(
+    public void subscribeDcPowerDivisorAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActiveCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DC_POWER_DIVISOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DC_POWER_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readReactiveCurrentPhaseCAttribute(
+    public void readAcFrequencyAttribute(
         IntegerAttributeCallback callback) {
-        readReactiveCurrentPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_FREQUENCY_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeReactiveCurrentPhaseCAttribute(
+    public void subscribeAcFrequencyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReactiveCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_FREQUENCY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltagePhaseCAttribute(
+    public void readAcFrequencyMinAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltagePhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MIN_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_FREQUENCY_MIN_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltagePhaseCAttribute(
+    public void subscribeAcFrequencyMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltagePhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MIN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_FREQUENCY_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageMinPhaseCAttribute(
+    public void readAcFrequencyMaxAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageMinPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MAX_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_FREQUENCY_MAX_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageMinPhaseCAttribute(
+    public void subscribeAcFrequencyMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_FREQUENCY_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageMaxPhaseCAttribute(
+    public void readNeutralCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageMaxPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEUTRAL_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NEUTRAL_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageMaxPhaseCAttribute(
+    public void subscribeNeutralCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NEUTRAL_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NEUTRAL_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsCurrentPhaseCAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentPhaseCAttribute(chipClusterPtr, callback);
+    public void readTotalActivePowerAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_ACTIVE_POWER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOTAL_ACTIVE_POWER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsCurrentPhaseCAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTotalActivePowerAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_ACTIVE_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOTAL_ACTIVE_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsCurrentMinPhaseCAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMinPhaseCAttribute(chipClusterPtr, callback);
+    public void readTotalReactivePowerAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_REACTIVE_POWER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOTAL_REACTIVE_POWER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsCurrentMinPhaseCAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTotalReactivePowerAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_REACTIVE_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOTAL_REACTIVE_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsCurrentMaxPhaseCAttribute(
-        IntegerAttributeCallback callback) {
-        readRmsCurrentMaxPhaseCAttribute(chipClusterPtr, callback);
+    public void readTotalApparentPowerAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_APPARENT_POWER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TOTAL_APPARENT_POWER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsCurrentMaxPhaseCAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsCurrentMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTotalApparentPowerAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TOTAL_APPARENT_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TOTAL_APPARENT_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerPhaseCAttribute(
+    public void readMeasured1stHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED1ST_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED1ST_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerPhaseCAttribute(
+    public void subscribeMeasured1stHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED1ST_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED1ST_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerMinPhaseCAttribute(
+    public void readMeasured3rdHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerMinPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED3RD_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED3RD_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMinPhaseCAttribute(
+    public void subscribeMeasured3rdHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED3RD_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED3RD_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readActivePowerMaxPhaseCAttribute(
+    public void readMeasured5thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readActivePowerMaxPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED5TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED5TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeActivePowerMaxPhaseCAttribute(
+    public void subscribeMeasured5thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActivePowerMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED5TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED5TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readReactivePowerPhaseCAttribute(
+    public void readMeasured7thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readReactivePowerPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED7TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED7TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeReactivePowerPhaseCAttribute(
+    public void subscribeMeasured7thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReactivePowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED7TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED7TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readApparentPowerPhaseCAttribute(
+    public void readMeasured9thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readApparentPowerPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED9TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED9TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeApparentPowerPhaseCAttribute(
+    public void subscribeMeasured9thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApparentPowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED9TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED9TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readPowerFactorPhaseCAttribute(
+    public void readMeasured11thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readPowerFactorPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED11TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED11TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribePowerFactorPhaseCAttribute(
+    public void subscribeMeasured11thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerFactorPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED11TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED11TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+    public void readMeasuredPhase1stHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE1ST_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE1ST_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+    public void subscribeMeasuredPhase1stHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE1ST_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE1ST_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsOverVoltageCounterPhaseCAttribute(
+    public void readMeasuredPhase3rdHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsOverVoltageCounterPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE3RD_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE3RD_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
+    public void subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsOverVoltageCounterPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE3RD_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE3RD_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readAverageRmsUnderVoltageCounterPhaseCAttribute(
+    public void readMeasuredPhase5thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readAverageRmsUnderVoltageCounterPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE5TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE5TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
+    public void subscribeMeasuredPhase5thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE5TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE5TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsExtremeOverVoltagePeriodPhaseCAttribute(
+    public void readMeasuredPhase7thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readRmsExtremeOverVoltagePeriodPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE7TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE7TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
+    public void subscribeMeasuredPhase7thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE7TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE7TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+    public void readMeasuredPhase9thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readRmsExtremeUnderVoltagePeriodPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE9TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE9TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+    public void subscribeMeasuredPhase9thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE9TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE9TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageSagPeriodPhaseCAttribute(
+    public void readMeasuredPhase11thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageSagPeriodPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE11TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MEASURED_PHASE11TH_HARMONIC_CURRENT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSagPeriodPhaseCAttribute(
+    public void subscribeMeasuredPhase11thHarmonicCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSagPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_PHASE11TH_HARMONIC_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MEASURED_PHASE11TH_HARMONIC_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRmsVoltageSwellPeriodPhaseCAttribute(
+    public void readAcFrequencyMultiplierAttribute(
         IntegerAttributeCallback callback) {
-        readRmsVoltageSwellPeriodPhaseCAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRmsVoltageSwellPeriodPhaseCAttribute(
+    public void subscribeAcFrequencyMultiplierAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRmsVoltageSwellPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAcFrequencyDivisorAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID);
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeAcFrequencyDivisorAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID);
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readPowerMultiplierAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_MULTIPLIER_ATTRIBUTE_ID);
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePowerMultiplierAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_MULTIPLIER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(
+    public void readPowerDivisorAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_DIVISOR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_DIVISOR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFeatureMapAttribute(
+    public void subscribePowerDivisorAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_DIVISOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(
+    public void readHarmonicCurrentMultiplierAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, true);
     }
 
-    private native void readMeasurementTypeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeMeasurementTypeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcVoltageMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcVoltageMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcVoltageMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcVoltageMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcCurrentMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcCurrentMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcCurrentMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcCurrentMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDcPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDcPowerMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeHarmonicCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeDcPowerMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readDcPowerMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPhaseHarmonicCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeDcPowerMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readDcVoltageMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePhaseHarmonicCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeDcVoltageMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readDcVoltageDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstantaneousVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeDcVoltageDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readDcCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeInstantaneousVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeDcCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readDcCurrentDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstantaneousLineCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeDcCurrentDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readDcPowerMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeInstantaneousLineCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeDcPowerMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readDcPowerDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstantaneousActiveCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeDcPowerDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeInstantaneousActiveCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeAcFrequencyAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcFrequencyMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstantaneousReactiveCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeAcFrequencyMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcFrequencyMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeInstantaneousReactiveCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeAcFrequencyMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNeutralCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInstantaneousPowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeNeutralCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INSTANTANEOUS_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readTotalActivePowerAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeInstantaneousPowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTANTANEOUS_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeTotalActivePowerAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INSTANTANEOUS_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readTotalReactivePowerAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readRmsVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeTotalReactivePowerAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readTotalApparentPowerAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeRmsVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeTotalApparentPowerAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasured1stHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageMinAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured1stHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasured3rdHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageMinAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured3rdHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasured5thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageMaxAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured5thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasured7thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured7thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasured9thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured9thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasured11thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_ATTRIBUTE_ID);
 
-    private native void subscribeMeasured11thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasuredPhase1stHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentMinAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase1stHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasuredPhase3rdHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentMinAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase3rdHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasuredPhase5thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentMaxAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase5thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasuredPhase7thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase7thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMeasuredPhase9thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActivePowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase9thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMeasuredPhase11thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActivePowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeMeasuredPhase11thHarmonicCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcFrequencyMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActivePowerMinAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeAcFrequencyMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcFrequencyDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActivePowerMinAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeAcFrequencyDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPowerMultiplierAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readActivePowerMaxAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_ATTRIBUTE_ID);
 
-    private native void subscribePowerMultiplierAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPowerDivisorAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeActivePowerMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_ATTRIBUTE_ID);
 
-    private native void subscribePowerDivisorAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readHarmonicCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readReactivePowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeHarmonicCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACTIVE_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPhaseHarmonicCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeReactivePowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_ATTRIBUTE_ID);
 
-    private native void subscribePhaseHarmonicCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACTIVE_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInstantaneousVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readApparentPowerAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeInstantaneousVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPARENT_POWER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readInstantaneousLineCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeApparentPowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_ATTRIBUTE_ID);
 
-    private native void subscribeInstantaneousLineCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPARENT_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInstantaneousActiveCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readPowerFactorAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_ATTRIBUTE_ID);
 
-    private native void subscribeInstantaneousActiveCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_FACTOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void readInstantaneousReactiveCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePowerFactorAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_ATTRIBUTE_ID);
 
-    private native void subscribeInstantaneousReactiveCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_FACTOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInstantaneousPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAverageRmsVoltageMeasurementPeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeInstantaneousPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAverageRmsVoltageMeasurementPeriodAttribute(callback, value, 0);
+    }
 
-    private native void subscribeRmsVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readRmsVoltageMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAverageRmsVoltageMeasurementPeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAverageRmsUnderVoltageCounterAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAverageRmsUnderVoltageCounterAttribute(callback, value, 0);
+    }
 
-    private native void subscribeRmsCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readRmsCurrentMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAverageRmsUnderVoltageCounterAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsCurrentMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsExtremeOverVoltagePeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readActivePowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsExtremeOverVoltagePeriodAttribute(callback, value, 0);
+    }
 
-    private native void subscribeActivePowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readActivePowerMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsExtremeOverVoltagePeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMinAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActivePowerMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsExtremeUnderVoltagePeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readReactivePowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsExtremeUnderVoltagePeriodAttribute(callback, value, 0);
+    }
 
-    private native void subscribeReactivePowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readApparentPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsExtremeUnderVoltagePeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeApparentPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readPowerFactorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageSagPeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribePowerFactorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsVoltageSagPeriodAttribute(callback, value, 0);
+    }
 
-    private native void writeAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeRmsVoltageSagPeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID);
 
-    private native void readAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readRmsVoltageSwellPeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsVoltageSwellPeriodAttribute(callback, value, 0);
+    }
 
-    private native void writeRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeRmsVoltageSwellPeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID);
 
-    private native void readRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readAcVoltageMultiplierAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageSagPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcVoltageMultiplierAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void writeRmsVoltageSagPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeRmsVoltageSagPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readAcVoltageDivisorAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID);
 
-    private native void readRmsVoltageSwellPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeRmsVoltageSwellPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAcVoltageDivisorAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSwellPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcVoltageMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeAcVoltageMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcVoltageDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeAcVoltageDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcCurrentDivisorAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_DIVISOR_ATTRIBUTE_ID);
 
-    private native void subscribeAcCurrentMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_CURRENT_DIVISOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcCurrentDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcCurrentDivisorAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_DIVISOR_ATTRIBUTE_ID);
 
-    private native void subscribeAcCurrentDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_CURRENT_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcPowerMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcPowerMultiplierAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_POWER_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeAcPowerMultiplierAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_POWER_MULTIPLIER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcPowerDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcPowerMultiplierAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_POWER_MULTIPLIER_ATTRIBUTE_ID);
 
-    private native void subscribeAcPowerDivisorAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_POWER_MULTIPLIER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readOverloadAlarmsMaskAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcPowerDivisorAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_POWER_DIVISOR_ATTRIBUTE_ID);
 
-    private native void writeOverloadAlarmsMaskAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_POWER_DIVISOR_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeOverloadAlarmsMaskAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAcPowerDivisorAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_POWER_DIVISOR_ATTRIBUTE_ID);
 
-    private native void readVoltageOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_POWER_DIVISOR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeVoltageOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID);
 
-    private native void readCurrentOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeCurrentOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOverloadAlarmsMaskAttribute(callback, value, 0);
+    }
 
-    private native void readAcOverloadAlarmsMaskAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeAcOverloadAlarmsMaskAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID);
 
-    private native void subscribeAcOverloadAlarmsMaskAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcVoltageOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readVoltageOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VOLTAGE_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeAcVoltageOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VOLTAGE_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcCurrentOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeVoltageOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VOLTAGE_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeAcCurrentOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VOLTAGE_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcActivePowerOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readCurrentOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeAcActivePowerOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CURRENT_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcReactivePowerOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeAcReactivePowerOverloadAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CURRENT_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageRmsOverVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsOverVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageRmsUnderVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAcOverloadAlarmsMaskAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAverageRmsUnderVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void readRmsExtremeOverVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeOverVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsExtremeUnderVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcVoltageOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeUnderVoltageAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageSagAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcVoltageOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSagAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageSwellAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcCurrentOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSwellAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_CURRENT_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLineCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcCurrentOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CURRENT_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeLineCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_CURRENT_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActiveCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcActivePowerOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_ACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeActiveCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_ACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readReactiveCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcActivePowerOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_ACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeReactiveCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_ACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltagePhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcReactivePowerOverloadAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltagePhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcReactivePowerOverloadAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAverageRmsOverVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAverageRmsOverVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsCurrentMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAverageRmsUnderVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsCurrentMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAverageRmsUnderVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActivePowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsExtremeOverVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readActivePowerMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsExtremeOverVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMinPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActivePowerMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsExtremeUnderVoltageAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMaxPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readReactivePowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsExtremeUnderVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID);
 
-    private native void subscribeReactivePowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readApparentPowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageSagAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_ATTRIBUTE_ID);
 
-    private native void subscribeApparentPowerPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SAG_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPowerFactorPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageSagAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_ATTRIBUTE_ID);
 
-    private native void subscribePowerFactorPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SAG_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageSwellAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SWELL_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageRmsOverVoltageCounterPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageSwellAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsOverVoltageCounterPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SWELL_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageRmsUnderVoltageCounterPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readLineCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LINE_CURRENT_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsExtremeOverVoltagePeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeLineCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LINE_CURRENT_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsExtremeUnderVoltagePeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageSagPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSagPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageSwellPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readReactiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSwellPeriodPhaseBAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLineCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeReactiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeLineCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActiveCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltagePhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeActiveCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readReactiveCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltagePhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeReactiveCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltagePhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageMinPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltagePhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageMinPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsVoltageMaxPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsVoltageMaxPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsCurrentMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsCurrentMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsCurrentMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActivePowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentMinPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readActivePowerMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentMinPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMinPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readActivePowerMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRmsCurrentMaxPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeActivePowerMaxPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readReactivePowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRmsCurrentMaxPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeReactivePowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readApparentPowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeApparentPowerPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPowerFactorPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribePowerFactorPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActivePowerMinPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAverageRmsOverVoltageCounterPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActivePowerMinPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsOverVoltageCounterPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAverageRmsUnderVoltageCounterPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readActivePowerMaxPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsExtremeOverVoltagePeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeActivePowerMaxPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsExtremeUnderVoltagePeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readReactivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readRmsVoltageSagPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeReactivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSagPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRmsVoltageSwellPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readApparentPowerPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeRmsVoltageSwellPeriodPhaseCAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPARENT_POWER_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeApparentPowerPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPARENT_POWER_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readPowerFactorPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_FACTOR_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void subscribePowerFactorPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_FACTOR_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAverageRmsOverVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID, true);
+    }
 
-  public static class UnitTestingCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 4294048773L;
+    public void subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID);
 
-    public UnitTestingCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readAverageRmsUnderVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID);
 
-    public void test(DefaultClusterCallback callback) {
-      test(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID, true);
     }
 
-    public void test(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      test(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID);
 
-    public void testNotHandled(DefaultClusterCallback callback) {
-      testNotHandled(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testNotHandled(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      testNotHandled(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readRmsExtremeOverVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testSpecific(TestSpecificResponseCallback callback) {
-      testSpecific(chipClusterPtr, callback, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID, true);
     }
 
-    public void testSpecific(TestSpecificResponseCallback callback, int timedInvokeTimeoutMs) {
-      testSpecific(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testUnknownCommand(DefaultClusterCallback callback) {
-      testUnknownCommand(chipClusterPtr, callback, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testUnknownCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      testUnknownCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    public void readRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testAddArguments(TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2) {
-      testAddArguments(chipClusterPtr, callback, arg1, arg2, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID, true);
     }
 
-    public void testAddArguments(TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
-      testAddArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
-    }
+    public void subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback, Boolean arg1) {
-      testSimpleArgumentRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback, Boolean arg1, int timedInvokeTimeoutMs) {
-      testSimpleArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readRmsVoltageSagPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6) {
-      testStructArrayArgumentRequest(chipClusterPtr, callback, arg1, arg2, arg3, arg4, arg5, arg6, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID, true);
     }
 
-    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6, int timedInvokeTimeoutMs) {
-      testStructArrayArgumentRequest(chipClusterPtr, callback, arg1, arg2, arg3, arg4, arg5, arg6, timedInvokeTimeoutMs);
-    }
+    public void subscribeRmsVoltageSagPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1) {
-      testStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, int timedInvokeTimeoutMs) {
-      testStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readRmsVoltageSwellPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testNestedStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStruct arg1) {
-      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID, true);
     }
 
-    public void testNestedStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStruct arg1, int timedInvokeTimeoutMs) {
-      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void subscribeRmsVoltageSwellPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID);
 
-    public void testListStructArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1) {
-      testListStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testListStructArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1, int timedInvokeTimeoutMs) {
-      testListStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readLineCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testListInt8UArgumentRequest(BooleanResponseCallback callback, ArrayList<Integer> arg1) {
-      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LINE_CURRENT_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public void testListInt8UArgumentRequest(BooleanResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
-      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void subscribeLineCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LINE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStructList arg1) {
-      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LINE_CURRENT_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStructList arg1, int timedInvokeTimeoutMs) {
-      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readActiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1) {
-      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, int timedInvokeTimeoutMs) {
-      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void subscribeActiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1) {
-      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
-      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readReactiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2) {
-      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
-      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
-    }
+    public void subscribeReactiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1) {
-      testNullableOptionalRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1, int timedInvokeTimeoutMs) {
-      testNullableOptionalRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public void readRmsVoltagePhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID);
 
-    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback, @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList) {
-      testComplexNullableOptionalRequest(chipClusterPtr, callback, nullableInt, optionalInt, nullableOptionalInt, nullableString, optionalString, nullableOptionalString, nullableStruct, optionalStruct, nullableOptionalStruct, nullableList, optionalList, nullableOptionalList, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback, @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList, int timedInvokeTimeoutMs) {
-      testComplexNullableOptionalRequest(chipClusterPtr, callback, nullableInt, optionalInt, nullableOptionalInt, nullableString, optionalString, nullableOptionalString, nullableStruct, optionalStruct, nullableOptionalStruct, nullableList, optionalList, nullableOptionalList, timedInvokeTimeoutMs);
-    }
+    public void subscribeRmsVoltagePhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID);
 
-    public void simpleStructEchoRequest(SimpleStructResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1) {
-      simpleStructEchoRequest(chipClusterPtr, callback, arg1, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void simpleStructEchoRequest(SimpleStructResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, int timedInvokeTimeoutMs) {
-      simpleStructEchoRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    public void readRmsVoltageMinPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID, true);
     }
 
+    public void subscribeRmsVoltageMinPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID);
 
-    public void timedInvokeRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      timedInvokeRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback, Optional<Boolean> arg1) {
-      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, null);
-    }
+    public void readRmsVoltageMaxPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback, Optional<Boolean> arg1, int timedInvokeTimeoutMs) {
-      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3) {
-      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, null);
-    }
+    public void subscribeRmsVoltageMaxPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3, int timedInvokeTimeoutMs) {
-      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback, Integer arg1) {
-      testEmitTestFabricScopedEventRequest(chipClusterPtr, callback, arg1, null);
-    }
+    public void readRmsCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback, Integer arg1, int timedInvokeTimeoutMs) {
-      testEmitTestFabricScopedEventRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    private native void test(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeRmsCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readRmsCurrentMinPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID, true);
+    }
 
-    private native void testSimpleArgumentRequest(long chipClusterPtr, TestSimpleArgumentResponseCallback callback, Boolean arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeRmsCurrentMinPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testStructArrayArgumentRequest(long chipClusterPtr, TestStructArrayArgumentResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void testStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void readRmsCurrentMaxPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testNestedStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStruct arg1, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID, true);
+    }
 
-    private native void testListStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeRmsCurrentMaxPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testListInt8UArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ArrayList<Integer> arg1, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void testNestedStructListArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStructList arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void readActivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testListNestedStructListArgumentRequest(long chipClusterPtr, BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID, true);
+    }
 
-    private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeActivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testEnumsRequest(long chipClusterPtr, TestEnumsResponseCallback callback, Integer arg1, Integer arg2, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void testNullableOptionalRequest(long chipClusterPtr, TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void readActivePowerMinPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testComplexNullableOptionalRequest(long chipClusterPtr, TestComplexNullableOptionalResponseCallback callback, @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID, true);
+    }
 
-    private native void simpleStructEchoRequest(long chipClusterPtr, SimpleStructResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeActivePowerMinPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID);
 
-    private native void timedInvokeRequest(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void testSimpleOptionalArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, Optional<Boolean> arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void readActivePowerMaxPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    private native void testEmitTestEventRequest(long chipClusterPtr, TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3, @Nullable Integer timedInvokeTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID, true);
+    }
 
-    private native void testEmitTestFabricScopedEventRequest(long chipClusterPtr, TestEmitTestFabricScopedEventResponseCallback callback, Integer arg1, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeActivePowerMaxPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID);
 
-    public interface TestSpecificResponseCallback {
-      void onSuccess(Integer returnValue);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface TestAddArgumentsResponseCallback {
-      void onSuccess(Integer returnValue);
-      void onError(Exception error);
-    }
+    public void readReactivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface TestSimpleArgumentResponseCallback {
-      void onSuccess(Boolean returnValue);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface TestStructArrayArgumentResponseCallback {
-      void onSuccess(ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6);
-      void onError(Exception error);
-    }
+    public void subscribeReactivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface BooleanResponseCallback {
-      void onSuccess(Boolean value);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface TestListInt8UReverseResponseCallback {
-      void onSuccess(ArrayList<Integer> arg1);
-      void onError(Exception error);
-    }
+    public void readApparentPowerPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface TestEnumsResponseCallback {
-      void onSuccess(Integer arg1, Integer arg2);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, APPARENT_POWER_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface TestNullableOptionalResponseCallback {
-      void onSuccess(Boolean wasPresent, Optional<Boolean> wasNull, Optional<Integer> value, @Nullable Optional<Integer> originalValue);
-      void onError(Exception error);
-    }
+    public void subscribeApparentPowerPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPARENT_POWER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface TestComplexNullableOptionalResponseCallback {
-      void onSuccess(Boolean nullableIntWasNull, Optional<Integer> nullableIntValue, Boolean optionalIntWasPresent, Optional<Integer> optionalIntValue, Boolean nullableOptionalIntWasPresent, Optional<Boolean> nullableOptionalIntWasNull, Optional<Integer> nullableOptionalIntValue, Boolean nullableStringWasNull, Optional<String> nullableStringValue, Boolean optionalStringWasPresent, Optional<String> optionalStringValue, Boolean nullableOptionalStringWasPresent, Optional<Boolean> nullableOptionalStringWasNull, Optional<String> nullableOptionalStringValue, Boolean nullableStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableStructValue, Boolean optionalStructWasPresent, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStructValue, Boolean nullableOptionalStructWasPresent, Optional<Boolean> nullableOptionalStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStructValue, Boolean nullableListWasNull, Optional<ArrayList<Integer>> nullableListValue, Boolean optionalListWasPresent, Optional<ArrayList<Integer>> optionalListValue, Boolean nullableOptionalListWasPresent, Optional<Boolean> nullableOptionalListWasNull, Optional<ArrayList<Integer>> nullableOptionalListValue);
-      void onError(Exception error);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, APPARENT_POWER_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface SimpleStructResponseCallback {
-      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct arg1);
-      void onError(Exception error);
-    }
+    public void readPowerFactorPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_PHASE_C_ATTRIBUTE_ID);
 
-    public interface TestEmitTestEventResponseCallback {
-      void onSuccess(Long value);
-      void onError(Exception error);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, POWER_FACTOR_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface TestEmitTestFabricScopedEventResponseCallback {
-      void onSuccess(Long value);
-      void onError(Exception error);
-    }
+    public void subscribePowerFactorPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_FACTOR_PHASE_C_ATTRIBUTE_ID);
 
-    public interface ListInt8uAttributeCallback {
-      void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_FACTOR_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface ListOctetStringAttributeCallback {
-      void onSuccess(List<byte[]> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface ListStructOctetStringAttributeCallback {
-      void onSuccess(List<ChipStructs.UnitTestingClusterTestListStructOctet> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface ListNullablesAndOptionalsStructAttributeCallback {
-      void onSuccess(List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface StructAttrAttributeCallback {
-      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface ListLongOctetStringAttributeCallback {
-      void onSuccess(List<byte[]> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAverageRmsOverVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface ListFabricScopedAttributeCallback {
-      void onSuccess(List<ChipStructs.UnitTestingClusterTestFabricScoped> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableBooleanAttributeCallback {
-      void onSuccess(@Nullable Boolean value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableBitmap8AttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableBitmap16AttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAverageRmsUnderVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableBitmap32AttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableBitmap64AttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt8uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableInt16uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readRmsExtremeOverVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt24uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableInt32uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt40uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableInt48uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt56uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableInt64uAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt8sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableInt16sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readRmsVoltageSagPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt24sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableInt32sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeRmsVoltageSagPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt40sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableInt48sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readRmsVoltageSwellPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableInt56sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableInt64sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeRmsVoltageSwellPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID);
 
-    public interface NullableEnum8AttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableEnum16AttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface NullableFloatSingleAttributeCallback {
-      void onSuccess(@Nullable Float value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableFloatDoubleAttributeCallback {
-      void onSuccess(@Nullable Double value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface NullableOctetStringAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableCharStringAttributeCallback {
-      void onSuccess(@Nullable String value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface NullableEnumAttrAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableStructAttributeCallback {
-      void onSuccess(@Nullable ChipStructs.UnitTestingClusterSimpleStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public interface NullableRangeRestrictedInt8uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface NullableRangeRestrictedInt8sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface NullableRangeRestrictedInt16uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface NullableRangeRestrictedInt16sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void readBooleanAttribute(
-        BooleanAttributeCallback callback) {
-        readBooleanAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void readBitmap8Attribute(
-        IntegerAttributeCallback callback) {
-        readBitmap8Attribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
-        writeBitmap8Attribute(chipClusterPtr, callback, value, null);
-    }
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBitmap8Attribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readBitmap16Attribute(
-        IntegerAttributeCallback callback) {
-        readBitmap16Attribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
+  }
 
-    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
-        writeBitmap16Attribute(chipClusterPtr, callback, value, null);
-    }
+  public static class UnitTestingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 4294048773L;
 
-    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private static final long BOOLEAN_ATTRIBUTE_ID = 0L;
+    private static final long BITMAP8_ATTRIBUTE_ID = 1L;
+    private static final long BITMAP16_ATTRIBUTE_ID = 2L;
+    private static final long BITMAP32_ATTRIBUTE_ID = 3L;
+    private static final long BITMAP64_ATTRIBUTE_ID = 4L;
+    private static final long INT8U_ATTRIBUTE_ID = 5L;
+    private static final long INT16U_ATTRIBUTE_ID = 6L;
+    private static final long INT24U_ATTRIBUTE_ID = 7L;
+    private static final long INT32U_ATTRIBUTE_ID = 8L;
+    private static final long INT40U_ATTRIBUTE_ID = 9L;
+    private static final long INT48U_ATTRIBUTE_ID = 10L;
+    private static final long INT56U_ATTRIBUTE_ID = 11L;
+    private static final long INT64U_ATTRIBUTE_ID = 12L;
+    private static final long INT8S_ATTRIBUTE_ID = 13L;
+    private static final long INT16S_ATTRIBUTE_ID = 14L;
+    private static final long INT24S_ATTRIBUTE_ID = 15L;
+    private static final long INT32S_ATTRIBUTE_ID = 16L;
+    private static final long INT40S_ATTRIBUTE_ID = 17L;
+    private static final long INT48S_ATTRIBUTE_ID = 18L;
+    private static final long INT56S_ATTRIBUTE_ID = 19L;
+    private static final long INT64S_ATTRIBUTE_ID = 20L;
+    private static final long ENUM8_ATTRIBUTE_ID = 21L;
+    private static final long ENUM16_ATTRIBUTE_ID = 22L;
+    private static final long FLOAT_SINGLE_ATTRIBUTE_ID = 23L;
+    private static final long FLOAT_DOUBLE_ATTRIBUTE_ID = 24L;
+    private static final long OCTET_STRING_ATTRIBUTE_ID = 25L;
+    private static final long LIST_INT8U_ATTRIBUTE_ID = 26L;
+    private static final long LIST_OCTET_STRING_ATTRIBUTE_ID = 27L;
+    private static final long LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID = 28L;
+    private static final long LONG_OCTET_STRING_ATTRIBUTE_ID = 29L;
+    private static final long CHAR_STRING_ATTRIBUTE_ID = 30L;
+    private static final long LONG_CHAR_STRING_ATTRIBUTE_ID = 31L;
+    private static final long EPOCH_US_ATTRIBUTE_ID = 32L;
+    private static final long EPOCH_S_ATTRIBUTE_ID = 33L;
+    private static final long VENDOR_ID_ATTRIBUTE_ID = 34L;
+    private static final long LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID = 35L;
+    private static final long ENUM_ATTR_ATTRIBUTE_ID = 36L;
+    private static final long STRUCT_ATTR_ATTRIBUTE_ID = 37L;
+    private static final long RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID = 38L;
+    private static final long RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID = 39L;
+    private static final long RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID = 40L;
+    private static final long RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID = 41L;
+    private static final long LIST_LONG_OCTET_STRING_ATTRIBUTE_ID = 42L;
+    private static final long LIST_FABRIC_SCOPED_ATTRIBUTE_ID = 43L;
+    private static final long TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID = 48L;
+    private static final long GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID = 49L;
+    private static final long CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID = 50L;
+    private static final long UNSUPPORTED_ATTRIBUTE_ID = 255L;
+    private static final long NULLABLE_BOOLEAN_ATTRIBUTE_ID = 16384L;
+    private static final long NULLABLE_BITMAP8_ATTRIBUTE_ID = 16385L;
+    private static final long NULLABLE_BITMAP16_ATTRIBUTE_ID = 16386L;
+    private static final long NULLABLE_BITMAP32_ATTRIBUTE_ID = 16387L;
+    private static final long NULLABLE_BITMAP64_ATTRIBUTE_ID = 16388L;
+    private static final long NULLABLE_INT8U_ATTRIBUTE_ID = 16389L;
+    private static final long NULLABLE_INT16U_ATTRIBUTE_ID = 16390L;
+    private static final long NULLABLE_INT24U_ATTRIBUTE_ID = 16391L;
+    private static final long NULLABLE_INT32U_ATTRIBUTE_ID = 16392L;
+    private static final long NULLABLE_INT40U_ATTRIBUTE_ID = 16393L;
+    private static final long NULLABLE_INT48U_ATTRIBUTE_ID = 16394L;
+    private static final long NULLABLE_INT56U_ATTRIBUTE_ID = 16395L;
+    private static final long NULLABLE_INT64U_ATTRIBUTE_ID = 16396L;
+    private static final long NULLABLE_INT8S_ATTRIBUTE_ID = 16397L;
+    private static final long NULLABLE_INT16S_ATTRIBUTE_ID = 16398L;
+    private static final long NULLABLE_INT24S_ATTRIBUTE_ID = 16399L;
+    private static final long NULLABLE_INT32S_ATTRIBUTE_ID = 16400L;
+    private static final long NULLABLE_INT40S_ATTRIBUTE_ID = 16401L;
+    private static final long NULLABLE_INT48S_ATTRIBUTE_ID = 16402L;
+    private static final long NULLABLE_INT56S_ATTRIBUTE_ID = 16403L;
+    private static final long NULLABLE_INT64S_ATTRIBUTE_ID = 16404L;
+    private static final long NULLABLE_ENUM8_ATTRIBUTE_ID = 16405L;
+    private static final long NULLABLE_ENUM16_ATTRIBUTE_ID = 16406L;
+    private static final long NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID = 16407L;
+    private static final long NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID = 16408L;
+    private static final long NULLABLE_OCTET_STRING_ATTRIBUTE_ID = 16409L;
+    private static final long NULLABLE_CHAR_STRING_ATTRIBUTE_ID = 16414L;
+    private static final long NULLABLE_ENUM_ATTR_ATTRIBUTE_ID = 16420L;
+    private static final long NULLABLE_STRUCT_ATTRIBUTE_ID = 16421L;
+    private static final long NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID = 16422L;
+    private static final long NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID = 16423L;
+    private static final long NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID = 16424L;
+    private static final long NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID = 16425L;
+    private static final long WRITE_ONLY_INT8U_ATTRIBUTE_ID = 16426L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
 
-    public void subscribeBitmap16Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public UnitTestingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void readBitmap32Attribute(
-        LongAttributeCallback callback) {
-        readBitmap32Attribute(chipClusterPtr, callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value) {
-        writeBitmap32Attribute(chipClusterPtr, callback, value, null);
+    public void test(DefaultClusterCallback callback) {
+      test(callback, 0);
     }
 
-    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void test(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public void subscribeBitmap32Attribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readBitmap64Attribute(
-        LongAttributeCallback callback) {
-        readBitmap64Attribute(chipClusterPtr, callback);
+    public void testNotHandled(DefaultClusterCallback callback) {
+      testNotHandled(callback, 0);
     }
 
-    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value) {
-        writeBitmap64Attribute(chipClusterPtr, callback, value, null);
-    }
+    public void testNotHandled(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeBitmap64Attribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testSpecific(TestSpecificResponseCallback callback) {
+      testSpecific(callback, 0);
     }
 
-    public void readInt8uAttribute(
-        IntegerAttributeCallback callback) {
-        readInt8uAttribute(chipClusterPtr, callback);
+    public void testSpecific(TestSpecificResponseCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long returnValueFieldID = 0L;
+          Integer returnValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == returnValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                returnValue = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(returnValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void testUnknownCommand(DefaultClusterCallback callback) {
+      testUnknownCommand(callback, 0);
     }
 
-    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void testUnknownCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    public void subscribeInt8uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt16uAttribute(
-        IntegerAttributeCallback callback) {
-        readInt16uAttribute(chipClusterPtr, callback);
+    public void testAddArguments(TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2) {
+      testAddArguments(callback, arg1, arg2, 0);
     }
 
-    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeInt16uAttribute(chipClusterPtr, callback, value, null);
+    public void testAddArguments(TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new UIntType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      final long arg2FieldID = 1L;
+      BaseTLVType arg2tlvValue = new UIntType(arg2);
+      elements.add(new StructElement(arg2FieldID, arg2tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long returnValueFieldID = 0L;
+          Integer returnValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == returnValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                returnValue = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(returnValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback, Boolean arg1) {
+      testSimpleArgumentRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt16uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback, Boolean arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new BooleanType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long returnValueFieldID = 0L;
+          Boolean returnValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == returnValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                returnValue = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(returnValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt24uAttribute(
-        LongAttributeCallback callback) {
-        readInt24uAttribute(chipClusterPtr, callback);
+    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6) {
+      testStructArrayArgumentRequest(callback, arg1, arg2, arg3, arg4, arg5, arg6, 0);
     }
 
-    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt24uAttribute(chipClusterPtr, callback, value, null);
+    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6, int timedInvokeTimeoutMs) {
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = ArrayType.generateArrayType(arg1, (elementarg1) -> elementarg1.encodeTlv());
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      final long arg2FieldID = 1L;
+      BaseTLVType arg2tlvValue = ArrayType.generateArrayType(arg2, (elementarg2) -> elementarg2.encodeTlv());
+      elements.add(new StructElement(arg2FieldID, arg2tlvValue));
+
+      final long arg3FieldID = 2L;
+      BaseTLVType arg3tlvValue = ArrayType.generateArrayType(arg3, (elementarg3) -> new UIntType(elementarg3));
+      elements.add(new StructElement(arg3FieldID, arg3tlvValue));
+
+      final long arg4FieldID = 3L;
+      BaseTLVType arg4tlvValue = ArrayType.generateArrayType(arg4, (elementarg4) -> new BooleanType(elementarg4));
+      elements.add(new StructElement(arg4FieldID, arg4tlvValue));
+
+      final long arg5FieldID = 4L;
+      BaseTLVType arg5tlvValue = new UIntType(arg5);
+      elements.add(new StructElement(arg5FieldID, arg5tlvValue));
+
+      final long arg6FieldID = 5L;
+      BaseTLVType arg6tlvValue = new BooleanType(arg6);
+      elements.add(new StructElement(arg6FieldID, arg6tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long arg1FieldID = 0L;
+          ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1 = null;
+          final long arg2FieldID = 1L;
+          ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2 = null;
+          final long arg3FieldID = 2L;
+          ArrayList<Integer> arg3 = null;
+          final long arg4FieldID = 3L;
+          ArrayList<Boolean> arg4 = null;
+          final long arg5FieldID = 4L;
+          Integer arg5 = null;
+          final long arg6FieldID = 5L;
+          Boolean arg6 = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == arg1FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                arg1 = castingValue.map((elementcastingValue) -> ChipStructs.UnitTestingClusterNestedStructList.decodeTlv(elementcastingValue));
+              }
+            } else if (element.contextTagNum() == arg2FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                arg2 = castingValue.map((elementcastingValue) -> ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(elementcastingValue));
+              }
+            } else if (element.contextTagNum() == arg3FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                arg3 = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == arg4FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                arg4 = castingValue.map((elementcastingValue) -> elementcastingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == arg5FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                arg5 = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == arg6FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                arg6 = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(arg1, arg2, arg3, arg4, arg5, arg6);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1) {
+      testStructArgumentRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt24uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1.encodeTlv();
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt32uAttribute(
-        LongAttributeCallback callback) {
-        readInt32uAttribute(chipClusterPtr, callback);
+    public void testNestedStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStruct arg1) {
+      testNestedStructArgumentRequest(callback, arg1, 0);
     }
 
-    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt32uAttribute(chipClusterPtr, callback, value, null);
+    public void testNestedStructArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStruct arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1.encodeTlv();
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testListStructArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1) {
+      testListStructArgumentRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt32uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testListStructArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 9L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = ArrayType.generateArrayType(arg1, (elementarg1) -> elementarg1.encodeTlv());
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt40uAttribute(
-        LongAttributeCallback callback) {
-        readInt40uAttribute(chipClusterPtr, callback);
+    public void testListInt8UArgumentRequest(BooleanResponseCallback callback, ArrayList<Integer> arg1) {
+      testListInt8UArgumentRequest(callback, arg1, 0);
     }
 
-    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt40uAttribute(chipClusterPtr, callback, value, null);
+    public void testListInt8UArgumentRequest(BooleanResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 10L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = ArrayType.generateArrayType(arg1, (elementarg1) -> new UIntType(elementarg1));
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStructList arg1) {
+      testNestedStructListArgumentRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt40uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback, ChipStructs.UnitTestingClusterNestedStructList arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 11L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1.encodeTlv();
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt48uAttribute(
-        LongAttributeCallback callback) {
-        readInt48uAttribute(chipClusterPtr, callback);
+    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1) {
+      testListNestedStructListArgumentRequest(callback, arg1, 0);
     }
 
-    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt48uAttribute(chipClusterPtr, callback, value, null);
+    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback, ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 12L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = ArrayType.generateArrayType(arg1, (elementarg1) -> elementarg1.encodeTlv());
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Boolean value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                value = castingValue.value(Boolean.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1) {
+      testListInt8UReverseRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt48uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 13L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = ArrayType.generateArrayType(arg1, (elementarg1) -> new UIntType(elementarg1));
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long arg1FieldID = 0L;
+          ArrayList<Integer> arg1 = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == arg1FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                arg1 = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(arg1);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt56uAttribute(
-        LongAttributeCallback callback) {
-        readInt56uAttribute(chipClusterPtr, callback);
+    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2) {
+      testEnumsRequest(callback, arg1, arg2, 0);
     }
 
-    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt56uAttribute(chipClusterPtr, callback, value, null);
+    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
+      final long commandId = 14L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new UIntType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      final long arg2FieldID = 1L;
+      BaseTLVType arg2tlvValue = new UIntType(arg2);
+      elements.add(new StructElement(arg2FieldID, arg2tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long arg1FieldID = 0L;
+          Integer arg1 = null;
+          final long arg2FieldID = 1L;
+          Integer arg2 = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == arg1FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                arg1 = castingValue.value(Integer.class);
+              }
+            } else if (element.contextTagNum() == arg2FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                arg2 = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(arg1, arg2);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1) {
+      testNullableOptionalRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt56uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 15L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1 != null ? arg1.<BaseTLVType>map((nonOptionalarg1) -> new UIntType(nonOptionalarg1)).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long wasPresentFieldID = 0L;
+          Boolean wasPresent = null;
+          final long wasNullFieldID = 1L;
+          Optional<Boolean> wasNull = Optional.empty();
+          final long valueFieldID = 2L;
+          Optional<Integer> value = Optional.empty();
+          final long originalValueFieldID = 3L;
+          @Nullable Optional<Integer> originalValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == wasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                wasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == wasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                wasNull = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                value = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == originalValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                originalValue = Optional.of(castingValue.value(Integer.class));
+              }
+            }
+          }
+          callback.onSuccess(wasPresent, wasNull, value, originalValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt64uAttribute(
-        LongAttributeCallback callback) {
-        readInt64uAttribute(chipClusterPtr, callback);
+    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback, @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList) {
+      testComplexNullableOptionalRequest(callback, nullableInt, optionalInt, nullableOptionalInt, nullableString, optionalString, nullableOptionalString, nullableStruct, optionalStruct, nullableOptionalStruct, nullableList, optionalList, nullableOptionalList, 0);
     }
 
-    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt64uAttribute(chipClusterPtr, callback, value, null);
+    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback, @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList, int timedInvokeTimeoutMs) {
+      final long commandId = 16L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long nullableIntFieldID = 0L;
+      BaseTLVType nullableInttlvValue = nullableInt != null ? new UIntType(nullableInt) : new NullType();
+      elements.add(new StructElement(nullableIntFieldID, nullableInttlvValue));
+
+      final long optionalIntFieldID = 1L;
+      BaseTLVType optionalInttlvValue = optionalInt.<BaseTLVType>map((nonOptionaloptionalInt) -> new UIntType(nonOptionaloptionalInt)).orElse(new EmptyType());
+      elements.add(new StructElement(optionalIntFieldID, optionalInttlvValue));
+
+      final long nullableOptionalIntFieldID = 2L;
+      BaseTLVType nullableOptionalInttlvValue = nullableOptionalInt != null ? nullableOptionalInt.<BaseTLVType>map((nonOptionalnullableOptionalInt) -> new UIntType(nonOptionalnullableOptionalInt)).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(nullableOptionalIntFieldID, nullableOptionalInttlvValue));
+
+      final long nullableStringFieldID = 3L;
+      BaseTLVType nullableStringtlvValue = nullableString != null ? new StringType(nullableString) : new NullType();
+      elements.add(new StructElement(nullableStringFieldID, nullableStringtlvValue));
+
+      final long optionalStringFieldID = 4L;
+      BaseTLVType optionalStringtlvValue = optionalString.<BaseTLVType>map((nonOptionaloptionalString) -> new StringType(nonOptionaloptionalString)).orElse(new EmptyType());
+      elements.add(new StructElement(optionalStringFieldID, optionalStringtlvValue));
+
+      final long nullableOptionalStringFieldID = 5L;
+      BaseTLVType nullableOptionalStringtlvValue = nullableOptionalString != null ? nullableOptionalString.<BaseTLVType>map((nonOptionalnullableOptionalString) -> new StringType(nonOptionalnullableOptionalString)).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(nullableOptionalStringFieldID, nullableOptionalStringtlvValue));
+
+      final long nullableStructFieldID = 6L;
+      BaseTLVType nullableStructtlvValue = nullableStruct != null ? nullableStruct.encodeTlv() : new NullType();
+      elements.add(new StructElement(nullableStructFieldID, nullableStructtlvValue));
+
+      final long optionalStructFieldID = 7L;
+      BaseTLVType optionalStructtlvValue = optionalStruct.<BaseTLVType>map((nonOptionaloptionalStruct) -> nonOptionaloptionalStruct.encodeTlv()).orElse(new EmptyType());
+      elements.add(new StructElement(optionalStructFieldID, optionalStructtlvValue));
+
+      final long nullableOptionalStructFieldID = 8L;
+      BaseTLVType nullableOptionalStructtlvValue = nullableOptionalStruct != null ? nullableOptionalStruct.<BaseTLVType>map((nonOptionalnullableOptionalStruct) -> nonOptionalnullableOptionalStruct.encodeTlv()).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(nullableOptionalStructFieldID, nullableOptionalStructtlvValue));
+
+      final long nullableListFieldID = 9L;
+      BaseTLVType nullableListtlvValue = nullableList != null ? ArrayType.generateArrayType(nullableList, (elementnullableList) -> new UIntType(elementnullableList)) : new NullType();
+      elements.add(new StructElement(nullableListFieldID, nullableListtlvValue));
+
+      final long optionalListFieldID = 10L;
+      BaseTLVType optionalListtlvValue = optionalList.<BaseTLVType>map((nonOptionaloptionalList) -> ArrayType.generateArrayType(nonOptionaloptionalList, (elementnonOptionaloptionalList) -> new UIntType(elementnonOptionaloptionalList))).orElse(new EmptyType());
+      elements.add(new StructElement(optionalListFieldID, optionalListtlvValue));
+
+      final long nullableOptionalListFieldID = 11L;
+      BaseTLVType nullableOptionalListtlvValue = nullableOptionalList != null ? nullableOptionalList.<BaseTLVType>map((nonOptionalnullableOptionalList) -> ArrayType.generateArrayType(nonOptionalnullableOptionalList, (elementnonOptionalnullableOptionalList) -> new UIntType(elementnonOptionalnullableOptionalList))).orElse(new EmptyType()) : new NullType();
+      elements.add(new StructElement(nullableOptionalListFieldID, nullableOptionalListtlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long nullableIntWasNullFieldID = 0L;
+          Boolean nullableIntWasNull = null;
+          final long nullableIntValueFieldID = 1L;
+          Optional<Integer> nullableIntValue = Optional.empty();
+          final long optionalIntWasPresentFieldID = 2L;
+          Boolean optionalIntWasPresent = null;
+          final long optionalIntValueFieldID = 3L;
+          Optional<Integer> optionalIntValue = Optional.empty();
+          final long nullableOptionalIntWasPresentFieldID = 4L;
+          Boolean nullableOptionalIntWasPresent = null;
+          final long nullableOptionalIntWasNullFieldID = 5L;
+          Optional<Boolean> nullableOptionalIntWasNull = Optional.empty();
+          final long nullableOptionalIntValueFieldID = 6L;
+          Optional<Integer> nullableOptionalIntValue = Optional.empty();
+          final long nullableStringWasNullFieldID = 7L;
+          Boolean nullableStringWasNull = null;
+          final long nullableStringValueFieldID = 8L;
+          Optional<String> nullableStringValue = Optional.empty();
+          final long optionalStringWasPresentFieldID = 9L;
+          Boolean optionalStringWasPresent = null;
+          final long optionalStringValueFieldID = 10L;
+          Optional<String> optionalStringValue = Optional.empty();
+          final long nullableOptionalStringWasPresentFieldID = 11L;
+          Boolean nullableOptionalStringWasPresent = null;
+          final long nullableOptionalStringWasNullFieldID = 12L;
+          Optional<Boolean> nullableOptionalStringWasNull = Optional.empty();
+          final long nullableOptionalStringValueFieldID = 13L;
+          Optional<String> nullableOptionalStringValue = Optional.empty();
+          final long nullableStructWasNullFieldID = 14L;
+          Boolean nullableStructWasNull = null;
+          final long nullableStructValueFieldID = 15L;
+          Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableStructValue = Optional.empty();
+          final long optionalStructWasPresentFieldID = 16L;
+          Boolean optionalStructWasPresent = null;
+          final long optionalStructValueFieldID = 17L;
+          Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStructValue = Optional.empty();
+          final long nullableOptionalStructWasPresentFieldID = 18L;
+          Boolean nullableOptionalStructWasPresent = null;
+          final long nullableOptionalStructWasNullFieldID = 19L;
+          Optional<Boolean> nullableOptionalStructWasNull = Optional.empty();
+          final long nullableOptionalStructValueFieldID = 20L;
+          Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStructValue = Optional.empty();
+          final long nullableListWasNullFieldID = 21L;
+          Boolean nullableListWasNull = null;
+          final long nullableListValueFieldID = 22L;
+          Optional<ArrayList<Integer>> nullableListValue = Optional.empty();
+          final long optionalListWasPresentFieldID = 23L;
+          Boolean optionalListWasPresent = null;
+          final long optionalListValueFieldID = 24L;
+          Optional<ArrayList<Integer>> optionalListValue = Optional.empty();
+          final long nullableOptionalListWasPresentFieldID = 25L;
+          Boolean nullableOptionalListWasPresent = null;
+          final long nullableOptionalListWasNullFieldID = 26L;
+          Optional<Boolean> nullableOptionalListWasNull = Optional.empty();
+          final long nullableOptionalListValueFieldID = 27L;
+          Optional<ArrayList<Integer>> nullableOptionalListValue = Optional.empty();
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == nullableIntWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableIntWasNull = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableIntValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                nullableIntValue = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == optionalIntWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                optionalIntWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == optionalIntValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                optionalIntValue = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalIntWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalIntWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableOptionalIntWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalIntWasNull = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalIntValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                nullableOptionalIntValue = Optional.of(castingValue.value(Integer.class));
+              }
+            } else if (element.contextTagNum() == nullableStringWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableStringWasNull = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableStringValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                nullableStringValue = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == optionalStringWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                optionalStringWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == optionalStringValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                optionalStringValue = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalStringWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalStringWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableOptionalStringWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalStringWasNull = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalStringValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.String) {
+                StringType castingValue = element.value(StringType.class);
+                nullableOptionalStringValue = Optional.of(castingValue.value(String.class));
+              }
+            } else if (element.contextTagNum() == nullableStructWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableStructWasNull = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableStructValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                nullableStructValue = Optional.of(ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue));
+              }
+            } else if (element.contextTagNum() == optionalStructWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                optionalStructWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == optionalStructValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                optionalStructValue = Optional.of(ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue));
+              }
+            } else if (element.contextTagNum() == nullableOptionalStructWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalStructWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableOptionalStructWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalStructWasNull = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalStructValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                nullableOptionalStructValue = Optional.of(ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue));
+              }
+            } else if (element.contextTagNum() == nullableListWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableListWasNull = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableListValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                nullableListValue = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+              }
+            } else if (element.contextTagNum() == optionalListWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                optionalListWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == optionalListValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                optionalListValue = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+              }
+            } else if (element.contextTagNum() == nullableOptionalListWasPresentFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalListWasPresent = castingValue.value(Boolean.class);
+              }
+            } else if (element.contextTagNum() == nullableOptionalListWasNullFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+                BooleanType castingValue = element.value(BooleanType.class);
+                nullableOptionalListWasNull = Optional.of(castingValue.value(Boolean.class));
+              }
+            } else if (element.contextTagNum() == nullableOptionalListValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+                ArrayType castingValue = element.value(ArrayType.class);
+                nullableOptionalListValue = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+              }
+            }
+          }
+          callback.onSuccess(nullableIntWasNull, nullableIntValue, optionalIntWasPresent, optionalIntValue, nullableOptionalIntWasPresent, nullableOptionalIntWasNull, nullableOptionalIntValue, nullableStringWasNull, nullableStringValue, optionalStringWasPresent, optionalStringValue, nullableOptionalStringWasPresent, nullableOptionalStringWasNull, nullableOptionalStringValue, nullableStructWasNull, nullableStructValue, optionalStructWasPresent, optionalStructValue, nullableOptionalStructWasPresent, nullableOptionalStructWasNull, nullableOptionalStructValue, nullableListWasNull, nullableListValue, optionalListWasPresent, optionalListValue, nullableOptionalListWasPresent, nullableOptionalListWasNull, nullableOptionalListValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void simpleStructEchoRequest(SimpleStructResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1) {
+      simpleStructEchoRequest(callback, arg1, 0);
     }
 
-    public void subscribeInt64uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void simpleStructEchoRequest(SimpleStructResponseCallback callback, ChipStructs.UnitTestingClusterSimpleStruct arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 17L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1.encodeTlv();
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long arg1FieldID = 0L;
+          ChipStructs.UnitTestingClusterSimpleStruct arg1 = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == arg1FieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+                StructType castingValue = element.value(StructType.class);
+                arg1 = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+              }
+            }
+          }
+          callback.onSuccess(arg1);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readInt8sAttribute(
-        IntegerAttributeCallback callback) {
-        readInt8sAttribute(chipClusterPtr, callback);
-    }
 
-    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeInt8sAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void timedInvokeRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 18L;
 
-    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeInt8sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback, Optional<Boolean> arg1) {
+      testSimpleOptionalArgumentRequest(callback, arg1, 0);
     }
 
-    public void readInt16sAttribute(
-        IntegerAttributeCallback callback) {
-        readInt16sAttribute(chipClusterPtr, callback);
+    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback, Optional<Boolean> arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 19L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = arg1.<BaseTLVType>map((nonOptionalarg1) -> new BooleanType(nonOptionalarg1)).orElse(new EmptyType());
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeInt16sAttribute(chipClusterPtr, callback, value, null);
+    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3) {
+      testEmitTestEventRequest(callback, arg1, arg2, arg3, 0);
     }
 
-    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3, int timedInvokeTimeoutMs) {
+      final long commandId = 20L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new UIntType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      final long arg2FieldID = 1L;
+      BaseTLVType arg2tlvValue = new UIntType(arg2);
+      elements.add(new StructElement(arg2FieldID, arg2tlvValue));
+
+      final long arg3FieldID = 2L;
+      BaseTLVType arg3tlvValue = new BooleanType(arg3);
+      elements.add(new StructElement(arg3FieldID, arg3tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Long value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                value = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeInt16sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback, Integer arg1) {
+      testEmitTestFabricScopedEventRequest(callback, arg1, 0);
     }
 
-    public void readInt24sAttribute(
-        LongAttributeCallback callback) {
-        readInt24sAttribute(chipClusterPtr, callback);
+    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback, Integer arg1, int timedInvokeTimeoutMs) {
+      final long commandId = 21L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new UIntType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long valueFieldID = 0L;
+          Long value = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == valueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                value = castingValue.value(Long.class);
+              }
+            }
+          }
+          callback.onSuccess(value);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface TestSpecificResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer returnValue);
     }
 
-    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt24sAttribute(chipClusterPtr, callback, value, null);
+    public interface TestAddArgumentsResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer returnValue);
     }
 
-    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface TestSimpleArgumentResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean returnValue);
     }
 
-    public void subscribeInt24sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface TestStructArrayArgumentResponseCallback extends BaseClusterCallback {
+      void onSuccess(ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6);
     }
 
-    public void readInt32sAttribute(
-        LongAttributeCallback callback) {
-        readInt32sAttribute(chipClusterPtr, callback);
+    public interface BooleanResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean value);
     }
 
-    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt32sAttribute(chipClusterPtr, callback, value, null);
+    public interface TestListInt8UReverseResponseCallback extends BaseClusterCallback {
+      void onSuccess(ArrayList<Integer> arg1);
     }
 
-    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface TestEnumsResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer arg1, Integer arg2);
     }
 
-    public void subscribeInt32sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface TestNullableOptionalResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean wasPresent, Optional<Boolean> wasNull, Optional<Integer> value, @Nullable Optional<Integer> originalValue);
     }
 
-    public void readInt40sAttribute(
-        LongAttributeCallback callback) {
-        readInt40sAttribute(chipClusterPtr, callback);
+    public interface TestComplexNullableOptionalResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean nullableIntWasNull, Optional<Integer> nullableIntValue, Boolean optionalIntWasPresent, Optional<Integer> optionalIntValue, Boolean nullableOptionalIntWasPresent, Optional<Boolean> nullableOptionalIntWasNull, Optional<Integer> nullableOptionalIntValue, Boolean nullableStringWasNull, Optional<String> nullableStringValue, Boolean optionalStringWasPresent, Optional<String> optionalStringValue, Boolean nullableOptionalStringWasPresent, Optional<Boolean> nullableOptionalStringWasNull, Optional<String> nullableOptionalStringValue, Boolean nullableStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableStructValue, Boolean optionalStructWasPresent, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStructValue, Boolean nullableOptionalStructWasPresent, Optional<Boolean> nullableOptionalStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStructValue, Boolean nullableListWasNull, Optional<ArrayList<Integer>> nullableListValue, Boolean optionalListWasPresent, Optional<ArrayList<Integer>> optionalListValue, Boolean nullableOptionalListWasPresent, Optional<Boolean> nullableOptionalListWasNull, Optional<ArrayList<Integer>> nullableOptionalListValue);
     }
 
-    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt40sAttribute(chipClusterPtr, callback, value, null);
+    public interface SimpleStructResponseCallback extends BaseClusterCallback {
+      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct arg1);
     }
 
-    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface TestEmitTestEventResponseCallback extends BaseClusterCallback {
+      void onSuccess(Long value);
     }
 
-    public void subscribeInt40sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface TestEmitTestFabricScopedEventResponseCallback extends BaseClusterCallback {
+      void onSuccess(Long value);
     }
 
-    public void readInt48sAttribute(
-        LongAttributeCallback callback) {
-        readInt48sAttribute(chipClusterPtr, callback);
+    public interface ListInt8uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Integer> value);
     }
 
-    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt48sAttribute(chipClusterPtr, callback, value, null);
+    public interface ListOctetStringAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<byte[]> value);
     }
 
-    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface ListStructOctetStringAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterTestListStructOctet> value);
     }
 
-    public void subscribeInt48sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface ListNullablesAndOptionalsStructAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value);
     }
 
-    public void readInt56sAttribute(
-        LongAttributeCallback callback) {
-        readInt56sAttribute(chipClusterPtr, callback);
+    public interface StructAttrAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct value);
     }
 
-    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt56sAttribute(chipClusterPtr, callback, value, null);
+    public interface ListLongOctetStringAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<byte[]> value);
     }
 
-    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface ListFabricScopedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterTestFabricScoped> value);
     }
 
-    public void subscribeInt56sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableBooleanAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Boolean value);
     }
 
-    public void readInt64sAttribute(
-        LongAttributeCallback callback) {
-        readInt64sAttribute(chipClusterPtr, callback);
+    public interface NullableBitmap8AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value) {
-        writeInt64sAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableBitmap16AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableBitmap32AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeInt64sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableBitmap64AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readEnum8Attribute(
-        IntegerAttributeCallback callback) {
-        readEnum8Attribute(chipClusterPtr, callback);
+    public interface NullableInt8uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value) {
-        writeEnum8Attribute(chipClusterPtr, callback, value, null);
+    public interface NullableInt16uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableInt24uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeEnum8Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableInt32uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readEnum16Attribute(
-        IntegerAttributeCallback callback) {
-        readEnum16Attribute(chipClusterPtr, callback);
+    public interface NullableInt40uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value) {
-        writeEnum16Attribute(chipClusterPtr, callback, value, null);
+    public interface NullableInt48uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableInt56uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeEnum16Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableInt64uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readFloatSingleAttribute(
-        FloatAttributeCallback callback) {
-        readFloatSingleAttribute(chipClusterPtr, callback);
+    public interface NullableInt8sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
-        writeFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableInt16sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
-        writeFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableInt24sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeFloatSingleAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableInt32sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readFloatDoubleAttribute(
-        DoubleAttributeCallback callback) {
-        readFloatDoubleAttribute(chipClusterPtr, callback);
+    public interface NullableInt40sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
-        writeFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableInt48sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
-        writeFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableInt56sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeFloatDoubleAttribute(
-        DoubleAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableInt64sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readOctetStringAttribute(
-        OctetStringAttributeCallback callback) {
-        readOctetStringAttribute(chipClusterPtr, callback);
+    public interface NullableEnum8AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-        writeOctetStringAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableEnum16AttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-        writeOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableFloatSingleAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
     }
 
-    public void subscribeOctetStringAttribute(
-        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableFloatDoubleAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Double value);
     }
 
-    public void readListInt8uAttribute(
-        ListInt8uAttributeCallback callback) {
-        readListInt8uAttribute(chipClusterPtr, callback);
+    public interface NullableOctetStringAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
     }
 
-    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value) {
-        writeListInt8uAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableCharStringAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable String value);
     }
 
-    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value, int timedWriteTimeoutMs) {
-        writeListInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableEnumAttrAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeListInt8uAttribute(
-        ListInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableStructAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.UnitTestingClusterSimpleStruct value);
     }
 
-    public void readListOctetStringAttribute(
-        ListOctetStringAttributeCallback callback) {
-        readListOctetStringAttribute(chipClusterPtr, callback);
+    public interface NullableRangeRestrictedInt8uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
-        writeListOctetStringAttribute(chipClusterPtr, callback, value, null);
+    public interface NullableRangeRestrictedInt8sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
-        writeListOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface NullableRangeRestrictedInt16uAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeListOctetStringAttribute(
-        ListOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NullableRangeRestrictedInt16sAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readListStructOctetStringAttribute(
-        ListStructOctetStringAttributeCallback callback) {
-        readListStructOctetStringAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value) {
-        writeListStructOctetStringAttribute(chipClusterPtr, callback, value, null);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value, int timedWriteTimeoutMs) {
-        writeListStructOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeListStructOctetStringAttribute(
-        ListStructOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListStructOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readLongOctetStringAttribute(
-        OctetStringAttributeCallback callback) {
-        readLongOctetStringAttribute(chipClusterPtr, callback);
+    public void readBooleanAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BOOLEAN_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BOOLEAN_ATTRIBUTE_ID, true);
     }
 
-    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-        writeLongOctetStringAttribute(chipClusterPtr, callback, value, null);
+    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeBooleanAttribute(callback, value, 0);
     }
 
-    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-        writeLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BOOLEAN_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLongOctetStringAttribute(
-        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BOOLEAN_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BOOLEAN_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readCharStringAttribute(
-        CharStringAttributeCallback callback) {
-        readCharStringAttribute(chipClusterPtr, callback);
+    public void readBitmap8Attribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP8_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BITMAP8_ATTRIBUTE_ID, true);
     }
 
-    public void writeCharStringAttribute(DefaultClusterCallback callback, String value) {
-        writeCharStringAttribute(chipClusterPtr, callback, value, null);
+    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap8Attribute(callback, value, 0);
     }
 
-    public void writeCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BITMAP8_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeCharStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBitmap8Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP8_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BITMAP8_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readLongCharStringAttribute(
-        CharStringAttributeCallback callback) {
-        readLongCharStringAttribute(chipClusterPtr, callback);
+    public void readBitmap16Attribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP16_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BITMAP16_ATTRIBUTE_ID, true);
     }
 
-    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value) {
-        writeLongCharStringAttribute(chipClusterPtr, callback, value, null);
+    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap16Attribute(callback, value, 0);
     }
 
-    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLongCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BITMAP16_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeLongCharStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLongCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBitmap16Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP16_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BITMAP16_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEpochUsAttribute(
+    public void readBitmap32Attribute(
         LongAttributeCallback callback) {
-        readEpochUsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP32_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BITMAP32_ATTRIBUTE_ID, true);
     }
 
-    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value) {
-        writeEpochUsAttribute(chipClusterPtr, callback, value, null);
+    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap32Attribute(callback, value, 0);
     }
 
-    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeEpochUsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BITMAP32_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeEpochUsAttribute(
+    public void subscribeBitmap32Attribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEpochUsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP32_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BITMAP32_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEpochSAttribute(
+    public void readBitmap64Attribute(
         LongAttributeCallback callback) {
-        readEpochSAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP64_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, BITMAP64_ATTRIBUTE_ID, true);
     }
 
-    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value) {
-        writeEpochSAttribute(chipClusterPtr, callback, value, null);
+    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap64Attribute(callback, value, 0);
     }
 
-    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeEpochSAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BITMAP64_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeEpochSAttribute(
+    public void subscribeBitmap64Attribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEpochSAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BITMAP64_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BITMAP64_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readVendorIdAttribute(
+    public void readInt8uAttribute(
         IntegerAttributeCallback callback) {
-        readVendorIdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT8U_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT8U_ATTRIBUTE_ID, true);
     }
 
-    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value) {
-        writeVendorIdAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8uAttribute(callback, value, 0);
     }
 
-    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeVendorIdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeVendorIdAttribute(
+    public void subscribeInt8uAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT8U_ATTRIBUTE_ID);
 
-    public void readListNullablesAndOptionalsStructAttribute(
-        ListNullablesAndOptionalsStructAttributeCallback callback) {
-        readListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value) {
-        writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt16uAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT16U_ATTRIBUTE_ID);
 
-    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value, int timedWriteTimeoutMs) {
-        writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT16U_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeListNullablesAndOptionalsStructAttribute(
-        ListNullablesAndOptionalsStructAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16uAttribute(callback, value, 0);
     }
 
-    public void readEnumAttrAttribute(
-        IntegerAttributeCallback callback) {
-        readEnumAttrAttribute(chipClusterPtr, callback);
+    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT16U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
-        writeEnumAttrAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt16uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT16U_ATTRIBUTE_ID);
 
-    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT16U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeEnumAttrAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt24uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT24U_ATTRIBUTE_ID);
 
-    public void readStructAttrAttribute(
-        StructAttrAttributeCallback callback) {
-        readStructAttrAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT24U_ATTRIBUTE_ID, true);
     }
 
-    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
-        writeStructAttrAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24uAttribute(callback, value, 0);
     }
 
-    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
-        writeStructAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT24U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeStructAttrAttribute(
-        StructAttrAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStructAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt24uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT24U_ATTRIBUTE_ID);
 
-    public void readRangeRestrictedInt8uAttribute(
-        IntegerAttributeCallback callback) {
-        readRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT24U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt32uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT32U_ATTRIBUTE_ID);
 
-    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT32U_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeRangeRestrictedInt8uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32uAttribute(callback, value, 0);
     }
 
-    public void readRangeRestrictedInt8sAttribute(
-        IntegerAttributeCallback callback) {
-        readRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
+    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT32U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt32uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT32U_ATTRIBUTE_ID);
 
-    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT32U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeRangeRestrictedInt8sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt40uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT40U_ATTRIBUTE_ID);
 
-    public void readRangeRestrictedInt16uAttribute(
-        IntegerAttributeCallback callback) {
-        readRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT40U_ATTRIBUTE_ID, true);
     }
 
-    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40uAttribute(callback, value, 0);
     }
 
-    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT40U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeRangeRestrictedInt16uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt40uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT40U_ATTRIBUTE_ID);
 
-    public void readRangeRestrictedInt16sAttribute(
-        IntegerAttributeCallback callback) {
-        readRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT40U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
+    public void readInt48uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT48U_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT48U_ATTRIBUTE_ID, true);
     }
 
-    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48uAttribute(callback, value, 0);
     }
 
-    public void subscribeRangeRestrictedInt16sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT48U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readListLongOctetStringAttribute(
-        ListLongOctetStringAttributeCallback callback) {
-        readListLongOctetStringAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeInt48uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT48U_ATTRIBUTE_ID);
 
-    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
-        writeListLongOctetStringAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT48U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
-        writeListLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readInt56uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT56U_ATTRIBUTE_ID);
 
-    public void subscribeListLongOctetStringAttribute(
-        ListLongOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT56U_ATTRIBUTE_ID, true);
     }
 
-    public void readListFabricScopedAttribute(
-        ListFabricScopedAttributeCallback callback) {
-        readListFabricScopedAttribute(chipClusterPtr, callback, true);
+    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56uAttribute(callback, value, 0);
     }
 
-    public void readListFabricScopedAttributeWithFabricFilter(
-        ListFabricScopedAttributeCallback callback, boolean isFabricFiltered) {
-        readListFabricScopedAttribute(chipClusterPtr, callback, isFabricFiltered);
+    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT56U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
+    public void subscribeInt56uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT56U_ATTRIBUTE_ID);
 
-    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value) {
-        writeListFabricScopedAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT56U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value, int timedWriteTimeoutMs) {
-        writeListFabricScopedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readInt64uAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT64U_ATTRIBUTE_ID);
 
-    public void subscribeListFabricScopedAttribute(
-        ListFabricScopedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeListFabricScopedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT64U_ATTRIBUTE_ID, true);
     }
 
-    public void readTimedWriteBooleanAttribute(
-        BooleanAttributeCallback callback) {
-        readTimedWriteBooleanAttribute(chipClusterPtr, callback);
+    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64uAttribute(callback, value, 0);
     }
 
-    public void writeTimedWriteBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeTimedWriteBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT64U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeTimedWriteBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTimedWriteBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt64uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT64U_ATTRIBUTE_ID);
 
-    public void readGeneralErrorBooleanAttribute(
-        BooleanAttributeCallback callback) {
-        readGeneralErrorBooleanAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT64U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt8sAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT8S_ATTRIBUTE_ID);
 
-    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT8S_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeGeneralErrorBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneralErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8sAttribute(callback, value, 0);
     }
 
-    public void readClusterErrorBooleanAttribute(
-        BooleanAttributeCallback callback) {
-        readClusterErrorBooleanAttribute(chipClusterPtr, callback);
+    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT8S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt8sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT8S_ATTRIBUTE_ID);
 
-    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT8S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeClusterErrorBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt16sAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT16S_ATTRIBUTE_ID);
 
-    public void readUnsupportedAttribute(
-        BooleanAttributeCallback callback) {
-        readUnsupportedAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT16S_ATTRIBUTE_ID, true);
     }
 
-    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeUnsupportedAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16sAttribute(callback, value, 0);
     }
 
-    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeUnsupportedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT16S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeUnsupportedAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnsupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt16sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT16S_ATTRIBUTE_ID);
 
-    public void readNullableBooleanAttribute(
-        NullableBooleanAttributeCallback callback) {
-        readNullableBooleanAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT16S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeNullableBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt24sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT24S_ATTRIBUTE_ID);
 
-    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeNullableBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT24S_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNullableBooleanAttribute(
-        NullableBooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24sAttribute(callback, value, 0);
     }
 
-    public void readNullableBitmap8Attribute(
-        NullableBitmap8AttributeCallback callback) {
-        readNullableBitmap8Attribute(chipClusterPtr, callback);
+    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT24S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableBitmap8Attribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt24sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT24S_ATTRIBUTE_ID);
 
-    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT24S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableBitmap8Attribute(
-        NullableBitmap8AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt32sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT32S_ATTRIBUTE_ID);
 
-    public void readNullableBitmap16Attribute(
-        NullableBitmap16AttributeCallback callback) {
-        readNullableBitmap16Attribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT32S_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableBitmap16Attribute(chipClusterPtr, callback, value, null);
+    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32sAttribute(callback, value, 0);
     }
 
-    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT32S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNullableBitmap16Attribute(
-        NullableBitmap16AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt32sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT32S_ATTRIBUTE_ID);
 
-    public void readNullableBitmap32Attribute(
-        NullableBitmap32AttributeCallback callback) {
-        readNullableBitmap32Attribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT32S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value) {
-        writeNullableBitmap32Attribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt40sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT40S_ATTRIBUTE_ID);
 
-    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT40S_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNullableBitmap32Attribute(
-        NullableBitmap32AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40sAttribute(callback, value, 0);
     }
 
-    public void readNullableBitmap64Attribute(
-        NullableBitmap64AttributeCallback callback) {
-        readNullableBitmap64Attribute(chipClusterPtr, callback);
+    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT40S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value) {
-        writeNullableBitmap64Attribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt40sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT40S_ATTRIBUTE_ID);
 
-    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT40S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableBitmap64Attribute(
-        NullableBitmap64AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt48sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT48S_ATTRIBUTE_ID);
 
-    public void readNullableInt8uAttribute(
-        NullableInt8uAttributeCallback callback) {
-        readNullableInt8uAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT48S_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48sAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT48S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNullableInt8uAttribute(
-        NullableInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt48sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT48S_ATTRIBUTE_ID);
 
-    public void readNullableInt16uAttribute(
-        NullableInt16uAttributeCallback callback) {
-        readNullableInt16uAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT48S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableInt16uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readInt56sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT56S_ATTRIBUTE_ID);
 
-    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT56S_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNullableInt16uAttribute(
-        NullableInt16uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56sAttribute(callback, value, 0);
     }
 
-    public void readNullableInt24uAttribute(
-        NullableInt24uAttributeCallback callback) {
-        readNullableInt24uAttribute(chipClusterPtr, callback);
+    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT56S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt24uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeInt56sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT56S_ATTRIBUTE_ID);
 
-    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT56S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt24uAttribute(
-        NullableInt24uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readInt64sAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT64S_ATTRIBUTE_ID);
 
-    public void readNullableInt32uAttribute(
-        NullableInt32uAttributeCallback callback) {
-        readNullableInt32uAttribute(chipClusterPtr, callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, INT64S_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt32uAttribute(chipClusterPtr, callback, value, null);
+    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64sAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INT64S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNullableInt32uAttribute(
-        NullableInt32uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeInt64sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INT64S_ATTRIBUTE_ID);
 
-    public void readNullableInt40uAttribute(
-        NullableInt40uAttributeCallback callback) {
-        readNullableInt40uAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, INT64S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt40uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readEnum8Attribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM8_ATTRIBUTE_ID);
 
-    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENUM8_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeNullableInt40uAttribute(
-        NullableInt40uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum8Attribute(callback, value, 0);
     }
 
-    public void readNullableInt48uAttribute(
-        NullableInt48uAttributeCallback callback) {
-        readNullableInt48uAttribute(chipClusterPtr, callback);
+    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENUM8_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt48uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeEnum8Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM8_ATTRIBUTE_ID);
 
-    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENUM8_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt48uAttribute(
-        NullableInt48uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readEnum16Attribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM16_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENUM16_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt56uAttribute(
-        NullableInt56uAttributeCallback callback) {
-        readNullableInt56uAttribute(chipClusterPtr, callback);
+    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum16Attribute(callback, value, 0);
     }
 
-    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt56uAttribute(chipClusterPtr, callback, value, null);
+    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENUM16_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeEnum16Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM16_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENUM16_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt56uAttribute(
-        NullableInt56uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readFloatSingleAttribute(
+        FloatAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLOAT_SINGLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FLOAT_SINGLE_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt64uAttribute(
-        NullableInt64uAttributeCallback callback) {
-        readNullableInt64uAttribute(chipClusterPtr, callback);
+    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeFloatSingleAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt64uAttribute(chipClusterPtr, callback, value, null);
+    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new FloatType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), FLOAT_SINGLE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeFloatSingleAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLOAT_SINGLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FLOAT_SINGLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt64uAttribute(
-        NullableInt64uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readFloatDoubleAttribute(
+        DoubleAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLOAT_DOUBLE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Double value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FLOAT_DOUBLE_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt8sAttribute(
-        NullableInt8sAttributeCallback callback) {
-        readNullableInt8sAttribute(chipClusterPtr, callback);
+    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeFloatDoubleAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableInt8sAttribute(chipClusterPtr, callback, value, null);
+    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new DoubleType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), FLOAT_DOUBLE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeFloatDoubleAttribute(
+        DoubleAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLOAT_DOUBLE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Double value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FLOAT_DOUBLE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt8sAttribute(
-        NullableInt8sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readOctetStringAttribute(
+        OctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCTET_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OCTET_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt16sAttribute(
-        NullableInt16sAttributeCallback callback) {
-        readNullableInt16sAttribute(chipClusterPtr, callback);
+    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeOctetStringAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableInt16sAttribute(chipClusterPtr, callback, value, null);
+    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new ByteArrayType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeOctetStringAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCTET_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt16sAttribute(
-        NullableInt16sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readListInt8uAttribute(
+        ListInt8uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_INT8U_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_INT8U_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt24sAttribute(
-        NullableInt24sAttributeCallback callback) {
-        readNullableInt24sAttribute(chipClusterPtr, callback);
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value) {
+      writeListInt8uAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt24sAttribute(chipClusterPtr, callback, value, null);
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> new UIntType(elementvalue));
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeListInt8uAttribute(
+        ListInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_INT8U_ATTRIBUTE_ID);
 
-    public void subscribeNullableInt24sAttribute(
-        NullableInt24sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Integer> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableInt32sAttribute(
-        NullableInt32sAttributeCallback callback) {
-        readNullableInt32sAttribute(chipClusterPtr, callback);
-    }
+    public void readListOctetStringAttribute(
+        ListOctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt32sAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_OCTET_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListOctetStringAttribute(callback, value, 0);
     }
 
-    public void subscribeNullableInt32sAttribute(
-        NullableInt32sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> new ByteArrayType(elementvalue));
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readNullableInt40sAttribute(
-        NullableInt40sAttributeCallback callback) {
-        readNullableInt40sAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeListOctetStringAttribute(
+        ListOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt40sAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readListStructOctetStringAttribute(
+        ListStructOctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void subscribeNullableInt40sAttribute(
-        NullableInt40sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterTestListStructOctet> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableInt48sAttribute(
-        NullableInt48sAttributeCallback callback) {
-        readNullableInt48sAttribute(chipClusterPtr, callback);
+    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value) {
+      writeListStructOctetStringAttribute(callback, value, 0);
     }
 
-    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt48sAttribute(chipClusterPtr, callback, value, null);
+    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeListStructOctetStringAttribute(
+        ListStructOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void subscribeNullableInt48sAttribute(
-        NullableInt48sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterTestListStructOctet> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableInt56sAttribute(
-        NullableInt56sAttributeCallback callback) {
-        readNullableInt56sAttribute(chipClusterPtr, callback);
-    }
+    public void readLongOctetStringAttribute(
+        OctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LONG_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt56sAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LONG_OCTET_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeLongOctetStringAttribute(callback, value, 0);
     }
 
-    public void subscribeNullableInt56sAttribute(
-        NullableInt56sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new ByteArrayType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LONG_OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readNullableInt64sAttribute(
-        NullableInt64sAttributeCallback callback) {
-        readNullableInt64sAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLongOctetStringAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LONG_OCTET_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value) {
-        writeNullableInt64sAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LONG_OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeNullableInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readCharStringAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHAR_STRING_ATTRIBUTE_ID);
 
-    public void subscribeNullableInt64sAttribute(
-        NullableInt64sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CHAR_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableEnum8Attribute(
-        NullableEnum8AttributeCallback callback) {
-        readNullableEnum8Attribute(chipClusterPtr, callback);
+    public void writeCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeCharStringAttribute(callback, value, 0);
     }
 
-    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableEnum8Attribute(chipClusterPtr, callback, value, null);
+    public void writeCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), CHAR_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeCharStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHAR_STRING_ATTRIBUTE_ID);
 
-    public void subscribeNullableEnum8Attribute(
-        NullableEnum8AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHAR_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableEnum16Attribute(
-        NullableEnum16AttributeCallback callback) {
-        readNullableEnum16Attribute(chipClusterPtr, callback);
-    }
+    public void readLongCharStringAttribute(
+        CharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LONG_CHAR_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableEnum16Attribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LONG_CHAR_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeLongCharStringAttribute(callback, value, 0);
     }
 
-    public void subscribeNullableEnum16Attribute(
-        NullableEnum16AttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LONG_CHAR_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readNullableFloatSingleAttribute(
-        NullableFloatSingleAttributeCallback callback) {
-        readNullableFloatSingleAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeLongCharStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LONG_CHAR_STRING_ATTRIBUTE_ID);
 
-    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
-        writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LONG_CHAR_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
-        writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readEpochUsAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EPOCH_US_ATTRIBUTE_ID);
 
-    public void subscribeNullableFloatSingleAttribute(
-        NullableFloatSingleAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EPOCH_US_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableFloatDoubleAttribute(
-        NullableFloatDoubleAttributeCallback callback) {
-        readNullableFloatDoubleAttribute(chipClusterPtr, callback);
+    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochUsAttribute(callback, value, 0);
     }
 
-    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
-        writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), EPOCH_US_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
-        writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeEpochUsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EPOCH_US_ATTRIBUTE_ID);
 
-    public void subscribeNullableFloatDoubleAttribute(
-        NullableFloatDoubleAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EPOCH_US_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableOctetStringAttribute(
-        NullableOctetStringAttributeCallback callback) {
-        readNullableOctetStringAttribute(chipClusterPtr, callback);
-    }
+    public void readEpochSAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EPOCH_S_ATTRIBUTE_ID);
 
-    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-        writeNullableOctetStringAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EPOCH_S_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-        writeNullableOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochSAttribute(callback, value, 0);
     }
 
-    public void subscribeNullableOctetStringAttribute(
-        NullableOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), EPOCH_S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readNullableCharStringAttribute(
-        NullableCharStringAttributeCallback callback) {
-        readNullableCharStringAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeEpochSAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EPOCH_S_ATTRIBUTE_ID);
 
-    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value) {
-        writeNullableCharStringAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EPOCH_S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeNullableCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readVendorIdAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID);
 
-    public void subscribeNullableCharStringAttribute(
-        NullableCharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, VENDOR_ID_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableEnumAttrAttribute(
-        NullableEnumAttrAttributeCallback callback) {
-        readNullableEnumAttrAttribute(chipClusterPtr, callback);
+    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value) {
+      writeVendorIdAttribute(callback, value, 0);
     }
 
-    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, null);
+    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), VENDOR_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeVendorIdAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID);
 
-    public void subscribeNullableEnumAttrAttribute(
-        NullableEnumAttrAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VENDOR_ID_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableStructAttribute(
-        NullableStructAttributeCallback callback) {
-        readNullableStructAttribute(chipClusterPtr, callback);
-    }
+    public void readListNullablesAndOptionalsStructAttribute(
+        ListNullablesAndOptionalsStructAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID);
 
-    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
-        writeNullableStructAttribute(chipClusterPtr, callback, value, null);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
-        writeNullableStructAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value) {
+      writeListNullablesAndOptionalsStructAttribute(callback, value, 0);
     }
 
-    public void subscribeNullableStructAttribute(
-        NullableStructAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableStructAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void readNullableRangeRestrictedInt8uAttribute(
-        NullableRangeRestrictedInt8uAttributeCallback callback) {
-        readNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeListNullablesAndOptionalsStructAttribute(
+        ListNullablesAndOptionalsStructAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID);
 
-    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_NULLABLES_AND_OPTIONALS_STRUCT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readEnumAttrAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM_ATTR_ATTRIBUTE_ID);
 
-    public void subscribeNullableRangeRestrictedInt8uAttribute(
-        NullableRangeRestrictedInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENUM_ATTR_ATTRIBUTE_ID, true);
     }
 
-    public void readNullableRangeRestrictedInt8sAttribute(
-        NullableRangeRestrictedInt8sAttributeCallback callback) {
-        readNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
+    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEnumAttrAttribute(callback, value, 0);
     }
 
-    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
+    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ENUM_ATTR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void subscribeEnumAttrAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENUM_ATTR_ATTRIBUTE_ID);
 
-    public void subscribeNullableRangeRestrictedInt8sAttribute(
-        NullableRangeRestrictedInt8sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENUM_ATTR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableRangeRestrictedInt16uAttribute(
-        NullableRangeRestrictedInt16uAttributeCallback callback) {
-        readNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
+    public void readStructAttrAttribute(
+        StructAttrAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STRUCT_ATTR_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.UnitTestingClusterSimpleStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, STRUCT_ATTR_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
+    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
+      writeStructAttrAttribute(callback, value, 0);
     }
 
-    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value.encodeTlv();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), STRUCT_ATTR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNullableRangeRestrictedInt16uAttribute(
-        NullableRangeRestrictedInt16uAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStructAttrAttribute(
+        StructAttrAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STRUCT_ATTR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.UnitTestingClusterSimpleStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, STRUCT_ATTR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNullableRangeRestrictedInt16sAttribute(
-        NullableRangeRestrictedInt16sAttributeCallback callback) {
-        readNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
+    public void readRangeRestrictedInt8uAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, true);
     }
 
-    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
+    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8uAttribute(callback, value, 0);
     }
 
-    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeNullableRangeRestrictedInt16sAttribute(
-        NullableRangeRestrictedInt16sAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRangeRestrictedInt8uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readWriteOnlyInt8uAttribute(
+    public void readRangeRestrictedInt8sAttribute(
         IntegerAttributeCallback callback) {
-        readWriteOnlyInt8uAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, true);
     }
 
-    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWriteOnlyInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8sAttribute(callback, value, 0);
     }
 
-    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWriteOnlyInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeWriteOnlyInt8uAttribute(
+    public void subscribeRangeRestrictedInt8sAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWriteOnlyInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readRangeRestrictedInt16uAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16uAttribute(callback, value, 0);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRangeRestrictedInt16uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+    public void readRangeRestrictedInt16sAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16sAttribute(callback, value, 0);
     }
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new IntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRangeRestrictedInt16sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readListLongOctetStringAttribute(
+        ListLongOctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_LONG_OCTET_STRING_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_LONG_OCTET_STRING_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListLongOctetStringAttribute(callback, value, 0);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> new ByteArrayType(elementvalue));
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_LONG_OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeListLongOctetStringAttribute(
+        ListLongOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_LONG_OCTET_STRING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<byte[]> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_LONG_OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    private native void readBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void readListFabricScopedAttribute(
+        ListFabricScopedAttributeCallback callback) {
+      readListFabricScopedAttributeWithFabricFilter(callback, true);
+    }
 
-    private native void writeBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void readListFabricScopedAttributeWithFabricFilter(
+        ListFabricScopedAttributeCallback callback, boolean isFabricFiltered) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_FABRIC_SCOPED_ATTRIBUTE_ID);
 
-    private native void subscribeBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterTestFabricScoped> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, LIST_FABRIC_SCOPED_ATTRIBUTE_ID, isFabricFiltered);
+    }
 
-    private native void readBitmap8Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value) {
+      writeListFabricScopedAttribute(callback, value, 0);
+    }
 
-    private native void writeBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LIST_FABRIC_SCOPED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeBitmap8Attribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeListFabricScopedAttribute(
+        ListFabricScopedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIST_FABRIC_SCOPED_ATTRIBUTE_ID);
 
-    private native void readBitmap16Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.UnitTestingClusterTestFabricScoped> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LIST_FABRIC_SCOPED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readTimedWriteBooleanAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void subscribeBitmap16Attribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID, true);
+    }
 
-    private native void readBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeTimedWriteBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeTimedWriteBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void subscribeBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readGeneralErrorBooleanAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void writeBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeGeneralErrorBooleanAttribute(callback, value, 0);
+    }
 
-    private native void readInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneralErrorBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void subscribeInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readClusterErrorBooleanAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void writeInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeClusterErrorBooleanAttribute(callback, value, 0);
+    }
 
-    private native void readInt24uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt24uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeClusterErrorBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void subscribeInt24uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readUnsupportedAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNSUPPORTED_ATTRIBUTE_ID);
 
-    private native void writeInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNSUPPORTED_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeUnsupportedAttribute(callback, value, 0);
+    }
 
-    private native void readInt40uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), UNSUPPORTED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt40uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeUnsupportedAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNSUPPORTED_ATTRIBUTE_ID);
 
-    private native void subscribeInt40uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, UNSUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt48uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableBooleanAttribute(
+        NullableBooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void writeInt48uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_BOOLEAN_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt48uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeNullableBooleanAttribute(callback, value, 0);
+    }
 
-    private native void readInt56uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new BooleanType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_BOOLEAN_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt56uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableBooleanAttribute(
+        NullableBooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BOOLEAN_ATTRIBUTE_ID);
 
-    private native void subscribeInt56uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_BOOLEAN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableBitmap8Attribute(
+        NullableBitmap8AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP8_ATTRIBUTE_ID);
 
-    private native void writeInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_BITMAP8_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap8Attribute(callback, value, 0);
+    }
 
-    private native void readInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_BITMAP8_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableBitmap8Attribute(
+        NullableBitmap8AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP8_ATTRIBUTE_ID);
 
-    private native void subscribeInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_BITMAP8_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableBitmap16Attribute(
+        NullableBitmap16AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP16_ATTRIBUTE_ID);
 
-    private native void writeInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_BITMAP16_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap16Attribute(callback, value, 0);
+    }
 
-    private native void readInt24sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_BITMAP16_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt24sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableBitmap16Attribute(
+        NullableBitmap16AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP16_ATTRIBUTE_ID);
 
-    private native void subscribeInt24sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_BITMAP16_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt32sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableBitmap32Attribute(
+        NullableBitmap32AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP32_ATTRIBUTE_ID);
 
-    private native void writeInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_BITMAP32_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt32sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap32Attribute(callback, value, 0);
+    }
 
-    private native void readInt40sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_BITMAP32_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt40sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableBitmap32Attribute(
+        NullableBitmap32AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP32_ATTRIBUTE_ID);
 
-    private native void subscribeInt40sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_BITMAP32_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt48sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableBitmap64Attribute(
+        NullableBitmap64AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP64_ATTRIBUTE_ID);
 
-    private native void writeInt48sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_BITMAP64_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt48sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap64Attribute(callback, value, 0);
+    }
 
-    private native void readInt56sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_BITMAP64_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeInt56sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableBitmap64Attribute(
+        NullableBitmap64AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_BITMAP64_ATTRIBUTE_ID);
 
-    private native void subscribeInt56sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_BITMAP64_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readInt64sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableInt8uAttribute(
+        NullableInt8uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT8U_ATTRIBUTE_ID);
 
-    private native void writeInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT8U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeInt64sAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8uAttribute(callback, value, 0);
+    }
 
-    private native void readEnum8Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt8uAttribute(
+        NullableInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT8U_ATTRIBUTE_ID);
 
-    private native void subscribeEnum8Attribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEnum16Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableInt16uAttribute(
+        NullableInt16uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT16U_ATTRIBUTE_ID);
 
-    private native void writeEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT16U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeEnum16Attribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16uAttribute(callback, value, 0);
+    }
 
-    private native void readFloatSingleAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT16U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeFloatSingleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Float value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt16uAttribute(
+        NullableInt16uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT16U_ATTRIBUTE_ID);
 
-    private native void subscribeFloatSingleAttribute(long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT16U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFloatDoubleAttribute(long chipClusterPtr, DoubleAttributeCallback callback);
+    public void readNullableInt24uAttribute(
+        NullableInt24uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT24U_ATTRIBUTE_ID);
 
-    private native void writeFloatDoubleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Double value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT24U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeFloatDoubleAttribute(long chipClusterPtr, DoubleAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24uAttribute(callback, value, 0);
+    }
 
-    private native void readOctetStringAttribute(long chipClusterPtr, OctetStringAttributeCallback callback);
+    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT24U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt24uAttribute(
+        NullableInt24uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT24U_ATTRIBUTE_ID);
 
-    private native void subscribeOctetStringAttribute(long chipClusterPtr, OctetStringAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT24U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readListInt8uAttribute(long chipClusterPtr, ListInt8uAttributeCallback callback);
+    public void readNullableInt32uAttribute(
+        NullableInt32uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT32U_ATTRIBUTE_ID);
 
-    private native void writeListInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<Integer> value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT32U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeListInt8uAttribute(long chipClusterPtr, ListInt8uAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32uAttribute(callback, value, 0);
+    }
 
-    private native void readListOctetStringAttribute(long chipClusterPtr, ListOctetStringAttributeCallback callback);
+    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT32U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeListOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<byte[]> value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt32uAttribute(
+        NullableInt32uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT32U_ATTRIBUTE_ID);
 
-    private native void subscribeListOctetStringAttribute(long chipClusterPtr, ListOctetStringAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT32U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readListStructOctetStringAttribute(long chipClusterPtr, ListStructOctetStringAttributeCallback callback);
+    public void readNullableInt40uAttribute(
+        NullableInt40uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT40U_ATTRIBUTE_ID);
 
-    private native void writeListStructOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT40U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeListStructOctetStringAttribute(long chipClusterPtr, ListStructOctetStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40uAttribute(callback, value, 0);
+    }
 
-    private native void readLongOctetStringAttribute(long chipClusterPtr, OctetStringAttributeCallback callback);
+    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT40U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt40uAttribute(
+        NullableInt40uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT40U_ATTRIBUTE_ID);
 
-    private native void subscribeLongOctetStringAttribute(long chipClusterPtr, OctetStringAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT40U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readCharStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void readNullableInt48uAttribute(
+        NullableInt48uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT48U_ATTRIBUTE_ID);
 
-    private native void writeCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT48U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeCharStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48uAttribute(callback, value, 0);
+    }
 
-    private native void readLongCharStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT48U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeLongCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt48uAttribute(
+        NullableInt48uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT48U_ATTRIBUTE_ID);
 
-    private native void subscribeLongCharStringAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT48U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEpochUsAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableInt56uAttribute(
+        NullableInt56uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT56U_ATTRIBUTE_ID);
 
-    private native void writeEpochUsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT56U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeEpochUsAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56uAttribute(callback, value, 0);
+    }
 
-    private native void readEpochSAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT56U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeEpochSAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt56uAttribute(
+        NullableInt56uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT56U_ATTRIBUTE_ID);
 
-    private native void subscribeEpochSAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT56U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readVendorIdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableInt64uAttribute(
+        NullableInt64uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT64U_ATTRIBUTE_ID);
 
-    private native void writeVendorIdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT64U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeVendorIdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64uAttribute(callback, value, 0);
+    }
 
-    private native void readListNullablesAndOptionalsStructAttribute(long chipClusterPtr, ListNullablesAndOptionalsStructAttributeCallback callback);
+    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT64U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeListNullablesAndOptionalsStructAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt64uAttribute(
+        NullableInt64uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT64U_ATTRIBUTE_ID);
 
-    private native void subscribeListNullablesAndOptionalsStructAttribute(long chipClusterPtr, ListNullablesAndOptionalsStructAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT64U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEnumAttrAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableInt8sAttribute(
+        NullableInt8sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT8S_ATTRIBUTE_ID);
 
-    private native void writeEnumAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT8S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeEnumAttrAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8sAttribute(callback, value, 0);
+    }
 
-    private native void readStructAttrAttribute(long chipClusterPtr, StructAttrAttributeCallback callback);
+    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT8S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeStructAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt8sAttribute(
+        NullableInt8sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT8S_ATTRIBUTE_ID);
 
-    private native void subscribeStructAttrAttribute(long chipClusterPtr, StructAttrAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT8S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRangeRestrictedInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableInt16sAttribute(
+        NullableInt16sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT16S_ATTRIBUTE_ID);
 
-    private native void writeRangeRestrictedInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT16S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeRangeRestrictedInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16sAttribute(callback, value, 0);
+    }
 
-    private native void readRangeRestrictedInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT16S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeRangeRestrictedInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt16sAttribute(
+        NullableInt16sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT16S_ATTRIBUTE_ID);
 
-    private native void subscribeRangeRestrictedInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT16S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readRangeRestrictedInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableInt24sAttribute(
+        NullableInt24sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT24S_ATTRIBUTE_ID);
 
-    private native void writeRangeRestrictedInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT24S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeRangeRestrictedInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24sAttribute(callback, value, 0);
+    }
 
-    private native void readRangeRestrictedInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT24S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeRangeRestrictedInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt24sAttribute(
+        NullableInt24sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT24S_ATTRIBUTE_ID);
 
-    private native void subscribeRangeRestrictedInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT24S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readListLongOctetStringAttribute(long chipClusterPtr, ListLongOctetStringAttributeCallback callback);
+    public void readNullableInt32sAttribute(
+        NullableInt32sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT32S_ATTRIBUTE_ID);
 
-    private native void writeListLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<byte[]> value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT32S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeListLongOctetStringAttribute(long chipClusterPtr, ListLongOctetStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32sAttribute(callback, value, 0);
+    }
 
-    private native void readListFabricScopedAttribute(long chipClusterPtr, ListFabricScopedAttributeCallback callback, boolean isFabricFiltered);
+    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT32S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeListFabricScopedAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt32sAttribute(
+        NullableInt32sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT32S_ATTRIBUTE_ID);
 
-    private native void subscribeListFabricScopedAttribute(long chipClusterPtr, ListFabricScopedAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT32S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readTimedWriteBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void readNullableInt40sAttribute(
+        NullableInt40sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT40S_ATTRIBUTE_ID);
 
-    private native void writeTimedWriteBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT40S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeTimedWriteBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40sAttribute(callback, value, 0);
+    }
 
-    private native void readGeneralErrorBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT40S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeGeneralErrorBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt40sAttribute(
+        NullableInt40sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT40S_ATTRIBUTE_ID);
 
-    private native void subscribeGeneralErrorBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT40S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterErrorBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void readNullableInt48sAttribute(
+        NullableInt48sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT48S_ATTRIBUTE_ID);
 
-    private native void writeClusterErrorBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT48S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeClusterErrorBooleanAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48sAttribute(callback, value, 0);
+    }
 
-    private native void readUnsupportedAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT48S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeUnsupportedAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt48sAttribute(
+        NullableInt48sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT48S_ATTRIBUTE_ID);
 
-    private native void subscribeUnsupportedAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT48S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableBooleanAttribute(long chipClusterPtr, NullableBooleanAttributeCallback callback);
+    public void readNullableInt56sAttribute(
+        NullableInt56sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT56S_ATTRIBUTE_ID);
 
-    private native void writeNullableBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT56S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableBooleanAttribute(long chipClusterPtr, NullableBooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56sAttribute(callback, value, 0);
+    }
 
-    private native void readNullableBitmap8Attribute(long chipClusterPtr, NullableBitmap8AttributeCallback callback);
+    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT56S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt56sAttribute(
+        NullableInt56sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT56S_ATTRIBUTE_ID);
 
-    private native void subscribeNullableBitmap8Attribute(long chipClusterPtr, NullableBitmap8AttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT56S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableBitmap16Attribute(long chipClusterPtr, NullableBitmap16AttributeCallback callback);
+    public void readNullableInt64sAttribute(
+        NullableInt64sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT64S_ATTRIBUTE_ID);
 
-    private native void writeNullableBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_INT64S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableBitmap16Attribute(long chipClusterPtr, NullableBitmap16AttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64sAttribute(callback, value, 0);
+    }
 
-    private native void readNullableBitmap32Attribute(long chipClusterPtr, NullableBitmap32AttributeCallback callback);
+    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_INT64S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableInt64sAttribute(
+        NullableInt64sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_INT64S_ATTRIBUTE_ID);
 
-    private native void subscribeNullableBitmap32Attribute(long chipClusterPtr, NullableBitmap32AttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_INT64S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableBitmap64Attribute(long chipClusterPtr, NullableBitmap64AttributeCallback callback);
+    public void readNullableEnum8Attribute(
+        NullableEnum8AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM8_ATTRIBUTE_ID);
 
-    private native void writeNullableBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_ENUM8_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableBitmap64Attribute(long chipClusterPtr, NullableBitmap64AttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum8Attribute(callback, value, 0);
+    }
 
-    private native void readNullableInt8uAttribute(long chipClusterPtr, NullableInt8uAttributeCallback callback);
+    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_ENUM8_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableEnum8Attribute(
+        NullableEnum8AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM8_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt8uAttribute(long chipClusterPtr, NullableInt8uAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_ENUM8_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt16uAttribute(long chipClusterPtr, NullableInt16uAttributeCallback callback);
+    public void readNullableEnum16Attribute(
+        NullableEnum16AttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM16_ATTRIBUTE_ID);
 
-    private native void writeNullableInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_ENUM16_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt16uAttribute(long chipClusterPtr, NullableInt16uAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum16Attribute(callback, value, 0);
+    }
 
-    private native void readNullableInt24uAttribute(long chipClusterPtr, NullableInt24uAttributeCallback callback);
+    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_ENUM16_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt24uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableEnum16Attribute(
+        NullableEnum16AttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM16_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt24uAttribute(long chipClusterPtr, NullableInt24uAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_ENUM16_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt32uAttribute(long chipClusterPtr, NullableInt32uAttributeCallback callback);
+    public void readNullableFloatSingleAttribute(
+        NullableFloatSingleAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID);
 
-    private native void writeNullableInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt32uAttribute(long chipClusterPtr, NullableInt32uAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeNullableFloatSingleAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt40uAttribute(long chipClusterPtr, NullableInt40uAttributeCallback callback);
+    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new FloatType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt40uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableFloatSingleAttribute(
+        NullableFloatSingleAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt40uAttribute(long chipClusterPtr, NullableInt40uAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt48uAttribute(long chipClusterPtr, NullableInt48uAttributeCallback callback);
+    public void readNullableFloatDoubleAttribute(
+        NullableFloatDoubleAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID);
 
-    private native void writeNullableInt48uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Double value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt48uAttribute(long chipClusterPtr, NullableInt48uAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeNullableFloatDoubleAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt56uAttribute(long chipClusterPtr, NullableInt56uAttributeCallback callback);
+    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new DoubleType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt56uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableFloatDoubleAttribute(
+        NullableFloatDoubleAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt56uAttribute(long chipClusterPtr, NullableInt56uAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Double value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt64uAttribute(long chipClusterPtr, NullableInt64uAttributeCallback callback);
+    public void readNullableOctetStringAttribute(
+        NullableOctetStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_OCTET_STRING_ATTRIBUTE_ID);
 
-    private native void writeNullableInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_OCTET_STRING_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt64uAttribute(long chipClusterPtr, NullableInt64uAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeNullableOctetStringAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt8sAttribute(long chipClusterPtr, NullableInt8sAttributeCallback callback);
+    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new ByteArrayType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_OCTET_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableOctetStringAttribute(
+        NullableOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_OCTET_STRING_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt8sAttribute(long chipClusterPtr, NullableInt8sAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_OCTET_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt16sAttribute(long chipClusterPtr, NullableInt16sAttributeCallback callback);
+    public void readNullableCharStringAttribute(
+        NullableCharStringAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_CHAR_STRING_ATTRIBUTE_ID);
 
-    private native void writeNullableInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_CHAR_STRING_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt16sAttribute(long chipClusterPtr, NullableInt16sAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeNullableCharStringAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt24sAttribute(long chipClusterPtr, NullableInt24sAttributeCallback callback);
+    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new StringType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_CHAR_STRING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt24sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableCharStringAttribute(
+        NullableCharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_CHAR_STRING_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt24sAttribute(long chipClusterPtr, NullableInt24sAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_CHAR_STRING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt32sAttribute(long chipClusterPtr, NullableInt32sAttributeCallback callback);
+    public void readNullableEnumAttrAttribute(
+        NullableEnumAttrAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM_ATTR_ATTRIBUTE_ID);
 
-    private native void writeNullableInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_ENUM_ATTR_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt32sAttribute(long chipClusterPtr, NullableInt32sAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnumAttrAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt40sAttribute(long chipClusterPtr, NullableInt40sAttributeCallback callback);
+    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_ENUM_ATTR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt40sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableEnumAttrAttribute(
+        NullableEnumAttrAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_ENUM_ATTR_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt40sAttribute(long chipClusterPtr, NullableInt40sAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_ENUM_ATTR_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt48sAttribute(long chipClusterPtr, NullableInt48sAttributeCallback callback);
+    public void readNullableStructAttribute(
+        NullableStructAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_STRUCT_ATTRIBUTE_ID);
 
-    private native void writeNullableInt48sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.UnitTestingClusterSimpleStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_STRUCT_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt48sAttribute(long chipClusterPtr, NullableInt48sAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
+      writeNullableStructAttribute(callback, value, 0);
+    }
 
-    private native void readNullableInt56sAttribute(long chipClusterPtr, NullableInt56sAttributeCallback callback);
+    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? value.encodeTlv() : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_STRUCT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableInt56sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableStructAttribute(
+        NullableStructAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_STRUCT_ATTRIBUTE_ID);
 
-    private native void subscribeNullableInt56sAttribute(long chipClusterPtr, NullableInt56sAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable ChipStructs.UnitTestingClusterSimpleStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_STRUCT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt64sAttribute(long chipClusterPtr, NullableInt64sAttributeCallback callback);
+    public void readNullableRangeRestrictedInt8uAttribute(
+        NullableRangeRestrictedInt8uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID);
 
-    private native void writeNullableInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableInt64sAttribute(long chipClusterPtr, NullableInt64sAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8uAttribute(callback, value, 0);
+    }
 
-    private native void readNullableEnum8Attribute(long chipClusterPtr, NullableEnum8AttributeCallback callback);
+    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableRangeRestrictedInt8uAttribute(
+        NullableRangeRestrictedInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID);
 
-    private native void subscribeNullableEnum8Attribute(long chipClusterPtr, NullableEnum8AttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableEnum16Attribute(long chipClusterPtr, NullableEnum16AttributeCallback callback);
+    public void readNullableRangeRestrictedInt8sAttribute(
+        NullableRangeRestrictedInt8sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID);
 
-    private native void writeNullableEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableEnum16Attribute(long chipClusterPtr, NullableEnum16AttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8sAttribute(callback, value, 0);
+    }
 
-    private native void readNullableFloatSingleAttribute(long chipClusterPtr, NullableFloatSingleAttributeCallback callback);
+    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableFloatSingleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Float value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableRangeRestrictedInt8sAttribute(
+        NullableRangeRestrictedInt8sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID);
 
-    private native void subscribeNullableFloatSingleAttribute(long chipClusterPtr, NullableFloatSingleAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableFloatDoubleAttribute(long chipClusterPtr, NullableFloatDoubleAttributeCallback callback);
+    public void readNullableRangeRestrictedInt16uAttribute(
+        NullableRangeRestrictedInt16uAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID);
 
-    private native void writeNullableFloatDoubleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Double value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableFloatDoubleAttribute(long chipClusterPtr, NullableFloatDoubleAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16uAttribute(callback, value, 0);
+    }
 
-    private native void readNullableOctetStringAttribute(long chipClusterPtr, NullableOctetStringAttributeCallback callback);
+    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableRangeRestrictedInt16uAttribute(
+        NullableRangeRestrictedInt16uAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID);
 
-    private native void subscribeNullableOctetStringAttribute(long chipClusterPtr, NullableOctetStringAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT16U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableCharStringAttribute(long chipClusterPtr, NullableCharStringAttributeCallback callback);
+    public void readNullableRangeRestrictedInt16sAttribute(
+        NullableRangeRestrictedInt16sAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID);
 
-    private native void writeNullableCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableCharStringAttribute(long chipClusterPtr, NullableCharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16sAttribute(callback, value, 0);
+    }
 
-    private native void readNullableEnumAttrAttribute(long chipClusterPtr, NullableEnumAttrAttributeCallback callback);
+    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value != null ? new IntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableEnumAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNullableRangeRestrictedInt16sAttribute(
+        NullableRangeRestrictedInt16sAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID);
 
-    private native void subscribeNullableEnumAttrAttribute(long chipClusterPtr, NullableEnumAttrAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NULLABLE_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableStructAttribute(long chipClusterPtr, NullableStructAttributeCallback callback);
+    public void readWriteOnlyInt8uAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRITE_ONLY_INT8U_ATTRIBUTE_ID);
 
-    private native void writeNullableStructAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, WRITE_ONLY_INT8U_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableStructAttribute(long chipClusterPtr, NullableStructAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWriteOnlyInt8uAttribute(callback, value, 0);
+    }
 
-    private native void readNullableRangeRestrictedInt8uAttribute(long chipClusterPtr, NullableRangeRestrictedInt8uAttributeCallback callback);
+    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WRITE_ONLY_INT8U_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeNullableRangeRestrictedInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeWriteOnlyInt8uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRITE_ONLY_INT8U_ATTRIBUTE_ID);
 
-    private native void subscribeNullableRangeRestrictedInt8uAttribute(long chipClusterPtr, NullableRangeRestrictedInt8uAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WRITE_ONLY_INT8U_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNullableRangeRestrictedInt8sAttribute(long chipClusterPtr, NullableRangeRestrictedInt8sAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeNullableRangeRestrictedInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeNullableRangeRestrictedInt8sAttribute(long chipClusterPtr, NullableRangeRestrictedInt8sAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void readNullableRangeRestrictedInt16uAttribute(long chipClusterPtr, NullableRangeRestrictedInt16uAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeNullableRangeRestrictedInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeNullableRangeRestrictedInt16uAttribute(long chipClusterPtr, NullableRangeRestrictedInt16uAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNullableRangeRestrictedInt16sAttribute(long chipClusterPtr, NullableRangeRestrictedInt16sAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    private native void writeNullableRangeRestrictedInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableRangeRestrictedInt16sAttribute(long chipClusterPtr, NullableRangeRestrictedInt16sAttributeCallback callback, int minInterval, int maxInterval);
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void readWriteOnlyInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeWriteOnlyInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeWriteOnlyInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class FaultInjectionCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 4294048774L;
 
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public FaultInjectionCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void failAtFault(DefaultClusterCallback callback, Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex) {
-      failAtFault(chipClusterPtr, callback, type, id, numCallsToSkip, numCallsToFail, takeMutex, null);
+      failAtFault(callback, type, id, numCallsToSkip, numCallsToFail, takeMutex, 0);
     }
 
     public void failAtFault(DefaultClusterCallback callback, Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex, int timedInvokeTimeoutMs) {
-      failAtFault(chipClusterPtr, callback, type, id, numCallsToSkip, numCallsToFail, takeMutex, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long typeFieldID = 0L;
+      BaseTLVType typetlvValue = new UIntType(type);
+      elements.add(new StructElement(typeFieldID, typetlvValue));
+
+      final long idFieldID = 1L;
+      BaseTLVType idtlvValue = new UIntType(id);
+      elements.add(new StructElement(idFieldID, idtlvValue));
+
+      final long numCallsToSkipFieldID = 2L;
+      BaseTLVType numCallsToSkiptlvValue = new UIntType(numCallsToSkip);
+      elements.add(new StructElement(numCallsToSkipFieldID, numCallsToSkiptlvValue));
+
+      final long numCallsToFailFieldID = 3L;
+      BaseTLVType numCallsToFailtlvValue = new UIntType(numCallsToFail);
+      elements.add(new StructElement(numCallsToFailFieldID, numCallsToFailtlvValue));
+
+      final long takeMutexFieldID = 4L;
+      BaseTLVType takeMutextlvValue = new BooleanType(takeMutex);
+      elements.add(new StructElement(takeMutexFieldID, takeMutextlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void failRandomlyAtFault(DefaultClusterCallback callback, Integer type, Long id, Integer percentage) {
-      failRandomlyAtFault(chipClusterPtr, callback, type, id, percentage, null);
+      failRandomlyAtFault(callback, type, id, percentage, 0);
     }
 
     public void failRandomlyAtFault(DefaultClusterCallback callback, Integer type, Long id, Integer percentage, int timedInvokeTimeoutMs) {
-      failRandomlyAtFault(chipClusterPtr, callback, type, id, percentage, timedInvokeTimeoutMs);
-    }
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long typeFieldID = 0L;
+      BaseTLVType typetlvValue = new UIntType(type);
+      elements.add(new StructElement(typeFieldID, typetlvValue));
 
-    private native void failAtFault(long chipClusterPtr, DefaultClusterCallback callback, Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex, @Nullable Integer timedInvokeTimeoutMs);
+      final long idFieldID = 1L;
+      BaseTLVType idtlvValue = new UIntType(id);
+      elements.add(new StructElement(idFieldID, idtlvValue));
 
-    private native void failRandomlyAtFault(long chipClusterPtr, DefaultClusterCallback callback, Integer type, Long id, Integer percentage, @Nullable Integer timedInvokeTimeoutMs);
+      final long percentageFieldID = 2L;
+      BaseTLVType percentagetlvValue = new UIntType(percentage);
+      elements.add(new StructElement(percentageFieldID, percentagetlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 
   public static class SampleMeiCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 4294048800L;
 
+    private static final long FLIP_FLOP_ATTRIBUTE_ID = 0L;
+    private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
+    private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
+    private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
+    private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
+    private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
+    private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
+
     public SampleMeiCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void ping(DefaultClusterCallback callback) {
-      ping(chipClusterPtr, callback, null);
+      ping(callback, 0);
     }
 
     public void ping(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      ping(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addArguments(AddArgumentsResponseCallback callback, Integer arg1, Integer arg2) {
-      addArguments(chipClusterPtr, callback, arg1, arg2, null);
+      addArguments(callback, arg1, arg2, 0);
     }
 
     public void addArguments(AddArgumentsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
-      addArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
-    }
-
-    private native void ping(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addArguments(long chipClusterPtr, AddArgumentsResponseCallback callback, Integer arg1, Integer arg2, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface AddArgumentsResponseCallback {
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long arg1FieldID = 0L;
+      BaseTLVType arg1tlvValue = new UIntType(arg1);
+      elements.add(new StructElement(arg1FieldID, arg1tlvValue));
+
+      final long arg2FieldID = 1L;
+      BaseTLVType arg2tlvValue = new UIntType(arg2);
+      elements.add(new StructElement(arg2FieldID, arg2tlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          final long returnValueFieldID = 0L;
+          Integer returnValue = null;
+          for (StructElement element: invokeStructValue.value()) {
+            if (element.contextTagNum() == returnValueFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                returnValue = castingValue.value(Integer.class);
+              }
+            }
+          }
+          callback.onSuccess(returnValue);
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface AddArgumentsResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer returnValue);
-      void onError(Exception error);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface EventListAttributeCallback {
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
     public void readFlipFlopAttribute(
         BooleanAttributeCallback callback) {
-        readFlipFlopAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLIP_FLOP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FLIP_FLOP_ATTRIBUTE_ID, true);
     }
 
     public void writeFlipFlopAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeFlipFlopAttribute(chipClusterPtr, callback, value, null);
+      writeFlipFlopAttribute(callback, value, 0);
     }
 
     public void writeFlipFlopAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeFlipFlopAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new BooleanType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), FLIP_FLOP_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeFlipFlopAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFlipFlopAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FLIP_FLOP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FLIP_FLOP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAcceptedCommandListAttribute(
         AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEventListAttribute(
         EventListAttributeCallback callback) {
-        readEventListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeEventListAttribute(
         EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(
         AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeAttributeListAttribute(
         AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFeatureMapAttribute(
         LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
     public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readClusterRevisionAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readFlipFlopAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writeFlipFlopAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeFlipFlopAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
-
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
   }
 }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
index be50323f6c5b54..db8d4ddc1bfc23 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipEventStructs {
 public static class AccessControlClusterAccessControlEntryChangedEvent {
   public @Nullable Long adminNodeID;
@@ -28,6 +30,12 @@ public static class AccessControlClusterAccessControlEntryChangedEvent {
   public Integer changeType;
   public @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue;
   public Integer fabricIndex;
+  private static final long ADMIN_NODE_I_D_ID = 1L;
+  private static final long ADMIN_PASSCODE_I_D_ID = 2L;
+  private static final long CHANGE_TYPE_ID = 3L;
+  private static final long LATEST_VALUE_ID = 4L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public AccessControlClusterAccessControlEntryChangedEvent(
     @Nullable Long adminNodeID,
     @Nullable Integer adminPasscodeID,
@@ -42,6 +50,63 @@ public AccessControlClusterAccessControlEntryChangedEvent(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ADMIN_NODE_I_D_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType()));
+    values.add(new StructElement(ADMIN_PASSCODE_I_D_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType()));
+    values.add(new StructElement(CHANGE_TYPE_ID, new UIntType(changeType)));
+    values.add(new StructElement(LATEST_VALUE_ID, latestValue != null ? latestValue.encodeTlv() : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static AccessControlClusterAccessControlEntryChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Long adminNodeID = null;
+    @Nullable Integer adminPasscodeID = null;
+    Integer changeType = null;
+    @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ADMIN_NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          adminNodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ADMIN_PASSCODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          adminPasscodeID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CHANGE_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          changeType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LATEST_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          latestValue = ChipStructs.AccessControlClusterAccessControlEntryStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new AccessControlClusterAccessControlEntryChangedEvent(
+      adminNodeID,
+      adminPasscodeID,
+      changeType,
+      latestValue,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -71,6 +136,12 @@ public static class AccessControlClusterAccessControlExtensionChangedEvent {
   public Integer changeType;
   public @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue;
   public Integer fabricIndex;
+  private static final long ADMIN_NODE_I_D_ID = 1L;
+  private static final long ADMIN_PASSCODE_I_D_ID = 2L;
+  private static final long CHANGE_TYPE_ID = 3L;
+  private static final long LATEST_VALUE_ID = 4L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public AccessControlClusterAccessControlExtensionChangedEvent(
     @Nullable Long adminNodeID,
     @Nullable Integer adminPasscodeID,
@@ -85,6 +156,63 @@ public AccessControlClusterAccessControlExtensionChangedEvent(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ADMIN_NODE_I_D_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType()));
+    values.add(new StructElement(ADMIN_PASSCODE_I_D_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType()));
+    values.add(new StructElement(CHANGE_TYPE_ID, new UIntType(changeType)));
+    values.add(new StructElement(LATEST_VALUE_ID, latestValue != null ? latestValue.encodeTlv() : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static AccessControlClusterAccessControlExtensionChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Long adminNodeID = null;
+    @Nullable Integer adminPasscodeID = null;
+    Integer changeType = null;
+    @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ADMIN_NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          adminNodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ADMIN_PASSCODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          adminPasscodeID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CHANGE_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          changeType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LATEST_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          latestValue = ChipStructs.AccessControlClusterAccessControlExtensionStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new AccessControlClusterAccessControlExtensionChangedEvent(
+      adminNodeID,
+      adminPasscodeID,
+      changeType,
+      latestValue,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -112,6 +240,10 @@ public static class ActionsClusterStateChangedEvent {
   public Integer actionID;
   public Long invokeID;
   public Integer newState;
+  private static final long ACTION_I_D_ID = 0L;
+  private static final long INVOKE_I_D_ID = 1L;
+  private static final long NEW_STATE_ID = 2L;
+
   public ActionsClusterStateChangedEvent(
     Integer actionID,
     Long invokeID,
@@ -122,6 +254,47 @@ public ActionsClusterStateChangedEvent(
     this.newState = newState;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID)));
+    values.add(new StructElement(INVOKE_I_D_ID, new UIntType(invokeID)));
+    values.add(new StructElement(NEW_STATE_ID, new UIntType(newState)));
+
+    return new StructType(values);
+  }
+
+  public static ActionsClusterStateChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer actionID = null;
+    Long invokeID = null;
+    Integer newState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          actionID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == INVOKE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          invokeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NEW_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newState = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ActionsClusterStateChangedEvent(
+      actionID,
+      invokeID,
+      newState
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -144,6 +317,11 @@ public static class ActionsClusterActionFailedEvent {
   public Long invokeID;
   public Integer newState;
   public Integer error;
+  private static final long ACTION_I_D_ID = 0L;
+  private static final long INVOKE_I_D_ID = 1L;
+  private static final long NEW_STATE_ID = 2L;
+  private static final long ERROR_ID = 3L;
+
   public ActionsClusterActionFailedEvent(
     Integer actionID,
     Long invokeID,
@@ -156,6 +334,55 @@ public ActionsClusterActionFailedEvent(
     this.error = error;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID)));
+    values.add(new StructElement(INVOKE_I_D_ID, new UIntType(invokeID)));
+    values.add(new StructElement(NEW_STATE_ID, new UIntType(newState)));
+    values.add(new StructElement(ERROR_ID, new UIntType(error)));
+
+    return new StructType(values);
+  }
+
+  public static ActionsClusterActionFailedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer actionID = null;
+    Long invokeID = null;
+    Integer newState = null;
+    Integer error = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          actionID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == INVOKE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          invokeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NEW_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newState = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ERROR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          error = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ActionsClusterActionFailedEvent(
+      actionID,
+      invokeID,
+      newState,
+      error
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -178,12 +405,39 @@ public String toString() {
 }
 public static class BasicInformationClusterStartUpEvent {
   public Long softwareVersion;
+  private static final long SOFTWARE_VERSION_ID = 0L;
+
   public BasicInformationClusterStartUpEvent(
     Long softwareVersion
   ) {
     this.softwareVersion = softwareVersion;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SOFTWARE_VERSION_ID, new UIntType(softwareVersion)));
+
+    return new StructType(values);
+  }
+
+  public static BasicInformationClusterStartUpEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long softwareVersion = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SOFTWARE_VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          softwareVersion = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new BasicInformationClusterStartUpEvent(
+      softwareVersion
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -197,12 +451,39 @@ public String toString() {
 }
 public static class BasicInformationClusterLeaveEvent {
   public Integer fabricIndex;
+  private static final long FABRIC_INDEX_ID = 0L;
+
   public BasicInformationClusterLeaveEvent(
     Integer fabricIndex
   ) {
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static BasicInformationClusterLeaveEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new BasicInformationClusterLeaveEvent(
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -216,12 +497,39 @@ public String toString() {
 }
 public static class BasicInformationClusterReachableChangedEvent {
   public Boolean reachableNewValue;
+  private static final long REACHABLE_NEW_VALUE_ID = 0L;
+
   public BasicInformationClusterReachableChangedEvent(
     Boolean reachableNewValue
   ) {
     this.reachableNewValue = reachableNewValue;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(REACHABLE_NEW_VALUE_ID, new BooleanType(reachableNewValue)));
+
+    return new StructType(values);
+  }
+
+  public static BasicInformationClusterReachableChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean reachableNewValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == REACHABLE_NEW_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          reachableNewValue = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new BasicInformationClusterReachableChangedEvent(
+      reachableNewValue
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -238,6 +546,11 @@ public static class OtaSoftwareUpdateRequestorClusterStateTransitionEvent {
   public Integer newState;
   public Integer reason;
   public @Nullable Long targetSoftwareVersion;
+  private static final long PREVIOUS_STATE_ID = 0L;
+  private static final long NEW_STATE_ID = 1L;
+  private static final long REASON_ID = 2L;
+  private static final long TARGET_SOFTWARE_VERSION_ID = 3L;
+
   public OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
     Integer previousState,
     Integer newState,
@@ -250,6 +563,55 @@ public OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
     this.targetSoftwareVersion = targetSoftwareVersion;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PREVIOUS_STATE_ID, new UIntType(previousState)));
+    values.add(new StructElement(NEW_STATE_ID, new UIntType(newState)));
+    values.add(new StructElement(REASON_ID, new UIntType(reason)));
+    values.add(new StructElement(TARGET_SOFTWARE_VERSION_ID, targetSoftwareVersion != null ? new UIntType(targetSoftwareVersion) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static OtaSoftwareUpdateRequestorClusterStateTransitionEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer previousState = null;
+    Integer newState = null;
+    Integer reason = null;
+    @Nullable Long targetSoftwareVersion = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PREVIOUS_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          previousState = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NEW_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newState = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == REASON_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          reason = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TARGET_SOFTWARE_VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          targetSoftwareVersion = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
+      previousState,
+      newState,
+      reason,
+      targetSoftwareVersion
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -273,6 +635,9 @@ public String toString() {
 public static class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent {
   public Long softwareVersion;
   public Integer productID;
+  private static final long SOFTWARE_VERSION_ID = 0L;
+  private static final long PRODUCT_I_D_ID = 1L;
+
   public OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(
     Long softwareVersion,
     Integer productID
@@ -281,6 +646,39 @@ public OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(
     this.productID = productID;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SOFTWARE_VERSION_ID, new UIntType(softwareVersion)));
+    values.add(new StructElement(PRODUCT_I_D_ID, new UIntType(productID)));
+
+    return new StructType(values);
+  }
+
+  public static OtaSoftwareUpdateRequestorClusterVersionAppliedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long softwareVersion = null;
+    Integer productID = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SOFTWARE_VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          softwareVersion = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == PRODUCT_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          productID = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(
+      softwareVersion,
+      productID
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -300,6 +698,11 @@ public static class OtaSoftwareUpdateRequestorClusterDownloadErrorEvent {
   public Long bytesDownloaded;
   public @Nullable Integer progressPercent;
   public @Nullable Long platformCode;
+  private static final long SOFTWARE_VERSION_ID = 0L;
+  private static final long BYTES_DOWNLOADED_ID = 1L;
+  private static final long PROGRESS_PERCENT_ID = 2L;
+  private static final long PLATFORM_CODE_ID = 3L;
+
   public OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
     Long softwareVersion,
     Long bytesDownloaded,
@@ -312,6 +715,55 @@ public OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
     this.platformCode = platformCode;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SOFTWARE_VERSION_ID, new UIntType(softwareVersion)));
+    values.add(new StructElement(BYTES_DOWNLOADED_ID, new UIntType(bytesDownloaded)));
+    values.add(new StructElement(PROGRESS_PERCENT_ID, progressPercent != null ? new UIntType(progressPercent) : new NullType()));
+    values.add(new StructElement(PLATFORM_CODE_ID, platformCode != null ? new IntType(platformCode) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static OtaSoftwareUpdateRequestorClusterDownloadErrorEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long softwareVersion = null;
+    Long bytesDownloaded = null;
+    @Nullable Integer progressPercent = null;
+    @Nullable Long platformCode = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SOFTWARE_VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          softwareVersion = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == BYTES_DOWNLOADED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          bytesDownloaded = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == PROGRESS_PERCENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          progressPercent = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PLATFORM_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          platformCode = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
+      softwareVersion,
+      bytesDownloaded,
+      progressPercent,
+      platformCode
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -335,6 +787,9 @@ public String toString() {
 public static class PowerSourceClusterWiredFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterWiredFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -343,6 +798,39 @@ public PowerSourceClusterWiredFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterWiredFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterWiredFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -360,6 +848,9 @@ public String toString() {
 public static class PowerSourceClusterBatFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterBatFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -368,6 +859,39 @@ public PowerSourceClusterBatFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterBatFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterBatFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -385,6 +909,9 @@ public String toString() {
 public static class PowerSourceClusterBatChargeFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterBatChargeFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -393,6 +920,39 @@ public PowerSourceClusterBatChargeFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterBatChargeFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterBatChargeFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -410,6 +970,9 @@ public String toString() {
 public static class GeneralDiagnosticsClusterHardwareFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public GeneralDiagnosticsClusterHardwareFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -418,6 +981,39 @@ public GeneralDiagnosticsClusterHardwareFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static GeneralDiagnosticsClusterHardwareFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new GeneralDiagnosticsClusterHardwareFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -435,6 +1031,9 @@ public String toString() {
 public static class GeneralDiagnosticsClusterRadioFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public GeneralDiagnosticsClusterRadioFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -443,6 +1042,39 @@ public GeneralDiagnosticsClusterRadioFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static GeneralDiagnosticsClusterRadioFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new GeneralDiagnosticsClusterRadioFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -460,6 +1092,9 @@ public String toString() {
 public static class GeneralDiagnosticsClusterNetworkFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public GeneralDiagnosticsClusterNetworkFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -468,6 +1103,39 @@ public GeneralDiagnosticsClusterNetworkFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static GeneralDiagnosticsClusterNetworkFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new GeneralDiagnosticsClusterNetworkFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -484,12 +1152,39 @@ public String toString() {
 }
 public static class GeneralDiagnosticsClusterBootReasonEvent {
   public Integer bootReason;
+  private static final long BOOT_REASON_ID = 0L;
+
   public GeneralDiagnosticsClusterBootReasonEvent(
     Integer bootReason
   ) {
     this.bootReason = bootReason;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(BOOT_REASON_ID, new UIntType(bootReason)));
+
+    return new StructType(values);
+  }
+
+  public static GeneralDiagnosticsClusterBootReasonEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer bootReason = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == BOOT_REASON_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          bootReason = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GeneralDiagnosticsClusterBootReasonEvent(
+      bootReason
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -505,6 +1200,10 @@ public static class SoftwareDiagnosticsClusterSoftwareFaultEvent {
   public Long id;
   public Optional<String> name;
   public Optional<byte[]> faultRecording;
+  private static final long ID_ID = 0L;
+  private static final long NAME_ID = 1L;
+  private static final long FAULT_RECORDING_ID = 2L;
+
   public SoftwareDiagnosticsClusterSoftwareFaultEvent(
     Long id,
     Optional<String> name,
@@ -515,6 +1214,47 @@ public SoftwareDiagnosticsClusterSoftwareFaultEvent(
     this.faultRecording = faultRecording;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ID_ID, new UIntType(id)));
+    values.add(new StructElement(NAME_ID, name.<BaseTLVType>map((nonOptionalname) -> new StringType(nonOptionalname)).orElse(new EmptyType())));
+    values.add(new StructElement(FAULT_RECORDING_ID, faultRecording.<BaseTLVType>map((nonOptionalfaultRecording) -> new ByteArrayType(nonOptionalfaultRecording)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static SoftwareDiagnosticsClusterSoftwareFaultEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long id = null;
+    Optional<String> name = Optional.empty();
+    Optional<byte[]> faultRecording = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          id = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == FAULT_RECORDING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          faultRecording = Optional.of(castingValue.value(byte[].class));
+        }
+      }
+    }
+    return new SoftwareDiagnosticsClusterSoftwareFaultEvent(
+      id,
+      name,
+      faultRecording
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -534,12 +1274,39 @@ public String toString() {
 }
 public static class ThreadNetworkDiagnosticsClusterConnectionStatusEvent {
   public Integer connectionStatus;
+  private static final long CONNECTION_STATUS_ID = 0L;
+
   public ThreadNetworkDiagnosticsClusterConnectionStatusEvent(
     Integer connectionStatus
   ) {
     this.connectionStatus = connectionStatus;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CONNECTION_STATUS_ID, new UIntType(connectionStatus)));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterConnectionStatusEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer connectionStatus = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CONNECTION_STATUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          connectionStatus = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterConnectionStatusEvent(
+      connectionStatus
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -554,6 +1321,9 @@ public String toString() {
 public static class ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -562,6 +1332,39 @@ public ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -578,12 +1381,39 @@ public String toString() {
 }
 public static class WiFiNetworkDiagnosticsClusterDisconnectionEvent {
   public Integer reasonCode;
+  private static final long REASON_CODE_ID = 0L;
+
   public WiFiNetworkDiagnosticsClusterDisconnectionEvent(
     Integer reasonCode
   ) {
     this.reasonCode = reasonCode;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(REASON_CODE_ID, new UIntType(reasonCode)));
+
+    return new StructType(values);
+  }
+
+  public static WiFiNetworkDiagnosticsClusterDisconnectionEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer reasonCode = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == REASON_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          reasonCode = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new WiFiNetworkDiagnosticsClusterDisconnectionEvent(
+      reasonCode
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -596,22 +1426,58 @@ public String toString() {
   }
 }
 public static class WiFiNetworkDiagnosticsClusterAssociationFailureEvent {
-  public Integer associationFailure;
+  public Integer associationFailureCause;
   public Integer status;
+  private static final long ASSOCIATION_FAILURE_CAUSE_ID = 0L;
+  private static final long STATUS_ID = 1L;
+
   public WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
-    Integer associationFailure,
+    Integer associationFailureCause,
     Integer status
   ) {
-    this.associationFailure = associationFailure;
+    this.associationFailureCause = associationFailureCause;
     this.status = status;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ASSOCIATION_FAILURE_CAUSE_ID, new UIntType(associationFailureCause)));
+    values.add(new StructElement(STATUS_ID, new UIntType(status)));
+
+    return new StructType(values);
+  }
+
+  public static WiFiNetworkDiagnosticsClusterAssociationFailureEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer associationFailureCause = null;
+    Integer status = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ASSOCIATION_FAILURE_CAUSE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          associationFailureCause = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == STATUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          status = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
+      associationFailureCause,
+      status
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
     output.append("WiFiNetworkDiagnosticsClusterAssociationFailureEvent {\n");
-    output.append("\tassociationFailure: ");
-    output.append(associationFailure);
+    output.append("\tassociationFailureCause: ");
+    output.append(associationFailureCause);
     output.append("\n");
     output.append("\tstatus: ");
     output.append(status);
@@ -622,12 +1488,39 @@ public String toString() {
 }
 public static class WiFiNetworkDiagnosticsClusterConnectionStatusEvent {
   public Integer connectionStatus;
+  private static final long CONNECTION_STATUS_ID = 0L;
+
   public WiFiNetworkDiagnosticsClusterConnectionStatusEvent(
     Integer connectionStatus
   ) {
     this.connectionStatus = connectionStatus;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CONNECTION_STATUS_ID, new UIntType(connectionStatus)));
+
+    return new StructType(values);
+  }
+
+  public static WiFiNetworkDiagnosticsClusterConnectionStatusEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer connectionStatus = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CONNECTION_STATUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          connectionStatus = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new WiFiNetworkDiagnosticsClusterConnectionStatusEvent(
+      connectionStatus
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -641,12 +1534,39 @@ public String toString() {
 }
 public static class TimeSynchronizationClusterDSTStatusEvent {
   public Boolean DSTOffsetActive;
+  private static final long D_S_T_OFFSET_ACTIVE_ID = 0L;
+
   public TimeSynchronizationClusterDSTStatusEvent(
     Boolean DSTOffsetActive
   ) {
     this.DSTOffsetActive = DSTOffsetActive;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(D_S_T_OFFSET_ACTIVE_ID, new BooleanType(DSTOffsetActive)));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterDSTStatusEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean DSTOffsetActive = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == D_S_T_OFFSET_ACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          DSTOffsetActive = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new TimeSynchronizationClusterDSTStatusEvent(
+      DSTOffsetActive
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -661,6 +1581,9 @@ public String toString() {
 public static class TimeSynchronizationClusterTimeZoneStatusEvent {
   public Long offset;
   public Optional<String> name;
+  private static final long OFFSET_ID = 0L;
+  private static final long NAME_ID = 1L;
+
   public TimeSynchronizationClusterTimeZoneStatusEvent(
     Long offset,
     Optional<String> name
@@ -669,6 +1592,39 @@ public TimeSynchronizationClusterTimeZoneStatusEvent(
     this.name = name;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OFFSET_ID, new IntType(offset)));
+    values.add(new StructElement(NAME_ID, name.<BaseTLVType>map((nonOptionalname) -> new StringType(nonOptionalname)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterTimeZoneStatusEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long offset = null;
+    Optional<String> name = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OFFSET_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          offset = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new TimeSynchronizationClusterTimeZoneStatusEvent(
+      offset,
+      name
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -685,12 +1641,39 @@ public String toString() {
 }
 public static class BridgedDeviceBasicInformationClusterStartUpEvent {
   public Long softwareVersion;
+  private static final long SOFTWARE_VERSION_ID = 0L;
+
   public BridgedDeviceBasicInformationClusterStartUpEvent(
     Long softwareVersion
   ) {
     this.softwareVersion = softwareVersion;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SOFTWARE_VERSION_ID, new UIntType(softwareVersion)));
+
+    return new StructType(values);
+  }
+
+  public static BridgedDeviceBasicInformationClusterStartUpEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long softwareVersion = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SOFTWARE_VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          softwareVersion = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new BridgedDeviceBasicInformationClusterStartUpEvent(
+      softwareVersion
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -704,12 +1687,39 @@ public String toString() {
 }
 public static class BridgedDeviceBasicInformationClusterReachableChangedEvent {
   public Boolean reachableNewValue;
+  private static final long REACHABLE_NEW_VALUE_ID = 0L;
+
   public BridgedDeviceBasicInformationClusterReachableChangedEvent(
     Boolean reachableNewValue
   ) {
     this.reachableNewValue = reachableNewValue;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(REACHABLE_NEW_VALUE_ID, new BooleanType(reachableNewValue)));
+
+    return new StructType(values);
+  }
+
+  public static BridgedDeviceBasicInformationClusterReachableChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean reachableNewValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == REACHABLE_NEW_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          reachableNewValue = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new BridgedDeviceBasicInformationClusterReachableChangedEvent(
+      reachableNewValue
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -723,12 +1733,39 @@ public String toString() {
 }
 public static class SwitchClusterSwitchLatchedEvent {
   public Integer newPosition;
+  private static final long NEW_POSITION_ID = 0L;
+
   public SwitchClusterSwitchLatchedEvent(
     Integer newPosition
   ) {
     this.newPosition = newPosition;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NEW_POSITION_ID, new UIntType(newPosition)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterSwitchLatchedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer newPosition = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NEW_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newPosition = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterSwitchLatchedEvent(
+      newPosition
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -742,12 +1779,39 @@ public String toString() {
 }
 public static class SwitchClusterInitialPressEvent {
   public Integer newPosition;
+  private static final long NEW_POSITION_ID = 0L;
+
   public SwitchClusterInitialPressEvent(
     Integer newPosition
   ) {
     this.newPosition = newPosition;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NEW_POSITION_ID, new UIntType(newPosition)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterInitialPressEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer newPosition = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NEW_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newPosition = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterInitialPressEvent(
+      newPosition
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -761,12 +1825,39 @@ public String toString() {
 }
 public static class SwitchClusterLongPressEvent {
   public Integer newPosition;
+  private static final long NEW_POSITION_ID = 0L;
+
   public SwitchClusterLongPressEvent(
     Integer newPosition
   ) {
     this.newPosition = newPosition;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NEW_POSITION_ID, new UIntType(newPosition)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterLongPressEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer newPosition = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NEW_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newPosition = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterLongPressEvent(
+      newPosition
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -780,12 +1871,39 @@ public String toString() {
 }
 public static class SwitchClusterShortReleaseEvent {
   public Integer previousPosition;
+  private static final long PREVIOUS_POSITION_ID = 0L;
+
   public SwitchClusterShortReleaseEvent(
     Integer previousPosition
   ) {
     this.previousPosition = previousPosition;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PREVIOUS_POSITION_ID, new UIntType(previousPosition)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterShortReleaseEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer previousPosition = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PREVIOUS_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          previousPosition = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterShortReleaseEvent(
+      previousPosition
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -799,12 +1917,39 @@ public String toString() {
 }
 public static class SwitchClusterLongReleaseEvent {
   public Integer previousPosition;
+  private static final long PREVIOUS_POSITION_ID = 0L;
+
   public SwitchClusterLongReleaseEvent(
     Integer previousPosition
   ) {
     this.previousPosition = previousPosition;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PREVIOUS_POSITION_ID, new UIntType(previousPosition)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterLongReleaseEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer previousPosition = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PREVIOUS_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          previousPosition = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterLongReleaseEvent(
+      previousPosition
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -819,6 +1964,9 @@ public String toString() {
 public static class SwitchClusterMultiPressOngoingEvent {
   public Integer newPosition;
   public Integer currentNumberOfPressesCounted;
+  private static final long NEW_POSITION_ID = 0L;
+  private static final long CURRENT_NUMBER_OF_PRESSES_COUNTED_ID = 1L;
+
   public SwitchClusterMultiPressOngoingEvent(
     Integer newPosition,
     Integer currentNumberOfPressesCounted
@@ -827,6 +1975,39 @@ public SwitchClusterMultiPressOngoingEvent(
     this.currentNumberOfPressesCounted = currentNumberOfPressesCounted;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NEW_POSITION_ID, new UIntType(newPosition)));
+    values.add(new StructElement(CURRENT_NUMBER_OF_PRESSES_COUNTED_ID, new UIntType(currentNumberOfPressesCounted)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterMultiPressOngoingEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer newPosition = null;
+    Integer currentNumberOfPressesCounted = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NEW_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          newPosition = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CURRENT_NUMBER_OF_PRESSES_COUNTED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          currentNumberOfPressesCounted = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterMultiPressOngoingEvent(
+      newPosition,
+      currentNumberOfPressesCounted
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -844,6 +2025,9 @@ public String toString() {
 public static class SwitchClusterMultiPressCompleteEvent {
   public Integer previousPosition;
   public Integer totalNumberOfPressesCounted;
+  private static final long PREVIOUS_POSITION_ID = 0L;
+  private static final long TOTAL_NUMBER_OF_PRESSES_COUNTED_ID = 1L;
+
   public SwitchClusterMultiPressCompleteEvent(
     Integer previousPosition,
     Integer totalNumberOfPressesCounted
@@ -852,6 +2036,39 @@ public SwitchClusterMultiPressCompleteEvent(
     this.totalNumberOfPressesCounted = totalNumberOfPressesCounted;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PREVIOUS_POSITION_ID, new UIntType(previousPosition)));
+    values.add(new StructElement(TOTAL_NUMBER_OF_PRESSES_COUNTED_ID, new UIntType(totalNumberOfPressesCounted)));
+
+    return new StructType(values);
+  }
+
+  public static SwitchClusterMultiPressCompleteEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer previousPosition = null;
+    Integer totalNumberOfPressesCounted = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PREVIOUS_POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          previousPosition = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TOTAL_NUMBER_OF_PRESSES_COUNTED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          totalNumberOfPressesCounted = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SwitchClusterMultiPressCompleteEvent(
+      previousPosition,
+      totalNumberOfPressesCounted
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -868,12 +2085,39 @@ public String toString() {
 }
 public static class BooleanStateClusterStateChangeEvent {
   public Boolean stateValue;
+  private static final long STATE_VALUE_ID = 0L;
+
   public BooleanStateClusterStateChangeEvent(
     Boolean stateValue
   ) {
     this.stateValue = stateValue;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(STATE_VALUE_ID, new BooleanType(stateValue)));
+
+    return new StructType(values);
+  }
+
+  public static BooleanStateClusterStateChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean stateValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == STATE_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          stateValue = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new BooleanStateClusterStateChangeEvent(
+      stateValue
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -885,50 +2129,253 @@ public String toString() {
     return output.toString();
   }
 }
-public static class RefrigeratorAlarmClusterNotifyEvent {
-  public Long active;
-  public Long inactive;
-  public Long state;
-  public Long mask;
-  public RefrigeratorAlarmClusterNotifyEvent(
-    Long active,
-    Long inactive,
-    Long state,
-    Long mask
+public static class OvenCavityOperationalStateClusterOperationalErrorEvent {
+  public ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct errorState;
+  private static final long ERROR_STATE_ID = 0L;
+
+  public OvenCavityOperationalStateClusterOperationalErrorEvent(
+    ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct errorState
   ) {
-    this.active = active;
-    this.inactive = inactive;
-    this.state = state;
-    this.mask = mask;
+    this.errorState = errorState;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_ID, errorState.encodeTlv()));
+
+    return new StructType(values);
+  }
+
+  public static OvenCavityOperationalStateClusterOperationalErrorEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct errorState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          errorState = ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+        }
+      }
+    }
+    return new OvenCavityOperationalStateClusterOperationalErrorEvent(
+      errorState
+    );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("RefrigeratorAlarmClusterNotifyEvent {\n");
-    output.append("\tactive: ");
-    output.append(active);
-    output.append("\n");
-    output.append("\tinactive: ");
-    output.append(inactive);
-    output.append("\n");
-    output.append("\tstate: ");
-    output.append(state);
-    output.append("\n");
-    output.append("\tmask: ");
-    output.append(mask);
+    output.append("OvenCavityOperationalStateClusterOperationalErrorEvent {\n");
+    output.append("\terrorState: ");
+    output.append(errorState);
     output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-public static class SmokeCoAlarmClusterSmokeAlarmEvent {
-  public Integer alarmSeverityLevel;
-  public SmokeCoAlarmClusterSmokeAlarmEvent(
-    Integer alarmSeverityLevel
-  ) {
-    this.alarmSeverityLevel = alarmSeverityLevel;
-  }
+public static class OvenCavityOperationalStateClusterOperationCompletionEvent {
+  public Integer completionErrorCode;
+  public @Nullable Optional<Long> totalOperationalTime;
+  public @Nullable Optional<Long> pausedTime;
+  private static final long COMPLETION_ERROR_CODE_ID = 0L;
+  private static final long TOTAL_OPERATIONAL_TIME_ID = 1L;
+  private static final long PAUSED_TIME_ID = 2L;
+
+  public OvenCavityOperationalStateClusterOperationCompletionEvent(
+    Integer completionErrorCode,
+    @Nullable Optional<Long> totalOperationalTime,
+    @Nullable Optional<Long> pausedTime
+  ) {
+    this.completionErrorCode = completionErrorCode;
+    this.totalOperationalTime = totalOperationalTime;
+    this.pausedTime = pausedTime;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(COMPLETION_ERROR_CODE_ID, new UIntType(completionErrorCode)));
+    values.add(new StructElement(TOTAL_OPERATIONAL_TIME_ID, totalOperationalTime != null ? totalOperationalTime.<BaseTLVType>map((nonOptionaltotalOperationalTime) -> new UIntType(nonOptionaltotalOperationalTime)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(PAUSED_TIME_ID, pausedTime != null ? pausedTime.<BaseTLVType>map((nonOptionalpausedTime) -> new UIntType(nonOptionalpausedTime)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static OvenCavityOperationalStateClusterOperationCompletionEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer completionErrorCode = null;
+    @Nullable Optional<Long> totalOperationalTime = null;
+    @Nullable Optional<Long> pausedTime = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == COMPLETION_ERROR_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          completionErrorCode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TOTAL_OPERATIONAL_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          totalOperationalTime = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == PAUSED_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          pausedTime = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new OvenCavityOperationalStateClusterOperationCompletionEvent(
+      completionErrorCode,
+      totalOperationalTime,
+      pausedTime
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OvenCavityOperationalStateClusterOperationCompletionEvent {\n");
+    output.append("\tcompletionErrorCode: ");
+    output.append(completionErrorCode);
+    output.append("\n");
+    output.append("\ttotalOperationalTime: ");
+    output.append(totalOperationalTime);
+    output.append("\n");
+    output.append("\tpausedTime: ");
+    output.append(pausedTime);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class RefrigeratorAlarmClusterNotifyEvent {
+  public Long active;
+  public Long inactive;
+  public Long state;
+  public Long mask;
+  private static final long ACTIVE_ID = 0L;
+  private static final long INACTIVE_ID = 1L;
+  private static final long STATE_ID = 2L;
+  private static final long MASK_ID = 3L;
+
+  public RefrigeratorAlarmClusterNotifyEvent(
+    Long active,
+    Long inactive,
+    Long state,
+    Long mask
+  ) {
+    this.active = active;
+    this.inactive = inactive;
+    this.state = state;
+    this.mask = mask;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTIVE_ID, new UIntType(active)));
+    values.add(new StructElement(INACTIVE_ID, new UIntType(inactive)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(MASK_ID, new UIntType(mask)));
+
+    return new StructType(values);
+  }
+
+  public static RefrigeratorAlarmClusterNotifyEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long active = null;
+    Long inactive = null;
+    Long state = null;
+    Long mask = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          active = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == INACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          inactive = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == MASK_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mask = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new RefrigeratorAlarmClusterNotifyEvent(
+      active,
+      inactive,
+      state,
+      mask
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("RefrigeratorAlarmClusterNotifyEvent {\n");
+    output.append("\tactive: ");
+    output.append(active);
+    output.append("\n");
+    output.append("\tinactive: ");
+    output.append(inactive);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\tmask: ");
+    output.append(mask);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class SmokeCoAlarmClusterSmokeAlarmEvent {
+  public Integer alarmSeverityLevel;
+  private static final long ALARM_SEVERITY_LEVEL_ID = 0L;
+
+  public SmokeCoAlarmClusterSmokeAlarmEvent(
+    Integer alarmSeverityLevel
+  ) {
+    this.alarmSeverityLevel = alarmSeverityLevel;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_SEVERITY_LEVEL_ID, new UIntType(alarmSeverityLevel)));
+
+    return new StructType(values);
+  }
+
+  public static SmokeCoAlarmClusterSmokeAlarmEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmSeverityLevel = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_SEVERITY_LEVEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmSeverityLevel = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SmokeCoAlarmClusterSmokeAlarmEvent(
+      alarmSeverityLevel
+    );
+  }
 
   @Override
   public String toString() {
@@ -943,12 +2390,39 @@ public String toString() {
 }
 public static class SmokeCoAlarmClusterCOAlarmEvent {
   public Integer alarmSeverityLevel;
+  private static final long ALARM_SEVERITY_LEVEL_ID = 0L;
+
   public SmokeCoAlarmClusterCOAlarmEvent(
     Integer alarmSeverityLevel
   ) {
     this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_SEVERITY_LEVEL_ID, new UIntType(alarmSeverityLevel)));
+
+    return new StructType(values);
+  }
+
+  public static SmokeCoAlarmClusterCOAlarmEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmSeverityLevel = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_SEVERITY_LEVEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmSeverityLevel = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SmokeCoAlarmClusterCOAlarmEvent(
+      alarmSeverityLevel
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -962,12 +2436,39 @@ public String toString() {
 }
 public static class SmokeCoAlarmClusterLowBatteryEvent {
   public Integer alarmSeverityLevel;
+  private static final long ALARM_SEVERITY_LEVEL_ID = 0L;
+
   public SmokeCoAlarmClusterLowBatteryEvent(
     Integer alarmSeverityLevel
   ) {
     this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_SEVERITY_LEVEL_ID, new UIntType(alarmSeverityLevel)));
+
+    return new StructType(values);
+  }
+
+  public static SmokeCoAlarmClusterLowBatteryEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmSeverityLevel = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_SEVERITY_LEVEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmSeverityLevel = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SmokeCoAlarmClusterLowBatteryEvent(
+      alarmSeverityLevel
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -981,12 +2482,39 @@ public String toString() {
 }
 public static class SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {
   public Integer alarmSeverityLevel;
+  private static final long ALARM_SEVERITY_LEVEL_ID = 0L;
+
   public SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(
     Integer alarmSeverityLevel
   ) {
     this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_SEVERITY_LEVEL_ID, new UIntType(alarmSeverityLevel)));
+
+    return new StructType(values);
+  }
+
+  public static SmokeCoAlarmClusterInterconnectSmokeAlarmEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmSeverityLevel = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_SEVERITY_LEVEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmSeverityLevel = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(
+      alarmSeverityLevel
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1000,12 +2528,39 @@ public String toString() {
 }
 public static class SmokeCoAlarmClusterInterconnectCOAlarmEvent {
   public Integer alarmSeverityLevel;
+  private static final long ALARM_SEVERITY_LEVEL_ID = 0L;
+
   public SmokeCoAlarmClusterInterconnectCOAlarmEvent(
     Integer alarmSeverityLevel
   ) {
     this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_SEVERITY_LEVEL_ID, new UIntType(alarmSeverityLevel)));
+
+    return new StructType(values);
+  }
+
+  public static SmokeCoAlarmClusterInterconnectCOAlarmEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmSeverityLevel = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_SEVERITY_LEVEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmSeverityLevel = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new SmokeCoAlarmClusterInterconnectCOAlarmEvent(
+      alarmSeverityLevel
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1022,6 +2577,11 @@ public static class DishwasherAlarmClusterNotifyEvent {
   public Long inactive;
   public Long state;
   public Long mask;
+  private static final long ACTIVE_ID = 0L;
+  private static final long INACTIVE_ID = 1L;
+  private static final long STATE_ID = 2L;
+  private static final long MASK_ID = 3L;
+
   public DishwasherAlarmClusterNotifyEvent(
     Long active,
     Long inactive,
@@ -1034,6 +2594,55 @@ public DishwasherAlarmClusterNotifyEvent(
     this.mask = mask;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTIVE_ID, new UIntType(active)));
+    values.add(new StructElement(INACTIVE_ID, new UIntType(inactive)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(MASK_ID, new UIntType(mask)));
+
+    return new StructType(values);
+  }
+
+  public static DishwasherAlarmClusterNotifyEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long active = null;
+    Long inactive = null;
+    Long state = null;
+    Long mask = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          active = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == INACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          inactive = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == MASK_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mask = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new DishwasherAlarmClusterNotifyEvent(
+      active,
+      inactive,
+      state,
+      mask
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1056,12 +2665,39 @@ public String toString() {
 }
 public static class OperationalStateClusterOperationalErrorEvent {
   public ChipStructs.OperationalStateClusterErrorStateStruct errorState;
+  private static final long ERROR_STATE_ID = 0L;
+
   public OperationalStateClusterOperationalErrorEvent(
     ChipStructs.OperationalStateClusterErrorStateStruct errorState
   ) {
     this.errorState = errorState;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_ID, errorState.encodeTlv()));
+
+    return new StructType(values);
+  }
+
+  public static OperationalStateClusterOperationalErrorEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ChipStructs.OperationalStateClusterErrorStateStruct errorState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          errorState = ChipStructs.OperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+        }
+      }
+    }
+    return new OperationalStateClusterOperationalErrorEvent(
+      errorState
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1077,6 +2713,10 @@ public static class OperationalStateClusterOperationCompletionEvent {
   public Integer completionErrorCode;
   public @Nullable Optional<Long> totalOperationalTime;
   public @Nullable Optional<Long> pausedTime;
+  private static final long COMPLETION_ERROR_CODE_ID = 0L;
+  private static final long TOTAL_OPERATIONAL_TIME_ID = 1L;
+  private static final long PAUSED_TIME_ID = 2L;
+
   public OperationalStateClusterOperationCompletionEvent(
     Integer completionErrorCode,
     @Nullable Optional<Long> totalOperationalTime,
@@ -1087,6 +2727,47 @@ public OperationalStateClusterOperationCompletionEvent(
     this.pausedTime = pausedTime;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(COMPLETION_ERROR_CODE_ID, new UIntType(completionErrorCode)));
+    values.add(new StructElement(TOTAL_OPERATIONAL_TIME_ID, totalOperationalTime != null ? totalOperationalTime.<BaseTLVType>map((nonOptionaltotalOperationalTime) -> new UIntType(nonOptionaltotalOperationalTime)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(PAUSED_TIME_ID, pausedTime != null ? pausedTime.<BaseTLVType>map((nonOptionalpausedTime) -> new UIntType(nonOptionalpausedTime)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static OperationalStateClusterOperationCompletionEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer completionErrorCode = null;
+    @Nullable Optional<Long> totalOperationalTime = null;
+    @Nullable Optional<Long> pausedTime = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == COMPLETION_ERROR_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          completionErrorCode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TOTAL_OPERATIONAL_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          totalOperationalTime = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == PAUSED_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          pausedTime = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new OperationalStateClusterOperationCompletionEvent(
+      completionErrorCode,
+      totalOperationalTime,
+      pausedTime
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1106,12 +2787,39 @@ public String toString() {
 }
 public static class RvcOperationalStateClusterOperationalErrorEvent {
   public ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState;
+  private static final long ERROR_STATE_ID = 0L;
+
   public RvcOperationalStateClusterOperationalErrorEvent(
     ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState
   ) {
     this.errorState = errorState;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_ID, errorState.encodeTlv()));
+
+    return new StructType(values);
+  }
+
+  public static RvcOperationalStateClusterOperationalErrorEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          errorState = ChipStructs.RvcOperationalStateClusterErrorStateStruct.decodeTlv(castingValue);
+        }
+      }
+    }
+    return new RvcOperationalStateClusterOperationalErrorEvent(
+      errorState
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1127,6 +2835,10 @@ public static class RvcOperationalStateClusterOperationCompletionEvent {
   public Integer completionErrorCode;
   public @Nullable Optional<Long> totalOperationalTime;
   public @Nullable Optional<Long> pausedTime;
+  private static final long COMPLETION_ERROR_CODE_ID = 0L;
+  private static final long TOTAL_OPERATIONAL_TIME_ID = 1L;
+  private static final long PAUSED_TIME_ID = 2L;
+
   public RvcOperationalStateClusterOperationCompletionEvent(
     Integer completionErrorCode,
     @Nullable Optional<Long> totalOperationalTime,
@@ -1137,6 +2849,47 @@ public RvcOperationalStateClusterOperationCompletionEvent(
     this.pausedTime = pausedTime;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(COMPLETION_ERROR_CODE_ID, new UIntType(completionErrorCode)));
+    values.add(new StructElement(TOTAL_OPERATIONAL_TIME_ID, totalOperationalTime != null ? totalOperationalTime.<BaseTLVType>map((nonOptionaltotalOperationalTime) -> new UIntType(nonOptionaltotalOperationalTime)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(PAUSED_TIME_ID, pausedTime != null ? pausedTime.<BaseTLVType>map((nonOptionalpausedTime) -> new UIntType(nonOptionalpausedTime)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static RvcOperationalStateClusterOperationCompletionEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer completionErrorCode = null;
+    @Nullable Optional<Long> totalOperationalTime = null;
+    @Nullable Optional<Long> pausedTime = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == COMPLETION_ERROR_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          completionErrorCode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TOTAL_OPERATIONAL_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          totalOperationalTime = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == PAUSED_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          pausedTime = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new RvcOperationalStateClusterOperationCompletionEvent(
+      completionErrorCode,
+      totalOperationalTime,
+      pausedTime
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1154,14 +2907,831 @@ public String toString() {
     return output.toString();
   }
 }
+public static class BooleanSensorConfigurationClusterAlarmsStateChangedEvent {
+  public Integer alarmsActive;
+  public Optional<Integer> alarmsSuppressed;
+  private static final long ALARMS_ACTIVE_ID = 0L;
+  private static final long ALARMS_SUPPRESSED_ID = 1L;
+
+  public BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+    Integer alarmsActive,
+    Optional<Integer> alarmsSuppressed
+  ) {
+    this.alarmsActive = alarmsActive;
+    this.alarmsSuppressed = alarmsSuppressed;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARMS_ACTIVE_ID, new UIntType(alarmsActive)));
+    values.add(new StructElement(ALARMS_SUPPRESSED_ID, alarmsSuppressed.<BaseTLVType>map((nonOptionalalarmsSuppressed) -> new UIntType(nonOptionalalarmsSuppressed)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static BooleanSensorConfigurationClusterAlarmsStateChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmsActive = null;
+    Optional<Integer> alarmsSuppressed = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARMS_ACTIVE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmsActive = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ALARMS_SUPPRESSED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmsSuppressed = Optional.of(castingValue.value(Integer.class));
+        }
+      }
+    }
+    return new BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+      alarmsActive,
+      alarmsSuppressed
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("BooleanSensorConfigurationClusterAlarmsStateChangedEvent {\n");
+    output.append("\talarmsActive: ");
+    output.append(alarmsActive);
+    output.append("\n");
+    output.append("\talarmsSuppressed: ");
+    output.append(alarmsSuppressed);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class ValveConfigurationAndControlClusterValveStateChangedEvent {
+  public Integer valveState;
+  private static final long VALVE_STATE_ID = 0L;
+
+  public ValveConfigurationAndControlClusterValveStateChangedEvent(
+    Integer valveState
+  ) {
+    this.valveState = valveState;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(VALVE_STATE_ID, new UIntType(valveState)));
+
+    return new StructType(values);
+  }
+
+  public static ValveConfigurationAndControlClusterValveStateChangedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer valveState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == VALVE_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          valveState = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ValveConfigurationAndControlClusterValveStateChangedEvent(
+      valveState
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("ValveConfigurationAndControlClusterValveStateChangedEvent {\n");
+    output.append("\tvalveState: ");
+    output.append(valveState);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class ValveConfigurationAndControlClusterValveFaultEvent {
+  public Integer valveFault;
+  private static final long VALVE_FAULT_ID = 0L;
+
+  public ValveConfigurationAndControlClusterValveFaultEvent(
+    Integer valveFault
+  ) {
+    this.valveFault = valveFault;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(VALVE_FAULT_ID, new UIntType(valveFault)));
+
+    return new StructType(values);
+  }
+
+  public static ValveConfigurationAndControlClusterValveFaultEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer valveFault = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == VALVE_FAULT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          valveFault = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ValveConfigurationAndControlClusterValveFaultEvent(
+      valveFault
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("ValveConfigurationAndControlClusterValveFaultEvent {\n");
+    output.append("\tvalveFault: ");
+    output.append(valveFault);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {
+  public byte[] eventID;
+  public @Nullable Integer transitionIndex;
+  public Integer status;
+  public Integer criticality;
+  public Integer control;
+  public @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl;
+  public @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl;
+  public @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl;
+  public @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl;
+  public @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl;
+  private static final long EVENT_I_D_ID = 0L;
+  private static final long TRANSITION_INDEX_ID = 1L;
+  private static final long STATUS_ID = 2L;
+  private static final long CRITICALITY_ID = 3L;
+  private static final long CONTROL_ID = 4L;
+  private static final long TEMPERATURE_CONTROL_ID = 5L;
+  private static final long AVERAGE_LOAD_CONTROL_ID = 6L;
+  private static final long DUTY_CYCLE_CONTROL_ID = 7L;
+  private static final long POWER_SAVINGS_CONTROL_ID = 8L;
+  private static final long HEATING_SOURCE_CONTROL_ID = 9L;
+
+  public DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+    byte[] eventID,
+    @Nullable Integer transitionIndex,
+    Integer status,
+    Integer criticality,
+    Integer control,
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl,
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl,
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl,
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl,
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl
+  ) {
+    this.eventID = eventID;
+    this.transitionIndex = transitionIndex;
+    this.status = status;
+    this.criticality = criticality;
+    this.control = control;
+    this.temperatureControl = temperatureControl;
+    this.averageLoadControl = averageLoadControl;
+    this.dutyCycleControl = dutyCycleControl;
+    this.powerSavingsControl = powerSavingsControl;
+    this.heatingSourceControl = heatingSourceControl;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(EVENT_I_D_ID, new ByteArrayType(eventID)));
+    values.add(new StructElement(TRANSITION_INDEX_ID, transitionIndex != null ? new UIntType(transitionIndex) : new NullType()));
+    values.add(new StructElement(STATUS_ID, new UIntType(status)));
+    values.add(new StructElement(CRITICALITY_ID, new UIntType(criticality)));
+    values.add(new StructElement(CONTROL_ID, new UIntType(control)));
+    values.add(new StructElement(TEMPERATURE_CONTROL_ID, temperatureControl != null ? temperatureControl.<BaseTLVType>map((nonOptionaltemperatureControl) -> nonOptionaltemperatureControl.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(AVERAGE_LOAD_CONTROL_ID, averageLoadControl != null ? averageLoadControl.<BaseTLVType>map((nonOptionalaverageLoadControl) -> nonOptionalaverageLoadControl.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(DUTY_CYCLE_CONTROL_ID, dutyCycleControl != null ? dutyCycleControl.<BaseTLVType>map((nonOptionaldutyCycleControl) -> nonOptionaldutyCycleControl.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(POWER_SAVINGS_CONTROL_ID, powerSavingsControl != null ? powerSavingsControl.<BaseTLVType>map((nonOptionalpowerSavingsControl) -> nonOptionalpowerSavingsControl.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(HEATING_SOURCE_CONTROL_ID, heatingSourceControl != null ? heatingSourceControl.<BaseTLVType>map((nonOptionalheatingSourceControl) -> nonOptionalheatingSourceControl.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] eventID = null;
+    @Nullable Integer transitionIndex = null;
+    Integer status = null;
+    Integer criticality = null;
+    Integer control = null;
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl = null;
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl = null;
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl = null;
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl = null;
+    @Nullable Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == EVENT_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          eventID = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == TRANSITION_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          transitionIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == STATUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          status = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CRITICALITY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          criticality = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          control = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TEMPERATURE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          temperatureControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == AVERAGE_LOAD_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          averageLoadControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == DUTY_CYCLE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          dutyCycleControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == POWER_SAVINGS_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          powerSavingsControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == HEATING_SOURCE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          heatingSourceControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct.decodeTlv(castingValue));
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+      eventID,
+      transitionIndex,
+      status,
+      criticality,
+      control,
+      temperatureControl,
+      averageLoadControl,
+      dutyCycleControl,
+      powerSavingsControl,
+      heatingSourceControl
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {\n");
+    output.append("\teventID: ");
+    output.append(Arrays.toString(eventID));
+    output.append("\n");
+    output.append("\ttransitionIndex: ");
+    output.append(transitionIndex);
+    output.append("\n");
+    output.append("\tstatus: ");
+    output.append(status);
+    output.append("\n");
+    output.append("\tcriticality: ");
+    output.append(criticality);
+    output.append("\n");
+    output.append("\tcontrol: ");
+    output.append(control);
+    output.append("\n");
+    output.append("\ttemperatureControl: ");
+    output.append(temperatureControl);
+    output.append("\n");
+    output.append("\taverageLoadControl: ");
+    output.append(averageLoadControl);
+    output.append("\n");
+    output.append("\tdutyCycleControl: ");
+    output.append(dutyCycleControl);
+    output.append("\n");
+    output.append("\tpowerSavingsControl: ");
+    output.append(powerSavingsControl);
+    output.append("\n");
+    output.append("\theatingSourceControl: ");
+    output.append(heatingSourceControl);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterEVConnectedEvent {
+  public Long sessionID;
+  private static final long SESSION_I_D_ID = 0L;
+
+  public EnergyEvseClusterEVConnectedEvent(
+    Long sessionID
+  ) {
+    this.sessionID = sessionID;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterEVConnectedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long sessionID = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SESSION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionID = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new EnergyEvseClusterEVConnectedEvent(
+      sessionID
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterEVConnectedEvent {\n");
+    output.append("\tsessionID: ");
+    output.append(sessionID);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterEVNotDetectedEvent {
+  public Long sessionID;
+  public Integer state;
+  public Long sessionDuration;
+  public Long sessionEnergyCharged;
+  public Optional<Long> sessionEnergyDischarged;
+  private static final long SESSION_I_D_ID = 0L;
+  private static final long STATE_ID = 1L;
+  private static final long SESSION_DURATION_ID = 2L;
+  private static final long SESSION_ENERGY_CHARGED_ID = 3L;
+  private static final long SESSION_ENERGY_DISCHARGED_ID = 4L;
+
+  public EnergyEvseClusterEVNotDetectedEvent(
+    Long sessionID,
+    Integer state,
+    Long sessionDuration,
+    Long sessionEnergyCharged,
+    Optional<Long> sessionEnergyDischarged
+  ) {
+    this.sessionID = sessionID;
+    this.state = state;
+    this.sessionDuration = sessionDuration;
+    this.sessionEnergyCharged = sessionEnergyCharged;
+    this.sessionEnergyDischarged = sessionEnergyDischarged;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(SESSION_DURATION_ID, new UIntType(sessionDuration)));
+    values.add(new StructElement(SESSION_ENERGY_CHARGED_ID, new IntType(sessionEnergyCharged)));
+    values.add(new StructElement(SESSION_ENERGY_DISCHARGED_ID, sessionEnergyDischarged.<BaseTLVType>map((nonOptionalsessionEnergyDischarged) -> new IntType(nonOptionalsessionEnergyDischarged)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterEVNotDetectedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long sessionID = null;
+    Integer state = null;
+    Long sessionDuration = null;
+    Long sessionEnergyCharged = null;
+    Optional<Long> sessionEnergyDischarged = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SESSION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SESSION_DURATION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionDuration = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == SESSION_ENERGY_CHARGED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          sessionEnergyCharged = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == SESSION_ENERGY_DISCHARGED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          sessionEnergyDischarged = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new EnergyEvseClusterEVNotDetectedEvent(
+      sessionID,
+      state,
+      sessionDuration,
+      sessionEnergyCharged,
+      sessionEnergyDischarged
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterEVNotDetectedEvent {\n");
+    output.append("\tsessionID: ");
+    output.append(sessionID);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\tsessionDuration: ");
+    output.append(sessionDuration);
+    output.append("\n");
+    output.append("\tsessionEnergyCharged: ");
+    output.append(sessionEnergyCharged);
+    output.append("\n");
+    output.append("\tsessionEnergyDischarged: ");
+    output.append(sessionEnergyDischarged);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterEnergyTransferStartedEvent {
+  public Long sessionID;
+  public Integer state;
+  public Long maximumCurrent;
+  private static final long SESSION_I_D_ID = 0L;
+  private static final long STATE_ID = 1L;
+  private static final long MAXIMUM_CURRENT_ID = 2L;
+
+  public EnergyEvseClusterEnergyTransferStartedEvent(
+    Long sessionID,
+    Integer state,
+    Long maximumCurrent
+  ) {
+    this.sessionID = sessionID;
+    this.state = state;
+    this.maximumCurrent = maximumCurrent;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(MAXIMUM_CURRENT_ID, new IntType(maximumCurrent)));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long sessionID = null;
+    Integer state = null;
+    Long maximumCurrent = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SESSION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MAXIMUM_CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          maximumCurrent = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new EnergyEvseClusterEnergyTransferStartedEvent(
+      sessionID,
+      state,
+      maximumCurrent
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterEnergyTransferStartedEvent {\n");
+    output.append("\tsessionID: ");
+    output.append(sessionID);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\tmaximumCurrent: ");
+    output.append(maximumCurrent);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterEnergyTransferStoppedEvent {
+  public Long sessionID;
+  public Integer state;
+  public Integer reason;
+  public Long energyTransferred;
+  private static final long SESSION_I_D_ID = 0L;
+  private static final long STATE_ID = 1L;
+  private static final long REASON_ID = 2L;
+  private static final long ENERGY_TRANSFERRED_ID = 4L;
+
+  public EnergyEvseClusterEnergyTransferStoppedEvent(
+    Long sessionID,
+    Integer state,
+    Integer reason,
+    Long energyTransferred
+  ) {
+    this.sessionID = sessionID;
+    this.state = state;
+    this.reason = reason;
+    this.energyTransferred = energyTransferred;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(REASON_ID, new UIntType(reason)));
+    values.add(new StructElement(ENERGY_TRANSFERRED_ID, new IntType(energyTransferred)));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterEnergyTransferStoppedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long sessionID = null;
+    Integer state = null;
+    Integer reason = null;
+    Long energyTransferred = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SESSION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == REASON_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          reason = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ENERGY_TRANSFERRED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          energyTransferred = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new EnergyEvseClusterEnergyTransferStoppedEvent(
+      sessionID,
+      state,
+      reason,
+      energyTransferred
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterEnergyTransferStoppedEvent {\n");
+    output.append("\tsessionID: ");
+    output.append(sessionID);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\treason: ");
+    output.append(reason);
+    output.append("\n");
+    output.append("\tenergyTransferred: ");
+    output.append(energyTransferred);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterFaultEvent {
+  public Long sessionID;
+  public Integer state;
+  public Integer faultStatePreviousState;
+  public Integer faultStateCurrentState;
+  private static final long SESSION_I_D_ID = 0L;
+  private static final long STATE_ID = 1L;
+  private static final long FAULT_STATE_PREVIOUS_STATE_ID = 2L;
+  private static final long FAULT_STATE_CURRENT_STATE_ID = 4L;
+
+  public EnergyEvseClusterFaultEvent(
+    Long sessionID,
+    Integer state,
+    Integer faultStatePreviousState,
+    Integer faultStateCurrentState
+  ) {
+    this.sessionID = sessionID;
+    this.state = state;
+    this.faultStatePreviousState = faultStatePreviousState;
+    this.faultStateCurrentState = faultStateCurrentState;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+    values.add(new StructElement(FAULT_STATE_PREVIOUS_STATE_ID, new UIntType(faultStatePreviousState)));
+    values.add(new StructElement(FAULT_STATE_CURRENT_STATE_ID, new UIntType(faultStateCurrentState)));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterFaultEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long sessionID = null;
+    Integer state = null;
+    Integer faultStatePreviousState = null;
+    Integer faultStateCurrentState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SESSION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sessionID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FAULT_STATE_PREVIOUS_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          faultStatePreviousState = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FAULT_STATE_CURRENT_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          faultStateCurrentState = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new EnergyEvseClusterFaultEvent(
+      sessionID,
+      state,
+      faultStatePreviousState,
+      faultStateCurrentState
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterFaultEvent {\n");
+    output.append("\tsessionID: ");
+    output.append(sessionID);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\tfaultStatePreviousState: ");
+    output.append(faultStatePreviousState);
+    output.append("\n");
+    output.append("\tfaultStateCurrentState: ");
+    output.append(faultStateCurrentState);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class EnergyEvseClusterRFIDEvent {
+  public byte[] uid;
+  private static final long UID_ID = 0L;
+
+  public EnergyEvseClusterRFIDEvent(
+    byte[] uid
+  ) {
+    this.uid = uid;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(UID_ID, new ByteArrayType(uid)));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterRFIDEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] uid = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == UID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          uid = castingValue.value(byte[].class);
+        }
+      }
+    }
+    return new EnergyEvseClusterRFIDEvent(
+      uid
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("EnergyEvseClusterRFIDEvent {\n");
+    output.append("\tuid: ");
+    output.append(Arrays.toString(uid));
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
 public static class DoorLockClusterDoorLockAlarmEvent {
   public Integer alarmCode;
+  private static final long ALARM_CODE_ID = 0L;
+
   public DoorLockClusterDoorLockAlarmEvent(
     Integer alarmCode
   ) {
     this.alarmCode = alarmCode;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ALARM_CODE_ID, new UIntType(alarmCode)));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterDoorLockAlarmEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer alarmCode = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ALARM_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          alarmCode = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DoorLockClusterDoorLockAlarmEvent(
+      alarmCode
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1175,12 +3745,39 @@ public String toString() {
 }
 public static class DoorLockClusterDoorStateChangeEvent {
   public Integer doorState;
+  private static final long DOOR_STATE_ID = 0L;
+
   public DoorLockClusterDoorStateChangeEvent(
     Integer doorState
   ) {
     this.doorState = doorState;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(DOOR_STATE_ID, new UIntType(doorState)));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterDoorStateChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer doorState = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == DOOR_STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          doorState = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DoorLockClusterDoorStateChangeEvent(
+      doorState
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1199,6 +3796,13 @@ public static class DoorLockClusterLockOperationEvent {
   public @Nullable Integer fabricIndex;
   public @Nullable Long sourceNode;
   public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
+  private static final long LOCK_OPERATION_TYPE_ID = 0L;
+  private static final long OPERATION_SOURCE_ID = 1L;
+  private static final long USER_INDEX_ID = 2L;
+  private static final long FABRIC_INDEX_ID = 3L;
+  private static final long SOURCE_NODE_ID = 4L;
+  private static final long CREDENTIALS_ID = 5L;
+
   public DoorLockClusterLockOperationEvent(
     Integer lockOperationType,
     Integer operationSource,
@@ -1215,6 +3819,71 @@ public DoorLockClusterLockOperationEvent(
     this.credentials = credentials;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LOCK_OPERATION_TYPE_ID, new UIntType(lockOperationType)));
+    values.add(new StructElement(OPERATION_SOURCE_ID, new UIntType(operationSource)));
+    values.add(new StructElement(USER_INDEX_ID, userIndex != null ? new UIntType(userIndex) : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, fabricIndex != null ? new UIntType(fabricIndex) : new NullType()));
+    values.add(new StructElement(SOURCE_NODE_ID, sourceNode != null ? new UIntType(sourceNode) : new NullType()));
+    values.add(new StructElement(CREDENTIALS_ID, credentials != null ? credentials.<BaseTLVType>map((nonOptionalcredentials) -> ArrayType.generateArrayType(nonOptionalcredentials, (elementnonOptionalcredentials) -> elementnonOptionalcredentials.encodeTlv())).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterLockOperationEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer lockOperationType = null;
+    Integer operationSource = null;
+    @Nullable Integer userIndex = null;
+    @Nullable Integer fabricIndex = null;
+    @Nullable Long sourceNode = null;
+    @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LOCK_OPERATION_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lockOperationType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATION_SOURCE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationSource = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == USER_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          userIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SOURCE_NODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sourceNode = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == CREDENTIALS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          credentials = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.DoorLockClusterCredentialStruct.decodeTlv(elementcastingValue)));
+        }
+      }
+    }
+    return new DoorLockClusterLockOperationEvent(
+      lockOperationType,
+      operationSource,
+      userIndex,
+      fabricIndex,
+      sourceNode,
+      credentials
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1249,6 +3918,14 @@ public static class DoorLockClusterLockOperationErrorEvent {
   public @Nullable Integer fabricIndex;
   public @Nullable Long sourceNode;
   public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
+  private static final long LOCK_OPERATION_TYPE_ID = 0L;
+  private static final long OPERATION_SOURCE_ID = 1L;
+  private static final long OPERATION_ERROR_ID = 2L;
+  private static final long USER_INDEX_ID = 3L;
+  private static final long FABRIC_INDEX_ID = 4L;
+  private static final long SOURCE_NODE_ID = 5L;
+  private static final long CREDENTIALS_ID = 6L;
+
   public DoorLockClusterLockOperationErrorEvent(
     Integer lockOperationType,
     Integer operationSource,
@@ -1267,6 +3944,79 @@ public DoorLockClusterLockOperationErrorEvent(
     this.credentials = credentials;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LOCK_OPERATION_TYPE_ID, new UIntType(lockOperationType)));
+    values.add(new StructElement(OPERATION_SOURCE_ID, new UIntType(operationSource)));
+    values.add(new StructElement(OPERATION_ERROR_ID, new UIntType(operationError)));
+    values.add(new StructElement(USER_INDEX_ID, userIndex != null ? new UIntType(userIndex) : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, fabricIndex != null ? new UIntType(fabricIndex) : new NullType()));
+    values.add(new StructElement(SOURCE_NODE_ID, sourceNode != null ? new UIntType(sourceNode) : new NullType()));
+    values.add(new StructElement(CREDENTIALS_ID, credentials != null ? credentials.<BaseTLVType>map((nonOptionalcredentials) -> ArrayType.generateArrayType(nonOptionalcredentials, (elementnonOptionalcredentials) -> elementnonOptionalcredentials.encodeTlv())).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterLockOperationErrorEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer lockOperationType = null;
+    Integer operationSource = null;
+    Integer operationError = null;
+    @Nullable Integer userIndex = null;
+    @Nullable Integer fabricIndex = null;
+    @Nullable Long sourceNode = null;
+    @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LOCK_OPERATION_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lockOperationType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATION_SOURCE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationSource = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATION_ERROR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationError = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == USER_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          userIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SOURCE_NODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sourceNode = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == CREDENTIALS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          credentials = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.DoorLockClusterCredentialStruct.decodeTlv(elementcastingValue)));
+        }
+      }
+    }
+    return new DoorLockClusterLockOperationErrorEvent(
+      lockOperationType,
+      operationSource,
+      operationError,
+      userIndex,
+      fabricIndex,
+      sourceNode,
+      credentials
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1304,6 +4054,14 @@ public static class DoorLockClusterLockUserChangeEvent {
   public @Nullable Integer fabricIndex;
   public @Nullable Long sourceNode;
   public @Nullable Integer dataIndex;
+  private static final long LOCK_DATA_TYPE_ID = 0L;
+  private static final long DATA_OPERATION_TYPE_ID = 1L;
+  private static final long OPERATION_SOURCE_ID = 2L;
+  private static final long USER_INDEX_ID = 3L;
+  private static final long FABRIC_INDEX_ID = 4L;
+  private static final long SOURCE_NODE_ID = 5L;
+  private static final long DATA_INDEX_ID = 6L;
+
   public DoorLockClusterLockUserChangeEvent(
     Integer lockDataType,
     Integer dataOperationType,
@@ -1322,6 +4080,79 @@ public DoorLockClusterLockUserChangeEvent(
     this.dataIndex = dataIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LOCK_DATA_TYPE_ID, new UIntType(lockDataType)));
+    values.add(new StructElement(DATA_OPERATION_TYPE_ID, new UIntType(dataOperationType)));
+    values.add(new StructElement(OPERATION_SOURCE_ID, new UIntType(operationSource)));
+    values.add(new StructElement(USER_INDEX_ID, userIndex != null ? new UIntType(userIndex) : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, fabricIndex != null ? new UIntType(fabricIndex) : new NullType()));
+    values.add(new StructElement(SOURCE_NODE_ID, sourceNode != null ? new UIntType(sourceNode) : new NullType()));
+    values.add(new StructElement(DATA_INDEX_ID, dataIndex != null ? new UIntType(dataIndex) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterLockUserChangeEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer lockDataType = null;
+    Integer dataOperationType = null;
+    Integer operationSource = null;
+    @Nullable Integer userIndex = null;
+    @Nullable Integer fabricIndex = null;
+    @Nullable Long sourceNode = null;
+    @Nullable Integer dataIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LOCK_DATA_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lockDataType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == DATA_OPERATION_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          dataOperationType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATION_SOURCE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationSource = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == USER_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          userIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SOURCE_NODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sourceNode = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == DATA_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          dataIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DoorLockClusterLockUserChangeEvent(
+      lockDataType,
+      dataOperationType,
+      operationSource,
+      userIndex,
+      fabricIndex,
+      sourceNode,
+      dataIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1358,6 +4189,13 @@ public static class UnitTestingClusterTestEventEvent {
   public ChipStructs.UnitTestingClusterSimpleStruct arg4;
   public ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5;
   public ArrayList<Integer> arg6;
+  private static final long ARG1_ID = 1L;
+  private static final long ARG2_ID = 2L;
+  private static final long ARG3_ID = 3L;
+  private static final long ARG4_ID = 4L;
+  private static final long ARG5_ID = 5L;
+  private static final long ARG6_ID = 6L;
+
   public UnitTestingClusterTestEventEvent(
     Integer arg1,
     Integer arg2,
@@ -1374,6 +4212,71 @@ public UnitTestingClusterTestEventEvent(
     this.arg6 = arg6;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ARG1_ID, new UIntType(arg1)));
+    values.add(new StructElement(ARG2_ID, new UIntType(arg2)));
+    values.add(new StructElement(ARG3_ID, new BooleanType(arg3)));
+    values.add(new StructElement(ARG4_ID, arg4.encodeTlv()));
+    values.add(new StructElement(ARG5_ID, ArrayType.generateArrayType(arg5, (elementarg5) -> elementarg5.encodeTlv())));
+    values.add(new StructElement(ARG6_ID, ArrayType.generateArrayType(arg6, (elementarg6) -> new UIntType(elementarg6))));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterTestEventEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer arg1 = null;
+    Integer arg2 = null;
+    Boolean arg3 = null;
+    ChipStructs.UnitTestingClusterSimpleStruct arg4 = null;
+    ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5 = null;
+    ArrayList<Integer> arg6 = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ARG1_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          arg1 = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ARG2_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          arg2 = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ARG3_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          arg3 = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == ARG4_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          arg4 = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == ARG5_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          arg5 = castingValue.map((elementcastingValue) -> ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(elementcastingValue));
+        }
+      } else if (element.contextTagNum() == ARG6_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          arg6 = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new UnitTestingClusterTestEventEvent(
+      arg1,
+      arg2,
+      arg3,
+      arg4,
+      arg5,
+      arg6
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1402,12 +4305,39 @@ public String toString() {
 }
 public static class UnitTestingClusterTestFabricScopedEventEvent {
   public Integer fabricIndex;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public UnitTestingClusterTestFabricScopedEventEvent(
     Integer fabricIndex
   ) {
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterTestFabricScopedEventEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new UnitTestingClusterTestFabricScopedEventEvent(
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
index b2a267b050609a..740adecd59d598 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
@@ -21,10 +21,15 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import static chip.devicecontroller.ChipTLVType.*;
+
 public class ChipStructs {
 public static class ScenesClusterAttributeValuePair {
   public Long attributeID;
   public Long attributeValue;
+  private static final long ATTRIBUTE_I_D_ID = 0L;
+  private static final long ATTRIBUTE_VALUE_ID = 1L;
+
   public ScenesClusterAttributeValuePair(
     Long attributeID,
     Long attributeValue
@@ -33,6 +38,39 @@ public ScenesClusterAttributeValuePair(
     this.attributeValue = attributeValue;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ATTRIBUTE_I_D_ID, new UIntType(attributeID)));
+    values.add(new StructElement(ATTRIBUTE_VALUE_ID, new UIntType(attributeValue)));
+
+    return new StructType(values);
+  }
+
+  public static ScenesClusterAttributeValuePair decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long attributeID = null;
+    Long attributeValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ATTRIBUTE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          attributeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ATTRIBUTE_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          attributeValue = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new ScenesClusterAttributeValuePair(
+      attributeID,
+      attributeValue
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -50,6 +88,9 @@ public String toString() {
 public static class ScenesClusterExtensionFieldSet {
   public Long clusterID;
   public ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList;
+  private static final long CLUSTER_I_D_ID = 0L;
+  private static final long ATTRIBUTE_VALUE_LIST_ID = 1L;
+
   public ScenesClusterExtensionFieldSet(
     Long clusterID,
     ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList
@@ -58,6 +99,39 @@ public ScenesClusterExtensionFieldSet(
     this.attributeValueList = attributeValueList;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CLUSTER_I_D_ID, new UIntType(clusterID)));
+    values.add(new StructElement(ATTRIBUTE_VALUE_LIST_ID, ArrayType.generateArrayType(attributeValueList, (elementattributeValueList) -> elementattributeValueList.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static ScenesClusterExtensionFieldSet decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long clusterID = null;
+    ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CLUSTER_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          clusterID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ATTRIBUTE_VALUE_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          attributeValueList = castingValue.map((elementcastingValue) -> ChipStructs.ScenesClusterAttributeValuePair.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new ScenesClusterExtensionFieldSet(
+      clusterID,
+      attributeValueList
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -72,9 +146,133 @@ public String toString() {
     return output.toString();
   }
 }
+public static class ScenesClusterSceneInfoStruct {
+  public Integer sceneCount;
+  public Integer currentScene;
+  public Integer currentGroup;
+  public Boolean sceneValid;
+  public Integer remainingCapacity;
+  public Integer fabricIndex;
+  private static final long SCENE_COUNT_ID = 0L;
+  private static final long CURRENT_SCENE_ID = 1L;
+  private static final long CURRENT_GROUP_ID = 2L;
+  private static final long SCENE_VALID_ID = 3L;
+  private static final long REMAINING_CAPACITY_ID = 4L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
+  public ScenesClusterSceneInfoStruct(
+    Integer sceneCount,
+    Integer currentScene,
+    Integer currentGroup,
+    Boolean sceneValid,
+    Integer remainingCapacity,
+    Integer fabricIndex
+  ) {
+    this.sceneCount = sceneCount;
+    this.currentScene = currentScene;
+    this.currentGroup = currentGroup;
+    this.sceneValid = sceneValid;
+    this.remainingCapacity = remainingCapacity;
+    this.fabricIndex = fabricIndex;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SCENE_COUNT_ID, new UIntType(sceneCount)));
+    values.add(new StructElement(CURRENT_SCENE_ID, new UIntType(currentScene)));
+    values.add(new StructElement(CURRENT_GROUP_ID, new UIntType(currentGroup)));
+    values.add(new StructElement(SCENE_VALID_ID, new BooleanType(sceneValid)));
+    values.add(new StructElement(REMAINING_CAPACITY_ID, new UIntType(remainingCapacity)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static ScenesClusterSceneInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer sceneCount = null;
+    Integer currentScene = null;
+    Integer currentGroup = null;
+    Boolean sceneValid = null;
+    Integer remainingCapacity = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SCENE_COUNT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          sceneCount = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CURRENT_SCENE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          currentScene = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CURRENT_GROUP_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          currentGroup = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SCENE_VALID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          sceneValid = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == REMAINING_CAPACITY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          remainingCapacity = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ScenesClusterSceneInfoStruct(
+      sceneCount,
+      currentScene,
+      currentGroup,
+      sceneValid,
+      remainingCapacity,
+      fabricIndex
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("ScenesClusterSceneInfoStruct {\n");
+    output.append("\tsceneCount: ");
+    output.append(sceneCount);
+    output.append("\n");
+    output.append("\tcurrentScene: ");
+    output.append(currentScene);
+    output.append("\n");
+    output.append("\tcurrentGroup: ");
+    output.append(currentGroup);
+    output.append("\n");
+    output.append("\tsceneValid: ");
+    output.append(sceneValid);
+    output.append("\n");
+    output.append("\tremainingCapacity: ");
+    output.append(remainingCapacity);
+    output.append("\n");
+    output.append("\tfabricIndex: ");
+    output.append(fabricIndex);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
 public static class DescriptorClusterDeviceTypeStruct {
   public Long deviceType;
   public Integer revision;
+  private static final long DEVICE_TYPE_ID = 0L;
+  private static final long REVISION_ID = 1L;
+
   public DescriptorClusterDeviceTypeStruct(
     Long deviceType,
     Integer revision
@@ -83,6 +281,39 @@ public DescriptorClusterDeviceTypeStruct(
     this.revision = revision;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(DEVICE_TYPE_ID, new UIntType(deviceType)));
+    values.add(new StructElement(REVISION_ID, new UIntType(revision)));
+
+    return new StructType(values);
+  }
+
+  public static DescriptorClusterDeviceTypeStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long deviceType = null;
+    Integer revision = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == DEVICE_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          deviceType = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == REVISION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          revision = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DescriptorClusterDeviceTypeStruct(
+      deviceType,
+      revision
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -102,6 +333,11 @@ public static class DescriptorClusterSemanticTagStruct {
   public Integer namespaceID;
   public Integer tag;
   public @Nullable Optional<String> label;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long NAMESPACE_I_D_ID = 1L;
+  private static final long TAG_ID = 2L;
+  private static final long LABEL_ID = 3L;
+
   public DescriptorClusterSemanticTagStruct(
     @Nullable Integer mfgCode,
     Integer namespaceID,
@@ -114,6 +350,55 @@ public DescriptorClusterSemanticTagStruct(
     this.label = label;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode != null ? new UIntType(mfgCode) : new NullType()));
+    values.add(new StructElement(NAMESPACE_I_D_ID, new UIntType(namespaceID)));
+    values.add(new StructElement(TAG_ID, new UIntType(tag)));
+    values.add(new StructElement(LABEL_ID, label != null ? label.<BaseTLVType>map((nonOptionallabel) -> new StringType(nonOptionallabel)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DescriptorClusterSemanticTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Integer mfgCode = null;
+    Integer namespaceID = null;
+    Integer tag = null;
+    @Nullable Optional<String> label = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAMESPACE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          namespaceID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TAG_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          tag = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new DescriptorClusterSemanticTagStruct(
+      mfgCode,
+      namespaceID,
+      tag,
+      label
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -140,6 +425,12 @@ public static class BindingClusterTargetStruct {
   public Optional<Integer> endpoint;
   public Optional<Long> cluster;
   public Integer fabricIndex;
+  private static final long NODE_ID = 1L;
+  private static final long GROUP_ID = 2L;
+  private static final long ENDPOINT_ID = 3L;
+  private static final long CLUSTER_ID = 4L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public BindingClusterTargetStruct(
     Optional<Long> node,
     Optional<Integer> group,
@@ -154,6 +445,63 @@ public BindingClusterTargetStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NODE_ID, node.<BaseTLVType>map((nonOptionalnode) -> new UIntType(nonOptionalnode)).orElse(new EmptyType())));
+    values.add(new StructElement(GROUP_ID, group.<BaseTLVType>map((nonOptionalgroup) -> new UIntType(nonOptionalgroup)).orElse(new EmptyType())));
+    values.add(new StructElement(ENDPOINT_ID, endpoint.<BaseTLVType>map((nonOptionalendpoint) -> new UIntType(nonOptionalendpoint)).orElse(new EmptyType())));
+    values.add(new StructElement(CLUSTER_ID, cluster.<BaseTLVType>map((nonOptionalcluster) -> new UIntType(nonOptionalcluster)).orElse(new EmptyType())));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static BindingClusterTargetStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Long> node = Optional.empty();
+    Optional<Integer> group = Optional.empty();
+    Optional<Integer> endpoint = Optional.empty();
+    Optional<Long> cluster = Optional.empty();
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          node = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == GROUP_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          group = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == CLUSTER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          cluster = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new BindingClusterTargetStruct(
+      node,
+      group,
+      endpoint,
+      cluster,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -181,6 +529,10 @@ public static class AccessControlClusterAccessControlTargetStruct {
   public @Nullable Long cluster;
   public @Nullable Integer endpoint;
   public @Nullable Long deviceType;
+  private static final long CLUSTER_ID = 0L;
+  private static final long ENDPOINT_ID = 1L;
+  private static final long DEVICE_TYPE_ID = 2L;
+
   public AccessControlClusterAccessControlTargetStruct(
     @Nullable Long cluster,
     @Nullable Integer endpoint,
@@ -191,6 +543,47 @@ public AccessControlClusterAccessControlTargetStruct(
     this.deviceType = deviceType;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CLUSTER_ID, cluster != null ? new UIntType(cluster) : new NullType()));
+    values.add(new StructElement(ENDPOINT_ID, endpoint != null ? new UIntType(endpoint) : new NullType()));
+    values.add(new StructElement(DEVICE_TYPE_ID, deviceType != null ? new UIntType(deviceType) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static AccessControlClusterAccessControlTargetStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Long cluster = null;
+    @Nullable Integer endpoint = null;
+    @Nullable Long deviceType = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CLUSTER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          cluster = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == DEVICE_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          deviceType = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new AccessControlClusterAccessControlTargetStruct(
+      cluster,
+      endpoint,
+      deviceType
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -214,6 +607,12 @@ public static class AccessControlClusterAccessControlEntryStruct {
   public @Nullable ArrayList<Long> subjects;
   public @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets;
   public Integer fabricIndex;
+  private static final long PRIVILEGE_ID = 1L;
+  private static final long AUTH_MODE_ID = 2L;
+  private static final long SUBJECTS_ID = 3L;
+  private static final long TARGETS_ID = 4L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public AccessControlClusterAccessControlEntryStruct(
     Integer privilege,
     Integer authMode,
@@ -228,6 +627,63 @@ public AccessControlClusterAccessControlEntryStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PRIVILEGE_ID, new UIntType(privilege)));
+    values.add(new StructElement(AUTH_MODE_ID, new UIntType(authMode)));
+    values.add(new StructElement(SUBJECTS_ID, subjects != null ? ArrayType.generateArrayType(subjects, (elementsubjects) -> new UIntType(elementsubjects)) : new NullType()));
+    values.add(new StructElement(TARGETS_ID, targets != null ? ArrayType.generateArrayType(targets, (elementtargets) -> elementtargets.encodeTlv()) : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static AccessControlClusterAccessControlEntryStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer privilege = null;
+    Integer authMode = null;
+    @Nullable ArrayList<Long> subjects = null;
+    @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PRIVILEGE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          privilege = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == AUTH_MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          authMode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SUBJECTS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          subjects = castingValue.map((elementcastingValue) -> elementcastingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == TARGETS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          targets = castingValue.map((elementcastingValue) -> ChipStructs.AccessControlClusterAccessControlTargetStruct.decodeTlv(elementcastingValue));
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new AccessControlClusterAccessControlEntryStruct(
+      privilege,
+      authMode,
+      subjects,
+      targets,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -254,6 +710,9 @@ public String toString() {
 public static class AccessControlClusterAccessControlExtensionStruct {
   public byte[] data;
   public Integer fabricIndex;
+  private static final long DATA_ID = 1L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public AccessControlClusterAccessControlExtensionStruct(
     byte[] data,
     Integer fabricIndex
@@ -262,6 +721,39 @@ public AccessControlClusterAccessControlExtensionStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(DATA_ID, new ByteArrayType(data)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static AccessControlClusterAccessControlExtensionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] data = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == DATA_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          data = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new AccessControlClusterAccessControlExtensionStruct(
+      data,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -283,6 +775,13 @@ public static class ActionsClusterActionStruct {
   public Integer endpointListID;
   public Integer supportedCommands;
   public Integer state;
+  private static final long ACTION_I_D_ID = 0L;
+  private static final long NAME_ID = 1L;
+  private static final long TYPE_ID = 2L;
+  private static final long ENDPOINT_LIST_I_D_ID = 3L;
+  private static final long SUPPORTED_COMMANDS_ID = 4L;
+  private static final long STATE_ID = 5L;
+
   public ActionsClusterActionStruct(
     Integer actionID,
     String name,
@@ -299,6 +798,71 @@ public ActionsClusterActionStruct(
     this.state = state;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(TYPE_ID, new UIntType(type)));
+    values.add(new StructElement(ENDPOINT_LIST_I_D_ID, new UIntType(endpointListID)));
+    values.add(new StructElement(SUPPORTED_COMMANDS_ID, new UIntType(supportedCommands)));
+    values.add(new StructElement(STATE_ID, new UIntType(state)));
+
+    return new StructType(values);
+  }
+
+  public static ActionsClusterActionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer actionID = null;
+    String name = null;
+    Integer type = null;
+    Integer endpointListID = null;
+    Integer supportedCommands = null;
+    Integer state = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          actionID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          type = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_LIST_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpointListID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SUPPORTED_COMMANDS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          supportedCommands = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == STATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          state = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ActionsClusterActionStruct(
+      actionID,
+      name,
+      type,
+      endpointListID,
+      supportedCommands,
+      state
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -330,6 +894,11 @@ public static class ActionsClusterEndpointListStruct {
   public String name;
   public Integer type;
   public ArrayList<Integer> endpoints;
+  private static final long ENDPOINT_LIST_I_D_ID = 0L;
+  private static final long NAME_ID = 1L;
+  private static final long TYPE_ID = 2L;
+  private static final long ENDPOINTS_ID = 3L;
+
   public ActionsClusterEndpointListStruct(
     Integer endpointListID,
     String name,
@@ -342,6 +911,55 @@ public ActionsClusterEndpointListStruct(
     this.endpoints = endpoints;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ENDPOINT_LIST_I_D_ID, new UIntType(endpointListID)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(TYPE_ID, new UIntType(type)));
+    values.add(new StructElement(ENDPOINTS_ID, ArrayType.generateArrayType(endpoints, (elementendpoints) -> new UIntType(elementendpoints))));
+
+    return new StructType(values);
+  }
+
+  public static ActionsClusterEndpointListStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer endpointListID = null;
+    String name = null;
+    Integer type = null;
+    ArrayList<Integer> endpoints = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ENDPOINT_LIST_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpointListID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          type = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINTS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          endpoints = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new ActionsClusterEndpointListStruct(
+      endpointListID,
+      name,
+      type,
+      endpoints
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -365,6 +983,9 @@ public String toString() {
 public static class BasicInformationClusterCapabilityMinimaStruct {
   public Integer caseSessionsPerFabric;
   public Integer subscriptionsPerFabric;
+  private static final long CASE_SESSIONS_PER_FABRIC_ID = 0L;
+  private static final long SUBSCRIPTIONS_PER_FABRIC_ID = 1L;
+
   public BasicInformationClusterCapabilityMinimaStruct(
     Integer caseSessionsPerFabric,
     Integer subscriptionsPerFabric
@@ -373,6 +994,39 @@ public BasicInformationClusterCapabilityMinimaStruct(
     this.subscriptionsPerFabric = subscriptionsPerFabric;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CASE_SESSIONS_PER_FABRIC_ID, new UIntType(caseSessionsPerFabric)));
+    values.add(new StructElement(SUBSCRIPTIONS_PER_FABRIC_ID, new UIntType(subscriptionsPerFabric)));
+
+    return new StructType(values);
+  }
+
+  public static BasicInformationClusterCapabilityMinimaStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer caseSessionsPerFabric = null;
+    Integer subscriptionsPerFabric = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CASE_SESSIONS_PER_FABRIC_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          caseSessionsPerFabric = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SUBSCRIPTIONS_PER_FABRIC_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          subscriptionsPerFabric = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new BasicInformationClusterCapabilityMinimaStruct(
+      caseSessionsPerFabric,
+      subscriptionsPerFabric
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -390,6 +1044,9 @@ public String toString() {
 public static class BasicInformationClusterProductAppearanceStruct {
   public Integer finish;
   public @Nullable Integer primaryColor;
+  private static final long FINISH_ID = 0L;
+  private static final long PRIMARY_COLOR_ID = 1L;
+
   public BasicInformationClusterProductAppearanceStruct(
     Integer finish,
     @Nullable Integer primaryColor
@@ -398,6 +1055,39 @@ public BasicInformationClusterProductAppearanceStruct(
     this.primaryColor = primaryColor;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FINISH_ID, new UIntType(finish)));
+    values.add(new StructElement(PRIMARY_COLOR_ID, primaryColor != null ? new UIntType(primaryColor) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static BasicInformationClusterProductAppearanceStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer finish = null;
+    @Nullable Integer primaryColor = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FINISH_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          finish = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PRIMARY_COLOR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          primaryColor = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new BasicInformationClusterProductAppearanceStruct(
+      finish,
+      primaryColor
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -416,6 +1106,10 @@ public static class OtaSoftwareUpdateRequestorClusterProviderLocation {
   public Long providerNodeID;
   public Integer endpoint;
   public Integer fabricIndex;
+  private static final long PROVIDER_NODE_I_D_ID = 1L;
+  private static final long ENDPOINT_ID = 2L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public OtaSoftwareUpdateRequestorClusterProviderLocation(
     Long providerNodeID,
     Integer endpoint,
@@ -426,6 +1120,47 @@ public OtaSoftwareUpdateRequestorClusterProviderLocation(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PROVIDER_NODE_I_D_ID, new UIntType(providerNodeID)));
+    values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static OtaSoftwareUpdateRequestorClusterProviderLocation decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long providerNodeID = null;
+    Integer endpoint = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PROVIDER_NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          providerNodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new OtaSoftwareUpdateRequestorClusterProviderLocation(
+      providerNodeID,
+      endpoint,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -446,6 +1181,9 @@ public String toString() {
 public static class PowerSourceClusterBatChargeFaultChangeType {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterBatChargeFaultChangeType(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -454,6 +1192,39 @@ public PowerSourceClusterBatChargeFaultChangeType(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterBatChargeFaultChangeType decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterBatChargeFaultChangeType(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -471,6 +1242,9 @@ public String toString() {
 public static class PowerSourceClusterBatFaultChangeType {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterBatFaultChangeType(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -479,6 +1253,39 @@ public PowerSourceClusterBatFaultChangeType(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterBatFaultChangeType decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterBatFaultChangeType(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -496,6 +1303,9 @@ public String toString() {
 public static class PowerSourceClusterWiredFaultChangeType {
   public ArrayList<Integer> current;
   public ArrayList<Integer> previous;
+  private static final long CURRENT_ID = 0L;
+  private static final long PREVIOUS_ID = 1L;
+
   public PowerSourceClusterWiredFaultChangeType(
     ArrayList<Integer> current,
     ArrayList<Integer> previous
@@ -504,6 +1314,39 @@ public PowerSourceClusterWiredFaultChangeType(
     this.previous = previous;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CURRENT_ID, ArrayType.generateArrayType(current, (elementcurrent) -> new UIntType(elementcurrent))));
+    values.add(new StructElement(PREVIOUS_ID, ArrayType.generateArrayType(previous, (elementprevious) -> new UIntType(elementprevious))));
+
+    return new StructType(values);
+  }
+
+  public static PowerSourceClusterWiredFaultChangeType decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<Integer> current = null;
+    ArrayList<Integer> previous = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          current = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == PREVIOUS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          previous = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new PowerSourceClusterWiredFaultChangeType(
+      current,
+      previous
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -521,6 +1364,9 @@ public String toString() {
 public static class GeneralCommissioningClusterBasicCommissioningInfo {
   public Integer failSafeExpiryLengthSeconds;
   public Integer maxCumulativeFailsafeSeconds;
+  private static final long FAIL_SAFE_EXPIRY_LENGTH_SECONDS_ID = 0L;
+  private static final long MAX_CUMULATIVE_FAILSAFE_SECONDS_ID = 1L;
+
   public GeneralCommissioningClusterBasicCommissioningInfo(
     Integer failSafeExpiryLengthSeconds,
     Integer maxCumulativeFailsafeSeconds
@@ -529,6 +1375,39 @@ public GeneralCommissioningClusterBasicCommissioningInfo(
     this.maxCumulativeFailsafeSeconds = maxCumulativeFailsafeSeconds;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FAIL_SAFE_EXPIRY_LENGTH_SECONDS_ID, new UIntType(failSafeExpiryLengthSeconds)));
+    values.add(new StructElement(MAX_CUMULATIVE_FAILSAFE_SECONDS_ID, new UIntType(maxCumulativeFailsafeSeconds)));
+
+    return new StructType(values);
+  }
+
+  public static GeneralCommissioningClusterBasicCommissioningInfo decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer failSafeExpiryLengthSeconds = null;
+    Integer maxCumulativeFailsafeSeconds = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FAIL_SAFE_EXPIRY_LENGTH_SECONDS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          failSafeExpiryLengthSeconds = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MAX_CUMULATIVE_FAILSAFE_SECONDS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          maxCumulativeFailsafeSeconds = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GeneralCommissioningClusterBasicCommissioningInfo(
+      failSafeExpiryLengthSeconds,
+      maxCumulativeFailsafeSeconds
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -546,12 +1425,72 @@ public String toString() {
 public static class NetworkCommissioningClusterNetworkInfoStruct {
   public byte[] networkID;
   public Boolean connected;
+  public @Nullable Optional<byte[]> networkIdentifier;
+  public @Nullable Optional<byte[]> clientIdentifier;
+  private static final long NETWORK_I_D_ID = 0L;
+  private static final long CONNECTED_ID = 1L;
+  private static final long NETWORK_IDENTIFIER_ID = 2L;
+  private static final long CLIENT_IDENTIFIER_ID = 3L;
+
   public NetworkCommissioningClusterNetworkInfoStruct(
     byte[] networkID,
-    Boolean connected
+    Boolean connected,
+    @Nullable Optional<byte[]> networkIdentifier,
+    @Nullable Optional<byte[]> clientIdentifier
   ) {
     this.networkID = networkID;
     this.connected = connected;
+    this.networkIdentifier = networkIdentifier;
+    this.clientIdentifier = clientIdentifier;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NETWORK_I_D_ID, new ByteArrayType(networkID)));
+    values.add(new StructElement(CONNECTED_ID, new BooleanType(connected)));
+    values.add(new StructElement(NETWORK_IDENTIFIER_ID, networkIdentifier != null ? networkIdentifier.<BaseTLVType>map((nonOptionalnetworkIdentifier) -> new ByteArrayType(nonOptionalnetworkIdentifier)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(CLIENT_IDENTIFIER_ID, clientIdentifier != null ? clientIdentifier.<BaseTLVType>map((nonOptionalclientIdentifier) -> new ByteArrayType(nonOptionalclientIdentifier)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static NetworkCommissioningClusterNetworkInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] networkID = null;
+    Boolean connected = null;
+    @Nullable Optional<byte[]> networkIdentifier = null;
+    @Nullable Optional<byte[]> clientIdentifier = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NETWORK_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          networkID = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == CONNECTED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          connected = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == NETWORK_IDENTIFIER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          networkIdentifier = Optional.of(castingValue.value(byte[].class));
+        }
+      } else if (element.contextTagNum() == CLIENT_IDENTIFIER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          clientIdentifier = Optional.of(castingValue.value(byte[].class));
+        }
+      }
+    }
+    return new NetworkCommissioningClusterNetworkInfoStruct(
+      networkID,
+      connected,
+      networkIdentifier,
+      clientIdentifier
+    );
   }
 
   @Override
@@ -564,6 +1503,12 @@ public String toString() {
     output.append("\tconnected: ");
     output.append(connected);
     output.append("\n");
+    output.append("\tnetworkIdentifier: ");
+    output.append(networkIdentifier.isPresent() ? Arrays.toString(networkIdentifier.get()) : "");
+    output.append("\n");
+    output.append("\tclientIdentifier: ");
+    output.append(clientIdentifier.isPresent() ? Arrays.toString(clientIdentifier.get()) : "");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
@@ -577,6 +1522,15 @@ public static class NetworkCommissioningClusterThreadInterfaceScanResultStruct {
   public byte[] extendedAddress;
   public Integer rssi;
   public Integer lqi;
+  private static final long PAN_ID_ID = 0L;
+  private static final long EXTENDED_PAN_ID_ID = 1L;
+  private static final long NETWORK_NAME_ID = 2L;
+  private static final long CHANNEL_ID = 3L;
+  private static final long VERSION_ID = 4L;
+  private static final long EXTENDED_ADDRESS_ID = 5L;
+  private static final long RSSI_ID = 6L;
+  private static final long LQI_ID = 7L;
+
   public NetworkCommissioningClusterThreadInterfaceScanResultStruct(
     Integer panId,
     Long extendedPanId,
@@ -597,6 +1551,87 @@ public NetworkCommissioningClusterThreadInterfaceScanResultStruct(
     this.lqi = lqi;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PAN_ID_ID, new UIntType(panId)));
+    values.add(new StructElement(EXTENDED_PAN_ID_ID, new UIntType(extendedPanId)));
+    values.add(new StructElement(NETWORK_NAME_ID, new StringType(networkName)));
+    values.add(new StructElement(CHANNEL_ID, new UIntType(channel)));
+    values.add(new StructElement(VERSION_ID, new UIntType(version)));
+    values.add(new StructElement(EXTENDED_ADDRESS_ID, new ByteArrayType(extendedAddress)));
+    values.add(new StructElement(RSSI_ID, new IntType(rssi)));
+    values.add(new StructElement(LQI_ID, new UIntType(lqi)));
+
+    return new StructType(values);
+  }
+
+  public static NetworkCommissioningClusterThreadInterfaceScanResultStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer panId = null;
+    Long extendedPanId = null;
+    String networkName = null;
+    Integer channel = null;
+    Integer version = null;
+    byte[] extendedAddress = null;
+    Integer rssi = null;
+    Integer lqi = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PAN_ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          panId = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == EXTENDED_PAN_ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          extendedPanId = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NETWORK_NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          networkName = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == CHANNEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          channel = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == VERSION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          version = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == EXTENDED_ADDRESS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          extendedAddress = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == RSSI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          rssi = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LQI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lqi = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new NetworkCommissioningClusterThreadInterfaceScanResultStruct(
+      panId,
+      extendedPanId,
+      networkName,
+      channel,
+      version,
+      extendedAddress,
+      rssi,
+      lqi
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -636,6 +1671,13 @@ public static class NetworkCommissioningClusterWiFiInterfaceScanResultStruct {
   public Integer channel;
   public Integer wiFiBand;
   public Integer rssi;
+  private static final long SECURITY_ID = 0L;
+  private static final long SSID_ID = 1L;
+  private static final long BSSID_ID = 2L;
+  private static final long CHANNEL_ID = 3L;
+  private static final long WI_FI_BAND_ID = 4L;
+  private static final long RSSI_ID = 5L;
+
   public NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
     Integer security,
     byte[] ssid,
@@ -652,6 +1694,71 @@ public NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
     this.rssi = rssi;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(SECURITY_ID, new UIntType(security)));
+    values.add(new StructElement(SSID_ID, new ByteArrayType(ssid)));
+    values.add(new StructElement(BSSID_ID, new ByteArrayType(bssid)));
+    values.add(new StructElement(CHANNEL_ID, new UIntType(channel)));
+    values.add(new StructElement(WI_FI_BAND_ID, new UIntType(wiFiBand)));
+    values.add(new StructElement(RSSI_ID, new IntType(rssi)));
+
+    return new StructType(values);
+  }
+
+  public static NetworkCommissioningClusterWiFiInterfaceScanResultStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer security = null;
+    byte[] ssid = null;
+    byte[] bssid = null;
+    Integer channel = null;
+    Integer wiFiBand = null;
+    Integer rssi = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == SECURITY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          security = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SSID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          ssid = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == BSSID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          bssid = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == CHANNEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          channel = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == WI_FI_BAND_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          wiFiBand = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == RSSI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          rssi = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
+      security,
+      ssid,
+      bssid,
+      channel,
+      wiFiBand,
+      rssi
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -687,6 +1794,15 @@ public static class GeneralDiagnosticsClusterNetworkInterface {
   public ArrayList<byte[]> IPv4Addresses;
   public ArrayList<byte[]> IPv6Addresses;
   public Integer type;
+  private static final long NAME_ID = 0L;
+  private static final long IS_OPERATIONAL_ID = 1L;
+  private static final long OFF_PREMISE_SERVICES_REACHABLE_I_PV4_ID = 2L;
+  private static final long OFF_PREMISE_SERVICES_REACHABLE_I_PV6_ID = 3L;
+  private static final long HARDWARE_ADDRESS_ID = 4L;
+  private static final long I_PV4_ADDRESSES_ID = 5L;
+  private static final long I_PV6_ADDRESSES_ID = 6L;
+  private static final long TYPE_ID = 7L;
+
   public GeneralDiagnosticsClusterNetworkInterface(
     String name,
     Boolean isOperational,
@@ -707,6 +1823,87 @@ public GeneralDiagnosticsClusterNetworkInterface(
     this.type = type;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(IS_OPERATIONAL_ID, new BooleanType(isOperational)));
+    values.add(new StructElement(OFF_PREMISE_SERVICES_REACHABLE_I_PV4_ID, offPremiseServicesReachableIPv4 != null ? new BooleanType(offPremiseServicesReachableIPv4) : new NullType()));
+    values.add(new StructElement(OFF_PREMISE_SERVICES_REACHABLE_I_PV6_ID, offPremiseServicesReachableIPv6 != null ? new BooleanType(offPremiseServicesReachableIPv6) : new NullType()));
+    values.add(new StructElement(HARDWARE_ADDRESS_ID, new ByteArrayType(hardwareAddress)));
+    values.add(new StructElement(I_PV4_ADDRESSES_ID, ArrayType.generateArrayType(IPv4Addresses, (elementIPv4Addresses) -> new ByteArrayType(elementIPv4Addresses))));
+    values.add(new StructElement(I_PV6_ADDRESSES_ID, ArrayType.generateArrayType(IPv6Addresses, (elementIPv6Addresses) -> new ByteArrayType(elementIPv6Addresses))));
+    values.add(new StructElement(TYPE_ID, new UIntType(type)));
+
+    return new StructType(values);
+  }
+
+  public static GeneralDiagnosticsClusterNetworkInterface decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String name = null;
+    Boolean isOperational = null;
+    @Nullable Boolean offPremiseServicesReachableIPv4 = null;
+    @Nullable Boolean offPremiseServicesReachableIPv6 = null;
+    byte[] hardwareAddress = null;
+    ArrayList<byte[]> IPv4Addresses = null;
+    ArrayList<byte[]> IPv6Addresses = null;
+    Integer type = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == IS_OPERATIONAL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          isOperational = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == OFF_PREMISE_SERVICES_REACHABLE_I_PV4_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          offPremiseServicesReachableIPv4 = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == OFF_PREMISE_SERVICES_REACHABLE_I_PV6_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          offPremiseServicesReachableIPv6 = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == HARDWARE_ADDRESS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          hardwareAddress = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == I_PV4_ADDRESSES_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          IPv4Addresses = castingValue.map((elementcastingValue) -> elementcastingValue.value(byte[].class));
+        }
+      } else if (element.contextTagNum() == I_PV6_ADDRESSES_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          IPv6Addresses = castingValue.map((elementcastingValue) -> elementcastingValue.value(byte[].class));
+        }
+      } else if (element.contextTagNum() == TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          type = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GeneralDiagnosticsClusterNetworkInterface(
+      name,
+      isOperational,
+      offPremiseServicesReachableIPv4,
+      offPremiseServicesReachableIPv6,
+      hardwareAddress,
+      IPv4Addresses,
+      IPv6Addresses,
+      type
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -745,6 +1942,12 @@ public static class SoftwareDiagnosticsClusterThreadMetricsStruct {
   public Optional<Long> stackFreeCurrent;
   public Optional<Long> stackFreeMinimum;
   public Optional<Long> stackSize;
+  private static final long ID_ID = 0L;
+  private static final long NAME_ID = 1L;
+  private static final long STACK_FREE_CURRENT_ID = 2L;
+  private static final long STACK_FREE_MINIMUM_ID = 3L;
+  private static final long STACK_SIZE_ID = 4L;
+
   public SoftwareDiagnosticsClusterThreadMetricsStruct(
     Long id,
     Optional<String> name,
@@ -759,6 +1962,63 @@ public SoftwareDiagnosticsClusterThreadMetricsStruct(
     this.stackSize = stackSize;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ID_ID, new UIntType(id)));
+    values.add(new StructElement(NAME_ID, name.<BaseTLVType>map((nonOptionalname) -> new StringType(nonOptionalname)).orElse(new EmptyType())));
+    values.add(new StructElement(STACK_FREE_CURRENT_ID, stackFreeCurrent.<BaseTLVType>map((nonOptionalstackFreeCurrent) -> new UIntType(nonOptionalstackFreeCurrent)).orElse(new EmptyType())));
+    values.add(new StructElement(STACK_FREE_MINIMUM_ID, stackFreeMinimum.<BaseTLVType>map((nonOptionalstackFreeMinimum) -> new UIntType(nonOptionalstackFreeMinimum)).orElse(new EmptyType())));
+    values.add(new StructElement(STACK_SIZE_ID, stackSize.<BaseTLVType>map((nonOptionalstackSize) -> new UIntType(nonOptionalstackSize)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static SoftwareDiagnosticsClusterThreadMetricsStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long id = null;
+    Optional<String> name = Optional.empty();
+    Optional<Long> stackFreeCurrent = Optional.empty();
+    Optional<Long> stackFreeMinimum = Optional.empty();
+    Optional<Long> stackSize = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          id = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == STACK_FREE_CURRENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          stackFreeCurrent = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == STACK_FREE_MINIMUM_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          stackFreeMinimum = Optional.of(castingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == STACK_SIZE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          stackSize = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new SoftwareDiagnosticsClusterThreadMetricsStruct(
+      id,
+      name,
+      stackFreeCurrent,
+      stackFreeMinimum,
+      stackSize
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -797,6 +2057,21 @@ public static class ThreadNetworkDiagnosticsClusterNeighborTableStruct {
   public Boolean fullThreadDevice;
   public Boolean fullNetworkData;
   public Boolean isChild;
+  private static final long EXT_ADDRESS_ID = 0L;
+  private static final long AGE_ID = 1L;
+  private static final long RLOC16_ID = 2L;
+  private static final long LINK_FRAME_COUNTER_ID = 3L;
+  private static final long MLE_FRAME_COUNTER_ID = 4L;
+  private static final long LQI_ID = 5L;
+  private static final long AVERAGE_RSSI_ID = 6L;
+  private static final long LAST_RSSI_ID = 7L;
+  private static final long FRAME_ERROR_RATE_ID = 8L;
+  private static final long MESSAGE_ERROR_RATE_ID = 9L;
+  private static final long RX_ON_WHEN_IDLE_ID = 10L;
+  private static final long FULL_THREAD_DEVICE_ID = 11L;
+  private static final long FULL_NETWORK_DATA_ID = 12L;
+  private static final long IS_CHILD_ID = 13L;
+
   public ThreadNetworkDiagnosticsClusterNeighborTableStruct(
     Long extAddress,
     Long age,
@@ -829,6 +2104,135 @@ public ThreadNetworkDiagnosticsClusterNeighborTableStruct(
     this.isChild = isChild;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(EXT_ADDRESS_ID, new UIntType(extAddress)));
+    values.add(new StructElement(AGE_ID, new UIntType(age)));
+    values.add(new StructElement(RLOC16_ID, new UIntType(rloc16)));
+    values.add(new StructElement(LINK_FRAME_COUNTER_ID, new UIntType(linkFrameCounter)));
+    values.add(new StructElement(MLE_FRAME_COUNTER_ID, new UIntType(mleFrameCounter)));
+    values.add(new StructElement(LQI_ID, new UIntType(lqi)));
+    values.add(new StructElement(AVERAGE_RSSI_ID, averageRssi != null ? new IntType(averageRssi) : new NullType()));
+    values.add(new StructElement(LAST_RSSI_ID, lastRssi != null ? new IntType(lastRssi) : new NullType()));
+    values.add(new StructElement(FRAME_ERROR_RATE_ID, new UIntType(frameErrorRate)));
+    values.add(new StructElement(MESSAGE_ERROR_RATE_ID, new UIntType(messageErrorRate)));
+    values.add(new StructElement(RX_ON_WHEN_IDLE_ID, new BooleanType(rxOnWhenIdle)));
+    values.add(new StructElement(FULL_THREAD_DEVICE_ID, new BooleanType(fullThreadDevice)));
+    values.add(new StructElement(FULL_NETWORK_DATA_ID, new BooleanType(fullNetworkData)));
+    values.add(new StructElement(IS_CHILD_ID, new BooleanType(isChild)));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterNeighborTableStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long extAddress = null;
+    Long age = null;
+    Integer rloc16 = null;
+    Long linkFrameCounter = null;
+    Long mleFrameCounter = null;
+    Integer lqi = null;
+    @Nullable Integer averageRssi = null;
+    @Nullable Integer lastRssi = null;
+    Integer frameErrorRate = null;
+    Integer messageErrorRate = null;
+    Boolean rxOnWhenIdle = null;
+    Boolean fullThreadDevice = null;
+    Boolean fullNetworkData = null;
+    Boolean isChild = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == EXT_ADDRESS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          extAddress = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == AGE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          age = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == RLOC16_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          rloc16 = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LINK_FRAME_COUNTER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          linkFrameCounter = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == MLE_FRAME_COUNTER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mleFrameCounter = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == LQI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lqi = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == AVERAGE_RSSI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          averageRssi = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == LAST_RSSI_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          lastRssi = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FRAME_ERROR_RATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          frameErrorRate = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MESSAGE_ERROR_RATE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          messageErrorRate = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == RX_ON_WHEN_IDLE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          rxOnWhenIdle = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == FULL_THREAD_DEVICE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          fullThreadDevice = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == FULL_NETWORK_DATA_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          fullNetworkData = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == IS_CHILD_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          isChild = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterNeighborTableStruct(
+      extAddress,
+      age,
+      rloc16,
+      linkFrameCounter,
+      mleFrameCounter,
+      lqi,
+      averageRssi,
+      lastRssi,
+      frameErrorRate,
+      messageErrorRate,
+      rxOnWhenIdle,
+      fullThreadDevice,
+      fullNetworkData,
+      isChild
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -892,6 +2296,19 @@ public static class ThreadNetworkDiagnosticsClusterOperationalDatasetComponents
   public Boolean pskcPresent;
   public Boolean securityPolicyPresent;
   public Boolean channelMaskPresent;
+  private static final long ACTIVE_TIMESTAMP_PRESENT_ID = 0L;
+  private static final long PENDING_TIMESTAMP_PRESENT_ID = 1L;
+  private static final long MASTER_KEY_PRESENT_ID = 2L;
+  private static final long NETWORK_NAME_PRESENT_ID = 3L;
+  private static final long EXTENDED_PAN_ID_PRESENT_ID = 4L;
+  private static final long MESH_LOCAL_PREFIX_PRESENT_ID = 5L;
+  private static final long DELAY_PRESENT_ID = 6L;
+  private static final long PAN_ID_PRESENT_ID = 7L;
+  private static final long CHANNEL_PRESENT_ID = 8L;
+  private static final long PSKC_PRESENT_ID = 9L;
+  private static final long SECURITY_POLICY_PRESENT_ID = 10L;
+  private static final long CHANNEL_MASK_PRESENT_ID = 11L;
+
   public ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
     Boolean activeTimestampPresent,
     Boolean pendingTimestampPresent,
@@ -920,6 +2337,119 @@ public ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
     this.channelMaskPresent = channelMaskPresent;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ACTIVE_TIMESTAMP_PRESENT_ID, new BooleanType(activeTimestampPresent)));
+    values.add(new StructElement(PENDING_TIMESTAMP_PRESENT_ID, new BooleanType(pendingTimestampPresent)));
+    values.add(new StructElement(MASTER_KEY_PRESENT_ID, new BooleanType(masterKeyPresent)));
+    values.add(new StructElement(NETWORK_NAME_PRESENT_ID, new BooleanType(networkNamePresent)));
+    values.add(new StructElement(EXTENDED_PAN_ID_PRESENT_ID, new BooleanType(extendedPanIdPresent)));
+    values.add(new StructElement(MESH_LOCAL_PREFIX_PRESENT_ID, new BooleanType(meshLocalPrefixPresent)));
+    values.add(new StructElement(DELAY_PRESENT_ID, new BooleanType(delayPresent)));
+    values.add(new StructElement(PAN_ID_PRESENT_ID, new BooleanType(panIdPresent)));
+    values.add(new StructElement(CHANNEL_PRESENT_ID, new BooleanType(channelPresent)));
+    values.add(new StructElement(PSKC_PRESENT_ID, new BooleanType(pskcPresent)));
+    values.add(new StructElement(SECURITY_POLICY_PRESENT_ID, new BooleanType(securityPolicyPresent)));
+    values.add(new StructElement(CHANNEL_MASK_PRESENT_ID, new BooleanType(channelMaskPresent)));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterOperationalDatasetComponents decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean activeTimestampPresent = null;
+    Boolean pendingTimestampPresent = null;
+    Boolean masterKeyPresent = null;
+    Boolean networkNamePresent = null;
+    Boolean extendedPanIdPresent = null;
+    Boolean meshLocalPrefixPresent = null;
+    Boolean delayPresent = null;
+    Boolean panIdPresent = null;
+    Boolean channelPresent = null;
+    Boolean pskcPresent = null;
+    Boolean securityPolicyPresent = null;
+    Boolean channelMaskPresent = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ACTIVE_TIMESTAMP_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          activeTimestampPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == PENDING_TIMESTAMP_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          pendingTimestampPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == MASTER_KEY_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          masterKeyPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == NETWORK_NAME_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          networkNamePresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == EXTENDED_PAN_ID_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          extendedPanIdPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == MESH_LOCAL_PREFIX_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          meshLocalPrefixPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == DELAY_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          delayPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == PAN_ID_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          panIdPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == CHANNEL_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          channelPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == PSKC_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          pskcPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == SECURITY_POLICY_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          securityPolicyPresent = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == CHANNEL_MASK_PRESENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          channelMaskPresent = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
+      activeTimestampPresent,
+      pendingTimestampPresent,
+      masterKeyPresent,
+      networkNamePresent,
+      extendedPanIdPresent,
+      meshLocalPrefixPresent,
+      delayPresent,
+      panIdPresent,
+      channelPresent,
+      pskcPresent,
+      securityPolicyPresent,
+      channelMaskPresent
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -975,6 +2505,17 @@ public static class ThreadNetworkDiagnosticsClusterRouteTableStruct {
   public Integer age;
   public Boolean allocated;
   public Boolean linkEstablished;
+  private static final long EXT_ADDRESS_ID = 0L;
+  private static final long RLOC16_ID = 1L;
+  private static final long ROUTER_ID_ID = 2L;
+  private static final long NEXT_HOP_ID = 3L;
+  private static final long PATH_COST_ID = 4L;
+  private static final long L_Q_I_IN_ID = 5L;
+  private static final long L_Q_I_OUT_ID = 6L;
+  private static final long AGE_ID = 7L;
+  private static final long ALLOCATED_ID = 8L;
+  private static final long LINK_ESTABLISHED_ID = 9L;
+
   public ThreadNetworkDiagnosticsClusterRouteTableStruct(
     Long extAddress,
     Integer rloc16,
@@ -999,6 +2540,103 @@ public ThreadNetworkDiagnosticsClusterRouteTableStruct(
     this.linkEstablished = linkEstablished;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(EXT_ADDRESS_ID, new UIntType(extAddress)));
+    values.add(new StructElement(RLOC16_ID, new UIntType(rloc16)));
+    values.add(new StructElement(ROUTER_ID_ID, new UIntType(routerId)));
+    values.add(new StructElement(NEXT_HOP_ID, new UIntType(nextHop)));
+    values.add(new StructElement(PATH_COST_ID, new UIntType(pathCost)));
+    values.add(new StructElement(L_Q_I_IN_ID, new UIntType(LQIIn)));
+    values.add(new StructElement(L_Q_I_OUT_ID, new UIntType(LQIOut)));
+    values.add(new StructElement(AGE_ID, new UIntType(age)));
+    values.add(new StructElement(ALLOCATED_ID, new BooleanType(allocated)));
+    values.add(new StructElement(LINK_ESTABLISHED_ID, new BooleanType(linkEstablished)));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterRouteTableStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long extAddress = null;
+    Integer rloc16 = null;
+    Integer routerId = null;
+    Integer nextHop = null;
+    Integer pathCost = null;
+    Integer LQIIn = null;
+    Integer LQIOut = null;
+    Integer age = null;
+    Boolean allocated = null;
+    Boolean linkEstablished = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == EXT_ADDRESS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          extAddress = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == RLOC16_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          rloc16 = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ROUTER_ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          routerId = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NEXT_HOP_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nextHop = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PATH_COST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          pathCost = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == L_Q_I_IN_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          LQIIn = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == L_Q_I_OUT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          LQIOut = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == AGE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          age = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ALLOCATED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          allocated = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == LINK_ESTABLISHED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          linkEstablished = castingValue.value(Boolean.class);
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterRouteTableStruct(
+      extAddress,
+      rloc16,
+      routerId,
+      nextHop,
+      pathCost,
+      LQIIn,
+      LQIOut,
+      age,
+      allocated,
+      linkEstablished
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1040,6 +2678,9 @@ public String toString() {
 public static class ThreadNetworkDiagnosticsClusterSecurityPolicy {
   public Integer rotationTime;
   public Integer flags;
+  private static final long ROTATION_TIME_ID = 0L;
+  private static final long FLAGS_ID = 1L;
+
   public ThreadNetworkDiagnosticsClusterSecurityPolicy(
     Integer rotationTime,
     Integer flags
@@ -1048,6 +2689,39 @@ public ThreadNetworkDiagnosticsClusterSecurityPolicy(
     this.flags = flags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ROTATION_TIME_ID, new UIntType(rotationTime)));
+    values.add(new StructElement(FLAGS_ID, new UIntType(flags)));
+
+    return new StructType(values);
+  }
+
+  public static ThreadNetworkDiagnosticsClusterSecurityPolicy decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer rotationTime = null;
+    Integer flags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ROTATION_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          rotationTime = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FLAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          flags = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ThreadNetworkDiagnosticsClusterSecurityPolicy(
+      rotationTime,
+      flags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1066,6 +2740,10 @@ public static class TimeSynchronizationClusterDSTOffsetStruct {
   public Long offset;
   public Long validStarting;
   public @Nullable Long validUntil;
+  private static final long OFFSET_ID = 0L;
+  private static final long VALID_STARTING_ID = 1L;
+  private static final long VALID_UNTIL_ID = 2L;
+
   public TimeSynchronizationClusterDSTOffsetStruct(
     Long offset,
     Long validStarting,
@@ -1076,6 +2754,47 @@ public TimeSynchronizationClusterDSTOffsetStruct(
     this.validUntil = validUntil;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OFFSET_ID, new IntType(offset)));
+    values.add(new StructElement(VALID_STARTING_ID, new UIntType(validStarting)));
+    values.add(new StructElement(VALID_UNTIL_ID, validUntil != null ? new UIntType(validUntil) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterDSTOffsetStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long offset = null;
+    Long validStarting = null;
+    @Nullable Long validUntil = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OFFSET_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          offset = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == VALID_STARTING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          validStarting = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == VALID_UNTIL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          validUntil = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new TimeSynchronizationClusterDSTOffsetStruct(
+      offset,
+      validStarting,
+      validUntil
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1096,6 +2815,9 @@ public String toString() {
 public static class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct {
   public Long nodeID;
   public Integer endpoint;
+  private static final long NODE_I_D_ID = 0L;
+  private static final long ENDPOINT_ID = 1L;
+
   public TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(
     Long nodeID,
     Integer endpoint
@@ -1104,6 +2826,39 @@ public TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(
     this.endpoint = endpoint;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID)));
+    values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint)));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long nodeID = null;
+    Integer endpoint = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(
+      nodeID,
+      endpoint
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1122,6 +2877,10 @@ public static class TimeSynchronizationClusterTimeZoneStruct {
   public Long offset;
   public Long validAt;
   public Optional<String> name;
+  private static final long OFFSET_ID = 0L;
+  private static final long VALID_AT_ID = 1L;
+  private static final long NAME_ID = 2L;
+
   public TimeSynchronizationClusterTimeZoneStruct(
     Long offset,
     Long validAt,
@@ -1132,6 +2891,47 @@ public TimeSynchronizationClusterTimeZoneStruct(
     this.name = name;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OFFSET_ID, new IntType(offset)));
+    values.add(new StructElement(VALID_AT_ID, new UIntType(validAt)));
+    values.add(new StructElement(NAME_ID, name.<BaseTLVType>map((nonOptionalname) -> new StringType(nonOptionalname)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterTimeZoneStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long offset = null;
+    Long validAt = null;
+    Optional<String> name = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OFFSET_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          offset = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == VALID_AT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          validAt = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new TimeSynchronizationClusterTimeZoneStruct(
+      offset,
+      validAt,
+      name
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1153,6 +2953,10 @@ public static class TimeSynchronizationClusterTrustedTimeSourceStruct {
   public Integer fabricIndex;
   public Long nodeID;
   public Integer endpoint;
+  private static final long FABRIC_INDEX_ID = 0L;
+  private static final long NODE_I_D_ID = 1L;
+  private static final long ENDPOINT_ID = 2L;
+
   public TimeSynchronizationClusterTrustedTimeSourceStruct(
     Integer fabricIndex,
     Long nodeID,
@@ -1163,6 +2967,47 @@ public TimeSynchronizationClusterTrustedTimeSourceStruct(
     this.endpoint = endpoint;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+    values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID)));
+    values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint)));
+
+    return new StructType(values);
+  }
+
+  public static TimeSynchronizationClusterTrustedTimeSourceStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer fabricIndex = null;
+    Long nodeID = null;
+    Integer endpoint = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new TimeSynchronizationClusterTrustedTimeSourceStruct(
+      fabricIndex,
+      nodeID,
+      endpoint
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1183,6 +3028,9 @@ public String toString() {
 public static class BridgedDeviceBasicInformationClusterProductAppearanceStruct {
   public Integer finish;
   public @Nullable Integer primaryColor;
+  private static final long FINISH_ID = 0L;
+  private static final long PRIMARY_COLOR_ID = 1L;
+
   public BridgedDeviceBasicInformationClusterProductAppearanceStruct(
     Integer finish,
     @Nullable Integer primaryColor
@@ -1191,6 +3039,39 @@ public BridgedDeviceBasicInformationClusterProductAppearanceStruct(
     this.primaryColor = primaryColor;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FINISH_ID, new UIntType(finish)));
+    values.add(new StructElement(PRIMARY_COLOR_ID, primaryColor != null ? new UIntType(primaryColor) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static BridgedDeviceBasicInformationClusterProductAppearanceStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer finish = null;
+    @Nullable Integer primaryColor = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FINISH_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          finish = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PRIMARY_COLOR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          primaryColor = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new BridgedDeviceBasicInformationClusterProductAppearanceStruct(
+      finish,
+      primaryColor
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1212,6 +3093,13 @@ public static class OperationalCredentialsClusterFabricDescriptorStruct {
   public Long nodeID;
   public String label;
   public Integer fabricIndex;
+  private static final long ROOT_PUBLIC_KEY_ID = 1L;
+  private static final long VENDOR_I_D_ID = 2L;
+  private static final long FABRIC_I_D_ID = 3L;
+  private static final long NODE_I_D_ID = 4L;
+  private static final long LABEL_ID = 5L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public OperationalCredentialsClusterFabricDescriptorStruct(
     byte[] rootPublicKey,
     Integer vendorID,
@@ -1228,6 +3116,71 @@ public OperationalCredentialsClusterFabricDescriptorStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ROOT_PUBLIC_KEY_ID, new ByteArrayType(rootPublicKey)));
+    values.add(new StructElement(VENDOR_I_D_ID, new UIntType(vendorID)));
+    values.add(new StructElement(FABRIC_I_D_ID, new UIntType(fabricID)));
+    values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID)));
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static OperationalCredentialsClusterFabricDescriptorStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] rootPublicKey = null;
+    Integer vendorID = null;
+    Long fabricID = null;
+    Long nodeID = null;
+    String label = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ROOT_PUBLIC_KEY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          rootPublicKey = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == VENDOR_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          vendorID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new OperationalCredentialsClusterFabricDescriptorStruct(
+      rootPublicKey,
+      vendorID,
+      fabricID,
+      nodeID,
+      label,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1258,6 +3211,10 @@ public static class OperationalCredentialsClusterNOCStruct {
   public byte[] noc;
   public @Nullable byte[] icac;
   public Integer fabricIndex;
+  private static final long NOC_ID = 1L;
+  private static final long ICAC_ID = 2L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public OperationalCredentialsClusterNOCStruct(
     byte[] noc,
     @Nullable byte[] icac,
@@ -1268,6 +3225,47 @@ public OperationalCredentialsClusterNOCStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NOC_ID, new ByteArrayType(noc)));
+    values.add(new StructElement(ICAC_ID, icac != null ? new ByteArrayType(icac) : new NullType()));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static OperationalCredentialsClusterNOCStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] noc = null;
+    @Nullable byte[] icac = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NOC_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          noc = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == ICAC_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          icac = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new OperationalCredentialsClusterNOCStruct(
+      noc,
+      icac,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1290,6 +3288,11 @@ public static class GroupKeyManagementClusterGroupInfoMapStruct {
   public ArrayList<Integer> endpoints;
   public Optional<String> groupName;
   public Integer fabricIndex;
+  private static final long GROUP_ID_ID = 1L;
+  private static final long ENDPOINTS_ID = 2L;
+  private static final long GROUP_NAME_ID = 3L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public GroupKeyManagementClusterGroupInfoMapStruct(
     Integer groupId,
     ArrayList<Integer> endpoints,
@@ -1302,6 +3305,55 @@ public GroupKeyManagementClusterGroupInfoMapStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(GROUP_ID_ID, new UIntType(groupId)));
+    values.add(new StructElement(ENDPOINTS_ID, ArrayType.generateArrayType(endpoints, (elementendpoints) -> new UIntType(elementendpoints))));
+    values.add(new StructElement(GROUP_NAME_ID, groupName.<BaseTLVType>map((nonOptionalgroupName) -> new StringType(nonOptionalgroupName)).orElse(new EmptyType())));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static GroupKeyManagementClusterGroupInfoMapStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer groupId = null;
+    ArrayList<Integer> endpoints = null;
+    Optional<String> groupName = Optional.empty();
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == GROUP_ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupId = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ENDPOINTS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          endpoints = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == GROUP_NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          groupName = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GroupKeyManagementClusterGroupInfoMapStruct(
+      groupId,
+      endpoints,
+      groupName,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1326,6 +3378,10 @@ public static class GroupKeyManagementClusterGroupKeyMapStruct {
   public Integer groupId;
   public Integer groupKeySetID;
   public Integer fabricIndex;
+  private static final long GROUP_ID_ID = 1L;
+  private static final long GROUP_KEY_SET_I_D_ID = 2L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public GroupKeyManagementClusterGroupKeyMapStruct(
     Integer groupId,
     Integer groupKeySetID,
@@ -1336,6 +3392,47 @@ public GroupKeyManagementClusterGroupKeyMapStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(GROUP_ID_ID, new UIntType(groupId)));
+    values.add(new StructElement(GROUP_KEY_SET_I_D_ID, new UIntType(groupKeySetID)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static GroupKeyManagementClusterGroupKeyMapStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer groupId = null;
+    Integer groupKeySetID = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == GROUP_ID_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupId = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == GROUP_KEY_SET_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupKeySetID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GroupKeyManagementClusterGroupKeyMapStruct(
+      groupId,
+      groupKeySetID,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1362,6 +3459,15 @@ public static class GroupKeyManagementClusterGroupKeySetStruct {
   public @Nullable Long epochStartTime1;
   public @Nullable byte[] epochKey2;
   public @Nullable Long epochStartTime2;
+  private static final long GROUP_KEY_SET_I_D_ID = 0L;
+  private static final long GROUP_KEY_SECURITY_POLICY_ID = 1L;
+  private static final long EPOCH_KEY0_ID = 2L;
+  private static final long EPOCH_START_TIME0_ID = 3L;
+  private static final long EPOCH_KEY1_ID = 4L;
+  private static final long EPOCH_START_TIME1_ID = 5L;
+  private static final long EPOCH_KEY2_ID = 6L;
+  private static final long EPOCH_START_TIME2_ID = 7L;
+
   public GroupKeyManagementClusterGroupKeySetStruct(
     Integer groupKeySetID,
     Integer groupKeySecurityPolicy,
@@ -1382,6 +3488,87 @@ public GroupKeyManagementClusterGroupKeySetStruct(
     this.epochStartTime2 = epochStartTime2;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(GROUP_KEY_SET_I_D_ID, new UIntType(groupKeySetID)));
+    values.add(new StructElement(GROUP_KEY_SECURITY_POLICY_ID, new UIntType(groupKeySecurityPolicy)));
+    values.add(new StructElement(EPOCH_KEY0_ID, epochKey0 != null ? new ByteArrayType(epochKey0) : new NullType()));
+    values.add(new StructElement(EPOCH_START_TIME0_ID, epochStartTime0 != null ? new UIntType(epochStartTime0) : new NullType()));
+    values.add(new StructElement(EPOCH_KEY1_ID, epochKey1 != null ? new ByteArrayType(epochKey1) : new NullType()));
+    values.add(new StructElement(EPOCH_START_TIME1_ID, epochStartTime1 != null ? new UIntType(epochStartTime1) : new NullType()));
+    values.add(new StructElement(EPOCH_KEY2_ID, epochKey2 != null ? new ByteArrayType(epochKey2) : new NullType()));
+    values.add(new StructElement(EPOCH_START_TIME2_ID, epochStartTime2 != null ? new UIntType(epochStartTime2) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static GroupKeyManagementClusterGroupKeySetStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer groupKeySetID = null;
+    Integer groupKeySecurityPolicy = null;
+    @Nullable byte[] epochKey0 = null;
+    @Nullable Long epochStartTime0 = null;
+    @Nullable byte[] epochKey1 = null;
+    @Nullable Long epochStartTime1 = null;
+    @Nullable byte[] epochKey2 = null;
+    @Nullable Long epochStartTime2 = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == GROUP_KEY_SET_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupKeySetID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == GROUP_KEY_SECURITY_POLICY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupKeySecurityPolicy = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == EPOCH_KEY0_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          epochKey0 = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == EPOCH_START_TIME0_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          epochStartTime0 = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == EPOCH_KEY1_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          epochKey1 = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == EPOCH_START_TIME1_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          epochStartTime1 = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == EPOCH_KEY2_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          epochKey2 = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == EPOCH_START_TIME2_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          epochStartTime2 = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new GroupKeyManagementClusterGroupKeySetStruct(
+      groupKeySetID,
+      groupKeySecurityPolicy,
+      epochKey0,
+      epochStartTime0,
+      epochKey1,
+      epochStartTime1,
+      epochKey2,
+      epochStartTime2
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1417,6 +3604,9 @@ public String toString() {
 public static class FixedLabelClusterLabelStruct {
   public String label;
   public String value;
+  private static final long LABEL_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public FixedLabelClusterLabelStruct(
     String label,
     String value
@@ -1425,6 +3615,39 @@ public FixedLabelClusterLabelStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(VALUE_ID, new StringType(value)));
+
+    return new StructType(values);
+  }
+
+  public static FixedLabelClusterLabelStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    String value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          value = castingValue.value(String.class);
+        }
+      }
+    }
+    return new FixedLabelClusterLabelStruct(
+      label,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1442,6 +3665,9 @@ public String toString() {
 public static class UserLabelClusterLabelStruct {
   public String label;
   public String value;
+  private static final long LABEL_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public UserLabelClusterLabelStruct(
     String label,
     String value
@@ -1450,9 +3676,42 @@ public UserLabelClusterLabelStruct(
     this.value = value;
   }
 
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(VALUE_ID, new StringType(value)));
+
+    return new StructType(values);
+  }
+
+  public static UserLabelClusterLabelStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    String value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          value = castingValue.value(String.class);
+        }
+      }
+    }
+    return new UserLabelClusterLabelStruct(
+      label,
+      value
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
     output.append("UserLabelClusterLabelStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
@@ -1468,6 +3727,10 @@ public static class IcdManagementClusterMonitoringRegistrationStruct {
   public Long checkInNodeID;
   public Long monitoredSubject;
   public Integer fabricIndex;
+  private static final long CHECK_IN_NODE_I_D_ID = 1L;
+  private static final long MONITORED_SUBJECT_ID = 2L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public IcdManagementClusterMonitoringRegistrationStruct(
     Long checkInNodeID,
     Long monitoredSubject,
@@ -1478,6 +3741,47 @@ public IcdManagementClusterMonitoringRegistrationStruct(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CHECK_IN_NODE_I_D_ID, new UIntType(checkInNodeID)));
+    values.add(new StructElement(MONITORED_SUBJECT_ID, new UIntType(monitoredSubject)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static IcdManagementClusterMonitoringRegistrationStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long checkInNodeID = null;
+    Long monitoredSubject = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CHECK_IN_NODE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          checkInNodeID = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == MONITORED_SUBJECT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          monitoredSubject = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new IcdManagementClusterMonitoringRegistrationStruct(
+      checkInNodeID,
+      monitoredSubject,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1495,9 +3799,286 @@ public String toString() {
     return output.toString();
   }
 }
+public static class OvenCavityOperationalStateClusterErrorStateStruct {
+  public Integer errorStateID;
+  public Optional<String> errorStateLabel;
+  public Optional<String> errorStateDetails;
+  private static final long ERROR_STATE_I_D_ID = 0L;
+  private static final long ERROR_STATE_LABEL_ID = 1L;
+  private static final long ERROR_STATE_DETAILS_ID = 2L;
+
+  public OvenCavityOperationalStateClusterErrorStateStruct(
+    Integer errorStateID,
+    Optional<String> errorStateLabel,
+    Optional<String> errorStateDetails
+  ) {
+    this.errorStateID = errorStateID;
+    this.errorStateLabel = errorStateLabel;
+    this.errorStateDetails = errorStateDetails;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID)));
+    values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.<BaseTLVType>map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType())));
+    values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.<BaseTLVType>map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static OvenCavityOperationalStateClusterErrorStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer errorStateID = null;
+    Optional<String> errorStateLabel = Optional.empty();
+    Optional<String> errorStateDetails = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          errorStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_DETAILS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateDetails = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new OvenCavityOperationalStateClusterErrorStateStruct(
+      errorStateID,
+      errorStateLabel,
+      errorStateDetails
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OvenCavityOperationalStateClusterErrorStateStruct {\n");
+    output.append("\terrorStateID: ");
+    output.append(errorStateID);
+    output.append("\n");
+    output.append("\terrorStateLabel: ");
+    output.append(errorStateLabel);
+    output.append("\n");
+    output.append("\terrorStateDetails: ");
+    output.append(errorStateDetails);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class OvenCavityOperationalStateClusterOperationalStateStruct {
+  public Integer operationalStateID;
+  public Optional<String> operationalStateLabel;
+  private static final long OPERATIONAL_STATE_I_D_ID = 0L;
+  private static final long OPERATIONAL_STATE_LABEL_ID = 1L;
+
+  public OvenCavityOperationalStateClusterOperationalStateStruct(
+    Integer operationalStateID,
+    Optional<String> operationalStateLabel
+  ) {
+    this.operationalStateID = operationalStateID;
+    this.operationalStateLabel = operationalStateLabel;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID)));
+    values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.<BaseTLVType>map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static OvenCavityOperationalStateClusterOperationalStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer operationalStateID = null;
+    Optional<String> operationalStateLabel = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationalStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATIONAL_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          operationalStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new OvenCavityOperationalStateClusterOperationalStateStruct(
+      operationalStateID,
+      operationalStateLabel
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OvenCavityOperationalStateClusterOperationalStateStruct {\n");
+    output.append("\toperationalStateID: ");
+    output.append(operationalStateID);
+    output.append("\n");
+    output.append("\toperationalStateLabel: ");
+    output.append(operationalStateLabel);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class OvenModeClusterModeTagStruct {
+  public Optional<Integer> mfgCode;
+  public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
+  public OvenModeClusterModeTagStruct(
+    Optional<Integer> mfgCode,
+    Integer value
+  ) {
+    this.mfgCode = mfgCode;
+    this.value = value;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static OvenModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new OvenModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OvenModeClusterModeTagStruct {\n");
+    output.append("\tmfgCode: ");
+    output.append(mfgCode);
+    output.append("\n");
+    output.append("\tvalue: ");
+    output.append(value);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class OvenModeClusterModeOptionStruct {
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.OvenModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
+  public OvenModeClusterModeOptionStruct(
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.OvenModeClusterModeTagStruct> modeTags
+  ) {
+    this.label = label;
+    this.mode = mode;
+    this.modeTags = modeTags;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static OvenModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.OvenModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.OvenModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new OvenModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OvenModeClusterModeOptionStruct {\n");
+    output.append("\tlabel: ");
+    output.append(label);
+    output.append("\n");
+    output.append("\tmode: ");
+    output.append(mode);
+    output.append("\n");
+    output.append("\tmodeTags: ");
+    output.append(modeTags);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
 public static class ModeSelectClusterSemanticTagStruct {
   public Integer mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public ModeSelectClusterSemanticTagStruct(
     Integer mfgCode,
     Integer value
@@ -1506,6 +4087,39 @@ public ModeSelectClusterSemanticTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, new UIntType(mfgCode)));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static ModeSelectClusterSemanticTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer mfgCode = null;
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ModeSelectClusterSemanticTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1524,6 +4138,10 @@ public static class ModeSelectClusterModeOptionStruct {
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long SEMANTIC_TAGS_ID = 2L;
+
   public ModeSelectClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1534,6 +4152,47 @@ public ModeSelectClusterModeOptionStruct(
     this.semanticTags = semanticTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(SEMANTIC_TAGS_ID, ArrayType.generateArrayType(semanticTags, (elementsemanticTags) -> elementsemanticTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static ModeSelectClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == SEMANTIC_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          semanticTags = castingValue.map((elementcastingValue) -> ChipStructs.ModeSelectClusterSemanticTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new ModeSelectClusterModeOptionStruct(
+      label,
+      mode,
+      semanticTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1554,6 +4213,9 @@ public String toString() {
 public static class LaundryWasherModeClusterModeTagStruct {
   public Optional<Integer> mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public LaundryWasherModeClusterModeTagStruct(
     Optional<Integer> mfgCode,
     Integer value
@@ -1562,6 +4224,39 @@ public LaundryWasherModeClusterModeTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static LaundryWasherModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new LaundryWasherModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1580,6 +4275,10 @@ public static class LaundryWasherModeClusterModeOptionStruct {
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
   public LaundryWasherModeClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1590,6 +4289,47 @@ public LaundryWasherModeClusterModeOptionStruct(
     this.modeTags = modeTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static LaundryWasherModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.LaundryWasherModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new LaundryWasherModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1610,6 +4350,9 @@ public String toString() {
 public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {
   public Optional<Integer> mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(
     Optional<Integer> mfgCode,
     Integer value
@@ -1618,6 +4361,39 @@ public RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1636,6 +4412,10 @@ public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeOp
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
   public RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1646,6 +4426,47 @@ public RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
     this.modeTags = modeTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1666,6 +4487,9 @@ public String toString() {
 public static class RvcRunModeClusterModeTagStruct {
   public Optional<Integer> mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public RvcRunModeClusterModeTagStruct(
     Optional<Integer> mfgCode,
     Integer value
@@ -1674,6 +4498,39 @@ public RvcRunModeClusterModeTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static RvcRunModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new RvcRunModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1692,6 +4549,10 @@ public static class RvcRunModeClusterModeOptionStruct {
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
   public RvcRunModeClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1702,6 +4563,47 @@ public RvcRunModeClusterModeOptionStruct(
     this.modeTags = modeTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static RvcRunModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.RvcRunModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new RvcRunModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1722,6 +4624,9 @@ public String toString() {
 public static class RvcCleanModeClusterModeTagStruct {
   public Optional<Integer> mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public RvcCleanModeClusterModeTagStruct(
     Optional<Integer> mfgCode,
     Integer value
@@ -1730,6 +4635,39 @@ public RvcCleanModeClusterModeTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static RvcCleanModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new RvcCleanModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1748,6 +4686,10 @@ public static class RvcCleanModeClusterModeOptionStruct {
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
   public RvcCleanModeClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1758,6 +4700,47 @@ public RvcCleanModeClusterModeOptionStruct(
     this.modeTags = modeTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static RvcCleanModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.RvcCleanModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new RvcCleanModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1778,6 +4761,9 @@ public String toString() {
 public static class DishwasherModeClusterModeTagStruct {
   public Optional<Integer> mfgCode;
   public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public DishwasherModeClusterModeTagStruct(
     Optional<Integer> mfgCode,
     Integer value
@@ -1786,6 +4772,39 @@ public DishwasherModeClusterModeTagStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static DishwasherModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DishwasherModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1804,6 +4823,10 @@ public static class DishwasherModeClusterModeOptionStruct {
   public String label;
   public Integer mode;
   public ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
   public DishwasherModeClusterModeOptionStruct(
     String label,
     Integer mode,
@@ -1814,6 +4837,47 @@ public DishwasherModeClusterModeOptionStruct(
     this.modeTags = modeTags;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static DishwasherModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.DishwasherModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new DishwasherModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1831,10 +4895,151 @@ public String toString() {
     return output.toString();
   }
 }
+public static class MicrowaveOvenModeClusterModeTagStruct {
+  public Optional<Integer> mfgCode;
+  public Integer value;
+  private static final long MFG_CODE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
+  public MicrowaveOvenModeClusterModeTagStruct(
+    Optional<Integer> mfgCode,
+    Integer value
+  ) {
+    this.mfgCode = mfgCode;
+    this.value = value;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MFG_CODE_ID, mfgCode.<BaseTLVType>map((nonOptionalmfgCode) -> new UIntType(nonOptionalmfgCode)).orElse(new EmptyType())));
+    values.add(new StructElement(VALUE_ID, new UIntType(value)));
+
+    return new StructType(values);
+  }
+
+  public static MicrowaveOvenModeClusterModeTagStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<Integer> mfgCode = Optional.empty();
+    Integer value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MFG_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mfgCode = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          value = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new MicrowaveOvenModeClusterModeTagStruct(
+      mfgCode,
+      value
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("MicrowaveOvenModeClusterModeTagStruct {\n");
+    output.append("\tmfgCode: ");
+    output.append(mfgCode);
+    output.append("\n");
+    output.append("\tvalue: ");
+    output.append(value);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class MicrowaveOvenModeClusterModeOptionStruct {
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.MicrowaveOvenModeClusterModeTagStruct> modeTags;
+  private static final long LABEL_ID = 0L;
+  private static final long MODE_ID = 1L;
+  private static final long MODE_TAGS_ID = 2L;
+
+  public MicrowaveOvenModeClusterModeOptionStruct(
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.MicrowaveOvenModeClusterModeTagStruct> modeTags
+  ) {
+    this.label = label;
+    this.mode = mode;
+    this.modeTags = modeTags;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LABEL_ID, new StringType(label)));
+    values.add(new StructElement(MODE_ID, new UIntType(mode)));
+    values.add(new StructElement(MODE_TAGS_ID, ArrayType.generateArrayType(modeTags, (elementmodeTags) -> elementmodeTags.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static MicrowaveOvenModeClusterModeOptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String label = null;
+    Integer mode = null;
+    ArrayList<ChipStructs.MicrowaveOvenModeClusterModeTagStruct> modeTags = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          label = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == MODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          mode = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MODE_TAGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          modeTags = castingValue.map((elementcastingValue) -> ChipStructs.MicrowaveOvenModeClusterModeTagStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new MicrowaveOvenModeClusterModeOptionStruct(
+      label,
+      mode,
+      modeTags
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("MicrowaveOvenModeClusterModeOptionStruct {\n");
+    output.append("\tlabel: ");
+    output.append(label);
+    output.append("\n");
+    output.append("\tmode: ");
+    output.append(mode);
+    output.append("\n");
+    output.append("\tmodeTags: ");
+    output.append(modeTags);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
 public static class OperationalStateClusterErrorStateStruct {
   public Integer errorStateID;
   public Optional<String> errorStateLabel;
   public Optional<String> errorStateDetails;
+  private static final long ERROR_STATE_I_D_ID = 0L;
+  private static final long ERROR_STATE_LABEL_ID = 1L;
+  private static final long ERROR_STATE_DETAILS_ID = 2L;
+
   public OperationalStateClusterErrorStateStruct(
     Integer errorStateID,
     Optional<String> errorStateLabel,
@@ -1845,6 +5050,47 @@ public OperationalStateClusterErrorStateStruct(
     this.errorStateDetails = errorStateDetails;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID)));
+    values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.<BaseTLVType>map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType())));
+    values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.<BaseTLVType>map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static OperationalStateClusterErrorStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer errorStateID = null;
+    Optional<String> errorStateLabel = Optional.empty();
+    Optional<String> errorStateDetails = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          errorStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_DETAILS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateDetails = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new OperationalStateClusterErrorStateStruct(
+      errorStateID,
+      errorStateLabel,
+      errorStateDetails
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -1865,6 +5111,9 @@ public String toString() {
 public static class OperationalStateClusterOperationalStateStruct {
   public Integer operationalStateID;
   public Optional<String> operationalStateLabel;
+  private static final long OPERATIONAL_STATE_I_D_ID = 0L;
+  private static final long OPERATIONAL_STATE_LABEL_ID = 1L;
+
   public OperationalStateClusterOperationalStateStruct(
     Integer operationalStateID,
     Optional<String> operationalStateLabel
@@ -1873,121 +5122,1051 @@ public OperationalStateClusterOperationalStateStruct(
     this.operationalStateLabel = operationalStateLabel;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID)));
+    values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.<BaseTLVType>map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static OperationalStateClusterOperationalStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer operationalStateID = null;
+    Optional<String> operationalStateLabel = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationalStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATIONAL_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          operationalStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new OperationalStateClusterOperationalStateStruct(
+      operationalStateID,
+      operationalStateLabel
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("OperationalStateClusterOperationalStateStruct {\n");
+    output.append("\toperationalStateID: ");
+    output.append(operationalStateID);
+    output.append("\n");
+    output.append("\toperationalStateLabel: ");
+    output.append(operationalStateLabel);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class RvcOperationalStateClusterErrorStateStruct {
+  public Integer errorStateID;
+  public Optional<String> errorStateLabel;
+  public Optional<String> errorStateDetails;
+  private static final long ERROR_STATE_I_D_ID = 0L;
+  private static final long ERROR_STATE_LABEL_ID = 1L;
+  private static final long ERROR_STATE_DETAILS_ID = 2L;
+
+  public RvcOperationalStateClusterErrorStateStruct(
+    Integer errorStateID,
+    Optional<String> errorStateLabel,
+    Optional<String> errorStateDetails
+  ) {
+    this.errorStateID = errorStateID;
+    this.errorStateLabel = errorStateLabel;
+    this.errorStateDetails = errorStateDetails;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID)));
+    values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.<BaseTLVType>map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType())));
+    values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.<BaseTLVType>map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static RvcOperationalStateClusterErrorStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer errorStateID = null;
+    Optional<String> errorStateLabel = Optional.empty();
+    Optional<String> errorStateDetails = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == ERROR_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          errorStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == ERROR_STATE_DETAILS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          errorStateDetails = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new RvcOperationalStateClusterErrorStateStruct(
+      errorStateID,
+      errorStateLabel,
+      errorStateDetails
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("RvcOperationalStateClusterErrorStateStruct {\n");
+    output.append("\terrorStateID: ");
+    output.append(errorStateID);
+    output.append("\n");
+    output.append("\terrorStateLabel: ");
+    output.append(errorStateLabel);
+    output.append("\n");
+    output.append("\terrorStateDetails: ");
+    output.append(errorStateDetails);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class RvcOperationalStateClusterOperationalStateStruct {
+  public Integer operationalStateID;
+  public Optional<String> operationalStateLabel;
+  private static final long OPERATIONAL_STATE_I_D_ID = 0L;
+  private static final long OPERATIONAL_STATE_LABEL_ID = 1L;
+
+  public RvcOperationalStateClusterOperationalStateStruct(
+    Integer operationalStateID,
+    Optional<String> operationalStateLabel
+  ) {
+    this.operationalStateID = operationalStateID;
+    this.operationalStateLabel = operationalStateLabel;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID)));
+    values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.<BaseTLVType>map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static RvcOperationalStateClusterOperationalStateStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer operationalStateID = null;
+    Optional<String> operationalStateLabel = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          operationalStateID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPERATIONAL_STATE_LABEL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          operationalStateLabel = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new RvcOperationalStateClusterOperationalStateStruct(
+      operationalStateID,
+      operationalStateLabel
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("RvcOperationalStateClusterOperationalStateStruct {\n");
+    output.append("\toperationalStateID: ");
+    output.append(operationalStateID);
+    output.append("\n");
+    output.append("\toperationalStateLabel: ");
+    output.append(operationalStateLabel);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class HepaFilterMonitoringClusterReplacementProductStruct {
+  public Integer productIdentifierType;
+  public String productIdentifierValue;
+  private static final long PRODUCT_IDENTIFIER_TYPE_ID = 0L;
+  private static final long PRODUCT_IDENTIFIER_VALUE_ID = 1L;
+
+  public HepaFilterMonitoringClusterReplacementProductStruct(
+    Integer productIdentifierType,
+    String productIdentifierValue
+  ) {
+    this.productIdentifierType = productIdentifierType;
+    this.productIdentifierValue = productIdentifierValue;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PRODUCT_IDENTIFIER_TYPE_ID, new UIntType(productIdentifierType)));
+    values.add(new StructElement(PRODUCT_IDENTIFIER_VALUE_ID, new StringType(productIdentifierValue)));
+
+    return new StructType(values);
+  }
+
+  public static HepaFilterMonitoringClusterReplacementProductStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer productIdentifierType = null;
+    String productIdentifierValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PRODUCT_IDENTIFIER_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          productIdentifierType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PRODUCT_IDENTIFIER_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          productIdentifierValue = castingValue.value(String.class);
+        }
+      }
+    }
+    return new HepaFilterMonitoringClusterReplacementProductStruct(
+      productIdentifierType,
+      productIdentifierValue
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("HepaFilterMonitoringClusterReplacementProductStruct {\n");
+    output.append("\tproductIdentifierType: ");
+    output.append(productIdentifierType);
+    output.append("\n");
+    output.append("\tproductIdentifierValue: ");
+    output.append(productIdentifierValue);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {
+  public Integer productIdentifierType;
+  public String productIdentifierValue;
+  private static final long PRODUCT_IDENTIFIER_TYPE_ID = 0L;
+  private static final long PRODUCT_IDENTIFIER_VALUE_ID = 1L;
+
+  public ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
+    Integer productIdentifierType,
+    String productIdentifierValue
+  ) {
+    this.productIdentifierType = productIdentifierType;
+    this.productIdentifierValue = productIdentifierValue;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PRODUCT_IDENTIFIER_TYPE_ID, new UIntType(productIdentifierType)));
+    values.add(new StructElement(PRODUCT_IDENTIFIER_VALUE_ID, new StringType(productIdentifierValue)));
+
+    return new StructType(values);
+  }
+
+  public static ActivatedCarbonFilterMonitoringClusterReplacementProductStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer productIdentifierType = null;
+    String productIdentifierValue = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PRODUCT_IDENTIFIER_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          productIdentifierType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == PRODUCT_IDENTIFIER_VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          productIdentifierValue = castingValue.value(String.class);
+        }
+      }
+    }
+    return new ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
+      productIdentifierType,
+      productIdentifierValue
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {\n");
+    output.append("\tproductIdentifierType: ");
+    output.append(productIdentifierType);
+    output.append("\n");
+    output.append("\tproductIdentifierValue: ");
+    output.append(productIdentifierValue);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterHeatingSourceControlStruct {
+  public Integer heatingSource;
+  private static final long HEATING_SOURCE_ID = 0L;
+
+  public DemandResponseLoadControlClusterHeatingSourceControlStruct(
+    Integer heatingSource
+  ) {
+    this.heatingSource = heatingSource;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(HEATING_SOURCE_ID, new UIntType(heatingSource)));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterHeatingSourceControlStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer heatingSource = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == HEATING_SOURCE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          heatingSource = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterHeatingSourceControlStruct(
+      heatingSource
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("DemandResponseLoadControlClusterHeatingSourceControlStruct {\n");
+    output.append("\theatingSource: ");
+    output.append(heatingSource);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterPowerSavingsControlStruct {
+  public Integer powerSavings;
+  private static final long POWER_SAVINGS_ID = 0L;
+
+  public DemandResponseLoadControlClusterPowerSavingsControlStruct(
+    Integer powerSavings
+  ) {
+    this.powerSavings = powerSavings;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(POWER_SAVINGS_ID, new UIntType(powerSavings)));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterPowerSavingsControlStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer powerSavings = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == POWER_SAVINGS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          powerSavings = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterPowerSavingsControlStruct(
+      powerSavings
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("DemandResponseLoadControlClusterPowerSavingsControlStruct {\n");
+    output.append("\tpowerSavings: ");
+    output.append(powerSavings);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterDutyCycleControlStruct {
+  public Integer dutyCycle;
+  private static final long DUTY_CYCLE_ID = 0L;
+
+  public DemandResponseLoadControlClusterDutyCycleControlStruct(
+    Integer dutyCycle
+  ) {
+    this.dutyCycle = dutyCycle;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(DUTY_CYCLE_ID, new UIntType(dutyCycle)));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterDutyCycleControlStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer dutyCycle = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == DUTY_CYCLE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          dutyCycle = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterDutyCycleControlStruct(
+      dutyCycle
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("DemandResponseLoadControlClusterDutyCycleControlStruct {\n");
+    output.append("\tdutyCycle: ");
+    output.append(dutyCycle);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterAverageLoadControlStruct {
+  public Integer loadAdjustment;
+  private static final long LOAD_ADJUSTMENT_ID = 0L;
+
+  public DemandResponseLoadControlClusterAverageLoadControlStruct(
+    Integer loadAdjustment
+  ) {
+    this.loadAdjustment = loadAdjustment;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(LOAD_ADJUSTMENT_ID, new IntType(loadAdjustment)));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterAverageLoadControlStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer loadAdjustment = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == LOAD_ADJUSTMENT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          loadAdjustment = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterAverageLoadControlStruct(
+      loadAdjustment
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("DemandResponseLoadControlClusterAverageLoadControlStruct {\n");
+    output.append("\tloadAdjustment: ");
+    output.append(loadAdjustment);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class DemandResponseLoadControlClusterTemperatureControlStruct {
+  public @Nullable Optional<Integer> coolingTempOffset;
+  public @Nullable Optional<Integer> heatingtTempOffset;
+  public @Nullable Optional<Integer> coolingTempSetpoint;
+  public @Nullable Optional<Integer> heatingTempSetpoint;
+  private static final long COOLING_TEMP_OFFSET_ID = 0L;
+  private static final long HEATINGT_TEMP_OFFSET_ID = 1L;
+  private static final long COOLING_TEMP_SETPOINT_ID = 2L;
+  private static final long HEATING_TEMP_SETPOINT_ID = 3L;
+
+  public DemandResponseLoadControlClusterTemperatureControlStruct(
+    @Nullable Optional<Integer> coolingTempOffset,
+    @Nullable Optional<Integer> heatingtTempOffset,
+    @Nullable Optional<Integer> coolingTempSetpoint,
+    @Nullable Optional<Integer> heatingTempSetpoint
+  ) {
+    this.coolingTempOffset = coolingTempOffset;
+    this.heatingtTempOffset = heatingtTempOffset;
+    this.coolingTempSetpoint = coolingTempSetpoint;
+    this.heatingTempSetpoint = heatingTempSetpoint;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(COOLING_TEMP_OFFSET_ID, coolingTempOffset != null ? coolingTempOffset.<BaseTLVType>map((nonOptionalcoolingTempOffset) -> new UIntType(nonOptionalcoolingTempOffset)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(HEATINGT_TEMP_OFFSET_ID, heatingtTempOffset != null ? heatingtTempOffset.<BaseTLVType>map((nonOptionalheatingtTempOffset) -> new UIntType(nonOptionalheatingtTempOffset)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(COOLING_TEMP_SETPOINT_ID, coolingTempSetpoint != null ? coolingTempSetpoint.<BaseTLVType>map((nonOptionalcoolingTempSetpoint) -> new IntType(nonOptionalcoolingTempSetpoint)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(HEATING_TEMP_SETPOINT_ID, heatingTempSetpoint != null ? heatingTempSetpoint.<BaseTLVType>map((nonOptionalheatingTempSetpoint) -> new IntType(nonOptionalheatingTempSetpoint)).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterTemperatureControlStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Optional<Integer> coolingTempOffset = null;
+    @Nullable Optional<Integer> heatingtTempOffset = null;
+    @Nullable Optional<Integer> coolingTempSetpoint = null;
+    @Nullable Optional<Integer> heatingTempSetpoint = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == COOLING_TEMP_OFFSET_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          coolingTempOffset = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == HEATINGT_TEMP_OFFSET_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          heatingtTempOffset = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == COOLING_TEMP_SETPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          coolingTempSetpoint = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == HEATING_TEMP_SETPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          heatingTempSetpoint = Optional.of(castingValue.value(Integer.class));
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterTemperatureControlStruct(
+      coolingTempOffset,
+      heatingtTempOffset,
+      coolingTempSetpoint,
+      heatingTempSetpoint
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("OperationalStateClusterOperationalStateStruct {\n");
-    output.append("\toperationalStateID: ");
-    output.append(operationalStateID);
+    output.append("DemandResponseLoadControlClusterTemperatureControlStruct {\n");
+    output.append("\tcoolingTempOffset: ");
+    output.append(coolingTempOffset);
     output.append("\n");
-    output.append("\toperationalStateLabel: ");
-    output.append(operationalStateLabel);
+    output.append("\theatingtTempOffset: ");
+    output.append(heatingtTempOffset);
+    output.append("\n");
+    output.append("\tcoolingTempSetpoint: ");
+    output.append(coolingTempSetpoint);
+    output.append("\n");
+    output.append("\theatingTempSetpoint: ");
+    output.append(heatingTempSetpoint);
     output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-public static class RvcOperationalStateClusterErrorStateStruct {
-  public Integer errorStateID;
-  public Optional<String> errorStateLabel;
-  public Optional<String> errorStateDetails;
-  public RvcOperationalStateClusterErrorStateStruct(
-    Integer errorStateID,
-    Optional<String> errorStateLabel,
-    Optional<String> errorStateDetails
+public static class DemandResponseLoadControlClusterLoadControlEventTransitionStruct {
+  public Integer duration;
+  public Integer control;
+  public Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl;
+  public Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl;
+  public Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl;
+  public Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl;
+  public Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl;
+  private static final long DURATION_ID = 0L;
+  private static final long CONTROL_ID = 1L;
+  private static final long TEMPERATURE_CONTROL_ID = 2L;
+  private static final long AVERAGE_LOAD_CONTROL_ID = 3L;
+  private static final long DUTY_CYCLE_CONTROL_ID = 4L;
+  private static final long POWER_SAVINGS_CONTROL_ID = 5L;
+  private static final long HEATING_SOURCE_CONTROL_ID = 6L;
+
+  public DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+    Integer duration,
+    Integer control,
+    Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl,
+    Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl,
+    Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl,
+    Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl,
+    Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl
   ) {
-    this.errorStateID = errorStateID;
-    this.errorStateLabel = errorStateLabel;
-    this.errorStateDetails = errorStateDetails;
+    this.duration = duration;
+    this.control = control;
+    this.temperatureControl = temperatureControl;
+    this.averageLoadControl = averageLoadControl;
+    this.dutyCycleControl = dutyCycleControl;
+    this.powerSavingsControl = powerSavingsControl;
+    this.heatingSourceControl = heatingSourceControl;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(DURATION_ID, new UIntType(duration)));
+    values.add(new StructElement(CONTROL_ID, new UIntType(control)));
+    values.add(new StructElement(TEMPERATURE_CONTROL_ID, temperatureControl.<BaseTLVType>map((nonOptionaltemperatureControl) -> nonOptionaltemperatureControl.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(AVERAGE_LOAD_CONTROL_ID, averageLoadControl.<BaseTLVType>map((nonOptionalaverageLoadControl) -> nonOptionalaverageLoadControl.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(DUTY_CYCLE_CONTROL_ID, dutyCycleControl.<BaseTLVType>map((nonOptionaldutyCycleControl) -> nonOptionaldutyCycleControl.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(POWER_SAVINGS_CONTROL_ID, powerSavingsControl.<BaseTLVType>map((nonOptionalpowerSavingsControl) -> nonOptionalpowerSavingsControl.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(HEATING_SOURCE_CONTROL_ID, heatingSourceControl.<BaseTLVType>map((nonOptionalheatingSourceControl) -> nonOptionalheatingSourceControl.encodeTlv()).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterLoadControlEventTransitionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer duration = null;
+    Integer control = null;
+    Optional<ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct> temperatureControl = Optional.empty();
+    Optional<ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct> averageLoadControl = Optional.empty();
+    Optional<ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct> dutyCycleControl = Optional.empty();
+    Optional<ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct> powerSavingsControl = Optional.empty();
+    Optional<ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct> heatingSourceControl = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == DURATION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          duration = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          control = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TEMPERATURE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          temperatureControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterTemperatureControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == AVERAGE_LOAD_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          averageLoadControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterAverageLoadControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == DUTY_CYCLE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          dutyCycleControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterDutyCycleControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == POWER_SAVINGS_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          powerSavingsControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterPowerSavingsControlStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == HEATING_SOURCE_CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          heatingSourceControl = Optional.of(ChipStructs.DemandResponseLoadControlClusterHeatingSourceControlStruct.decodeTlv(castingValue));
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+      duration,
+      control,
+      temperatureControl,
+      averageLoadControl,
+      dutyCycleControl,
+      powerSavingsControl,
+      heatingSourceControl
+    );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("RvcOperationalStateClusterErrorStateStruct {\n");
-    output.append("\terrorStateID: ");
-    output.append(errorStateID);
+    output.append("DemandResponseLoadControlClusterLoadControlEventTransitionStruct {\n");
+    output.append("\tduration: ");
+    output.append(duration);
     output.append("\n");
-    output.append("\terrorStateLabel: ");
-    output.append(errorStateLabel);
+    output.append("\tcontrol: ");
+    output.append(control);
     output.append("\n");
-    output.append("\terrorStateDetails: ");
-    output.append(errorStateDetails);
+    output.append("\ttemperatureControl: ");
+    output.append(temperatureControl);
+    output.append("\n");
+    output.append("\taverageLoadControl: ");
+    output.append(averageLoadControl);
+    output.append("\n");
+    output.append("\tdutyCycleControl: ");
+    output.append(dutyCycleControl);
+    output.append("\n");
+    output.append("\tpowerSavingsControl: ");
+    output.append(powerSavingsControl);
+    output.append("\n");
+    output.append("\theatingSourceControl: ");
+    output.append(heatingSourceControl);
     output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-public static class RvcOperationalStateClusterOperationalStateStruct {
-  public Integer operationalStateID;
-  public Optional<String> operationalStateLabel;
-  public RvcOperationalStateClusterOperationalStateStruct(
-    Integer operationalStateID,
-    Optional<String> operationalStateLabel
+public static class DemandResponseLoadControlClusterLoadControlEventStruct {
+  public byte[] eventID;
+  public @Nullable byte[] programID;
+  public Integer control;
+  public Long deviceClass;
+  public Optional<Integer> enrollmentGroup;
+  public Integer criticality;
+  public @Nullable Long startTime;
+  public ArrayList<ChipStructs.DemandResponseLoadControlClusterLoadControlEventTransitionStruct> transitions;
+  private static final long EVENT_I_D_ID = 0L;
+  private static final long PROGRAM_I_D_ID = 1L;
+  private static final long CONTROL_ID = 2L;
+  private static final long DEVICE_CLASS_ID = 3L;
+  private static final long ENROLLMENT_GROUP_ID = 4L;
+  private static final long CRITICALITY_ID = 5L;
+  private static final long START_TIME_ID = 6L;
+  private static final long TRANSITIONS_ID = 7L;
+
+  public DemandResponseLoadControlClusterLoadControlEventStruct(
+    byte[] eventID,
+    @Nullable byte[] programID,
+    Integer control,
+    Long deviceClass,
+    Optional<Integer> enrollmentGroup,
+    Integer criticality,
+    @Nullable Long startTime,
+    ArrayList<ChipStructs.DemandResponseLoadControlClusterLoadControlEventTransitionStruct> transitions
   ) {
-    this.operationalStateID = operationalStateID;
-    this.operationalStateLabel = operationalStateLabel;
+    this.eventID = eventID;
+    this.programID = programID;
+    this.control = control;
+    this.deviceClass = deviceClass;
+    this.enrollmentGroup = enrollmentGroup;
+    this.criticality = criticality;
+    this.startTime = startTime;
+    this.transitions = transitions;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(EVENT_I_D_ID, new ByteArrayType(eventID)));
+    values.add(new StructElement(PROGRAM_I_D_ID, programID != null ? new ByteArrayType(programID) : new NullType()));
+    values.add(new StructElement(CONTROL_ID, new UIntType(control)));
+    values.add(new StructElement(DEVICE_CLASS_ID, new UIntType(deviceClass)));
+    values.add(new StructElement(ENROLLMENT_GROUP_ID, enrollmentGroup.<BaseTLVType>map((nonOptionalenrollmentGroup) -> new UIntType(nonOptionalenrollmentGroup)).orElse(new EmptyType())));
+    values.add(new StructElement(CRITICALITY_ID, new UIntType(criticality)));
+    values.add(new StructElement(START_TIME_ID, startTime != null ? new UIntType(startTime) : new NullType()));
+    values.add(new StructElement(TRANSITIONS_ID, ArrayType.generateArrayType(transitions, (elementtransitions) -> elementtransitions.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterLoadControlEventStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] eventID = null;
+    @Nullable byte[] programID = null;
+    Integer control = null;
+    Long deviceClass = null;
+    Optional<Integer> enrollmentGroup = Optional.empty();
+    Integer criticality = null;
+    @Nullable Long startTime = null;
+    ArrayList<ChipStructs.DemandResponseLoadControlClusterLoadControlEventTransitionStruct> transitions = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == EVENT_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          eventID = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == PROGRAM_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          programID = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == CONTROL_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          control = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == DEVICE_CLASS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          deviceClass = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == ENROLLMENT_GROUP_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          enrollmentGroup = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == CRITICALITY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          criticality = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == START_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          startTime = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == TRANSITIONS_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          transitions = castingValue.map((elementcastingValue) -> ChipStructs.DemandResponseLoadControlClusterLoadControlEventTransitionStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterLoadControlEventStruct(
+      eventID,
+      programID,
+      control,
+      deviceClass,
+      enrollmentGroup,
+      criticality,
+      startTime,
+      transitions
+    );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("RvcOperationalStateClusterOperationalStateStruct {\n");
-    output.append("\toperationalStateID: ");
-    output.append(operationalStateID);
+    output.append("DemandResponseLoadControlClusterLoadControlEventStruct {\n");
+    output.append("\teventID: ");
+    output.append(Arrays.toString(eventID));
     output.append("\n");
-    output.append("\toperationalStateLabel: ");
-    output.append(operationalStateLabel);
+    output.append("\tprogramID: ");
+    output.append(Arrays.toString(programID));
+    output.append("\n");
+    output.append("\tcontrol: ");
+    output.append(control);
+    output.append("\n");
+    output.append("\tdeviceClass: ");
+    output.append(deviceClass);
+    output.append("\n");
+    output.append("\tenrollmentGroup: ");
+    output.append(enrollmentGroup);
+    output.append("\n");
+    output.append("\tcriticality: ");
+    output.append(criticality);
+    output.append("\n");
+    output.append("\tstartTime: ");
+    output.append(startTime);
+    output.append("\n");
+    output.append("\ttransitions: ");
+    output.append(transitions);
     output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-public static class HepaFilterMonitoringClusterReplacementProductStruct {
-  public Integer productIdentifierType;
-  public String productIdentifierValue;
-  public HepaFilterMonitoringClusterReplacementProductStruct(
-    Integer productIdentifierType,
-    String productIdentifierValue
+public static class DemandResponseLoadControlClusterLoadControlProgramStruct {
+  public byte[] programID;
+  public String name;
+  public @Nullable Integer enrollmentGroup;
+  public @Nullable Integer randomStartMinutes;
+  public @Nullable Integer randomDurationMinutes;
+  private static final long PROGRAM_I_D_ID = 0L;
+  private static final long NAME_ID = 1L;
+  private static final long ENROLLMENT_GROUP_ID = 2L;
+  private static final long RANDOM_START_MINUTES_ID = 3L;
+  private static final long RANDOM_DURATION_MINUTES_ID = 4L;
+
+  public DemandResponseLoadControlClusterLoadControlProgramStruct(
+    byte[] programID,
+    String name,
+    @Nullable Integer enrollmentGroup,
+    @Nullable Integer randomStartMinutes,
+    @Nullable Integer randomDurationMinutes
   ) {
-    this.productIdentifierType = productIdentifierType;
-    this.productIdentifierValue = productIdentifierValue;
+    this.programID = programID;
+    this.name = name;
+    this.enrollmentGroup = enrollmentGroup;
+    this.randomStartMinutes = randomStartMinutes;
+    this.randomDurationMinutes = randomDurationMinutes;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PROGRAM_I_D_ID, new ByteArrayType(programID)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(ENROLLMENT_GROUP_ID, enrollmentGroup != null ? new UIntType(enrollmentGroup) : new NullType()));
+    values.add(new StructElement(RANDOM_START_MINUTES_ID, randomStartMinutes != null ? new UIntType(randomStartMinutes) : new NullType()));
+    values.add(new StructElement(RANDOM_DURATION_MINUTES_ID, randomDurationMinutes != null ? new UIntType(randomDurationMinutes) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static DemandResponseLoadControlClusterLoadControlProgramStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    byte[] programID = null;
+    String name = null;
+    @Nullable Integer enrollmentGroup = null;
+    @Nullable Integer randomStartMinutes = null;
+    @Nullable Integer randomDurationMinutes = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PROGRAM_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          programID = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == ENROLLMENT_GROUP_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          enrollmentGroup = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == RANDOM_START_MINUTES_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          randomStartMinutes = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == RANDOM_DURATION_MINUTES_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          randomDurationMinutes = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DemandResponseLoadControlClusterLoadControlProgramStruct(
+      programID,
+      name,
+      enrollmentGroup,
+      randomStartMinutes,
+      randomDurationMinutes
+    );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("HepaFilterMonitoringClusterReplacementProductStruct {\n");
-    output.append("\tproductIdentifierType: ");
-    output.append(productIdentifierType);
+    output.append("DemandResponseLoadControlClusterLoadControlProgramStruct {\n");
+    output.append("\tprogramID: ");
+    output.append(Arrays.toString(programID));
     output.append("\n");
-    output.append("\tproductIdentifierValue: ");
-    output.append(productIdentifierValue);
+    output.append("\tname: ");
+    output.append(name);
+    output.append("\n");
+    output.append("\tenrollmentGroup: ");
+    output.append(enrollmentGroup);
+    output.append("\n");
+    output.append("\trandomStartMinutes: ");
+    output.append(randomStartMinutes);
+    output.append("\n");
+    output.append("\trandomDurationMinutes: ");
+    output.append(randomDurationMinutes);
     output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-public static class ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {
-  public Integer productIdentifierType;
-  public String productIdentifierValue;
-  public ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
-    Integer productIdentifierType,
-    String productIdentifierValue
+public static class EnergyEvseClusterChargingTargetStruct {
+  public Integer targetTime;
+  public Optional<Integer> targetSoC;
+  public Optional<Long> addedEnergy;
+  private static final long TARGET_TIME_ID = 0L;
+  private static final long TARGET_SO_C_ID = 1L;
+  private static final long ADDED_ENERGY_ID = 2L;
+
+  public EnergyEvseClusterChargingTargetStruct(
+    Integer targetTime,
+    Optional<Integer> targetSoC,
+    Optional<Long> addedEnergy
   ) {
-    this.productIdentifierType = productIdentifierType;
-    this.productIdentifierValue = productIdentifierValue;
+    this.targetTime = targetTime;
+    this.targetSoC = targetSoC;
+    this.addedEnergy = addedEnergy;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(TARGET_TIME_ID, new UIntType(targetTime)));
+    values.add(new StructElement(TARGET_SO_C_ID, targetSoC.<BaseTLVType>map((nonOptionaltargetSoC) -> new UIntType(nonOptionaltargetSoC)).orElse(new EmptyType())));
+    values.add(new StructElement(ADDED_ENERGY_ID, addedEnergy.<BaseTLVType>map((nonOptionaladdedEnergy) -> new IntType(nonOptionaladdedEnergy)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static EnergyEvseClusterChargingTargetStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer targetTime = null;
+    Optional<Integer> targetSoC = Optional.empty();
+    Optional<Long> addedEnergy = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == TARGET_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          targetTime = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == TARGET_SO_C_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          targetSoC = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == ADDED_ENERGY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          addedEnergy = Optional.of(castingValue.value(Long.class));
+        }
+      }
+    }
+    return new EnergyEvseClusterChargingTargetStruct(
+      targetTime,
+      targetSoC,
+      addedEnergy
+    );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {\n");
-    output.append("\tproductIdentifierType: ");
-    output.append(productIdentifierType);
+    output.append("EnergyEvseClusterChargingTargetStruct {\n");
+    output.append("\ttargetTime: ");
+    output.append(targetTime);
     output.append("\n");
-    output.append("\tproductIdentifierValue: ");
-    output.append(productIdentifierValue);
+    output.append("\ttargetSoC: ");
+    output.append(targetSoC);
+    output.append("\n");
+    output.append("\taddedEnergy: ");
+    output.append(addedEnergy);
     output.append("\n");
     output.append("}\n");
     return output.toString();
@@ -1996,6 +6175,9 @@ public String toString() {
 public static class DoorLockClusterCredentialStruct {
   public Integer credentialType;
   public Integer credentialIndex;
+  private static final long CREDENTIAL_TYPE_ID = 0L;
+  private static final long CREDENTIAL_INDEX_ID = 1L;
+
   public DoorLockClusterCredentialStruct(
     Integer credentialType,
     Integer credentialIndex
@@ -2004,6 +6186,39 @@ public DoorLockClusterCredentialStruct(
     this.credentialIndex = credentialIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CREDENTIAL_TYPE_ID, new UIntType(credentialType)));
+    values.add(new StructElement(CREDENTIAL_INDEX_ID, new UIntType(credentialIndex)));
+
+    return new StructType(values);
+  }
+
+  public static DoorLockClusterCredentialStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer credentialType = null;
+    Integer credentialIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CREDENTIAL_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          credentialType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == CREDENTIAL_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          credentialIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new DoorLockClusterCredentialStruct(
+      credentialType,
+      credentialIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2022,6 +6237,10 @@ public static class ThermostatClusterThermostatScheduleTransition {
   public Integer transitionTime;
   public @Nullable Integer heatSetpoint;
   public @Nullable Integer coolSetpoint;
+  private static final long TRANSITION_TIME_ID = 0L;
+  private static final long HEAT_SETPOINT_ID = 1L;
+  private static final long COOL_SETPOINT_ID = 2L;
+
   public ThermostatClusterThermostatScheduleTransition(
     Integer transitionTime,
     @Nullable Integer heatSetpoint,
@@ -2032,6 +6251,47 @@ public ThermostatClusterThermostatScheduleTransition(
     this.coolSetpoint = coolSetpoint;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(TRANSITION_TIME_ID, new UIntType(transitionTime)));
+    values.add(new StructElement(HEAT_SETPOINT_ID, heatSetpoint != null ? new IntType(heatSetpoint) : new NullType()));
+    values.add(new StructElement(COOL_SETPOINT_ID, coolSetpoint != null ? new IntType(coolSetpoint) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static ThermostatClusterThermostatScheduleTransition decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer transitionTime = null;
+    @Nullable Integer heatSetpoint = null;
+    @Nullable Integer coolSetpoint = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == TRANSITION_TIME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          transitionTime = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == HEAT_SETPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          heatSetpoint = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == COOL_SETPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Int) {
+          IntType castingValue = element.value(IntType.class);
+          coolSetpoint = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ThermostatClusterThermostatScheduleTransition(
+      transitionTime,
+      heatSetpoint,
+      coolSetpoint
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2055,6 +6315,12 @@ public static class ChannelClusterChannelInfoStruct {
   public Optional<String> name;
   public Optional<String> callSign;
   public Optional<String> affiliateCallSign;
+  private static final long MAJOR_NUMBER_ID = 0L;
+  private static final long MINOR_NUMBER_ID = 1L;
+  private static final long NAME_ID = 2L;
+  private static final long CALL_SIGN_ID = 3L;
+  private static final long AFFILIATE_CALL_SIGN_ID = 4L;
+
   public ChannelClusterChannelInfoStruct(
     Integer majorNumber,
     Integer minorNumber,
@@ -2069,6 +6335,63 @@ public ChannelClusterChannelInfoStruct(
     this.affiliateCallSign = affiliateCallSign;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MAJOR_NUMBER_ID, new UIntType(majorNumber)));
+    values.add(new StructElement(MINOR_NUMBER_ID, new UIntType(minorNumber)));
+    values.add(new StructElement(NAME_ID, name.<BaseTLVType>map((nonOptionalname) -> new StringType(nonOptionalname)).orElse(new EmptyType())));
+    values.add(new StructElement(CALL_SIGN_ID, callSign.<BaseTLVType>map((nonOptionalcallSign) -> new StringType(nonOptionalcallSign)).orElse(new EmptyType())));
+    values.add(new StructElement(AFFILIATE_CALL_SIGN_ID, affiliateCallSign.<BaseTLVType>map((nonOptionalaffiliateCallSign) -> new StringType(nonOptionalaffiliateCallSign)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static ChannelClusterChannelInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer majorNumber = null;
+    Integer minorNumber = null;
+    Optional<String> name = Optional.empty();
+    Optional<String> callSign = Optional.empty();
+    Optional<String> affiliateCallSign = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MAJOR_NUMBER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          majorNumber = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == MINOR_NUMBER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          minorNumber = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == CALL_SIGN_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          callSign = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == AFFILIATE_CALL_SIGN_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          affiliateCallSign = Optional.of(castingValue.value(String.class));
+        }
+      }
+    }
+    return new ChannelClusterChannelInfoStruct(
+      majorNumber,
+      minorNumber,
+      name,
+      callSign,
+      affiliateCallSign
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2097,6 +6420,11 @@ public static class ChannelClusterLineupInfoStruct {
   public Optional<String> lineupName;
   public Optional<String> postalCode;
   public Integer lineupInfoType;
+  private static final long OPERATOR_NAME_ID = 0L;
+  private static final long LINEUP_NAME_ID = 1L;
+  private static final long POSTAL_CODE_ID = 2L;
+  private static final long LINEUP_INFO_TYPE_ID = 3L;
+
   public ChannelClusterLineupInfoStruct(
     String operatorName,
     Optional<String> lineupName,
@@ -2109,6 +6437,55 @@ public ChannelClusterLineupInfoStruct(
     this.lineupInfoType = lineupInfoType;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(OPERATOR_NAME_ID, new StringType(operatorName)));
+    values.add(new StructElement(LINEUP_NAME_ID, lineupName.<BaseTLVType>map((nonOptionallineupName) -> new StringType(nonOptionallineupName)).orElse(new EmptyType())));
+    values.add(new StructElement(POSTAL_CODE_ID, postalCode.<BaseTLVType>map((nonOptionalpostalCode) -> new StringType(nonOptionalpostalCode)).orElse(new EmptyType())));
+    values.add(new StructElement(LINEUP_INFO_TYPE_ID, new UIntType(lineupInfoType)));
+
+    return new StructType(values);
+  }
+
+  public static ChannelClusterLineupInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String operatorName = null;
+    Optional<String> lineupName = Optional.empty();
+    Optional<String> postalCode = Optional.empty();
+    Integer lineupInfoType = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == OPERATOR_NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          operatorName = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == LINEUP_NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          lineupName = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == POSTAL_CODE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          postalCode = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == LINEUP_INFO_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          lineupInfoType = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ChannelClusterLineupInfoStruct(
+      operatorName,
+      lineupName,
+      postalCode,
+      lineupInfoType
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2132,6 +6509,9 @@ public String toString() {
 public static class TargetNavigatorClusterTargetInfoStruct {
   public Integer identifier;
   public String name;
+  private static final long IDENTIFIER_ID = 0L;
+  private static final long NAME_ID = 1L;
+
   public TargetNavigatorClusterTargetInfoStruct(
     Integer identifier,
     String name
@@ -2140,6 +6520,39 @@ public TargetNavigatorClusterTargetInfoStruct(
     this.name = name;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(IDENTIFIER_ID, new UIntType(identifier)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+
+    return new StructType(values);
+  }
+
+  public static TargetNavigatorClusterTargetInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer identifier = null;
+    String name = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == IDENTIFIER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          identifier = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      }
+    }
+    return new TargetNavigatorClusterTargetInfoStruct(
+      identifier,
+      name
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2157,6 +6570,9 @@ public String toString() {
 public static class MediaPlaybackClusterPlaybackPositionStruct {
   public Long updatedAt;
   public @Nullable Long position;
+  private static final long UPDATED_AT_ID = 0L;
+  private static final long POSITION_ID = 1L;
+
   public MediaPlaybackClusterPlaybackPositionStruct(
     Long updatedAt,
     @Nullable Long position
@@ -2165,6 +6581,39 @@ public MediaPlaybackClusterPlaybackPositionStruct(
     this.position = position;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(UPDATED_AT_ID, new UIntType(updatedAt)));
+    values.add(new StructElement(POSITION_ID, position != null ? new UIntType(position) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static MediaPlaybackClusterPlaybackPositionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long updatedAt = null;
+    @Nullable Long position = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == UPDATED_AT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          updatedAt = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == POSITION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          position = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new MediaPlaybackClusterPlaybackPositionStruct(
+      updatedAt,
+      position
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2184,6 +6633,11 @@ public static class MediaInputClusterInputInfoStruct {
   public Integer inputType;
   public String name;
   public String description;
+  private static final long INDEX_ID = 0L;
+  private static final long INPUT_TYPE_ID = 1L;
+  private static final long NAME_ID = 2L;
+  private static final long DESCRIPTION_ID = 3L;
+
   public MediaInputClusterInputInfoStruct(
     Integer index,
     Integer inputType,
@@ -2196,6 +6650,55 @@ public MediaInputClusterInputInfoStruct(
     this.description = description;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(INDEX_ID, new UIntType(index)));
+    values.add(new StructElement(INPUT_TYPE_ID, new UIntType(inputType)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(DESCRIPTION_ID, new StringType(description)));
+
+    return new StructType(values);
+  }
+
+  public static MediaInputClusterInputInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer index = null;
+    Integer inputType = null;
+    String name = null;
+    String description = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          index = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == INPUT_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          inputType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == DESCRIPTION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          description = castingValue.value(String.class);
+        }
+      }
+    }
+    return new MediaInputClusterInputInfoStruct(
+      index,
+      inputType,
+      name,
+      description
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2220,6 +6723,10 @@ public static class ContentLauncherClusterDimensionStruct {
   public Double width;
   public Double height;
   public Integer metric;
+  private static final long WIDTH_ID = 0L;
+  private static final long HEIGHT_ID = 1L;
+  private static final long METRIC_ID = 2L;
+
   public ContentLauncherClusterDimensionStruct(
     Double width,
     Double height,
@@ -2230,6 +6737,47 @@ public ContentLauncherClusterDimensionStruct(
     this.metric = metric;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(WIDTH_ID, new DoubleType(width)));
+    values.add(new StructElement(HEIGHT_ID, new DoubleType(height)));
+    values.add(new StructElement(METRIC_ID, new UIntType(metric)));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterDimensionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Double width = null;
+    Double height = null;
+    Integer metric = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == WIDTH_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Double) {
+          DoubleType castingValue = element.value(DoubleType.class);
+          width = castingValue.value(Double.class);
+        }
+      } else if (element.contextTagNum() == HEIGHT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Double) {
+          DoubleType castingValue = element.value(DoubleType.class);
+          height = castingValue.value(Double.class);
+        }
+      } else if (element.contextTagNum() == METRIC_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          metric = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new ContentLauncherClusterDimensionStruct(
+      width,
+      height,
+      metric
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2250,6 +6798,9 @@ public String toString() {
 public static class ContentLauncherClusterAdditionalInfoStruct {
   public String name;
   public String value;
+  private static final long NAME_ID = 0L;
+  private static final long VALUE_ID = 1L;
+
   public ContentLauncherClusterAdditionalInfoStruct(
     String name,
     String value
@@ -2258,6 +6809,39 @@ public ContentLauncherClusterAdditionalInfoStruct(
     this.value = value;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+    values.add(new StructElement(VALUE_ID, new StringType(value)));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterAdditionalInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String name = null;
+    String value = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          value = castingValue.value(String.class);
+        }
+      }
+    }
+    return new ContentLauncherClusterAdditionalInfoStruct(
+      name,
+      value
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2276,6 +6860,10 @@ public static class ContentLauncherClusterParameterStruct {
   public Integer type;
   public String value;
   public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList;
+  private static final long TYPE_ID = 0L;
+  private static final long VALUE_ID = 1L;
+  private static final long EXTERNAL_I_D_LIST_ID = 2L;
+
   public ContentLauncherClusterParameterStruct(
     Integer type,
     String value,
@@ -2286,6 +6874,47 @@ public ContentLauncherClusterParameterStruct(
     this.externalIDList = externalIDList;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(TYPE_ID, new UIntType(type)));
+    values.add(new StructElement(VALUE_ID, new StringType(value)));
+    values.add(new StructElement(EXTERNAL_I_D_LIST_ID, externalIDList.<BaseTLVType>map((nonOptionalexternalIDList) -> ArrayType.generateArrayType(nonOptionalexternalIDList, (elementnonOptionalexternalIDList) -> elementnonOptionalexternalIDList.encodeTlv())).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterParameterStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer type = null;
+    String value = null;
+    Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          type = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == VALUE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          value = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == EXTERNAL_I_D_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          externalIDList = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ContentLauncherClusterAdditionalInfoStruct.decodeTlv(elementcastingValue)));
+        }
+      }
+    }
+    return new ContentLauncherClusterParameterStruct(
+      type,
+      value,
+      externalIDList
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2305,12 +6934,39 @@ public String toString() {
 }
 public static class ContentLauncherClusterContentSearchStruct {
   public ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList;
+  private static final long PARAMETER_LIST_ID = 0L;
+
   public ContentLauncherClusterContentSearchStruct(
     ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList
   ) {
     this.parameterList = parameterList;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PARAMETER_LIST_ID, ArrayType.generateArrayType(parameterList, (elementparameterList) -> elementparameterList.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterContentSearchStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PARAMETER_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          parameterList = castingValue.map((elementcastingValue) -> ChipStructs.ContentLauncherClusterParameterStruct.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new ContentLauncherClusterContentSearchStruct(
+      parameterList
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2326,6 +6982,10 @@ public static class ContentLauncherClusterStyleInformationStruct {
   public Optional<String> imageURL;
   public Optional<String> color;
   public Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size;
+  private static final long IMAGE_U_R_L_ID = 0L;
+  private static final long COLOR_ID = 1L;
+  private static final long SIZE_ID = 2L;
+
   public ContentLauncherClusterStyleInformationStruct(
     Optional<String> imageURL,
     Optional<String> color,
@@ -2336,6 +6996,47 @@ public ContentLauncherClusterStyleInformationStruct(
     this.size = size;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(IMAGE_U_R_L_ID, imageURL.<BaseTLVType>map((nonOptionalimageURL) -> new StringType(nonOptionalimageURL)).orElse(new EmptyType())));
+    values.add(new StructElement(COLOR_ID, color.<BaseTLVType>map((nonOptionalcolor) -> new StringType(nonOptionalcolor)).orElse(new EmptyType())));
+    values.add(new StructElement(SIZE_ID, size.<BaseTLVType>map((nonOptionalsize) -> nonOptionalsize.encodeTlv()).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterStyleInformationStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Optional<String> imageURL = Optional.empty();
+    Optional<String> color = Optional.empty();
+    Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == IMAGE_U_R_L_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          imageURL = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == COLOR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          color = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == SIZE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          size = Optional.of(ChipStructs.ContentLauncherClusterDimensionStruct.decodeTlv(castingValue));
+        }
+      }
+    }
+    return new ContentLauncherClusterStyleInformationStruct(
+      imageURL,
+      color,
+      size
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2360,6 +7061,13 @@ public static class ContentLauncherClusterBrandingInformationStruct {
   public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar;
   public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash;
   public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark;
+  private static final long PROVIDER_NAME_ID = 0L;
+  private static final long BACKGROUND_ID = 1L;
+  private static final long LOGO_ID = 2L;
+  private static final long PROGRESS_BAR_ID = 3L;
+  private static final long SPLASH_ID = 4L;
+  private static final long WATER_MARK_ID = 5L;
+
   public ContentLauncherClusterBrandingInformationStruct(
     String providerName,
     Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background,
@@ -2376,6 +7084,71 @@ public ContentLauncherClusterBrandingInformationStruct(
     this.waterMark = waterMark;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(PROVIDER_NAME_ID, new StringType(providerName)));
+    values.add(new StructElement(BACKGROUND_ID, background.<BaseTLVType>map((nonOptionalbackground) -> nonOptionalbackground.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(LOGO_ID, logo.<BaseTLVType>map((nonOptionallogo) -> nonOptionallogo.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(PROGRESS_BAR_ID, progressBar.<BaseTLVType>map((nonOptionalprogressBar) -> nonOptionalprogressBar.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(SPLASH_ID, splash.<BaseTLVType>map((nonOptionalsplash) -> nonOptionalsplash.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(WATER_MARK_ID, waterMark.<BaseTLVType>map((nonOptionalwaterMark) -> nonOptionalwaterMark.encodeTlv()).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static ContentLauncherClusterBrandingInformationStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    String providerName = null;
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background = Optional.empty();
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo = Optional.empty();
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar = Optional.empty();
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash = Optional.empty();
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == PROVIDER_NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          providerName = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == BACKGROUND_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          background = Optional.of(ChipStructs.ContentLauncherClusterStyleInformationStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == LOGO_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          logo = Optional.of(ChipStructs.ContentLauncherClusterStyleInformationStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == PROGRESS_BAR_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          progressBar = Optional.of(ChipStructs.ContentLauncherClusterStyleInformationStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == SPLASH_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          splash = Optional.of(ChipStructs.ContentLauncherClusterStyleInformationStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == WATER_MARK_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          waterMark = Optional.of(ChipStructs.ContentLauncherClusterStyleInformationStruct.decodeTlv(castingValue));
+        }
+      }
+    }
+    return new ContentLauncherClusterBrandingInformationStruct(
+      providerName,
+      background,
+      logo,
+      progressBar,
+      splash,
+      waterMark
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2406,6 +7179,10 @@ public static class AudioOutputClusterOutputInfoStruct {
   public Integer index;
   public Integer outputType;
   public String name;
+  private static final long INDEX_ID = 0L;
+  private static final long OUTPUT_TYPE_ID = 1L;
+  private static final long NAME_ID = 2L;
+
   public AudioOutputClusterOutputInfoStruct(
     Integer index,
     Integer outputType,
@@ -2416,6 +7193,47 @@ public AudioOutputClusterOutputInfoStruct(
     this.name = name;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(INDEX_ID, new UIntType(index)));
+    values.add(new StructElement(OUTPUT_TYPE_ID, new UIntType(outputType)));
+    values.add(new StructElement(NAME_ID, new StringType(name)));
+
+    return new StructType(values);
+  }
+
+  public static AudioOutputClusterOutputInfoStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer index = null;
+    Integer outputType = null;
+    String name = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          index = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OUTPUT_TYPE_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          outputType = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NAME_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          name = castingValue.value(String.class);
+        }
+      }
+    }
+    return new AudioOutputClusterOutputInfoStruct(
+      index,
+      outputType,
+      name
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2436,6 +7254,9 @@ public String toString() {
 public static class ApplicationLauncherClusterApplicationStruct {
   public Integer catalogVendorID;
   public String applicationID;
+  private static final long CATALOG_VENDOR_I_D_ID = 0L;
+  private static final long APPLICATION_I_D_ID = 1L;
+
   public ApplicationLauncherClusterApplicationStruct(
     Integer catalogVendorID,
     String applicationID
@@ -2444,6 +7265,39 @@ public ApplicationLauncherClusterApplicationStruct(
     this.applicationID = applicationID;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CATALOG_VENDOR_I_D_ID, new UIntType(catalogVendorID)));
+    values.add(new StructElement(APPLICATION_I_D_ID, new StringType(applicationID)));
+
+    return new StructType(values);
+  }
+
+  public static ApplicationLauncherClusterApplicationStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer catalogVendorID = null;
+    String applicationID = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CATALOG_VENDOR_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          catalogVendorID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == APPLICATION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          applicationID = castingValue.value(String.class);
+        }
+      }
+    }
+    return new ApplicationLauncherClusterApplicationStruct(
+      catalogVendorID,
+      applicationID
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2461,6 +7315,9 @@ public String toString() {
 public static class ApplicationLauncherClusterApplicationEPStruct {
   public ChipStructs.ApplicationLauncherClusterApplicationStruct application;
   public Optional<Integer> endpoint;
+  private static final long APPLICATION_ID = 0L;
+  private static final long ENDPOINT_ID = 1L;
+
   public ApplicationLauncherClusterApplicationEPStruct(
     ChipStructs.ApplicationLauncherClusterApplicationStruct application,
     Optional<Integer> endpoint
@@ -2469,6 +7326,39 @@ public ApplicationLauncherClusterApplicationEPStruct(
     this.endpoint = endpoint;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(APPLICATION_ID, application.encodeTlv()));
+    values.add(new StructElement(ENDPOINT_ID, endpoint.<BaseTLVType>map((nonOptionalendpoint) -> new UIntType(nonOptionalendpoint)).orElse(new EmptyType())));
+
+    return new StructType(values);
+  }
+
+  public static ApplicationLauncherClusterApplicationEPStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ChipStructs.ApplicationLauncherClusterApplicationStruct application = null;
+    Optional<Integer> endpoint = Optional.empty();
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == APPLICATION_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          application = ChipStructs.ApplicationLauncherClusterApplicationStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == ENDPOINT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          endpoint = Optional.of(castingValue.value(Integer.class));
+        }
+      }
+    }
+    return new ApplicationLauncherClusterApplicationEPStruct(
+      application,
+      endpoint
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2486,6 +7376,9 @@ public String toString() {
 public static class ApplicationBasicClusterApplicationStruct {
   public Integer catalogVendorID;
   public String applicationID;
+  private static final long CATALOG_VENDOR_I_D_ID = 0L;
+  private static final long APPLICATION_I_D_ID = 1L;
+
   public ApplicationBasicClusterApplicationStruct(
     Integer catalogVendorID,
     String applicationID
@@ -2494,6 +7387,39 @@ public ApplicationBasicClusterApplicationStruct(
     this.applicationID = applicationID;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(CATALOG_VENDOR_I_D_ID, new UIntType(catalogVendorID)));
+    values.add(new StructElement(APPLICATION_I_D_ID, new StringType(applicationID)));
+
+    return new StructType(values);
+  }
+
+  public static ApplicationBasicClusterApplicationStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer catalogVendorID = null;
+    String applicationID = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == CATALOG_VENDOR_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          catalogVendorID = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == APPLICATION_I_D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          applicationID = castingValue.value(String.class);
+        }
+      }
+    }
+    return new ApplicationBasicClusterApplicationStruct(
+      catalogVendorID,
+      applicationID
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2517,6 +7443,15 @@ public static class UnitTestingClusterSimpleStruct {
   public Integer f;
   public Float g;
   public Double h;
+  private static final long A_ID = 0L;
+  private static final long B_ID = 1L;
+  private static final long C_ID = 2L;
+  private static final long D_ID = 3L;
+  private static final long E_ID = 4L;
+  private static final long F_ID = 5L;
+  private static final long G_ID = 6L;
+  private static final long H_ID = 7L;
+
   public UnitTestingClusterSimpleStruct(
     Integer a,
     Boolean b,
@@ -2537,6 +7472,87 @@ public UnitTestingClusterSimpleStruct(
     this.h = h;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(A_ID, new UIntType(a)));
+    values.add(new StructElement(B_ID, new BooleanType(b)));
+    values.add(new StructElement(C_ID, new UIntType(c)));
+    values.add(new StructElement(D_ID, new ByteArrayType(d)));
+    values.add(new StructElement(E_ID, new StringType(e)));
+    values.add(new StructElement(F_ID, new UIntType(f)));
+    values.add(new StructElement(G_ID, new FloatType(g)));
+    values.add(new StructElement(H_ID, new DoubleType(h)));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterSimpleStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer a = null;
+    Boolean b = null;
+    Integer c = null;
+    byte[] d = null;
+    String e = null;
+    Integer f = null;
+    Float g = null;
+    Double h = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == A_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          a = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == B_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          b = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == C_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          c = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          d = castingValue.value(byte[].class);
+        }
+      } else if (element.contextTagNum() == E_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          e = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == F_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          f = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == G_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Float) {
+          FloatType castingValue = element.value(FloatType.class);
+          g = castingValue.value(Float.class);
+        }
+      } else if (element.contextTagNum() == H_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Double) {
+          DoubleType castingValue = element.value(DoubleType.class);
+          h = castingValue.value(Double.class);
+        }
+      }
+    }
+    return new UnitTestingClusterSimpleStruct(
+      a,
+      b,
+      c,
+      d,
+      e,
+      f,
+      g,
+      h
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2578,6 +7594,15 @@ public static class UnitTestingClusterTestFabricScoped {
   public ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct;
   public ArrayList<Integer> fabricSensitiveInt8uList;
   public Integer fabricIndex;
+  private static final long FABRIC_SENSITIVE_INT8U_ID = 1L;
+  private static final long OPTIONAL_FABRIC_SENSITIVE_INT8U_ID = 2L;
+  private static final long NULLABLE_FABRIC_SENSITIVE_INT8U_ID = 3L;
+  private static final long NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U_ID = 4L;
+  private static final long FABRIC_SENSITIVE_CHAR_STRING_ID = 5L;
+  private static final long FABRIC_SENSITIVE_STRUCT_ID = 6L;
+  private static final long FABRIC_SENSITIVE_INT8U_LIST_ID = 7L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
   public UnitTestingClusterTestFabricScoped(
     Integer fabricSensitiveInt8u,
     Optional<Integer> optionalFabricSensitiveInt8u,
@@ -2598,6 +7623,87 @@ public UnitTestingClusterTestFabricScoped(
     this.fabricIndex = fabricIndex;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(FABRIC_SENSITIVE_INT8U_ID, new UIntType(fabricSensitiveInt8u)));
+    values.add(new StructElement(OPTIONAL_FABRIC_SENSITIVE_INT8U_ID, optionalFabricSensitiveInt8u.<BaseTLVType>map((nonOptionaloptionalFabricSensitiveInt8u) -> new UIntType(nonOptionaloptionalFabricSensitiveInt8u)).orElse(new EmptyType())));
+    values.add(new StructElement(NULLABLE_FABRIC_SENSITIVE_INT8U_ID, nullableFabricSensitiveInt8u != null ? new UIntType(nullableFabricSensitiveInt8u) : new NullType()));
+    values.add(new StructElement(NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U_ID, nullableOptionalFabricSensitiveInt8u != null ? nullableOptionalFabricSensitiveInt8u.<BaseTLVType>map((nonOptionalnullableOptionalFabricSensitiveInt8u) -> new UIntType(nonOptionalnullableOptionalFabricSensitiveInt8u)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(FABRIC_SENSITIVE_CHAR_STRING_ID, new StringType(fabricSensitiveCharString)));
+    values.add(new StructElement(FABRIC_SENSITIVE_STRUCT_ID, fabricSensitiveStruct.encodeTlv()));
+    values.add(new StructElement(FABRIC_SENSITIVE_INT8U_LIST_ID, ArrayType.generateArrayType(fabricSensitiveInt8uList, (elementfabricSensitiveInt8uList) -> new UIntType(elementfabricSensitiveInt8uList))));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterTestFabricScoped decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer fabricSensitiveInt8u = null;
+    Optional<Integer> optionalFabricSensitiveInt8u = Optional.empty();
+    @Nullable Integer nullableFabricSensitiveInt8u = null;
+    @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u = null;
+    String fabricSensitiveCharString = null;
+    ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct = null;
+    ArrayList<Integer> fabricSensitiveInt8uList = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == FABRIC_SENSITIVE_INT8U_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricSensitiveInt8u = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPTIONAL_FABRIC_SENSITIVE_INT8U_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          optionalFabricSensitiveInt8u = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == NULLABLE_FABRIC_SENSITIVE_INT8U_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nullableFabricSensitiveInt8u = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nullableOptionalFabricSensitiveInt8u = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == FABRIC_SENSITIVE_CHAR_STRING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          fabricSensitiveCharString = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_SENSITIVE_STRUCT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          fabricSensitiveStruct = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == FABRIC_SENSITIVE_INT8U_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          fabricSensitiveInt8uList = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new UnitTestingClusterTestFabricScoped(
+      fabricSensitiveInt8u,
+      optionalFabricSensitiveInt8u,
+      nullableFabricSensitiveInt8u,
+      nullableOptionalFabricSensitiveInt8u,
+      fabricSensitiveCharString,
+      fabricSensitiveStruct,
+      fabricSensitiveInt8uList,
+      fabricIndex
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2643,6 +7749,19 @@ public static class UnitTestingClusterNullablesAndOptionalsStruct {
   public @Nullable ArrayList<Integer> nullableList;
   public Optional<ArrayList<Integer>> optionalList;
   public @Nullable Optional<ArrayList<Integer>> nullableOptionalList;
+  private static final long NULLABLE_INT_ID = 0L;
+  private static final long OPTIONAL_INT_ID = 1L;
+  private static final long NULLABLE_OPTIONAL_INT_ID = 2L;
+  private static final long NULLABLE_STRING_ID = 3L;
+  private static final long OPTIONAL_STRING_ID = 4L;
+  private static final long NULLABLE_OPTIONAL_STRING_ID = 5L;
+  private static final long NULLABLE_STRUCT_ID = 6L;
+  private static final long OPTIONAL_STRUCT_ID = 7L;
+  private static final long NULLABLE_OPTIONAL_STRUCT_ID = 8L;
+  private static final long NULLABLE_LIST_ID = 9L;
+  private static final long OPTIONAL_LIST_ID = 10L;
+  private static final long NULLABLE_OPTIONAL_LIST_ID = 11L;
+
   public UnitTestingClusterNullablesAndOptionalsStruct(
     @Nullable Integer nullableInt,
     Optional<Integer> optionalInt,
@@ -2671,6 +7790,119 @@ public UnitTestingClusterNullablesAndOptionalsStruct(
     this.nullableOptionalList = nullableOptionalList;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(NULLABLE_INT_ID, nullableInt != null ? new UIntType(nullableInt) : new NullType()));
+    values.add(new StructElement(OPTIONAL_INT_ID, optionalInt.<BaseTLVType>map((nonOptionaloptionalInt) -> new UIntType(nonOptionaloptionalInt)).orElse(new EmptyType())));
+    values.add(new StructElement(NULLABLE_OPTIONAL_INT_ID, nullableOptionalInt != null ? nullableOptionalInt.<BaseTLVType>map((nonOptionalnullableOptionalInt) -> new UIntType(nonOptionalnullableOptionalInt)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(NULLABLE_STRING_ID, nullableString != null ? new StringType(nullableString) : new NullType()));
+    values.add(new StructElement(OPTIONAL_STRING_ID, optionalString.<BaseTLVType>map((nonOptionaloptionalString) -> new StringType(nonOptionaloptionalString)).orElse(new EmptyType())));
+    values.add(new StructElement(NULLABLE_OPTIONAL_STRING_ID, nullableOptionalString != null ? nullableOptionalString.<BaseTLVType>map((nonOptionalnullableOptionalString) -> new StringType(nonOptionalnullableOptionalString)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(NULLABLE_STRUCT_ID, nullableStruct != null ? nullableStruct.encodeTlv() : new NullType()));
+    values.add(new StructElement(OPTIONAL_STRUCT_ID, optionalStruct.<BaseTLVType>map((nonOptionaloptionalStruct) -> nonOptionaloptionalStruct.encodeTlv()).orElse(new EmptyType())));
+    values.add(new StructElement(NULLABLE_OPTIONAL_STRUCT_ID, nullableOptionalStruct != null ? nullableOptionalStruct.<BaseTLVType>map((nonOptionalnullableOptionalStruct) -> nonOptionalnullableOptionalStruct.encodeTlv()).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(NULLABLE_LIST_ID, nullableList != null ? ArrayType.generateArrayType(nullableList, (elementnullableList) -> new UIntType(elementnullableList)) : new NullType()));
+    values.add(new StructElement(OPTIONAL_LIST_ID, optionalList.<BaseTLVType>map((nonOptionaloptionalList) -> ArrayType.generateArrayType(nonOptionaloptionalList, (elementnonOptionaloptionalList) -> new UIntType(elementnonOptionaloptionalList))).orElse(new EmptyType())));
+    values.add(new StructElement(NULLABLE_OPTIONAL_LIST_ID, nullableOptionalList != null ? nullableOptionalList.<BaseTLVType>map((nonOptionalnullableOptionalList) -> ArrayType.generateArrayType(nonOptionalnullableOptionalList, (elementnonOptionalnullableOptionalList) -> new UIntType(elementnonOptionalnullableOptionalList))).orElse(new EmptyType()) : new NullType()));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterNullablesAndOptionalsStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    @Nullable Integer nullableInt = null;
+    Optional<Integer> optionalInt = Optional.empty();
+    @Nullable Optional<Integer> nullableOptionalInt = null;
+    @Nullable String nullableString = null;
+    Optional<String> optionalString = Optional.empty();
+    @Nullable Optional<String> nullableOptionalString = null;
+    @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct = null;
+    Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct = Optional.empty();
+    @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct = null;
+    @Nullable ArrayList<Integer> nullableList = null;
+    Optional<ArrayList<Integer>> optionalList = Optional.empty();
+    @Nullable Optional<ArrayList<Integer>> nullableOptionalList = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == NULLABLE_INT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nullableInt = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == OPTIONAL_INT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          optionalInt = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == NULLABLE_OPTIONAL_INT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          nullableOptionalInt = Optional.of(castingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == NULLABLE_STRING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          nullableString = castingValue.value(String.class);
+        }
+      } else if (element.contextTagNum() == OPTIONAL_STRING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          optionalString = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == NULLABLE_OPTIONAL_STRING_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.String) {
+          StringType castingValue = element.value(StringType.class);
+          nullableOptionalString = Optional.of(castingValue.value(String.class));
+        }
+      } else if (element.contextTagNum() == NULLABLE_STRUCT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          nullableStruct = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == OPTIONAL_STRUCT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          optionalStruct = Optional.of(ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == NULLABLE_OPTIONAL_STRUCT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          nullableOptionalStruct = Optional.of(ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue));
+        }
+      } else if (element.contextTagNum() == NULLABLE_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          nullableList = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      } else if (element.contextTagNum() == OPTIONAL_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          optionalList = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+        }
+      } else if (element.contextTagNum() == NULLABLE_OPTIONAL_LIST_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          nullableOptionalList = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class)));
+        }
+      }
+    }
+    return new UnitTestingClusterNullablesAndOptionalsStruct(
+      nullableInt,
+      optionalInt,
+      nullableOptionalInt,
+      nullableString,
+      optionalString,
+      nullableOptionalString,
+      nullableStruct,
+      optionalStruct,
+      nullableOptionalStruct,
+      nullableList,
+      optionalList,
+      nullableOptionalList
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2719,6 +7951,10 @@ public static class UnitTestingClusterNestedStruct {
   public Integer a;
   public Boolean b;
   public ChipStructs.UnitTestingClusterSimpleStruct c;
+  private static final long A_ID = 0L;
+  private static final long B_ID = 1L;
+  private static final long C_ID = 2L;
+
   public UnitTestingClusterNestedStruct(
     Integer a,
     Boolean b,
@@ -2729,6 +7965,47 @@ public UnitTestingClusterNestedStruct(
     this.c = c;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(A_ID, new UIntType(a)));
+    values.add(new StructElement(B_ID, new BooleanType(b)));
+    values.add(new StructElement(C_ID, c.encodeTlv()));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterNestedStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer a = null;
+    Boolean b = null;
+    ChipStructs.UnitTestingClusterSimpleStruct c = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == A_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          a = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == B_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          b = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == C_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          c = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+        }
+      }
+    }
+    return new UnitTestingClusterNestedStruct(
+      a,
+      b,
+      c
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2754,6 +8031,14 @@ public static class UnitTestingClusterNestedStructList {
   public ArrayList<Long> e;
   public ArrayList<byte[]> f;
   public ArrayList<Integer> g;
+  private static final long A_ID = 0L;
+  private static final long B_ID = 1L;
+  private static final long C_ID = 2L;
+  private static final long D_ID = 3L;
+  private static final long E_ID = 4L;
+  private static final long F_ID = 5L;
+  private static final long G_ID = 6L;
+
   public UnitTestingClusterNestedStructList(
     Integer a,
     Boolean b,
@@ -2772,6 +8057,79 @@ public UnitTestingClusterNestedStructList(
     this.g = g;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(A_ID, new UIntType(a)));
+    values.add(new StructElement(B_ID, new BooleanType(b)));
+    values.add(new StructElement(C_ID, c.encodeTlv()));
+    values.add(new StructElement(D_ID, ArrayType.generateArrayType(d, (elementd) -> elementd.encodeTlv())));
+    values.add(new StructElement(E_ID, ArrayType.generateArrayType(e, (elemente) -> new UIntType(elemente))));
+    values.add(new StructElement(F_ID, ArrayType.generateArrayType(f, (elementf) -> new ByteArrayType(elementf))));
+    values.add(new StructElement(G_ID, ArrayType.generateArrayType(g, (elementg) -> new UIntType(elementg))));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterNestedStructList decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Integer a = null;
+    Boolean b = null;
+    ChipStructs.UnitTestingClusterSimpleStruct c = null;
+    ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> d = null;
+    ArrayList<Long> e = null;
+    ArrayList<byte[]> f = null;
+    ArrayList<Integer> g = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == A_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          a = castingValue.value(Integer.class);
+        }
+      } else if (element.contextTagNum() == B_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          b = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == C_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          c = ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == D_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          d = castingValue.map((elementcastingValue) -> ChipStructs.UnitTestingClusterSimpleStruct.decodeTlv(elementcastingValue));
+        }
+      } else if (element.contextTagNum() == E_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          e = castingValue.map((elementcastingValue) -> elementcastingValue.value(Long.class));
+        }
+      } else if (element.contextTagNum() == F_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          f = castingValue.map((elementcastingValue) -> elementcastingValue.value(byte[].class));
+        }
+      } else if (element.contextTagNum() == G_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          g = castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class));
+        }
+      }
+    }
+    return new UnitTestingClusterNestedStructList(
+      a,
+      b,
+      c,
+      d,
+      e,
+      f,
+      g
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2803,12 +8161,39 @@ public String toString() {
 }
 public static class UnitTestingClusterDoubleNestedStructList {
   public ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a;
+  private static final long A_ID = 0L;
+
   public UnitTestingClusterDoubleNestedStructList(
     ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a
   ) {
     this.a = a;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(A_ID, ArrayType.generateArrayType(a, (elementa) -> elementa.encodeTlv())));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterDoubleNestedStructList decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == A_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Array) {
+          ArrayType castingValue = element.value(ArrayType.class);
+          a = castingValue.map((elementcastingValue) -> ChipStructs.UnitTestingClusterNestedStructList.decodeTlv(elementcastingValue));
+        }
+      }
+    }
+    return new UnitTestingClusterDoubleNestedStructList(
+      a
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
@@ -2823,6 +8208,9 @@ public String toString() {
 public static class UnitTestingClusterTestListStructOctet {
   public Long member1;
   public byte[] member2;
+  private static final long MEMBER1_ID = 0L;
+  private static final long MEMBER2_ID = 1L;
+
   public UnitTestingClusterTestListStructOctet(
     Long member1,
     byte[] member2
@@ -2831,6 +8219,39 @@ public UnitTestingClusterTestListStructOctet(
     this.member2 = member2;
   }
 
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(MEMBER1_ID, new UIntType(member1)));
+    values.add(new StructElement(MEMBER2_ID, new ByteArrayType(member2)));
+
+    return new StructType(values);
+  }
+
+  public static UnitTestingClusterTestListStructOctet decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long member1 = null;
+    byte[] member2 = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == MEMBER1_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          member1 = castingValue.value(Long.class);
+        }
+      } else if (element.contextTagNum() == MEMBER2_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+          ByteArrayType castingValue = element.value(ByteArrayType.class);
+          member2 = castingValue.value(byte[].class);
+        }
+      }
+    }
+    return new UnitTestingClusterTestListStructOctet(
+      member1,
+      member2
+    );
+  }
+
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index 413541bdf799b4..5a089cd25528ba 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -151,6 +151,18 @@ public static BaseCluster getCluster(long clusterId) {
         if (clusterId == IcdManagement.ID) {
             return new IcdManagement();
         }
+        if (clusterId == Timer.ID) {
+            return new Timer();
+        }
+        if (clusterId == OvenCavityOperationalState.ID) {
+            return new OvenCavityOperationalState();
+        }
+        if (clusterId == OvenMode.ID) {
+            return new OvenMode();
+        }
+        if (clusterId == LaundryDryerControls.ID) {
+            return new LaundryDryerControls();
+        }
         if (clusterId == ModeSelect.ID) {
             return new ModeSelect();
         }
@@ -187,6 +199,12 @@ public static BaseCluster getCluster(long clusterId) {
         if (clusterId == DishwasherAlarm.ID) {
             return new DishwasherAlarm();
         }
+        if (clusterId == MicrowaveOvenMode.ID) {
+            return new MicrowaveOvenMode();
+        }
+        if (clusterId == MicrowaveOvenControl.ID) {
+            return new MicrowaveOvenControl();
+        }
         if (clusterId == OperationalState.ID) {
             return new OperationalState();
         }
@@ -199,6 +217,18 @@ public static BaseCluster getCluster(long clusterId) {
         if (clusterId == ActivatedCarbonFilterMonitoring.ID) {
             return new ActivatedCarbonFilterMonitoring();
         }
+        if (clusterId == BooleanSensorConfiguration.ID) {
+            return new BooleanSensorConfiguration();
+        }
+        if (clusterId == ValveConfigurationAndControl.ID) {
+            return new ValveConfigurationAndControl();
+        }
+        if (clusterId == DemandResponseLoadControl.ID) {
+            return new DemandResponseLoadControl();
+        }
+        if (clusterId == EnergyEvse.ID) {
+            return new EnergyEvse();
+        }
         if (clusterId == DoorLock.ID) {
             return new DoorLock();
         }
@@ -667,7 +697,7 @@ public enum Attribute {
             NameSupport(4L),
             LastConfiguredBy(5L),
             SceneTableSize(6L),
-            RemainingCapacity(7L),
+            FabricSceneInfo(7L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -2335,6 +2365,8 @@ public enum Attribute {
             UniqueID(18L),
             CapabilityMinima(19L),
             ProductAppearance(20L),
+            SpecificationVersion(21L),
+            MaxPathsPerInvoke(22L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -3465,7 +3497,8 @@ public enum Command {
             AddOrUpdateThreadNetwork(3L),
             RemoveNetwork(4L),
             ConnectNetwork(6L),
-            ReorderNetwork(8L),;
+            ReorderNetwork(8L),
+            QueryIdentity(9L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -3500,7 +3533,7 @@ public static ScanNetworksCommandField value(int id) throws NoSuchFieldError {
                         }
                         throw new NoSuchFieldError();
                     }
-                }public enum AddOrUpdateWiFiNetworkCommandField {Ssid(0),Credentials(1),Breadcrumb(2),;
+                }public enum AddOrUpdateWiFiNetworkCommandField {Ssid(0),Credentials(1),Breadcrumb(2),NetworkIdentity(3),ClientIdentifier(4),PossessionNonce(5),;
                     private final int id;
                     AddOrUpdateWiFiNetworkCommandField(int id) {
                         this.id = id;
@@ -3585,6 +3618,23 @@ public static ReorderNetworkCommandField value(int id) throws NoSuchFieldError {
                         }
                         throw new NoSuchFieldError();
                     }
+                }public enum QueryIdentityCommandField {KeyIdentifier(0),PossessionNonce(1),;
+                    private final int id;
+                    QueryIdentityCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static QueryIdentityCommandField value(int id) throws NoSuchFieldError {
+                        for (QueryIdentityCommandField field : QueryIdentityCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
                 }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
@@ -3749,7 +3799,6 @@ public enum Attribute {
             ActiveRadioFaults(6L),
             ActiveNetworkFaults(7L),
             TestEventTriggersEnabled(8L),
-            AverageWearCount(9L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -3800,7 +3849,8 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            TestEventTrigger(0L),;
+            TestEventTrigger(0L),
+            TimeSnapshot(1L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -6100,19 +6150,16 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class ModeSelect implements BaseCluster {
-        public static final long ID = 80L;
+    public static class Timer implements BaseCluster {
+        public static final long ID = 71L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            Description(0L),
-            StandardNamespace(1L),
-            SupportedModes(2L),
-            CurrentMode(3L),
-            StartUpMode(4L),
-            OnMode(5L),
+            SetTime(0L),
+            TimeRemaining(1L),
+            TimerState(2L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6159,7 +6206,10 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            ChangeToMode(0L),;
+            SetTimer(0L),
+            ResetTimer(1L),
+            AddTime(2L),
+            ReduceTime(3L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -6177,17 +6227,51 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum ChangeToModeCommandField {NewMode(0),;
+        }public enum SetTimerCommandField {NewTime(0),;
                     private final int id;
-                    ChangeToModeCommandField(int id) {
+                    SetTimerCommandField(int id) {
                         this.id = id;
                     }
 
                     public int getID() {
                         return id;
                     }
-                    public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
-                        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
+                    public static SetTimerCommandField value(int id) throws NoSuchFieldError {
+                        for (SetTimerCommandField field : SetTimerCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum AddTimeCommandField {AdditionalTime(0),;
+                    private final int id;
+                    AddTimeCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static AddTimeCommandField value(int id) throws NoSuchFieldError {
+                        for (AddTimeCommandField field : AddTimeCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum ReduceTimeCommandField {TimeReduction(0),;
+                    private final int id;
+                    ReduceTimeCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static ReduceTimeCommandField value(int id) throws NoSuchFieldError {
+                        for (ReduceTimeCommandField field : ReduceTimeCommandField.values()) {
                         if (field.getID() == id) {
                             return field;
                         }
@@ -6224,17 +6308,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class LaundryWasherMode implements BaseCluster {
-        public static final long ID = 81L;
+    public static class OvenCavityOperationalState implements BaseCluster {
+        public static final long ID = 72L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SupportedModes(0L),
-            CurrentMode(1L),
-            StartUpMode(2L),
-            OnMode(3L),
+            PhaseList(0L),
+            CurrentPhase(1L),
+            CountdownTime(2L),
+            OperationalStateList(3L),
+            OperationalState(4L),
+            OperationalError(5L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6260,7 +6346,9 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {;
+        public enum Event {
+            OperationalError(0L),
+            OperationCompletion(1L),;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -6281,7 +6369,10 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            ChangeToMode(0L),;
+            Pause(0L),
+            Stop(1L),
+            Start(2L),
+            Resume(3L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -6299,24 +6390,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum ChangeToModeCommandField {NewMode(0),;
-                    private final int id;
-                    ChangeToModeCommandField(int id) {
-                        this.id = id;
-                    }
-
-                    public int getID() {
-                        return id;
-                    }
-                    public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
-                        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
-                        if (field.getID() == id) {
-                            return field;
-                        }
-                        }
-                        throw new NoSuchFieldError();
-                    }
-                }@Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -6346,8 +6420,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RefrigeratorAndTemperatureControlledCabinetMode implements BaseCluster {
-        public static final long ID = 82L;
+    public static class OvenMode implements BaseCluster {
+        public static final long ID = 73L;
         public long getID() {
             return ID;
         }
@@ -6468,17 +6542,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class LaundryWasherControls implements BaseCluster {
-        public static final long ID = 83L;
+    public static class LaundryDryerControls implements BaseCluster {
+        public static final long ID = 74L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SpinSpeeds(0L),
-            SpinSpeedCurrent(1L),
-            NumberOfRinses(2L),
-            SupportedRinses(3L),
+            SupportedDrynessLevels(0L),
+            SelectedDrynessLevel(1L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6572,16 +6644,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RvcRunMode implements BaseCluster {
-        public static final long ID = 84L;
+    public static class ModeSelect implements BaseCluster {
+        public static final long ID = 80L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SupportedModes(0L),
-            CurrentMode(1L),
-            OnMode(3L),
+            Description(0L),
+            StandardNamespace(1L),
+            SupportedModes(2L),
+            CurrentMode(3L),
+            StartUpMode(4L),
+            OnMode(5L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6693,8 +6768,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RvcCleanMode implements BaseCluster {
-        public static final long ID = 85L;
+    public static class LaundryWasherMode implements BaseCluster {
+        public static final long ID = 81L;
         public long getID() {
             return ID;
         }
@@ -6702,6 +6777,7 @@ public long getID() {
         public enum Attribute {
             SupportedModes(0L),
             CurrentMode(1L),
+            StartUpMode(2L),
             OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
@@ -6814,19 +6890,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class TemperatureControl implements BaseCluster {
-        public static final long ID = 86L;
+    public static class RefrigeratorAndTemperatureControlledCabinetMode implements BaseCluster {
+        public static final long ID = 82L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            TemperatureSetpoint(0L),
-            MinTemperature(1L),
-            MaxTemperature(2L),
-            Step(3L),
-            SelectedTemperatureLevel(4L),
-            SupportedTemperatureLevels(5L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            StartUpMode(2L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6873,7 +6947,7 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            SetTemperature(0L),;
+            ChangeToMode(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -6891,17 +6965,17 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum SetTemperatureCommandField {TargetTemperature(0),TargetTemperatureLevel(1),;
+        }public enum ChangeToModeCommandField {NewMode(0),;
                     private final int id;
-                    SetTemperatureCommandField(int id) {
+                    ChangeToModeCommandField(int id) {
                         this.id = id;
                     }
 
                     public int getID() {
                         return id;
                     }
-                    public static SetTemperatureCommandField value(int id) throws NoSuchFieldError {
-                        for (SetTemperatureCommandField field : SetTemperatureCommandField.values()) {
+                    public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
+                        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
                         if (field.getID() == id) {
                             return field;
                         }
@@ -6938,16 +7012,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RefrigeratorAlarm implements BaseCluster {
-        public static final long ID = 87L;
+    public static class LaundryWasherControls implements BaseCluster {
+        public static final long ID = 83L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            Mask(0L),
-            State(2L),
-            Supported(3L),
+            SpinSpeeds(0L),
+            SpinSpeedCurrent(1L),
+            NumberOfRinses(2L),
+            SupportedRinses(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6973,8 +7048,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {
-            Notify(0L),;
+        public enum Event {;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7042,8 +7116,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class DishwasherMode implements BaseCluster {
-        public static final long ID = 89L;
+    public static class RvcRunMode implements BaseCluster {
+        public static final long ID = 84L;
         public long getID() {
             return ID;
         }
@@ -7051,7 +7125,6 @@ public long getID() {
         public enum Attribute {
             SupportedModes(0L),
             CurrentMode(1L),
-            StartUpMode(2L),
             OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
@@ -7164,14 +7237,16 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class AirQuality implements BaseCluster {
-        public static final long ID = 91L;
+    public static class RvcCleanMode implements BaseCluster {
+        public static final long ID = 85L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            AirQuality(0L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7217,7 +7292,8 @@ public static Event value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Command {;
+        public enum Command {
+            ChangeToMode(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7235,7 +7311,24 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }@Override
+        }public enum ChangeToModeCommandField {NewMode(0),;
+                    private final int id;
+                    ChangeToModeCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
+                        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -7265,26 +7358,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class SmokeCoAlarm implements BaseCluster {
-        public static final long ID = 92L;
+    public static class TemperatureControl implements BaseCluster {
+        public static final long ID = 86L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            ExpressedState(0L),
-            SmokeState(1L),
-            COState(2L),
-            BatteryAlert(3L),
-            DeviceMuted(4L),
-            TestInProgress(5L),
-            HardwareFaultAlert(6L),
-            EndOfServiceAlert(7L),
-            InterconnectSmokeAlarm(8L),
-            InterconnectCOAlarm(9L),
-            ContaminationState(10L),
-            SmokeSensitivityLevel(11L),
-            ExpiryDate(12L),
+            TemperatureSetpoint(0L),
+            MinTemperature(1L),
+            MaxTemperature(2L),
+            Step(3L),
+            SelectedTemperatureLevel(4L),
+            SupportedTemperatureLevels(5L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7310,18 +7396,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {
-            SmokeAlarm(0L),
-            COAlarm(1L),
-            LowBattery(2L),
-            HardwareFault(3L),
-            EndOfService(4L),
-            SelfTestComplete(5L),
-            AlarmMuted(6L),
-            MuteEnded(7L),
-            InterconnectSmokeAlarm(8L),
-            InterconnectCOAlarm(9L),
-            AllClear(10L),;
+        public enum Event {;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7342,7 +7417,7 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            SelfTestRequest(0L),;
+            SetTemperature(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7360,19 +7435,36 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }@Override
-        public String getAttributeName(long id) throws NoSuchFieldError {
-            return Attribute.value(id).toString();
-        }
-
-        @Override
-        public String getEventName(long id) throws NoSuchFieldError {
-            return Event.value(id).toString();
-        }
+        }public enum SetTemperatureCommandField {TargetTemperature(0),TargetTemperatureLevel(1),;
+                    private final int id;
+                    SetTemperatureCommandField(int id) {
+                        this.id = id;
+                    }
 
-        @Override
-        public String getCommandName(long id) throws NoSuchFieldError {
-            return Command.value(id).toString();
+                    public int getID() {
+                        return id;
+                    }
+                    public static SetTemperatureCommandField value(int id) throws NoSuchFieldError {
+                        for (SetTemperatureCommandField field : SetTemperatureCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
         }
 
         @Override
@@ -7390,15 +7482,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class DishwasherAlarm implements BaseCluster {
-        public static final long ID = 93L;
+    public static class RefrigeratorAlarm implements BaseCluster {
+        public static final long ID = 87L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
             Mask(0L),
-            Latch(1L),
             State(2L),
             Supported(3L),
             GeneratedCommandList(65528L),
@@ -7447,9 +7538,7 @@ public static Event value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Command {
-            Reset(0L),
-            ModifyEnabledAlarms(1L),;
+        public enum Command {;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7467,41 +7556,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum ResetCommandField {Alarms(0),;
-                    private final int id;
-                    ResetCommandField(int id) {
-                        this.id = id;
-                    }
-
-                    public int getID() {
-                        return id;
-                    }
-                    public static ResetCommandField value(int id) throws NoSuchFieldError {
-                        for (ResetCommandField field : ResetCommandField.values()) {
-                        if (field.getID() == id) {
-                            return field;
-                        }
-                        }
-                        throw new NoSuchFieldError();
-                    }
-                }public enum ModifyEnabledAlarmsCommandField {Mask(0),;
-                    private final int id;
-                    ModifyEnabledAlarmsCommandField(int id) {
-                        this.id = id;
-                    }
-
-                    public int getID() {
-                        return id;
-                    }
-                    public static ModifyEnabledAlarmsCommandField value(int id) throws NoSuchFieldError {
-                        for (ModifyEnabledAlarmsCommandField field : ModifyEnabledAlarmsCommandField.values()) {
-                        if (field.getID() == id) {
-                            return field;
-                        }
-                        }
-                        throw new NoSuchFieldError();
-                    }
-                }@Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -7531,19 +7586,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class OperationalState implements BaseCluster {
-        public static final long ID = 96L;
+    public static class DishwasherMode implements BaseCluster {
+        public static final long ID = 89L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            PhaseList(0L),
-            CurrentPhase(1L),
-            CountdownTime(2L),
-            OperationalStateList(3L),
-            OperationalState(4L),
-            OperationalError(5L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            StartUpMode(2L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7569,9 +7622,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {
-            OperationalError(0L),
-            OperationCompletion(1L),;
+        public enum Event {;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7592,10 +7643,7 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            Pause(0L),
-            Stop(1L),
-            Start(2L),
-            Resume(3L),;
+            ChangeToMode(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7613,7 +7661,24 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }@Override
+        }public enum ChangeToModeCommandField {NewMode(0),;
+                    private final int id;
+                    ChangeToModeCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
+                        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -7643,19 +7708,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RvcOperationalState implements BaseCluster {
-        public static final long ID = 97L;
+    public static class AirQuality implements BaseCluster {
+        public static final long ID = 91L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            PhaseList(0L),
-            CurrentPhase(1L),
-            CountdownTime(2L),
-            OperationalStateList(3L),
-            OperationalState(4L),
-            OperationalError(5L),
+            AirQuality(0L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7681,9 +7741,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {
-            OperationalError(0L),
-            OperationCompletion(1L),;
+        public enum Event {;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7703,11 +7761,7 @@ public static Event value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Command {
-            Pause(0L),
-            Stop(1L),
-            Start(2L),
-            Resume(3L),;
+        public enum Command {;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7755,19 +7809,26 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class HepaFilterMonitoring implements BaseCluster {
-        public static final long ID = 113L;
+    public static class SmokeCoAlarm implements BaseCluster {
+        public static final long ID = 92L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            Condition(0L),
-            DegradationDirection(1L),
-            ChangeIndication(2L),
-            InPlaceIndicator(3L),
-            LastChangedTime(4L),
-            ReplacementProductList(5L),
+            ExpressedState(0L),
+            SmokeState(1L),
+            COState(2L),
+            BatteryAlert(3L),
+            DeviceMuted(4L),
+            TestInProgress(5L),
+            HardwareFaultAlert(6L),
+            EndOfServiceAlert(7L),
+            InterconnectSmokeAlarm(8L),
+            InterconnectCOAlarm(9L),
+            ContaminationState(10L),
+            SmokeSensitivityLevel(11L),
+            ExpiryDate(12L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7793,7 +7854,18 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {;
+        public enum Event {
+            SmokeAlarm(0L),
+            COAlarm(1L),
+            LowBattery(2L),
+            HardwareFault(3L),
+            EndOfService(4L),
+            SelfTestComplete(5L),
+            AlarmMuted(6L),
+            MuteEnded(7L),
+            InterconnectSmokeAlarm(8L),
+            InterconnectCOAlarm(9L),
+            AllClear(10L),;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7814,7 +7886,7 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            ResetCondition(0L),;
+            SelfTestRequest(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7862,19 +7934,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class ActivatedCarbonFilterMonitoring implements BaseCluster {
-        public static final long ID = 114L;
+    public static class DishwasherAlarm implements BaseCluster {
+        public static final long ID = 93L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            Condition(0L),
-            DegradationDirection(1L),
-            ChangeIndication(2L),
-            InPlaceIndicator(3L),
-            LastChangedTime(4L),
-            ReplacementProductList(5L),
+            Mask(0L),
+            Latch(1L),
+            State(2L),
+            Supported(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7900,7 +7970,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Event {;
+        public enum Event {
+            Notify(0L),;
             private final long id;
             Event(long id) {
                 this.id = id;
@@ -7921,7 +7992,8 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            ResetCondition(0L),;
+            Reset(0L),
+            ModifyEnabledAlarms(1L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7939,7 +8011,1383 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }@Override
+        }public enum ResetCommandField {Alarms(0),;
+                    private final int id;
+                    ResetCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static ResetCommandField value(int id) throws NoSuchFieldError {
+                        for (ResetCommandField field : ResetCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum ModifyEnabledAlarmsCommandField {Mask(0),;
+                    private final int id;
+                    ModifyEnabledAlarmsCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static ModifyEnabledAlarmsCommandField value(int id) throws NoSuchFieldError {
+                        for (ModifyEnabledAlarmsCommandField field : ModifyEnabledAlarmsCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class MicrowaveOvenMode implements BaseCluster {
+        public static final long ID = 94L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            SupportedModes(0L),
+            CurrentMode(1L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class MicrowaveOvenControl implements BaseCluster {
+        public static final long ID = 95L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            CookTime(1L),
+            PowerSetting(2L),
+            MinPower(3L),
+            MaxPower(4L),
+            PowerStep(5L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            SetCookingParameters(0L),
+            AddMoreTime(1L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }public enum SetCookingParametersCommandField {CookMode(0),CookTime(1),PowerSetting(2),;
+                    private final int id;
+                    SetCookingParametersCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static SetCookingParametersCommandField value(int id) throws NoSuchFieldError {
+                        for (SetCookingParametersCommandField field : SetCookingParametersCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum AddMoreTimeCommandField {TimeToAdd(0),;
+                    private final int id;
+                    AddMoreTimeCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static AddMoreTimeCommandField value(int id) throws NoSuchFieldError {
+                        for (AddMoreTimeCommandField field : AddMoreTimeCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class OperationalState implements BaseCluster {
+        public static final long ID = 96L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            PhaseList(0L),
+            CurrentPhase(1L),
+            CountdownTime(2L),
+            OperationalStateList(3L),
+            OperationalState(4L),
+            OperationalError(5L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            OperationalError(0L),
+            OperationCompletion(1L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            Pause(0L),
+            Stop(1L),
+            Start(2L),
+            Resume(3L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class RvcOperationalState implements BaseCluster {
+        public static final long ID = 97L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            PhaseList(0L),
+            CurrentPhase(1L),
+            CountdownTime(2L),
+            OperationalStateList(3L),
+            OperationalState(4L),
+            OperationalError(5L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            OperationalError(0L),
+            OperationCompletion(1L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            Pause(0L),
+            Stop(1L),
+            Start(2L),
+            Resume(3L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class HepaFilterMonitoring implements BaseCluster {
+        public static final long ID = 113L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            Condition(0L),
+            DegradationDirection(1L),
+            ChangeIndication(2L),
+            InPlaceIndicator(3L),
+            LastChangedTime(4L),
+            ReplacementProductList(5L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            ResetCondition(0L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class ActivatedCarbonFilterMonitoring implements BaseCluster {
+        public static final long ID = 114L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            Condition(0L),
+            DegradationDirection(1L),
+            ChangeIndication(2L),
+            InPlaceIndicator(3L),
+            LastChangedTime(4L),
+            ReplacementProductList(5L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            ResetCondition(0L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class BooleanSensorConfiguration implements BaseCluster {
+        public static final long ID = 128L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            SensitivityLevel(0L),
+            AlarmsActive(1L),
+            AlarmsSuppressed(2L),
+            AlarmsEnabled(3L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            AlarmsStateChanged(0L),
+            SensorFault(1L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            SuppressRequest(0L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }public enum SuppressRequestCommandField {AlarmsToSuppress(0),;
+                    private final int id;
+                    SuppressRequestCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static SuppressRequestCommandField value(int id) throws NoSuchFieldError {
+                        for (SuppressRequestCommandField field : SuppressRequestCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class ValveConfigurationAndControl implements BaseCluster {
+        public static final long ID = 129L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            OpenDuration(0L),
+            AutoCloseTime(1L),
+            RemainingDuration(2L),
+            CurrentState(3L),
+            TargetState(4L),
+            StartUpState(5L),
+            CurrentLevel(6L),
+            TargetLevel(7L),
+            OpenLevel(8L),
+            ValveFault(9L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            ValveStateChanged(0L),
+            ValveFault(1L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            Open(0L),
+            Close(1L),
+            SetLevel(2L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }public enum OpenCommandField {OpenDuration(0),;
+                    private final int id;
+                    OpenCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static OpenCommandField value(int id) throws NoSuchFieldError {
+                        for (OpenCommandField field : OpenCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum SetLevelCommandField {Level(0),OpenDuration(1),;
+                    private final int id;
+                    SetLevelCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static SetLevelCommandField value(int id) throws NoSuchFieldError {
+                        for (SetLevelCommandField field : SetLevelCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class DemandResponseLoadControl implements BaseCluster {
+        public static final long ID = 150L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            LoadControlPrograms(0L),
+            NumberOfLoadControlPrograms(1L),
+            Events(2L),
+            ActiveEvents(3L),
+            NumberOfEventsPerProgram(4L),
+            NumberOfTransitions(5L),
+            DefaultRandomStart(6L),
+            DefaultRandomDuration(7L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            LoadControlEventStatusChange(0L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            RegisterLoadControlProgramRequest(0L),
+            UnregisterLoadControlProgramRequest(1L),
+            AddLoadControlEventRequest(2L),
+            RemoveLoadControlEventRequest(3L),
+            ClearLoadControlEventsRequest(4L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }public enum RegisterLoadControlProgramRequestCommandField {LoadControlProgram(0),;
+                    private final int id;
+                    RegisterLoadControlProgramRequestCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static RegisterLoadControlProgramRequestCommandField value(int id) throws NoSuchFieldError {
+                        for (RegisterLoadControlProgramRequestCommandField field : RegisterLoadControlProgramRequestCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum UnregisterLoadControlProgramRequestCommandField {LoadControlProgramID(0),;
+                    private final int id;
+                    UnregisterLoadControlProgramRequestCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static UnregisterLoadControlProgramRequestCommandField value(int id) throws NoSuchFieldError {
+                        for (UnregisterLoadControlProgramRequestCommandField field : UnregisterLoadControlProgramRequestCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum AddLoadControlEventRequestCommandField {Event(0),;
+                    private final int id;
+                    AddLoadControlEventRequestCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static AddLoadControlEventRequestCommandField value(int id) throws NoSuchFieldError {
+                        for (AddLoadControlEventRequestCommandField field : AddLoadControlEventRequestCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum RemoveLoadControlEventRequestCommandField {EventID(0),CancelControl(1),;
+                    private final int id;
+                    RemoveLoadControlEventRequestCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static RemoveLoadControlEventRequestCommandField value(int id) throws NoSuchFieldError {
+                        for (RemoveLoadControlEventRequestCommandField field : RemoveLoadControlEventRequestCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
+        public String getAttributeName(long id) throws NoSuchFieldError {
+            return Attribute.value(id).toString();
+        }
+
+        @Override
+        public String getEventName(long id) throws NoSuchFieldError {
+            return Event.value(id).toString();
+        }
+
+        @Override
+        public String getCommandName(long id) throws NoSuchFieldError {
+            return Command.value(id).toString();
+        }
+
+        @Override
+        public long getAttributeID(String name) throws IllegalArgumentException {
+            return Attribute.valueOf(name).getID();
+        }
+
+        @Override
+        public long getEventID(String name) throws IllegalArgumentException {
+            return Event.valueOf(name).getID();
+        }
+
+        @Override
+        public long getCommandID(String name) throws IllegalArgumentException {
+            return Command.valueOf(name).getID();
+        }
+    }
+    public static class EnergyEvse implements BaseCluster {
+        public static final long ID = 153L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            State(0L),
+            SupplyState(1L),
+            FaultState(2L),
+            ChargingEnabledUntil(3L),
+            DischargingEnabledUntil(4L),
+            CircuitCapacity(5L),
+            MinimumChargeCurrent(6L),
+            MaximumChargeCurrent(7L),
+            MaximumDischargeCurrent(8L),
+            UserMaximumChargeCurrent(9L),
+            RandomizationDelayWindow(10L),
+            NumberOfWeeklyTargets(33L),
+            NumberOfDailyTargets(34L),
+            NextChargeStartTime(35L),
+            NextChargeTargetTime(36L),
+            NextChargeRequiredEnergy(37L),
+            NextChargeTargetSoC(38L),
+            ApproximateEVEfficiency(39L),
+            StateOfCharge(48L),
+            BatteryCapacity(49L),
+            VehicleID(50L),
+            SessionID(64L),
+            SessionDuration(65L),
+            SessionEnergyCharged(66L),
+            SessionEnergyDischarged(67L),
+            GeneratedCommandList(65528L),
+            AcceptedCommandList(65529L),
+            EventList(65530L),
+            AttributeList(65531L),
+            FeatureMap(65532L),
+            ClusterRevision(65533L),;
+            private final long id;
+            Attribute(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Attribute value(long id) throws NoSuchFieldError {
+                for (Attribute attribute : Attribute.values()) {
+                    if (attribute.getID() == id) {
+                        return attribute;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Event {
+            EVConnected(0L),
+            EVNotDetected(1L),
+            EnergyTransferStarted(2L),
+            EnergyTransferStopped(3L),
+            Fault(4L),
+            RFID(5L),;
+            private final long id;
+            Event(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Event value(long id) throws NoSuchFieldError {
+                for (Event event : Event.values()) {
+                    if (event.getID() == id) {
+                        return event;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }
+
+        public enum Command {
+            Disable(1L),
+            EnableCharging(2L),
+            EnableDischarging(3L),
+            StartDiagnostics(4L),
+            SetTargets(5L),
+            GetTargets(6L),
+            ClearTargets(7L),;
+            private final long id;
+            Command(long id) {
+                this.id = id;
+            }
+
+            public long getID() {
+                return id;
+            }
+
+            public static Command value(long id) throws NoSuchFieldError {
+                for (Command command : Command.values()) {
+                    if (command.getID() == id) {
+                        return command;
+                    }
+                }
+                throw new NoSuchFieldError();
+            }
+        }public enum EnableChargingCommandField {ChargingEnabledUntil(0),MinimumChargeCurrent(1),MaximumChargeCurrent(2),;
+                    private final int id;
+                    EnableChargingCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static EnableChargingCommandField value(int id) throws NoSuchFieldError {
+                        for (EnableChargingCommandField field : EnableChargingCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum EnableDischargingCommandField {DischargingEnabledUntil(0),MaximumDischargeCurrent(1),;
+                    private final int id;
+                    EnableDischargingCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static EnableDischargingCommandField value(int id) throws NoSuchFieldError {
+                        for (EnableDischargingCommandField field : EnableDischargingCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum SetTargetsCommandField {DayOfWeekforSequence(0),ChargingTargets(1),;
+                    private final int id;
+                    SetTargetsCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static SetTargetsCommandField value(int id) throws NoSuchFieldError {
+                        for (SetTargetsCommandField field : SetTargetsCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }public enum GetTargetsCommandField {DaysToReturn(0),;
+                    private final int id;
+                    GetTargetsCommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static GetTargetsCommandField value(int id) throws NoSuchFieldError {
+                        for (GetTargetsCommandField field : GetTargetsCommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -11719,6 +13167,7 @@ public long getID() {
 
         public enum Attribute {
             MACAddress(0L),
+            LinkLocalAddress(1L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
index a051e4d5b071b8..b54bf0d5ffa116 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -750,6 +750,27 @@ public void onError(Exception ex) {
     }
   }
 
+  public static class DelegatedScenesClusterFabricSceneInfoAttributeCallback implements ChipClusters.ScenesCluster.FabricSceneInfoAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ScenesClusterSceneInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ScenesClusterSceneInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
   public static class DelegatedScenesClusterGeneratedCommandListAttributeCallback implements ChipClusters.ScenesCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
@@ -3294,7 +3315,7 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex) {
+    public void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex, Optional<byte[]> clientIdentity, Optional<byte[]> possessionSignature) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
 
       CommandResponseInfo networkingStatusResponseValue = new CommandResponseInfo("networkingStatus", "Integer");
@@ -3303,6 +3324,10 @@ public void onSuccess(Integer networkingStatus, Optional<String> debugText, Opti
       responseValues.put(debugTextResponseValue, debugText);
       CommandResponseInfo networkIndexResponseValue = new CommandResponseInfo("networkIndex", "Optional<Integer>");
       responseValues.put(networkIndexResponseValue, networkIndex);
+      CommandResponseInfo clientIdentityResponseValue = new CommandResponseInfo("clientIdentity", "Optional<byte[]>");
+      responseValues.put(clientIdentityResponseValue, clientIdentity);
+      CommandResponseInfo possessionSignatureResponseValue = new CommandResponseInfo("possessionSignature", "Optional<byte[]>");
+      responseValues.put(possessionSignatureResponseValue, possessionSignature);
       callback.onSuccess(responseValues);
     }
 
@@ -3337,6 +3362,30 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
+
+  public static class DelegatedNetworkCommissioningClusterQueryIdentityResponseCallback implements ChipClusters.NetworkCommissioningCluster.QueryIdentityResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] identity, Optional<byte[]> possessionSignature) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo identityResponseValue = new CommandResponseInfo("identity", "byte[]");
+      responseValues.put(identityResponseValue, identity);
+      CommandResponseInfo possessionSignatureResponseValue = new CommandResponseInfo("possessionSignature", "Optional<byte[]>");
+      responseValues.put(possessionSignatureResponseValue, possessionSignature);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
   public static class DelegatedNetworkCommissioningClusterNetworksAttributeCallback implements ChipClusters.NetworkCommissioningCluster.NetworksAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
@@ -3638,6 +3687,30 @@ public void onError(Exception ex) {
     }
   }
 
+
+  public static class DelegatedGeneralDiagnosticsClusterTimeSnapshotResponseCallback implements ChipClusters.GeneralDiagnosticsCluster.TimeSnapshotResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo systemTimeUsResponseValue = new CommandResponseInfo("systemTimeUs", "Long");
+      responseValues.put(systemTimeUsResponseValue, systemTimeUs);
+      CommandResponseInfo UTCTimeUsResponseValue = new CommandResponseInfo("UTCTimeUs", "Long");
+      responseValues.put(UTCTimeUsResponseValue, UTCTimeUs);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
   public static class DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
@@ -6448,7 +6521,8 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedIcdManagementClusterRegisteredClientsAttributeCallback implements ChipClusters.IcdManagementCluster.RegisteredClientsAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedIcdManagementClusterStayActiveResponseCallback implements ChipClusters.IcdManagementCluster.StayActiveResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6456,20 +6530,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> valueList) {
+    public void onSuccess(Long promisedActiveDuration) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+
+      CommandResponseInfo promisedActiveDurationResponseValue = new CommandResponseInfo("promisedActiveDuration", "Long");
+      responseValues.put(promisedActiveDurationResponseValue, promisedActiveDuration);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
-
-  public static class DelegatedIcdManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIcdManagementClusterRegisteredClientsAttributeCallback implements ChipClusters.IcdManagementCluster.RegisteredClientsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6477,9 +6551,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6490,7 +6564,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIcdManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIcdManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6511,7 +6585,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIcdManagementClusterEventListAttributeCallback implements ChipClusters.IcdManagementCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIcdManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6532,7 +6606,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIcdManagementClusterAttributeListAttributeCallback implements ChipClusters.IcdManagementCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIcdManagementClusterEventListAttributeCallback implements ChipClusters.IcdManagementCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6553,28 +6627,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterStandardNamespaceAttributeCallback implements ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(@Nullable Integer value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
-  }
-
-  public static class DelegatedModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIcdManagementClusterAttributeListAttributeCallback implements ChipClusters.IcdManagementCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6582,9 +6635,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6595,7 +6648,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.ModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimerCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6603,10 +6656,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -6616,7 +6669,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterOnModeAttributeCallback implements ChipClusters.ModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimerCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6624,10 +6677,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -6637,7 +6690,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterEventListAttributeCallback implements ChipClusters.TimerCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6658,7 +6711,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterAttributeListAttributeCallback implements ChipClusters.TimerCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6679,7 +6732,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedOvenCavityOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OvenCavityOperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6687,20 +6741,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct commandResponseState) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+
+      // commandResponseState: Struct ErrorStateStruct
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
-
-  public static class DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6708,9 +6762,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable List<String> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6721,8 +6775,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6730,22 +6783,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> statusText) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
-      responseValues.put(statusTextResponseValue, statusText);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
-  public static class DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedOvenCavityOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6753,10 +6804,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.LaundryWasherModeClusterModeOptionStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -6766,7 +6817,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6774,10 +6825,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(List<ChipStructs.OvenCavityOperationalStateClusterOperationalStateStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OvenCavityOperationalStateClusterOperationalStateStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -6787,7 +6838,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6795,9 +6846,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct");
       responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
@@ -6808,7 +6859,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6829,7 +6880,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6850,7 +6901,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterEventListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6871,7 +6922,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenCavityOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.OvenCavityOperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6893,7 +6944,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterChangeToModeResponseCallback implements ChipClusters.OvenModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6916,7 +6967,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterSupportedModesAttributeCallback implements ChipClusters.OvenModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6924,9 +6975,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.OvenModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OvenModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6937,7 +6988,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterStartUpModeAttributeCallback implements ChipClusters.OvenModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6958,7 +7009,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterOnModeAttributeCallback implements ChipClusters.OvenModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6979,7 +7030,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.OvenModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7000,7 +7051,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.OvenModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7021,7 +7072,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterEventListAttributeCallback implements ChipClusters.OvenModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7042,7 +7093,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterAttributeListAttributeCallback implements ChipClusters.OvenModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7063,7 +7114,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterSupportedDrynessLevelsAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.SupportedDrynessLevelsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7071,9 +7122,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<String> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7084,7 +7135,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterSelectedDrynessLevelAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.SelectedDrynessLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7105,7 +7156,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7113,9 +7164,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7126,7 +7177,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7147,7 +7198,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterEventListAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7168,7 +7219,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryDryerControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryDryerControlsCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7189,7 +7240,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterStandardNamespaceAttributeCallback implements ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7197,10 +7248,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -7210,8 +7261,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7219,22 +7269,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> statusText) {
+    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
-      responseValues.put(statusTextResponseValue, statusText);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
-  public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.ModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7242,10 +7290,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -7255,7 +7303,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterOnModeAttributeCallback implements ChipClusters.ModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7276,7 +7324,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7297,7 +7345,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7318,7 +7366,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7339,7 +7387,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7361,7 +7409,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7384,7 +7432,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7392,9 +7440,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.LaundryWasherModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7405,7 +7453,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7426,7 +7474,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7434,10 +7482,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -7447,7 +7495,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7468,7 +7516,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7489,7 +7537,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7510,7 +7558,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterSupportedTemperatureLevelsAttributeCallback implements ChipClusters.TemperatureControlCluster.SupportedTemperatureLevelsAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7518,9 +7566,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<String> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7531,7 +7579,94 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7552,7 +7687,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7573,7 +7708,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7594,7 +7729,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7615,7 +7750,70 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7636,7 +7834,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7657,7 +7855,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7678,7 +7876,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7700,7 +7898,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7723,7 +7921,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7731,9 +7929,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DishwasherModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7744,7 +7942,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7765,7 +7963,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7773,10 +7971,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -7786,7 +7984,1485 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterSupportedTemperatureLevelsAttributeCallback implements ChipClusters.TemperatureControlCluster.SupportedTemperatureLevelsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DishwasherModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterAttributeListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenModeClusterSupportedModesAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenModeClusterEventListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenModeClusterAttributeListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenControlClusterEventListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMicrowaveOvenControlClusterAttributeListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // commandResponseState: Struct ErrorStateStruct
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalStateClusterOperationalStateStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.OperationalStateClusterErrorStateStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterEventListAttributeCallback implements ChipClusters.OperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.OperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // commandResponseState: Struct ErrorStateStruct
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRvcOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.RvcOperationalStateClusterErrorStateStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterEventListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7807,7 +9483,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedHepaFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7828,7 +9504,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedHepaFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7849,7 +9525,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedHepaFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7870,7 +9546,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7878,10 +9554,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -7891,7 +9567,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7899,9 +9575,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7912,7 +9588,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7933,7 +9609,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7954,7 +9630,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7975,7 +9651,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7996,7 +9672,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8017,7 +9693,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8038,7 +9714,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterEventListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8059,7 +9735,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterAttributeListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8080,7 +9756,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterOpenDurationAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.OpenDurationAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8088,10 +9764,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8101,7 +9777,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterAttributeListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAutoCloseTimeAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AutoCloseTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8109,10 +9785,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8122,8 +9798,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterRemainingDurationAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.RemainingDurationAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8131,20 +9806,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-
-      // commandResponseState: Struct ErrorStateStruct
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
-  public static class DelegatedOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedValveConfigurationAndControlClusterCurrentStateAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.CurrentStateAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8152,10 +9827,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable List<String> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8165,7 +9840,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterTargetStateAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.TargetStateAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8186,7 +9861,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterCurrentLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.CurrentLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8194,9 +9869,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Long value) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
       responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
@@ -8207,7 +9882,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterTargetLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.TargetLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8215,10 +9890,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalStateClusterOperationalStateStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8228,7 +9903,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterOpenLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.OpenLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8236,9 +9911,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.OperationalStateClusterErrorStateStruct");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
       responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
@@ -8249,7 +9924,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8270,7 +9945,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8291,7 +9966,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterEventListAttributeCallback implements ChipClusters.OperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterEventListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8312,7 +9987,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.OperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAttributeListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8333,8 +10008,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterLoadControlProgramsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.LoadControlProgramsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8342,20 +10016,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-
-      // commandResponseState: Struct ErrorStateStruct
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
-  public static class DelegatedRvcOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedDemandResponseLoadControlClusterEventsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.EventsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8363,9 +10037,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable List<String> valueList) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8376,7 +10050,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterActiveEventsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.ActiveEventsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8384,10 +10058,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer value) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -8397,7 +10071,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8405,10 +10079,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Long value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -8418,7 +10092,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8426,9 +10100,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8439,7 +10113,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterEventListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8447,10 +10121,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.RvcOperationalStateClusterErrorStateStruct");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -8460,7 +10134,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterAttributeListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8481,7 +10155,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedEnergyEvseClusterGetTargetsResponseCallback implements ChipClusters.EnergyEvseCluster.GetTargetsResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8489,10 +10164,34 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer dayOfWeekforSequence, ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+
+      CommandResponseInfo dayOfWeekforSequenceResponseValue = new CommandResponseInfo("dayOfWeekforSequence", "Integer");
+      responseValues.put(dayOfWeekforSequenceResponseValue, dayOfWeekforSequence);
+      // chargingTargets: ChargingTargetStruct
+      // Conversion from this type to Java is not properly implemented yet
+
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedEnergyEvseClusterStateAttributeCallback implements ChipClusters.EnergyEvseCluster.StateAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8502,7 +10201,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterEventListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterChargingEnabledUntilAttributeCallback implements ChipClusters.EnergyEvseCluster.ChargingEnabledUntilAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8510,10 +10209,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8523,7 +10222,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterDischargingEnabledUntilAttributeCallback implements ChipClusters.EnergyEvseCluster.DischargingEnabledUntilAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8531,10 +10230,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8544,7 +10243,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterNextChargeStartTimeAttributeCallback implements ChipClusters.EnergyEvseCluster.NextChargeStartTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8565,7 +10264,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterNextChargeTargetTimeAttributeCallback implements ChipClusters.EnergyEvseCluster.NextChargeTargetTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8573,10 +10272,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8586,7 +10285,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterNextChargeRequiredEnergyAttributeCallback implements ChipClusters.EnergyEvseCluster.NextChargeRequiredEnergyAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8594,10 +10293,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8607,7 +10306,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterNextChargeTargetSoCAttributeCallback implements ChipClusters.EnergyEvseCluster.NextChargeTargetSoCAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8615,10 +10314,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8628,7 +10327,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterApproximateEVEfficiencyAttributeCallback implements ChipClusters.EnergyEvseCluster.ApproximateEVEfficiencyAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8636,10 +10335,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8649,7 +10348,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterStateOfChargeAttributeCallback implements ChipClusters.EnergyEvseCluster.StateOfChargeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8657,10 +10356,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8670,7 +10369,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterBatteryCapacityAttributeCallback implements ChipClusters.EnergyEvseCluster.BatteryCapacityAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8691,7 +10390,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterVehicleIDAttributeCallback implements ChipClusters.EnergyEvseCluster.VehicleIDAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8699,10 +10398,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> valueList) {
+    public void onSuccess(@Nullable String value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8712,7 +10411,28 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterSessionIDAttributeCallback implements ChipClusters.EnergyEvseCluster.SessionIDAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedEnergyEvseClusterGeneratedCommandListAttributeCallback implements ChipClusters.EnergyEvseCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8733,7 +10453,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterAcceptedCommandListAttributeCallback implements ChipClusters.EnergyEvseCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8754,7 +10474,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterEventListAttributeCallback implements ChipClusters.EnergyEvseCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8775,7 +10495,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedEnergyEvseClusterAttributeListAttributeCallback implements ChipClusters.EnergyEvseCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -16993,6 +18713,22 @@ public Map<String, ClusterInfo> initializeClusterMap() {
       (ptr, endpointId) -> new ChipClusters.IcdManagementCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("icdManagement", icdManagementClusterInfo);
 
+    ClusterInfo timerClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TimerCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("timer", timerClusterInfo);
+
+    ClusterInfo ovenCavityOperationalStateClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OvenCavityOperationalStateCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ovenCavityOperationalState", ovenCavityOperationalStateClusterInfo);
+
+    ClusterInfo ovenModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OvenModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ovenMode", ovenModeClusterInfo);
+
+    ClusterInfo laundryDryerControlsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LaundryDryerControlsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("laundryDryerControls", laundryDryerControlsClusterInfo);
+
     ClusterInfo modeSelectClusterInfo = new ClusterInfo(
       (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("modeSelect", modeSelectClusterInfo);
@@ -17041,6 +18777,14 @@ public Map<String, ClusterInfo> initializeClusterMap() {
       (ptr, endpointId) -> new ChipClusters.DishwasherAlarmCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("dishwasherAlarm", dishwasherAlarmClusterInfo);
 
+    ClusterInfo microwaveOvenModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.MicrowaveOvenModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("microwaveOvenMode", microwaveOvenModeClusterInfo);
+
+    ClusterInfo microwaveOvenControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.MicrowaveOvenControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("microwaveOvenControl", microwaveOvenControlClusterInfo);
+
     ClusterInfo operationalStateClusterInfo = new ClusterInfo(
       (ptr, endpointId) -> new ChipClusters.OperationalStateCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("operationalState", operationalStateClusterInfo);
@@ -17057,6 +18801,22 @@ public Map<String, ClusterInfo> initializeClusterMap() {
       (ptr, endpointId) -> new ChipClusters.ActivatedCarbonFilterMonitoringCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInfo);
 
+    ClusterInfo booleanSensorConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BooleanSensorConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("booleanSensorConfiguration", booleanSensorConfigurationClusterInfo);
+
+    ClusterInfo valveConfigurationAndControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ValveConfigurationAndControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("valveConfigurationAndControl", valveConfigurationAndControlClusterInfo);
+
+    ClusterInfo demandResponseLoadControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DemandResponseLoadControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("demandResponseLoadControl", demandResponseLoadControlClusterInfo);
+
+    ClusterInfo energyEvseClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.EnergyEvseCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("energyEvse", energyEvseClusterInfo);
+
     ClusterInfo doorLockClusterInfo = new ClusterInfo(
       (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("doorLock", doorLockClusterInfo);
@@ -17266,6 +19026,10 @@ public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map
     destination.get("proxyValid").combineCommands(source.get("proxyValid"));
     destination.get("booleanState").combineCommands(source.get("booleanState"));
     destination.get("icdManagement").combineCommands(source.get("icdManagement"));
+    destination.get("timer").combineCommands(source.get("timer"));
+    destination.get("ovenCavityOperationalState").combineCommands(source.get("ovenCavityOperationalState"));
+    destination.get("ovenMode").combineCommands(source.get("ovenMode"));
+    destination.get("laundryDryerControls").combineCommands(source.get("laundryDryerControls"));
     destination.get("modeSelect").combineCommands(source.get("modeSelect"));
     destination.get("laundryWasherMode").combineCommands(source.get("laundryWasherMode"));
     destination.get("refrigeratorAndTemperatureControlledCabinetMode").combineCommands(source.get("refrigeratorAndTemperatureControlledCabinetMode"));
@@ -17278,10 +19042,16 @@ public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map
     destination.get("airQuality").combineCommands(source.get("airQuality"));
     destination.get("smokeCoAlarm").combineCommands(source.get("smokeCoAlarm"));
     destination.get("dishwasherAlarm").combineCommands(source.get("dishwasherAlarm"));
+    destination.get("microwaveOvenMode").combineCommands(source.get("microwaveOvenMode"));
+    destination.get("microwaveOvenControl").combineCommands(source.get("microwaveOvenControl"));
     destination.get("operationalState").combineCommands(source.get("operationalState"));
     destination.get("rvcOperationalState").combineCommands(source.get("rvcOperationalState"));
     destination.get("hepaFilterMonitoring").combineCommands(source.get("hepaFilterMonitoring"));
     destination.get("activatedCarbonFilterMonitoring").combineCommands(source.get("activatedCarbonFilterMonitoring"));
+    destination.get("booleanSensorConfiguration").combineCommands(source.get("booleanSensorConfiguration"));
+    destination.get("valveConfigurationAndControl").combineCommands(source.get("valveConfigurationAndControl"));
+    destination.get("demandResponseLoadControl").combineCommands(source.get("demandResponseLoadControl"));
+    destination.get("energyEvse").combineCommands(source.get("energyEvse"));
     destination.get("doorLock").combineCommands(source.get("doorLock"));
     destination.get("windowCovering").combineCommands(source.get("windowCovering"));
     destination.get("barrierControl").combineCommands(source.get("barrierControl"));
@@ -18751,6 +20521,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("breadcrumb",networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworknetworkIdentityCommandParameterInfo = new CommandParameterInfo("networkIdentity", Optional.class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("networkIdentity",networkCommissioningaddOrUpdateWiFiNetworknetworkIdentityCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkclientIdentifierCommandParameterInfo = new CommandParameterInfo("clientIdentifier", Optional.class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("clientIdentifier",networkCommissioningaddOrUpdateWiFiNetworkclientIdentifierCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkpossessionNonceCommandParameterInfo = new CommandParameterInfo("possessionNonce", Optional.class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("possessionNonce",networkCommissioningaddOrUpdateWiFiNetworkpossessionNonceCommandParameterInfo);
     InteractionInfo networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo = new InteractionInfo(
       (cluster, callback, commandArguments) -> {
         ((ChipClusters.NetworkCommissioningCluster) cluster)
@@ -18761,8 +20540,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
            , (byte[])
              commandArguments.get("credentials")
 
-           , (Optional<Long>)
-             commandArguments.get("breadcrumb")
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+           , (Optional<byte[]>)
+             commandArguments.get("networkIdentity")
+
+           , (Optional<byte[]>)
+             commandArguments.get("clientIdentifier")
+
+           , (Optional<byte[]>)
+             commandArguments.get("possessionNonce")
 
             );
         },
@@ -18873,6 +20661,30 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
       );
     networkCommissioningClusterInteractionInfoMap.put("reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
 
+    Map<String, CommandParameterInfo> networkCommissioningqueryIdentityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningqueryIdentitykeyIdentifierCommandParameterInfo = new CommandParameterInfo("keyIdentifier", byte[].class, byte[].class);
+    networkCommissioningqueryIdentityCommandParams.put("keyIdentifier",networkCommissioningqueryIdentitykeyIdentifierCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningqueryIdentitypossessionNonceCommandParameterInfo = new CommandParameterInfo("possessionNonce", Optional.class, byte[].class);
+    networkCommissioningqueryIdentityCommandParams.put("possessionNonce",networkCommissioningqueryIdentitypossessionNonceCommandParameterInfo);
+    InteractionInfo networkCommissioningqueryIdentityInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .queryIdentity((ChipClusters.NetworkCommissioningCluster.QueryIdentityResponseCallback) callback
+           , (byte[])
+             commandArguments.get("keyIdentifier")
+
+           , (Optional<byte[]>)
+             commandArguments.get("possessionNonce")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterQueryIdentityResponseCallback(),
+        networkCommissioningqueryIdentityCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("queryIdentity", networkCommissioningqueryIdentityInteractionInfo);
+
     commandMap.put("networkCommissioning", networkCommissioningClusterInteractionInfoMap);
 
     Map<String, InteractionInfo> diagnosticLogsClusterInteractionInfoMap = new LinkedHashMap<>();
@@ -18933,6 +20745,18 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     );
     generalDiagnosticsClusterInteractionInfoMap.put("testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
 
+    Map<String, CommandParameterInfo> generalDiagnosticstimeSnapshotCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo generalDiagnosticstimeSnapshotInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+          .timeSnapshot((ChipClusters.GeneralDiagnosticsCluster.TimeSnapshotResponseCallback) callback
+            );
+        },
+        () -> new DelegatedGeneralDiagnosticsClusterTimeSnapshotResponseCallback(),
+        generalDiagnosticstimeSnapshotCommandParams
+      );
+    generalDiagnosticsClusterInteractionInfoMap.put("timeSnapshot", generalDiagnosticstimeSnapshotInteractionInfo);
+
     commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
 
     Map<String, InteractionInfo> softwareDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
@@ -19508,15 +21332,160 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     InteractionInfo icdManagementstayActiveRequestInteractionInfo = new InteractionInfo(
       (cluster, callback, commandArguments) -> {
         ((ChipClusters.IcdManagementCluster) cluster)
-        .stayActiveRequest((DefaultClusterCallback) callback
+          .stayActiveRequest((ChipClusters.IcdManagementCluster.StayActiveResponseCallback) callback
+            );
+        },
+        () -> new DelegatedIcdManagementClusterStayActiveResponseCallback(),
+        icdManagementstayActiveRequestCommandParams
+      );
+    icdManagementClusterInteractionInfoMap.put("stayActiveRequest", icdManagementstayActiveRequestInteractionInfo);
+
+    commandMap.put("icdManagement", icdManagementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> timerClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> timersetTimerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo timersetTimernewTimeCommandParameterInfo = new CommandParameterInfo("newTime", Long.class, Long.class);
+    timersetTimerCommandParams.put("newTime",timersetTimernewTimeCommandParameterInfo);
+    InteractionInfo timersetTimerInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimerCluster) cluster)
+        .setTimer((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("newTime")
         );
       },
       () -> new DelegatedDefaultClusterCallback(),
-        icdManagementstayActiveRequestCommandParams
+        timersetTimerCommandParams
     );
-    icdManagementClusterInteractionInfoMap.put("stayActiveRequest", icdManagementstayActiveRequestInteractionInfo);
+    timerClusterInteractionInfoMap.put("setTimer", timersetTimerInteractionInfo);
 
-    commandMap.put("icdManagement", icdManagementClusterInteractionInfoMap);
+    Map<String, CommandParameterInfo> timerresetTimerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo timerresetTimerInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimerCluster) cluster)
+        .resetTimer((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timerresetTimerCommandParams
+    );
+    timerClusterInteractionInfoMap.put("resetTimer", timerresetTimerInteractionInfo);
+
+    Map<String, CommandParameterInfo> timeraddTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo timeraddTimeadditionalTimeCommandParameterInfo = new CommandParameterInfo("additionalTime", Long.class, Long.class);
+    timeraddTimeCommandParams.put("additionalTime",timeraddTimeadditionalTimeCommandParameterInfo);
+    InteractionInfo timeraddTimeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimerCluster) cluster)
+        .addTime((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("additionalTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timeraddTimeCommandParams
+    );
+    timerClusterInteractionInfoMap.put("addTime", timeraddTimeInteractionInfo);
+
+    Map<String, CommandParameterInfo> timerreduceTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo timerreduceTimetimeReductionCommandParameterInfo = new CommandParameterInfo("timeReduction", Long.class, Long.class);
+    timerreduceTimeCommandParams.put("timeReduction",timerreduceTimetimeReductionCommandParameterInfo);
+    InteractionInfo timerreduceTimeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimerCluster) cluster)
+        .reduceTime((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("timeReduction")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timerreduceTimeCommandParams
+    );
+    timerClusterInteractionInfoMap.put("reduceTime", timerreduceTimeInteractionInfo);
+
+    commandMap.put("timer", timerClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> ovenCavityOperationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> ovenCavityOperationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo ovenCavityOperationalStatepauseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenCavityOperationalStateCluster) cluster)
+          .pause((ChipClusters.OvenCavityOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOvenCavityOperationalStateClusterOperationalCommandResponseCallback(),
+        ovenCavityOperationalStatepauseCommandParams
+      );
+    ovenCavityOperationalStateClusterInteractionInfoMap.put("pause", ovenCavityOperationalStatepauseInteractionInfo);
+
+    Map<String, CommandParameterInfo> ovenCavityOperationalStatestopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo ovenCavityOperationalStatestopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenCavityOperationalStateCluster) cluster)
+          .stop((ChipClusters.OvenCavityOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOvenCavityOperationalStateClusterOperationalCommandResponseCallback(),
+        ovenCavityOperationalStatestopCommandParams
+      );
+    ovenCavityOperationalStateClusterInteractionInfoMap.put("stop", ovenCavityOperationalStatestopInteractionInfo);
+
+    Map<String, CommandParameterInfo> ovenCavityOperationalStatestartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo ovenCavityOperationalStatestartInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenCavityOperationalStateCluster) cluster)
+          .start((ChipClusters.OvenCavityOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOvenCavityOperationalStateClusterOperationalCommandResponseCallback(),
+        ovenCavityOperationalStatestartCommandParams
+      );
+    ovenCavityOperationalStateClusterInteractionInfoMap.put("start", ovenCavityOperationalStatestartInteractionInfo);
+
+    Map<String, CommandParameterInfo> ovenCavityOperationalStateresumeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo ovenCavityOperationalStateresumeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenCavityOperationalStateCluster) cluster)
+          .resume((ChipClusters.OvenCavityOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOvenCavityOperationalStateClusterOperationalCommandResponseCallback(),
+        ovenCavityOperationalStateresumeCommandParams
+      );
+    ovenCavityOperationalStateClusterInteractionInfoMap.put("resume", ovenCavityOperationalStateresumeInteractionInfo);
+
+    commandMap.put("ovenCavityOperationalState", ovenCavityOperationalStateClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> ovenModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> ovenModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo ovenModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    ovenModechangeToModeCommandParams.put("newMode",ovenModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo ovenModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenModeCluster) cluster)
+          .changeToMode((ChipClusters.OvenModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedOvenModeClusterChangeToModeResponseCallback(),
+        ovenModechangeToModeCommandParams
+      );
+    ovenModeClusterInteractionInfoMap.put("changeToMode", ovenModechangeToModeInteractionInfo);
+
+    commandMap.put("ovenMode", ovenModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> laundryDryerControlsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("laundryDryerControls", laundryDryerControlsClusterInteractionInfoMap);
 
     Map<String, InteractionInfo> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
 
@@ -19741,6 +21710,58 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     commandMap.put("dishwasherAlarm", dishwasherAlarmClusterInteractionInfoMap);
 
+    Map<String, InteractionInfo> microwaveOvenModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("microwaveOvenMode", microwaveOvenModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> microwaveOvenControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> microwaveOvenControlsetCookingParametersCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo microwaveOvenControlsetCookingParameterscookModeCommandParameterInfo = new CommandParameterInfo("cookMode", Optional.class, Integer.class);
+    microwaveOvenControlsetCookingParametersCommandParams.put("cookMode",microwaveOvenControlsetCookingParameterscookModeCommandParameterInfo);
+
+    CommandParameterInfo microwaveOvenControlsetCookingParameterscookTimeCommandParameterInfo = new CommandParameterInfo("cookTime", Optional.class, Long.class);
+    microwaveOvenControlsetCookingParametersCommandParams.put("cookTime",microwaveOvenControlsetCookingParameterscookTimeCommandParameterInfo);
+
+    CommandParameterInfo microwaveOvenControlsetCookingParameterspowerSettingCommandParameterInfo = new CommandParameterInfo("powerSetting", Optional.class, Integer.class);
+    microwaveOvenControlsetCookingParametersCommandParams.put("powerSetting",microwaveOvenControlsetCookingParameterspowerSettingCommandParameterInfo);
+    InteractionInfo microwaveOvenControlsetCookingParametersInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MicrowaveOvenControlCluster) cluster)
+        .setCookingParameters((DefaultClusterCallback) callback
+        , (Optional<Integer>)
+        commandArguments.get("cookMode")
+        , (Optional<Long>)
+        commandArguments.get("cookTime")
+        , (Optional<Integer>)
+        commandArguments.get("powerSetting")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        microwaveOvenControlsetCookingParametersCommandParams
+    );
+    microwaveOvenControlClusterInteractionInfoMap.put("setCookingParameters", microwaveOvenControlsetCookingParametersInteractionInfo);
+
+    Map<String, CommandParameterInfo> microwaveOvenControladdMoreTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo microwaveOvenControladdMoreTimetimeToAddCommandParameterInfo = new CommandParameterInfo("timeToAdd", Long.class, Long.class);
+    microwaveOvenControladdMoreTimeCommandParams.put("timeToAdd",microwaveOvenControladdMoreTimetimeToAddCommandParameterInfo);
+    InteractionInfo microwaveOvenControladdMoreTimeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MicrowaveOvenControlCluster) cluster)
+        .addMoreTime((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("timeToAdd")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        microwaveOvenControladdMoreTimeCommandParams
+    );
+    microwaveOvenControlClusterInteractionInfoMap.put("addMoreTime", microwaveOvenControladdMoreTimeInteractionInfo);
+
+    commandMap.put("microwaveOvenControl", microwaveOvenControlClusterInteractionInfoMap);
+
     Map<String, InteractionInfo> operationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
 
     Map<String, CommandParameterInfo> operationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
@@ -19877,6 +21898,294 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     commandMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInteractionInfoMap);
 
+    Map<String, InteractionInfo> booleanSensorConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> booleanSensorConfigurationsuppressRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo booleanSensorConfigurationsuppressRequestalarmsToSuppressCommandParameterInfo = new CommandParameterInfo("alarmsToSuppress", Integer.class, Integer.class);
+    booleanSensorConfigurationsuppressRequestCommandParams.put("alarmsToSuppress",booleanSensorConfigurationsuppressRequestalarmsToSuppressCommandParameterInfo);
+    InteractionInfo booleanSensorConfigurationsuppressRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BooleanSensorConfigurationCluster) cluster)
+        .suppressRequest((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("alarmsToSuppress")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        booleanSensorConfigurationsuppressRequestCommandParams
+    );
+    booleanSensorConfigurationClusterInteractionInfoMap.put("suppressRequest", booleanSensorConfigurationsuppressRequestInteractionInfo);
+
+    commandMap.put("booleanSensorConfiguration", booleanSensorConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> valveConfigurationAndControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> valveConfigurationAndControlopenCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo valveConfigurationAndControlopenopenDurationCommandParameterInfo = new CommandParameterInfo("openDuration", Optional.class, Long.class);
+    valveConfigurationAndControlopenCommandParams.put("openDuration",valveConfigurationAndControlopenopenDurationCommandParameterInfo);
+    InteractionInfo valveConfigurationAndControlopenInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster)
+        .open((DefaultClusterCallback) callback
+        , (Optional<Long>)
+        commandArguments.get("openDuration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        valveConfigurationAndControlopenCommandParams
+    );
+    valveConfigurationAndControlClusterInteractionInfoMap.put("open", valveConfigurationAndControlopenInteractionInfo);
+
+    Map<String, CommandParameterInfo> valveConfigurationAndControlcloseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo valveConfigurationAndControlcloseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster)
+        .close((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        valveConfigurationAndControlcloseCommandParams
+    );
+    valveConfigurationAndControlClusterInteractionInfoMap.put("close", valveConfigurationAndControlcloseInteractionInfo);
+
+    Map<String, CommandParameterInfo> valveConfigurationAndControlsetLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo valveConfigurationAndControlsetLevellevelCommandParameterInfo = new CommandParameterInfo("level", Integer.class, Integer.class);
+    valveConfigurationAndControlsetLevelCommandParams.put("level",valveConfigurationAndControlsetLevellevelCommandParameterInfo);
+
+    CommandParameterInfo valveConfigurationAndControlsetLevelopenDurationCommandParameterInfo = new CommandParameterInfo("openDuration", Optional.class, Long.class);
+    valveConfigurationAndControlsetLevelCommandParams.put("openDuration",valveConfigurationAndControlsetLevelopenDurationCommandParameterInfo);
+    InteractionInfo valveConfigurationAndControlsetLevelInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster)
+        .setLevel((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("level")
+        , (Optional<Long>)
+        commandArguments.get("openDuration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        valveConfigurationAndControlsetLevelCommandParams
+    );
+    valveConfigurationAndControlClusterInteractionInfoMap.put("setLevel", valveConfigurationAndControlsetLevelInteractionInfo);
+
+    commandMap.put("valveConfigurationAndControl", valveConfigurationAndControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> demandResponseLoadControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> demandResponseLoadControlregisterLoadControlProgramRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo demandResponseLoadControlregisterLoadControlProgramRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster)
+        .registerLoadControlProgramRequest((DefaultClusterCallback) callback
+        , (ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct)
+        commandArguments.get("loadControlProgram")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        demandResponseLoadControlregisterLoadControlProgramRequestCommandParams
+    );
+    demandResponseLoadControlClusterInteractionInfoMap.put("registerLoadControlProgramRequest", demandResponseLoadControlregisterLoadControlProgramRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> demandResponseLoadControlunregisterLoadControlProgramRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo demandResponseLoadControlunregisterLoadControlProgramRequestloadControlProgramIDCommandParameterInfo = new CommandParameterInfo("loadControlProgramID", byte[].class, byte[].class);
+    demandResponseLoadControlunregisterLoadControlProgramRequestCommandParams.put("loadControlProgramID",demandResponseLoadControlunregisterLoadControlProgramRequestloadControlProgramIDCommandParameterInfo);
+    InteractionInfo demandResponseLoadControlunregisterLoadControlProgramRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster)
+        .unregisterLoadControlProgramRequest((DefaultClusterCallback) callback
+        , (byte[])
+        commandArguments.get("loadControlProgramID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        demandResponseLoadControlunregisterLoadControlProgramRequestCommandParams
+    );
+    demandResponseLoadControlClusterInteractionInfoMap.put("unregisterLoadControlProgramRequest", demandResponseLoadControlunregisterLoadControlProgramRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> demandResponseLoadControladdLoadControlEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo demandResponseLoadControladdLoadControlEventRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster)
+        .addLoadControlEventRequest((DefaultClusterCallback) callback
+        , (ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct)
+        commandArguments.get("event")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        demandResponseLoadControladdLoadControlEventRequestCommandParams
+    );
+    demandResponseLoadControlClusterInteractionInfoMap.put("addLoadControlEventRequest", demandResponseLoadControladdLoadControlEventRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> demandResponseLoadControlremoveLoadControlEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo demandResponseLoadControlremoveLoadControlEventRequesteventIDCommandParameterInfo = new CommandParameterInfo("eventID", byte[].class, byte[].class);
+    demandResponseLoadControlremoveLoadControlEventRequestCommandParams.put("eventID",demandResponseLoadControlremoveLoadControlEventRequesteventIDCommandParameterInfo);
+
+    CommandParameterInfo demandResponseLoadControlremoveLoadControlEventRequestcancelControlCommandParameterInfo = new CommandParameterInfo("cancelControl", Integer.class, Integer.class);
+    demandResponseLoadControlremoveLoadControlEventRequestCommandParams.put("cancelControl",demandResponseLoadControlremoveLoadControlEventRequestcancelControlCommandParameterInfo);
+    InteractionInfo demandResponseLoadControlremoveLoadControlEventRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster)
+        .removeLoadControlEventRequest((DefaultClusterCallback) callback
+        , (byte[])
+        commandArguments.get("eventID")
+        , (Integer)
+        commandArguments.get("cancelControl")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        demandResponseLoadControlremoveLoadControlEventRequestCommandParams
+    );
+    demandResponseLoadControlClusterInteractionInfoMap.put("removeLoadControlEventRequest", demandResponseLoadControlremoveLoadControlEventRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> demandResponseLoadControlclearLoadControlEventsRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo demandResponseLoadControlclearLoadControlEventsRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster)
+        .clearLoadControlEventsRequest((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        demandResponseLoadControlclearLoadControlEventsRequestCommandParams
+    );
+    demandResponseLoadControlClusterInteractionInfoMap.put("clearLoadControlEventsRequest", demandResponseLoadControlclearLoadControlEventsRequestInteractionInfo);
+
+    commandMap.put("demandResponseLoadControl", demandResponseLoadControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> energyEvseClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> energyEvsedisableCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo energyEvsedisableInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .disable((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvsedisableCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("disable", energyEvsedisableInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvseenableChargingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo energyEvseenableChargingchargingEnabledUntilCommandParameterInfo = new CommandParameterInfo("chargingEnabledUntil", Long.class, Long.class);
+    energyEvseenableChargingCommandParams.put("chargingEnabledUntil",energyEvseenableChargingchargingEnabledUntilCommandParameterInfo);
+
+    CommandParameterInfo energyEvseenableChargingminimumChargeCurrentCommandParameterInfo = new CommandParameterInfo("minimumChargeCurrent", Long.class, Long.class);
+    energyEvseenableChargingCommandParams.put("minimumChargeCurrent",energyEvseenableChargingminimumChargeCurrentCommandParameterInfo);
+
+    CommandParameterInfo energyEvseenableChargingmaximumChargeCurrentCommandParameterInfo = new CommandParameterInfo("maximumChargeCurrent", Long.class, Long.class);
+    energyEvseenableChargingCommandParams.put("maximumChargeCurrent",energyEvseenableChargingmaximumChargeCurrentCommandParameterInfo);
+    InteractionInfo energyEvseenableChargingInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .enableCharging((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("chargingEnabledUntil")
+        , (Long)
+        commandArguments.get("minimumChargeCurrent")
+        , (Long)
+        commandArguments.get("maximumChargeCurrent"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvseenableChargingCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("enableCharging", energyEvseenableChargingInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvseenableDischargingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo energyEvseenableDischargingdischargingEnabledUntilCommandParameterInfo = new CommandParameterInfo("dischargingEnabledUntil", Long.class, Long.class);
+    energyEvseenableDischargingCommandParams.put("dischargingEnabledUntil",energyEvseenableDischargingdischargingEnabledUntilCommandParameterInfo);
+
+    CommandParameterInfo energyEvseenableDischargingmaximumDischargeCurrentCommandParameterInfo = new CommandParameterInfo("maximumDischargeCurrent", Long.class, Long.class);
+    energyEvseenableDischargingCommandParams.put("maximumDischargeCurrent",energyEvseenableDischargingmaximumDischargeCurrentCommandParameterInfo);
+    InteractionInfo energyEvseenableDischargingInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .enableDischarging((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("dischargingEnabledUntil")
+        , (Long)
+        commandArguments.get("maximumDischargeCurrent"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvseenableDischargingCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("enableDischarging", energyEvseenableDischargingInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvsestartDiagnosticsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo energyEvsestartDiagnosticsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .startDiagnostics((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvsestartDiagnosticsCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("startDiagnostics", energyEvsestartDiagnosticsInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvsesetTargetsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo energyEvsesetTargetsdayOfWeekforSequenceCommandParameterInfo = new CommandParameterInfo("dayOfWeekforSequence", Integer.class, Integer.class);
+    energyEvsesetTargetsCommandParams.put("dayOfWeekforSequence",energyEvsesetTargetsdayOfWeekforSequenceCommandParameterInfo);
+
+    InteractionInfo energyEvsesetTargetsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .setTargets((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("dayOfWeekforSequence")
+        , (ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct>)
+        commandArguments.get("chargingTargets"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvsesetTargetsCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("setTargets", energyEvsesetTargetsInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvsegetTargetsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo energyEvsegetTargetsdaysToReturnCommandParameterInfo = new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
+    energyEvsegetTargetsCommandParams.put("daysToReturn",energyEvsegetTargetsdaysToReturnCommandParameterInfo);
+    InteractionInfo energyEvsegetTargetsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+          .getTargets((ChipClusters.EnergyEvseCluster.GetTargetsResponseCallback) callback
+           , (Integer)
+             commandArguments.get("daysToReturn")
+
+            , 10000);
+        },
+        () -> new DelegatedEnergyEvseClusterGetTargetsResponseCallback(),
+        energyEvsegetTargetsCommandParams
+      );
+    energyEvseClusterInteractionInfoMap.put("getTargets", energyEvsegetTargetsInteractionInfo);
+
+    Map<String, CommandParameterInfo> energyEvseclearTargetsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo energyEvseclearTargetsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster)
+        .clearTargets((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        energyEvseclearTargetsCommandParams
+    );
+    energyEvseClusterInteractionInfoMap.put("clearTargets", energyEvseclearTargetsInteractionInfo);
+
+    commandMap.put("energyEvse", energyEvseClusterInteractionInfoMap);
+
     Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
 
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
index 8fc29e53155f78..3397f9966c0920 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
@@ -276,17 +276,17 @@ private static Map<String, InteractionInfo> readScenesInteractionInfo() {
           readScenesSceneTableSizeCommandParams
         );
         result.put("readSceneTableSizeAttribute", readScenesSceneTableSizeAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readScenesRemainingCapacityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readScenesRemainingCapacityAttributeInteractionInfo = new InteractionInfo(
+     Map<String, CommandParameterInfo> readScenesFabricSceneInfoCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readScenesFabricSceneInfoAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.ScenesCluster) cluster).readRemainingCapacityAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
+            ((ChipClusters.ScenesCluster) cluster).readFabricSceneInfoAttribute(
+              (ChipClusters.ScenesCluster.FabricSceneInfoAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-          readScenesRemainingCapacityCommandParams
+          () -> new ClusterInfoMapping.DelegatedScenesClusterFabricSceneInfoAttributeCallback(),
+          readScenesFabricSceneInfoCommandParams
         );
-        result.put("readRemainingCapacityAttribute", readScenesRemainingCapacityAttributeInteractionInfo);
+        result.put("readFabricSceneInfoAttribute", readScenesFabricSceneInfoAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readScenesGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readScenesGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -1680,6 +1680,28 @@ private static Map<String, InteractionInfo> readBasicInformationInteractionInfo(
           readBasicInformationUniqueIDCommandParams
         );
         result.put("readUniqueIDAttribute", readBasicInformationUniqueIDAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBasicInformationSpecificationVersionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBasicInformationSpecificationVersionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BasicInformationCluster) cluster).readSpecificationVersionAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readBasicInformationSpecificationVersionCommandParams
+        );
+        result.put("readSpecificationVersionAttribute", readBasicInformationSpecificationVersionAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBasicInformationMaxPathsPerInvokeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBasicInformationMaxPathsPerInvokeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BasicInformationCluster) cluster).readMaxPathsPerInvokeAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBasicInformationMaxPathsPerInvokeCommandParams
+        );
+        result.put("readMaxPathsPerInvokeAttribute", readBasicInformationMaxPathsPerInvokeAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readBasicInformationGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readBasicInformationGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -3187,17 +3209,6 @@ private static Map<String, InteractionInfo> readGeneralDiagnosticsInteractionInf
           readGeneralDiagnosticsTestEventTriggersEnabledCommandParams
         );
         result.put("readTestEventTriggersEnabledAttribute", readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readGeneralDiagnosticsAverageWearCountCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readGeneralDiagnosticsAverageWearCountAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.GeneralDiagnosticsCluster) cluster).readAverageWearCountAttribute(
-              (ChipClusters.LongAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-          readGeneralDiagnosticsAverageWearCountCommandParams
-        );
-        result.put("readAverageWearCountAttribute", readGeneralDiagnosticsAverageWearCountAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readGeneralDiagnosticsGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -6008,6 +6019,440 @@ private static Map<String, InteractionInfo> readIcdManagementInteractionInfo() {
      
        return result;
     }
+    private static Map<String, InteractionInfo> readTimerInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readTimerSetTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerSetTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readSetTimeAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readTimerSetTimeCommandParams
+        );
+        result.put("readSetTimeAttribute", readTimerSetTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerTimeRemainingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerTimeRemainingAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readTimeRemainingAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readTimerTimeRemainingCommandParams
+        );
+        result.put("readTimeRemainingAttribute", readTimerTimeRemainingAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerTimerStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerTimerStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readTimerStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readTimerTimerStateCommandParams
+        );
+        result.put("readTimerStateAttribute", readTimerTimerStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.TimerCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedTimerClusterGeneratedCommandListAttributeCallback(),
+          readTimerGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readTimerGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.TimerCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedTimerClusterAcceptedCommandListAttributeCallback(),
+          readTimerAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readTimerAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readEventListAttribute(
+              (ChipClusters.TimerCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedTimerClusterEventListAttributeCallback(),
+          readTimerEventListCommandParams
+        );
+        result.put("readEventListAttribute", readTimerEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.TimerCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedTimerClusterAttributeListAttributeCallback(),
+          readTimerAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readTimerAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readTimerFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readTimerFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readTimerClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readTimerClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.TimerCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readTimerClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readTimerClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readOvenCavityOperationalStateInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readOvenCavityOperationalStatePhaseListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStatePhaseListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readPhaseListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.PhaseListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterPhaseListAttributeCallback(),
+          readOvenCavityOperationalStatePhaseListCommandParams
+        );
+        result.put("readPhaseListAttribute", readOvenCavityOperationalStatePhaseListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateCurrentPhaseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateCurrentPhaseAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readCurrentPhaseAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.CurrentPhaseAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterCurrentPhaseAttributeCallback(),
+          readOvenCavityOperationalStateCurrentPhaseCommandParams
+        );
+        result.put("readCurrentPhaseAttribute", readOvenCavityOperationalStateCurrentPhaseAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateCountdownTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateCountdownTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readCountdownTimeAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.CountdownTimeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterCountdownTimeAttributeCallback(),
+          readOvenCavityOperationalStateCountdownTimeCommandParams
+        );
+        result.put("readCountdownTimeAttribute", readOvenCavityOperationalStateCountdownTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateOperationalStateListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateOperationalStateListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readOperationalStateListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.OperationalStateListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterOperationalStateListAttributeCallback(),
+          readOvenCavityOperationalStateOperationalStateListCommandParams
+        );
+        result.put("readOperationalStateListAttribute", readOvenCavityOperationalStateOperationalStateListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateOperationalStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateOperationalStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readOperationalStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readOvenCavityOperationalStateOperationalStateCommandParams
+        );
+        result.put("readOperationalStateAttribute", readOvenCavityOperationalStateOperationalStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterGeneratedCommandListAttributeCallback(),
+          readOvenCavityOperationalStateGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readOvenCavityOperationalStateGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterAcceptedCommandListAttributeCallback(),
+          readOvenCavityOperationalStateAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readOvenCavityOperationalStateAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readEventListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterEventListAttributeCallback(),
+          readOvenCavityOperationalStateEventListCommandParams
+        );
+        result.put("readEventListAttribute", readOvenCavityOperationalStateEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.OvenCavityOperationalStateCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenCavityOperationalStateClusterAttributeListAttributeCallback(),
+          readOvenCavityOperationalStateAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readOvenCavityOperationalStateAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readOvenCavityOperationalStateFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readOvenCavityOperationalStateFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenCavityOperationalStateClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenCavityOperationalStateClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenCavityOperationalStateCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readOvenCavityOperationalStateClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readOvenCavityOperationalStateClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readOvenModeInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readOvenModeSupportedModesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeSupportedModesAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readSupportedModesAttribute(
+              (ChipClusters.OvenModeCluster.SupportedModesAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterSupportedModesAttributeCallback(),
+          readOvenModeSupportedModesCommandParams
+        );
+        result.put("readSupportedModesAttribute", readOvenModeSupportedModesAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeCurrentModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeCurrentModeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readCurrentModeAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readOvenModeCurrentModeCommandParams
+        );
+        result.put("readCurrentModeAttribute", readOvenModeCurrentModeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readStartUpModeAttribute(
+              (ChipClusters.OvenModeCluster.StartUpModeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterStartUpModeAttributeCallback(),
+          readOvenModeStartUpModeCommandParams
+        );
+        result.put("readStartUpModeAttribute", readOvenModeStartUpModeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeOnModeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readOnModeAttribute(
+              (ChipClusters.OvenModeCluster.OnModeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterOnModeAttributeCallback(),
+          readOvenModeOnModeCommandParams
+        );
+        result.put("readOnModeAttribute", readOvenModeOnModeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.OvenModeCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterGeneratedCommandListAttributeCallback(),
+          readOvenModeGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readOvenModeGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.OvenModeCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterAcceptedCommandListAttributeCallback(),
+          readOvenModeAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readOvenModeAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readEventListAttribute(
+              (ChipClusters.OvenModeCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterEventListAttributeCallback(),
+          readOvenModeEventListCommandParams
+        );
+        result.put("readEventListAttribute", readOvenModeEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.OvenModeCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOvenModeClusterAttributeListAttributeCallback(),
+          readOvenModeAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readOvenModeAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readOvenModeFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readOvenModeFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOvenModeClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOvenModeClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OvenModeCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readOvenModeClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readOvenModeClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readLaundryDryerControlsInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readLaundryDryerControlsSupportedDrynessLevelsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsSupportedDrynessLevelsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readSupportedDrynessLevelsAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.SupportedDrynessLevelsAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterSupportedDrynessLevelsAttributeCallback(),
+          readLaundryDryerControlsSupportedDrynessLevelsCommandParams
+        );
+        result.put("readSupportedDrynessLevelsAttribute", readLaundryDryerControlsSupportedDrynessLevelsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsSelectedDrynessLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsSelectedDrynessLevelAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readSelectedDrynessLevelAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.SelectedDrynessLevelAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterSelectedDrynessLevelAttributeCallback(),
+          readLaundryDryerControlsSelectedDrynessLevelCommandParams
+        );
+        result.put("readSelectedDrynessLevelAttribute", readLaundryDryerControlsSelectedDrynessLevelAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterGeneratedCommandListAttributeCallback(),
+          readLaundryDryerControlsGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readLaundryDryerControlsGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterAcceptedCommandListAttributeCallback(),
+          readLaundryDryerControlsAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readLaundryDryerControlsAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readEventListAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterEventListAttributeCallback(),
+          readLaundryDryerControlsEventListCommandParams
+        );
+        result.put("readEventListAttribute", readLaundryDryerControlsEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.LaundryDryerControlsCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLaundryDryerControlsClusterAttributeListAttributeCallback(),
+          readLaundryDryerControlsAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readLaundryDryerControlsAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readLaundryDryerControlsFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readLaundryDryerControlsFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readLaundryDryerControlsClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readLaundryDryerControlsClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.LaundryDryerControlsCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readLaundryDryerControlsClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readLaundryDryerControlsClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
     private static Map<String, InteractionInfo> readModeSelectInteractionInfo() {
        Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readModeSelectDescriptionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo(
@@ -7453,74 +7898,291 @@ private static Map<String, InteractionInfo> readDishwasherAlarmInteractionInfo()
      
        return result;
     }
-    private static Map<String, InteractionInfo> readOperationalStateInteractionInfo() {
-       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readOperationalStatePhaseListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStatePhaseListAttributeInteractionInfo = new InteractionInfo(
+    private static Map<String, InteractionInfo> readMicrowaveOvenModeInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readMicrowaveOvenModeSupportedModesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeSupportedModesAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readPhaseListAttribute(
-              (ChipClusters.OperationalStateCluster.PhaseListAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readSupportedModesAttribute(
+              (ChipClusters.MicrowaveOvenModeCluster.SupportedModesAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterPhaseListAttributeCallback(),
-          readOperationalStatePhaseListCommandParams
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenModeClusterSupportedModesAttributeCallback(),
+          readMicrowaveOvenModeSupportedModesCommandParams
         );
-        result.put("readPhaseListAttribute", readOperationalStatePhaseListAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateCurrentPhaseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStateCurrentPhaseAttributeInteractionInfo = new InteractionInfo(
+        result.put("readSupportedModesAttribute", readMicrowaveOvenModeSupportedModesAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeCurrentModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeCurrentModeAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readCurrentPhaseAttribute(
-              (ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readCurrentModeAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterCurrentPhaseAttributeCallback(),
-          readOperationalStateCurrentPhaseCommandParams
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenModeCurrentModeCommandParams
         );
-        result.put("readCurrentPhaseAttribute", readOperationalStateCurrentPhaseAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateCountdownTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStateCountdownTimeAttributeInteractionInfo = new InteractionInfo(
+        result.put("readCurrentModeAttribute", readMicrowaveOvenModeCurrentModeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readCountdownTimeAttribute(
-              (ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.MicrowaveOvenModeCluster.GeneratedCommandListAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterCountdownTimeAttributeCallback(),
-          readOperationalStateCountdownTimeCommandParams
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenModeClusterGeneratedCommandListAttributeCallback(),
+          readMicrowaveOvenModeGeneratedCommandListCommandParams
         );
-        result.put("readCountdownTimeAttribute", readOperationalStateCountdownTimeAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateOperationalStateListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStateOperationalStateListAttributeInteractionInfo = new InteractionInfo(
+        result.put("readGeneratedCommandListAttribute", readMicrowaveOvenModeGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readOperationalStateListAttribute(
-              (ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.MicrowaveOvenModeCluster.AcceptedCommandListAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterOperationalStateListAttributeCallback(),
-          readOperationalStateOperationalStateListCommandParams
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenModeClusterAcceptedCommandListAttributeCallback(),
+          readMicrowaveOvenModeAcceptedCommandListCommandParams
         );
-        result.put("readOperationalStateListAttribute", readOperationalStateOperationalStateListAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateOperationalStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStateOperationalStateAttributeInteractionInfo = new InteractionInfo(
+        result.put("readAcceptedCommandListAttribute", readMicrowaveOvenModeAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeEventListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readOperationalStateAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readEventListAttribute(
+              (ChipClusters.MicrowaveOvenModeCluster.EventListAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-          readOperationalStateOperationalStateCommandParams
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenModeClusterEventListAttributeCallback(),
+          readMicrowaveOvenModeEventListCommandParams
         );
-        result.put("readOperationalStateAttribute", readOperationalStateOperationalStateAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readOperationalStateGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+        result.put("readEventListAttribute", readMicrowaveOvenModeEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeAttributeListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.OperationalStateCluster) cluster).readGeneratedCommandListAttribute(
-              (ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback) callback
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.MicrowaveOvenModeCluster.AttributeListAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback(),
-          readOperationalStateGeneratedCommandListCommandParams
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenModeClusterAttributeListAttributeCallback(),
+          readMicrowaveOvenModeAttributeListCommandParams
         );
-        result.put("readGeneratedCommandListAttribute", readOperationalStateGeneratedCommandListAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readOperationalStateAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        result.put("readAttributeListAttribute", readMicrowaveOvenModeAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readMicrowaveOvenModeFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readMicrowaveOvenModeFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenModeClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenModeClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenModeCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenModeClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readMicrowaveOvenModeClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readMicrowaveOvenControlInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readMicrowaveOvenControlCookTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlCookTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readCookTimeAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readMicrowaveOvenControlCookTimeCommandParams
+        );
+        result.put("readCookTimeAttribute", readMicrowaveOvenControlCookTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlPowerSettingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlPowerSettingAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readPowerSettingAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenControlPowerSettingCommandParams
+        );
+        result.put("readPowerSettingAttribute", readMicrowaveOvenControlPowerSettingAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlMinPowerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlMinPowerAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readMinPowerAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenControlMinPowerCommandParams
+        );
+        result.put("readMinPowerAttribute", readMicrowaveOvenControlMinPowerAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlMaxPowerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlMaxPowerAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readMaxPowerAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenControlMaxPowerCommandParams
+        );
+        result.put("readMaxPowerAttribute", readMicrowaveOvenControlMaxPowerAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlPowerStepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlPowerStepAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readPowerStepAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenControlPowerStepCommandParams
+        );
+        result.put("readPowerStepAttribute", readMicrowaveOvenControlPowerStepAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.MicrowaveOvenControlCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenControlClusterGeneratedCommandListAttributeCallback(),
+          readMicrowaveOvenControlGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readMicrowaveOvenControlGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.MicrowaveOvenControlCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenControlClusterAcceptedCommandListAttributeCallback(),
+          readMicrowaveOvenControlAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readMicrowaveOvenControlAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readEventListAttribute(
+              (ChipClusters.MicrowaveOvenControlCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenControlClusterEventListAttributeCallback(),
+          readMicrowaveOvenControlEventListCommandParams
+        );
+        result.put("readEventListAttribute", readMicrowaveOvenControlEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.MicrowaveOvenControlCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedMicrowaveOvenControlClusterAttributeListAttributeCallback(),
+          readMicrowaveOvenControlAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readMicrowaveOvenControlAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readMicrowaveOvenControlFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readMicrowaveOvenControlFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readMicrowaveOvenControlClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readMicrowaveOvenControlClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.MicrowaveOvenControlCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readMicrowaveOvenControlClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readMicrowaveOvenControlClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readOperationalStateInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readOperationalStatePhaseListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStatePhaseListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readPhaseListAttribute(
+              (ChipClusters.OperationalStateCluster.PhaseListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterPhaseListAttributeCallback(),
+          readOperationalStatePhaseListCommandParams
+        );
+        result.put("readPhaseListAttribute", readOperationalStatePhaseListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateCurrentPhaseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStateCurrentPhaseAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readCurrentPhaseAttribute(
+              (ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterCurrentPhaseAttributeCallback(),
+          readOperationalStateCurrentPhaseCommandParams
+        );
+        result.put("readCurrentPhaseAttribute", readOperationalStateCurrentPhaseAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateCountdownTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStateCountdownTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readCountdownTimeAttribute(
+              (ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterCountdownTimeAttributeCallback(),
+          readOperationalStateCountdownTimeCommandParams
+        );
+        result.put("readCountdownTimeAttribute", readOperationalStateCountdownTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateOperationalStateListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStateOperationalStateListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readOperationalStateListAttribute(
+              (ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterOperationalStateListAttributeCallback(),
+          readOperationalStateOperationalStateListCommandParams
+        );
+        result.put("readOperationalStateListAttribute", readOperationalStateOperationalStateListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateOperationalStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStateOperationalStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readOperationalStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readOperationalStateOperationalStateCommandParams
+        );
+        result.put("readOperationalStateAttribute", readOperationalStateOperationalStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readOperationalStateGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.OperationalStateCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback(),
+          readOperationalStateGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readOperationalStateGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readOperationalStateAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readOperationalStateAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
             ((ChipClusters.OperationalStateCluster) cluster).readAcceptedCommandListAttribute(
@@ -7975,6 +8637,803 @@ private static Map<String, InteractionInfo> readActivatedCarbonFilterMonitoringI
      
        return result;
     }
+    private static Map<String, InteractionInfo> readBooleanSensorConfigurationInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readBooleanSensorConfigurationSensitivityLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationSensitivityLevelAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readSensitivityLevelAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBooleanSensorConfigurationSensitivityLevelCommandParams
+        );
+        result.put("readSensitivityLevelAttribute", readBooleanSensorConfigurationSensitivityLevelAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationAlarmsActiveCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationAlarmsActiveAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readAlarmsActiveAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBooleanSensorConfigurationAlarmsActiveCommandParams
+        );
+        result.put("readAlarmsActiveAttribute", readBooleanSensorConfigurationAlarmsActiveAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationAlarmsSuppressedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationAlarmsSuppressedAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readAlarmsSuppressedAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBooleanSensorConfigurationAlarmsSuppressedCommandParams
+        );
+        result.put("readAlarmsSuppressedAttribute", readBooleanSensorConfigurationAlarmsSuppressedAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationAlarmsEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationAlarmsEnabledAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readAlarmsEnabledAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBooleanSensorConfigurationAlarmsEnabledCommandParams
+        );
+        result.put("readAlarmsEnabledAttribute", readBooleanSensorConfigurationAlarmsEnabledAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.BooleanSensorConfigurationCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedBooleanSensorConfigurationClusterGeneratedCommandListAttributeCallback(),
+          readBooleanSensorConfigurationGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readBooleanSensorConfigurationGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.BooleanSensorConfigurationCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedBooleanSensorConfigurationClusterAcceptedCommandListAttributeCallback(),
+          readBooleanSensorConfigurationAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readBooleanSensorConfigurationAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readEventListAttribute(
+              (ChipClusters.BooleanSensorConfigurationCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedBooleanSensorConfigurationClusterEventListAttributeCallback(),
+          readBooleanSensorConfigurationEventListCommandParams
+        );
+        result.put("readEventListAttribute", readBooleanSensorConfigurationEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.BooleanSensorConfigurationCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedBooleanSensorConfigurationClusterAttributeListAttributeCallback(),
+          readBooleanSensorConfigurationAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readBooleanSensorConfigurationAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readBooleanSensorConfigurationFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readBooleanSensorConfigurationFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readBooleanSensorConfigurationClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readBooleanSensorConfigurationClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.BooleanSensorConfigurationCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readBooleanSensorConfigurationClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readBooleanSensorConfigurationClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readValveConfigurationAndControlInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readValveConfigurationAndControlOpenDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlOpenDurationAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readOpenDurationAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.OpenDurationAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterOpenDurationAttributeCallback(),
+          readValveConfigurationAndControlOpenDurationCommandParams
+        );
+        result.put("readOpenDurationAttribute", readValveConfigurationAndControlOpenDurationAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlAutoCloseTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlAutoCloseTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readAutoCloseTimeAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.AutoCloseTimeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterAutoCloseTimeAttributeCallback(),
+          readValveConfigurationAndControlAutoCloseTimeCommandParams
+        );
+        result.put("readAutoCloseTimeAttribute", readValveConfigurationAndControlAutoCloseTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlRemainingDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlRemainingDurationAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readRemainingDurationAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.RemainingDurationAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterRemainingDurationAttributeCallback(),
+          readValveConfigurationAndControlRemainingDurationCommandParams
+        );
+        result.put("readRemainingDurationAttribute", readValveConfigurationAndControlRemainingDurationAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlCurrentStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlCurrentStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readCurrentStateAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.CurrentStateAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterCurrentStateAttributeCallback(),
+          readValveConfigurationAndControlCurrentStateCommandParams
+        );
+        result.put("readCurrentStateAttribute", readValveConfigurationAndControlCurrentStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlTargetStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlTargetStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readTargetStateAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.TargetStateAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterTargetStateAttributeCallback(),
+          readValveConfigurationAndControlTargetStateCommandParams
+        );
+        result.put("readTargetStateAttribute", readValveConfigurationAndControlTargetStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlStartUpStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlStartUpStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readStartUpStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readValveConfigurationAndControlStartUpStateCommandParams
+        );
+        result.put("readStartUpStateAttribute", readValveConfigurationAndControlStartUpStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlCurrentLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlCurrentLevelAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readCurrentLevelAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.CurrentLevelAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterCurrentLevelAttributeCallback(),
+          readValveConfigurationAndControlCurrentLevelCommandParams
+        );
+        result.put("readCurrentLevelAttribute", readValveConfigurationAndControlCurrentLevelAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlTargetLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlTargetLevelAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readTargetLevelAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.TargetLevelAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterTargetLevelAttributeCallback(),
+          readValveConfigurationAndControlTargetLevelCommandParams
+        );
+        result.put("readTargetLevelAttribute", readValveConfigurationAndControlTargetLevelAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlOpenLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlOpenLevelAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readOpenLevelAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.OpenLevelAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterOpenLevelAttributeCallback(),
+          readValveConfigurationAndControlOpenLevelCommandParams
+        );
+        result.put("readOpenLevelAttribute", readValveConfigurationAndControlOpenLevelAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlValveFaultCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlValveFaultAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readValveFaultAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readValveConfigurationAndControlValveFaultCommandParams
+        );
+        result.put("readValveFaultAttribute", readValveConfigurationAndControlValveFaultAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterGeneratedCommandListAttributeCallback(),
+          readValveConfigurationAndControlGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readValveConfigurationAndControlGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterAcceptedCommandListAttributeCallback(),
+          readValveConfigurationAndControlAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readValveConfigurationAndControlAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readEventListAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterEventListAttributeCallback(),
+          readValveConfigurationAndControlEventListCommandParams
+        );
+        result.put("readEventListAttribute", readValveConfigurationAndControlEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.ValveConfigurationAndControlCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedValveConfigurationAndControlClusterAttributeListAttributeCallback(),
+          readValveConfigurationAndControlAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readValveConfigurationAndControlAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readValveConfigurationAndControlFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readValveConfigurationAndControlFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readValveConfigurationAndControlClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readValveConfigurationAndControlClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.ValveConfigurationAndControlCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readValveConfigurationAndControlClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readValveConfigurationAndControlClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readDemandResponseLoadControlInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readDemandResponseLoadControlLoadControlProgramsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlLoadControlProgramsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readLoadControlProgramsAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.LoadControlProgramsAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterLoadControlProgramsAttributeCallback(),
+          readDemandResponseLoadControlLoadControlProgramsCommandParams
+        );
+        result.put("readLoadControlProgramsAttribute", readDemandResponseLoadControlLoadControlProgramsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlNumberOfLoadControlProgramsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlNumberOfLoadControlProgramsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfLoadControlProgramsAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlNumberOfLoadControlProgramsCommandParams
+        );
+        result.put("readNumberOfLoadControlProgramsAttribute", readDemandResponseLoadControlNumberOfLoadControlProgramsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlEventsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlEventsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readEventsAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.EventsAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterEventsAttributeCallback(),
+          readDemandResponseLoadControlEventsCommandParams
+        );
+        result.put("readEventsAttribute", readDemandResponseLoadControlEventsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlActiveEventsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlActiveEventsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readActiveEventsAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.ActiveEventsAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterActiveEventsAttributeCallback(),
+          readDemandResponseLoadControlActiveEventsCommandParams
+        );
+        result.put("readActiveEventsAttribute", readDemandResponseLoadControlActiveEventsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlNumberOfEventsPerProgramCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlNumberOfEventsPerProgramAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfEventsPerProgramAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlNumberOfEventsPerProgramCommandParams
+        );
+        result.put("readNumberOfEventsPerProgramAttribute", readDemandResponseLoadControlNumberOfEventsPerProgramAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlNumberOfTransitionsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlNumberOfTransitionsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfTransitionsAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlNumberOfTransitionsCommandParams
+        );
+        result.put("readNumberOfTransitionsAttribute", readDemandResponseLoadControlNumberOfTransitionsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlDefaultRandomStartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlDefaultRandomStartAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readDefaultRandomStartAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlDefaultRandomStartCommandParams
+        );
+        result.put("readDefaultRandomStartAttribute", readDemandResponseLoadControlDefaultRandomStartAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlDefaultRandomDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlDefaultRandomDurationAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readDefaultRandomDurationAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlDefaultRandomDurationCommandParams
+        );
+        result.put("readDefaultRandomDurationAttribute", readDemandResponseLoadControlDefaultRandomDurationAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterGeneratedCommandListAttributeCallback(),
+          readDemandResponseLoadControlGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readDemandResponseLoadControlGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterAcceptedCommandListAttributeCallback(),
+          readDemandResponseLoadControlAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readDemandResponseLoadControlAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readEventListAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterEventListAttributeCallback(),
+          readDemandResponseLoadControlEventListCommandParams
+        );
+        result.put("readEventListAttribute", readDemandResponseLoadControlEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.DemandResponseLoadControlCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedDemandResponseLoadControlClusterAttributeListAttributeCallback(),
+          readDemandResponseLoadControlAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readDemandResponseLoadControlAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readDemandResponseLoadControlFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readDemandResponseLoadControlFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readDemandResponseLoadControlClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readDemandResponseLoadControlClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
+    private static Map<String, InteractionInfo> readEnergyEvseInteractionInfo() {
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readEnergyEvseStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readStateAttribute(
+              (ChipClusters.EnergyEvseCluster.StateAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterStateAttributeCallback(),
+          readEnergyEvseStateCommandParams
+        );
+        result.put("readStateAttribute", readEnergyEvseStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseSupplyStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseSupplyStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readSupplyStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readEnergyEvseSupplyStateCommandParams
+        );
+        result.put("readSupplyStateAttribute", readEnergyEvseSupplyStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseFaultStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseFaultStateAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readFaultStateAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readEnergyEvseFaultStateCommandParams
+        );
+        result.put("readFaultStateAttribute", readEnergyEvseFaultStateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseChargingEnabledUntilCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseChargingEnabledUntilAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readChargingEnabledUntilAttribute(
+              (ChipClusters.EnergyEvseCluster.ChargingEnabledUntilAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterChargingEnabledUntilAttributeCallback(),
+          readEnergyEvseChargingEnabledUntilCommandParams
+        );
+        result.put("readChargingEnabledUntilAttribute", readEnergyEvseChargingEnabledUntilAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseDischargingEnabledUntilCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseDischargingEnabledUntilAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readDischargingEnabledUntilAttribute(
+              (ChipClusters.EnergyEvseCluster.DischargingEnabledUntilAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterDischargingEnabledUntilAttributeCallback(),
+          readEnergyEvseDischargingEnabledUntilCommandParams
+        );
+        result.put("readDischargingEnabledUntilAttribute", readEnergyEvseDischargingEnabledUntilAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseCircuitCapacityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseCircuitCapacityAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readCircuitCapacityAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseCircuitCapacityCommandParams
+        );
+        result.put("readCircuitCapacityAttribute", readEnergyEvseCircuitCapacityAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseMinimumChargeCurrentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseMinimumChargeCurrentAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readMinimumChargeCurrentAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseMinimumChargeCurrentCommandParams
+        );
+        result.put("readMinimumChargeCurrentAttribute", readEnergyEvseMinimumChargeCurrentAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseMaximumChargeCurrentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseMaximumChargeCurrentAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readMaximumChargeCurrentAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseMaximumChargeCurrentCommandParams
+        );
+        result.put("readMaximumChargeCurrentAttribute", readEnergyEvseMaximumChargeCurrentAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseMaximumDischargeCurrentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseMaximumDischargeCurrentAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readMaximumDischargeCurrentAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseMaximumDischargeCurrentCommandParams
+        );
+        result.put("readMaximumDischargeCurrentAttribute", readEnergyEvseMaximumDischargeCurrentAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseUserMaximumChargeCurrentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseUserMaximumChargeCurrentAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readUserMaximumChargeCurrentAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseUserMaximumChargeCurrentCommandParams
+        );
+        result.put("readUserMaximumChargeCurrentAttribute", readEnergyEvseUserMaximumChargeCurrentAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseRandomizationDelayWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseRandomizationDelayWindowAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readRandomizationDelayWindowAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseRandomizationDelayWindowCommandParams
+        );
+        result.put("readRandomizationDelayWindowAttribute", readEnergyEvseRandomizationDelayWindowAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNumberOfWeeklyTargetsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNumberOfWeeklyTargetsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNumberOfWeeklyTargetsAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readEnergyEvseNumberOfWeeklyTargetsCommandParams
+        );
+        result.put("readNumberOfWeeklyTargetsAttribute", readEnergyEvseNumberOfWeeklyTargetsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNumberOfDailyTargetsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNumberOfDailyTargetsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNumberOfDailyTargetsAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readEnergyEvseNumberOfDailyTargetsCommandParams
+        );
+        result.put("readNumberOfDailyTargetsAttribute", readEnergyEvseNumberOfDailyTargetsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNextChargeStartTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNextChargeStartTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNextChargeStartTimeAttribute(
+              (ChipClusters.EnergyEvseCluster.NextChargeStartTimeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterNextChargeStartTimeAttributeCallback(),
+          readEnergyEvseNextChargeStartTimeCommandParams
+        );
+        result.put("readNextChargeStartTimeAttribute", readEnergyEvseNextChargeStartTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNextChargeTargetTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNextChargeTargetTimeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNextChargeTargetTimeAttribute(
+              (ChipClusters.EnergyEvseCluster.NextChargeTargetTimeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterNextChargeTargetTimeAttributeCallback(),
+          readEnergyEvseNextChargeTargetTimeCommandParams
+        );
+        result.put("readNextChargeTargetTimeAttribute", readEnergyEvseNextChargeTargetTimeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNextChargeRequiredEnergyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNextChargeRequiredEnergyAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNextChargeRequiredEnergyAttribute(
+              (ChipClusters.EnergyEvseCluster.NextChargeRequiredEnergyAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterNextChargeRequiredEnergyAttributeCallback(),
+          readEnergyEvseNextChargeRequiredEnergyCommandParams
+        );
+        result.put("readNextChargeRequiredEnergyAttribute", readEnergyEvseNextChargeRequiredEnergyAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseNextChargeTargetSoCCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseNextChargeTargetSoCAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readNextChargeTargetSoCAttribute(
+              (ChipClusters.EnergyEvseCluster.NextChargeTargetSoCAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterNextChargeTargetSoCAttributeCallback(),
+          readEnergyEvseNextChargeTargetSoCCommandParams
+        );
+        result.put("readNextChargeTargetSoCAttribute", readEnergyEvseNextChargeTargetSoCAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseApproximateEVEfficiencyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseApproximateEVEfficiencyAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readApproximateEVEfficiencyAttribute(
+              (ChipClusters.EnergyEvseCluster.ApproximateEVEfficiencyAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterApproximateEVEfficiencyAttributeCallback(),
+          readEnergyEvseApproximateEVEfficiencyCommandParams
+        );
+        result.put("readApproximateEVEfficiencyAttribute", readEnergyEvseApproximateEVEfficiencyAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseStateOfChargeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseStateOfChargeAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readStateOfChargeAttribute(
+              (ChipClusters.EnergyEvseCluster.StateOfChargeAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterStateOfChargeAttributeCallback(),
+          readEnergyEvseStateOfChargeCommandParams
+        );
+        result.put("readStateOfChargeAttribute", readEnergyEvseStateOfChargeAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseBatteryCapacityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseBatteryCapacityAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readBatteryCapacityAttribute(
+              (ChipClusters.EnergyEvseCluster.BatteryCapacityAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterBatteryCapacityAttributeCallback(),
+          readEnergyEvseBatteryCapacityCommandParams
+        );
+        result.put("readBatteryCapacityAttribute", readEnergyEvseBatteryCapacityAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseVehicleIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseVehicleIDAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readVehicleIDAttribute(
+              (ChipClusters.EnergyEvseCluster.VehicleIDAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterVehicleIDAttributeCallback(),
+          readEnergyEvseVehicleIDCommandParams
+        );
+        result.put("readVehicleIDAttribute", readEnergyEvseVehicleIDAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseSessionIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseSessionIDAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readSessionIDAttribute(
+              (ChipClusters.EnergyEvseCluster.SessionIDAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterSessionIDAttributeCallback(),
+          readEnergyEvseSessionIDCommandParams
+        );
+        result.put("readSessionIDAttribute", readEnergyEvseSessionIDAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseSessionDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseSessionDurationAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readSessionDurationAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseSessionDurationCommandParams
+        );
+        result.put("readSessionDurationAttribute", readEnergyEvseSessionDurationAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseSessionEnergyChargedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseSessionEnergyChargedAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readSessionEnergyChargedAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseSessionEnergyChargedCommandParams
+        );
+        result.put("readSessionEnergyChargedAttribute", readEnergyEvseSessionEnergyChargedAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseSessionEnergyDischargedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseSessionEnergyDischargedAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readSessionEnergyDischargedAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseSessionEnergyDischargedCommandParams
+        );
+        result.put("readSessionEnergyDischargedAttribute", readEnergyEvseSessionEnergyDischargedAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readGeneratedCommandListAttribute(
+              (ChipClusters.EnergyEvseCluster.GeneratedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterGeneratedCommandListAttributeCallback(),
+          readEnergyEvseGeneratedCommandListCommandParams
+        );
+        result.put("readGeneratedCommandListAttribute", readEnergyEvseGeneratedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseAcceptedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseAcceptedCommandListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readAcceptedCommandListAttribute(
+              (ChipClusters.EnergyEvseCluster.AcceptedCommandListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterAcceptedCommandListAttributeCallback(),
+          readEnergyEvseAcceptedCommandListCommandParams
+        );
+        result.put("readAcceptedCommandListAttribute", readEnergyEvseAcceptedCommandListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseEventListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseEventListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readEventListAttribute(
+              (ChipClusters.EnergyEvseCluster.EventListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterEventListAttributeCallback(),
+          readEnergyEvseEventListCommandParams
+        );
+        result.put("readEventListAttribute", readEnergyEvseEventListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseAttributeListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseAttributeListAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readAttributeListAttribute(
+              (ChipClusters.EnergyEvseCluster.AttributeListAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedEnergyEvseClusterAttributeListAttributeCallback(),
+          readEnergyEvseAttributeListCommandParams
+        );
+        result.put("readAttributeListAttribute", readEnergyEvseAttributeListAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseFeatureMapCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseFeatureMapAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readFeatureMapAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readEnergyEvseFeatureMapCommandParams
+        );
+        result.put("readFeatureMapAttribute", readEnergyEvseFeatureMapAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readEnergyEvseClusterRevisionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readEnergyEvseClusterRevisionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.EnergyEvseCluster) cluster).readClusterRevisionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readEnergyEvseClusterRevisionCommandParams
+        );
+        result.put("readClusterRevisionAttribute", readEnergyEvseClusterRevisionAttributeInteractionInfo);
+     
+       return result;
+    }
     private static Map<String, InteractionInfo> readDoorLockInteractionInfo() {
        Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readDoorLockLockStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readDoorLockLockStateAttributeInteractionInfo = new InteractionInfo(
@@ -13796,6 +15255,17 @@ private static Map<String, InteractionInfo> readWakeOnLanInteractionInfo() {
           readWakeOnLanMACAddressCommandParams
         );
         result.put("readMACAddressAttribute", readWakeOnLanMACAddressAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readWakeOnLanLinkLocalAddressCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readWakeOnLanLinkLocalAddressAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.WakeOnLanCluster) cluster).readLinkLocalAddressAttribute(
+              (ChipClusters.OctetStringAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+          readWakeOnLanLinkLocalAddressCommandParams
+        );
+        result.put("readLinkLocalAddressAttribute", readWakeOnLanLinkLocalAddressAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readWakeOnLanGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readWakeOnLanGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -17512,6 +18982,10 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
             put("proxyValid", readProxyValidInteractionInfo());
             put("booleanState", readBooleanStateInteractionInfo());
             put("icdManagement", readIcdManagementInteractionInfo());
+            put("timer", readTimerInteractionInfo());
+            put("ovenCavityOperationalState", readOvenCavityOperationalStateInteractionInfo());
+            put("ovenMode", readOvenModeInteractionInfo());
+            put("laundryDryerControls", readLaundryDryerControlsInteractionInfo());
             put("modeSelect", readModeSelectInteractionInfo());
             put("laundryWasherMode", readLaundryWasherModeInteractionInfo());
             put("refrigeratorAndTemperatureControlledCabinetMode", readRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo());
@@ -17524,10 +18998,16 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
             put("airQuality", readAirQualityInteractionInfo());
             put("smokeCoAlarm", readSmokeCoAlarmInteractionInfo());
             put("dishwasherAlarm", readDishwasherAlarmInteractionInfo());
+            put("microwaveOvenMode", readMicrowaveOvenModeInteractionInfo());
+            put("microwaveOvenControl", readMicrowaveOvenControlInteractionInfo());
             put("operationalState", readOperationalStateInteractionInfo());
             put("rvcOperationalState", readRvcOperationalStateInteractionInfo());
             put("hepaFilterMonitoring", readHepaFilterMonitoringInteractionInfo());
             put("activatedCarbonFilterMonitoring", readActivatedCarbonFilterMonitoringInteractionInfo());
+            put("booleanSensorConfiguration", readBooleanSensorConfigurationInteractionInfo());
+            put("valveConfigurationAndControl", readValveConfigurationAndControlInteractionInfo());
+            put("demandResponseLoadControl", readDemandResponseLoadControlInteractionInfo());
+            put("energyEvse", readEnergyEvseInteractionInfo());
             put("doorLock", readDoorLockInteractionInfo());
             put("windowCovering", readWindowCoveringInteractionInfo());
             put("barrierControl", readBarrierControlInteractionInfo());
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
index eaf536bf0f76cd..03a11848b3a2f5 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
@@ -724,6 +724,80 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     writeAttributeMap.put("booleanState", writeBooleanStateInteractionInfo);
     Map<String, InteractionInfo> writeIcdManagementInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("icdManagement", writeIcdManagementInteractionInfo);
+    Map<String, InteractionInfo> writeTimerInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("timer", writeTimerInteractionInfo);
+    Map<String, InteractionInfo> writeOvenCavityOperationalStateInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("ovenCavityOperationalState", writeOvenCavityOperationalStateInteractionInfo);
+    Map<String, InteractionInfo> writeOvenModeInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeOvenModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo ovenModestartUpModeCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeOvenModeStartUpModeCommandParams.put(
+        "value",
+        ovenModestartUpModeCommandParameterInfo
+    );
+    InteractionInfo writeOvenModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenModeCluster) cluster).writeStartUpModeAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeOvenModeStartUpModeCommandParams
+    );
+    writeOvenModeInteractionInfo.put("writeStartUpModeAttribute", writeOvenModeStartUpModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeOvenModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo ovenModeonModeCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeOvenModeOnModeCommandParams.put(
+        "value",
+        ovenModeonModeCommandParameterInfo
+    );
+    InteractionInfo writeOvenModeOnModeAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OvenModeCluster) cluster).writeOnModeAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeOvenModeOnModeCommandParams
+    );
+    writeOvenModeInteractionInfo.put("writeOnModeAttribute", writeOvenModeOnModeAttributeInteractionInfo);
+    writeAttributeMap.put("ovenMode", writeOvenModeInteractionInfo);
+    Map<String, InteractionInfo> writeLaundryDryerControlsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeLaundryDryerControlsSelectedDrynessLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo laundryDryerControlsselectedDrynessLevelCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeLaundryDryerControlsSelectedDrynessLevelCommandParams.put(
+        "value",
+        laundryDryerControlsselectedDrynessLevelCommandParameterInfo
+    );
+    InteractionInfo writeLaundryDryerControlsSelectedDrynessLevelAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LaundryDryerControlsCluster) cluster).writeSelectedDrynessLevelAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeLaundryDryerControlsSelectedDrynessLevelCommandParams
+    );
+    writeLaundryDryerControlsInteractionInfo.put("writeSelectedDrynessLevelAttribute", writeLaundryDryerControlsSelectedDrynessLevelAttributeInteractionInfo);
+    writeAttributeMap.put("laundryDryerControls", writeLaundryDryerControlsInteractionInfo);
     Map<String, InteractionInfo> writeModeSelectInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
@@ -1034,6 +1108,10 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     writeAttributeMap.put("smokeCoAlarm", writeSmokeCoAlarmInteractionInfo);
     Map<String, InteractionInfo> writeDishwasherAlarmInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("dishwasherAlarm", writeDishwasherAlarmInteractionInfo);
+    Map<String, InteractionInfo> writeMicrowaveOvenModeInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("microwaveOvenMode", writeMicrowaveOvenModeInteractionInfo);
+    Map<String, InteractionInfo> writeMicrowaveOvenControlInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("microwaveOvenControl", writeMicrowaveOvenControlInteractionInfo);
     Map<String, InteractionInfo> writeOperationalStateInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("operationalState", writeOperationalStateInteractionInfo);
     Map<String, InteractionInfo> writeRvcOperationalStateInteractionInfo = new LinkedHashMap<>();
@@ -1086,6 +1164,234 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     );
     writeActivatedCarbonFilterMonitoringInteractionInfo.put("writeLastChangedTimeAttribute", writeActivatedCarbonFilterMonitoringLastChangedTimeAttributeInteractionInfo);
     writeAttributeMap.put("activatedCarbonFilterMonitoring", writeActivatedCarbonFilterMonitoringInteractionInfo);
+    Map<String, InteractionInfo> writeBooleanSensorConfigurationInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeBooleanSensorConfigurationSensitivityLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo booleanSensorConfigurationsensitivityLevelCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeBooleanSensorConfigurationSensitivityLevelCommandParams.put(
+        "value",
+        booleanSensorConfigurationsensitivityLevelCommandParameterInfo
+    );
+    InteractionInfo writeBooleanSensorConfigurationSensitivityLevelAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BooleanSensorConfigurationCluster) cluster).writeSensitivityLevelAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeBooleanSensorConfigurationSensitivityLevelCommandParams
+    );
+    writeBooleanSensorConfigurationInteractionInfo.put("writeSensitivityLevelAttribute", writeBooleanSensorConfigurationSensitivityLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeBooleanSensorConfigurationAlarmsEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo booleanSensorConfigurationalarmsEnabledCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeBooleanSensorConfigurationAlarmsEnabledCommandParams.put(
+        "value",
+        booleanSensorConfigurationalarmsEnabledCommandParameterInfo
+    );
+    InteractionInfo writeBooleanSensorConfigurationAlarmsEnabledAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BooleanSensorConfigurationCluster) cluster).writeAlarmsEnabledAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeBooleanSensorConfigurationAlarmsEnabledCommandParams
+    );
+    writeBooleanSensorConfigurationInteractionInfo.put("writeAlarmsEnabledAttribute", writeBooleanSensorConfigurationAlarmsEnabledAttributeInteractionInfo);
+    writeAttributeMap.put("booleanSensorConfiguration", writeBooleanSensorConfigurationInteractionInfo);
+    Map<String, InteractionInfo> writeValveConfigurationAndControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeValveConfigurationAndControlOpenDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo valveConfigurationAndControlopenDurationCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Long.class, 
+            Long.class 
+        );
+    writeValveConfigurationAndControlOpenDurationCommandParams.put(
+        "value",
+        valveConfigurationAndControlopenDurationCommandParameterInfo
+    );
+    InteractionInfo writeValveConfigurationAndControlOpenDurationAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster).writeOpenDurationAttribute(
+          (DefaultClusterCallback) callback,
+          (Long) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeValveConfigurationAndControlOpenDurationCommandParams
+    );
+    writeValveConfigurationAndControlInteractionInfo.put("writeOpenDurationAttribute", writeValveConfigurationAndControlOpenDurationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeValveConfigurationAndControlStartUpStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo valveConfigurationAndControlstartUpStateCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeValveConfigurationAndControlStartUpStateCommandParams.put(
+        "value",
+        valveConfigurationAndControlstartUpStateCommandParameterInfo
+    );
+    InteractionInfo writeValveConfigurationAndControlStartUpStateAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster).writeStartUpStateAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeValveConfigurationAndControlStartUpStateCommandParams
+    );
+    writeValveConfigurationAndControlInteractionInfo.put("writeStartUpStateAttribute", writeValveConfigurationAndControlStartUpStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeValveConfigurationAndControlOpenLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo valveConfigurationAndControlopenLevelCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeValveConfigurationAndControlOpenLevelCommandParams.put(
+        "value",
+        valveConfigurationAndControlopenLevelCommandParameterInfo
+    );
+    InteractionInfo writeValveConfigurationAndControlOpenLevelAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ValveConfigurationAndControlCluster) cluster).writeOpenLevelAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeValveConfigurationAndControlOpenLevelCommandParams
+    );
+    writeValveConfigurationAndControlInteractionInfo.put("writeOpenLevelAttribute", writeValveConfigurationAndControlOpenLevelAttributeInteractionInfo);
+    writeAttributeMap.put("valveConfigurationAndControl", writeValveConfigurationAndControlInteractionInfo);
+    Map<String, InteractionInfo> writeDemandResponseLoadControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeDemandResponseLoadControlDefaultRandomStartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo demandResponseLoadControldefaultRandomStartCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeDemandResponseLoadControlDefaultRandomStartCommandParams.put(
+        "value",
+        demandResponseLoadControldefaultRandomStartCommandParameterInfo
+    );
+    InteractionInfo writeDemandResponseLoadControlDefaultRandomStartAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster).writeDefaultRandomStartAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeDemandResponseLoadControlDefaultRandomStartCommandParams
+    );
+    writeDemandResponseLoadControlInteractionInfo.put("writeDefaultRandomStartAttribute", writeDemandResponseLoadControlDefaultRandomStartAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeDemandResponseLoadControlDefaultRandomDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo demandResponseLoadControldefaultRandomDurationCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeDemandResponseLoadControlDefaultRandomDurationCommandParams.put(
+        "value",
+        demandResponseLoadControldefaultRandomDurationCommandParameterInfo
+    );
+    InteractionInfo writeDemandResponseLoadControlDefaultRandomDurationAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DemandResponseLoadControlCluster) cluster).writeDefaultRandomDurationAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeDemandResponseLoadControlDefaultRandomDurationCommandParams
+    );
+    writeDemandResponseLoadControlInteractionInfo.put("writeDefaultRandomDurationAttribute", writeDemandResponseLoadControlDefaultRandomDurationAttributeInteractionInfo);
+    writeAttributeMap.put("demandResponseLoadControl", writeDemandResponseLoadControlInteractionInfo);
+    Map<String, InteractionInfo> writeEnergyEvseInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeEnergyEvseUserMaximumChargeCurrentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo energyEvseuserMaximumChargeCurrentCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Long.class, 
+            Long.class 
+        );
+    writeEnergyEvseUserMaximumChargeCurrentCommandParams.put(
+        "value",
+        energyEvseuserMaximumChargeCurrentCommandParameterInfo
+    );
+    InteractionInfo writeEnergyEvseUserMaximumChargeCurrentAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster).writeUserMaximumChargeCurrentAttribute(
+          (DefaultClusterCallback) callback,
+          (Long) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeEnergyEvseUserMaximumChargeCurrentCommandParams
+    );
+    writeEnergyEvseInteractionInfo.put("writeUserMaximumChargeCurrentAttribute", writeEnergyEvseUserMaximumChargeCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeEnergyEvseRandomizationDelayWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo energyEvserandomizationDelayWindowCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Long.class, 
+            Long.class 
+        );
+    writeEnergyEvseRandomizationDelayWindowCommandParams.put(
+        "value",
+        energyEvserandomizationDelayWindowCommandParameterInfo
+    );
+    InteractionInfo writeEnergyEvseRandomizationDelayWindowAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster).writeRandomizationDelayWindowAttribute(
+          (DefaultClusterCallback) callback,
+          (Long) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeEnergyEvseRandomizationDelayWindowCommandParams
+    );
+    writeEnergyEvseInteractionInfo.put("writeRandomizationDelayWindowAttribute", writeEnergyEvseRandomizationDelayWindowAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeEnergyEvseApproximateEVEfficiencyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo energyEvseapproximateEVEfficiencyCommandParameterInfo =
+        new CommandParameterInfo(
+            "value", 
+            Integer.class, 
+            Integer.class 
+        );
+    writeEnergyEvseApproximateEVEfficiencyCommandParams.put(
+        "value",
+        energyEvseapproximateEVEfficiencyCommandParameterInfo
+    );
+    InteractionInfo writeEnergyEvseApproximateEVEfficiencyAttributeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EnergyEvseCluster) cluster).writeApproximateEVEfficiencyAttribute(
+          (DefaultClusterCallback) callback,
+          (Integer) commandArguments.get("value")
+        );
+      },
+      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+      writeEnergyEvseApproximateEVEfficiencyCommandParams
+    );
+    writeEnergyEvseInteractionInfo.put("writeApproximateEVEfficiencyAttribute", writeEnergyEvseApproximateEVEfficiencyAttributeInteractionInfo);
+    writeAttributeMap.put("energyEvse", writeEnergyEvseInteractionInfo);
     Map<String, InteractionInfo> writeDoorLockInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> writeDoorLockDoorOpenEventsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockdoorOpenEventsCommandParameterInfo =
@@ -2351,28 +2657,6 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
       writeFanControlFanModeCommandParams
     );
     writeFanControlInteractionInfo.put("writeFanModeAttribute", writeFanControlFanModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlFanModeSequenceCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlfanModeSequenceCommandParameterInfo =
-        new CommandParameterInfo(
-            "value", 
-            Integer.class, 
-            Integer.class 
-        );
-    writeFanControlFanModeSequenceCommandParams.put(
-        "value",
-        fanControlfanModeSequenceCommandParameterInfo
-    );
-    InteractionInfo writeFanControlFanModeSequenceAttributeInteractionInfo = new InteractionInfo(
-      (cluster, callback, commandArguments) -> {
-        ((ChipClusters.FanControlCluster) cluster).writeFanModeSequenceAttribute(
-          (DefaultClusterCallback) callback,
-          (Integer) commandArguments.get("value")
-        );
-      },
-      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-      writeFanControlFanModeSequenceCommandParams
-    );
-    writeFanControlInteractionInfo.put("writeFanModeSequenceAttribute", writeFanControlFanModeSequenceAttributeInteractionInfo);
     Map<String, CommandParameterInfo> writeFanControlPercentSettingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlpercentSettingCommandParameterInfo =
         new CommandParameterInfo(
@@ -3307,28 +3591,6 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, InteractionInfo> writeKeypadInputInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("keypadInput", writeKeypadInputInteractionInfo);
     Map<String, InteractionInfo> writeContentLauncherInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeContentLauncherSupportedStreamingProtocolsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo contentLaunchersupportedStreamingProtocolsCommandParameterInfo =
-        new CommandParameterInfo(
-            "value", 
-            Long.class, 
-            Long.class 
-        );
-    writeContentLauncherSupportedStreamingProtocolsCommandParams.put(
-        "value",
-        contentLaunchersupportedStreamingProtocolsCommandParameterInfo
-    );
-    InteractionInfo writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo = new InteractionInfo(
-      (cluster, callback, commandArguments) -> {
-        ((ChipClusters.ContentLauncherCluster) cluster).writeSupportedStreamingProtocolsAttribute(
-          (DefaultClusterCallback) callback,
-          (Long) commandArguments.get("value")
-        );
-      },
-      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-      writeContentLauncherSupportedStreamingProtocolsCommandParams
-    );
-    writeContentLauncherInteractionInfo.put("writeSupportedStreamingProtocolsAttribute", writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo);
     writeAttributeMap.put("contentLauncher", writeContentLauncherInteractionInfo);
     Map<String, InteractionInfo> writeAudioOutputInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("audioOutput", writeAudioOutputInteractionInfo);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
new file mode 100644
index 00000000000000..c51a8e06724875
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+  val alarmsActive: UInt,
+  val alarmsSuppressed: Optional<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("BooleanSensorConfigurationClusterAlarmsStateChangedEvent {\n")
+    append("\talarmsActive : $alarmsActive\n")
+    append("\talarmsSuppressed : $alarmsSuppressed\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARMS_ACTIVE), alarmsActive)
+      if (alarmsSuppressed.isPresent) {
+        val optalarmsSuppressed = alarmsSuppressed.get()
+        put(ContextSpecificTag(TAG_ALARMS_SUPPRESSED), optalarmsSuppressed)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARMS_ACTIVE = 0
+    private const val TAG_ALARMS_SUPPRESSED = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BooleanSensorConfigurationClusterAlarmsStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmsActive = tlvReader.getUInt(ContextSpecificTag(TAG_ALARMS_ACTIVE))
+      val alarmsSuppressed =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ALARMS_SUPPRESSED))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ALARMS_SUPPRESSED)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+        alarmsActive,
+        alarmsSuppressed
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
new file mode 100644
index 00000000000000..a4ab48a89bc770
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
@@ -0,0 +1,244 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+  val eventID: ByteArray,
+  val transitionIndex: UInt?,
+  val status: UInt,
+  val criticality: UInt,
+  val control: UInt,
+  val temperatureControl:
+    Optional<
+      chip.devicecontroller.cluster.structs.DemandResponseLoadControlClusterTemperatureControlStruct
+    >?,
+  val averageLoadControl:
+    Optional<
+      chip.devicecontroller.cluster.structs.DemandResponseLoadControlClusterAverageLoadControlStruct
+    >?,
+  val dutyCycleControl:
+    Optional<
+      chip.devicecontroller.cluster.structs.DemandResponseLoadControlClusterDutyCycleControlStruct
+    >?,
+  val powerSavingsControl:
+    Optional<
+      chip.devicecontroller.cluster.structs.DemandResponseLoadControlClusterPowerSavingsControlStruct
+    >?,
+  val heatingSourceControl:
+    Optional<
+      chip.devicecontroller.cluster.structs.DemandResponseLoadControlClusterHeatingSourceControlStruct
+    >?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {\n")
+    append("\teventID : $eventID\n")
+    append("\ttransitionIndex : $transitionIndex\n")
+    append("\tstatus : $status\n")
+    append("\tcriticality : $criticality\n")
+    append("\tcontrol : $control\n")
+    append("\ttemperatureControl : $temperatureControl\n")
+    append("\taverageLoadControl : $averageLoadControl\n")
+    append("\tdutyCycleControl : $dutyCycleControl\n")
+    append("\tpowerSavingsControl : $powerSavingsControl\n")
+    append("\theatingSourceControl : $heatingSourceControl\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      if (transitionIndex != null) {
+        put(ContextSpecificTag(TAG_TRANSITION_INDEX), transitionIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_TRANSITION_INDEX))
+      }
+      put(ContextSpecificTag(TAG_STATUS), status)
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      if (temperatureControl != null) {
+        if (temperatureControl.isPresent) {
+          val opttemperatureControl = temperatureControl.get()
+          opttemperatureControl.toTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))
+      }
+      if (averageLoadControl != null) {
+        if (averageLoadControl.isPresent) {
+          val optaverageLoadControl = averageLoadControl.get()
+          optaverageLoadControl.toTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))
+      }
+      if (dutyCycleControl != null) {
+        if (dutyCycleControl.isPresent) {
+          val optdutyCycleControl = dutyCycleControl.get()
+          optdutyCycleControl.toTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))
+      }
+      if (powerSavingsControl != null) {
+        if (powerSavingsControl.isPresent) {
+          val optpowerSavingsControl = powerSavingsControl.get()
+          optpowerSavingsControl.toTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))
+      }
+      if (heatingSourceControl != null) {
+        if (heatingSourceControl.isPresent) {
+          val optheatingSourceControl = heatingSourceControl.get()
+          optheatingSourceControl.toTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_TRANSITION_INDEX = 1
+    private const val TAG_STATUS = 2
+    private const val TAG_CRITICALITY = 3
+    private const val TAG_CONTROL = 4
+    private const val TAG_TEMPERATURE_CONTROL = 5
+    private const val TAG_AVERAGE_LOAD_CONTROL = 6
+    private const val TAG_DUTY_CYCLE_CONTROL = 7
+    private const val TAG_POWER_SAVINGS_CONTROL = 8
+    private const val TAG_HEATING_SOURCE_CONTROL = 9
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val transitionIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_TRANSITION_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TRANSITION_INDEX))
+          null
+        }
+      val status = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS))
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val temperatureControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))) {
+            Optional.of(
+              chip.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterTemperatureControlStruct
+                .fromTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))
+          null
+        }
+      val averageLoadControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))) {
+            Optional.of(
+              chip.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterAverageLoadControlStruct
+                .fromTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))
+          null
+        }
+      val dutyCycleControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))) {
+            Optional.of(
+              chip.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterDutyCycleControlStruct
+                .fromTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))
+          null
+        }
+      val powerSavingsControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))) {
+            Optional.of(
+              chip.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterPowerSavingsControlStruct
+                .fromTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))
+          null
+        }
+      val heatingSourceControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))) {
+            Optional.of(
+              chip.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterHeatingSourceControlStruct
+                .fromTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+        eventID,
+        transitionIndex,
+        status,
+        criticality,
+        control,
+        temperatureControl,
+        averageLoadControl,
+        dutyCycleControl,
+        powerSavingsControl,
+        heatingSourceControl
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
new file mode 100644
index 00000000000000..37d91a3291a9f2
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEVConnectedEvent(val sessionID: ULong) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEVConnectedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVConnectedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEVConnectedEvent(sessionID)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
new file mode 100644
index 00000000000000..5720d4469df39c
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEVNotDetectedEvent(
+  val sessionID: ULong,
+  val state: UInt,
+  val sessionDuration: ULong,
+  val sessionEnergyCharged: Long,
+  val sessionEnergyDischarged: Optional<Long>
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEVNotDetectedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tsessionDuration : $sessionDuration\n")
+    append("\tsessionEnergyCharged : $sessionEnergyCharged\n")
+    append("\tsessionEnergyDischarged : $sessionEnergyDischarged\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_SESSION_DURATION), sessionDuration)
+      put(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED), sessionEnergyCharged)
+      if (sessionEnergyDischarged.isPresent) {
+        val optsessionEnergyDischarged = sessionEnergyDischarged.get()
+        put(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED), optsessionEnergyDischarged)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_SESSION_DURATION = 2
+    private const val TAG_SESSION_ENERGY_CHARGED = 3
+    private const val TAG_SESSION_ENERGY_DISCHARGED = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVNotDetectedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val sessionDuration = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_DURATION))
+      val sessionEnergyCharged = tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED))
+      val sessionEnergyDischarged =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED))) {
+          Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEVNotDetectedEvent(
+        sessionID,
+        state,
+        sessionDuration,
+        sessionEnergyCharged,
+        sessionEnergyDischarged
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
new file mode 100644
index 00000000000000..7843215518c11d
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEnergyTransferStartedEvent(
+  val sessionID: ULong,
+  val state: UInt,
+  val maximumCurrent: Long
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEnergyTransferStartedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tmaximumCurrent : $maximumCurrent\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_MAXIMUM_CURRENT = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEnergyTransferStartedEvent(sessionID, state, maximumCurrent)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
new file mode 100644
index 00000000000000..642bbc9b5e7a04
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEnergyTransferStoppedEvent(
+  val sessionID: ULong,
+  val state: UInt,
+  val reason: UInt,
+  val energyTransferred: Long
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEnergyTransferStoppedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\treason : $reason\n")
+    append("\tenergyTransferred : $energyTransferred\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_REASON), reason)
+      put(ContextSpecificTag(TAG_ENERGY_TRANSFERRED), energyTransferred)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_REASON = 2
+    private const val TAG_ENERGY_TRANSFERRED = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStoppedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val reason = tlvReader.getUInt(ContextSpecificTag(TAG_REASON))
+      val energyTransferred = tlvReader.getLong(ContextSpecificTag(TAG_ENERGY_TRANSFERRED))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEnergyTransferStoppedEvent(
+        sessionID,
+        state,
+        reason,
+        energyTransferred
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
new file mode 100644
index 00000000000000..2b82c363aa442c
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterFaultEvent(
+  val sessionID: ULong,
+  val state: UInt,
+  val faultStatePreviousState: UInt,
+  val faultStateCurrentState: UInt
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterFaultEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tfaultStatePreviousState : $faultStatePreviousState\n")
+    append("\tfaultStateCurrentState : $faultStateCurrentState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE), faultStatePreviousState)
+      put(ContextSpecificTag(TAG_FAULT_STATE_CURRENT_STATE), faultStateCurrentState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_FAULT_STATE_PREVIOUS_STATE = 2
+    private const val TAG_FAULT_STATE_CURRENT_STATE = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterFaultEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val faultStatePreviousState =
+        tlvReader.getUInt(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE))
+      val faultStateCurrentState =
+        tlvReader.getUInt(ContextSpecificTag(TAG_FAULT_STATE_CURRENT_STATE))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterFaultEvent(
+        sessionID,
+        state,
+        faultStatePreviousState,
+        faultStateCurrentState
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
new file mode 100644
index 00000000000000..760bc2cd92b2eb
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterRFIDEvent(val uid: ByteArray) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterRFIDEvent {\n")
+    append("\tuid : $uid\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_UID), uid)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_UID = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterRFIDEvent {
+      tlvReader.enterStructure(tlvTag)
+      val uid = tlvReader.getByteArray(ContextSpecificTag(TAG_UID))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterRFIDEvent(uid)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
new file mode 100644
index 00000000000000..b5a235e97841ba
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationCompletionEvent(
+  val completionErrorCode: UInt,
+  val totalOperationalTime: Optional<ULong>?,
+  val pausedTime: Optional<ULong>?
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationCompletionEvent {\n")
+    append("\tcompletionErrorCode : $completionErrorCode\n")
+    append("\ttotalOperationalTime : $totalOperationalTime\n")
+    append("\tpausedTime : $pausedTime\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE), completionErrorCode)
+      if (totalOperationalTime != null) {
+        if (totalOperationalTime.isPresent) {
+          val opttotalOperationalTime = totalOperationalTime.get()
+          put(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME), opttotalOperationalTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+      }
+      if (pausedTime != null) {
+        if (pausedTime.isPresent) {
+          val optpausedTime = pausedTime.get()
+          put(ContextSpecificTag(TAG_PAUSED_TIME), optpausedTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_PAUSED_TIME))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COMPLETION_ERROR_CODE = 0
+    private const val TAG_TOTAL_OPERATIONAL_TIME = 1
+    private const val TAG_PAUSED_TIME = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationCompletionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val completionErrorCode = tlvReader.getUInt(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE))
+      val totalOperationalTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))) {
+            Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+          null
+        }
+      val pausedTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAUSED_TIME))) {
+            Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_PAUSED_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PAUSED_TIME))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationCompletionEvent(
+        completionErrorCode,
+        totalOperationalTime,
+        pausedTime
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
new file mode 100644
index 00000000000000..8b1b9345a7df0b
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationalErrorEvent(
+  val errorState:
+    chip.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationalErrorEvent {\n")
+    append("\terrorState : $errorState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      errorState.toTlv(ContextSpecificTag(TAG_ERROR_STATE), this)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationalErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val errorState =
+        chip.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
+          .fromTlv(ContextSpecificTag(TAG_ERROR_STATE), tlvReader)
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationalErrorEvent(errorState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
new file mode 100644
index 00000000000000..cb432d975e1275
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ValveConfigurationAndControlClusterValveFaultEvent(val valveFault: UInt) {
+  override fun toString(): String = buildString {
+    append("ValveConfigurationAndControlClusterValveFaultEvent {\n")
+    append("\tvalveFault : $valveFault\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_VALVE_FAULT), valveFault)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_VALVE_FAULT = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ValveConfigurationAndControlClusterValveFaultEvent {
+      tlvReader.enterStructure(tlvTag)
+      val valveFault = tlvReader.getUInt(ContextSpecificTag(TAG_VALVE_FAULT))
+
+      tlvReader.exitContainer()
+
+      return ValveConfigurationAndControlClusterValveFaultEvent(valveFault)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
new file mode 100644
index 00000000000000..d015f73b2e61b5
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ValveConfigurationAndControlClusterValveStateChangedEvent(val valveState: UInt) {
+  override fun toString(): String = buildString {
+    append("ValveConfigurationAndControlClusterValveStateChangedEvent {\n")
+    append("\tvalveState : $valveState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_VALVE_STATE), valveState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_VALVE_STATE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ValveConfigurationAndControlClusterValveStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val valveState = tlvReader.getUInt(ContextSpecificTag(TAG_VALVE_STATE))
+
+      tlvReader.exitContainer()
+
+      return ValveConfigurationAndControlClusterValveStateChangedEvent(valveState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
index 6547c9d894a71f..2f94dc8e6b1c58 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
@@ -23,12 +23,12 @@ import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
 class WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
-  val associationFailure: UInt,
+  val associationFailureCause: UInt,
   val status: UInt
 ) {
   override fun toString(): String = buildString {
     append("WiFiNetworkDiagnosticsClusterAssociationFailureEvent {\n")
-    append("\tassociationFailure : $associationFailure\n")
+    append("\tassociationFailureCause : $associationFailureCause\n")
     append("\tstatus : $status\n")
     append("}\n")
   }
@@ -36,14 +36,14 @@ class WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
   fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
       startStructure(tlvTag)
-      put(ContextSpecificTag(TAG_ASSOCIATION_FAILURE), associationFailure)
+      put(ContextSpecificTag(TAG_ASSOCIATION_FAILURE_CAUSE), associationFailureCause)
       put(ContextSpecificTag(TAG_STATUS), status)
       endStructure()
     }
   }
 
   companion object {
-    private const val TAG_ASSOCIATION_FAILURE = 0
+    private const val TAG_ASSOCIATION_FAILURE_CAUSE = 0
     private const val TAG_STATUS = 1
 
     fun fromTlv(
@@ -51,12 +51,13 @@ class WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
       tlvReader: TlvReader
     ): WiFiNetworkDiagnosticsClusterAssociationFailureEvent {
       tlvReader.enterStructure(tlvTag)
-      val associationFailure = tlvReader.getUInt(ContextSpecificTag(TAG_ASSOCIATION_FAILURE))
+      val associationFailureCause =
+        tlvReader.getUInt(ContextSpecificTag(TAG_ASSOCIATION_FAILURE_CAUSE))
       val status = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS))
 
       tlvReader.exitContainer()
 
-      return WiFiNetworkDiagnosticsClusterAssociationFailureEvent(associationFailure, status)
+      return WiFiNetworkDiagnosticsClusterAssociationFailureEvent(associationFailureCause, status)
     }
   }
 }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
index 7b067fdcef6e8b..18552f76458513 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
@@ -24,11 +24,20 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
@@ -41,6 +50,8 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt",
@@ -51,6 +62,10 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt",
@@ -64,6 +79,7 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt",
@@ -93,15 +109,23 @@ eventstructs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt",
@@ -111,6 +135,8 @@ eventstructs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt",
@@ -136,6 +162,8 @@ eventstructs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt",
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
new file mode 100644
index 00000000000000..a4dd7c659efb22
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterAverageLoadControlStruct(val loadAdjustment: Int) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterAverageLoadControlStruct {\n")
+    append("\tloadAdjustment : $loadAdjustment\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LOAD_ADJUSTMENT), loadAdjustment)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LOAD_ADJUSTMENT = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterAverageLoadControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val loadAdjustment = tlvReader.getInt(ContextSpecificTag(TAG_LOAD_ADJUSTMENT))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterAverageLoadControlStruct(loadAdjustment)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
new file mode 100644
index 00000000000000..af1ad8026cc11b
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterDutyCycleControlStruct(val dutyCycle: UInt) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterDutyCycleControlStruct {\n")
+    append("\tdutyCycle : $dutyCycle\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DUTY_CYCLE), dutyCycle)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DUTY_CYCLE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterDutyCycleControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val dutyCycle = tlvReader.getUInt(ContextSpecificTag(TAG_DUTY_CYCLE))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterDutyCycleControlStruct(dutyCycle)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
new file mode 100644
index 00000000000000..049c061b9966e1
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterHeatingSourceControlStruct(val heatingSource: UInt) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterHeatingSourceControlStruct {\n")
+    append("\theatingSource : $heatingSource\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_HEATING_SOURCE), heatingSource)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_HEATING_SOURCE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterHeatingSourceControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val heatingSource = tlvReader.getUInt(ContextSpecificTag(TAG_HEATING_SOURCE))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterHeatingSourceControlStruct(heatingSource)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
new file mode 100644
index 00000000000000..f714af6d7b8fbd
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
@@ -0,0 +1,147 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventStruct(
+  val eventID: ByteArray,
+  val programID: ByteArray?,
+  val control: UInt,
+  val deviceClass: ULong,
+  val enrollmentGroup: Optional<UInt>,
+  val criticality: UInt,
+  val startTime: ULong?,
+  val transitions: List<DemandResponseLoadControlClusterLoadControlEventTransitionStruct>
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventStruct {\n")
+    append("\teventID : $eventID\n")
+    append("\tprogramID : $programID\n")
+    append("\tcontrol : $control\n")
+    append("\tdeviceClass : $deviceClass\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\tcriticality : $criticality\n")
+    append("\tstartTime : $startTime\n")
+    append("\ttransitions : $transitions\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      if (programID != null) {
+        put(ContextSpecificTag(TAG_PROGRAM_I_D), programID)
+      } else {
+        putNull(ContextSpecificTag(TAG_PROGRAM_I_D))
+      }
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass)
+      if (enrollmentGroup.isPresent) {
+        val optenrollmentGroup = enrollmentGroup.get()
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), optenrollmentGroup)
+      }
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      if (startTime != null) {
+        put(ContextSpecificTag(TAG_START_TIME), startTime)
+      } else {
+        putNull(ContextSpecificTag(TAG_START_TIME))
+      }
+      startArray(ContextSpecificTag(TAG_TRANSITIONS))
+      for (item in transitions.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_PROGRAM_I_D = 1
+    private const val TAG_CONTROL = 2
+    private const val TAG_DEVICE_CLASS = 3
+    private const val TAG_ENROLLMENT_GROUP = 4
+    private const val TAG_CRITICALITY = 5
+    private const val TAG_START_TIME = 6
+    private const val TAG_TRANSITIONS = 7
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventStruct {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val programID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_I_D))
+          null
+        }
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val deviceClass = tlvReader.getULong(ContextSpecificTag(TAG_DEVICE_CLASS))
+      val enrollmentGroup =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENROLLMENT_GROUP))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ENROLLMENT_GROUP)))
+        } else {
+          Optional.empty()
+        }
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val startTime =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_START_TIME))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_START_TIME))
+          null
+        }
+      val transitions =
+        buildList<DemandResponseLoadControlClusterLoadControlEventTransitionStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_TRANSITIONS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(
+              DemandResponseLoadControlClusterLoadControlEventTransitionStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventStruct(
+        eventID,
+        programID,
+        control,
+        deviceClass,
+        enrollmentGroup,
+        criticality,
+        startTime,
+        transitions
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
new file mode 100644
index 00000000000000..6d44b1e020d180
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
@@ -0,0 +1,161 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+  val duration: UInt,
+  val control: UInt,
+  val temperatureControl: Optional<DemandResponseLoadControlClusterTemperatureControlStruct>,
+  val averageLoadControl: Optional<DemandResponseLoadControlClusterAverageLoadControlStruct>,
+  val dutyCycleControl: Optional<DemandResponseLoadControlClusterDutyCycleControlStruct>,
+  val powerSavingsControl: Optional<DemandResponseLoadControlClusterPowerSavingsControlStruct>,
+  val heatingSourceControl: Optional<DemandResponseLoadControlClusterHeatingSourceControlStruct>
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventTransitionStruct {\n")
+    append("\tduration : $duration\n")
+    append("\tcontrol : $control\n")
+    append("\ttemperatureControl : $temperatureControl\n")
+    append("\taverageLoadControl : $averageLoadControl\n")
+    append("\tdutyCycleControl : $dutyCycleControl\n")
+    append("\tpowerSavingsControl : $powerSavingsControl\n")
+    append("\theatingSourceControl : $heatingSourceControl\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DURATION), duration)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      if (temperatureControl.isPresent) {
+        val opttemperatureControl = temperatureControl.get()
+        opttemperatureControl.toTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), this)
+      }
+      if (averageLoadControl.isPresent) {
+        val optaverageLoadControl = averageLoadControl.get()
+        optaverageLoadControl.toTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), this)
+      }
+      if (dutyCycleControl.isPresent) {
+        val optdutyCycleControl = dutyCycleControl.get()
+        optdutyCycleControl.toTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), this)
+      }
+      if (powerSavingsControl.isPresent) {
+        val optpowerSavingsControl = powerSavingsControl.get()
+        optpowerSavingsControl.toTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), this)
+      }
+      if (heatingSourceControl.isPresent) {
+        val optheatingSourceControl = heatingSourceControl.get()
+        optheatingSourceControl.toTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), this)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DURATION = 0
+    private const val TAG_CONTROL = 1
+    private const val TAG_TEMPERATURE_CONTROL = 2
+    private const val TAG_AVERAGE_LOAD_CONTROL = 3
+    private const val TAG_DUTY_CYCLE_CONTROL = 4
+    private const val TAG_POWER_SAVINGS_CONTROL = 5
+    private const val TAG_HEATING_SOURCE_CONTROL = 6
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventTransitionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val duration = tlvReader.getUInt(ContextSpecificTag(TAG_DURATION))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val temperatureControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterTemperatureControlStruct.fromTlv(
+              ContextSpecificTag(TAG_TEMPERATURE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val averageLoadControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterAverageLoadControlStruct.fromTlv(
+              ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val dutyCycleControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterDutyCycleControlStruct.fromTlv(
+              ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val powerSavingsControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterPowerSavingsControlStruct.fromTlv(
+              ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val heatingSourceControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterHeatingSourceControlStruct.fromTlv(
+              ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+        duration,
+        control,
+        temperatureControl,
+        averageLoadControl,
+        dutyCycleControl,
+        powerSavingsControl,
+        heatingSourceControl
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
new file mode 100644
index 00000000000000..289e4b0a1dbebf
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
@@ -0,0 +1,113 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlProgramStruct(
+  val programID: ByteArray,
+  val name: String,
+  val enrollmentGroup: UInt?,
+  val randomStartMinutes: UInt?,
+  val randomDurationMinutes: UInt?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlProgramStruct {\n")
+    append("\tprogramID : $programID\n")
+    append("\tname : $name\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\trandomStartMinutes : $randomStartMinutes\n")
+    append("\trandomDurationMinutes : $randomDurationMinutes\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PROGRAM_I_D), programID)
+      put(ContextSpecificTag(TAG_NAME), name)
+      if (enrollmentGroup != null) {
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup)
+      } else {
+        putNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+      }
+      if (randomStartMinutes != null) {
+        put(ContextSpecificTag(TAG_RANDOM_START_MINUTES), randomStartMinutes)
+      } else {
+        putNull(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+      }
+      if (randomDurationMinutes != null) {
+        put(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES), randomDurationMinutes)
+      } else {
+        putNull(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PROGRAM_I_D = 0
+    private const val TAG_NAME = 1
+    private const val TAG_ENROLLMENT_GROUP = 2
+    private const val TAG_RANDOM_START_MINUTES = 3
+    private const val TAG_RANDOM_DURATION_MINUTES = 4
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlProgramStruct {
+      tlvReader.enterStructure(tlvTag)
+      val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val enrollmentGroup =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+          null
+        }
+      val randomStartMinutes =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+          null
+        }
+      val randomDurationMinutes =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlProgramStruct(
+        programID,
+        name,
+        enrollmentGroup,
+        randomStartMinutes,
+        randomDurationMinutes
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
new file mode 100644
index 00000000000000..30ed601d4ac156
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterPowerSavingsControlStruct(val powerSavings: UInt) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterPowerSavingsControlStruct {\n")
+    append("\tpowerSavings : $powerSavings\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_POWER_SAVINGS), powerSavings)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_POWER_SAVINGS = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterPowerSavingsControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val powerSavings = tlvReader.getUInt(ContextSpecificTag(TAG_POWER_SAVINGS))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterPowerSavingsControlStruct(powerSavings)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt
new file mode 100644
index 00000000000000..6a02cd2f755090
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt
@@ -0,0 +1,144 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterScopedLoadControlEventStruct(
+  val eventID: ByteArray,
+  val programControl: ByteArray,
+  val control: UInt,
+  val deviceClass: ULong,
+  val enrollmentGroup: UInt?,
+  val criticality: UInt,
+  val startTime: ULong?,
+  val transitions: List<DemandResponseLoadControlClusterLoadControlEventTransitionStruct>,
+  val fabricIndex: UInt
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterScopedLoadControlEventStruct {\n")
+    append("\teventID : $eventID\n")
+    append("\tprogramControl : $programControl\n")
+    append("\tcontrol : $control\n")
+    append("\tdeviceClass : $deviceClass\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\tcriticality : $criticality\n")
+    append("\tstartTime : $startTime\n")
+    append("\ttransitions : $transitions\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      put(ContextSpecificTag(TAG_PROGRAM_CONTROL), programControl)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass)
+      if (enrollmentGroup != null) {
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup)
+      } else {
+        putNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+      }
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      if (startTime != null) {
+        put(ContextSpecificTag(TAG_START_TIME), startTime)
+      } else {
+        putNull(ContextSpecificTag(TAG_START_TIME))
+      }
+      startArray(ContextSpecificTag(TAG_TRANSITIONS))
+      for (item in transitions.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_PROGRAM_CONTROL = 1
+    private const val TAG_CONTROL = 2
+    private const val TAG_DEVICE_CLASS = 3
+    private const val TAG_ENROLLMENT_GROUP = 4
+    private const val TAG_CRITICALITY = 5
+    private const val TAG_START_TIME = 6
+    private const val TAG_TRANSITIONS = 7
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterScopedLoadControlEventStruct {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val programControl = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_CONTROL))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val deviceClass = tlvReader.getULong(ContextSpecificTag(TAG_DEVICE_CLASS))
+      val enrollmentGroup =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+          null
+        }
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val startTime =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_START_TIME))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_START_TIME))
+          null
+        }
+      val transitions =
+        buildList<DemandResponseLoadControlClusterLoadControlEventTransitionStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_TRANSITIONS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(
+              DemandResponseLoadControlClusterLoadControlEventTransitionStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+      val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterScopedLoadControlEventStruct(
+        eventID,
+        programControl,
+        control,
+        deviceClass,
+        enrollmentGroup,
+        criticality,
+        startTime,
+        transitions,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
new file mode 100644
index 00000000000000..925c1db888410a
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
@@ -0,0 +1,146 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterTemperatureControlStruct(
+  val coolingTempOffset: Optional<UInt>?,
+  val heatingtTempOffset: Optional<UInt>?,
+  val coolingTempSetpoint: Optional<Int>?,
+  val heatingTempSetpoint: Optional<Int>?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterTemperatureControlStruct {\n")
+    append("\tcoolingTempOffset : $coolingTempOffset\n")
+    append("\theatingtTempOffset : $heatingtTempOffset\n")
+    append("\tcoolingTempSetpoint : $coolingTempSetpoint\n")
+    append("\theatingTempSetpoint : $heatingTempSetpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (coolingTempOffset != null) {
+        if (coolingTempOffset.isPresent) {
+          val optcoolingTempOffset = coolingTempOffset.get()
+          put(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET), optcoolingTempOffset)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))
+      }
+      if (heatingtTempOffset != null) {
+        if (heatingtTempOffset.isPresent) {
+          val optheatingtTempOffset = heatingtTempOffset.get()
+          put(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET), optheatingtTempOffset)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))
+      }
+      if (coolingTempSetpoint != null) {
+        if (coolingTempSetpoint.isPresent) {
+          val optcoolingTempSetpoint = coolingTempSetpoint.get()
+          put(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT), optcoolingTempSetpoint)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))
+      }
+      if (heatingTempSetpoint != null) {
+        if (heatingTempSetpoint.isPresent) {
+          val optheatingTempSetpoint = heatingTempSetpoint.get()
+          put(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT), optheatingTempSetpoint)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COOLING_TEMP_OFFSET = 0
+    private const val TAG_HEATINGT_TEMP_OFFSET = 1
+    private const val TAG_COOLING_TEMP_SETPOINT = 2
+    private const val TAG_HEATING_TEMP_SETPOINT = 3
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterTemperatureControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val coolingTempOffset =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))
+          null
+        }
+      val heatingtTempOffset =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))
+          null
+        }
+      val coolingTempSetpoint =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))) {
+            Optional.of(tlvReader.getInt(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))
+          null
+        }
+      val heatingTempSetpoint =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))) {
+            Optional.of(tlvReader.getInt(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterTemperatureControlStruct(
+        coolingTempOffset,
+        heatingtTempOffset,
+        coolingTempSetpoint,
+        heatingTempSetpoint
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
new file mode 100644
index 00000000000000..f457f066ff27bc
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
@@ -0,0 +1,81 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterChargingTargetStruct(
+  val targetTime: UInt,
+  val targetSoC: Optional<UInt>,
+  val addedEnergy: Optional<Long>
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterChargingTargetStruct {\n")
+    append("\ttargetTime : $targetTime\n")
+    append("\ttargetSoC : $targetSoC\n")
+    append("\taddedEnergy : $addedEnergy\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_TARGET_TIME), targetTime)
+      if (targetSoC.isPresent) {
+        val opttargetSoC = targetSoC.get()
+        put(ContextSpecificTag(TAG_TARGET_SO_C), opttargetSoC)
+      }
+      if (addedEnergy.isPresent) {
+        val optaddedEnergy = addedEnergy.get()
+        put(ContextSpecificTag(TAG_ADDED_ENERGY), optaddedEnergy)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_TARGET_TIME = 0
+    private const val TAG_TARGET_SO_C = 1
+    private const val TAG_ADDED_ENERGY = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterChargingTargetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val targetTime = tlvReader.getUInt(ContextSpecificTag(TAG_TARGET_TIME))
+      val targetSoC =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_TARGET_SO_C))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_TARGET_SO_C)))
+        } else {
+          Optional.empty()
+        }
+      val addedEnergy =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ADDED_ENERGY))) {
+          Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_ADDED_ENERGY)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterChargingTargetStruct(targetTime, targetSoC, addedEnergy)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..69caf35509d049
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MicrowaveOvenModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UInt,
+  val modeTags: List<MicrowaveOvenModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("MicrowaveOvenModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MicrowaveOvenModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUInt(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<MicrowaveOvenModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(MicrowaveOvenModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return MicrowaveOvenModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..bf9800a012de5f
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MicrowaveOvenModeClusterModeTagStruct(val mfgCode: Optional<UInt>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("MicrowaveOvenModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MicrowaveOvenModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return MicrowaveOvenModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
index e4eee464d0b20d..82f98aeb677204 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
@@ -17,6 +17,7 @@
 package chip.devicecontroller.cluster.structs
 
 import chip.devicecontroller.cluster.*
+import java.util.Optional
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -24,12 +25,16 @@ import matter.tlv.TlvWriter
 
 class NetworkCommissioningClusterNetworkInfoStruct(
   val networkID: ByteArray,
-  val connected: Boolean
+  val connected: Boolean,
+  val networkIdentifier: Optional<ByteArray>?,
+  val clientIdentifier: Optional<ByteArray>?
 ) {
   override fun toString(): String = buildString {
     append("NetworkCommissioningClusterNetworkInfoStruct {\n")
     append("\tnetworkID : $networkID\n")
     append("\tconnected : $connected\n")
+    append("\tnetworkIdentifier : $networkIdentifier\n")
+    append("\tclientIdentifier : $clientIdentifier\n")
     append("}\n")
   }
 
@@ -38,6 +43,22 @@ class NetworkCommissioningClusterNetworkInfoStruct(
       startStructure(tlvTag)
       put(ContextSpecificTag(TAG_NETWORK_I_D), networkID)
       put(ContextSpecificTag(TAG_CONNECTED), connected)
+      if (networkIdentifier != null) {
+        if (networkIdentifier.isPresent) {
+          val optnetworkIdentifier = networkIdentifier.get()
+          put(ContextSpecificTag(TAG_NETWORK_IDENTIFIER), optnetworkIdentifier)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))
+      }
+      if (clientIdentifier != null) {
+        if (clientIdentifier.isPresent) {
+          val optclientIdentifier = clientIdentifier.get()
+          put(ContextSpecificTag(TAG_CLIENT_IDENTIFIER), optclientIdentifier)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))
+      }
       endStructure()
     }
   }
@@ -45,15 +66,44 @@ class NetworkCommissioningClusterNetworkInfoStruct(
   companion object {
     private const val TAG_NETWORK_I_D = 0
     private const val TAG_CONNECTED = 1
+    private const val TAG_NETWORK_IDENTIFIER = 2
+    private const val TAG_CLIENT_IDENTIFIER = 3
 
     fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): NetworkCommissioningClusterNetworkInfoStruct {
       tlvReader.enterStructure(tlvTag)
       val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_I_D))
       val connected = tlvReader.getBoolean(ContextSpecificTag(TAG_CONNECTED))
+      val networkIdentifier =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))) {
+            Optional.of(tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_IDENTIFIER)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))
+          null
+        }
+      val clientIdentifier =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))) {
+            Optional.of(tlvReader.getByteArray(ContextSpecificTag(TAG_CLIENT_IDENTIFIER)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))
+          null
+        }
 
       tlvReader.exitContainer()
 
-      return NetworkCommissioningClusterNetworkInfoStruct(networkID, connected)
+      return NetworkCommissioningClusterNetworkInfoStruct(
+        networkID,
+        connected,
+        networkIdentifier,
+        clientIdentifier
+      )
     }
   }
 }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
new file mode 100644
index 00000000000000..dff5c0684a1501
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterErrorStateStruct(
+  val errorStateID: UInt,
+  val errorStateLabel: Optional<String>,
+  val errorStateDetails: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterErrorStateStruct {\n")
+    append("\terrorStateID : $errorStateID\n")
+    append("\terrorStateLabel : $errorStateLabel\n")
+    append("\terrorStateDetails : $errorStateDetails\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID)
+      if (errorStateLabel.isPresent) {
+        val opterrorStateLabel = errorStateLabel.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel)
+      }
+      if (errorStateDetails.isPresent) {
+        val opterrorStateDetails = errorStateDetails.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_DETAILS), opterrorStateDetails)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE_I_D = 0
+    private const val TAG_ERROR_STATE_LABEL = 1
+    private const val TAG_ERROR_STATE_DETAILS = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterErrorStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D))
+      val errorStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+      val errorStateDetails =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_DETAILS))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_DETAILS)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterErrorStateStruct(
+        errorStateID,
+        errorStateLabel,
+        errorStateDetails
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
new file mode 100644
index 00000000000000..1d32c7fe4a6af2
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationalStateStruct(
+  val operationalStateID: UInt,
+  val operationalStateLabel: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationalStateStruct {\n")
+    append("\toperationalStateID : $operationalStateID\n")
+    append("\toperationalStateLabel : $operationalStateLabel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID)
+      if (operationalStateLabel.isPresent) {
+        val optoperationalStateLabel = operationalStateLabel.get()
+        put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OPERATIONAL_STATE_I_D = 0
+    private const val TAG_OPERATIONAL_STATE_LABEL = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationalStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D))
+      val operationalStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationalStateStruct(
+        operationalStateID,
+        operationalStateLabel
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..0df558d3935e26
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UInt,
+  val modeTags: List<OvenModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("OvenModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OvenModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUInt(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<OvenModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(OvenModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..df0465b2c3055d
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenModeClusterModeTagStruct(val mfgCode: Optional<UInt>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("OvenModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OvenModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return OvenModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
new file mode 100644
index 00000000000000..066ade4d02a12f
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
@@ -0,0 +1,86 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ScenesClusterSceneInfoStruct(
+  val sceneCount: UInt,
+  val currentScene: UInt,
+  val currentGroup: UInt,
+  val sceneValid: Boolean,
+  val remainingCapacity: UInt,
+  val fabricIndex: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ScenesClusterSceneInfoStruct {\n")
+    append("\tsceneCount : $sceneCount\n")
+    append("\tcurrentScene : $currentScene\n")
+    append("\tcurrentGroup : $currentGroup\n")
+    append("\tsceneValid : $sceneValid\n")
+    append("\tremainingCapacity : $remainingCapacity\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SCENE_COUNT), sceneCount)
+      put(ContextSpecificTag(TAG_CURRENT_SCENE), currentScene)
+      put(ContextSpecificTag(TAG_CURRENT_GROUP), currentGroup)
+      put(ContextSpecificTag(TAG_SCENE_VALID), sceneValid)
+      put(ContextSpecificTag(TAG_REMAINING_CAPACITY), remainingCapacity)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SCENE_COUNT = 0
+    private const val TAG_CURRENT_SCENE = 1
+    private const val TAG_CURRENT_GROUP = 2
+    private const val TAG_SCENE_VALID = 3
+    private const val TAG_REMAINING_CAPACITY = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesClusterSceneInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val sceneCount = tlvReader.getUInt(ContextSpecificTag(TAG_SCENE_COUNT))
+      val currentScene = tlvReader.getUInt(ContextSpecificTag(TAG_CURRENT_SCENE))
+      val currentGroup = tlvReader.getUInt(ContextSpecificTag(TAG_CURRENT_GROUP))
+      val sceneValid = tlvReader.getBoolean(ContextSpecificTag(TAG_SCENE_VALID))
+      val remainingCapacity = tlvReader.getUInt(ContextSpecificTag(TAG_REMAINING_CAPACITY))
+      val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return ScenesClusterSceneInfoStruct(
+        sceneCount,
+        currentScene,
+        currentGroup,
+        sceneValid,
+        remainingCapacity,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
index a16aec610367ed..78ee6725bb7646 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
@@ -17,227 +17,164 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class AccessControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 31u
-  }
-
-  interface AclAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class AccessControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class AclAttribute(val value: List<AccessControlClusterAccessControlEntryStruct>)
 
-  interface ExtensionAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>?)
+  class ExtensionAttribute(val value: List<AccessControlClusterAccessControlExtensionStruct>?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readAclAttribute(callback: AclAttributeCallback) {
+  suspend fun readAclAttribute(): AclAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAclAttributeWithFabricFilter(callback: AclAttributeCallback, isFabricFiltered: Boolean) {
+  suspend fun readAclAttributeWithFabricFilter(isFabricFiltered: Boolean): AclAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeAclAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>
+  suspend fun writeAclAttribute(
+    value: List<AccessControlClusterAccessControlEntryStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeAclAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeAclAttribute(minInterval: Int, maxInterval: Int): AclAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAclAttribute(callback: AclAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun readExtensionAttribute(): ExtensionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readExtensionAttribute(callback: ExtensionAttributeCallback) {
+  suspend fun readExtensionAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): ExtensionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readExtensionAttributeWithFabricFilter(
-    callback: ExtensionAttributeCallback,
-    isFabricFiltered: Boolean
+  suspend fun writeExtensionAttribute(
+    value: List<AccessControlClusterAccessControlExtensionStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeExtensionAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>
-  ) {
+  suspend fun subscribeExtensionAttribute(minInterval: Int, maxInterval: Int): ExtensionAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeExtensionAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readSubjectsPerAccessControlEntryAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeExtensionAttribute(
-    callback: ExtensionAttributeCallback,
+  suspend fun subscribeSubjectsPerAccessControlEntryAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readSubjectsPerAccessControlEntryAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTargetsPerAccessControlEntryAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeSubjectsPerAccessControlEntryAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeTargetsPerAccessControlEntryAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readTargetsPerAccessControlEntryAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAccessControlEntriesPerFabricAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeTargetsPerAccessControlEntryAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAccessControlEntriesPerFabricAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAccessControlEntriesPerFabricAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAccessControlEntriesPerFabricAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 31u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
index 511713c5df05b5..32bca8bbe97d6c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
@@ -17,141 +17,102 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class AccountLoginCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1294u
-  }
+class AccountLoginCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GetSetupPINResponse(val setupPIN: String)
 
-  fun getSetupPIN(
-    callback: GetSetupPINResponseCallback,
-    tempAccountIdentifier: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun login(
-    callback: DefaultClusterCallback,
-    tempAccountIdentifier: String,
-    setupPIN: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun logout(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface GetSetupPINResponseCallback {
-    fun onSuccess(setupPIN: String)
-
-    fun onError(error: Exception)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun getSetupPIN(
+    tempAccountIdentifier: String,
+    timedInvokeTimeoutMs: Int
+  ): GetSetupPINResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun login(tempAccountIdentifier: String, setupPIN: String, timedInvokeTimeoutMs: Int) {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun logout(timedInvokeTimeoutMs: Int) {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1294u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
index 584c8d537cc9df..264bde16fae360 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
@@ -17,352 +17,255 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ActionsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 37u
-  }
+class ActionsCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class ActionListAttribute(val value: List<ActionsClusterActionStruct>)
 
-  fun instantAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
-  }
+  class EndpointListsAttribute(val value: List<ActionsClusterEndpointListStruct>)
 
-  fun instantAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun instantActionWithTransition(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    transitionTime: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun instantActionWithTransition(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    transitionTime: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun startAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun startAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  fun startActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun startActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long,
-    timedInvokeTimeoutMs: Int
+  suspend fun instantActionWithTransition(
+    actionID: UShort,
+    invokeID: UInt?,
+    transitionTime: UShort,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 1L
 
-  fun stopAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stopAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
 
-  fun pauseAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun pauseAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
+  suspend fun startActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 3L
 
-  fun pauseActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun pauseActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 4L
 
-  fun resumeAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun resumeAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 5L
 
-  fun enableAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enableAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
+  suspend fun pauseActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 6L
 
-  fun enableActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enableActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 7L
 
-  fun disableAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun disableAction(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 8L
 
-  fun disableActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun disableActionWithDuration(
-    callback: DefaultClusterCallback,
-    actionID: Integer,
-    invokeID: Long?,
-    duration: Long,
-    timedInvokeTimeoutMs: Int
+  suspend fun enableActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface ActionListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ActionsClusterActionStruct>)
+    val commandId = 9L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EndpointListsAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ActionsClusterEndpointListStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 10L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun disableActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 11L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readActionListAttribute(callback: ActionListAttributeCallback) {
+  suspend fun readActionListAttribute(): ActionListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActionListAttribute(
-    callback: ActionListAttributeCallback,
+  suspend fun subscribeActionListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActionListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEndpointListsAttribute(callback: EndpointListsAttributeCallback) {
+  suspend fun readEndpointListsAttribute(): EndpointListsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEndpointListsAttribute(
-    callback: EndpointListsAttributeCallback,
+  suspend fun subscribeEndpointListsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): EndpointListsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSetupURLAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readSetupURLAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeSetupURLAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSetupURLAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 37u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
index c109709f14cede..9b128e71667096 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
@@ -17,224 +17,157 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 114u
-  }
-
-  fun resetCondition(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetCondition(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface LastChangedTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ReplacementProductListAttributeCallback {
-    fun onSuccess(
-      value: ArrayList<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>?
-    )
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class ActivatedCarbonFilterMonitoringCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class LastChangedTimeAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class ReplacementProductListAttribute(
+    val value: List<ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>?
+  )
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readConditionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readConditionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeConditionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readDegradationDirectionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDegradationDirectionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDegradationDirectionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readChangeIndicationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readChangeIndicationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeChangeIndicationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readInPlaceIndicatorAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readInPlaceIndicatorAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeInPlaceIndicatorAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readLastChangedTimeAttribute(callback: LastChangedTimeAttributeCallback) {
+  suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLastChangedTimeAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
+  suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLastChangedTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeLastChangedTimeAttribute(
-    callback: LastChangedTimeAttributeCallback,
+  suspend fun subscribeLastChangedTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastChangedTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readReplacementProductListAttribute(callback: ReplacementProductListAttributeCallback) {
+  suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeReplacementProductListAttribute(
-    callback: ReplacementProductListAttributeCallback,
+  suspend fun subscribeReplacementProductListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ReplacementProductListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 114u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
index 5d2ec55d786c40..fa3698f95ac7e6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
@@ -17,190 +17,141 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class AdministratorCommissioningCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 60u
-  }
+class AdministratorCommissioningCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class AdminFabricIndexAttribute(val value: UByte?)
+
+  class AdminVendorIdAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
 
-  fun openCommissioningWindow(
-    callback: DefaultClusterCallback,
-    commissioningTimeout: Integer,
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun openCommissioningWindow(
+    commissioningTimeout: UShort,
     PAKEPasscodeVerifier: ByteArray,
-    discriminator: Integer,
-    iterations: Long,
+    discriminator: UShort,
+    iterations: UInt,
     salt: ByteArray,
     timedInvokeTimeoutMs: Int
   ) {
+    val commandId = 0L
+
     // Implementation needs to be added here
   }
 
-  fun openBasicCommissioningWindow(
-    callback: DefaultClusterCallback,
-    commissioningTimeout: Integer,
+  suspend fun openBasicCommissioningWindow(
+    commissioningTimeout: UShort,
     timedInvokeTimeoutMs: Int
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 1L
 
-  fun revokeCommissioning(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
     // Implementation needs to be added here
   }
 
-  interface AdminFabricIndexAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AdminVendorIdAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun revokeCommissioning(timedInvokeTimeoutMs: Int) {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  fun readWindowStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readWindowStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeWindowStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWindowStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readAdminFabricIndexAttribute(callback: AdminFabricIndexAttributeCallback) {
+  suspend fun readAdminFabricIndexAttribute(): AdminFabricIndexAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAdminFabricIndexAttribute(
-    callback: AdminFabricIndexAttributeCallback,
+  suspend fun subscribeAdminFabricIndexAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AdminFabricIndexAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAdminVendorIdAttribute(callback: AdminVendorIdAttributeCallback) {
+  suspend fun readAdminVendorIdAttribute(): AdminVendorIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAdminVendorIdAttribute(
-    callback: AdminVendorIdAttributeCallback,
+  suspend fun subscribeAdminVendorIdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AdminVendorIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 60u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
index c81674a306021c..6355856efbd286 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
@@ -17,126 +17,84 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class AirQualityCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 91u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class AirQualityCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readAirQualityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAirQualityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeAirQualityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAirQualityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 91u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
index 6c315058fa2e9f..58b400775a3fea 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
@@ -17,226 +17,153 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ApplicationBasicCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1293u
-  }
-
-  interface ApplicationAttributeCallback {
-    fun onSuccess(value: ChipStructs.ApplicationBasicClusterApplicationStruct)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AllowedVendorListAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class ApplicationBasicCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ApplicationAttribute(val value: ApplicationBasicClusterApplicationStruct)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AllowedVendorListAttribute(val value: List<UShort>)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readVendorNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readVendorNameAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readVendorIDAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readVendorIDAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorIDAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readApplicationNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readApplicationNameAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeApplicationNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeApplicationNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductIDAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readProductIDAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductIDAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readApplicationAttribute(callback: ApplicationAttributeCallback) {
+  suspend fun readApplicationAttribute(): ApplicationAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeApplicationAttribute(
-    callback: ApplicationAttributeCallback,
+  suspend fun subscribeApplicationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ApplicationAttribute {
     // Implementation needs to be added here
   }
 
-  fun readStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readApplicationVersionAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readApplicationVersionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeApplicationVersionAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeApplicationVersionAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readAllowedVendorListAttribute(callback: AllowedVendorListAttributeCallback) {
+  suspend fun readAllowedVendorListAttribute(): AllowedVendorListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAllowedVendorListAttribute(
-    callback: AllowedVendorListAttributeCallback,
+  suspend fun subscribeAllowedVendorListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AllowedVendorListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1293u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
index 21bfb4f5e37d19..cd1fb69aa46af3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
@@ -17,222 +17,147 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ApplicationLauncherCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1292u
-  }
-
-  fun launchApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
-    data: ByteArray?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun launchApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
-    data: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun stopApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?
-  ) {
-    // Implementation needs to be added here
-  }
+class ApplicationLauncherCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class LauncherResponse(val status: UInt, val data: ByteArray?)
 
-  fun stopApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class CatalogListAttribute(val value: List<UShort>?)
 
-  fun hideApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?
-  ) {
-    // Implementation needs to be added here
-  }
+  class CurrentAppAttribute(val value: ApplicationLauncherClusterApplicationEPStruct?)
 
-  fun hideApp(
-    callback: LauncherResponseCallback,
-    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface LauncherResponseCallback {
-    fun onSuccess(status: Integer, data: ByteArray?)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(error: Exception)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface CatalogListAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface CurrentAppAttributeCallback {
-    fun onSuccess(value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun launchApp(
+    application: ApplicationLauncherClusterApplicationStruct?,
+    data: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun stopApp(
+    application: ApplicationLauncherClusterApplicationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun hideApp(
+    application: ApplicationLauncherClusterApplicationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readCatalogListAttribute(callback: CatalogListAttributeCallback) {
+  suspend fun readCatalogListAttribute(): CatalogListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCatalogListAttribute(
-    callback: CatalogListAttributeCallback,
+  suspend fun subscribeCatalogListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readCurrentAppAttribute(callback: CurrentAppAttributeCallback) {
+  ): CatalogListAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeCurrentAppAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct
-  ) {
+  suspend fun readCurrentAppAttribute(): CurrentAppAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeCurrentAppAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeCurrentAppAttribute(
-    callback: CurrentAppAttributeCallback,
+  suspend fun subscribeCurrentAppAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentAppAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1292u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
index 3eaae5e7ab157d..e90ee1bd52ce00 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
@@ -17,167 +17,117 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class AudioOutputCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1291u
-  }
+class AudioOutputCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class OutputListAttribute(val value: List<AudioOutputClusterOutputInfoStruct>)
 
-  fun selectOutput(callback: DefaultClusterCallback, index: Integer) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun selectOutput(callback: DefaultClusterCallback, index: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun renameOutput(callback: DefaultClusterCallback, index: Integer, name: String) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun renameOutput(
-    callback: DefaultClusterCallback,
-    index: Integer,
-    name: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface OutputListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.AudioOutputClusterOutputInfoStruct>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun selectOutput(index: UByte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun renameOutput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readOutputListAttribute(callback: OutputListAttributeCallback) {
+  suspend fun readOutputListAttribute(): OutputListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOutputListAttribute(
-    callback: OutputListAttributeCallback,
+  suspend fun subscribeOutputListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OutputListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentOutputAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentOutputAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentOutputAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentOutputAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1291u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
index b0efd271d427f3..c3a9d6c78807eb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
@@ -17,442 +17,299 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BallastConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 769u
-  }
-
-  interface IntrinsicBallastFactorAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BallastFactorAdjustmentAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LampRatedHoursAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LampBurnHoursAttributeCallback {
-    fun onSuccess(value: Long?)
+class BallastConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class IntrinsicBallastFactorAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class BallastFactorAdjustmentAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LampBurnHoursTripPointAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class LampRatedHoursAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class LampBurnHoursAttribute(val value: UInt?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class LampBurnHoursTripPointAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readPhysicalMinLevelAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readPhysicalMinLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePhysicalMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribePhysicalMinLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPhysicalMaxLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalMaxLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePhysicalMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribePhysicalMaxLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readBallastStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBallastStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeBallastStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBallastStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readMinLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMinLevelAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeMinLevelAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeMinLevelAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeMinLevelAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readMaxLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeMaxLevelAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readMaxLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeMaxLevelAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readIntrinsicBallastFactorAttribute(): IntrinsicBallastFactorAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeMaxLevelAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeIntrinsicBallastFactorAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeMaxLevelAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeIntrinsicBallastFactorAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): IntrinsicBallastFactorAttribute {
     // Implementation needs to be added here
   }
 
-  fun readIntrinsicBallastFactorAttribute(callback: IntrinsicBallastFactorAttributeCallback) {
+  suspend fun readBallastFactorAdjustmentAttribute(): BallastFactorAdjustmentAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeIntrinsicBallastFactorAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeIntrinsicBallastFactorAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeBallastFactorAdjustmentAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeIntrinsicBallastFactorAttribute(
-    callback: IntrinsicBallastFactorAttributeCallback,
+  suspend fun subscribeBallastFactorAdjustmentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBallastFactorAdjustmentAttribute(callback: BallastFactorAdjustmentAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBallastFactorAdjustmentAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBallastFactorAdjustmentAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  ): BallastFactorAdjustmentAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBallastFactorAdjustmentAttribute(
-    callback: BallastFactorAdjustmentAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readLampQuantityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLampQuantityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeLampQuantityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLampQuantityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readLampTypeAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readLampTypeAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeLampTypeAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLampTypeAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeLampTypeAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeLampTypeAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readLampManufacturerAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeLampTypeAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLampManufacturerAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readLampManufacturerAttribute(callback: CharStringAttributeCallback) {
+  suspend fun subscribeLampManufacturerAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeLampManufacturerAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun readLampRatedHoursAttribute(): LampRatedHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampManufacturerAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLampRatedHoursAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLampManufacturerAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeLampRatedHoursAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readLampRatedHoursAttribute(callback: LampRatedHoursAttributeCallback) {
+  ): LampRatedHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampRatedHoursAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readLampBurnHoursAttribute(): LampBurnHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampRatedHoursAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLampBurnHoursAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLampRatedHoursAttribute(
-    callback: LampRatedHoursAttributeCallback,
+  suspend fun subscribeLampBurnHoursAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readLampBurnHoursAttribute(callback: LampBurnHoursAttributeCallback) {
+  ): LampBurnHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampBurnHoursAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readLampAlarmModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLampBurnHoursAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLampAlarmModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLampBurnHoursAttribute(
-    callback: LampBurnHoursAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLampAlarmModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLampAlarmModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLampBurnHoursTripPointAttribute(): LampBurnHoursTripPointAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampAlarmModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeLampBurnHoursTripPointAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLampAlarmModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeLampAlarmModeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeLampBurnHoursTripPointAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readLampBurnHoursTripPointAttribute(callback: LampBurnHoursTripPointAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeLampBurnHoursTripPointAttribute(callback: DefaultClusterCallback, value: Long) {
+  ): LampBurnHoursTripPointAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLampBurnHoursTripPointAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLampBurnHoursTripPointAttribute(
-    callback: LampBurnHoursTripPointAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 769u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
index 946845dcc57905..e3446f20394a8e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
@@ -17,326 +17,239 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BarrierControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 259u
-  }
+class BarrierControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun barrierControlGoToPercent(callback: DefaultClusterCallback, percentOpen: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun barrierControlGoToPercent(
-    callback: DefaultClusterCallback,
-    percentOpen: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun barrierControlStop(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun barrierControlStop(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  suspend fun barrierControlGoToPercent(percentOpen: UByte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun barrierControlStop(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readBarrierMovingStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBarrierMovingStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierMovingStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBarrierMovingStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBarrierSafetyStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBarrierSafetyStatusAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierSafetyStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBarrierSafetyStatusAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBarrierCapabilitiesAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBarrierCapabilitiesAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierCapabilitiesAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBarrierCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBarrierOpenEventsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBarrierOpenEventsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierOpenEventsAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeBarrierOpenEventsAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBarrierOpenEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeBarrierOpenEventsAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierOpenEventsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readBarrierCloseEventsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBarrierCloseEventsAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeBarrierCloseEventsAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBarrierCloseEventsAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeBarrierCloseEventsAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierCloseEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readBarrierCommandOpenEventsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierCloseEventsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeBarrierCommandOpenEventsAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBarrierCommandOpenEventsAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBarrierCommandOpenEventsAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBarrierCommandOpenEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBarrierCommandOpenEventsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeBarrierCommandOpenEventsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBarrierCommandCloseEventsAttribute(callback: IntegerAttributeCallback) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierCommandCloseEventsAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readBarrierCommandCloseEventsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierCommandCloseEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeBarrierCommandCloseEventsAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeBarrierCommandCloseEventsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeBarrierCommandCloseEventsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBarrierOpenPeriodAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBarrierOpenPeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierOpenPeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeBarrierOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBarrierOpenPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeBarrierOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierOpenPeriodAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readBarrierClosePeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBarrierClosePeriodAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeBarrierClosePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBarrierClosePeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeBarrierClosePeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeBarrierClosePeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readBarrierPositionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierClosePeriodAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBarrierPositionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBarrierPositionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBarrierPositionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 259u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
index 7c9043360ea567..9cfb4657ad3cc0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
@@ -17,426 +17,313 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BasicInformationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 40u
-  }
-
-  fun mfgSpecificPing(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+class BasicInformationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class CapabilityMinimaAttribute(val value: BasicInformationClusterCapabilityMinimaStruct)
 
-  fun mfgSpecificPing(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class ProductAppearanceAttribute(val value: BasicInformationClusterProductAppearanceStruct?)
 
-  interface CapabilityMinimaAttributeCallback {
-    fun onSuccess(value: ChipStructs.BasicInformationClusterCapabilityMinimaStruct)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface ProductAppearanceAttributeCallback {
-    fun onSuccess(value: ChipStructs.BasicInformationClusterProductAppearanceStruct?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun mfgSpecificPing(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readDataModelRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDataModelRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDataModelRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDataModelRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readVendorNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readVendorNameAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readVendorIDAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readVendorIDAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorIDAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readProductNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductNameAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductIDAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readProductIDAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductIDAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNodeLabelAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readNodeLabelAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeNodeLabelAttribute(callback: DefaultClusterCallback, value: String) {
-    // Implementation needs to be added here
+  suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNodeLabelAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeNodeLabelAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readLocationAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readLocationAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeLocationAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLocationAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeLocationAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeLocationAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readHardwareVersionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeLocationAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readHardwareVersionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readHardwareVersionStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeHardwareVersionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeHardwareVersionStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readHardwareVersionStringAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readSoftwareVersionAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeHardwareVersionStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readSoftwareVersionAttribute(callback: LongAttributeCallback) {
+  suspend fun readSoftwareVersionStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeSoftwareVersionAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeSoftwareVersionStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readSoftwareVersionStringAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readManufacturingDateAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeSoftwareVersionStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readManufacturingDateAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readPartNumberAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeManufacturingDateAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readPartNumberAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductURLAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribePartNumberAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductURLAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductLabelAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductURLAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductLabelAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readSerialNumberAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductLabelAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readSerialNumberAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readLocalConfigDisabledAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeSerialNumberAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun writeLocalConfigDisabledAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeLocalConfigDisabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readLocalConfigDisabledAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readReachableAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeLocalConfigDisabledAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeLocalConfigDisabledAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readUniqueIDAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeLocalConfigDisabledAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readReachableAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readCapabilityMinimaAttribute(): CapabilityMinimaAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeReachableAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeCapabilityMinimaAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CapabilityMinimaAttribute {
     // Implementation needs to be added here
   }
 
-  fun readUniqueIDAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeUniqueIDAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeProductAppearanceAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ProductAppearanceAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCapabilityMinimaAttribute(callback: CapabilityMinimaAttributeCallback) {
+  suspend fun readSpecificationVersionAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeCapabilityMinimaAttribute(
-    callback: CapabilityMinimaAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSpecificationVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readProductAppearanceAttribute(callback: ProductAppearanceAttributeCallback) {
+  suspend fun readMaxPathsPerInvokeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductAppearanceAttribute(
-    callback: ProductAppearanceAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxPathsPerInvokeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 40u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
index 13102a5d6e7289..a8da4754e7748f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
@@ -17,294 +17,199 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BinaryInputBasicCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 15u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class BinaryInputBasicCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readActiveTextAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeActiveTextAttribute(callback: DefaultClusterCallback, value: String) {
-    // Implementation needs to be added here
-  }
-
-  fun writeActiveTextAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun subscribeActiveTextAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readDescriptionAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readActiveTextAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeDescriptionAttribute(callback: DefaultClusterCallback, value: String) {
-    // Implementation needs to be added here
+  suspend fun writeActiveTextAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeDescriptionAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeActiveTextAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeDescriptionAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readDescriptionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readInactiveTextAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeDescriptionAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeInactiveTextAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeInactiveTextAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readInactiveTextAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeInactiveTextAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInactiveTextAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readOutOfServiceAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeInactiveTextAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeOutOfServiceAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun readOutOfServiceAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeOutOfServiceAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOutOfServiceAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeOutOfServiceAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOutOfServiceAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readPolarityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPolarityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribePolarityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePolarityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPresentValueAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readPresentValueAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writePresentValueAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
+  suspend fun writePresentValueAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writePresentValueAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribePresentValueAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribePresentValueAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readReliabilityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readReliabilityAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeReliabilityAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeReliabilityAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeReliabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeReliabilityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readStatusFlagsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeReliabilityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStatusFlagsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStatusFlagsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readApplicationTypeAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeStatusFlagsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeApplicationTypeAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readApplicationTypeAttribute(callback: LongAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeApplicationTypeAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 15u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
index 4ed086c2a795c7..824522c0a95f7d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
@@ -17,156 +17,101 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BindingCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 30u
-  }
+class BindingCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class BindingAttribute(val value: List<BindingClusterTargetStruct>)
 
-  interface BindingAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.BindingClusterTargetStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readBindingAttribute(): BindingAttribute {
+    // Implementation needs to be added here
   }
 
-  fun readBindingAttribute(callback: BindingAttributeCallback) {
+  suspend fun readBindingAttributeWithFabricFilter(isFabricFiltered: Boolean): BindingAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBindingAttributeWithFabricFilter(
-    callback: BindingAttributeCallback,
-    isFabricFiltered: Boolean
+  suspend fun writeBindingAttribute(
+    value: List<BindingClusterTargetStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBindingAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.BindingClusterTargetStruct>
-  ) {
+  suspend fun subscribeBindingAttribute(minInterval: Int, maxInterval: Int): BindingAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeBindingAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.BindingClusterTargetStruct>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBindingAttribute(
-    callback: BindingAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 30u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt
new file mode 100644
index 00000000000000..068aa709815206
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt
@@ -0,0 +1,153 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class BooleanSensorConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun suppressRequest(alarmsToSuppress: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readSensitivityLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSensitivityLevelAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAlarmsActiveAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAlarmsActiveAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAlarmsSuppressedAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAlarmsSuppressedAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAlarmsEnabledAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAlarmsEnabledAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeAlarmsEnabledAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 128u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
index 8d3a717e618c5f..f8b8fa301c2ee1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
@@ -17,126 +17,87 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BooleanStateCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 69u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class BooleanStateCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readStateValueAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readStateValueAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeStateValueAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStateValueAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 69u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
index e7171b39cead18..6f16251fb84c31 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
@@ -17,326 +17,228 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 57u
-  }
-
-  interface ProductAppearanceAttributeCallback {
-    fun onSuccess(value: ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct?)
+class BridgedDeviceBasicInformationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ProductAppearanceAttribute(
+    val value: BridgedDeviceBasicInformationClusterProductAppearanceStruct?
+  )
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readVendorNameAttribute(): CharString {
+    // Implementation needs to be added here
   }
 
-  fun readVendorNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readVendorIDAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readVendorIDAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorIDAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readProductNameAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductNameAttribute(callback: CharStringAttributeCallback) {
+  suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductNameAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readNodeLabelAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readNodeLabelAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNodeLabelAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeNodeLabelAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readHardwareVersionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNodeLabelAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readHardwareVersionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readHardwareVersionStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeHardwareVersionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeHardwareVersionStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readHardwareVersionStringAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readSoftwareVersionAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeHardwareVersionStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readSoftwareVersionAttribute(callback: LongAttributeCallback) {
+  suspend fun readSoftwareVersionStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeSoftwareVersionAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeSoftwareVersionStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readSoftwareVersionStringAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readManufacturingDateAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeSoftwareVersionStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readManufacturingDateAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readPartNumberAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeManufacturingDateAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readPartNumberAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductURLAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribePartNumberAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductURLAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductLabelAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductURLAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readProductLabelAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readSerialNumberAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductLabelAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readSerialNumberAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readReachableAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeSerialNumberAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readReachableAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readUniqueIDAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeReachableAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readUniqueIDAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeUniqueIDAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeProductAppearanceAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ProductAppearanceAttribute {
     // Implementation needs to be added here
   }
 
-  fun readProductAppearanceAttribute(callback: ProductAppearanceAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeProductAppearanceAttribute(
-    callback: ProductAppearanceAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 57u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
index 6562abd82bb5c1..9586beac02dbcc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1037u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class CarbonDioxideConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1037u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
index 451b4a986c2cf6..fdb299760ce83a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1036u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class CarbonMonoxideConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1036u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
index 125a7045445cf1..70cda55af0e17c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
@@ -17,217 +17,151 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ChannelCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1284u
-  }
-
-  fun changeChannel(callback: ChangeChannelResponseCallback, match: String) {
-    // Implementation needs to be added here
-  }
-
-  fun changeChannel(
-    callback: ChangeChannelResponseCallback,
-    match: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun changeChannelByNumber(
-    callback: DefaultClusterCallback,
-    majorNumber: Integer,
-    minorNumber: Integer
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun changeChannelByNumber(
-    callback: DefaultClusterCallback,
-    majorNumber: Integer,
-    minorNumber: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun skipChannel(callback: DefaultClusterCallback, count: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun skipChannel(callback: DefaultClusterCallback, count: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeChannelResponseCallback {
-    fun onSuccess(status: Integer, data: String?)
-
-    fun onError(error: Exception)
-  }
+class ChannelCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class ChangeChannelResponse(val status: UInt, val data: String?)
 
-  interface ChannelListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ChannelClusterChannelInfoStruct>?)
+  class ChannelListAttribute(val value: List<ChannelClusterChannelInfoStruct>?)
 
-    fun onError(ex: Exception)
+  class LineupAttribute(val value: ChannelClusterLineupInfoStruct?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LineupAttributeCallback {
-    fun onSuccess(value: ChipStructs.ChannelClusterLineupInfoStruct?)
+  class CurrentChannelAttribute(val value: ChannelClusterChannelInfoStruct?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface CurrentChannelAttributeCallback {
-    fun onSuccess(value: ChipStructs.ChannelClusterChannelInfoStruct?)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun changeChannel(
+    match: String,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeChannelResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun changeChannelByNumber(
+    majorNumber: UShort,
+    minorNumber: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun skipChannel(count: Short, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readChannelListAttribute(callback: ChannelListAttributeCallback) {
+  suspend fun readChannelListAttribute(): ChannelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeChannelListAttribute(
-    callback: ChannelListAttributeCallback,
+  suspend fun subscribeChannelListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ChannelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLineupAttribute(callback: LineupAttributeCallback) {
+  suspend fun readLineupAttribute(): LineupAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLineupAttribute(
-    callback: LineupAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLineupAttribute(minInterval: Int, maxInterval: Int): LineupAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentChannelAttribute(callback: CurrentChannelAttributeCallback) {
+  suspend fun readCurrentChannelAttribute(): CurrentChannelAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentChannelAttribute(
-    callback: CurrentChannelAttributeCallback,
+  suspend fun subscribeCurrentChannelAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentChannelAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1284u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
index 0faf5c751ba20b..1f30a7e219f96f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
@@ -17,1416 +17,991 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ColorControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 768u
-  }
+class ColorControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class NumberOfPrimariesAttribute(val value: UByte?)
 
-  fun moveToHue(
-    callback: DefaultClusterCallback,
-    hue: Integer,
-    direction: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary1IntensityAttribute(val value: UByte?)
 
-  fun moveToHue(
-    callback: DefaultClusterCallback,
-    hue: Integer,
-    direction: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary2IntensityAttribute(val value: UByte?)
 
-  fun moveHue(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary3IntensityAttribute(val value: UByte?)
 
-  fun moveHue(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary4IntensityAttribute(val value: UByte?)
 
-  fun stepHue(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary5IntensityAttribute(val value: UByte?)
 
-  fun stepHue(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class Primary6IntensityAttribute(val value: UByte?)
 
-  fun moveToSaturation(
-    callback: DefaultClusterCallback,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class ColorPointRIntensityAttribute(val value: UByte?)
 
-  fun moveToSaturation(
-    callback: DefaultClusterCallback,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class ColorPointGIntensityAttribute(val value: UByte?)
 
-  fun moveSaturation(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class ColorPointBIntensityAttribute(val value: UByte?)
 
-  fun moveSaturation(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class StartUpColorTemperatureMiredsAttribute(val value: UShort?)
 
-  fun stepSaturation(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun stepSaturation(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun moveToHueAndSaturation(
-    callback: DefaultClusterCallback,
-    hue: Integer,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun moveToHueAndSaturation(
-    callback: DefaultClusterCallback,
-    hue: Integer,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun moveToColor(
-    callback: DefaultClusterCallback,
-    colorX: Integer,
-    colorY: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun moveToHue(
+    hue: UByte,
+    direction: UInt,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 0L
 
-  fun moveToColor(
-    callback: DefaultClusterCallback,
-    colorX: Integer,
-    colorY: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun moveColor(
-    callback: DefaultClusterCallback,
-    rateX: Integer,
-    rateY: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun moveHue(
+    moveMode: UInt,
+    rate: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 1L
 
-  fun moveColor(
-    callback: DefaultClusterCallback,
-    rateX: Integer,
-    rateY: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stepColor(
-    callback: DefaultClusterCallback,
-    stepX: Integer,
-    stepY: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun stepHue(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 2L
 
-  fun stepColor(
-    callback: DefaultClusterCallback,
-    stepX: Integer,
-    stepY: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun moveToColorTemperature(
-    callback: DefaultClusterCallback,
-    colorTemperatureMireds: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun moveToSaturation(
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 3L
 
-  fun moveToColorTemperature(
-    callback: DefaultClusterCallback,
-    colorTemperatureMireds: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enhancedMoveToHue(
-    callback: DefaultClusterCallback,
-    enhancedHue: Integer,
-    direction: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun moveSaturation(
+    moveMode: UInt,
+    rate: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 4L
 
-  fun enhancedMoveToHue(
-    callback: DefaultClusterCallback,
-    enhancedHue: Integer,
-    direction: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enhancedMoveHue(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
+  suspend fun stepSaturation(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 5L
 
-  fun enhancedMoveHue(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToHueAndSaturation(
+    hue: UByte,
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 6L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enhancedStepHue(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+  suspend fun moveToColor(
+    colorX: UShort,
+    colorY: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 7L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveColor(
+    rateX: Short,
+    rateY: Short,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 8L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enhancedStepHue(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun stepColor(
+    stepX: Short,
+    stepY: Short,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 9L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToColorTemperature(
+    colorTemperatureMireds: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 10L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedMoveToHue(
+    enhancedHue: UShort,
+    direction: UInt,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 64L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedMoveHue(
+    moveMode: UInt,
+    rate: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 65L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedStepHue(
+    stepMode: UInt,
+    stepSize: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 66L
 
-  fun enhancedMoveToHueAndSaturation(
-    callback: DefaultClusterCallback,
-    enhancedHue: Integer,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun enhancedMoveToHueAndSaturation(
-    callback: DefaultClusterCallback,
-    enhancedHue: Integer,
-    saturation: Integer,
-    transitionTime: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun enhancedMoveToHueAndSaturation(
+    enhancedHue: UShort,
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 67L
 
-  fun colorLoopSet(
-    callback: DefaultClusterCallback,
-    updateFlags: Integer,
-    action: Integer,
-    direction: Integer,
-    time: Integer,
-    startHue: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun colorLoopSet(
-    callback: DefaultClusterCallback,
-    updateFlags: Integer,
-    action: Integer,
-    direction: Integer,
-    time: Integer,
-    startHue: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun colorLoopSet(
+    updateFlags: UInt,
+    action: UInt,
+    direction: UInt,
+    time: UShort,
+    startHue: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 68L
 
-  fun stopMoveStep(
-    callback: DefaultClusterCallback,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stopMoveStep(
-    callback: DefaultClusterCallback,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun stopMoveStep(
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 71L
 
-  fun moveColorTemperature(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    colorTemperatureMinimumMireds: Integer,
-    colorTemperatureMaximumMireds: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun moveColorTemperature(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer,
-    colorTemperatureMinimumMireds: Integer,
-    colorTemperatureMaximumMireds: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun moveColorTemperature(
+    moveMode: UInt,
+    rate: UShort,
+    colorTemperatureMinimumMireds: UShort,
+    colorTemperatureMaximumMireds: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 75L
 
-  fun stepColorTemperature(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    colorTemperatureMinimumMireds: Integer,
-    colorTemperatureMaximumMireds: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stepColorTemperature(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer,
-    colorTemperatureMinimumMireds: Integer,
-    colorTemperatureMaximumMireds: Integer,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun stepColorTemperature(
+    stepMode: UInt,
+    stepSize: UShort,
+    transitionTime: UShort,
+    colorTemperatureMinimumMireds: UShort,
+    colorTemperatureMaximumMireds: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface NumberOfPrimariesAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary1IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary2IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary3IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary4IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary5IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface Primary6IntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ColorPointRIntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ColorPointGIntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ColorPointBIntensityAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+    val commandId = 76L
 
-  interface StartUpColorTemperatureMiredsAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readCurrentHueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentHueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentHueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentHueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentSaturationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentSaturationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentSaturationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentSaturationAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readRemainingTimeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRemainingTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRemainingTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readCurrentXAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentXAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentXAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentXAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readCurrentYAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentYAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentYAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentYAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDriftCompensationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDriftCompensationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDriftCompensationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDriftCompensationAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCompensationTextAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readCompensationTextAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeCompensationTextAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCompensationTextAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readColorTemperatureMiredsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorTemperatureMiredsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorTemperatureMiredsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorTemperatureMiredsAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOptionsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOptionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeOptionsAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOptionsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOptionsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readNumberOfPrimariesAttribute(): NumberOfPrimariesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfPrimariesAttribute(callback: NumberOfPrimariesAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeNumberOfPrimariesAttribute(
-    callback: NumberOfPrimariesAttributeCallback,
+  suspend fun subscribeNumberOfPrimariesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NumberOfPrimariesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary1XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary1XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary1XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary1XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary1YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary1YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary1YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary1YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary1IntensityAttribute(callback: Primary1IntensityAttributeCallback) {
+  suspend fun readPrimary1IntensityAttribute(): Primary1IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary1IntensityAttribute(
-    callback: Primary1IntensityAttributeCallback,
+  suspend fun subscribePrimary1IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Primary1IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary2XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary2XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary2XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary2XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary2YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary2YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary2YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary2YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary2IntensityAttribute(callback: Primary2IntensityAttributeCallback) {
+  suspend fun readPrimary2IntensityAttribute(): Primary2IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary2IntensityAttribute(
-    callback: Primary2IntensityAttributeCallback,
+  suspend fun subscribePrimary2IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Primary2IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary3XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary3XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary3XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary3XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary3YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary3YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary3YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary3YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary3IntensityAttribute(callback: Primary3IntensityAttributeCallback) {
+  suspend fun readPrimary3IntensityAttribute(): Primary3IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary3IntensityAttribute(
-    callback: Primary3IntensityAttributeCallback,
+  suspend fun subscribePrimary3IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Primary3IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary4XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary4XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary4XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary4XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary4YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary4YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary4YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary4YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary4IntensityAttribute(callback: Primary4IntensityAttributeCallback) {
+  suspend fun readPrimary4IntensityAttribute(): Primary4IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary4IntensityAttribute(
-    callback: Primary4IntensityAttributeCallback,
+  suspend fun subscribePrimary4IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Primary4IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary5XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary5XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary5XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary5XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary5YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary5YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary5YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary5YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary5IntensityAttribute(callback: Primary5IntensityAttributeCallback) {
+  suspend fun readPrimary5IntensityAttribute(): Primary5IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary5IntensityAttribute(
-    callback: Primary5IntensityAttributeCallback,
+  suspend fun subscribePrimary5IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Primary5IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPrimary6XAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary6XAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary6XAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary6XAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary6YAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPrimary6YAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary6YAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePrimary6YAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPrimary6IntensityAttribute(callback: Primary6IntensityAttributeCallback) {
+  suspend fun readPrimary6IntensityAttribute(): Primary6IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePrimary6IntensityAttribute(
-    callback: Primary6IntensityAttributeCallback,
+  suspend fun subscribePrimary6IntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readWhitePointXAttribute(callback: IntegerAttributeCallback) {
+  ): Primary6IntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeWhitePointXAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readWhitePointXAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeWhitePointXAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeWhitePointXAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeWhitePointXAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWhitePointXAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readWhitePointYAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readWhitePointYAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeWhitePointYAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeWhitePointYAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeWhitePointYAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeWhitePointYAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeWhitePointYAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readColorPointRXAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorPointRXAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointRXAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeColorPointRXAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeColorPointRXAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointRXAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readColorPointRYAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorPointRXAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointRYAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readColorPointRYAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeColorPointRYAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointRYAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readColorPointRIntensityAttribute(): ColorPointRIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointRYAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointRIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeColorPointRYAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorPointRIntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readColorPointRIntensityAttribute(callback: ColorPointRIntensityAttributeCallback) {
+  ): ColorPointRIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointRIntensityAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readColorPointGXAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointRIntensityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeColorPointRIntensityAttribute(
-    callback: ColorPointRIntensityAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readColorPointGXAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointGXAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeColorPointGXAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeColorPointGXAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointGXAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readColorPointGYAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorPointGXAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointGYAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readColorPointGYAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeColorPointGYAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointGYAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readColorPointGIntensityAttribute(): ColorPointGIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointGYAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointGIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeColorPointGYAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorPointGIntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readColorPointGIntensityAttribute(callback: ColorPointGIntensityAttributeCallback) {
+  ): ColorPointGIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointGIntensityAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readColorPointBXAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointGIntensityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeColorPointGIntensityAttribute(
-    callback: ColorPointGIntensityAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readColorPointBXAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointBXAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeColorPointBXAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeColorPointBXAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointBXAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readColorPointBYAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorPointBXAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointBYAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readColorPointBYAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeColorPointBYAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointBYAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readColorPointBIntensityAttribute(): ColorPointBIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointBYAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeColorPointBIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeColorPointBYAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorPointBIntensityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ColorPointBIntensityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readColorPointBIntensityAttribute(callback: ColorPointBIntensityAttributeCallback) {
+  suspend fun readEnhancedCurrentHueAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointBIntensityAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeEnhancedCurrentHueAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeColorPointBIntensityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readEnhancedColorModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorPointBIntensityAttribute(
-    callback: ColorPointBIntensityAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEnhancedColorModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readEnhancedCurrentHueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorLoopActiveAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeEnhancedCurrentHueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorLoopActiveAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readEnhancedColorModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorLoopDirectionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeEnhancedColorModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorLoopDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readColorLoopActiveAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorLoopTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorLoopActiveAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorLoopTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorLoopDirectionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorLoopStartEnhancedHueAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorLoopDirectionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorLoopStartEnhancedHueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorLoopTimeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorLoopStoredEnhancedHueAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorLoopTimeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorLoopStoredEnhancedHueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorLoopStartEnhancedHueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorCapabilitiesAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorLoopStartEnhancedHueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeColorCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorLoopStoredEnhancedHueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorTempPhysicalMinMiredsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorLoopStoredEnhancedHueAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorTempPhysicalMinMiredsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorCapabilitiesAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readColorTempPhysicalMaxMiredsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorCapabilitiesAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeColorTempPhysicalMaxMiredsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorTempPhysicalMinMiredsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCoupleColorTempToLevelMinMiredsAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorTempPhysicalMinMiredsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeCoupleColorTempToLevelMinMiredsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readColorTempPhysicalMaxMiredsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readStartUpColorTemperatureMiredsAttribute(): StartUpColorTemperatureMiredsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeColorTempPhysicalMaxMiredsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeStartUpColorTemperatureMiredsAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun readCoupleColorTempToLevelMinMiredsAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeCoupleColorTempToLevelMinMiredsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeStartUpColorTemperatureMiredsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readStartUpColorTemperatureMiredsAttribute(
-    callback: StartUpColorTemperatureMiredsAttributeCallback
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun writeStartUpColorTemperatureMiredsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  ): StartUpColorTemperatureMiredsAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpColorTemperatureMiredsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeStartUpColorTemperatureMiredsAttribute(
-    callback: StartUpColorTemperatureMiredsAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 768u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
index 31c53d05ec49b6..d91c75e898b7ef 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
@@ -17,202 +17,135 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ContentLauncherCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1290u
-  }
-
-  fun launchContent(
-    callback: LauncherResponseCallback,
-    search: ChipStructs.ContentLauncherClusterContentSearchStruct,
-    autoPlay: Boolean,
-    data: String?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun launchContent(
-    callback: LauncherResponseCallback,
-    search: ChipStructs.ContentLauncherClusterContentSearchStruct,
-    autoPlay: Boolean,
-    data: String?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun launchURL(
-    callback: LauncherResponseCallback,
-    contentURL: String,
-    displayString: String?,
-    brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun launchURL(
-    callback: LauncherResponseCallback,
-    contentURL: String,
-    displayString: String?,
-    brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface LauncherResponseCallback {
-    fun onSuccess(status: Integer, data: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface AcceptHeaderAttributeCallback {
-    fun onSuccess(value: ArrayList<String>?)
-
-    fun onError(ex: Exception)
+class ContentLauncherCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class LauncherResponse(val status: UInt, val data: String?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptHeaderAttribute(val value: List<String>?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun launchContent(
+    search: ContentLauncherClusterContentSearchStruct,
+    autoPlay: Boolean,
+    data: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun launchURL(
+    contentURL: String,
+    displayString: String?,
+    brandingInformation: ContentLauncherClusterBrandingInformationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readAcceptHeaderAttribute(callback: AcceptHeaderAttributeCallback) {
+  suspend fun readAcceptHeaderAttribute(): AcceptHeaderAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptHeaderAttribute(
-    callback: AcceptHeaderAttributeCallback,
+  suspend fun subscribeAcceptHeaderAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSupportedStreamingProtocolsAttribute(callback: LongAttributeCallback) {
+  ): AcceptHeaderAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeSupportedStreamingProtocolsAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readSupportedStreamingProtocolsAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeSupportedStreamingProtocolsAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeSupportedStreamingProtocolsAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeSupportedStreamingProtocolsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1290u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt
new file mode 100644
index 00000000000000..2f61d6f7b0c5db
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt
@@ -0,0 +1,260 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class DemandResponseLoadControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class LoadControlProgramsAttribute(
+    val value: List<DemandResponseLoadControlClusterLoadControlProgramStruct>
+  )
+
+  class EventsAttribute(val value: List<DemandResponseLoadControlClusterLoadControlEventStruct>)
+
+  class ActiveEventsAttribute(
+    val value: List<DemandResponseLoadControlClusterLoadControlEventStruct>
+  )
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun registerLoadControlProgramRequest(
+    loadControlProgram: DemandResponseLoadControlClusterLoadControlProgramStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun unregisterLoadControlProgramRequest(
+    loadControlProgramID: ByteArray,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addLoadControlEventRequest(
+    event: DemandResponseLoadControlClusterLoadControlEventStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeLoadControlEventRequest(
+    eventID: ByteArray,
+    cancelControl: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 3L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearLoadControlEventsRequest(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 4L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readLoadControlProgramsAttribute(): LoadControlProgramsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLoadControlProgramsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LoadControlProgramsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfLoadControlProgramsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfLoadControlProgramsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventsAttribute(): EventsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventsAttribute(minInterval: Int, maxInterval: Int): EventsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveEventsAttribute(): ActiveEventsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveEventsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveEventsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfEventsPerProgramAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfEventsPerProgramAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfTransitionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfTransitionsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultRandomStartAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultRandomStartAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeDefaultRandomStartAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultRandomDurationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultRandomDurationAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeDefaultRandomDurationAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 150u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
index fc0bc78ddddbfd..109cefa90c030a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
@@ -17,214 +17,135 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class DescriptorCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 29u
-  }
-
-  interface DeviceTypeListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.DescriptorClusterDeviceTypeStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ServerListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class DescriptorCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class DeviceTypeListAttribute(val value: List<DescriptorClusterDeviceTypeStruct>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ServerListAttribute(val value: List<UInt>)
 
-  interface ClientListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class ClientListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class PartsListAttribute(val value: List<UShort>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class TagListAttribute(val value: List<DescriptorClusterSemanticTagStruct>?)
 
-  interface PartsListAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface TagListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.DescriptorClusterSemanticTagStruct>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readDeviceTypeListAttribute(callback: DeviceTypeListAttributeCallback) {
+  suspend fun readDeviceTypeListAttribute(): DeviceTypeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDeviceTypeListAttribute(
-    callback: DeviceTypeListAttributeCallback,
+  suspend fun subscribeDeviceTypeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): DeviceTypeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readServerListAttribute(callback: ServerListAttributeCallback) {
+  suspend fun readServerListAttribute(): ServerListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeServerListAttribute(
-    callback: ServerListAttributeCallback,
+  suspend fun subscribeServerListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ServerListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readClientListAttribute(callback: ClientListAttributeCallback) {
+  suspend fun readClientListAttribute(): ClientListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeClientListAttribute(
-    callback: ClientListAttributeCallback,
+  suspend fun subscribeClientListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ClientListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPartsListAttribute(callback: PartsListAttributeCallback) {
+  suspend fun readPartsListAttribute(): PartsListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePartsListAttribute(
-    callback: PartsListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePartsListAttribute(minInterval: Int, maxInterval: Int): PartsListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTagListAttribute(callback: TagListAttributeCallback) {
+  suspend fun readTagListAttribute(): TagListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTagListAttribute(
-    callback: TagListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTagListAttribute(minInterval: Int, maxInterval: Int): TagListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 29u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
index 1eaf5b35f573f4..13b9d53a1f6740 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
@@ -17,139 +17,101 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class DiagnosticLogsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 50u
-  }
+class DiagnosticLogsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class RetrieveLogsResponse(
+    val status: UInt,
+    val logContent: ByteArray,
+    val UTCTimeStamp: ULong?,
+    val timeSinceBoot: ULong?
+  )
 
-  fun retrieveLogsRequest(
-    callback: RetrieveLogsResponseCallback,
-    intent: Integer,
-    requestedProtocol: Integer,
-    transferFileDesignator: String?
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun retrieveLogsRequest(
-    callback: RetrieveLogsResponseCallback,
-    intent: Integer,
-    requestedProtocol: Integer,
-    transferFileDesignator: String?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface RetrieveLogsResponseCallback {
-    fun onSuccess(status: Integer, logContent: ByteArray, UTCTimeStamp: Long?, timeSinceBoot: Long?)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(error: Exception)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun retrieveLogsRequest(
+    intent: UInt,
+    requestedProtocol: UInt,
+    transferFileDesignator: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): RetrieveLogsResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 50u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
index fca1a80c6793eb..e0d986f2c59042 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
@@ -17,166 +17,131 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class DishwasherAlarmCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 93u
-  }
-
-  fun reset(callback: DefaultClusterCallback, alarms: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun reset(callback: DefaultClusterCallback, alarms: Long, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun modifyEnabledAlarms(callback: DefaultClusterCallback, mask: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun modifyEnabledAlarms(callback: DefaultClusterCallback, mask: Long, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class DishwasherAlarmCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun reset(alarms: ULong, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun modifyEnabledAlarms(mask: ULong, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readMaskAttribute(callback: LongAttributeCallback) {
+  suspend fun readMaskAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaskAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readLatchAttribute(callback: LongAttributeCallback) {
+  suspend fun readLatchAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeLatchAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeLatchAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readStateAttribute(callback: LongAttributeCallback) {
+  suspend fun readStateAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeStateAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readSupportedAttribute(callback: LongAttributeCallback) {
+  suspend fun readSupportedAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 93u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
index 22ea8827c31e0c..5352d16f02443c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
@@ -17,228 +17,154 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class DishwasherModeCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 89u
-  }
-
-  fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun changeToMode(
-    callback: ChangeToModeResponseCallback,
-    newMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeToModeResponseCallback {
-    fun onSuccess(status: Integer, statusText: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.DishwasherModeClusterModeOptionStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StartUpModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class DishwasherModeCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class SupportedModesAttribute(val value: List<DishwasherModeClusterModeOptionStruct>)
 
-    fun onError(ex: Exception)
+  class StartUpModeAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OnModeAttribute(val value: UByte?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) {
+  suspend fun readStartUpModeAttribute(): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeStartUpModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeStartUpModeAttribute(
-    callback: StartUpModeAttributeCallback,
+  suspend fun subscribeStartUpModeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  ): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 89u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
index 38253f104f8acb..efe90d407177d7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
@@ -17,1096 +17,850 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class DoorLockCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 257u
-  }
+class DoorLockCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GetWeekDayScheduleResponse(
+    val weekDayIndex: UByte,
+    val userIndex: UShort,
+    val status: UInt,
+    val daysMask: UInt?,
+    val startHour: UByte?,
+    val startMinute: UByte?,
+    val endHour: UByte?,
+    val endMinute: UByte?
+  )
 
-  fun lockDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class GetYearDayScheduleResponse(
+    val yearDayIndex: UByte,
+    val userIndex: UShort,
+    val status: UInt,
+    val localStartTime: UInt?,
+    val localEndTime: UInt?
+  )
 
-  fun unlockDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun unlockWithTimeout(
-    callback: DefaultClusterCallback,
-    timeout: Integer,
-    PINCode: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GetHolidayScheduleResponse(
+    val holidayIndex: UByte,
+    val status: UInt,
+    val localStartTime: UInt?,
+    val localEndTime: UInt?,
+    val operatingMode: UInt?
+  )
 
-  fun setWeekDaySchedule(
-    callback: DefaultClusterCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer,
-    daysMask: Integer,
-    startHour: Integer,
-    startMinute: Integer,
-    endHour: Integer,
-    endMinute: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class GetUserResponse(
+    val userIndex: UShort,
+    val userName: String?,
+    val userUniqueID: UInt?,
+    val userStatus: UInt?,
+    val userType: UInt?,
+    val credentialRule: UInt?,
+    val credentials: List<DoorLockClusterCredentialStruct>?,
+    val creatorFabricIndex: UByte?,
+    val lastModifiedFabricIndex: UByte?,
+    val nextUserIndex: UShort?
+  )
 
-  fun setWeekDaySchedule(
-    callback: DefaultClusterCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer,
-    daysMask: Integer,
-    startHour: Integer,
-    startMinute: Integer,
-    endHour: Integer,
-    endMinute: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class SetCredentialResponse(
+    val status: UInt,
+    val userIndex: UShort?,
+    val nextCredentialIndex: UShort?
+  )
 
-  fun getWeekDaySchedule(
-    callback: GetWeekDayScheduleResponseCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class GetCredentialStatusResponse(
+    val credentialExists: Boolean,
+    val userIndex: UShort?,
+    val creatorFabricIndex: UByte?,
+    val lastModifiedFabricIndex: UByte?,
+    val nextCredentialIndex: UShort?
+  )
 
-  fun getWeekDaySchedule(
-    callback: GetWeekDayScheduleResponseCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class LockStateAttribute(val value: UInt?)
 
-  fun clearWeekDaySchedule(
-    callback: DefaultClusterCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class DoorStateAttribute(val value: UInt?)
 
-  fun clearWeekDaySchedule(
-    callback: DefaultClusterCallback,
-    weekDayIndex: Integer,
-    userIndex: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun setYearDaySchedule(
-    callback: DefaultClusterCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer,
-    localStartTime: Long,
-    localEndTime: Long
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun setYearDaySchedule(
-    callback: DefaultClusterCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer,
-    localStartTime: Long,
-    localEndTime: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun getYearDaySchedule(
-    callback: GetYearDayScheduleResponseCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun getYearDaySchedule(
-    callback: GetYearDayScheduleResponseCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun lockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
+    val commandId = 0L
 
-  fun clearYearDaySchedule(
-    callback: DefaultClusterCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer
-  ) {
     // Implementation needs to be added here
   }
 
-  fun clearYearDaySchedule(
-    callback: DefaultClusterCallback,
-    yearDayIndex: Integer,
-    userIndex: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun unlockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
+    val commandId = 1L
 
-  fun setHolidaySchedule(
-    callback: DefaultClusterCallback,
-    holidayIndex: Integer,
-    localStartTime: Long,
-    localEndTime: Long,
-    operatingMode: Integer
-  ) {
     // Implementation needs to be added here
   }
 
-  fun setHolidaySchedule(
-    callback: DefaultClusterCallback,
-    holidayIndex: Integer,
-    localStartTime: Long,
-    localEndTime: Long,
-    operatingMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun unlockWithTimeout(timeout: UShort, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
+    val commandId = 3L
 
-  fun getHolidaySchedule(callback: GetHolidayScheduleResponseCallback, holidayIndex: Integer) {
     // Implementation needs to be added here
   }
 
-  fun getHolidaySchedule(
-    callback: GetHolidayScheduleResponseCallback,
-    holidayIndex: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun setWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    daysMask: UInt,
+    startHour: UByte,
+    startMinute: UByte,
+    endHour: UByte,
+    endMinute: UByte,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun clearHolidaySchedule(callback: DefaultClusterCallback, holidayIndex: Integer) {
-    // Implementation needs to be added here
-  }
+    val commandId = 11L
 
-  fun clearHolidaySchedule(
-    callback: DefaultClusterCallback,
-    holidayIndex: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun setUser(
-    callback: DefaultClusterCallback,
-    operationType: Integer,
-    userIndex: Integer,
-    userName: String?,
-    userUniqueID: Long?,
-    userStatus: Integer?,
-    userType: Integer?,
-    credentialRule: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun getWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetWeekDayScheduleResponse {
+    val commandId = 12L
 
-  fun getUser(callback: GetUserResponseCallback, userIndex: Integer) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun getUser(callback: GetUserResponseCallback, userIndex: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun clearUser(callback: DefaultClusterCallback, userIndex: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun setCredential(
-    callback: SetCredentialResponseCallback,
-    operationType: Integer,
-    credential: ChipStructs.DoorLockClusterCredentialStruct,
-    credentialData: ByteArray,
-    userIndex: Integer?,
-    userStatus: Integer?,
-    userType: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun getCredentialStatus(
-    callback: GetCredentialStatusResponseCallback,
-    credential: ChipStructs.DoorLockClusterCredentialStruct
+  suspend fun clearWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 13L
 
-  fun getCredentialStatus(
-    callback: GetCredentialStatusResponseCallback,
-    credential: ChipStructs.DoorLockClusterCredentialStruct,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun clearCredential(
-    callback: DefaultClusterCallback,
-    credential: ChipStructs.DoorLockClusterCredentialStruct?,
-    timedInvokeTimeoutMs: Int
+  suspend fun setYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    localStartTime: UInt,
+    localEndTime: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun unboltDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface GetWeekDayScheduleResponseCallback {
-    fun onSuccess(
-      weekDayIndex: Integer,
-      userIndex: Integer,
-      status: Integer,
-      daysMask: Integer?,
-      startHour: Integer?,
-      startMinute: Integer?,
-      endHour: Integer?,
-      endMinute: Integer?
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface GetYearDayScheduleResponseCallback {
-    fun onSuccess(
-      yearDayIndex: Integer,
-      userIndex: Integer,
-      status: Integer,
-      localStartTime: Long?,
-      localEndTime: Long?
-    )
+    val commandId = 14L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GetHolidayScheduleResponseCallback {
-    fun onSuccess(
-      holidayIndex: Integer,
-      status: Integer,
-      localStartTime: Long?,
-      localEndTime: Long?,
-      operatingMode: Integer?
-    )
+  suspend fun getYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetYearDayScheduleResponse {
+    val commandId = 15L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GetUserResponseCallback {
-    fun onSuccess(
-      userIndex: Integer,
-      userName: String?,
-      userUniqueID: Long?,
-      userStatus: Integer?,
-      userType: Integer?,
-      credentialRule: Integer?,
-      credentials: ArrayList<ChipStructs.DoorLockClusterCredentialStruct>?,
-      creatorFabricIndex: Integer?,
-      lastModifiedFabricIndex: Integer?,
-      nextUserIndex: Integer?
-    )
+  suspend fun clearYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 16L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface SetCredentialResponseCallback {
-    fun onSuccess(status: Integer, userIndex: Integer?, nextCredentialIndex: Integer?)
+  suspend fun setHolidaySchedule(
+    holidayIndex: UByte,
+    localStartTime: UInt,
+    localEndTime: UInt,
+    operatingMode: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 17L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GetCredentialStatusResponseCallback {
-    fun onSuccess(
-      credentialExists: Boolean,
-      userIndex: Integer?,
-      creatorFabricIndex: Integer?,
-      lastModifiedFabricIndex: Integer?,
-      nextCredentialIndex: Integer?
-    )
+  suspend fun getHolidaySchedule(
+    holidayIndex: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetHolidayScheduleResponse {
+    val commandId = 18L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface LockStateAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+  suspend fun clearHolidaySchedule(holidayIndex: UByte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 19L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface DoorStateAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setUser(
+    operationType: UInt,
+    userIndex: UShort,
+    userName: String?,
+    userUniqueID: UInt?,
+    userStatus: UInt?,
+    userType: UInt?,
+    credentialRule: UInt?,
+    timedInvokeTimeoutMs: Int
+  ) {
+    val commandId = 26L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun getUser(userIndex: UShort, timedInvokeTimeoutMs: Int? = null): GetUserResponse {
+    val commandId = 27L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun clearUser(userIndex: UShort, timedInvokeTimeoutMs: Int) {
+    val commandId = 29L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    // Implementation needs to be added here
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  suspend fun setCredential(
+    operationType: UInt,
+    credential: DoorLockClusterCredentialStruct,
+    credentialData: ByteArray,
+    userIndex: UShort?,
+    userStatus: UInt?,
+    userType: UInt?,
+    timedInvokeTimeoutMs: Int
+  ): SetCredentialResponse {
+    val commandId = 34L
 
-  fun readLockStateAttribute(callback: LockStateAttributeCallback) {
     // Implementation needs to be added here
   }
 
-  fun subscribeLockStateAttribute(
-    callback: LockStateAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun getCredentialStatus(
+    credential: DoorLockClusterCredentialStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetCredentialStatusResponse {
+    val commandId = 36L
 
-  fun readLockTypeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun subscribeLockTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun clearCredential(
+    credential: DoorLockClusterCredentialStruct?,
+    timedInvokeTimeoutMs: Int
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 38L
 
-  fun readActuatorEnabledAttribute(callback: BooleanAttributeCallback) {
     // Implementation needs to be added here
   }
 
-  fun subscribeActuatorEnabledAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun unboltDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) {
+    val commandId = 39L
 
-  fun readDoorStateAttribute(callback: DoorStateAttributeCallback) {
     // Implementation needs to be added here
   }
 
-  fun subscribeDoorStateAttribute(
-    callback: DoorStateAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readLockStateAttribute(): LockStateAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDoorOpenEventsAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeLockStateAttribute(minInterval: Int, maxInterval: Int): LockStateAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeDoorOpenEventsAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readLockTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeDoorOpenEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeLockTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDoorOpenEventsAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readActuatorEnabledAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readDoorClosedEventsAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeActuatorEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeDoorClosedEventsAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readDoorStateAttribute(): DoorStateAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeDoorClosedEventsAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeDoorStateAttribute(minInterval: Int, maxInterval: Int): DoorStateAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDoorClosedEventsAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readDoorOpenEventsAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readOpenPeriodAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeDoorOpenEventsAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOpenPeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeDoorOpenEventsAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeOpenPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readDoorClosedEventsAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeOpenPeriodAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeDoorClosedEventsAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNumberOfTotalUsersSupportedAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeDoorClosedEventsAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfTotalUsersSupportedAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readOpenPeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfPINUsersSupportedAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNumberOfPINUsersSupportedAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfRFIDUsersSupportedAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfTotalUsersSupportedAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfRFIDUsersSupportedAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfTotalUsersSupportedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfPINUsersSupportedAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfPINUsersSupportedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfRFIDUsersSupportedAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfRFIDUsersSupportedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfHolidaySchedulesSupportedAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfHolidaySchedulesSupportedAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMaxPINCodeLengthAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxPINCodeLengthAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMinPINCodeLengthAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfHolidaySchedulesSupportedAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinPINCodeLengthAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfHolidaySchedulesSupportedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMaxRFIDCodeLengthAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxPINCodeLengthAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxRFIDCodeLengthAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMinRFIDCodeLengthAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinPINCodeLengthAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinRFIDCodeLengthAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMinPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCredentialRulesSupportAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxRFIDCodeLengthAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCredentialRulesSupportAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfCredentialsSupportedPerUserAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinRFIDCodeLengthAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfCredentialsSupportedPerUserAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMinRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLanguageAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readCredentialRulesSupportAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLanguageAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeCredentialRulesSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLanguageAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNumberOfCredentialsSupportedPerUserAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLanguageAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeNumberOfCredentialsSupportedPerUserAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLEDSettingsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLanguageAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeLEDSettingsAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeLanguageAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLEDSettingsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeLanguageAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeLEDSettingsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readLEDSettingsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readAutoRelockTimeAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeLEDSettingsAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeAutoRelockTimeAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun subscribeLEDSettingsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeAutoRelockTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readAutoRelockTimeAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAutoRelockTimeAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeAutoRelockTimeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readSoundVolumeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeAutoRelockTimeAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeSoundVolumeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readSoundVolumeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeSoundVolumeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeSoundVolumeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeSoundVolumeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSoundVolumeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOperatingModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOperatingModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeOperatingModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOperatingModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOperatingModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeOperatingModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperatingModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSupportedOperatingModesAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readSupportedOperatingModesAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeSupportedOperatingModesAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSupportedOperatingModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDefaultConfigurationRegisterAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDefaultConfigurationRegisterAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDefaultConfigurationRegisterAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeDefaultConfigurationRegisterAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readEnableLocalProgrammingAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readEnableLocalProgrammingAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnableLocalProgrammingAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
-  }
-
-  fun writeEnableLocalProgrammingAttribute(
-    callback: DefaultClusterCallback,
+  suspend fun writeEnableLocalProgrammingAttribute(
     value: Boolean,
-    timedWriteTimeoutMs: Int
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeEnableLocalProgrammingAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeEnableLocalProgrammingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readEnableOneTouchLockingAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readEnableOneTouchLockingAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnableOneTouchLockingAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
-  }
-
-  fun writeEnableOneTouchLockingAttribute(
-    callback: DefaultClusterCallback,
+  suspend fun writeEnableOneTouchLockingAttribute(
     value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeEnableOneTouchLockingAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readEnableInsideStatusLEDAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeEnableOneTouchLockingAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnableInsideStatusLEDAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun readEnableInsideStatusLEDAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnableInsideStatusLEDAttribute(
-    callback: DefaultClusterCallback,
+  suspend fun writeEnableInsideStatusLEDAttribute(
     value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeEnableInsideStatusLEDAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readEnablePrivacyModeButtonAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeEnableInsideStatusLEDAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnablePrivacyModeButtonAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun readEnablePrivacyModeButtonAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeEnablePrivacyModeButtonAttribute(
-    callback: DefaultClusterCallback,
+  suspend fun writeEnablePrivacyModeButtonAttribute(
     value: Boolean,
-    timedWriteTimeoutMs: Int
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeEnablePrivacyModeButtonAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeEnablePrivacyModeButtonAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readLocalProgrammingFeaturesAttribute(callback: IntegerAttributeCallback) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeLocalProgrammingFeaturesAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readLocalProgrammingFeaturesAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLocalProgrammingFeaturesAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeLocalProgrammingFeaturesAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLocalProgrammingFeaturesAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeLocalProgrammingFeaturesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readWrongCodeEntryLimitAttribute(callback: IntegerAttributeCallback) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeWrongCodeEntryLimitAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeWrongCodeEntryLimitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readWrongCodeEntryLimitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeWrongCodeEntryLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeWrongCodeEntryLimitAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readUserCodeTemporaryDisableTimeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeWrongCodeEntryLimitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeUserCodeTemporaryDisableTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readUserCodeTemporaryDisableTimeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeUserCodeTemporaryDisableTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeUserCodeTemporaryDisableTimeAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUserCodeTemporaryDisableTimeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUserCodeTemporaryDisableTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSendPINOverTheAirAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readSendPINOverTheAirAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeSendPINOverTheAirAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
+  suspend fun writeSendPINOverTheAirAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeSendPINOverTheAirAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeSendPINOverTheAirAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeSendPINOverTheAirAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readRequirePINforRemoteOperationAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeRequirePINforRemoteOperationAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun readRequirePINforRemoteOperationAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeRequirePINforRemoteOperationAttribute(
-    callback: DefaultClusterCallback,
+  suspend fun writeRequirePINforRemoteOperationAttribute(
     value: Boolean,
-    timedWriteTimeoutMs: Int
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRequirePINforRemoteOperationAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeRequirePINforRemoteOperationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readExpiringUserTimeoutAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readExpiringUserTimeoutAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeExpiringUserTimeoutAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeExpiringUserTimeoutAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeExpiringUserTimeoutAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeExpiringUserTimeoutAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeExpiringUserTimeoutAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 257u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
index bd0c67644a9f2e..9e3ed080f8c3f6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
@@ -17,1779 +17,1309 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ElectricalMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 2820u
-  }
+class ElectricalMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun getProfileInfoCommand(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun getProfileInfoCommand(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun getMeasurementProfileCommand(
-    callback: DefaultClusterCallback,
-    attributeId: Integer,
-    startTime: Long,
-    numberOfIntervals: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun getMeasurementProfileCommand(
-    callback: DefaultClusterCallback,
-    attributeId: Integer,
-    startTime: Long,
-    numberOfIntervals: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun getProfileInfoCommand(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun getMeasurementProfileCommand(
+    attributeId: UShort,
+    startTime: UInt,
+    numberOfIntervals: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readMeasurementTypeAttribute(callback: LongAttributeCallback) {
+  suspend fun readMeasurementTypeAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementTypeAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementTypeAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readDcVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcVoltageMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcVoltageMinAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcVoltageMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcVoltageMinAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcVoltageMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcVoltageMaxAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcVoltageMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcCurrentAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcCurrentAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcCurrentMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcCurrentMinAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcCurrentMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcCurrentMinAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcCurrentMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcCurrentMaxAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcCurrentMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcPowerAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcPowerAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcPowerAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcPowerAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcPowerMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcPowerMinAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcPowerMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcPowerMinAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcPowerMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcPowerMaxAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcPowerMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcPowerMaxAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readDcVoltageMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcVoltageMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcVoltageMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDcVoltageDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcVoltageDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcVoltageDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDcCurrentMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcCurrentMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcCurrentMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDcCurrentDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcCurrentDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcCurrentDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDcPowerMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcPowerMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcPowerMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readDcPowerDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDcPowerDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDcPowerDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcFrequencyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcFrequencyAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcFrequencyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcFrequencyMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcFrequencyMinAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcFrequencyMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcFrequencyMinAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcFrequencyMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcFrequencyMaxAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcFrequencyMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcFrequencyMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNeutralCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNeutralCurrentAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNeutralCurrentAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNeutralCurrentAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readTotalActivePowerAttribute(callback: LongAttributeCallback) {
+  suspend fun readTotalActivePowerAttribute(): Int {
     // Implementation needs to be added here
   }
 
-  fun subscribeTotalActivePowerAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTotalActivePowerAttribute(minInterval: Int, maxInterval: Int): Int {
     // Implementation needs to be added here
   }
 
-  fun readTotalReactivePowerAttribute(callback: LongAttributeCallback) {
+  suspend fun readTotalReactivePowerAttribute(): Int {
     // Implementation needs to be added here
   }
 
-  fun subscribeTotalReactivePowerAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTotalReactivePowerAttribute(minInterval: Int, maxInterval: Int): Int {
     // Implementation needs to be added here
   }
 
-  fun readTotalApparentPowerAttribute(callback: LongAttributeCallback) {
+  suspend fun readTotalApparentPowerAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTotalApparentPowerAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTotalApparentPowerAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readMeasured1stHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured1stHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured1stHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured1stHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasured3rdHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured3rdHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured3rdHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured3rdHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasured5thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured5thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured5thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured5thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasured7thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured7thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured7thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured7thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasured9thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured9thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured9thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured9thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasured11thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasured11thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasured11thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasured11thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase1stHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase1stHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase1stHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase1stHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase3rdHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase3rdHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase5thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase5thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase5thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase5thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase7thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase7thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase7thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase7thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase9thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase9thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase9thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase9thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMeasuredPhase11thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasuredPhase11thHarmonicCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredPhase11thHarmonicCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeMeasuredPhase11thHarmonicCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readAcFrequencyMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcFrequencyMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcFrequencyMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcFrequencyMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcFrequencyDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcFrequencyDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcFrequencyDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcFrequencyDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPowerMultiplierAttribute(callback: LongAttributeCallback) {
+  suspend fun readPowerMultiplierAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerMultiplierAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readPowerDivisorAttribute(callback: LongAttributeCallback) {
+  suspend fun readPowerDivisorAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerDivisorAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePowerDivisorAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readHarmonicCurrentMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readHarmonicCurrentMultiplierAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeHarmonicCurrentMultiplierAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeHarmonicCurrentMultiplierAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Byte {
     // Implementation needs to be added here
   }
 
-  fun readPhaseHarmonicCurrentMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPhaseHarmonicCurrentMultiplierAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribePhaseHarmonicCurrentMultiplierAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhaseHarmonicCurrentMultiplierAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Byte {
     // Implementation needs to be added here
   }
 
-  fun readInstantaneousVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstantaneousVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstantaneousVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInstantaneousVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readInstantaneousLineCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstantaneousLineCurrentAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstantaneousLineCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeInstantaneousLineCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readInstantaneousActiveCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstantaneousActiveCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstantaneousActiveCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeInstantaneousActiveCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readInstantaneousReactiveCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstantaneousReactiveCurrentAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstantaneousReactiveCurrentAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeInstantaneousReactiveCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readInstantaneousPowerAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstantaneousPowerAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstantaneousPowerAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInstantaneousPowerAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMinAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMinAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMaxAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMinAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMinAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMaxAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readActivePowerMinAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeActivePowerAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMinAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readActivePowerMinAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeActivePowerMinAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readActivePowerMaxAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readReactivePowerAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeActivePowerMaxAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeReactivePowerAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readReactivePowerAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readApparentPowerAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeReactivePowerAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeApparentPowerAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readApparentPowerAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPowerFactorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeApparentPowerAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerFactorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPowerFactorAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsVoltageMeasurementPeriodAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePowerFactorAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeAverageRmsVoltageMeasurementPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readAverageRmsVoltageMeasurementPeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeAverageRmsVoltageMeasurementPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeAverageRmsVoltageMeasurementPeriodAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeAverageRmsVoltageMeasurementPeriodAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsUnderVoltageCounterAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsUnderVoltageCounterAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeAverageRmsUnderVoltageCounterAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writeAverageRmsUnderVoltageCounterAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun writeAverageRmsUnderVoltageCounterAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeAverageRmsUnderVoltageCounterAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsUnderVoltageCounterAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeOverVoltagePeriodAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeOverVoltagePeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeRmsExtremeOverVoltagePeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeRmsExtremeOverVoltagePeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeRmsExtremeOverVoltagePeriodAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRmsExtremeOverVoltagePeriodAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeOverVoltagePeriodAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readRmsExtremeUnderVoltagePeriodAttribute(callback: IntegerAttributeCallback) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeRmsExtremeUnderVoltagePeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readRmsExtremeUnderVoltagePeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeRmsExtremeUnderVoltagePeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeRmsExtremeUnderVoltagePeriodAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRmsExtremeUnderVoltagePeriodAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSagPeriodAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSagPeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeRmsVoltageSagPeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeRmsVoltageSagPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeRmsVoltageSagPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeRmsVoltageSagPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSagPeriodAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readRmsVoltageSwellPeriodAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSwellPeriodAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeRmsVoltageSwellPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeRmsVoltageSwellPeriodAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeRmsVoltageSwellPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeRmsVoltageSwellPeriodAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readAcVoltageMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSwellPeriodAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcVoltageMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcVoltageDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcVoltageMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcVoltageDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcCurrentMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcVoltageDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcCurrentMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcCurrentDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcCurrentMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcCurrentDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcPowerMultiplierAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcCurrentDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcPowerMultiplierAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcPowerDivisorAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcPowerMultiplierAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcPowerDivisorAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOverloadAlarmsMaskAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcPowerDivisorAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readOverloadAlarmsMaskAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeOverloadAlarmsMaskAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readVoltageOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeOverloadAlarmsMaskAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeOverloadAlarmsMaskAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readCurrentOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readVoltageOverloadAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeVoltageOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readAcOverloadAlarmsMaskAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readCurrentOverloadAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeAcOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeCurrentOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAcOverloadAlarmsMaskAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcVoltageOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeAcOverloadAlarmsMaskAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeAcVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeAcOverloadAlarmsMaskAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readAcCurrentOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcOverloadAlarmsMaskAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAcVoltageOverloadAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcActivePowerOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcVoltageOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcActivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAcCurrentOverloadAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAcReactivePowerOverloadAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcCurrentOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAcReactivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAcActivePowerOverloadAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsOverVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcActivePowerOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAverageRmsOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAcReactivePowerOverloadAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsUnderVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcReactivePowerOverloadAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAverageRmsUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsOverVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeOverVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsOverVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAverageRmsUnderVoltageAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAverageRmsUnderVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsExtremeOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeOverVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeUnderVoltageAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeOverVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsExtremeUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeUnderVoltageAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSagAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeUnderVoltageAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageSagAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSagAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSwellAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSagAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageSwellAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSwellAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLineCurrentPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSwellAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLineCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readLineCurrentPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActiveCurrentPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeLineCurrentPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActiveCurrentPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readReactiveCurrentPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveCurrentPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeReactiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readReactiveCurrentPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltagePhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeReactiveCurrentPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltagePhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltagePhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMinPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltagePhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMinPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMaxPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMinPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMaxPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMaxPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMinPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMinPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMaxPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMinPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMaxPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMaxPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerMinPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerMinPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerMaxPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMinPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerMaxPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readReactivePowerPhaseBAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMaxPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeReactivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readReactivePowerPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readApparentPowerPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeReactivePowerPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeApparentPowerPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readApparentPowerPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPowerFactorPhaseBAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeApparentPowerPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePowerFactorPhaseBAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun readPowerFactorPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerFactorPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsOverVoltageCounterPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsOverVoltageCounterPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsUnderVoltageCounterPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsUnderVoltageCounterPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSagPeriodPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsVoltageSagPeriodPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSagPeriodPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSwellPeriodPhaseBAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSagPeriodPhaseBAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsVoltageSwellPeriodPhaseBAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSwellPeriodPhaseBAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLineCurrentPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSwellPeriodPhaseBAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLineCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readLineCurrentPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActiveCurrentPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeLineCurrentPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActiveCurrentPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readReactiveCurrentPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveCurrentPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeReactiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readReactiveCurrentPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltagePhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeReactiveCurrentPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltagePhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltagePhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMinPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltagePhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMinPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageMaxPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMinPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsVoltageMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageMaxPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageMaxPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMinPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMinPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsCurrentMaxPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMinPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRmsCurrentMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsCurrentMaxPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsCurrentMaxPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerMinPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerMinPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readActivePowerMaxPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMinPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeActivePowerMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readActivePowerMaxPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readReactivePowerPhaseCAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeActivePowerMaxPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeReactivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readReactivePowerPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readApparentPowerPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeReactivePowerPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeApparentPowerPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readApparentPowerPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPowerFactorPhaseCAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeApparentPowerPhaseCAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePowerFactorPhaseCAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun readPowerFactorPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerFactorPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsOverVoltageCounterPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsOverVoltageCounterPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAverageRmsUnderVoltageCounterPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAverageRmsUnderVoltageCounterPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSagPeriodPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsVoltageSagPeriodPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSagPeriodPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRmsVoltageSwellPeriodPhaseCAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSagPeriodPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRmsVoltageSwellPeriodPhaseCAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRmsVoltageSwellPeriodPhaseCAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeRmsVoltageSwellPeriodPhaseCAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 2820u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt
new file mode 100644
index 00000000000000..8e5208cee1d2b4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt
@@ -0,0 +1,436 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class EnergyEvseCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GetTargetsResponse(
+    val dayOfWeekforSequence: UInt,
+    val chargingTargets: List<EnergyEvseClusterChargingTargetStruct>
+  )
+
+  class StateAttribute(val value: UInt?)
+
+  class ChargingEnabledUntilAttribute(val value: UInt?)
+
+  class DischargingEnabledUntilAttribute(val value: UInt?)
+
+  class NextChargeStartTimeAttribute(val value: UInt?)
+
+  class NextChargeTargetTimeAttribute(val value: UInt?)
+
+  class NextChargeRequiredEnergyAttribute(val value: Long?)
+
+  class NextChargeTargetSoCAttribute(val value: UByte?)
+
+  class ApproximateEVEfficiencyAttribute(val value: UShort?)
+
+  class StateOfChargeAttribute(val value: UByte?)
+
+  class BatteryCapacityAttribute(val value: Long?)
+
+  class VehicleIDAttribute(val value: String?)
+
+  class SessionIDAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun disable(timedInvokeTimeoutMs: Int) {
+    val commandId = 1L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun enableCharging(
+    chargingEnabledUntil: UInt?,
+    minimumChargeCurrent: Long,
+    maximumChargeCurrent: Long,
+    timedInvokeTimeoutMs: Int
+  ) {
+    val commandId = 2L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun enableDischarging(
+    dischargingEnabledUntil: UInt?,
+    maximumDischargeCurrent: Long,
+    timedInvokeTimeoutMs: Int
+  ) {
+    val commandId = 3L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun startDiagnostics(timedInvokeTimeoutMs: Int) {
+    val commandId = 4L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun setTargets(
+    dayOfWeekforSequence: UInt,
+    chargingTargets: List<EnergyEvseClusterChargingTargetStruct>,
+    timedInvokeTimeoutMs: Int
+  ) {
+    val commandId = 5L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun getTargets(daysToReturn: UInt, timedInvokeTimeoutMs: Int): GetTargetsResponse {
+    val commandId = 6L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun clearTargets(timedInvokeTimeoutMs: Int) {
+    val commandId = 7L
+
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStateAttribute(): StateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): StateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupplyStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupplyStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFaultStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFaultStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChargingEnabledUntilAttribute(): ChargingEnabledUntilAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChargingEnabledUntilAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ChargingEnabledUntilAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDischargingEnabledUntilAttribute(): DischargingEnabledUntilAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDischargingEnabledUntilAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DischargingEnabledUntilAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCircuitCapacityAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCircuitCapacityAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinimumChargeCurrentAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinimumChargeCurrentAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaximumChargeCurrentAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaximumChargeCurrentAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaximumDischargeCurrentAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaximumDischargeCurrentAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUserMaximumChargeCurrentAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUserMaximumChargeCurrentAttribute(
+    value: Long,
+    timedWriteTimeoutMs: Int? = null
+  ) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeUserMaximumChargeCurrentAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRandomizationDelayWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRandomizationDelayWindowAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
+  ) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeRandomizationDelayWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfWeeklyTargetsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfWeeklyTargetsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfDailyTargetsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfDailyTargetsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNextChargeStartTimeAttribute(): NextChargeStartTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNextChargeStartTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NextChargeStartTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNextChargeTargetTimeAttribute(): NextChargeTargetTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNextChargeTargetTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NextChargeTargetTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNextChargeRequiredEnergyAttribute(): NextChargeRequiredEnergyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNextChargeRequiredEnergyAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NextChargeRequiredEnergyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNextChargeTargetSoCAttribute(): NextChargeTargetSoCAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNextChargeTargetSoCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NextChargeTargetSoCAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApproximateEVEfficiencyAttribute(): ApproximateEVEfficiencyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeApproximateEVEfficiencyAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
+  ) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeApproximateEVEfficiencyAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ApproximateEVEfficiencyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStateOfChargeAttribute(): StateOfChargeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStateOfChargeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StateOfChargeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatteryCapacityAttribute(): BatteryCapacityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatteryCapacityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatteryCapacityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVehicleIDAttribute(): VehicleIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVehicleIDAttribute(minInterval: Int, maxInterval: Int): VehicleIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSessionIDAttribute(): SessionIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSessionIDAttribute(minInterval: Int, maxInterval: Int): SessionIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSessionDurationAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSessionDurationAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSessionEnergyChargedAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSessionEnergyChargedAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSessionEnergyDischargedAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSessionEnergyDischargedAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 153u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
index f61cf30b5f114a..d7fc8fa494c838 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
@@ -17,254 +17,173 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 55u
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface PHYRateAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface FullDuplexAttributeCallback {
-    fun onSuccess(value: Boolean?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface CarrierDetectAttributeCallback {
-    fun onSuccess(value: Boolean?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class EthernetNetworkDiagnosticsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class PHYRateAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class FullDuplexAttribute(val value: Boolean?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class CarrierDetectAttribute(val value: Boolean?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readPHYRateAttribute(callback: PHYRateAttributeCallback) {
+  suspend fun readPHYRateAttribute(): PHYRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePHYRateAttribute(
-    callback: PHYRateAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePHYRateAttribute(minInterval: Int, maxInterval: Int): PHYRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFullDuplexAttribute(callback: FullDuplexAttributeCallback) {
+  suspend fun readFullDuplexAttribute(): FullDuplexAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeFullDuplexAttribute(
-    callback: FullDuplexAttributeCallback,
+  suspend fun subscribeFullDuplexAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): FullDuplexAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPacketRxCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readPacketRxCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketRxCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePacketRxCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readPacketTxCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readPacketTxCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketTxCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePacketTxCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readTxErrCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxErrCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxErrCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxErrCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readCollisionCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readCollisionCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeCollisionCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCollisionCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readOverrunCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readOverrunCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeOverrunCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readCarrierDetectAttribute(callback: CarrierDetectAttributeCallback) {
+  suspend fun readCarrierDetectAttribute(): CarrierDetectAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCarrierDetectAttribute(
-    callback: CarrierDetectAttributeCallback,
+  suspend fun subscribeCarrierDetectAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CarrierDetectAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTimeSinceResetAttribute(callback: LongAttributeCallback) {
+  suspend fun readTimeSinceResetAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeTimeSinceResetAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTimeSinceResetAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 55u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
index fea630a32e28c0..178dde9600faad 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
@@ -17,377 +17,245 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class FanControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 514u
-  }
-
-  fun step(
-    callback: DefaultClusterCallback,
-    direction: Integer,
-    wrap: Boolean?,
-    lowestOff: Boolean?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun step(
-    callback: DefaultClusterCallback,
-    direction: Integer,
-    wrap: Boolean?,
-    lowestOff: Boolean?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface PercentSettingAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SpeedSettingAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class FanControlCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class PercentSettingAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class SpeedSettingAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun readFanModeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun writeFanModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun writeFanModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun step(
+    direction: UInt,
+    wrap: Boolean?,
+    lowestOff: Boolean?,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 0L
 
-  fun subscribeFanModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readFanModeSequenceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readFanModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeFanModeSequenceAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeFanModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeFanModeSequenceAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeFanModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeFanModeSequenceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFanModeSequenceAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPercentSettingAttribute(callback: PercentSettingAttributeCallback) {
+  suspend fun subscribeFanModeSequenceAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writePercentSettingAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readPercentSettingAttribute(): PercentSettingAttribute {
     // Implementation needs to be added here
   }
 
-  fun writePercentSettingAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writePercentSettingAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribePercentSettingAttribute(
-    callback: PercentSettingAttributeCallback,
+  suspend fun subscribePercentSettingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readPercentCurrentAttribute(callback: IntegerAttributeCallback) {
+  ): PercentSettingAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePercentCurrentAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPercentCurrentAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSpeedMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePercentCurrentAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSpeedMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSpeedMaxAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSpeedSettingAttribute(callback: SpeedSettingAttributeCallback) {
+  suspend fun subscribeSpeedMaxAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeSpeedSettingAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readSpeedSettingAttribute(): SpeedSettingAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeSpeedSettingAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeSpeedSettingAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeSpeedSettingAttribute(
-    callback: SpeedSettingAttributeCallback,
+  suspend fun subscribeSpeedSettingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSpeedCurrentAttribute(callback: IntegerAttributeCallback) {
+  ): SpeedSettingAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSpeedCurrentAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSpeedCurrentAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readRockSupportAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeSpeedCurrentAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeRockSupportAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readRockSupportAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readRockSettingAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeRockSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeRockSettingAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readRockSettingAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeRockSettingAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeRockSettingAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRockSettingAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRockSettingAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readWindSupportAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readWindSupportAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeWindSupportAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWindSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readWindSettingAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readWindSettingAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeWindSettingAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeWindSettingAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeWindSettingAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeWindSettingAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeWindSettingAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readAirflowDirectionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readAirflowDirectionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeAirflowDirectionAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeAirflowDirectionAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeAirflowDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeAirflowDirectionAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAirflowDirectionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 514u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
index e7fe9587313e38..8580869b08b912 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
@@ -17,156 +17,111 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class FaultInjectionCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 4294048774u
-  }
+class FaultInjectionCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun failAtFault(
-    callback: DefaultClusterCallback,
-    type: Integer,
-    id: Long,
-    numCallsToSkip: Long,
-    numCallsToFail: Long,
-    takeMutex: Boolean
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun failAtFault(
-    callback: DefaultClusterCallback,
-    type: Integer,
-    id: Long,
-    numCallsToSkip: Long,
-    numCallsToFail: Long,
-    takeMutex: Boolean,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun failRandomlyAtFault(
-    callback: DefaultClusterCallback,
-    type: Integer,
-    id: Long,
-    percentage: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun failRandomlyAtFault(
-    callback: DefaultClusterCallback,
-    type: Integer,
-    id: Long,
-    percentage: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun failAtFault(
+    type: UInt,
+    id: UInt,
+    numCallsToSkip: UInt,
+    numCallsToFail: UInt,
+    takeMutex: Boolean,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun failRandomlyAtFault(
+    type: UInt,
+    id: UInt,
+    percentage: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 4294048774u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
index bab84393fc7fd2..6d9458b0610c05 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
@@ -17,134 +17,86 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class FixedLabelCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 64u
-  }
-
-  interface LabelListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.FixedLabelClusterLabelStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class FixedLabelCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class LabelListAttribute(val value: List<FixedLabelClusterLabelStruct>)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readLabelListAttribute(callback: LabelListAttributeCallback) {
+  suspend fun readLabelListAttribute(): LabelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLabelListAttribute(
-    callback: LabelListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 64u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
index f1075fa6282d2b..69a553ee21ae62 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
@@ -17,186 +17,126 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class FlowMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1028u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class FlowMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MinMeasuredValueAttribute(val value: UShort?)
 
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class MaxMeasuredValueAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1028u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
index 5ab1994b688368..12195781103ef8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1067u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class FormaldehydeConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1067u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
index de430114295af6..b00a893fde74f8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
@@ -17,259 +17,184 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class GeneralCommissioningCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 48u
-  }
-
-  fun armFailSafe(
-    callback: ArmFailSafeResponseCallback,
-    expiryLengthSeconds: Integer,
-    breadcrumb: Long
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun armFailSafe(
-    callback: ArmFailSafeResponseCallback,
-    expiryLengthSeconds: Integer,
-    breadcrumb: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun setRegulatoryConfig(
-    callback: SetRegulatoryConfigResponseCallback,
-    newRegulatoryConfig: Integer,
-    countryCode: String,
-    breadcrumb: Long
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun setRegulatoryConfig(
-    callback: SetRegulatoryConfigResponseCallback,
-    newRegulatoryConfig: Integer,
-    countryCode: String,
-    breadcrumb: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun commissioningComplete(callback: CommissioningCompleteResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun commissioningComplete(
-    callback: CommissioningCompleteResponseCallback,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+class GeneralCommissioningCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ArmFailSafeResponse(val errorCode: UInt, val debugText: String)
 
-  interface ArmFailSafeResponseCallback {
-    fun onSuccess(errorCode: Integer, debugText: String)
+  class SetRegulatoryConfigResponse(val errorCode: UInt, val debugText: String)
 
-    fun onError(error: Exception)
-  }
+  class CommissioningCompleteResponse(val errorCode: UInt, val debugText: String)
 
-  interface SetRegulatoryConfigResponseCallback {
-    fun onSuccess(errorCode: Integer, debugText: String)
+  class BasicCommissioningInfoAttribute(
+    val value: GeneralCommissioningClusterBasicCommissioningInfo
+  )
 
-    fun onError(error: Exception)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface CommissioningCompleteResponseCallback {
-    fun onSuccess(errorCode: Integer, debugText: String)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(error: Exception)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface BasicCommissioningInfoAttributeCallback {
-    fun onSuccess(value: ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun armFailSafe(
+    expiryLengthSeconds: UShort,
+    breadcrumb: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): ArmFailSafeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setRegulatoryConfig(
+    newRegulatoryConfig: UInt,
+    countryCode: String,
+    breadcrumb: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): SetRegulatoryConfigResponse {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun commissioningComplete(
+    timedInvokeTimeoutMs: Int? = null
+  ): CommissioningCompleteResponse {
+    val commandId = 4L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readBreadcrumbAttribute(): ULong {
+    // Implementation needs to be added here
   }
 
-  fun readBreadcrumbAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeBreadcrumbAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeBreadcrumbAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun subscribeBreadcrumbAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeBreadcrumbAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readBasicCommissioningInfoAttribute(): BasicCommissioningInfoAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBreadcrumbAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeBasicCommissioningInfoAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BasicCommissioningInfoAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBasicCommissioningInfoAttribute(callback: BasicCommissioningInfoAttributeCallback) {
+  suspend fun readRegulatoryConfigAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBasicCommissioningInfoAttribute(
-    callback: BasicCommissioningInfoAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRegulatoryConfigAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readRegulatoryConfigAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLocationCapabilityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeRegulatoryConfigAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLocationCapabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLocationCapabilityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSupportsConcurrentConnectionAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeLocationCapabilityAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSupportsConcurrentConnectionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readSupportsConcurrentConnectionAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportsConcurrentConnectionAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 48u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
index 931f3f1904afd6..543a9bcb638158 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
@@ -17,279 +17,200 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class GeneralDiagnosticsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 51u
-  }
-
-  fun testEventTrigger(callback: DefaultClusterCallback, enableKey: ByteArray, eventTrigger: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun testEventTrigger(
-    callback: DefaultClusterCallback,
-    enableKey: ByteArray,
-    eventTrigger: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+class GeneralDiagnosticsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class TimeSnapshotResponse(val systemTimeUs: ULong, val UTCTimeUs: ULong?)
 
-  interface NetworkInterfacesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.GeneralDiagnosticsClusterNetworkInterface>)
+  class NetworkInterfacesAttribute(val value: List<GeneralDiagnosticsClusterNetworkInterface>)
 
-    fun onError(ex: Exception)
+  class ActiveHardwareFaultsAttribute(val value: List<UInt>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ActiveRadioFaultsAttribute(val value: List<UInt>?)
 
-  interface ActiveHardwareFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
+  class ActiveNetworkFaultsAttribute(val value: List<UInt>?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface ActiveRadioFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ActiveNetworkFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun testEventTrigger(
+    enableKey: ByteArray,
+    eventTrigger: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun timeSnapshot(timedInvokeTimeoutMs: Int? = null): TimeSnapshotResponse {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readNetworkInterfacesAttribute(callback: NetworkInterfacesAttributeCallback) {
+  suspend fun readNetworkInterfacesAttribute(): NetworkInterfacesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNetworkInterfacesAttribute(
-    callback: NetworkInterfacesAttributeCallback,
+  suspend fun subscribeNetworkInterfacesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NetworkInterfacesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRebootCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRebootCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRebootCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRebootCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readUpTimeAttribute(callback: LongAttributeCallback) {
+  suspend fun readUpTimeAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeUpTimeAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUpTimeAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readTotalOperationalHoursAttribute(callback: LongAttributeCallback) {
+  suspend fun readTotalOperationalHoursAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTotalOperationalHoursAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTotalOperationalHoursAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readBootReasonAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBootReasonAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBootReasonAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBootReasonAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readActiveHardwareFaultsAttribute(callback: ActiveHardwareFaultsAttributeCallback) {
+  suspend fun readActiveHardwareFaultsAttribute(): ActiveHardwareFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveHardwareFaultsAttribute(
-    callback: ActiveHardwareFaultsAttributeCallback,
+  suspend fun subscribeActiveHardwareFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveHardwareFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readActiveRadioFaultsAttribute(callback: ActiveRadioFaultsAttributeCallback) {
+  suspend fun readActiveRadioFaultsAttribute(): ActiveRadioFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveRadioFaultsAttribute(
-    callback: ActiveRadioFaultsAttributeCallback,
+  suspend fun subscribeActiveRadioFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveRadioFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readActiveNetworkFaultsAttribute(callback: ActiveNetworkFaultsAttributeCallback) {
+  suspend fun readActiveNetworkFaultsAttribute(): ActiveNetworkFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveNetworkFaultsAttribute(
-    callback: ActiveNetworkFaultsAttributeCallback,
+  suspend fun subscribeActiveNetworkFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveNetworkFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTestEventTriggersEnabledAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readTestEventTriggersEnabledAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeTestEventTriggersEnabledAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeTestEventTriggersEnabledAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readAverageWearCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageWearCountAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 51u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
index 724e266df3b59f..254d6a4bf63803 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
@@ -17,269 +17,196 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class GroupKeyManagementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 63u
-  }
+class GroupKeyManagementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class KeySetReadResponse(val groupKeySet: GroupKeyManagementClusterGroupKeySetStruct)
 
-  fun keySetWrite(
-    callback: DefaultClusterCallback,
-    groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct
-  ) {
-    // Implementation needs to be added here
-  }
+  class KeySetReadAllIndicesResponse(val groupKeySetIDs: List<UShort>)
 
-  fun keySetWrite(
-    callback: DefaultClusterCallback,
-    groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GroupKeyMapAttribute(val value: List<GroupKeyManagementClusterGroupKeyMapStruct>)
 
-  fun keySetRead(callback: KeySetReadResponseCallback, groupKeySetID: Integer) {
-    // Implementation needs to be added here
-  }
+  class GroupTableAttribute(val value: List<GroupKeyManagementClusterGroupInfoMapStruct>)
 
-  fun keySetRead(
-    callback: KeySetReadResponseCallback,
-    groupKeySetID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun keySetRemove(callback: DefaultClusterCallback, groupKeySetID: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun keySetRemove(
-    callback: DefaultClusterCallback,
-    groupKeySetID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun keySetReadAllIndices(callback: KeySetReadAllIndicesResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun keySetReadAllIndices(
-    callback: KeySetReadAllIndicesResponseCallback,
-    timedInvokeTimeoutMs: Int
+  suspend fun keySetWrite(
+    groupKeySet: GroupKeyManagementClusterGroupKeySetStruct,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface KeySetReadResponseCallback {
-    fun onSuccess(groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
-
-    fun onError(error: Exception)
-  }
-
-  interface KeySetReadAllIndicesResponseCallback {
-    fun onSuccess(groupKeySetIDs: ArrayList<Integer>)
-
-    fun onError(error: Exception)
-  }
-
-  interface GroupKeyMapAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>)
-
-    fun onError(ex: Exception)
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GroupTableAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>)
+  suspend fun keySetRead(
+    groupKeySetID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): KeySetReadResponse {
+    val commandId = 1L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun keySetRemove(groupKeySetID: UShort, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun keySetReadAllIndices(
+    timedInvokeTimeoutMs: Int? = null
+  ): KeySetReadAllIndicesResponse {
+    val commandId = 4L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readGroupKeyMapAttribute(callback: GroupKeyMapAttributeCallback) {
+  suspend fun readGroupKeyMapAttribute(): GroupKeyMapAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGroupKeyMapAttributeWithFabricFilter(
-    callback: GroupKeyMapAttributeCallback,
+  suspend fun readGroupKeyMapAttributeWithFabricFilter(
     isFabricFiltered: Boolean
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun writeGroupKeyMapAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>
-  ) {
+  ): GroupKeyMapAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeGroupKeyMapAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>,
-    timedWriteTimeoutMs: Int
+  suspend fun writeGroupKeyMapAttribute(
+    value: List<GroupKeyManagementClusterGroupKeyMapStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeGroupKeyMapAttribute(
-    callback: GroupKeyMapAttributeCallback,
+  suspend fun subscribeGroupKeyMapAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GroupKeyMapAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGroupTableAttribute(callback: GroupTableAttributeCallback) {
+  suspend fun readGroupTableAttribute(): GroupTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGroupTableAttributeWithFabricFilter(
-    callback: GroupTableAttributeCallback,
+  suspend fun readGroupTableAttributeWithFabricFilter(
     isFabricFiltered: Boolean
-  ) {
+  ): GroupTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGroupTableAttribute(
-    callback: GroupTableAttributeCallback,
+  suspend fun subscribeGroupTableAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GroupTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxGroupsPerFabricAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxGroupsPerFabricAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxGroupsPerFabricAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxGroupsPerFabricAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readMaxGroupKeysPerFabricAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxGroupKeysPerFabricAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxGroupKeysPerFabricAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxGroupKeysPerFabricAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 63u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
index 95af698e4a9098..4858d7a68b38db 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
@@ -17,219 +17,163 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class GroupsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 4u
-  }
+class GroupsCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class AddGroupResponse(val status: UInt, val groupID: UShort)
 
-  fun addGroup(callback: AddGroupResponseCallback, groupID: Integer, groupName: String) {
-    // Implementation needs to be added here
-  }
+  class ViewGroupResponse(val status: UInt, val groupID: UShort, val groupName: String)
 
-  fun addGroup(
-    callback: AddGroupResponseCallback,
-    groupID: Integer,
-    groupName: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GetGroupMembershipResponse(val capacity: UByte?, val groupList: List<UShort>)
 
-  fun viewGroup(callback: ViewGroupResponseCallback, groupID: Integer) {
-    // Implementation needs to be added here
-  }
+  class RemoveGroupResponse(val status: UInt, val groupID: UShort)
 
-  fun viewGroup(callback: ViewGroupResponseCallback, groupID: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun getGroupMembership(
-    callback: GetGroupMembershipResponseCallback,
-    groupList: ArrayList<Integer>
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun getGroupMembership(
-    callback: GetGroupMembershipResponseCallback,
-    groupList: ArrayList<Integer>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun removeGroup(callback: RemoveGroupResponseCallback, groupID: Integer) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun removeGroup(
-    callback: RemoveGroupResponseCallback,
-    groupID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun removeAllGroups(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun removeAllGroups(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun addGroupIfIdentifying(callback: DefaultClusterCallback, groupID: Integer, groupName: String) {
-    // Implementation needs to be added here
-  }
-
-  fun addGroupIfIdentifying(
-    callback: DefaultClusterCallback,
-    groupID: Integer,
+  suspend fun addGroup(
+    groupID: UShort,
     groupName: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface AddGroupResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer)
+    timedInvokeTimeoutMs: Int? = null
+  ): AddGroupResponse {
+    val commandId = 0L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface ViewGroupResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer, groupName: String)
+  suspend fun viewGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): ViewGroupResponse {
+    val commandId = 1L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GetGroupMembershipResponseCallback {
-    fun onSuccess(capacity: Integer?, groupList: ArrayList<Integer>)
+  suspend fun getGroupMembership(
+    groupList: List<UShort>,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetGroupMembershipResponse {
+    val commandId = 2L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface RemoveGroupResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer)
+  suspend fun removeGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): RemoveGroupResponse {
+    val commandId = 3L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun removeAllGroups(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 4L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun addGroupIfIdentifying(
+    groupID: UShort,
+    groupName: String,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 5L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readNameSupportAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNameSupportAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNameSupportAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 4u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
index 197ec7b96c2d35..465dd38a9397a5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
@@ -17,224 +17,157 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class HepaFilterMonitoringCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 113u
-  }
-
-  fun resetCondition(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetCondition(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface LastChangedTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ReplacementProductListAttributeCallback {
-    fun onSuccess(
-      value: ArrayList<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>?
-    )
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class HepaFilterMonitoringCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class LastChangedTimeAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class ReplacementProductListAttribute(
+    val value: List<HepaFilterMonitoringClusterReplacementProductStruct>?
+  )
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readConditionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readConditionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeConditionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readDegradationDirectionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDegradationDirectionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDegradationDirectionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readChangeIndicationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readChangeIndicationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeChangeIndicationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readInPlaceIndicatorAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readInPlaceIndicatorAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeInPlaceIndicatorAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readLastChangedTimeAttribute(callback: LastChangedTimeAttributeCallback) {
+  suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLastChangedTimeAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
+  suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLastChangedTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeLastChangedTimeAttribute(
-    callback: LastChangedTimeAttributeCallback,
+  suspend fun subscribeLastChangedTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastChangedTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readReplacementProductListAttribute(callback: ReplacementProductListAttributeCallback) {
+  suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeReplacementProductListAttribute(
-    callback: ReplacementProductListAttributeCallback,
+  suspend fun subscribeReplacementProductListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ReplacementProductListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 113u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
index 5356755c8cab03..c70094f9e08ec9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
@@ -17,253 +17,209 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class IcdManagementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 70u
-  }
+class IcdManagementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class RegisterClientResponse(val ICDCounter: UInt)
 
-  fun registerClient(
-    callback: RegisterClientResponseCallback,
-    checkInNodeID: Long,
-    monitoredSubject: Long,
-    key: ByteArray,
-    verificationKey: ByteArray?
-  ) {
-    // Implementation needs to be added here
-  }
+  class StayActiveResponse(val promisedActiveDuration: UInt)
 
-  fun registerClient(
-    callback: RegisterClientResponseCallback,
-    checkInNodeID: Long,
-    monitoredSubject: Long,
-    key: ByteArray,
-    verificationKey: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class RegisteredClientsAttribute(
+    val value: List<IcdManagementClusterMonitoringRegistrationStruct>?
+  )
 
-  fun unregisterClient(
-    callback: DefaultClusterCallback,
-    checkInNodeID: Long,
-    verificationKey: ByteArray?
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun unregisterClient(
-    callback: DefaultClusterCallback,
-    checkInNodeID: Long,
-    verificationKey: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun stayActiveRequest(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun stayActiveRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface RegisterClientResponseCallback {
-    fun onSuccess(ICDCounter: Long)
+  suspend fun registerClient(
+    checkInNodeID: ULong,
+    monitoredSubject: ULong,
+    key: ByteArray,
+    verificationKey: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): RegisterClientResponse {
+    val commandId = 0L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface RegisteredClientsAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>?)
-
-    fun onError(ex: Exception)
+  suspend fun unregisterClient(
+    checkInNodeID: ULong,
+    verificationKey: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun stayActiveRequest(timedInvokeTimeoutMs: Int? = null): StayActiveResponse {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readIdleModeDurationAttribute(): UInt {
+    // Implementation needs to be added here
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun subscribeIdleModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readActiveModeDurationAttribute(): UInt {
+    // Implementation needs to be added here
   }
 
-  fun readIdleModeDurationAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeActiveModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeIdleModeDurationAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readActiveModeThresholdAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readActiveModeDurationAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeActiveModeThresholdAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveModeDurationAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readRegisteredClientsAttribute(): RegisteredClientsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readActiveModeThresholdAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRegisteredClientsAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): RegisteredClientsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveModeThresholdAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeRegisteredClientsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): RegisteredClientsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRegisteredClientsAttribute(callback: RegisteredClientsAttributeCallback) {
+  suspend fun readICDCounterAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRegisteredClientsAttributeWithFabricFilter(
-    callback: RegisteredClientsAttributeCallback,
-    isFabricFiltered: Boolean
-  ) {
+  suspend fun subscribeICDCounterAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRegisteredClientsAttribute(
-    callback: RegisteredClientsAttributeCallback,
+  suspend fun readClientsSupportedPerFabricAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClientsSupportedPerFabricAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readICDCounterAttribute(callback: LongAttributeCallback) {
+  suspend fun readUserActiveModeTriggerHintAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeICDCounterAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeUserActiveModeTriggerHintAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClientsSupportedPerFabricAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readUserActiveModeTriggerInstructionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeClientsSupportedPerFabricAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUserActiveModeTriggerInstructionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 70u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
index be3173b944c2f3..72ec3e94ee2642 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
@@ -17,175 +17,124 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class IdentifyCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 3u
-  }
+class IdentifyCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun identify(callback: DefaultClusterCallback, identifyTime: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun identify(callback: DefaultClusterCallback, identifyTime: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun triggerEffect(
-    callback: DefaultClusterCallback,
-    effectIdentifier: Integer,
-    effectVariant: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun triggerEffect(
-    callback: DefaultClusterCallback,
-    effectIdentifier: Integer,
-    effectVariant: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun identify(identifyTime: UShort, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun triggerEffect(
+    effectIdentifier: UInt,
+    effectVariant: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 64L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readIdentifyTimeAttribute(): UShort {
+    // Implementation needs to be added here
   }
 
-  fun readIdentifyTimeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeIdentifyTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeIdentifyTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeIdentifyTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeIdentifyTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readIdentifyTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeIdentifyTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeIdentifyTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readIdentifyTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeIdentifyTypeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 3u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
index ddd3a319e7954c..d1067f466fcc0f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
@@ -17,206 +17,139 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class IlluminanceMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1024u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LightSensorTypeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class IlluminanceMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class MinMeasuredValueAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MaxMeasuredValueAttribute(val value: UShort?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class LightSensorTypeAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readLightSensorTypeAttribute(callback: LightSensorTypeAttributeCallback) {
+  suspend fun readLightSensorTypeAttribute(): LightSensorTypeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLightSensorTypeAttribute(
-    callback: LightSensorTypeAttributeCallback,
+  suspend fun subscribeLightSensorTypeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LightSensorTypeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1024u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
index cb3b2175937043..365427acb053cc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
@@ -17,128 +17,88 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class KeypadInputCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1289u
-  }
-
-  fun sendKey(callback: SendKeyResponseCallback, keyCode: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun sendKey(callback: SendKeyResponseCallback, keyCode: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface SendKeyResponseCallback {
-    fun onSuccess(status: Integer)
-
-    fun onError(error: Exception)
-  }
+class KeypadInputCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class SendKeyResponse(val status: UInt)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun sendKey(keyCode: UInt, timedInvokeTimeoutMs: Int? = null): SendKeyResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1289u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt
new file mode 100644
index 00000000000000..7b05c8dc8a4b6c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt
@@ -0,0 +1,129 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class LaundryDryerControlsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SupportedDrynessLevelsAttribute(val value: List<UInt>)
+
+  class SelectedDrynessLevelAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun readSupportedDrynessLevelsAttribute(): SupportedDrynessLevelsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedDrynessLevelsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedDrynessLevelsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSelectedDrynessLevelAttribute(): SelectedDrynessLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSelectedDrynessLevelAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeSelectedDrynessLevelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SelectedDrynessLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 74u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
index 525094a60feb69..e7d246777e25c2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
@@ -17,210 +17,142 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class LaundryWasherControlsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 83u
-  }
-
-  interface SpinSpeedsAttributeCallback {
-    fun onSuccess(value: ArrayList<String>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SpinSpeedCurrentAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class LaundryWasherControlsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SpinSpeedsAttribute(val value: List<String>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SupportedRinsesAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
+  class SpinSpeedCurrentAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class SupportedRinsesAttribute(val value: List<UInt>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readSpinSpeedsAttribute(callback: SpinSpeedsAttributeCallback) {
+  suspend fun readSpinSpeedsAttribute(): SpinSpeedsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSpinSpeedsAttribute(
-    callback: SpinSpeedsAttributeCallback,
+  suspend fun subscribeSpinSpeedsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSpinSpeedCurrentAttribute(callback: SpinSpeedCurrentAttributeCallback) {
+  ): SpinSpeedsAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeSpinSpeedCurrentAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readSpinSpeedCurrentAttribute(): SpinSpeedCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeSpinSpeedCurrentAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeSpinSpeedCurrentAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeSpinSpeedCurrentAttribute(
-    callback: SpinSpeedCurrentAttributeCallback,
+  suspend fun subscribeSpinSpeedCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SpinSpeedCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfRinsesAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfRinsesAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeNumberOfRinsesAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeNumberOfRinsesAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNumberOfRinsesAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeNumberOfRinsesAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNumberOfRinsesAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSupportedRinsesAttribute(callback: SupportedRinsesAttributeCallback) {
+  suspend fun readSupportedRinsesAttribute(): SupportedRinsesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedRinsesAttribute(
-    callback: SupportedRinsesAttributeCallback,
+  suspend fun subscribeSupportedRinsesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedRinsesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 83u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
index 0064e8588a5bc3..1145e4b1d8b056 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
@@ -17,228 +17,154 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class LaundryWasherModeCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 81u
-  }
-
-  fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun changeToMode(
-    callback: ChangeToModeResponseCallback,
-    newMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeToModeResponseCallback {
-    fun onSuccess(status: Integer, statusText: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.LaundryWasherModeClusterModeOptionStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StartUpModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class LaundryWasherModeCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class SupportedModesAttribute(val value: List<LaundryWasherModeClusterModeOptionStruct>)
 
-    fun onError(ex: Exception)
+  class StartUpModeAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OnModeAttribute(val value: UByte?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) {
+  suspend fun readStartUpModeAttribute(): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeStartUpModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeStartUpModeAttribute(
-    callback: StartUpModeAttributeCallback,
+  suspend fun subscribeStartUpModeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  ): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 81u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
index fd0c0ecd34dc6c..a20be7c6f73199 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
@@ -17,586 +17,406 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class LevelControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 8u
-  }
+class LevelControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class CurrentLevelAttribute(val value: UByte?)
 
-  fun moveToLevel(
-    callback: DefaultClusterCallback,
-    level: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class OnLevelAttribute(val value: UByte?)
 
-  fun moveToLevel(
-    callback: DefaultClusterCallback,
-    level: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class OnTransitionTimeAttribute(val value: UShort?)
 
-  fun move(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class OffTransitionTimeAttribute(val value: UShort?)
 
-  fun move(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class DefaultMoveRateAttribute(val value: UByte?)
 
-  fun step(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class StartUpCurrentLevelAttribute(val value: UByte?)
 
-  fun step(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun stop(callback: DefaultClusterCallback, optionsMask: Integer, optionsOverride: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun stop(
-    callback: DefaultClusterCallback,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun moveToLevelWithOnOff(
-    callback: DefaultClusterCallback,
-    level: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun moveToLevelWithOnOff(
-    callback: DefaultClusterCallback,
-    level: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun moveToLevel(
+    level: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 0L
 
-  fun moveWithOnOff(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun moveWithOnOff(
-    callback: DefaultClusterCallback,
-    moveMode: Integer,
-    rate: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun move(
+    moveMode: UInt,
+    rate: UByte?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 1L
 
-  fun stepWithOnOff(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stepWithOnOff(
-    callback: DefaultClusterCallback,
-    stepMode: Integer,
-    stepSize: Integer,
-    transitionTime: Integer?,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun step(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 2L
 
-  fun stopWithOnOff(
-    callback: DefaultClusterCallback,
-    optionsMask: Integer,
-    optionsOverride: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun stopWithOnOff(
-    callback: DefaultClusterCallback,
-    optionsMask: Integer,
-    optionsOverride: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun stop(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-  fun moveToClosestFrequency(callback: DefaultClusterCallback, frequency: Integer) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun moveToClosestFrequency(
-    callback: DefaultClusterCallback,
-    frequency: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun moveToLevelWithOnOff(
+    level: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface CurrentLevelAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+    val commandId = 4L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface OnLevelAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OnTransitionTimeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OffTransitionTimeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface DefaultMoveRateAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StartUpCurrentLevelAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun moveWithOnOff(
+    moveMode: UInt,
+    rate: UByte?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 5L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun stepWithOnOff(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 6L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun stopWithOnOff(
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 7L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun moveToClosestFrequency(frequency: UShort, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 8L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readCurrentLevelAttribute(callback: CurrentLevelAttributeCallback) {
+  suspend fun readCurrentLevelAttribute(): CurrentLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentLevelAttribute(
-    callback: CurrentLevelAttributeCallback,
+  suspend fun subscribeCurrentLevelAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRemainingTimeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRemainingTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRemainingTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readMinLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMaxLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentFrequencyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentFrequencyAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentFrequencyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readMinFrequencyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinFrequencyAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinFrequencyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMinFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readMaxFrequencyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxFrequencyAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxFrequencyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readOptionsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOptionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeOptionsAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOptionsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOptionsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readOnOffTransitionTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readOnOffTransitionTimeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeOnOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOnOffTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeOnOffTransitionTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeOnOffTransitionTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readOnLevelAttribute(): OnLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOnOffTransitionTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOnLevelAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readOnLevelAttribute(callback: OnLevelAttributeCallback) {
+  suspend fun subscribeOnLevelAttribute(minInterval: Int, maxInterval: Int): OnLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnLevelAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readOnTransitionTimeAttribute(): OnTransitionTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnLevelAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOnTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeOnLevelAttribute(
-    callback: OnLevelAttributeCallback,
+  suspend fun subscribeOnTransitionTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OnTransitionTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOnTransitionTimeAttribute(callback: OnTransitionTimeAttributeCallback) {
+  suspend fun readOffTransitionTimeAttribute(): OffTransitionTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOnTransitionTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOnTransitionTimeAttribute(
-    callback: OnTransitionTimeAttributeCallback,
+  suspend fun subscribeOffTransitionTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OffTransitionTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOffTransitionTimeAttribute(callback: OffTransitionTimeAttributeCallback) {
+  suspend fun readDefaultMoveRateAttribute(): DefaultMoveRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOffTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeDefaultMoveRateAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOffTransitionTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOffTransitionTimeAttribute(
-    callback: OffTransitionTimeAttributeCallback,
+  suspend fun subscribeDefaultMoveRateAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readDefaultMoveRateAttribute(callback: DefaultMoveRateAttributeCallback) {
+  ): DefaultMoveRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeDefaultMoveRateAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readStartUpCurrentLevelAttribute(): StartUpCurrentLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeDefaultMoveRateAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpCurrentLevelAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeDefaultMoveRateAttribute(
-    callback: DefaultMoveRateAttributeCallback,
+  suspend fun subscribeStartUpCurrentLevelAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): StartUpCurrentLevelAttribute {
     // Implementation needs to be added here
   }
 
-  fun readStartUpCurrentLevelAttribute(callback: StartUpCurrentLevelAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpCurrentLevelAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeStartUpCurrentLevelAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeStartUpCurrentLevelAttribute(
-    callback: StartUpCurrentLevelAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 8u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
index f83ccd57f56f5d..4cd978399d01d7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
@@ -17,158 +17,108 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class LocalizationConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 43u
-  }
+class LocalizationConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SupportedLocalesAttribute(val value: List<String>)
 
-  interface SupportedLocalesAttributeCallback {
-    fun onSuccess(value: ArrayList<String>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readActiveLocaleAttribute(): CharString {
+    // Implementation needs to be added here
   }
 
-  fun readActiveLocaleAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeActiveLocaleAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeActiveLocaleAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeActiveLocaleAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeActiveLocaleAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readSupportedLocalesAttribute(): SupportedLocalesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveLocaleAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeSupportedLocalesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedLocalesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSupportedLocalesAttribute(callback: SupportedLocalesAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedLocalesAttribute(
-    callback: SupportedLocalesAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 43u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
index b21f9f213b3bf0..74390f3a6fb4dd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
@@ -17,122 +17,86 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class LowPowerCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1288u
-  }
-
-  fun sleep(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+class LowPowerCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun sleep(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun sleep(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1288u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
index 27482138fe32a0..97ba8c68b95619 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
@@ -17,183 +17,134 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class MediaInputCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1287u
-  }
+class MediaInputCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class InputListAttribute(val value: List<MediaInputClusterInputInfoStruct>)
 
-  fun selectInput(callback: DefaultClusterCallback, index: Integer) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun selectInput(callback: DefaultClusterCallback, index: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun showInputStatus(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun showInputStatus(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun hideInputStatus(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  suspend fun selectInput(index: UByte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  fun hideInputStatus(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun renameInput(callback: DefaultClusterCallback, index: Integer, name: String) {
-    // Implementation needs to be added here
-  }
+  suspend fun showInputStatus(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-  fun renameInput(
-    callback: DefaultClusterCallback,
-    index: Integer,
-    name: String,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface InputListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.MediaInputClusterInputInfoStruct>)
-
-    fun onError(ex: Exception)
+  suspend fun hideInputStatus(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun renameInput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readInputListAttribute(callback: InputListAttributeCallback) {
+  suspend fun readInputListAttribute(): InputListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeInputListAttribute(
-    callback: InputListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInputListAttribute(minInterval: Int, maxInterval: Int): InputListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentInputAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentInputAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentInputAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentInputAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1287u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
index cfceceef431065..9c38c74c79c543 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
@@ -17,340 +17,272 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class MediaPlaybackCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1286u
-  }
-
-  fun play(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun play(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun pause(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun pause(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+class MediaPlaybackCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class PlaybackResponse(val status: UInt, val data: String?)
 
-  fun startOver(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class StartTimeAttribute(val value: ULong?)
 
-  fun startOver(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class DurationAttribute(val value: ULong?)
 
-  fun previous(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun previous(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun next(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun next(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun rewind(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun rewind(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class SampledPositionAttribute(val value: MediaPlaybackClusterPlaybackPositionStruct?)
 
-  fun fastForward(callback: PlaybackResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class SeekRangeEndAttribute(val value: ULong?)
 
-  fun fastForward(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class SeekRangeStartAttribute(val value: ULong?)
 
-  fun skipForward(callback: PlaybackResponseCallback, deltaPositionMilliseconds: Long) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun skipForward(
-    callback: PlaybackResponseCallback,
-    deltaPositionMilliseconds: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun skipBackward(callback: PlaybackResponseCallback, deltaPositionMilliseconds: Long) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun skipBackward(
-    callback: PlaybackResponseCallback,
-    deltaPositionMilliseconds: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun seek(callback: PlaybackResponseCallback, position: Long) {
-    // Implementation needs to be added here
-  }
+  suspend fun play(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 0L
 
-  fun seek(callback: PlaybackResponseCallback, position: Long, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface PlaybackResponseCallback {
-    fun onSuccess(status: Integer, data: String?)
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 1L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface StartTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface DurationAttributeCallback {
-    fun onSuccess(value: Long?)
+  suspend fun startOver(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 3L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface SampledPositionAttributeCallback {
-    fun onSuccess(value: ChipStructs.MediaPlaybackClusterPlaybackPositionStruct?)
-
-    fun onError(ex: Exception)
+  suspend fun previous(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 4L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface SeekRangeEndAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun next(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 5L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface SeekRangeStartAttributeCallback {
-    fun onSuccess(value: Long?)
+  suspend fun rewind(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 6L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun fastForward(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 7L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun skipForward(
+    deltaPositionMilliseconds: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): PlaybackResponse {
+    val commandId = 8L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun skipBackward(
+    deltaPositionMilliseconds: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): PlaybackResponse {
+    val commandId = 9L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun seek(position: ULong, timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    val commandId = 11L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readCurrentStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartTimeAttribute(callback: StartTimeAttributeCallback) {
+  suspend fun readStartTimeAttribute(): StartTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeStartTimeAttribute(
-    callback: StartTimeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStartTimeAttribute(minInterval: Int, maxInterval: Int): StartTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDurationAttribute(callback: DurationAttributeCallback) {
+  suspend fun readDurationAttribute(): DurationAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDurationAttribute(
-    callback: DurationAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDurationAttribute(minInterval: Int, maxInterval: Int): DurationAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSampledPositionAttribute(callback: SampledPositionAttributeCallback) {
+  suspend fun readSampledPositionAttribute(): SampledPositionAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSampledPositionAttribute(
-    callback: SampledPositionAttributeCallback,
+  suspend fun subscribeSampledPositionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SampledPositionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPlaybackSpeedAttribute(callback: FloatAttributeCallback) {
+  suspend fun readPlaybackSpeedAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribePlaybackSpeedAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePlaybackSpeedAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readSeekRangeEndAttribute(callback: SeekRangeEndAttributeCallback) {
+  suspend fun readSeekRangeEndAttribute(): SeekRangeEndAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSeekRangeEndAttribute(
-    callback: SeekRangeEndAttributeCallback,
+  suspend fun subscribeSeekRangeEndAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SeekRangeEndAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSeekRangeStartAttribute(callback: SeekRangeStartAttributeCallback) {
+  suspend fun readSeekRangeStartAttribute(): SeekRangeStartAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSeekRangeStartAttribute(
-    callback: SeekRangeStartAttributeCallback,
+  suspend fun subscribeSeekRangeStartAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SeekRangeStartAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1286u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt
new file mode 100644
index 00000000000000..d655422ace9ae5
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt
@@ -0,0 +1,160 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class MicrowaveOvenControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun setCookingParameters(
+    cookMode: UByte?,
+    cookTime: UInt?,
+    powerSetting: UByte?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addMoreTime(timeToAdd: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readCookTimeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCookTimeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerSettingAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerSettingAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinPowerAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinPowerAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxPowerAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxPowerAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerStepAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerStepAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 95u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt
new file mode 100644
index 00000000000000..1483cab29ac970
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt
@@ -0,0 +1,116 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class MicrowaveOvenModeCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SupportedModesAttribute(val value: List<MicrowaveOvenModeClusterModeOptionStruct>)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedModesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedModesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 94u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
index a54d83e4866bba..22e63c94a66d54 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
@@ -17,250 +17,167 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ModeSelectCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 80u
-  }
-
-  fun changeToMode(callback: DefaultClusterCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun changeToMode(callback: DefaultClusterCallback, newMode: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface StandardNamespaceAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ModeSelectClusterModeOptionStruct>)
+class ModeSelectCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class StandardNamespaceAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class SupportedModesAttribute(val value: List<ModeSelectClusterModeOptionStruct>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StartUpModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+  class StartUpModeAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OnModeAttribute(val value: UByte?)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readDescriptionAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readDescriptionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeDescriptionAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readStandardNamespaceAttribute(callback: StandardNamespaceAttributeCallback) {
+  suspend fun readStandardNamespaceAttribute(): StandardNamespaceAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeStandardNamespaceAttribute(
-    callback: StandardNamespaceAttributeCallback,
+  suspend fun subscribeStandardNamespaceAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): StandardNamespaceAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readStartUpModeAttribute(): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeStartUpModeAttribute(
-    callback: StartUpModeAttributeCallback,
+  suspend fun subscribeStartUpModeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 80u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
index a946c8cb89c8b7..053471c8a853f7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
@@ -17,425 +17,326 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class NetworkCommissioningCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 49u
-  }
-
-  fun scanNetworks(callback: ScanNetworksResponseCallback, ssid: ByteArray?, breadcrumb: Long?) {
-    // Implementation needs to be added here
-  }
-
-  fun scanNetworks(
-    callback: ScanNetworksResponseCallback,
-    ssid: ByteArray?,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun addOrUpdateWiFiNetwork(
-    callback: NetworkConfigResponseCallback,
-    ssid: ByteArray,
-    credentials: ByteArray,
-    breadcrumb: Long?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun addOrUpdateWiFiNetwork(
-    callback: NetworkConfigResponseCallback,
-    ssid: ByteArray,
-    credentials: ByteArray,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun addOrUpdateThreadNetwork(
-    callback: NetworkConfigResponseCallback,
-    operationalDataset: ByteArray,
-    breadcrumb: Long?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun addOrUpdateThreadNetwork(
-    callback: NetworkConfigResponseCallback,
-    operationalDataset: ByteArray,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun removeNetwork(
-    callback: NetworkConfigResponseCallback,
-    networkID: ByteArray,
-    breadcrumb: Long?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun removeNetwork(
-    callback: NetworkConfigResponseCallback,
-    networkID: ByteArray,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun connectNetwork(
-    callback: ConnectNetworkResponseCallback,
-    networkID: ByteArray,
-    breadcrumb: Long?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun connectNetwork(
-    callback: ConnectNetworkResponseCallback,
-    networkID: ByteArray,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun reorderNetwork(
-    callback: NetworkConfigResponseCallback,
-    networkID: ByteArray,
-    networkIndex: Integer,
-    breadcrumb: Long?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun reorderNetwork(
-    callback: NetworkConfigResponseCallback,
-    networkID: ByteArray,
-    networkIndex: Integer,
-    breadcrumb: Long?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+class NetworkCommissioningCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ScanNetworksResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val wiFiScanResults: List<NetworkCommissioningClusterWiFiInterfaceScanResultStruct>?,
+    val threadScanResults: List<NetworkCommissioningClusterThreadInterfaceScanResultStruct>?
+  )
 
-  interface ScanNetworksResponseCallback {
-    fun onSuccess(
-      networkingStatus: Integer,
-      debugText: String?,
-      wiFiScanResults:
-        ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>?,
-      threadScanResults:
-        ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>?
-    )
+  class NetworkConfigResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val networkIndex: UByte?,
+    val clientIdentity: ByteArray?,
+    val possessionSignature: ByteArray?
+  )
 
-    fun onError(error: Exception)
-  }
+  class ConnectNetworkResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val errorValue: Int?
+  )
 
-  interface NetworkConfigResponseCallback {
-    fun onSuccess(networkingStatus: Integer, debugText: String?, networkIndex: Integer?)
+  class QueryIdentityResponse(val identity: ByteArray, val possessionSignature: ByteArray?)
 
-    fun onError(error: Exception)
-  }
+  class NetworksAttribute(val value: List<NetworkCommissioningClusterNetworkInfoStruct>)
 
-  interface ConnectNetworkResponseCallback {
-    fun onSuccess(networkingStatus: Integer, debugText: String?, errorValue: Long?)
+  class LastNetworkingStatusAttribute(val value: UInt?)
 
-    fun onError(error: Exception)
-  }
+  class LastNetworkIDAttribute(val value: ByteArray?)
 
-  interface NetworksAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct>)
+  class LastConnectErrorValueAttribute(val value: Int?)
 
-    fun onError(ex: Exception)
+  class SupportedWiFiBandsAttribute(val value: List<UInt>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface LastNetworkingStatusAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LastNetworkIDAttributeCallback {
-    fun onSuccess(value: ByteArray?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun scanNetworks(
+    ssid: ByteArray?,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): ScanNetworksResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface LastConnectErrorValueAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun addOrUpdateWiFiNetwork(
+    ssid: ByteArray,
+    credentials: ByteArray,
+    breadcrumb: ULong?,
+    networkIdentity: ByteArray?,
+    clientIdentifier: ByteArray?,
+    possessionNonce: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addOrUpdateThreadNetwork(
+    operationalDataset: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface SupportedWiFiBandsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
+  suspend fun removeNetwork(
+    networkID: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    val commandId = 4L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun connectNetwork(
+    networkID: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): ConnectNetworkResponse {
+    val commandId = 6L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun reorderNetwork(
+    networkID: ByteArray,
+    networkIndex: UByte,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    val commandId = 8L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun queryIdentity(
+    keyIdentifier: ByteArray,
+    possessionNonce: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): QueryIdentityResponse {
+    val commandId = 9L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readMaxNetworksAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readMaxNetworksAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeMaxNetworksAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxNetworksAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readNetworksAttribute(): NetworksAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNetworksAttribute(callback: NetworksAttributeCallback) {
+  suspend fun subscribeNetworksAttribute(minInterval: Int, maxInterval: Int): NetworksAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNetworksAttribute(
-    callback: NetworksAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readScanMaxTimeSecondsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readScanMaxTimeSecondsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeScanMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeScanMaxTimeSecondsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readConnectMaxTimeSecondsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readConnectMaxTimeSecondsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeConnectMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeConnectMaxTimeSecondsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInterfaceEnabledAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readInterfaceEnabledAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeInterfaceEnabledAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeInterfaceEnabledAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun subscribeInterfaceEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeInterfaceEnabledAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readLastNetworkingStatusAttribute(): LastNetworkingStatusAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeInterfaceEnabledAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeLastNetworkingStatusAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastNetworkingStatusAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLastNetworkingStatusAttribute(callback: LastNetworkingStatusAttributeCallback) {
+  suspend fun readLastNetworkIDAttribute(): LastNetworkIDAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLastNetworkingStatusAttribute(
-    callback: LastNetworkingStatusAttributeCallback,
+  suspend fun subscribeLastNetworkIDAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastNetworkIDAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLastNetworkIDAttribute(callback: LastNetworkIDAttributeCallback) {
+  suspend fun readLastConnectErrorValueAttribute(): LastConnectErrorValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLastNetworkIDAttribute(
-    callback: LastNetworkIDAttributeCallback,
+  suspend fun subscribeLastConnectErrorValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastConnectErrorValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLastConnectErrorValueAttribute(callback: LastConnectErrorValueAttributeCallback) {
+  suspend fun readSupportedWiFiBandsAttribute(): SupportedWiFiBandsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLastConnectErrorValueAttribute(
-    callback: LastConnectErrorValueAttributeCallback,
+  suspend fun subscribeSupportedWiFiBandsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedWiFiBandsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSupportedWiFiBandsAttribute(callback: SupportedWiFiBandsAttributeCallback) {
+  suspend fun readSupportedThreadFeaturesAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedWiFiBandsAttribute(
-    callback: SupportedWiFiBandsAttributeCallback,
+  suspend fun subscribeSupportedThreadFeaturesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readSupportedThreadFeaturesAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readThreadVersionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedThreadFeaturesAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeThreadVersionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readThreadVersionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeThreadVersionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 49u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
index 5d1496588b3d58..eb911e990eaf8f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1043u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class NitrogenDioxideConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1043u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
index f6fbba4620386b..07cb5e7d9ab25d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
@@ -17,389 +17,304 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OccupancySensingCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1030u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class OccupancySensingCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readOccupancyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOccupancyAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupancyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOccupancySensorTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOccupancySensorTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupancySensorTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOccupancySensorTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOccupancySensorTypeBitmapAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOccupancySensorTypeBitmapAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupancySensorTypeBitmapAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeOccupancySensorTypeBitmapAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPIROccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPIROccupiedToUnoccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writePIROccupiedToUnoccupiedDelayAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writePIROccupiedToUnoccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writePIROccupiedToUnoccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribePIROccupiedToUnoccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePIROccupiedToUnoccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readPIRUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun writePIRUnoccupiedToOccupiedDelayAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readPIRUnoccupiedToOccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writePIRUnoccupiedToOccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writePIRUnoccupiedToOccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribePIRUnoccupiedToOccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePIRUnoccupiedToOccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPIRUnoccupiedToOccupiedThresholdAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPIRUnoccupiedToOccupiedThresholdAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writePIRUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writePIRUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writePIRUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribePIRUnoccupiedToOccupiedThresholdAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePIRUnoccupiedToOccupiedThresholdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(callback: IntegerAttributeCallback) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-    callback: IntegerAttributeCallback
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1030u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
index 85474449bd5c4d..76a0996babd8e3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
@@ -17,286 +17,214 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OnOffCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 6u
-  }
+class OnOffCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class StartUpOnOffAttribute(val value: UInt?)
 
-  fun off(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun off(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun on(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun on(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun toggle(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun toggle(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  suspend fun off(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  fun offWithEffect(
-    callback: DefaultClusterCallback,
-    effectIdentifier: Integer,
-    effectVariant: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun offWithEffect(
-    callback: DefaultClusterCallback,
-    effectIdentifier: Integer,
-    effectVariant: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun on(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-  fun onWithRecallGlobalScene(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun onWithRecallGlobalScene(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  suspend fun toggle(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
 
-  fun onWithTimedOff(
-    callback: DefaultClusterCallback,
-    onOffControl: Integer,
-    onTime: Integer,
-    offWaitTime: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun onWithTimedOff(
-    callback: DefaultClusterCallback,
-    onOffControl: Integer,
-    onTime: Integer,
-    offWaitTime: Integer,
-    timedInvokeTimeoutMs: Int
+  suspend fun offWithEffect(
+    effectIdentifier: UInt,
+    effectVariant: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface StartUpOnOffAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+    val commandId = 64L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun onWithRecallGlobalScene(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 65L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readOnOffAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOnOffAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun onWithTimedOff(
+    onOffControl: UInt,
+    onTime: UShort,
+    offWaitTime: UShort,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
+    val commandId = 66L
 
-  fun readGlobalSceneControlAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun subscribeGlobalSceneControlAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readOnOffAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readOnTimeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeOnOffAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeOnTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readGlobalSceneControlAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeOnTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeGlobalSceneControlAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeOnTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readOnTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readOffWaitTimeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeOnTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOffWaitTimeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeOnTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeOffWaitTimeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readOffWaitTimeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeOffWaitTimeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOffWaitTimeAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readStartUpOnOffAttribute(callback: StartUpOnOffAttributeCallback) {
+  suspend fun subscribeOffWaitTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpOnOffAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readStartUpOnOffAttribute(): StartUpOnOffAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpOnOffAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpOnOffAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeStartUpOnOffAttribute(
-    callback: StartUpOnOffAttributeCallback,
+  suspend fun subscribeStartUpOnOffAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): StartUpOnOffAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 6u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
index b7317187237aca..71c1585a842d8d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
@@ -17,150 +17,103 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OnOffSwitchConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 7u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class OnOffSwitchConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readSwitchTypeAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readSwitchTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeSwitchTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSwitchTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSwitchActionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSwitchActionsAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeSwitchActionsAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeSwitchActionsAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeSwitchActionsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeSwitchActionsAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSwitchActionsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 7u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
index 7bb50af382d269..66f2b93d0351d1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
@@ -17,348 +17,259 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OperationalCredentialsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 62u
-  }
+class OperationalCredentialsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class AttestationResponse(
+    val attestationElements: ByteArray,
+    val attestationSignature: ByteArray
+  )
 
-  fun attestationRequest(callback: AttestationResponseCallback, attestationNonce: ByteArray) {
-    // Implementation needs to be added here
-  }
+  class CertificateChainResponse(val certificate: ByteArray)
+
+  class CSRResponse(val NOCSRElements: ByteArray, val attestationSignature: ByteArray)
+
+  class NOCResponse(val statusCode: UInt, val fabricIndex: UByte?, val debugText: String?)
+
+  class NOCsAttribute(val value: List<OperationalCredentialsClusterNOCStruct>)
 
-  fun attestationRequest(
-    callback: AttestationResponseCallback,
+  class FabricsAttribute(val value: List<OperationalCredentialsClusterFabricDescriptorStruct>)
+
+  class TrustedRootCertificatesAttribute(val value: List<ByteArray>)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun attestationRequest(
     attestationNonce: ByteArray,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    timedInvokeTimeoutMs: Int? = null
+  ): AttestationResponse {
+    val commandId = 0L
 
-  fun certificateChainRequest(
-    callback: CertificateChainResponseCallback,
-    certificateType: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun certificateChainRequest(
-    callback: CertificateChainResponseCallback,
-    certificateType: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun certificateChainRequest(
+    certificateType: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): CertificateChainResponse {
+    val commandId = 2L
 
-  fun CSRRequest(callback: CSRResponseCallback, CSRNonce: ByteArray, isForUpdateNOC: Boolean?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun CSRRequest(
-    callback: CSRResponseCallback,
+  suspend fun CSRRequest(
     CSRNonce: ByteArray,
     isForUpdateNOC: Boolean?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    timedInvokeTimeoutMs: Int? = null
+  ): CSRResponse {
+    val commandId = 4L
 
-  fun addNOC(
-    callback: NOCResponseCallback,
-    NOCValue: ByteArray,
-    ICACValue: ByteArray?,
-    IPKValue: ByteArray,
-    caseAdminSubject: Long,
-    adminVendorId: Integer
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun addNOC(
-    callback: NOCResponseCallback,
+  suspend fun addNOC(
     NOCValue: ByteArray,
     ICACValue: ByteArray?,
     IPKValue: ByteArray,
-    caseAdminSubject: Long,
-    adminVendorId: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    caseAdminSubject: ULong,
+    adminVendorId: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): NOCResponse {
+    val commandId = 6L
 
-  fun updateNOC(callback: NOCResponseCallback, NOCValue: ByteArray, ICACValue: ByteArray?) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun updateNOC(
-    callback: NOCResponseCallback,
+  suspend fun updateNOC(
     NOCValue: ByteArray,
     ICACValue: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    timedInvokeTimeoutMs: Int? = null
+  ): NOCResponse {
+    val commandId = 7L
 
-  fun updateFabricLabel(callback: NOCResponseCallback, label: String) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun updateFabricLabel(callback: NOCResponseCallback, label: String, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  suspend fun updateFabricLabel(label: String, timedInvokeTimeoutMs: Int? = null): NOCResponse {
+    val commandId = 9L
 
-  fun removeFabric(callback: NOCResponseCallback, fabricIndex: Integer) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun removeFabric(callback: NOCResponseCallback, fabricIndex: Integer, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  suspend fun removeFabric(fabricIndex: UByte, timedInvokeTimeoutMs: Int? = null): NOCResponse {
+    val commandId = 10L
 
-  fun addTrustedRootCertificate(callback: DefaultClusterCallback, rootCACertificate: ByteArray) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun addTrustedRootCertificate(
-    callback: DefaultClusterCallback,
+  suspend fun addTrustedRootCertificate(
     rootCACertificate: ByteArray,
-    timedInvokeTimeoutMs: Int
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface AttestationResponseCallback {
-    fun onSuccess(attestationElements: ByteArray, attestationSignature: ByteArray)
-
-    fun onError(error: Exception)
-  }
-
-  interface CertificateChainResponseCallback {
-    fun onSuccess(certificate: ByteArray)
-
-    fun onError(error: Exception)
-  }
-
-  interface CSRResponseCallback {
-    fun onSuccess(NOCSRElements: ByteArray, attestationSignature: ByteArray)
-
-    fun onError(error: Exception)
-  }
-
-  interface NOCResponseCallback {
-    fun onSuccess(statusCode: Integer, fabricIndex: Integer?, debugText: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface NOCsAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.OperationalCredentialsClusterNOCStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface FabricsAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface TrustedRootCertificatesAttributeCallback {
-    fun onSuccess(value: ArrayList<ByteArray>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+    val commandId = 11L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readNOCsAttribute(callback: NOCsAttributeCallback) {
+  suspend fun readNOCsAttribute(): NOCsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNOCsAttributeWithFabricFilter(
-    callback: NOCsAttributeCallback,
-    isFabricFiltered: Boolean
-  ) {
+  suspend fun readNOCsAttributeWithFabricFilter(isFabricFiltered: Boolean): NOCsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNOCsAttribute(callback: NOCsAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeNOCsAttribute(minInterval: Int, maxInterval: Int): NOCsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFabricsAttribute(callback: FabricsAttributeCallback) {
+  suspend fun readFabricsAttribute(): FabricsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFabricsAttributeWithFabricFilter(
-    callback: FabricsAttributeCallback,
-    isFabricFiltered: Boolean
-  ) {
+  suspend fun readFabricsAttributeWithFabricFilter(isFabricFiltered: Boolean): FabricsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeFabricsAttribute(
-    callback: FabricsAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFabricsAttribute(minInterval: Int, maxInterval: Int): FabricsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSupportedFabricsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSupportedFabricsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedFabricsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSupportedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCommissionedFabricsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCommissionedFabricsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCommissionedFabricsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCommissionedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readTrustedRootCertificatesAttribute(callback: TrustedRootCertificatesAttributeCallback) {
+  suspend fun readTrustedRootCertificatesAttribute(): TrustedRootCertificatesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTrustedRootCertificatesAttribute(
-    callback: TrustedRootCertificatesAttributeCallback,
+  suspend fun subscribeTrustedRootCertificatesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): TrustedRootCertificatesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentFabricIndexAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentFabricIndexAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentFabricIndexAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentFabricIndexAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 62u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
index df377c879437b6..2b4222c80d4efd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
@@ -17,264 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OperationalStateCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 96u
-  }
-
-  fun pause(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun pause(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+class OperationalStateCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class OperationalCommandResponse(
+    val commandResponseState: OperationalStateClusterErrorStateStruct
+  )
 
-  fun start(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class PhaseListAttribute(val value: List<String>?)
 
-  fun start(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class CurrentPhaseAttribute(val value: UByte?)
 
-  fun resume(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class CountdownTimeAttribute(val value: UInt?)
 
-  fun resume(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class OperationalStateListAttribute(
+    val value: List<OperationalStateClusterOperationalStateStruct>
+  )
 
-  interface OperationalCommandResponseCallback {
-    fun onSuccess(commandResponseState: ChipStructs.OperationalStateClusterErrorStateStruct)
+  class OperationalErrorAttribute(val value: OperationalStateClusterErrorStateStruct)
 
-    fun onError(error: Exception)
-  }
-
-  interface PhaseListAttributeCallback {
-    fun onSuccess(value: ArrayList<String>?)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface CurrentPhaseAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface CountdownTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface OperationalStateListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.OperationalStateClusterOperationalStateStruct>)
+  suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface OperationalErrorAttributeCallback {
-    fun onSuccess(value: ChipStructs.OperationalStateClusterErrorStateStruct)
-
-    fun onError(ex: Exception)
+  suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readPhaseListAttribute(callback: PhaseListAttributeCallback) {
+  suspend fun readPhaseListAttribute(): PhaseListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePhaseListAttribute(
-    callback: PhaseListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPhaseAttribute(callback: CurrentPhaseAttributeCallback) {
+  suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPhaseAttribute(
-    callback: CurrentPhaseAttributeCallback,
+  suspend fun subscribeCurrentPhaseAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPhaseAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCountdownTimeAttribute(callback: CountdownTimeAttributeCallback) {
+  suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCountdownTimeAttribute(
-    callback: CountdownTimeAttributeCallback,
+  suspend fun subscribeCountdownTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CountdownTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalStateListAttribute(callback: OperationalStateListAttributeCallback) {
+  suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalStateListAttribute(
-    callback: OperationalStateListAttributeCallback,
+  suspend fun subscribeOperationalStateListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OperationalStateListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOperationalStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOperationalErrorAttribute(callback: OperationalErrorAttributeCallback) {
+  suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalErrorAttribute(
-    callback: OperationalErrorAttributeCallback,
+  suspend fun subscribeOperationalErrorAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OperationalErrorAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 96u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
index 04a51a0416f34d..df9a021ffe3d35 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
@@ -17,198 +17,140 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
-
-class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 41u
-  }
-
-  fun queryImage(
-    callback: QueryImageResponseCallback,
-    vendorID: Integer,
-    productID: Integer,
-    softwareVersion: Long,
-    protocolsSupported: ArrayList<Integer>,
-    hardwareVersion: Integer?,
-    location: String?,
-    requestorCanConsent: Boolean?,
-    metadataForProvider: ByteArray?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun queryImage(
-    callback: QueryImageResponseCallback,
-    vendorID: Integer,
-    productID: Integer,
-    softwareVersion: Long,
-    protocolsSupported: ArrayList<Integer>,
-    hardwareVersion: Integer?,
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class OtaSoftwareUpdateProviderCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class QueryImageResponse(
+    val status: UInt,
+    val delayedActionTime: UInt?,
+    val imageURI: String?,
+    val softwareVersion: UInt?,
+    val softwareVersionString: String?,
+    val updateToken: ByteArray?,
+    val userConsentNeeded: Boolean?,
+    val metadataForRequestor: ByteArray?
+  )
+
+  class ApplyUpdateResponse(val action: UInt, val delayedActionTime: UInt)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun queryImage(
+    vendorID: UShort,
+    productID: UShort,
+    softwareVersion: UInt,
+    protocolsSupported: List<UInt>,
+    hardwareVersion: UShort?,
     location: String?,
     requestorCanConsent: Boolean?,
     metadataForProvider: ByteArray?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    timedInvokeTimeoutMs: Int? = null
+  ): QueryImageResponse {
+    val commandId = 0L
 
-  fun applyUpdateRequest(
-    callback: ApplyUpdateResponseCallback,
-    updateToken: ByteArray,
-    newVersion: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun applyUpdateRequest(
-    callback: ApplyUpdateResponseCallback,
+  suspend fun applyUpdateRequest(
     updateToken: ByteArray,
-    newVersion: Long,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+    newVersion: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): ApplyUpdateResponse {
+    val commandId = 2L
 
-  fun notifyUpdateApplied(
-    callback: DefaultClusterCallback,
-    updateToken: ByteArray,
-    softwareVersion: Long
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun notifyUpdateApplied(
-    callback: DefaultClusterCallback,
+  suspend fun notifyUpdateApplied(
     updateToken: ByteArray,
-    softwareVersion: Long,
-    timedInvokeTimeoutMs: Int
+    softwareVersion: UInt,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  interface QueryImageResponseCallback {
-    fun onSuccess(
-      status: Integer,
-      delayedActionTime: Long?,
-      imageURI: String?,
-      softwareVersion: Long?,
-      softwareVersionString: String?,
-      updateToken: ByteArray?,
-      userConsentNeeded: Boolean?,
-      metadataForRequestor: ByteArray?
-    )
+    val commandId = 4L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface ApplyUpdateResponseCallback {
-    fun onSuccess(action: Integer, delayedActionTime: Long)
-
-    fun onError(error: Exception)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 41u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
index 6085a4e7e6d2d3..7e422996631bdb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
@@ -17,223 +17,157 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 42u
-  }
-
-  fun announceOTAProvider(
-    callback: DefaultClusterCallback,
-    providerNodeID: Long,
-    vendorID: Integer,
-    announcementReason: Integer,
-    metadataForNode: ByteArray?,
-    endpoint: Integer
-  ) {
-    // Implementation needs to be added here
-  }
+class OtaSoftwareUpdateRequestorCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class DefaultOTAProvidersAttribute(
+    val value: List<OtaSoftwareUpdateRequestorClusterProviderLocation>
+  )
 
-  fun announceOTAProvider(
-    callback: DefaultClusterCallback,
-    providerNodeID: Long,
-    vendorID: Integer,
-    announcementReason: Integer,
-    metadataForNode: ByteArray?,
-    endpoint: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class UpdateStateProgressAttribute(val value: UByte?)
 
-  interface DefaultOTAProvidersAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface UpdateStateProgressAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun announceOTAProvider(
+    providerNodeID: ULong,
+    vendorID: UShort,
+    announcementReason: UInt,
+    metadataForNode: ByteArray?,
+    endpoint: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readDefaultOTAProvidersAttribute(callback: DefaultOTAProvidersAttributeCallback) {
+  suspend fun readDefaultOTAProvidersAttribute(): DefaultOTAProvidersAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDefaultOTAProvidersAttributeWithFabricFilter(
-    callback: DefaultOTAProvidersAttributeCallback,
+  suspend fun readDefaultOTAProvidersAttributeWithFabricFilter(
     isFabricFiltered: Boolean
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun writeDefaultOTAProvidersAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>
-  ) {
+  ): DefaultOTAProvidersAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeDefaultOTAProvidersAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>,
-    timedWriteTimeoutMs: Int
+  suspend fun writeDefaultOTAProvidersAttribute(
+    value: List<OtaSoftwareUpdateRequestorClusterProviderLocation>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeDefaultOTAProvidersAttribute(
-    callback: DefaultOTAProvidersAttributeCallback,
+  suspend fun subscribeDefaultOTAProvidersAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): DefaultOTAProvidersAttribute {
     // Implementation needs to be added here
   }
 
-  fun readUpdatePossibleAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readUpdatePossibleAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeUpdatePossibleAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUpdatePossibleAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readUpdateStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readUpdateStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeUpdateStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUpdateStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readUpdateStateProgressAttribute(callback: UpdateStateProgressAttributeCallback) {
+  suspend fun readUpdateStateProgressAttribute(): UpdateStateProgressAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeUpdateStateProgressAttribute(
-    callback: UpdateStateProgressAttributeCallback,
+  suspend fun subscribeUpdateStateProgressAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UpdateStateProgressAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 42u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt
new file mode 100644
index 00000000000000..c114fc72d1c586
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt
@@ -0,0 +1,211 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class OvenCavityOperationalStateCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class OperationalCommandResponse(
+    val commandResponseState: OvenCavityOperationalStateClusterErrorStateStruct
+  )
+
+  class PhaseListAttribute(val value: List<String>?)
+
+  class CurrentPhaseAttribute(val value: UByte?)
+
+  class CountdownTimeAttribute(val value: UInt?)
+
+  class OperationalStateListAttribute(
+    val value: List<OvenCavityOperationalStateClusterOperationalStateStruct>
+  )
+
+  class OperationalErrorAttribute(val value: OvenCavityOperationalStateClusterErrorStateStruct)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 3L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readPhaseListAttribute(): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPhaseAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCountdownTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalErrorAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 72u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt
new file mode 100644
index 00000000000000..267bd10448cca1
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt
@@ -0,0 +1,167 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class OvenModeCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(val value: List<OvenModeClusterModeOptionStruct>)
+
+  class StartUpModeAttribute(val value: UByte?)
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedModesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedModesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartUpModeAttribute(): StartUpModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeStartUpModeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StartUpModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOnModeAttribute(): OnModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 73u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
index b63a519ed9b572..3542a8e090a8fb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1045u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class OzoneConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1045u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
index c700eb641f2fb9..f6cdf804a7642f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1069u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class Pm10ConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1069u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
index 5a3c72eb8e30dc..f07c97fbfd4468 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1068u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class Pm1ConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1068u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
index cd979770c0f4f5..424658e2bd6e0b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1066u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class Pm25ConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1066u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
index b2e21c408b0e8c..6dc18689f87f2d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
@@ -17,596 +17,398 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class PowerSourceCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 47u
-  }
+class PowerSourceCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class WiredAssessedInputVoltageAttribute(val value: UInt?)
 
-  interface WiredAssessedInputVoltageAttributeCallback {
-    fun onSuccess(value: Long?)
+  class WiredAssessedInputFrequencyAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class WiredAssessedCurrentAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ActiveWiredFaultsAttribute(val value: List<UInt>?)
 
-  interface WiredAssessedInputFrequencyAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class BatVoltageAttribute(val value: UInt?)
 
-  interface WiredAssessedCurrentAttributeCallback {
-    fun onSuccess(value: Long?)
+  class BatPercentRemainingAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ActiveWiredFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BatVoltageAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BatPercentRemainingAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BatTimeRemainingAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ActiveBatFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BatTimeToFullChargeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BatChargingCurrentAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ActiveBatChargeFaultsAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EndpointListAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class BatTimeRemainingAttribute(val value: UInt?)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class ActiveBatFaultsAttribute(val value: List<UInt>?)
 
-    fun onError(ex: Exception)
+  class BatTimeToFullChargeAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class BatChargingCurrentAttribute(val value: UInt?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class ActiveBatChargeFaultsAttribute(val value: List<UInt>?)
 
-    fun onError(ex: Exception)
+  class EndpointListAttribute(val value: List<UShort>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOrderAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOrderAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOrderAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOrderAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readDescriptionAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readDescriptionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeDescriptionAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readWiredAssessedInputVoltageAttribute(callback: WiredAssessedInputVoltageAttributeCallback) {
+  suspend fun readWiredAssessedInputVoltageAttribute(): WiredAssessedInputVoltageAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredAssessedInputVoltageAttribute(
-    callback: WiredAssessedInputVoltageAttributeCallback,
+  suspend fun subscribeWiredAssessedInputVoltageAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): WiredAssessedInputVoltageAttribute {
     // Implementation needs to be added here
   }
 
-  fun readWiredAssessedInputFrequencyAttribute(
-    callback: WiredAssessedInputFrequencyAttributeCallback
-  ) {
+  suspend fun readWiredAssessedInputFrequencyAttribute(): WiredAssessedInputFrequencyAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredAssessedInputFrequencyAttribute(
-    callback: WiredAssessedInputFrequencyAttributeCallback,
+  suspend fun subscribeWiredAssessedInputFrequencyAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): WiredAssessedInputFrequencyAttribute {
     // Implementation needs to be added here
   }
 
-  fun readWiredCurrentTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readWiredCurrentTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredCurrentTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWiredCurrentTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readWiredAssessedCurrentAttribute(callback: WiredAssessedCurrentAttributeCallback) {
+  suspend fun readWiredAssessedCurrentAttribute(): WiredAssessedCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredAssessedCurrentAttribute(
-    callback: WiredAssessedCurrentAttributeCallback,
+  suspend fun subscribeWiredAssessedCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): WiredAssessedCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun readWiredNominalVoltageAttribute(callback: LongAttributeCallback) {
+  suspend fun readWiredNominalVoltageAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredNominalVoltageAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWiredNominalVoltageAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readWiredMaximumCurrentAttribute(callback: LongAttributeCallback) {
+  suspend fun readWiredMaximumCurrentAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredMaximumCurrentAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWiredMaximumCurrentAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readWiredPresentAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readWiredPresentAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiredPresentAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWiredPresentAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readActiveWiredFaultsAttribute(callback: ActiveWiredFaultsAttributeCallback) {
+  suspend fun readActiveWiredFaultsAttribute(): ActiveWiredFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveWiredFaultsAttribute(
-    callback: ActiveWiredFaultsAttributeCallback,
+  suspend fun subscribeActiveWiredFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveWiredFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatVoltageAttribute(callback: BatVoltageAttributeCallback) {
+  suspend fun readBatVoltageAttribute(): BatVoltageAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatVoltageAttribute(
-    callback: BatVoltageAttributeCallback,
+  suspend fun subscribeBatVoltageAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BatVoltageAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatPercentRemainingAttribute(callback: BatPercentRemainingAttributeCallback) {
+  suspend fun readBatPercentRemainingAttribute(): BatPercentRemainingAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatPercentRemainingAttribute(
-    callback: BatPercentRemainingAttributeCallback,
+  suspend fun subscribeBatPercentRemainingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BatPercentRemainingAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatTimeRemainingAttribute(callback: BatTimeRemainingAttributeCallback) {
+  suspend fun readBatTimeRemainingAttribute(): BatTimeRemainingAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatTimeRemainingAttribute(
-    callback: BatTimeRemainingAttributeCallback,
+  suspend fun subscribeBatTimeRemainingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BatTimeRemainingAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatChargeLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatChargeLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatChargeLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatChargeLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBatReplacementNeededAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readBatReplacementNeededAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatReplacementNeededAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatReplacementNeededAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readBatReplaceabilityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatReplaceabilityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatReplaceabilityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatReplaceabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBatPresentAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readBatPresentAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatPresentAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatPresentAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readActiveBatFaultsAttribute(callback: ActiveBatFaultsAttributeCallback) {
+  suspend fun readActiveBatFaultsAttribute(): ActiveBatFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveBatFaultsAttribute(
-    callback: ActiveBatFaultsAttributeCallback,
+  suspend fun subscribeActiveBatFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveBatFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatReplacementDescriptionAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readBatReplacementDescriptionAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatReplacementDescriptionAttribute(
-    callback: CharStringAttributeCallback,
+  suspend fun subscribeBatReplacementDescriptionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CharString {
     // Implementation needs to be added here
   }
 
-  fun readBatCommonDesignationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatCommonDesignationAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatCommonDesignationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatCommonDesignationAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBatANSIDesignationAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readBatANSIDesignationAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatANSIDesignationAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatANSIDesignationAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readBatIECDesignationAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readBatIECDesignationAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatIECDesignationAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatIECDesignationAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun readBatApprovedChemistryAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatApprovedChemistryAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatApprovedChemistryAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatApprovedChemistryAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBatCapacityAttribute(callback: LongAttributeCallback) {
+  suspend fun readBatCapacityAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatCapacityAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatCapacityAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readBatQuantityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatQuantityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatQuantityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatQuantityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBatChargeStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBatChargeStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatChargeStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBatChargeStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBatTimeToFullChargeAttribute(callback: BatTimeToFullChargeAttributeCallback) {
+  suspend fun readBatTimeToFullChargeAttribute(): BatTimeToFullChargeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatTimeToFullChargeAttribute(
-    callback: BatTimeToFullChargeAttributeCallback,
+  suspend fun subscribeBatTimeToFullChargeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BatTimeToFullChargeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBatFunctionalWhileChargingAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readBatFunctionalWhileChargingAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatFunctionalWhileChargingAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeBatFunctionalWhileChargingAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readBatChargingCurrentAttribute(callback: BatChargingCurrentAttributeCallback) {
+  suspend fun readBatChargingCurrentAttribute(): BatChargingCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatChargingCurrentAttribute(
-    callback: BatChargingCurrentAttributeCallback,
+  suspend fun subscribeBatChargingCurrentAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BatChargingCurrentAttribute {
     // Implementation needs to be added here
   }
 
-  fun readActiveBatChargeFaultsAttribute(callback: ActiveBatChargeFaultsAttributeCallback) {
+  suspend fun readActiveBatChargeFaultsAttribute(): ActiveBatChargeFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveBatChargeFaultsAttribute(
-    callback: ActiveBatChargeFaultsAttributeCallback,
+  suspend fun subscribeActiveBatChargeFaultsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveBatChargeFaultsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEndpointListAttribute(callback: EndpointListAttributeCallback) {
+  suspend fun readEndpointListAttribute(): EndpointListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEndpointListAttribute(
-    callback: EndpointListAttributeCallback,
+  suspend fun subscribeEndpointListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): EndpointListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 47u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
index d81ff7109df0b8..b90d42743b65f8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
@@ -17,134 +17,89 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class PowerSourceConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 46u
-  }
-
-  interface SourcesAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class PowerSourceConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SourcesAttribute(val value: List<UShort>)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readSourcesAttribute(callback: SourcesAttributeCallback) {
+  suspend fun readSourcesAttribute(): SourcesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSourcesAttribute(
-    callback: SourcesAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSourcesAttribute(minInterval: Int, maxInterval: Int): SourcesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 46u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
index 46a06ca398630e..64c49e903d5988 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
@@ -17,270 +17,181 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class PressureMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1027u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ScaledValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinScaledValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxScaledValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class PressureMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class MinMeasuredValueAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ScaledValueAttribute(val value: Short?)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class MinScaledValueAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class MaxScaledValueAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readScaledValueAttribute(callback: ScaledValueAttributeCallback) {
+  suspend fun readScaledValueAttribute(): ScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeScaledValueAttribute(
-    callback: ScaledValueAttributeCallback,
+  suspend fun subscribeScaledValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinScaledValueAttribute(callback: MinScaledValueAttributeCallback) {
+  suspend fun readMinScaledValueAttribute(): MinScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinScaledValueAttribute(
-    callback: MinScaledValueAttributeCallback,
+  suspend fun subscribeMinScaledValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxScaledValueAttribute(callback: MaxScaledValueAttributeCallback) {
+  suspend fun readMaxScaledValueAttribute(): MaxScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxScaledValueAttribute(
-    callback: MaxScaledValueAttributeCallback,
+  suspend fun subscribeMaxScaledValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxScaledValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readScaledToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readScaledToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeScaledToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeScaledToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readScaleAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readScaleAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeScaleAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeScaleAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1027u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
index 6c558514fc7a72..fe0e582c9d45da 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
@@ -17,114 +17,79 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ProxyConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 66u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class ProxyConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 66u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
index aa4463f9176547..fd1c428646a714 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
@@ -17,114 +17,79 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ProxyDiscoveryCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 67u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class ProxyDiscoveryCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 67u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
index 7903220186e8c0..589502096ac382 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
@@ -17,114 +17,76 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ProxyValidCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 68u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class ProxyValidCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 68u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
index 1c2a93699d5d41..d7e43df772c99b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
@@ -17,114 +17,79 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class PulseWidthModulationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 28u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class PulseWidthModulationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 28u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
index add5d698398fb5..501850ac2264d9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
@@ -17,582 +17,370 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class PumpConfigurationAndControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 512u
-  }
-
-  interface MaxPressureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxSpeedAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxFlowAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinConstPressureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxConstPressureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinCompPressureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxCompPressureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinConstSpeedAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxConstSpeedAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinConstFlowAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxConstFlowAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinConstTempAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxConstTempAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface CapacityAttributeCallback {
-    fun onSuccess(value: Integer?)
+class PumpConfigurationAndControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MaxPressureAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class MaxSpeedAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SpeedAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LifetimeRunningHoursAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  class MaxFlowAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MinConstPressureAttribute(val value: Short?)
 
-  interface PowerAttributeCallback {
-    fun onSuccess(value: Long?)
+  class MaxConstPressureAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class MinCompPressureAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MaxCompPressureAttribute(val value: Short?)
 
-  interface LifetimeEnergyConsumedAttributeCallback {
-    fun onSuccess(value: Long?)
+  class MinConstSpeedAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class MaxConstSpeedAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MinConstFlowAttribute(val value: UShort?)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class MaxConstFlowAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class MinConstTempAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MaxConstTempAttribute(val value: Short?)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class CapacityAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class SpeedAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class LifetimeRunningHoursAttribute(val value: UInt?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class PowerAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class LifetimeEnergyConsumedAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readMaxPressureAttribute(callback: MaxPressureAttributeCallback) {
+  suspend fun readMaxPressureAttribute(): MaxPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxPressureAttribute(
-    callback: MaxPressureAttributeCallback,
+  suspend fun subscribeMaxPressureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxSpeedAttribute(callback: MaxSpeedAttributeCallback) {
+  suspend fun readMaxSpeedAttribute(): MaxSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxSpeedAttribute(
-    callback: MaxSpeedAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxSpeedAttribute(minInterval: Int, maxInterval: Int): MaxSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxFlowAttribute(callback: MaxFlowAttributeCallback) {
+  suspend fun readMaxFlowAttribute(): MaxFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxFlowAttribute(
-    callback: MaxFlowAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxFlowAttribute(minInterval: Int, maxInterval: Int): MaxFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinConstPressureAttribute(callback: MinConstPressureAttributeCallback) {
+  suspend fun readMinConstPressureAttribute(): MinConstPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinConstPressureAttribute(
-    callback: MinConstPressureAttributeCallback,
+  suspend fun subscribeMinConstPressureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinConstPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxConstPressureAttribute(callback: MaxConstPressureAttributeCallback) {
+  suspend fun readMaxConstPressureAttribute(): MaxConstPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxConstPressureAttribute(
-    callback: MaxConstPressureAttributeCallback,
+  suspend fun subscribeMaxConstPressureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxConstPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinCompPressureAttribute(callback: MinCompPressureAttributeCallback) {
+  suspend fun readMinCompPressureAttribute(): MinCompPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinCompPressureAttribute(
-    callback: MinCompPressureAttributeCallback,
+  suspend fun subscribeMinCompPressureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinCompPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxCompPressureAttribute(callback: MaxCompPressureAttributeCallback) {
+  suspend fun readMaxCompPressureAttribute(): MaxCompPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxCompPressureAttribute(
-    callback: MaxCompPressureAttributeCallback,
+  suspend fun subscribeMaxCompPressureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxCompPressureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinConstSpeedAttribute(callback: MinConstSpeedAttributeCallback) {
+  suspend fun readMinConstSpeedAttribute(): MinConstSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinConstSpeedAttribute(
-    callback: MinConstSpeedAttributeCallback,
+  suspend fun subscribeMinConstSpeedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinConstSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxConstSpeedAttribute(callback: MaxConstSpeedAttributeCallback) {
+  suspend fun readMaxConstSpeedAttribute(): MaxConstSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxConstSpeedAttribute(
-    callback: MaxConstSpeedAttributeCallback,
+  suspend fun subscribeMaxConstSpeedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxConstSpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinConstFlowAttribute(callback: MinConstFlowAttributeCallback) {
+  suspend fun readMinConstFlowAttribute(): MinConstFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinConstFlowAttribute(
-    callback: MinConstFlowAttributeCallback,
+  suspend fun subscribeMinConstFlowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinConstFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxConstFlowAttribute(callback: MaxConstFlowAttributeCallback) {
+  suspend fun readMaxConstFlowAttribute(): MaxConstFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxConstFlowAttribute(
-    callback: MaxConstFlowAttributeCallback,
+  suspend fun subscribeMaxConstFlowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxConstFlowAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinConstTempAttribute(callback: MinConstTempAttributeCallback) {
+  suspend fun readMinConstTempAttribute(): MinConstTempAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinConstTempAttribute(
-    callback: MinConstTempAttributeCallback,
+  suspend fun subscribeMinConstTempAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinConstTempAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxConstTempAttribute(callback: MaxConstTempAttributeCallback) {
+  suspend fun readMaxConstTempAttribute(): MaxConstTempAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxConstTempAttribute(
-    callback: MaxConstTempAttributeCallback,
+  suspend fun subscribeMaxConstTempAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readPumpStatusAttribute(callback: IntegerAttributeCallback) {
+  ): MaxConstTempAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePumpStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPumpStatusAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readEffectiveOperationModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePumpStatusAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeEffectiveOperationModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readEffectiveOperationModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readEffectiveControlModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeEffectiveOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeEffectiveControlModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readEffectiveControlModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCapacityAttribute(callback: CapacityAttributeCallback) {
+  suspend fun subscribeEffectiveControlModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCapacityAttribute(
-    callback: CapacityAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readCapacityAttribute(): CapacityAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSpeedAttribute(callback: SpeedAttributeCallback) {
+  suspend fun subscribeCapacityAttribute(minInterval: Int, maxInterval: Int): CapacityAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSpeedAttribute(
-    callback: SpeedAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSpeedAttribute(): SpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLifetimeRunningHoursAttribute(callback: LifetimeRunningHoursAttributeCallback) {
+  suspend fun subscribeSpeedAttribute(minInterval: Int, maxInterval: Int): SpeedAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLifetimeRunningHoursAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readLifetimeRunningHoursAttribute(): LifetimeRunningHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLifetimeRunningHoursAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLifetimeRunningHoursAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLifetimeRunningHoursAttribute(
-    callback: LifetimeRunningHoursAttributeCallback,
+  suspend fun subscribeLifetimeRunningHoursAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readPowerAttribute(callback: PowerAttributeCallback) {
+  ): LifetimeRunningHoursAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePowerAttribute(
-    callback: PowerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPowerAttribute(): PowerAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLifetimeEnergyConsumedAttribute(callback: LifetimeEnergyConsumedAttributeCallback) {
+  suspend fun subscribePowerAttribute(minInterval: Int, maxInterval: Int): PowerAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLifetimeEnergyConsumedAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readLifetimeEnergyConsumedAttribute(): LifetimeEnergyConsumedAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLifetimeEnergyConsumedAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLifetimeEnergyConsumedAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLifetimeEnergyConsumedAttribute(
-    callback: LifetimeEnergyConsumedAttributeCallback,
+  suspend fun subscribeLifetimeEnergyConsumedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LifetimeEnergyConsumedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOperationModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeOperationModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOperationModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOperationModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readControlModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readControlModeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeControlModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeControlModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeControlModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeControlModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeControlModeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 512u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
index 53454570dcc3c5..5c54c5f5fee2fe 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RadonConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1071u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class RadonConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1071u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
index f401bcd1ad70bf..9aebd7443d205e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
@@ -17,142 +17,103 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RefrigeratorAlarmCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 87u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class RefrigeratorAlarmCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readMaskAttribute(callback: LongAttributeCallback) {
+  suspend fun readMaskAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaskAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readStateAttribute(callback: LongAttributeCallback) {
+  suspend fun readStateAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeStateAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readSupportedAttribute(callback: LongAttributeCallback) {
+  suspend fun readSupportedAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 87u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
index bbb249603c474c..bfb589a815d089 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
@@ -17,233 +17,156 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 82u
-  }
-
-  fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun changeToMode(
-    callback: ChangeToModeResponseCallback,
-    newMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeToModeResponseCallback {
-    fun onSuccess(status: Integer, statusText: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(
-      value:
-        ArrayList<
-          ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct
-        >
-    )
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StartUpModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class RefrigeratorAndTemperatureControlledCabinetModeCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class SupportedModesAttribute(
+    val value: List<RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>
+  )
 
-    fun onError(ex: Exception)
+  class StartUpModeAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OnModeAttribute(val value: UByte?)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) {
+  suspend fun readStartUpModeAttribute(): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeStartUpModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeStartUpModeAttribute(
-    callback: StartUpModeAttributeCallback,
+  suspend fun subscribeStartUpModeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  ): StartUpModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 82u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
index 7efad29eaaf8f0..d2240d51f6ae74 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
@@ -17,186 +17,126 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RelativeHumidityMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1029u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class RelativeHumidityMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MinMeasuredValueAttribute(val value: UShort?)
 
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class MaxMeasuredValueAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1029u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
index f51c947cd1c472..2a5620f647505c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
@@ -17,196 +17,133 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RvcCleanModeCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 85u
-  }
-
-  fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
+class RvcCleanModeCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
 
-  fun changeToMode(
-    callback: ChangeToModeResponseCallback,
-    newMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeToModeResponseCallback {
-    fun onSuccess(status: Integer, statusText: String?)
+  class SupportedModesAttribute(val value: List<RvcCleanModeClusterModeOptionStruct>)
 
-    fun onError(error: Exception)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.RvcCleanModeClusterModeOptionStruct>)
+  class OnModeAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 85u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
index dab1335f74f2cd..abb27510e5590c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
@@ -17,264 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RvcOperationalStateCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 97u
-  }
-
-  fun pause(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun pause(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun stop(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+class RvcOperationalStateCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class OperationalCommandResponse(
+    val commandResponseState: RvcOperationalStateClusterErrorStateStruct
+  )
 
-  fun start(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class PhaseListAttribute(val value: List<String>?)
 
-  fun start(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class CurrentPhaseAttribute(val value: UByte?)
 
-  fun resume(callback: OperationalCommandResponseCallback) {
-    // Implementation needs to be added here
-  }
+  class CountdownTimeAttribute(val value: UInt?)
 
-  fun resume(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class OperationalStateListAttribute(
+    val value: List<RvcOperationalStateClusterOperationalStateStruct>
+  )
 
-  interface OperationalCommandResponseCallback {
-    fun onSuccess(commandResponseState: ChipStructs.RvcOperationalStateClusterErrorStateStruct)
+  class OperationalErrorAttribute(val value: RvcOperationalStateClusterErrorStateStruct)
 
-    fun onError(error: Exception)
-  }
-
-  interface PhaseListAttributeCallback {
-    fun onSuccess(value: ArrayList<String>?)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface CurrentPhaseAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface CountdownTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface OperationalStateListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>)
+  suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface OperationalErrorAttributeCallback {
-    fun onSuccess(value: ChipStructs.RvcOperationalStateClusterErrorStateStruct)
-
-    fun onError(ex: Exception)
+  suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    val commandId = 3L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readPhaseListAttribute(callback: PhaseListAttributeCallback) {
+  suspend fun readPhaseListAttribute(): PhaseListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePhaseListAttribute(
-    callback: PhaseListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPhaseAttribute(callback: CurrentPhaseAttributeCallback) {
+  suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPhaseAttribute(
-    callback: CurrentPhaseAttributeCallback,
+  suspend fun subscribeCurrentPhaseAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPhaseAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCountdownTimeAttribute(callback: CountdownTimeAttributeCallback) {
+  suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCountdownTimeAttribute(
-    callback: CountdownTimeAttributeCallback,
+  suspend fun subscribeCountdownTimeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CountdownTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalStateListAttribute(callback: OperationalStateListAttributeCallback) {
+  suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalStateListAttribute(
-    callback: OperationalStateListAttributeCallback,
+  suspend fun subscribeOperationalStateListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OperationalStateListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOperationalStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOperationalErrorAttribute(callback: OperationalErrorAttributeCallback) {
+  suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalErrorAttribute(
-    callback: OperationalErrorAttributeCallback,
+  suspend fun subscribeOperationalErrorAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OperationalErrorAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 97u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
index 0160a183f48e96..6c4879b6144e03 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
@@ -17,196 +17,130 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class RvcRunModeCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 84u
-  }
-
-  fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) {
-    // Implementation needs to be added here
-  }
+class RvcRunModeCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
 
-  fun changeToMode(
-    callback: ChangeToModeResponseCallback,
-    newMode: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface ChangeToModeResponseCallback {
-    fun onSuccess(status: Integer, statusText: String?)
+  class SupportedModesAttribute(val value: List<RvcRunModeClusterModeOptionStruct>)
 
-    fun onError(error: Exception)
-  }
-
-  interface SupportedModesAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.RvcRunModeClusterModeOptionStruct>)
+  class OnModeAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface OnModeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) {
+  suspend fun readSupportedModesAttribute(): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedModesAttribute(
-    callback: SupportedModesAttributeCallback,
+  suspend fun subscribeSupportedModesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedModesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readOnModeAttribute(callback: OnModeAttributeCallback) {
+  suspend fun readOnModeAttribute(): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOnModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOnModeAttribute(
-    callback: OnModeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 84u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
index 37d98e704f5d10..a19737df6c3d4e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
@@ -17,165 +17,118 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class SampleMeiCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 4294048800u
-  }
-
-  fun ping(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+class SampleMeiCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class AddArgumentsResponse(val returnValue: UByte)
 
-  fun ping(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun addArguments(callback: AddArgumentsResponseCallback, arg1: Integer, arg2: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun addArguments(
-    callback: AddArgumentsResponseCallback,
-    arg1: Integer,
-    arg2: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface AddArgumentsResponseCallback {
-    fun onSuccess(returnValue: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun ping(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun addArguments(
+    arg1: UByte,
+    arg2: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): AddArgumentsResponse {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readFlipFlopAttribute(): Boolean {
+    // Implementation needs to be added here
   }
 
-  fun readFlipFlopAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeFlipFlopAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeFlipFlopAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun subscribeFlipFlopAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeFlipFlopAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeFlipFlopAttribute(
-    callback: BooleanAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 4294048800u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
index a075d23e1129ae..4baf50cd57f18a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
@@ -17,459 +17,345 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ScenesCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 5u
-  }
+class ScenesCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class AddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
 
-  fun addScene(
-    callback: AddSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer,
-    sceneName: String,
-    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>
-  ) {
-    // Implementation needs to be added here
-  }
+  class ViewSceneResponse(
+    val status: UShort,
+    val groupID: UShort,
+    val sceneID: UByte,
+    val transitionTime: UShort?,
+    val sceneName: String?,
+    val extensionFieldSets: List<ScenesClusterExtensionFieldSet>?
+  )
 
-  fun addScene(
-    callback: AddSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer,
-    sceneName: String,
-    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun viewScene(callback: ViewSceneResponseCallback, groupID: Integer, sceneID: Integer) {
-    // Implementation needs to be added here
-  }
+  class RemoveSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
 
-  fun viewScene(
-    callback: ViewSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class RemoveAllScenesResponse(val status: UShort, val groupID: UShort)
 
-  fun removeScene(callback: RemoveSceneResponseCallback, groupID: Integer, sceneID: Integer) {
-    // Implementation needs to be added here
-  }
+  class StoreSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
 
-  fun removeScene(
-    callback: RemoveSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GetSceneMembershipResponse(
+    val status: UShort,
+    val capacity: UByte?,
+    val groupID: UShort,
+    val sceneList: List<UByte>?
+  )
 
-  fun removeAllScenes(callback: RemoveAllScenesResponseCallback, groupID: Integer) {
-    // Implementation needs to be added here
-  }
+  class EnhancedAddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
 
-  fun removeAllScenes(
-    callback: RemoveAllScenesResponseCallback,
-    groupID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EnhancedViewSceneResponse(
+    val status: UShort,
+    val groupID: UShort,
+    val sceneID: UByte,
+    val transitionTime: UShort?,
+    val sceneName: String?,
+    val extensionFieldSets: List<ScenesClusterExtensionFieldSet>?
+  )
 
-  fun storeScene(callback: StoreSceneResponseCallback, groupID: Integer, sceneID: Integer) {
-    // Implementation needs to be added here
-  }
+  class CopySceneResponse(
+    val status: UShort,
+    val groupIdentifierFrom: UShort,
+    val sceneIdentifierFrom: UByte
+  )
 
-  fun storeScene(
-    callback: StoreSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class LastConfiguredByAttribute(val value: ULong?)
 
-  fun recallScene(
-    callback: DefaultClusterCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer?
-  ) {
-    // Implementation needs to be added here
-  }
+  class FabricSceneInfoAttribute(val value: List<ScenesClusterSceneInfoStruct>)
 
-  fun recallScene(
-    callback: DefaultClusterCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun getSceneMembership(callback: GetSceneMembershipResponseCallback, groupID: Integer) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun getSceneMembership(
-    callback: GetSceneMembershipResponseCallback,
-    groupID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun enhancedAddScene(
-    callback: EnhancedAddSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer,
-    sceneName: String,
-    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>
-  ) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun enhancedAddScene(
-    callback: EnhancedAddSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    transitionTime: Integer,
+  suspend fun addScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort,
     sceneName: String,
-    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun enhancedViewScene(
-    callback: EnhancedViewSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer
+    extensionFieldSets: List<ScenesClusterExtensionFieldSet>,
+    timedInvokeTimeoutMs: Int? = null
+  ): AddSceneResponse {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun viewScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ViewSceneResponse {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): RemoveSceneResponse {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeAllScenes(
+    groupID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): RemoveAllScenesResponse {
+    val commandId = 3L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun storeScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): StoreSceneResponse {
+    val commandId = 4L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun recallScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort?,
+    timedInvokeTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun enhancedViewScene(
-    callback: EnhancedViewSceneResponseCallback,
-    groupID: Integer,
-    sceneID: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun copyScene(
-    callback: CopySceneResponseCallback,
-    mode: Integer,
-    groupIdentifierFrom: Integer,
-    sceneIdentifierFrom: Integer,
-    groupIdentifierTo: Integer,
-    sceneIdentifierTo: Integer
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun copyScene(
-    callback: CopySceneResponseCallback,
-    mode: Integer,
-    groupIdentifierFrom: Integer,
-    sceneIdentifierFrom: Integer,
-    groupIdentifierTo: Integer,
-    sceneIdentifierTo: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface AddSceneResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer)
-
-    fun onError(error: Exception)
-  }
+    val commandId = 5L
 
-  interface ViewSceneResponseCallback {
-    fun onSuccess(
-      status: Integer,
-      groupID: Integer,
-      sceneID: Integer,
-      transitionTime: Integer?,
-      sceneName: String?,
-      extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>?
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface RemoveSceneResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface RemoveAllScenesResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface StoreSceneResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface GetSceneMembershipResponseCallback {
-    fun onSuccess(
-      status: Integer,
-      capacity: Integer?,
-      groupID: Integer,
-      sceneList: ArrayList<Integer>?
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface EnhancedAddSceneResponseCallback {
-    fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface EnhancedViewSceneResponseCallback {
-    fun onSuccess(
-      status: Integer,
-      groupID: Integer,
-      sceneID: Integer,
-      transitionTime: Integer?,
-      sceneName: String?,
-      extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>?
-    )
-
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface CopySceneResponseCallback {
-    fun onSuccess(status: Integer, groupIdentifierFrom: Integer, sceneIdentifierFrom: Integer)
+  suspend fun getSceneMembership(
+    groupID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetSceneMembershipResponse {
+    val commandId = 6L
 
-    fun onError(error: Exception)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface LastConfiguredByAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun enhancedAddScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort,
+    sceneName: String,
+    extensionFieldSets: List<ScenesClusterExtensionFieldSet>,
+    timedInvokeTimeoutMs: Int? = null
+  ): EnhancedAddSceneResponse {
+    val commandId = 64L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun enhancedViewScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): EnhancedViewSceneResponse {
+    val commandId = 65L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun copyScene(
+    mode: UInt,
+    groupIdentifierFrom: UShort,
+    sceneIdentifierFrom: UByte,
+    groupIdentifierTo: UShort,
+    sceneIdentifierTo: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): CopySceneResponse {
+    val commandId = 66L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readSceneCountAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun subscribeSceneCountAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readSceneCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentSceneAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSceneCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentSceneAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentSceneAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentGroupAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentSceneAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentGroupAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readCurrentGroupAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSceneValidAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentGroupAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSceneValidAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readSceneValidAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readNameSupportAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSceneValidAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNameSupportAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLastConfiguredByAttribute(): LastConfiguredByAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNameSupportAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeLastConfiguredByAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LastConfiguredByAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLastConfiguredByAttribute(callback: LastConfiguredByAttributeCallback) {
+  suspend fun readSceneTableSizeAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeLastConfiguredByAttribute(
-    callback: LastConfiguredByAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSceneTableSizeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeSceneTableSizeAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeSceneTableSizeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFabricSceneInfoAttribute(): FabricSceneInfoAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRemainingCapacityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readFabricSceneInfoAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): FabricSceneInfoAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeRemainingCapacityAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeFabricSceneInfoAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): FabricSceneInfoAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 5u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
index eae9b36d990a6d..384b52fbfcfea7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
@@ -17,290 +17,201 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class SmokeCoAlarmCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 92u
-  }
-
-  fun selfTestRequest(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
+class SmokeCoAlarmCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun selfTestRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun selfTestRequest(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readExpressedStateAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readExpressedStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeExpressedStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeExpressedStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSmokeStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSmokeStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeSmokeStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSmokeStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readCOStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCOStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeCOStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCOStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readBatteryAlertAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readBatteryAlertAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeBatteryAlertAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeBatteryAlertAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readDeviceMutedAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readDeviceMutedAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeDeviceMutedAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDeviceMutedAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readTestInProgressAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readTestInProgressAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeTestInProgressAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeTestInProgressAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readHardwareFaultAlertAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readHardwareFaultAlertAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeHardwareFaultAlertAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeHardwareFaultAlertAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readEndOfServiceAlertAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readEndOfServiceAlertAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeEndOfServiceAlertAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeEndOfServiceAlertAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInterconnectSmokeAlarmAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readInterconnectSmokeAlarmAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeInterconnectSmokeAlarmAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeInterconnectSmokeAlarmAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInterconnectCOAlarmAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readInterconnectCOAlarmAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeInterconnectCOAlarmAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeInterconnectCOAlarmAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readContaminationStateAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readContaminationStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeContaminationStateAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeContaminationStateAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSmokeSensitivityLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSmokeSensitivityLevelAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeSmokeSensitivityLevelAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeSmokeSensitivityLevelAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeSmokeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeSmokeSensitivityLevelAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readExpiryDateAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeSmokeSensitivityLevelAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeExpiryDateAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readExpiryDateAttribute(callback: LongAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeExpiryDateAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 92u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
index 79c817ba943239..0132daa4368246 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
@@ -17,178 +17,129 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class SoftwareDiagnosticsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 52u
-  }
-
-  fun resetWatermarks(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetWatermarks(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface ThreadMetricsAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class SoftwareDiagnosticsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ThreadMetricsAttribute(val value: List<SoftwareDiagnosticsClusterThreadMetricsStruct>?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun resetWatermarks(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readThreadMetricsAttribute(callback: ThreadMetricsAttributeCallback) {
+  suspend fun readThreadMetricsAttribute(): ThreadMetricsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeThreadMetricsAttribute(
-    callback: ThreadMetricsAttributeCallback,
+  suspend fun subscribeThreadMetricsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ThreadMetricsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentHeapFreeAttribute(callback: LongAttributeCallback) {
+  suspend fun readCurrentHeapFreeAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentHeapFreeAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentHeapFreeAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readCurrentHeapUsedAttribute(callback: LongAttributeCallback) {
+  suspend fun readCurrentHeapUsedAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentHeapUsedAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentHeapUsedAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readCurrentHeapHighWatermarkAttribute(callback: LongAttributeCallback) {
+  suspend fun readCurrentHeapHighWatermarkAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentHeapHighWatermarkAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeCurrentHeapHighWatermarkAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ULong {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 52u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
index 7d9685744e2ffc..a27cc29bd7b640 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
@@ -17,150 +17,100 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class SwitchCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 59u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class SwitchCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readNumberOfPositionsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfPositionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfPositionsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNumberOfPositionsAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentPositionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentPositionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMultiPressMaxAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMultiPressMaxAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMultiPressMaxAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMultiPressMaxAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 59u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
index 11eebe726ebc63..691bc7adc452b1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
@@ -17,165 +17,116 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TargetNavigatorCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1285u
-  }
-
-  fun navigateTarget(callback: NavigateTargetResponseCallback, target: Integer, data: String?) {
-    // Implementation needs to be added here
-  }
-
-  fun navigateTarget(
-    callback: NavigateTargetResponseCallback,
-    target: Integer,
-    data: String?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface NavigateTargetResponseCallback {
-    fun onSuccess(status: Integer, data: String?)
-
-    fun onError(error: Exception)
-  }
-
-  interface TargetListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.TargetNavigatorClusterTargetInfoStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class TargetNavigatorCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class NavigateTargetResponse(val status: UInt, val data: String?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class TargetListAttribute(val value: List<TargetNavigatorClusterTargetInfoStruct>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun navigateTarget(
+    target: UByte,
+    data: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NavigateTargetResponse {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readTargetListAttribute(callback: TargetListAttributeCallback) {
+  suspend fun readTargetListAttribute(): TargetListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTargetListAttribute(
-    callback: TargetListAttributeCallback,
+  suspend fun subscribeTargetListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): TargetListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentTargetAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readCurrentTargetAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentTargetAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeCurrentTargetAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1285u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
index e828002cddf0b8..978f543f84231a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
@@ -17,213 +17,149 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TemperatureControlCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 86u
-  }
-
-  fun setTemperature(
-    callback: DefaultClusterCallback,
-    targetTemperature: Integer?,
-    targetTemperatureLevel: Integer?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun setTemperature(
-    callback: DefaultClusterCallback,
-    targetTemperature: Integer?,
-    targetTemperatureLevel: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface SupportedTemperatureLevelsAttributeCallback {
-    fun onSuccess(value: ArrayList<String>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class TemperatureControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SupportedTemperatureLevelsAttribute(val value: List<String>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun setTemperature(
+    targetTemperature: Short?,
+    targetTemperatureLevel: UByte?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readTemperatureSetpointAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTemperatureSetpointAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeTemperatureSetpointAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTemperatureSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readMinTemperatureAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinTemperatureAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinTemperatureAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMinTemperatureAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readMaxTemperatureAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMaxTemperatureAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxTemperatureAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxTemperatureAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readStepAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readStepAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeStepAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStepAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readSelectedTemperatureLevelAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSelectedTemperatureLevelAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSelectedTemperatureLevelAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSelectedTemperatureLevelAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSupportedTemperatureLevelsAttribute(
-    callback: SupportedTemperatureLevelsAttributeCallback
-  ) {
+  suspend fun readSupportedTemperatureLevelsAttribute(): SupportedTemperatureLevelsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedTemperatureLevelsAttribute(
-    callback: SupportedTemperatureLevelsAttributeCallback,
+  suspend fun subscribeSupportedTemperatureLevelsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedTemperatureLevelsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 86u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
index cda7f5102d348b..5c6a6ff41fd1eb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
@@ -17,186 +17,126 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TemperatureMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1026u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class TemperatureMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class MinMeasuredValueAttribute(val value: Short?)
 
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class MaxMeasuredValueAttribute(val value: Short?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readToleranceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readToleranceAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeToleranceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1026u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
index efe49d68aa9df2..1e451858dabaf1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
@@ -17,1192 +17,851 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ThermostatCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 513u
-  }
-
-  fun setpointRaiseLower(callback: DefaultClusterCallback, mode: Integer, amount: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun setpointRaiseLower(
-    callback: DefaultClusterCallback,
-    mode: Integer,
-    amount: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun setWeeklySchedule(
-    callback: DefaultClusterCallback,
-    numberOfTransitionsForSequence: Integer,
-    dayOfWeekForSequence: Integer,
-    modeForSequence: Integer,
-    transitions: ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun setWeeklySchedule(
-    callback: DefaultClusterCallback,
-    numberOfTransitionsForSequence: Integer,
-    dayOfWeekForSequence: Integer,
-    modeForSequence: Integer,
-    transitions: ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun getWeeklySchedule(
-    callback: GetWeeklyScheduleResponseCallback,
-    daysToReturn: Integer,
-    modeToReturn: Integer
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun getWeeklySchedule(
-    callback: GetWeeklyScheduleResponseCallback,
-    daysToReturn: Integer,
-    modeToReturn: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun clearWeeklySchedule(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun clearWeeklySchedule(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface GetWeeklyScheduleResponseCallback {
-    fun onSuccess(
-      numberOfTransitionsForSequence: Integer,
-      dayOfWeekForSequence: Integer,
-      modeForSequence: Integer,
-      transitions: ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface LocalTemperatureAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OutdoorTemperatureAttributeCallback {
-    fun onSuccess(value: Integer?)
+class ThermostatCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GetWeeklyScheduleResponse(
+    val numberOfTransitionsForSequence: UByte,
+    val dayOfWeekForSequence: UInt,
+    val modeForSequence: UInt,
+    val transitions: List<ThermostatClusterThermostatScheduleTransition>
+  )
 
-    fun onError(ex: Exception)
+  class LocalTemperatureAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface TemperatureSetpointHoldDurationAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SetpointChangeAmountAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OccupiedSetbackAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OccupiedSetbackMinAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface OccupiedSetbackMaxAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OutdoorTemperatureAttribute(val value: Short?)
 
-  interface UnoccupiedSetbackAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class TemperatureSetpointHoldDurationAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class SetpointChangeAmountAttribute(val value: Short?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class OccupiedSetbackAttribute(val value: UByte?)
 
-  interface UnoccupiedSetbackMinAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class OccupiedSetbackMinAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class OccupiedSetbackMaxAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class UnoccupiedSetbackAttribute(val value: UByte?)
 
-  interface UnoccupiedSetbackMaxAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class UnoccupiedSetbackMinAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class UnoccupiedSetbackMaxAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ACCoilTemperatureAttribute(val value: Short?)
 
-  interface ACCoilTemperatureAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun setpointRaiseLower(mode: UInt, amount: Byte, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setWeeklySchedule(
+    numberOfTransitionsForSequence: UByte,
+    dayOfWeekForSequence: UInt,
+    modeForSequence: UInt,
+    transitions: List<ThermostatClusterThermostatScheduleTransition>,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun getWeeklySchedule(
+    daysToReturn: UInt,
+    modeToReturn: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetWeeklyScheduleResponse {
+    val commandId = 2L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun clearWeeklySchedule(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readLocalTemperatureAttribute(callback: LocalTemperatureAttributeCallback) {
+  suspend fun readLocalTemperatureAttribute(): LocalTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLocalTemperatureAttribute(
-    callback: LocalTemperatureAttributeCallback,
+  suspend fun subscribeLocalTemperatureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LocalTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOutdoorTemperatureAttribute(callback: OutdoorTemperatureAttributeCallback) {
+  suspend fun readOutdoorTemperatureAttribute(): OutdoorTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOutdoorTemperatureAttribute(
-    callback: OutdoorTemperatureAttributeCallback,
+  suspend fun subscribeOutdoorTemperatureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OutdoorTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOccupancyAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOccupancyAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupancyAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readAbsMinHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAbsMinHeatSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAbsMinHeatSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAbsMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAbsMaxHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAbsMaxHeatSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAbsMaxHeatSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAbsMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readAbsMinCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAbsMinCoolSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAbsMinCoolSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAbsMaxCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeAbsMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeAbsMaxCoolSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readAbsMaxCoolSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readPICoolingDemandAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeAbsMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribePICoolingDemandAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPICoolingDemandAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPIHeatingDemandAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePICoolingDemandAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribePIHeatingDemandAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readPIHeatingDemandAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readHVACSystemTypeConfigurationAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribePIHeatingDemandAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeHVACSystemTypeConfigurationAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readHVACSystemTypeConfigurationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeHVACSystemTypeConfigurationAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeHVACSystemTypeConfigurationAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeHVACSystemTypeConfigurationAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeHVACSystemTypeConfigurationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readLocalTemperatureCalibrationAttribute(callback: IntegerAttributeCallback) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLocalTemperatureCalibrationAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readLocalTemperatureCalibrationAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeLocalTemperatureCalibrationAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeLocalTemperatureCalibrationAttribute(
+    value: Byte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLocalTemperatureCalibrationAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeLocalTemperatureCalibrationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOccupiedCoolingSetpointAttribute(callback: IntegerAttributeCallback) {
+  ): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeOccupiedCoolingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readOccupiedCoolingSetpointAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeOccupiedCoolingSetpointAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOccupiedCoolingSetpointAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeOccupiedCoolingSetpointAttribute(
+    value: Short,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOccupiedHeatingSetpointAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeOccupiedHeatingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeOccupiedCoolingSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeOccupiedHeatingSetpointAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readOccupiedHeatingSetpointAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupiedHeatingSetpointAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeOccupiedHeatingSetpointAttribute(
+    value: Short,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readUnoccupiedCoolingSetpointAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeOccupiedHeatingSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeUnoccupiedCoolingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readUnoccupiedCoolingSetpointAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeUnoccupiedCoolingSetpointAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeUnoccupiedCoolingSetpointAttribute(
+    value: Short,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUnoccupiedCoolingSetpointAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUnoccupiedCoolingSetpointAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readUnoccupiedHeatingSetpointAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readUnoccupiedHeatingSetpointAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeUnoccupiedHeatingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeUnoccupiedHeatingSetpointAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeUnoccupiedHeatingSetpointAttribute(
+    value: Short,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUnoccupiedHeatingSetpointAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUnoccupiedHeatingSetpointAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): Short {
     // Implementation needs to be added here
   }
 
-  fun readMinHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinHeatSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeMinHeatSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeMinHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeMinHeatSetpointLimitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinHeatSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readMaxHeatSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun readMaxHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeMaxHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeMaxHeatSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeMaxHeatSetpointLimitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readMinCoolSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxHeatSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeMinCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readMinCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeMinCoolSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readMaxCoolSetpointLimitAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeMinCoolSetpointLimitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeMaxCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeMinCoolSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun readMaxCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMinSetpointDeadBandAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeMaxCoolSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeMinSetpointDeadBandAttribute(value: Byte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeMaxCoolSetpointLimitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeMinSetpointDeadBandAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxCoolSetpointLimitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readRemoteSensingAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMinSetpointDeadBandAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeRemoteSensingAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeMinSetpointDeadBandAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeRemoteSensingAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeMinSetpointDeadBandAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readControlSequenceOfOperationAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinSetpointDeadBandAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeControlSequenceOfOperationAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
-  }
-
-  fun readRemoteSensingAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeRemoteSensingAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeRemoteSensingAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeRemoteSensingAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeControlSequenceOfOperationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readControlSequenceOfOperationAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeControlSequenceOfOperationAttribute(callback: DefaultClusterCallback, value: Integer) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeControlSequenceOfOperationAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeControlSequenceOfOperationAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readSystemModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSystemModeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeSystemModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeSystemModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeSystemModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeSystemModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readThermostatRunningModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeSystemModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeThermostatRunningModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readThermostatRunningModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readStartOfWeekAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeThermostatRunningModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeStartOfWeekAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readStartOfWeekAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfWeeklyTransitionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeStartOfWeekAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfWeeklyTransitionsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfWeeklyTransitionsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfDailyTransitionsAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfWeeklyTransitionsAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeNumberOfDailyTransitionsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfDailyTransitionsAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTemperatureSetpointHoldAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfDailyTransitionsAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeTemperatureSetpointHoldAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readTemperatureSetpointHoldAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeTemperatureSetpointHoldAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureSetpointHoldAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readTemperatureSetpointHoldDurationAttribute():
+    TemperatureSetpointHoldDurationAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureSetpointHoldAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeTemperatureSetpointHoldDurationAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeTemperatureSetpointHoldAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeTemperatureSetpointHoldDurationAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readTemperatureSetpointHoldDurationAttribute(
-    callback: TemperatureSetpointHoldDurationAttributeCallback
-  ) {
+  ): TemperatureSetpointHoldDurationAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureSetpointHoldDurationAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readThermostatProgrammingOperationModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureSetpointHoldDurationAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeThermostatProgrammingOperationModeAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeTemperatureSetpointHoldDurationAttribute(
-    callback: TemperatureSetpointHoldDurationAttributeCallback,
+  suspend fun subscribeThermostatProgrammingOperationModeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun readThermostatProgrammingOperationModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readThermostatRunningStateAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeThermostatProgrammingOperationModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun subscribeThermostatRunningStateAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeThermostatProgrammingOperationModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readSetpointChangeSourceAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeThermostatProgrammingOperationModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSetpointChangeSourceAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readThermostatRunningStateAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSetpointChangeAmountAttribute(): SetpointChangeAmountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeThermostatRunningStateAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSetpointChangeAmountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SetpointChangeAmountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSetpointChangeSourceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSetpointChangeSourceTimestampAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeSetpointChangeSourceAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSetpointChangeSourceTimestampAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSetpointChangeAmountAttribute(callback: SetpointChangeAmountAttributeCallback) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeSetpointChangeAmountAttribute(
-    callback: SetpointChangeAmountAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readOccupiedSetbackAttribute(): OccupiedSetbackAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSetpointChangeSourceTimestampAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeOccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeSetpointChangeSourceTimestampAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeOccupiedSetbackAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OccupiedSetbackAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOccupiedSetbackAttribute(callback: OccupiedSetbackAttributeCallback) {
+  suspend fun readOccupiedSetbackMinAttribute(): OccupiedSetbackMinAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeOccupiedSetbackAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeOccupiedSetbackAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOccupiedSetbackAttribute(
-    callback: OccupiedSetbackAttributeCallback,
+  suspend fun subscribeOccupiedSetbackMinAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OccupiedSetbackMinAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOccupiedSetbackMinAttribute(callback: OccupiedSetbackMinAttributeCallback) {
+  suspend fun readOccupiedSetbackMaxAttribute(): OccupiedSetbackMaxAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOccupiedSetbackMinAttribute(
-    callback: OccupiedSetbackMinAttributeCallback,
+  suspend fun subscribeOccupiedSetbackMaxAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readOccupiedSetbackMaxAttribute(callback: OccupiedSetbackMaxAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeOccupiedSetbackMaxAttribute(
-    callback: OccupiedSetbackMaxAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readUnoccupiedSetbackAttribute(callback: UnoccupiedSetbackAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeUnoccupiedSetbackAttribute(callback: DefaultClusterCallback, value: Integer) {
+  ): OccupiedSetbackMaxAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeUnoccupiedSetbackAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeUnoccupiedSetbackAttribute(
-    callback: UnoccupiedSetbackAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readUnoccupiedSetbackAttribute(): UnoccupiedSetbackAttribute {
     // Implementation needs to be added here
   }
 
-  fun readUnoccupiedSetbackMinAttribute(callback: UnoccupiedSetbackMinAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeUnoccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUnoccupiedSetbackMinAttribute(
-    callback: UnoccupiedSetbackMinAttributeCallback,
+  suspend fun subscribeUnoccupiedSetbackAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UnoccupiedSetbackAttribute {
     // Implementation needs to be added here
   }
 
-  fun readUnoccupiedSetbackMaxAttribute(callback: UnoccupiedSetbackMaxAttributeCallback) {
+  suspend fun readUnoccupiedSetbackMinAttribute(): UnoccupiedSetbackMinAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeUnoccupiedSetbackMaxAttribute(
-    callback: UnoccupiedSetbackMaxAttributeCallback,
+  suspend fun subscribeUnoccupiedSetbackMinAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UnoccupiedSetbackMinAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEmergencyHeatDeltaAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readUnoccupiedSetbackMaxAttribute(): UnoccupiedSetbackMaxAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeEmergencyHeatDeltaAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeEmergencyHeatDeltaAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeEmergencyHeatDeltaAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeUnoccupiedSetbackMaxAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UnoccupiedSetbackMaxAttribute {
     // Implementation needs to be added here
   }
 
-  fun readACTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readEmergencyHeatDeltaAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACTypeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeEmergencyHeatDeltaAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACTypeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeEmergencyHeatDeltaAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeACTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readACTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readACCapacityAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeACTypeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACCapacityAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeACTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACCapacityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readACCapacityAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeACCapacityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeACCapacityAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readACRefrigerantTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeACCapacityAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeACRefrigerantTypeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readACRefrigerantTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACRefrigerantTypeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeACRefrigerantTypeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeACRefrigerantTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeACRefrigerantTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readACCompressorTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readACCompressorTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACCompressorTypeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeACCompressorTypeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACCompressorTypeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeACCompressorTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeACCompressorTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readACErrorCodeAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readACErrorCodeAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeACErrorCodeAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACErrorCodeAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun subscribeACErrorCodeAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeACErrorCodeAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeACErrorCodeAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readACLouverPositionAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readACLouverPositionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeACLouverPositionAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACLouverPositionAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeACLouverPositionAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACLouverPositionAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readACCoilTemperatureAttribute(): ACCoilTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeACLouverPositionAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeACCoilTemperatureAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ACCoilTemperatureAttribute {
     // Implementation needs to be added here
   }
 
-  fun readACCoilTemperatureAttribute(callback: ACCoilTemperatureAttributeCallback) {
+  suspend fun readACCapacityformatAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeACCoilTemperatureAttribute(
-    callback: ACCoilTemperatureAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readACCapacityformatAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeACCapacityformatAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeACCapacityformatAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeACCapacityformatAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeACCapacityformatAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeACCapacityformatAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 513u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
index c1d944c7854743..12ed570344c446 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
@@ -17,189 +17,133 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 516u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+class ThermostatUserInterfaceConfigurationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readTemperatureDisplayModeAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readTemperatureDisplayModeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeTemperatureDisplayModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeTemperatureDisplayModeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeTemperatureDisplayModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureDisplayModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readKeypadLockoutAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeTemperatureDisplayModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeKeypadLockoutAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readKeypadLockoutAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeKeypadLockoutAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeKeypadLockoutAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readScheduleProgrammingVisibilityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeKeypadLockoutAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeScheduleProgrammingVisibilityAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeKeypadLockoutAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeScheduleProgrammingVisibilityAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readScheduleProgrammingVisibilityAttribute(callback: IntegerAttributeCallback) {
+  ): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeScheduleProgrammingVisibilityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeScheduleProgrammingVisibilityAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeScheduleProgrammingVisibilityAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 516u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
index 2050e5b5dcc69a..86e2cb8e290a64 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
@@ -17,1040 +17,695 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 53u
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface ChannelAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface RoutingRoleAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NetworkNameAttributeCallback {
-    fun onSuccess(value: String?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PanIdAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ExtendedPanIdAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MeshLocalPrefixAttributeCallback {
-    fun onSuccess(value: ByteArray?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NeighborTableAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface RouteTableAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PartitionIdAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface WeightingAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface DataVersionAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StableDataVersionAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LeaderRouterIdAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ActiveTimestampAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PendingTimestampAttributeCallback {
-    fun onSuccess(value: Long?)
+class ThreadNetworkDiagnosticsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class ChannelAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class RoutingRoleAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface DelayAttributeCallback {
-    fun onSuccess(value: Long?)
+  class NetworkNameAttribute(val value: String?)
 
-    fun onError(ex: Exception)
+  class PanIdAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ExtendedPanIdAttribute(val value: ULong?)
 
-  interface SecurityPolicyAttributeCallback {
-    fun onSuccess(value: ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy?)
+  class MeshLocalPrefixAttribute(val value: ByteArray?)
 
-    fun onError(ex: Exception)
+  class NeighborTableAttribute(val value: List<ThreadNetworkDiagnosticsClusterNeighborTableStruct>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class RouteTableAttribute(val value: List<ThreadNetworkDiagnosticsClusterRouteTableStruct>)
 
-  interface ChannelPage0MaskAttributeCallback {
-    fun onSuccess(value: ByteArray?)
+  class PartitionIdAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class WeightingAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class DataVersionAttribute(val value: UShort?)
 
-  interface OperationalDatasetComponentsAttributeCallback {
-    fun onSuccess(value: ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents?)
+  class StableDataVersionAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class LeaderRouterIdAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ActiveTimestampAttribute(val value: ULong?)
 
-  interface ActiveNetworkFaultsListAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
+  class PendingTimestampAttribute(val value: ULong?)
 
-    fun onError(ex: Exception)
+  class DelayAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class SecurityPolicyAttribute(val value: ThreadNetworkDiagnosticsClusterSecurityPolicy?)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class ChannelPage0MaskAttribute(val value: ByteArray?)
 
-    fun onError(ex: Exception)
+  class OperationalDatasetComponentsAttribute(
+    val value: ThreadNetworkDiagnosticsClusterOperationalDatasetComponents?
+  )
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class ActiveNetworkFaultsListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readChannelAttribute(callback: ChannelAttributeCallback) {
+  suspend fun readChannelAttribute(): ChannelAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeChannelAttribute(
-    callback: ChannelAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeChannelAttribute(minInterval: Int, maxInterval: Int): ChannelAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRoutingRoleAttribute(callback: RoutingRoleAttributeCallback) {
+  suspend fun readRoutingRoleAttribute(): RoutingRoleAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeRoutingRoleAttribute(
-    callback: RoutingRoleAttributeCallback,
+  suspend fun subscribeRoutingRoleAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): RoutingRoleAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNetworkNameAttribute(callback: NetworkNameAttributeCallback) {
+  suspend fun readNetworkNameAttribute(): NetworkNameAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNetworkNameAttribute(
-    callback: NetworkNameAttributeCallback,
+  suspend fun subscribeNetworkNameAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NetworkNameAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPanIdAttribute(callback: PanIdAttributeCallback) {
+  suspend fun readPanIdAttribute(): PanIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePanIdAttribute(
-    callback: PanIdAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePanIdAttribute(minInterval: Int, maxInterval: Int): PanIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun readExtendedPanIdAttribute(callback: ExtendedPanIdAttributeCallback) {
+  suspend fun readExtendedPanIdAttribute(): ExtendedPanIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeExtendedPanIdAttribute(
-    callback: ExtendedPanIdAttributeCallback,
+  suspend fun subscribeExtendedPanIdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ExtendedPanIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMeshLocalPrefixAttribute(callback: MeshLocalPrefixAttributeCallback) {
+  suspend fun readMeshLocalPrefixAttribute(): MeshLocalPrefixAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeshLocalPrefixAttribute(
-    callback: MeshLocalPrefixAttributeCallback,
+  suspend fun subscribeMeshLocalPrefixAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeshLocalPrefixAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOverrunCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readOverrunCountAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeOverrunCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readNeighborTableAttribute(callback: NeighborTableAttributeCallback) {
+  suspend fun readNeighborTableAttribute(): NeighborTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNeighborTableAttribute(
-    callback: NeighborTableAttributeCallback,
+  suspend fun subscribeNeighborTableAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NeighborTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRouteTableAttribute(callback: RouteTableAttributeCallback) {
+  suspend fun readRouteTableAttribute(): RouteTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeRouteTableAttribute(
-    callback: RouteTableAttributeCallback,
+  suspend fun subscribeRouteTableAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): RouteTableAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPartitionIdAttribute(callback: PartitionIdAttributeCallback) {
+  suspend fun readPartitionIdAttribute(): PartitionIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePartitionIdAttribute(
-    callback: PartitionIdAttributeCallback,
+  suspend fun subscribePartitionIdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PartitionIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun readWeightingAttribute(callback: WeightingAttributeCallback) {
+  suspend fun readWeightingAttribute(): WeightingAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeWeightingAttribute(
-    callback: WeightingAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWeightingAttribute(minInterval: Int, maxInterval: Int): WeightingAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDataVersionAttribute(callback: DataVersionAttributeCallback) {
+  suspend fun readDataVersionAttribute(): DataVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDataVersionAttribute(
-    callback: DataVersionAttributeCallback,
+  suspend fun subscribeDataVersionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): DataVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readStableDataVersionAttribute(callback: StableDataVersionAttributeCallback) {
+  suspend fun readStableDataVersionAttribute(): StableDataVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeStableDataVersionAttribute(
-    callback: StableDataVersionAttributeCallback,
+  suspend fun subscribeStableDataVersionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): StableDataVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLeaderRouterIdAttribute(callback: LeaderRouterIdAttributeCallback) {
+  suspend fun readLeaderRouterIdAttribute(): LeaderRouterIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLeaderRouterIdAttribute(
-    callback: LeaderRouterIdAttributeCallback,
+  suspend fun subscribeLeaderRouterIdAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): LeaderRouterIdAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDetachedRoleCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDetachedRoleCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeDetachedRoleCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDetachedRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readChildRoleCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readChildRoleCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeChildRoleCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeChildRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readRouterRoleCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readRouterRoleCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeRouterRoleCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRouterRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readLeaderRoleCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLeaderRoleCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeLeaderRoleCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLeaderRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readAttachAttemptCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readAttachAttemptCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttachAttemptCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeAttachAttemptCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPartitionIdChangeCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPartitionIdChangeCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePartitionIdChangeCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePartitionIdChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readBetterPartitionAttachAttemptCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readBetterPartitionAttachAttemptCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeBetterPartitionAttachAttemptCountAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeBetterPartitionAttachAttemptCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readParentChangeCountAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readParentChangeCountAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeParentChangeCountAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeParentChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readTxTotalCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxTotalCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxTotalCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxUnicastCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxUnicastCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxUnicastCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxBroadcastCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxBroadcastCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxBroadcastCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxAckRequestedCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxAckRequestedCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxAckRequestedCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxAckedCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxAckedCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxAckedCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxAckedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxNoAckRequestedCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxNoAckRequestedCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxNoAckRequestedCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxNoAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxDataCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxDataCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxDataCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxDataPollCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxDataPollCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxDataPollCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxBeaconCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxBeaconCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxBeaconCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxBeaconRequestCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxBeaconRequestCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxBeaconRequestCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxOtherCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxOtherCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxOtherCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxRetryCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxRetryCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxRetryCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxRetryCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxDirectMaxRetryExpiryCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxDirectMaxRetryExpiryCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxDirectMaxRetryExpiryCountAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeTxDirectMaxRetryExpiryCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxIndirectMaxRetryExpiryCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxIndirectMaxRetryExpiryCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxIndirectMaxRetryExpiryCountAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeTxIndirectMaxRetryExpiryCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxErrCcaCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxErrCcaCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxErrCcaCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxErrCcaCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxErrAbortCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxErrAbortCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxErrAbortCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxErrAbortCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readTxErrBusyChannelCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readTxErrBusyChannelCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeTxErrBusyChannelCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTxErrBusyChannelCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxTotalCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxTotalCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxTotalCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxUnicastCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxUnicastCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxUnicastCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxBroadcastCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxBroadcastCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxBroadcastCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxDataCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxDataCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxDataCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxDataPollCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxDataPollCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxDataPollCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxBeaconCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxBeaconCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxBeaconCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxBeaconRequestCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxBeaconRequestCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxBeaconRequestCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxOtherCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxOtherCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxOtherCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxAddressFilteredCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxAddressFilteredCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxAddressFilteredCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxAddressFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxDestAddrFilteredCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxDestAddrFilteredCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxDestAddrFilteredCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxDestAddrFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxDuplicatedCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxDuplicatedCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxDuplicatedCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxDuplicatedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrNoFrameCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrNoFrameCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrNoFrameCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxErrNoFrameCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrUnknownNeighborCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrUnknownNeighborCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrUnknownNeighborCountAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeRxErrUnknownNeighborCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrInvalidSrcAddrCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrInvalidSrcAddrCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrInvalidSrcAddrCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxErrInvalidSrcAddrCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrSecCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrSecCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrSecCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxErrSecCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrFcsCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrFcsCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrFcsCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxErrFcsCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readRxErrOtherCountAttribute(callback: LongAttributeCallback) {
+  suspend fun readRxErrOtherCountAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeRxErrOtherCountAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRxErrOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readActiveTimestampAttribute(callback: ActiveTimestampAttributeCallback) {
+  suspend fun readActiveTimestampAttribute(): ActiveTimestampAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveTimestampAttribute(
-    callback: ActiveTimestampAttributeCallback,
+  suspend fun subscribeActiveTimestampAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveTimestampAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPendingTimestampAttribute(callback: PendingTimestampAttributeCallback) {
+  suspend fun readPendingTimestampAttribute(): PendingTimestampAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePendingTimestampAttribute(
-    callback: PendingTimestampAttributeCallback,
+  suspend fun subscribePendingTimestampAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PendingTimestampAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDelayAttribute(callback: DelayAttributeCallback) {
+  suspend fun readDelayAttribute(): DelayAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDelayAttribute(
-    callback: DelayAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDelayAttribute(minInterval: Int, maxInterval: Int): DelayAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSecurityPolicyAttribute(callback: SecurityPolicyAttributeCallback) {
+  suspend fun readSecurityPolicyAttribute(): SecurityPolicyAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSecurityPolicyAttribute(
-    callback: SecurityPolicyAttributeCallback,
+  suspend fun subscribeSecurityPolicyAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SecurityPolicyAttribute {
     // Implementation needs to be added here
   }
 
-  fun readChannelPage0MaskAttribute(callback: ChannelPage0MaskAttributeCallback) {
+  suspend fun readChannelPage0MaskAttribute(): ChannelPage0MaskAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeChannelPage0MaskAttribute(
-    callback: ChannelPage0MaskAttributeCallback,
+  suspend fun subscribeChannelPage0MaskAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ChannelPage0MaskAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalDatasetComponentsAttribute(
-    callback: OperationalDatasetComponentsAttributeCallback
-  ) {
+  suspend fun readOperationalDatasetComponentsAttribute(): OperationalDatasetComponentsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalDatasetComponentsAttribute(
-    callback: OperationalDatasetComponentsAttributeCallback,
+  suspend fun subscribeOperationalDatasetComponentsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OperationalDatasetComponentsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readActiveNetworkFaultsListAttribute(callback: ActiveNetworkFaultsListAttributeCallback) {
+  suspend fun readActiveNetworkFaultsListAttribute(): ActiveNetworkFaultsListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveNetworkFaultsListAttribute(
-    callback: ActiveNetworkFaultsListAttributeCallback,
+  suspend fun subscribeActiveNetworkFaultsListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ActiveNetworkFaultsListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 53u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
index 040b51246a2cf4..d3916cb0db2233 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
@@ -17,182 +17,124 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TimeFormatLocalizationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 44u
-  }
-
-  interface SupportedCalendarTypesAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>?)
-
-    fun onError(ex: Exception)
+class TimeFormatLocalizationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SupportedCalendarTypesAttribute(val value: List<UInt>?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun readHourFormatAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readHourFormatAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeHourFormatAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeHourFormatAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeHourFormatAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeHourFormatAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeHourFormatAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readActiveCalendarTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun readActiveCalendarTypeAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeActiveCalendarTypeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeActiveCalendarTypeAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeActiveCalendarTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeActiveCalendarTypeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readSupportedCalendarTypesAttribute(): SupportedCalendarTypesAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeActiveCalendarTypeAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeSupportedCalendarTypesAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SupportedCalendarTypesAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSupportedCalendarTypesAttribute(callback: SupportedCalendarTypesAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportedCalendarTypesAttribute(
-    callback: SupportedCalendarTypesAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 44u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
index 4d7b431cc9d501..d9b0d983141f95 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
@@ -17,400 +17,267 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TimeSynchronizationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 56u
-  }
+class TimeSynchronizationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class SetTimeZoneResponse(val DSTOffsetRequired: Boolean)
 
-  fun setUTCTime(
-    callback: DefaultClusterCallback,
-    UTCTime: Long,
-    granularity: Integer,
-    timeSource: Integer?
-  ) {
-    // Implementation needs to be added here
-  }
+  class UTCTimeAttribute(val value: ULong?)
 
-  fun setUTCTime(
-    callback: DefaultClusterCallback,
-    UTCTime: Long,
-    granularity: Integer,
-    timeSource: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class TrustedTimeSourceAttribute(val value: TimeSynchronizationClusterTrustedTimeSourceStruct?)
 
-  fun setTrustedTimeSource(
-    callback: DefaultClusterCallback,
-    trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?
-  ) {
-    // Implementation needs to be added here
-  }
+  class DefaultNTPAttribute(val value: String?)
 
-  fun setTrustedTimeSource(
-    callback: DefaultClusterCallback,
-    trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class TimeZoneAttribute(val value: List<TimeSynchronizationClusterTimeZoneStruct>?)
 
-  fun setTimeZone(
-    callback: SetTimeZoneResponseCallback,
-    timeZone: ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>
-  ) {
-    // Implementation needs to be added here
-  }
+  class DSTOffsetAttribute(val value: List<TimeSynchronizationClusterDSTOffsetStruct>?)
 
-  fun setTimeZone(
-    callback: SetTimeZoneResponseCallback,
-    timeZone: ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class LocalTimeAttribute(val value: ULong?)
 
-  fun setDSTOffset(
-    callback: DefaultClusterCallback,
-    DSTOffset: ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun setDSTOffset(
-    callback: DefaultClusterCallback,
-    DSTOffset: ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun setDefaultNTP(callback: DefaultClusterCallback, defaultNTP: String?) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun setDefaultNTP(
-    callback: DefaultClusterCallback,
-    defaultNTP: String?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface SetTimeZoneResponseCallback {
-    fun onSuccess(DSTOffsetRequired: Boolean)
-
-    fun onError(error: Exception)
-  }
-
-  interface UTCTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface TrustedTimeSourceAttributeCallback {
-    fun onSuccess(value: ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface DefaultNTPAttributeCallback {
-    fun onSuccess(value: String?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface TimeZoneAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface DSTOffsetAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface LocalTimeAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+  suspend fun setUTCTime(
+    UTCTime: ULong,
+    granularity: UInt,
+    timeSource: UInt?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setTrustedTimeSource(
+    trustedTimeSource: TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun setTimeZone(
+    timeZone: List<TimeSynchronizationClusterTimeZoneStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ): SetTimeZoneResponse {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setDSTOffset(
+    DSTOffset: List<TimeSynchronizationClusterDSTOffsetStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 4L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun setDefaultNTP(defaultNTP: String?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 5L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readUTCTimeAttribute(callback: UTCTimeAttributeCallback) {
+  suspend fun readUTCTimeAttribute(): UTCTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeUTCTimeAttribute(
-    callback: UTCTimeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUTCTimeAttribute(minInterval: Int, maxInterval: Int): UTCTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGranularityAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readGranularityAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeGranularityAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeGranularityAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readTimeSourceAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTimeSourceAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeTimeSourceAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTimeSourceAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readTrustedTimeSourceAttribute(callback: TrustedTimeSourceAttributeCallback) {
+  suspend fun readTrustedTimeSourceAttribute(): TrustedTimeSourceAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTrustedTimeSourceAttribute(
-    callback: TrustedTimeSourceAttributeCallback,
+  suspend fun subscribeTrustedTimeSourceAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): TrustedTimeSourceAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDefaultNTPAttribute(callback: DefaultNTPAttributeCallback) {
+  suspend fun readDefaultNTPAttribute(): DefaultNTPAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDefaultNTPAttribute(
-    callback: DefaultNTPAttributeCallback,
+  suspend fun subscribeDefaultNTPAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): DefaultNTPAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTimeZoneAttribute(callback: TimeZoneAttributeCallback) {
+  suspend fun readTimeZoneAttribute(): TimeZoneAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTimeZoneAttribute(
-    callback: TimeZoneAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTimeZoneAttribute(minInterval: Int, maxInterval: Int): TimeZoneAttribute {
     // Implementation needs to be added here
   }
 
-  fun readDSTOffsetAttribute(callback: DSTOffsetAttributeCallback) {
+  suspend fun readDSTOffsetAttribute(): DSTOffsetAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeDSTOffsetAttribute(
-    callback: DSTOffsetAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDSTOffsetAttribute(minInterval: Int, maxInterval: Int): DSTOffsetAttribute {
     // Implementation needs to be added here
   }
 
-  fun readLocalTimeAttribute(callback: LocalTimeAttributeCallback) {
+  suspend fun readLocalTimeAttribute(): LocalTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLocalTimeAttribute(
-    callback: LocalTimeAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLocalTimeAttribute(minInterval: Int, maxInterval: Int): LocalTimeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTimeZoneDatabaseAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTimeZoneDatabaseAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeTimeZoneDatabaseAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTimeZoneDatabaseAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNTPServerAvailableAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readNTPServerAvailableAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeNTPServerAvailableAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNTPServerAvailableAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readTimeZoneListMaxSizeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTimeZoneListMaxSizeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeTimeZoneListMaxSizeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTimeZoneListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readDSTOffsetListMaxSizeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readDSTOffsetListMaxSizeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeDSTOffsetListMaxSizeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeDSTOffsetListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readSupportsDNSResolveAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readSupportsDNSResolveAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeSupportsDNSResolveAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSupportsDNSResolveAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 56u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt
new file mode 100644
index 00000000000000..2ec115fde7742e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt
@@ -0,0 +1,156 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class TimerCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun setTimer(newTime: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun resetTimer(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addTime(additionalTime: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun reduceTime(timeReduction: UInt, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readSetTimeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSetTimeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeRemainingAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeRemainingAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimerStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimerStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 71u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
index a212e62b2059a5..bd37b97759d83e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
@@ -17,286 +17,195 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1070u
-  }
-
-  interface MeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MinMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface MaxMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
+class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class MeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PeakMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class MinMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class MaxMeasuredValueAttribute(val value: Float?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PeakMeasuredValueAttribute(val value: Float?)
 
-  interface AverageMeasuredValueAttributeCallback {
-    fun onSuccess(value: Float?)
+  class AverageMeasuredValueAttribute(val value: Float?)
 
-    fun onError(ex: Exception)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) {
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasuredValueAttribute(
-    callback: MeasuredValueAttributeCallback,
+  suspend fun subscribeMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) {
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMinMeasuredValueAttribute(
-    callback: MinMeasuredValueAttributeCallback,
+  suspend fun subscribeMinMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MinMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) {
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeMaxMeasuredValueAttribute(
-    callback: MaxMeasuredValueAttributeCallback,
+  suspend fun subscribeMaxMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): MaxMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) {
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueAttribute(
-    callback: PeakMeasuredValueAttributeCallback,
+  suspend fun subscribePeakMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PeakMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribePeakMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) {
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueAttribute(
-    callback: AverageMeasuredValueAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AverageMeasuredValueAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) {
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAverageMeasuredValueWindowAttribute(
-    callback: LongAttributeCallback,
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UInt {
     // Implementation needs to be added here
   }
 
-  fun readUncertaintyAttribute(callback: FloatAttributeCallback) {
+  suspend fun readUncertaintyAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun subscribeUncertaintyAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementUnitAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementUnitAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readMeasurementMediumAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeMeasurementMediumAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readLevelValueAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readLevelValueAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeLevelValueAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1070u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
index f72c32be0af306..573489cd5d60bd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
@@ -17,138 +17,95 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class UnitLocalizationCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 45u
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+class UnitLocalizationCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readTemperatureUnitAttribute(): UByte {
+    // Implementation needs to be added here
   }
 
-  fun readTemperatureUnitAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeTemperatureUnitAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeTemperatureUnitAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeTemperatureUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeTemperatureUnitAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTemperatureUnitAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  companion object {
+    const val CLUSTER_ID: UInt = 45u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
index 16e4708245a97b..30cfa97aab4cec 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
@@ -17,2858 +17,1975 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class UnitTestingCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 4294048773u
-  }
-
-  fun test(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun test(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun testNotHandled(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun testNotHandled(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun testSpecific(callback: TestSpecificResponseCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun testSpecific(callback: TestSpecificResponseCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun testUnknownCommand(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun testUnknownCommand(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun testAddArguments(callback: TestAddArgumentsResponseCallback, arg1: Integer, arg2: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun testAddArguments(
-    callback: TestAddArgumentsResponseCallback,
-    arg1: Integer,
-    arg2: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testSimpleArgumentRequest(callback: TestSimpleArgumentResponseCallback, arg1: Boolean) {
-    // Implementation needs to be added here
-  }
-
-  fun testSimpleArgumentRequest(
-    callback: TestSimpleArgumentResponseCallback,
-    arg1: Boolean,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testStructArrayArgumentRequest(
-    callback: TestStructArrayArgumentResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
-    arg2: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
-    arg3: ArrayList<Integer>,
-    arg4: ArrayList<Boolean>,
-    arg5: Integer,
-    arg6: Boolean
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testStructArrayArgumentRequest(
-    callback: TestStructArrayArgumentResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
-    arg2: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
-    arg3: ArrayList<Integer>,
-    arg4: ArrayList<Boolean>,
-    arg5: Integer,
-    arg6: Boolean,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterSimpleStruct
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterSimpleStruct,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testNestedStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterNestedStruct
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testNestedStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterNestedStruct,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListStructArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListInt8UArgumentRequest(callback: BooleanResponseCallback, arg1: ArrayList<Integer>) {
-    // Implementation needs to be added here
-  }
-
-  fun testListInt8UArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ArrayList<Integer>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testNestedStructListArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterNestedStructList
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testNestedStructListArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterNestedStructList,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListNestedStructListArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListNestedStructListArgumentRequest(
-    callback: BooleanResponseCallback,
-    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListInt8UReverseRequest(
-    callback: TestListInt8UReverseResponseCallback,
-    arg1: ArrayList<Integer>
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testListInt8UReverseRequest(
-    callback: TestListInt8UReverseResponseCallback,
-    arg1: ArrayList<Integer>,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testEnumsRequest(callback: TestEnumsResponseCallback, arg1: Integer, arg2: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun testEnumsRequest(
-    callback: TestEnumsResponseCallback,
-    arg1: Integer,
-    arg2: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testNullableOptionalRequest(callback: TestNullableOptionalResponseCallback, arg1: Integer?) {
-    // Implementation needs to be added here
-  }
-
-  fun testNullableOptionalRequest(
-    callback: TestNullableOptionalResponseCallback,
-    arg1: Integer?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testComplexNullableOptionalRequest(
-    callback: TestComplexNullableOptionalResponseCallback,
-    nullableInt: Integer?,
-    optionalInt: Integer?,
-    nullableOptionalInt: Integer?,
-    nullableString: String?,
-    optionalString: String?,
-    nullableOptionalString: String?,
-    nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    nullableList: ArrayList<Integer>?,
-    optionalList: ArrayList<Integer>?,
-    nullableOptionalList: ArrayList<Integer>?
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testComplexNullableOptionalRequest(
-    callback: TestComplexNullableOptionalResponseCallback,
-    nullableInt: Integer?,
-    optionalInt: Integer?,
-    nullableOptionalInt: Integer?,
-    nullableString: String?,
-    optionalString: String?,
-    nullableOptionalString: String?,
-    nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
-    nullableList: ArrayList<Integer>?,
-    optionalList: ArrayList<Integer>?,
-    nullableOptionalList: ArrayList<Integer>?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun simpleStructEchoRequest(
-    callback: SimpleStructResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterSimpleStruct
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun simpleStructEchoRequest(
-    callback: SimpleStructResponseCallback,
-    arg1: ChipStructs.UnitTestingClusterSimpleStruct,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun timedInvokeRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun testSimpleOptionalArgumentRequest(callback: DefaultClusterCallback, arg1: Boolean?) {
-    // Implementation needs to be added here
-  }
-
-  fun testSimpleOptionalArgumentRequest(
-    callback: DefaultClusterCallback,
-    arg1: Boolean?,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testEmitTestEventRequest(
-    callback: TestEmitTestEventResponseCallback,
-    arg1: Integer,
-    arg2: Integer,
-    arg3: Boolean
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testEmitTestEventRequest(
-    callback: TestEmitTestEventResponseCallback,
-    arg1: Integer,
-    arg2: Integer,
-    arg3: Boolean,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testEmitTestFabricScopedEventRequest(
-    callback: TestEmitTestFabricScopedEventResponseCallback,
-    arg1: Integer
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun testEmitTestFabricScopedEventRequest(
-    callback: TestEmitTestFabricScopedEventResponseCallback,
-    arg1: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface TestSpecificResponseCallback {
-    fun onSuccess(returnValue: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestAddArgumentsResponseCallback {
-    fun onSuccess(returnValue: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestSimpleArgumentResponseCallback {
-    fun onSuccess(returnValue: Boolean)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestStructArrayArgumentResponseCallback {
-    fun onSuccess(
-      arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
-      arg2: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
-      arg3: ArrayList<Integer>,
-      arg4: ArrayList<Boolean>,
-      arg5: Integer,
-      arg6: Boolean
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface BooleanResponseCallback {
-    fun onSuccess(value: Boolean)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestListInt8UReverseResponseCallback {
-    fun onSuccess(arg1: ArrayList<Integer>)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestEnumsResponseCallback {
-    fun onSuccess(arg1: Integer, arg2: Integer)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestNullableOptionalResponseCallback {
-    fun onSuccess(wasPresent: Boolean, wasNull: Boolean?, value: Integer?, originalValue: Integer?)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestComplexNullableOptionalResponseCallback {
-    fun onSuccess(
-      nullableIntWasNull: Boolean,
-      nullableIntValue: Integer?,
-      optionalIntWasPresent: Boolean,
-      optionalIntValue: Integer?,
-      nullableOptionalIntWasPresent: Boolean,
-      nullableOptionalIntWasNull: Boolean?,
-      nullableOptionalIntValue: Integer?,
-      nullableStringWasNull: Boolean,
-      nullableStringValue: String?,
-      optionalStringWasPresent: Boolean,
-      optionalStringValue: String?,
-      nullableOptionalStringWasPresent: Boolean,
-      nullableOptionalStringWasNull: Boolean?,
-      nullableOptionalStringValue: String?,
-      nullableStructWasNull: Boolean,
-      nullableStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
-      optionalStructWasPresent: Boolean,
-      optionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
-      nullableOptionalStructWasPresent: Boolean,
-      nullableOptionalStructWasNull: Boolean?,
-      nullableOptionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
-      nullableListWasNull: Boolean,
-      nullableListValue: ArrayList<Integer>?,
-      optionalListWasPresent: Boolean,
-      optionalListValue: ArrayList<Integer>?,
-      nullableOptionalListWasPresent: Boolean,
-      nullableOptionalListWasNull: Boolean?,
-      nullableOptionalListValue: ArrayList<Integer>?
-    )
-
-    fun onError(error: Exception)
-  }
-
-  interface SimpleStructResponseCallback {
-    fun onSuccess(arg1: ChipStructs.UnitTestingClusterSimpleStruct)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestEmitTestEventResponseCallback {
-    fun onSuccess(value: Long)
-
-    fun onError(error: Exception)
-  }
-
-  interface TestEmitTestFabricScopedEventResponseCallback {
-    fun onSuccess(value: Long)
-
-    fun onError(error: Exception)
-  }
-
-  interface ListInt8uAttributeCallback {
-    fun onSuccess(value: ArrayList<Integer>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ListOctetStringAttributeCallback {
-    fun onSuccess(value: ArrayList<ByteArray>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ListStructOctetStringAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ListNullablesAndOptionalsStructAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface StructAttrAttributeCallback {
-    fun onSuccess(value: ChipStructs.UnitTestingClusterSimpleStruct)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ListLongOctetStringAttributeCallback {
-    fun onSuccess(value: ArrayList<ByteArray>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ListFabricScopedAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableBooleanAttributeCallback {
-    fun onSuccess(value: Boolean?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableBitmap8AttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableBitmap16AttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableBitmap32AttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableBitmap64AttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt8uAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt16uAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt24uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt32uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt40uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt48uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt56uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt64uAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt8sAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt16sAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt24sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt32sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt40sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt48sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt56sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableInt64sAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableEnum8AttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableEnum16AttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableFloatSingleAttributeCallback {
-    fun onSuccess(value: Float?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableFloatDoubleAttributeCallback {
-    fun onSuccess(value: Double?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableOctetStringAttributeCallback {
-    fun onSuccess(value: ByteArray?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableCharStringAttributeCallback {
-    fun onSuccess(value: String?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableEnumAttrAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableStructAttributeCallback {
-    fun onSuccess(value: ChipStructs.UnitTestingClusterSimpleStruct?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableRangeRestrictedInt8uAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableRangeRestrictedInt8sAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableRangeRestrictedInt16uAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface NullableRangeRestrictedInt16sAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readBooleanAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBooleanAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBooleanAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBitmap8Attribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap8Attribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap8Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBitmap8Attribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBitmap16Attribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap16Attribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap16Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBitmap16Attribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBitmap32Attribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap32Attribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap32Attribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBitmap32Attribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readBitmap64Attribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap64Attribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun writeBitmap64Attribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeBitmap64Attribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readInt8uAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt8uAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeInt8uAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readInt16uAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt16uAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt16uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeInt16uAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readInt24uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt24uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt24uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeInt24uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readInt32uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt32uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt32uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeInt32uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readInt40uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+class UnitTestingCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class TestSpecificResponse(val returnValue: UByte)
 
-  fun writeInt40uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
-
-  fun writeInt40uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun subscribeInt40uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class TestAddArgumentsResponse(val returnValue: UByte)
 
-  fun readInt48uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class TestSimpleArgumentResponse(val returnValue: Boolean)
 
-  fun writeInt48uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class TestStructArrayArgumentResponse(
+    val arg1: List<UnitTestingClusterNestedStructList>,
+    val arg2: List<UnitTestingClusterSimpleStruct>,
+    val arg3: List<UInt>,
+    val arg4: List<Boolean>,
+    val arg5: UInt,
+    val arg6: Boolean
+  )
 
-  fun writeInt48uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class BooleanResponse(val value: Boolean)
 
-  fun subscribeInt48uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class TestListInt8UReverseResponse(val arg1: List<UByte>)
 
-  fun readInt56uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class TestEnumsResponse(val arg1: UShort, val arg2: UInt)
 
-  fun writeInt56uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class TestNullableOptionalResponse(
+    val wasPresent: Boolean,
+    val wasNull: Boolean?,
+    val value: UByte?,
+    val originalValue: UByte?
+  )
 
-  fun writeInt56uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class TestComplexNullableOptionalResponse(
+    val nullableIntWasNull: Boolean,
+    val nullableIntValue: UShort?,
+    val optionalIntWasPresent: Boolean,
+    val optionalIntValue: UShort?,
+    val nullableOptionalIntWasPresent: Boolean,
+    val nullableOptionalIntWasNull: Boolean?,
+    val nullableOptionalIntValue: UShort?,
+    val nullableStringWasNull: Boolean,
+    val nullableStringValue: String?,
+    val optionalStringWasPresent: Boolean,
+    val optionalStringValue: String?,
+    val nullableOptionalStringWasPresent: Boolean,
+    val nullableOptionalStringWasNull: Boolean?,
+    val nullableOptionalStringValue: String?,
+    val nullableStructWasNull: Boolean,
+    val nullableStructValue: UnitTestingClusterSimpleStruct?,
+    val optionalStructWasPresent: Boolean,
+    val optionalStructValue: UnitTestingClusterSimpleStruct?,
+    val nullableOptionalStructWasPresent: Boolean,
+    val nullableOptionalStructWasNull: Boolean?,
+    val nullableOptionalStructValue: UnitTestingClusterSimpleStruct?,
+    val nullableListWasNull: Boolean,
+    val nullableListValue: List<UInt>?,
+    val optionalListWasPresent: Boolean,
+    val optionalListValue: List<UInt>?,
+    val nullableOptionalListWasPresent: Boolean,
+    val nullableOptionalListWasNull: Boolean?,
+    val nullableOptionalListValue: List<UInt>?
+  )
 
-  fun subscribeInt56uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class SimpleStructResponse(val arg1: UnitTestingClusterSimpleStruct)
 
-  fun readInt64uAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class TestEmitTestEventResponse(val value: ULong)
 
-  fun writeInt64uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class TestEmitTestFabricScopedEventResponse(val value: ULong)
 
-  fun writeInt64uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class ListInt8uAttribute(val value: List<UByte>)
 
-  fun subscribeInt64uAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class ListOctetStringAttribute(val value: List<ByteArray>)
 
-  fun readInt8sAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class ListStructOctetStringAttribute(val value: List<UnitTestingClusterTestListStructOctet>)
 
-  fun writeInt8sAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
+  class ListNullablesAndOptionalsStructAttribute(
+    val value: List<UnitTestingClusterNullablesAndOptionalsStruct>
+  )
 
-  fun writeInt8sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class StructAttrAttribute(val value: UnitTestingClusterSimpleStruct)
 
-  fun subscribeInt8sAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class ListLongOctetStringAttribute(val value: List<ByteArray>)
 
-  fun readInt16sAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class ListFabricScopedAttribute(val value: List<UnitTestingClusterTestFabricScoped>)
 
-  fun writeInt16sAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
+  class NullableBooleanAttribute(val value: Boolean?)
 
-  fun writeInt16sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableBitmap8Attribute(val value: UInt?)
 
-  fun subscribeInt16sAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableBitmap16Attribute(val value: UInt?)
 
-  fun readInt24sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableBitmap32Attribute(val value: ULong?)
 
-  fun writeInt24sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableBitmap64Attribute(val value: ULong?)
 
-  fun writeInt24sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt8uAttribute(val value: UByte?)
 
-  fun subscribeInt24sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt16uAttribute(val value: UShort?)
 
-  fun readInt32sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableInt24uAttribute(val value: UInt?)
 
-  fun writeInt32sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableInt32uAttribute(val value: UInt?)
 
-  fun writeInt32sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt40uAttribute(val value: ULong?)
 
-  fun subscribeInt32sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt48uAttribute(val value: ULong?)
 
-  fun readInt40sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableInt56uAttribute(val value: ULong?)
 
-  fun writeInt40sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableInt64uAttribute(val value: ULong?)
 
-  fun writeInt40sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt8sAttribute(val value: Byte?)
 
-  fun subscribeInt40sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt16sAttribute(val value: Short?)
 
-  fun readInt48sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableInt24sAttribute(val value: Int?)
 
-  fun writeInt48sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableInt32sAttribute(val value: Int?)
 
-  fun writeInt48sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt40sAttribute(val value: Long?)
 
-  fun subscribeInt48sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableInt48sAttribute(val value: Long?)
 
-  fun readInt56sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableInt56sAttribute(val value: Long?)
 
-  fun writeInt56sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableInt64sAttribute(val value: Long?)
 
-  fun writeInt56sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableEnum8Attribute(val value: UInt?)
 
-  fun subscribeInt56sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableEnum16Attribute(val value: UInt?)
 
-  fun readInt64sAttribute(callback: LongAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableFloatSingleAttribute(val value: Float?)
 
-  fun writeInt64sAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
-  }
+  class NullableFloatDoubleAttribute(val value: Double?)
 
-  fun writeInt64sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableOctetStringAttribute(val value: ByteArray?)
 
-  fun subscribeInt64sAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableCharStringAttribute(val value: String?)
 
-  fun readEnum8Attribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableEnumAttrAttribute(val value: UInt?)
 
-  fun writeEnum8Attribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
+  class NullableStructAttribute(val value: UnitTestingClusterSimpleStruct?)
 
-  fun writeEnum8Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableRangeRestrictedInt8uAttribute(val value: UByte?)
 
-  fun subscribeEnum8Attribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class NullableRangeRestrictedInt8sAttribute(val value: Byte?)
 
-  fun readEnum16Attribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class NullableRangeRestrictedInt16uAttribute(val value: UShort?)
 
-  fun writeEnum16Attribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
-  }
+  class NullableRangeRestrictedInt16sAttribute(val value: Short?)
 
-  fun writeEnum16Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  fun subscribeEnum16Attribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-  fun readFloatSingleAttribute(callback: FloatAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  fun writeFloatSingleAttribute(callback: DefaultClusterCallback, value: Float) {
-    // Implementation needs to be added here
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  fun writeFloatSingleAttribute(
-    callback: DefaultClusterCallback,
-    value: Float,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun test(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-  fun subscribeFloatSingleAttribute(
-    callback: FloatAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readFloatDoubleAttribute(callback: DoubleAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  suspend fun testNotHandled(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-  fun writeFloatDoubleAttribute(callback: DefaultClusterCallback, value: Double) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun writeFloatDoubleAttribute(
-    callback: DefaultClusterCallback,
-    value: Double,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun testSpecific(timedInvokeTimeoutMs: Int? = null): TestSpecificResponse {
+    val commandId = 2L
 
-  fun subscribeFloatDoubleAttribute(
-    callback: DoubleAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readOctetStringAttribute(callback: OctetStringAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  suspend fun testUnknownCommand(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 3L
 
-  fun writeOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun writeOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ByteArray,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun testAddArguments(
+    arg1: UByte,
+    arg2: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestAddArgumentsResponse {
+    val commandId = 4L
 
-  fun subscribeOctetStringAttribute(
-    callback: OctetStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readListInt8uAttribute(callback: ListInt8uAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  suspend fun testSimpleArgumentRequest(
+    arg1: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestSimpleArgumentResponse {
+    val commandId = 5L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testStructArrayArgumentRequest(
+    arg1: List<UnitTestingClusterNestedStructList>,
+    arg2: List<UnitTestingClusterSimpleStruct>,
+    arg3: List<UInt>,
+    arg4: List<Boolean>,
+    arg5: UInt,
+    arg6: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestStructArrayArgumentResponse {
+    val commandId = 6L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testStructArgumentRequest(
+    arg1: UnitTestingClusterSimpleStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 7L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNestedStructArgumentRequest(
+    arg1: UnitTestingClusterNestedStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 8L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListStructArgumentRequest(
+    arg1: List<UnitTestingClusterSimpleStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 9L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListInt8UArgumentRequest(
+    arg1: List<UByte>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 10L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNestedStructListArgumentRequest(
+    arg1: UnitTestingClusterNestedStructList,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 11L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListNestedStructListArgumentRequest(
+    arg1: List<UnitTestingClusterNestedStructList>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    val commandId = 12L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListInt8UReverseRequest(
+    arg1: List<UByte>,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestListInt8UReverseResponse {
+    val commandId = 13L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testEnumsRequest(
+    arg1: UShort,
+    arg2: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEnumsResponse {
+    val commandId = 14L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNullableOptionalRequest(
+    arg1: UByte?,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestNullableOptionalResponse {
+    val commandId = 15L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testComplexNullableOptionalRequest(
+    nullableInt: UShort?,
+    optionalInt: UShort?,
+    nullableOptionalInt: UShort?,
+    nullableString: String?,
+    optionalString: String?,
+    nullableOptionalString: String?,
+    nullableStruct: UnitTestingClusterSimpleStruct?,
+    optionalStruct: UnitTestingClusterSimpleStruct?,
+    nullableOptionalStruct: UnitTestingClusterSimpleStruct?,
+    nullableList: List<UInt>?,
+    optionalList: List<UInt>?,
+    nullableOptionalList: List<UInt>?,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestComplexNullableOptionalResponse {
+    val commandId = 16L
 
-  fun writeListInt8uAttribute(callback: DefaultClusterCallback, value: ArrayList<Integer>) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun writeListInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<Integer>,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun simpleStructEchoRequest(
+    arg1: UnitTestingClusterSimpleStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): SimpleStructResponse {
+    val commandId = 17L
 
-  fun subscribeListInt8uAttribute(
-    callback: ListInt8uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readListOctetStringAttribute(callback: ListOctetStringAttributeCallback) {
-    // Implementation needs to be added here
-  }
+  suspend fun timedInvokeRequest(timedInvokeTimeoutMs: Int) {
+    val commandId = 18L
 
-  fun writeListOctetStringAttribute(callback: DefaultClusterCallback, value: ArrayList<ByteArray>) {
     // Implementation needs to be added here
   }
 
-  fun writeListOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ByteArray>,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
+  suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 19L
 
-  fun subscribeListOctetStringAttribute(
-    callback: ListOctetStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readListStructOctetStringAttribute(callback: ListStructOctetStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun testEmitTestEventRequest(
+    arg1: UByte,
+    arg2: UInt,
+    arg3: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEmitTestEventResponse {
+    val commandId = 20L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun writeListStructOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>
-  ) {
-    // Implementation needs to be added here
+  suspend fun testEmitTestFabricScopedEventRequest(
+    arg1: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEmitTestFabricScopedEventResponse {
+    val commandId = 21L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun writeListStructOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readBooleanAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeListStructOctetStringAttribute(
-    callback: ListStructOctetStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readLongOctetStringAttribute(callback: OctetStringAttributeCallback) {
+  suspend fun subscribeBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeLongOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) {
+  suspend fun readBitmap8Attribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeLongOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ByteArray,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeLongOctetStringAttribute(
-    callback: OctetStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBitmap8Attribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCharStringAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readBitmap16Attribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeCharStringAttribute(callback: DefaultClusterCallback, value: String) {
-    // Implementation needs to be added here
+  suspend fun writeBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeCharStringAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeBitmap16Attribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeCharStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readBitmap32Attribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readLongCharStringAttribute(callback: CharStringAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLongCharStringAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun subscribeBitmap32Attribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeLongCharStringAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readBitmap64Attribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeLongCharStringAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readEpochUsAttribute(callback: LongAttributeCallback) {
+  suspend fun subscribeBitmap64Attribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeEpochUsAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readInt8uAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeEpochUsAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeEpochUsAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInt8uAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readEpochSAttribute(callback: LongAttributeCallback) {
+  suspend fun readInt16uAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeEpochSAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
+  suspend fun writeInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeEpochSAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeInt16uAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeEpochSAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInt24uAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun readVendorIdAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeVendorIdAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeInt24uAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeVendorIdAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readInt32uAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeVendorIdAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readListNullablesAndOptionalsStructAttribute(
-    callback: ListNullablesAndOptionalsStructAttributeCallback
-  ) {
+  suspend fun subscribeInt32uAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeListNullablesAndOptionalsStructAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>
-  ) {
+  suspend fun readInt40uAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeListNullablesAndOptionalsStructAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeListNullablesAndOptionalsStructAttribute(
-    callback: ListNullablesAndOptionalsStructAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInt40uAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readEnumAttrAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInt48uAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeEnumAttrAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeEnumAttrAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeInt48uAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeEnumAttrAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInt56uAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun readStructAttrAttribute(callback: StructAttrAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeStructAttrAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.UnitTestingClusterSimpleStruct
-  ) {
+  suspend fun subscribeInt56uAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeStructAttrAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.UnitTestingClusterSimpleStruct,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readInt64uAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun subscribeStructAttrAttribute(
-    callback: StructAttrAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readRangeRestrictedInt8uAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeInt64uAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt8uAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readInt8sAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRangeRestrictedInt8uAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInt8sAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun readRangeRestrictedInt8sAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInt16sAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt8sAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeInt16sAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeRangeRestrictedInt8sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeInt16sAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeRangeRestrictedInt8sAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInt24sAttribute(): Int {
     // Implementation needs to be added here
   }
 
-  fun readRangeRestrictedInt16uAttribute(callback: IntegerAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeInt24sAttribute(value: Int, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeRangeRestrictedInt16uAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeInt24sAttribute(minInterval: Int, maxInterval: Int): Int {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt16uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readInt32sAttribute(): Int {
     // Implementation needs to be added here
   }
 
-  fun subscribeRangeRestrictedInt16uAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt32sAttribute(value: Int, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readRangeRestrictedInt16sAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeInt32sAttribute(minInterval: Int, maxInterval: Int): Int {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt16sAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readInt40sAttribute(): Long {
     // Implementation needs to be added here
   }
 
-  fun writeRangeRestrictedInt16sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt40sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeRangeRestrictedInt16sAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInt40sAttribute(minInterval: Int, maxInterval: Int): Long {
     // Implementation needs to be added here
   }
 
-  fun readListLongOctetStringAttribute(callback: ListLongOctetStringAttributeCallback) {
+  suspend fun readInt48sAttribute(): Long {
     // Implementation needs to be added here
   }
 
-  fun writeListLongOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ByteArray>
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt48sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeListLongOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ByteArray>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeInt48sAttribute(minInterval: Int, maxInterval: Int): Long {
     // Implementation needs to be added here
   }
 
-  fun subscribeListLongOctetStringAttribute(
-    callback: ListLongOctetStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readInt56sAttribute(): Long {
     // Implementation needs to be added here
   }
 
-  fun readListFabricScopedAttribute(callback: ListFabricScopedAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeInt56sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readListFabricScopedAttributeWithFabricFilter(
-    callback: ListFabricScopedAttributeCallback,
-    isFabricFiltered: Boolean
-  ) {
+  suspend fun subscribeInt56sAttribute(minInterval: Int, maxInterval: Int): Long {
     // Implementation needs to be added here
   }
 
-  fun writeListFabricScopedAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>
-  ) {
+  suspend fun readInt64sAttribute(): Long {
     // Implementation needs to be added here
   }
 
-  fun writeListFabricScopedAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeInt64sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeListFabricScopedAttribute(
-    callback: ListFabricScopedAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInt64sAttribute(minInterval: Int, maxInterval: Int): Long {
     // Implementation needs to be added here
   }
 
-  fun readTimedWriteBooleanAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readEnum8Attribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeTimedWriteBooleanAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeTimedWriteBooleanAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEnum8Attribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneralErrorBooleanAttribute(callback: BooleanAttributeCallback) {
+  suspend fun readEnum16Attribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeGeneralErrorBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) {
-    // Implementation needs to be added here
+  suspend fun writeEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeGeneralErrorBooleanAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeEnum16Attribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneralErrorBooleanAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readFloatSingleAttribute(): Float {
     // Implementation needs to be added here
   }
 
-  fun readClusterErrorBooleanAttribute(callback: BooleanAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeClusterErrorBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun subscribeFloatSingleAttribute(minInterval: Int, maxInterval: Int): Float {
     // Implementation needs to be added here
   }
 
-  fun writeClusterErrorBooleanAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readFloatDoubleAttribute(): Double {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterErrorBooleanAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readUnsupportedAttribute(callback: BooleanAttributeCallback) {
+  suspend fun subscribeFloatDoubleAttribute(minInterval: Int, maxInterval: Int): Double {
     // Implementation needs to be added here
   }
 
-  fun writeUnsupportedAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun readOctetStringAttribute(): OctetString {
     // Implementation needs to be added here
   }
 
-  fun writeUnsupportedAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeUnsupportedAttribute(
-    callback: BooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString {
     // Implementation needs to be added here
   }
 
-  fun readNullableBooleanAttribute(callback: NullableBooleanAttributeCallback) {
+  suspend fun readListInt8uAttribute(): ListInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) {
+  suspend fun writeListInt8uAttribute(value: List<UByte>, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeListInt8uAttribute(minInterval: Int, maxInterval: Int): ListInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBooleanAttribute(
-    callback: DefaultClusterCallback,
-    value: Boolean,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readListOctetStringAttribute(): ListOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableBooleanAttribute(
-    callback: NullableBooleanAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeListOctetStringAttribute(
+    value: List<ByteArray>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNullableBitmap8Attribute(callback: NullableBitmap8AttributeCallback) {
+  suspend fun subscribeListOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap8Attribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readListStructOctetStringAttribute(): ListStructOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap8Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeListStructOctetStringAttribute(
+    value: List<UnitTestingClusterTestListStructOctet>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableBitmap8Attribute(
-    callback: NullableBitmap8AttributeCallback,
+  suspend fun subscribeListStructOctetStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ListStructOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableBitmap16Attribute(callback: NullableBitmap16AttributeCallback) {
+  suspend fun readLongOctetStringAttribute(): OctetString {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap16Attribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeLongOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableBitmap16Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeLongOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableBitmap16Attribute(
-    callback: NullableBitmap16AttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readCharStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun readNullableBitmap32Attribute(callback: NullableBitmap32AttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeCharStringAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableBitmap32Attribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun subscribeCharStringAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap32Attribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readLongCharStringAttribute(): CharString {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableBitmap32Attribute(
-    callback: NullableBitmap32AttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeLongCharStringAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNullableBitmap64Attribute(callback: NullableBitmap64AttributeCallback) {
+  suspend fun subscribeLongCharStringAttribute(minInterval: Int, maxInterval: Int): CharString {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap64Attribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readEpochUsAttribute(): ULong {
     // Implementation needs to be added here
   }
 
-  fun writeNullableBitmap64Attribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeEpochUsAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableBitmap64Attribute(
-    callback: NullableBitmap64AttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEpochUsAttribute(minInterval: Int, maxInterval: Int): ULong {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt8uAttribute(callback: NullableInt8uAttributeCallback) {
+  suspend fun readEpochSAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt8uAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeEpochSAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeEpochSAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt8uAttribute(
-    callback: NullableInt8uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readVendorIdAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt16uAttribute(callback: NullableInt16uAttributeCallback) {
+  suspend fun writeVendorIdAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeVendorIdAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt16uAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readListNullablesAndOptionalsStructAttribute():
+    ListNullablesAndOptionalsStructAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt16uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeListNullablesAndOptionalsStructAttribute(
+    value: List<UnitTestingClusterNullablesAndOptionalsStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableInt16uAttribute(
-    callback: NullableInt16uAttributeCallback,
+  suspend fun subscribeListNullablesAndOptionalsStructAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ListNullablesAndOptionalsStructAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt24uAttribute(callback: NullableInt24uAttributeCallback) {
+  suspend fun readEnumAttrAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt24uAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeEnumAttrAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt24uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readStructAttrAttribute(): StructAttrAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt24uAttribute(
-    callback: NullableInt24uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeStructAttrAttribute(
+    value: UnitTestingClusterSimpleStruct,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNullableInt32uAttribute(callback: NullableInt32uAttributeCallback) {
+  suspend fun subscribeStructAttrAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StructAttrAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt32uAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readRangeRestrictedInt8uAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt32uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeRangeRestrictedInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableInt32uAttribute(
-    callback: NullableInt32uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeRangeRestrictedInt8uAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt40uAttribute(callback: NullableInt40uAttributeCallback) {
+  suspend fun readRangeRestrictedInt8sAttribute(): Byte {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt40uAttribute(callback: DefaultClusterCallback, value: Long) {
-    // Implementation needs to be added here
+  suspend fun writeRangeRestrictedInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableInt40uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeRangeRestrictedInt8sAttribute(minInterval: Int, maxInterval: Int): Byte {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt40uAttribute(
-    callback: NullableInt40uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readRangeRestrictedInt16uAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt48uAttribute(callback: NullableInt48uAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeRangeRestrictedInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableInt48uAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun subscribeRangeRestrictedInt16uAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt48uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readRangeRestrictedInt16sAttribute(): Short {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt48uAttribute(
-    callback: NullableInt48uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeRangeRestrictedInt16sAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNullableInt56uAttribute(callback: NullableInt56uAttributeCallback) {
+  suspend fun subscribeRangeRestrictedInt16sAttribute(minInterval: Int, maxInterval: Int): Short {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt56uAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readListLongOctetStringAttribute(): ListLongOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt56uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
+  suspend fun writeListLongOctetStringAttribute(
+    value: List<ByteArray>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableInt56uAttribute(
-    callback: NullableInt56uAttributeCallback,
+  suspend fun subscribeListLongOctetStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ListLongOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt64uAttribute(callback: NullableInt64uAttributeCallback) {
+  suspend fun readListFabricScopedAttribute(): ListFabricScopedAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt64uAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun readListFabricScopedAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): ListFabricScopedAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt64uAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
+  suspend fun writeListFabricScopedAttribute(
+    value: List<UnitTestingClusterTestFabricScoped>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableInt64uAttribute(
-    callback: NullableInt64uAttributeCallback,
+  suspend fun subscribeListFabricScopedAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ListFabricScopedAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt8sAttribute(callback: NullableInt8sAttributeCallback) {
+  suspend fun readTimedWriteBooleanAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt8sAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun writeTimedWriteBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt8sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeTimedWriteBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt8sAttribute(
-    callback: NullableInt8sAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readGeneralErrorBooleanAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt16sAttribute(callback: NullableInt16sAttributeCallback) {
-    // Implementation needs to be added here
+  suspend fun writeGeneralErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableInt16sAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeGeneralErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt16sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readClusterErrorBooleanAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt16sAttribute(
-    callback: NullableInt16sAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun writeClusterErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeClusterErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt24sAttribute(callback: NullableInt24sAttributeCallback) {
+  suspend fun readUnsupportedAttribute(): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt24sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeUnsupportedAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeUnsupportedAttribute(minInterval: Int, maxInterval: Int): Boolean {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt24sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableBooleanAttribute(): NullableBooleanAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt24sAttribute(
-    callback: NullableInt24sAttributeCallback,
+  suspend fun writeNullableBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableBooleanAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableBooleanAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt32sAttribute(callback: NullableInt32sAttributeCallback) {
+  suspend fun readNullableBitmap8Attribute(): NullableBitmap8Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt32sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeNullableBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableBitmap8Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap8Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt32sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableBitmap16Attribute(): NullableBitmap16Attribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt32sAttribute(
-    callback: NullableInt32sAttributeCallback,
+  suspend fun writeNullableBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableBitmap16Attribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableBitmap16Attribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt40sAttribute(callback: NullableInt40sAttributeCallback) {
+  suspend fun readNullableBitmap32Attribute(): NullableBitmap32Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt40sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeNullableBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableBitmap32Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap32Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt40sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableBitmap64Attribute(): NullableBitmap64Attribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt40sAttribute(
-    callback: NullableInt40sAttributeCallback,
+  suspend fun writeNullableBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableBitmap64Attribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableBitmap64Attribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt48sAttribute(callback: NullableInt48sAttributeCallback) {
+  suspend fun readNullableInt8uAttribute(): NullableInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt48sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeNullableInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt8uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt48sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt16uAttribute(): NullableInt16uAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt48sAttribute(
-    callback: NullableInt48sAttributeCallback,
+  suspend fun writeNullableInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt16uAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt16uAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt56sAttribute(callback: NullableInt56sAttributeCallback) {
+  suspend fun readNullableInt24uAttribute(): NullableInt24uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt56sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeNullableInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt24uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt24uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt56sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt32uAttribute(): NullableInt32uAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt56sAttribute(
-    callback: NullableInt56sAttributeCallback,
+  suspend fun writeNullableInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt32uAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt32uAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableInt64sAttribute(callback: NullableInt64sAttributeCallback) {
+  suspend fun readNullableInt40uAttribute(): NullableInt40uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt64sAttribute(callback: DefaultClusterCallback, value: Long) {
+  suspend fun writeNullableInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt40uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt40uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableInt64sAttribute(
-    callback: DefaultClusterCallback,
-    value: Long,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt48uAttribute(): NullableInt48uAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableInt64sAttribute(
-    callback: NullableInt64sAttributeCallback,
+  suspend fun writeNullableInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt48uAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt48uAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableEnum8Attribute(callback: NullableEnum8AttributeCallback) {
+  suspend fun readNullableInt56uAttribute(): NullableInt56uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnum8Attribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun writeNullableInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt56uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt56uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnum8Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt64uAttribute(): NullableInt64uAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableEnum8Attribute(
-    callback: NullableEnum8AttributeCallback,
+  suspend fun writeNullableInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt64uAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt64uAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableEnum16Attribute(callback: NullableEnum16AttributeCallback) {
+  suspend fun readNullableInt8sAttribute(): NullableInt8sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnum16Attribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun writeNullableInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt8sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt8sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnum16Attribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt16sAttribute(): NullableInt16sAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableEnum16Attribute(
-    callback: NullableEnum16AttributeCallback,
+  suspend fun writeNullableInt16sAttribute(value: Short, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt16sAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt16sAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableFloatSingleAttribute(callback: NullableFloatSingleAttributeCallback) {
+  suspend fun readNullableInt24sAttribute(): NullableInt24sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableFloatSingleAttribute(callback: DefaultClusterCallback, value: Float) {
+  suspend fun writeNullableInt24sAttribute(value: Int, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt24sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt24sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableFloatSingleAttribute(
-    callback: DefaultClusterCallback,
-    value: Float,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt32sAttribute(): NullableInt32sAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableFloatSingleAttribute(
-    callback: NullableFloatSingleAttributeCallback,
+  suspend fun writeNullableInt32sAttribute(value: Int, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt32sAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt32sAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableFloatDoubleAttribute(callback: NullableFloatDoubleAttributeCallback) {
+  suspend fun readNullableInt40sAttribute(): NullableInt40sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableFloatDoubleAttribute(callback: DefaultClusterCallback, value: Double) {
+  suspend fun writeNullableInt40sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt40sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt40sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableFloatDoubleAttribute(
-    callback: DefaultClusterCallback,
-    value: Double,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt48sAttribute(): NullableInt48sAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableFloatDoubleAttribute(
-    callback: NullableFloatDoubleAttributeCallback,
+  suspend fun writeNullableInt48sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt48sAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt48sAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableOctetStringAttribute(callback: NullableOctetStringAttributeCallback) {
+  suspend fun readNullableInt56sAttribute(): NullableInt56sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) {
+  suspend fun writeNullableInt56sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt56sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt56sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableOctetStringAttribute(
-    callback: DefaultClusterCallback,
-    value: ByteArray,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableInt64sAttribute(): NullableInt64sAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableOctetStringAttribute(
-    callback: NullableOctetStringAttributeCallback,
+  suspend fun writeNullableInt64sAttribute(value: Long, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableInt64sAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableInt64sAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableCharStringAttribute(callback: NullableCharStringAttributeCallback) {
+  suspend fun readNullableEnum8Attribute(): NullableEnum8Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableCharStringAttribute(callback: DefaultClusterCallback, value: String) {
+  suspend fun writeNullableEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableEnum8Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableEnum8Attribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableCharStringAttribute(
-    callback: DefaultClusterCallback,
-    value: String,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableEnum16Attribute(): NullableEnum16Attribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableCharStringAttribute(
-    callback: NullableCharStringAttributeCallback,
+  suspend fun writeNullableEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableEnum16Attribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableEnum16Attribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableEnumAttrAttribute(callback: NullableEnumAttrAttributeCallback) {
+  suspend fun readNullableFloatSingleAttribute(): NullableFloatSingleAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnumAttrAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun writeNullableFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableFloatSingleAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableFloatSingleAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableEnumAttrAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableFloatDoubleAttribute(): NullableFloatDoubleAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableEnumAttrAttribute(
-    callback: NullableEnumAttrAttributeCallback,
+  suspend fun writeNullableFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableFloatDoubleAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableFloatDoubleAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableStructAttribute(callback: NullableStructAttributeCallback) {
+  suspend fun readNullableOctetStringAttribute(): NullableOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableStructAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.UnitTestingClusterSimpleStruct
+  suspend fun writeNullableOctetStringAttribute(
+    value: ByteArray,
+    timedWriteTimeoutMs: Int? = null
   ) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableOctetStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableStructAttribute(
-    callback: DefaultClusterCallback,
-    value: ChipStructs.UnitTestingClusterSimpleStruct,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableCharStringAttribute(): NullableCharStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableStructAttribute(
-    callback: NullableStructAttributeCallback,
+  suspend fun writeNullableCharStringAttribute(value: String, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableCharStringAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableCharStringAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableRangeRestrictedInt8uAttribute(
-    callback: NullableRangeRestrictedInt8uAttributeCallback
-  ) {
+  suspend fun readNullableEnumAttrAttribute(): NullableEnumAttrAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt8uAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeNullableEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableRangeRestrictedInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeNullableEnumAttrAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableEnumAttrAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableRangeRestrictedInt8uAttribute(
-    callback: NullableRangeRestrictedInt8uAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun readNullableStructAttribute(): NullableStructAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableRangeRestrictedInt8sAttribute(
-    callback: NullableRangeRestrictedInt8sAttributeCallback
+  suspend fun writeNullableStructAttribute(
+    value: UnitTestingClusterSimpleStruct,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeNullableRangeRestrictedInt8sAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun subscribeNullableStructAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableStructAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt8sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableRangeRestrictedInt8uAttribute(): NullableRangeRestrictedInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableRangeRestrictedInt8sAttribute(
-    callback: NullableRangeRestrictedInt8sAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeNullableRangeRestrictedInt8uAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readNullableRangeRestrictedInt16uAttribute(
-    callback: NullableRangeRestrictedInt16uAttributeCallback
-  ) {
+  suspend fun subscribeNullableRangeRestrictedInt8uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt8uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt16uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
-  ) {
+  suspend fun readNullableRangeRestrictedInt8sAttribute(): NullableRangeRestrictedInt8sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt16uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
+  suspend fun writeNullableRangeRestrictedInt8sAttribute(
+    value: Byte,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeNullableRangeRestrictedInt16uAttribute(
-    callback: NullableRangeRestrictedInt16uAttributeCallback,
+  suspend fun subscribeNullableRangeRestrictedInt8sAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): NullableRangeRestrictedInt8sAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNullableRangeRestrictedInt16sAttribute(
-    callback: NullableRangeRestrictedInt16sAttributeCallback
-  ) {
+  suspend fun readNullableRangeRestrictedInt16uAttribute(): NullableRangeRestrictedInt16uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt16sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer
+  suspend fun writeNullableRangeRestrictedInt16uAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int? = null
   ) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeNullableRangeRestrictedInt16uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt16uAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeNullableRangeRestrictedInt16sAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun readNullableRangeRestrictedInt16sAttribute(): NullableRangeRestrictedInt16sAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeNullableRangeRestrictedInt16sAttribute(
-    callback: NullableRangeRestrictedInt16sAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
+  suspend fun writeNullableRangeRestrictedInt16sAttribute(
+    value: Short,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun readWriteOnlyInt8uAttribute(callback: IntegerAttributeCallback) {
+  suspend fun subscribeNullableRangeRestrictedInt16sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt16sAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeWriteOnlyInt8uAttribute(callback: DefaultClusterCallback, value: Integer) {
+  suspend fun readWriteOnlyInt8uAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeWriteOnlyInt8uAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
+  suspend fun writeWriteOnlyInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun subscribeWriteOnlyInt8uAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeWriteOnlyInt8uAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 4294048773u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
index 25b36155c2cdd1..4b986531f5b412 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
@@ -17,149 +17,97 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class UserLabelCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 65u
-  }
-
-  interface LabelListAttributeCallback {
-    fun onSuccess(value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+class UserLabelCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class LabelListAttribute(val value: List<UserLabelClusterLabelStruct>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readLabelListAttribute(callback: LabelListAttributeCallback) {
+  suspend fun readLabelListAttribute(): LabelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun writeLabelListAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>
+  suspend fun writeLabelListAttribute(
+    value: List<UserLabelClusterLabelStruct>,
+    timedWriteTimeoutMs: Int? = null
   ) {
-    // Implementation needs to be added here
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeLabelListAttribute(
-    callback: DefaultClusterCallback,
-    value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeLabelListAttribute(
-    callback: LabelListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 65u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt
new file mode 100644
index 00000000000000..bdcc7781467968
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt
@@ -0,0 +1,266 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
+
+class ValveConfigurationAndControlCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class OpenDurationAttribute(val value: UInt?)
+
+  class AutoCloseTimeAttribute(val value: ULong?)
+
+  class RemainingDurationAttribute(val value: UInt?)
+
+  class CurrentStateAttribute(val value: UInt?)
+
+  class TargetStateAttribute(val value: UInt?)
+
+  class CurrentLevelAttribute(val value: UByte?)
+
+  class TargetLevelAttribute(val value: UByte?)
+
+  class OpenLevelAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: List<UInt>)
+
+  class AcceptedCommandListAttribute(val value: List<UInt>)
+
+  class EventListAttribute(val value: List<UInt>)
+
+  class AttributeListAttribute(val value: List<UInt>)
+
+  suspend fun open(openDuration: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun close(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setLevel(level: UByte, openDuration: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readOpenDurationAttribute(): OpenDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOpenDurationAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeOpenDurationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OpenDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAutoCloseTimeAttribute(): AutoCloseTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAutoCloseTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AutoCloseTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRemainingDurationAttribute(): RemainingDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRemainingDurationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): RemainingDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentStateAttribute(): CurrentStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentStateAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTargetStateAttribute(): TargetStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetStateAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TargetStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartUpStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpStateAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeStartUpStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentLevelAttribute(): CurrentLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentLevelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTargetLevelAttribute(): TargetLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetLevelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TargetLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOpenLevelAttribute(): OpenLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOpenLevelAttribute(value: UByte, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
+  }
+
+  suspend fun subscribeOpenLevelAttribute(minInterval: Int, maxInterval: Int): OpenLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readValveFaultAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeValveFaultAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 129u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
index 267032c85e34f1..b879ef647988c4 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
@@ -17,126 +17,92 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class WakeOnLanCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 1283u
-  }
+class WakeOnLanCluster(private val controller: MatterController, private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun readMACAddressAttribute(): CharString {
+    // Implementation needs to be added here
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+  suspend fun subscribeMACAddressAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
   }
 
-  fun readMACAddressAttribute(callback: CharStringAttributeCallback) {
+  suspend fun readLinkLocalAddressAttribute(): OctetString {
     // Implementation needs to be added here
   }
 
-  fun subscribeMACAddressAttribute(
-    callback: CharStringAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeLinkLocalAddressAttribute(minInterval: Int, maxInterval: Int): OctetString {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 1283u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
index bdb5a96acc96b7..3bae4cf3db3210 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
@@ -17,378 +17,252 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class WiFiNetworkDiagnosticsCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 54u
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  interface BssidAttributeCallback {
-    fun onSuccess(value: ByteArray?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface SecurityTypeAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface WiFiVersionAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface ChannelNumberAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface RssiAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BeaconLostCountAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface BeaconRxCountAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
+class WiFiNetworkDiagnosticsCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class BssidAttribute(val value: ByteArray?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PacketMulticastRxCountAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface PacketMulticastTxCountAttributeCallback {
-    fun onSuccess(value: Long?)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class SecurityTypeAttribute(val value: UInt?)
 
-  interface PacketUnicastRxCountAttributeCallback {
-    fun onSuccess(value: Long?)
+  class WiFiVersionAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class ChannelNumberAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class RssiAttribute(val value: Byte?)
 
-  interface PacketUnicastTxCountAttributeCallback {
-    fun onSuccess(value: Long?)
+  class BeaconLostCountAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class BeaconRxCountAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PacketMulticastRxCountAttribute(val value: UInt?)
 
-  interface CurrentMaxRateAttributeCallback {
-    fun onSuccess(value: Long?)
+  class PacketMulticastTxCountAttribute(val value: UInt?)
 
-    fun onError(ex: Exception)
+  class PacketUnicastRxCountAttribute(val value: UInt?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class PacketUnicastTxCountAttribute(val value: UInt?)
 
-  interface OverrunCountAttributeCallback {
-    fun onSuccess(value: Long?)
+  class CurrentMaxRateAttribute(val value: ULong?)
 
-    fun onError(ex: Exception)
+  class OverrunCountAttribute(val value: ULong?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class EventListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class AttributeListAttribute(val value: List<UInt>)
 
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  fun readBssidAttribute(callback: BssidAttributeCallback) {
+  suspend fun readBssidAttribute(): BssidAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBssidAttribute(
-    callback: BssidAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeBssidAttribute(minInterval: Int, maxInterval: Int): BssidAttribute {
     // Implementation needs to be added here
   }
 
-  fun readSecurityTypeAttribute(callback: SecurityTypeAttributeCallback) {
+  suspend fun readSecurityTypeAttribute(): SecurityTypeAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeSecurityTypeAttribute(
-    callback: SecurityTypeAttributeCallback,
+  suspend fun subscribeSecurityTypeAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): SecurityTypeAttribute {
     // Implementation needs to be added here
   }
 
-  fun readWiFiVersionAttribute(callback: WiFiVersionAttributeCallback) {
+  suspend fun readWiFiVersionAttribute(): WiFiVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeWiFiVersionAttribute(
-    callback: WiFiVersionAttributeCallback,
+  suspend fun subscribeWiFiVersionAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): WiFiVersionAttribute {
     // Implementation needs to be added here
   }
 
-  fun readChannelNumberAttribute(callback: ChannelNumberAttributeCallback) {
+  suspend fun readChannelNumberAttribute(): ChannelNumberAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeChannelNumberAttribute(
-    callback: ChannelNumberAttributeCallback,
+  suspend fun subscribeChannelNumberAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): ChannelNumberAttribute {
     // Implementation needs to be added here
   }
 
-  fun readRssiAttribute(callback: RssiAttributeCallback) {
+  suspend fun readRssiAttribute(): RssiAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeRssiAttribute(callback: RssiAttributeCallback, minInterval: Int, maxInterval: Int) {
+  suspend fun subscribeRssiAttribute(minInterval: Int, maxInterval: Int): RssiAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBeaconLostCountAttribute(callback: BeaconLostCountAttributeCallback) {
+  suspend fun readBeaconLostCountAttribute(): BeaconLostCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBeaconLostCountAttribute(
-    callback: BeaconLostCountAttributeCallback,
+  suspend fun subscribeBeaconLostCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BeaconLostCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readBeaconRxCountAttribute(callback: BeaconRxCountAttributeCallback) {
+  suspend fun readBeaconRxCountAttribute(): BeaconRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeBeaconRxCountAttribute(
-    callback: BeaconRxCountAttributeCallback,
+  suspend fun subscribeBeaconRxCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): BeaconRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPacketMulticastRxCountAttribute(callback: PacketMulticastRxCountAttributeCallback) {
+  suspend fun readPacketMulticastRxCountAttribute(): PacketMulticastRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketMulticastRxCountAttribute(
-    callback: PacketMulticastRxCountAttributeCallback,
+  suspend fun subscribePacketMulticastRxCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PacketMulticastRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPacketMulticastTxCountAttribute(callback: PacketMulticastTxCountAttributeCallback) {
+  suspend fun readPacketMulticastTxCountAttribute(): PacketMulticastTxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketMulticastTxCountAttribute(
-    callback: PacketMulticastTxCountAttributeCallback,
+  suspend fun subscribePacketMulticastTxCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PacketMulticastTxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPacketUnicastRxCountAttribute(callback: PacketUnicastRxCountAttributeCallback) {
+  suspend fun readPacketUnicastRxCountAttribute(): PacketUnicastRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketUnicastRxCountAttribute(
-    callback: PacketUnicastRxCountAttributeCallback,
+  suspend fun subscribePacketUnicastRxCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PacketUnicastRxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readPacketUnicastTxCountAttribute(callback: PacketUnicastTxCountAttributeCallback) {
+  suspend fun readPacketUnicastTxCountAttribute(): PacketUnicastTxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribePacketUnicastTxCountAttribute(
-    callback: PacketUnicastTxCountAttributeCallback,
+  suspend fun subscribePacketUnicastTxCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): PacketUnicastTxCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentMaxRateAttribute(callback: CurrentMaxRateAttributeCallback) {
+  suspend fun readCurrentMaxRateAttribute(): CurrentMaxRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentMaxRateAttribute(
-    callback: CurrentMaxRateAttributeCallback,
+  suspend fun subscribeCurrentMaxRateAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentMaxRateAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOverrunCountAttribute(callback: OverrunCountAttributeCallback) {
+  suspend fun readOverrunCountAttribute(): OverrunCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeOverrunCountAttribute(
-    callback: OverrunCountAttributeCallback,
+  suspend fun subscribeOverrunCountAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): OverrunCountAttribute {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 54u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
index c57ba09b1f33d7..644a365b3c2440 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
@@ -17,538 +17,395 @@
 
 package matter.devicecontroller.cluster.clusters
 
-import java.util.ArrayList
+import matter.controller.MatterController
+import matter.devicecontroller.cluster.structs.*
 
-class WindowCoveringCluster(private val endpointId: UShort) {
-  companion object {
-    const val CLUSTER_ID: UInt = 258u
-  }
-
-  fun upOrOpen(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun upOrOpen(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun downOrClose(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun downOrClose(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun stopMotion(callback: DefaultClusterCallback) {
-    // Implementation needs to be added here
-  }
-
-  fun stopMotion(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) {
-    // Implementation needs to be added here
-  }
-
-  fun goToLiftValue(callback: DefaultClusterCallback, liftValue: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun goToLiftValue(
-    callback: DefaultClusterCallback,
-    liftValue: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun goToLiftPercentage(callback: DefaultClusterCallback, liftPercent100thsValue: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun goToLiftPercentage(
-    callback: DefaultClusterCallback,
-    liftPercent100thsValue: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun goToTiltValue(callback: DefaultClusterCallback, tiltValue: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun goToTiltValue(
-    callback: DefaultClusterCallback,
-    tiltValue: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun goToTiltPercentage(callback: DefaultClusterCallback, tiltPercent100thsValue: Integer) {
-    // Implementation needs to be added here
-  }
-
-  fun goToTiltPercentage(
-    callback: DefaultClusterCallback,
-    tiltPercent100thsValue: Integer,
-    timedInvokeTimeoutMs: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  interface CurrentPositionLiftAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+class WindowCoveringCluster(
+  private val controller: MatterController,
+  private val endpointId: UShort
+) {
+  class CurrentPositionLiftAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class CurrentPositionTiltAttribute(val value: UShort?)
 
-  interface CurrentPositionTiltAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class CurrentPositionLiftPercentageAttribute(val value: UByte?)
 
-    fun onError(ex: Exception)
+  class CurrentPositionTiltPercentageAttribute(val value: UByte?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class TargetPositionLiftPercent100thsAttribute(val value: UShort?)
 
-  interface CurrentPositionLiftPercentageAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class TargetPositionTiltPercent100thsAttribute(val value: UShort?)
 
-    fun onError(ex: Exception)
+  class CurrentPositionLiftPercent100thsAttribute(val value: UShort?)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class CurrentPositionTiltPercent100thsAttribute(val value: UShort?)
 
-  interface CurrentPositionTiltPercentageAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class GeneratedCommandListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  class AcceptedCommandListAttribute(val value: List<UInt>)
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
+  class EventListAttribute(val value: List<UInt>)
 
-  interface TargetPositionLiftPercent100thsAttributeCallback {
-    fun onSuccess(value: Integer?)
+  class AttributeListAttribute(val value: List<UInt>)
 
-    fun onError(ex: Exception)
+  suspend fun upOrOpen(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 0L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface TargetPositionTiltPercent100thsAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+  suspend fun downOrClose(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 1L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface CurrentPositionLiftPercent100thsAttributeCallback {
-    fun onSuccess(value: Integer?)
+  suspend fun stopMotion(timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 2L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface CurrentPositionTiltPercent100thsAttributeCallback {
-    fun onSuccess(value: Integer?)
-
-    fun onError(ex: Exception)
+  suspend fun goToLiftValue(liftValue: UShort, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 4L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface GeneratedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
-  }
-
-  interface AcceptedCommandListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun goToLiftPercentage(
+    liftPercent100thsValue: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 5L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface EventListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
+  suspend fun goToTiltValue(tiltValue: UShort, timedInvokeTimeoutMs: Int? = null) {
+    val commandId = 7L
 
-    fun onError(ex: Exception)
-
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  interface AttributeListAttributeCallback {
-    fun onSuccess(value: ArrayList<Long>)
-
-    fun onError(ex: Exception)
+  suspend fun goToTiltPercentage(
+    tiltPercent100thsValue: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    val commandId = 8L
 
-    fun onSubscriptionEstablished(subscriptionId: Long)
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
   }
 
-  fun readTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalClosedLimitLiftAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPhysicalClosedLimitLiftAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePhysicalClosedLimitLiftAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhysicalClosedLimitLiftAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readPhysicalClosedLimitTiltAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readPhysicalClosedLimitTiltAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribePhysicalClosedLimitTiltAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribePhysicalClosedLimitTiltAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionLiftAttribute(callback: CurrentPositionLiftAttributeCallback) {
+  suspend fun readCurrentPositionLiftAttribute(): CurrentPositionLiftAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionLiftAttribute(
-    callback: CurrentPositionLiftAttributeCallback,
+  suspend fun subscribeCurrentPositionLiftAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionLiftAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionTiltAttribute(callback: CurrentPositionTiltAttributeCallback) {
+  suspend fun readCurrentPositionTiltAttribute(): CurrentPositionTiltAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionTiltAttribute(
-    callback: CurrentPositionTiltAttributeCallback,
+  suspend fun subscribeCurrentPositionTiltAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionTiltAttribute {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfActuationsLiftAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfActuationsLiftAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfActuationsLiftAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNumberOfActuationsLiftAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readNumberOfActuationsTiltAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readNumberOfActuationsTiltAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeNumberOfActuationsTiltAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeNumberOfActuationsTiltAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readConfigStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readConfigStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeConfigStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeConfigStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionLiftPercentageAttribute(
-    callback: CurrentPositionLiftPercentageAttributeCallback
-  ) {
+  suspend fun readCurrentPositionLiftPercentageAttribute(): CurrentPositionLiftPercentageAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionLiftPercentageAttribute(
-    callback: CurrentPositionLiftPercentageAttributeCallback,
+  suspend fun subscribeCurrentPositionLiftPercentageAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionLiftPercentageAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionTiltPercentageAttribute(
-    callback: CurrentPositionTiltPercentageAttributeCallback
-  ) {
+  suspend fun readCurrentPositionTiltPercentageAttribute(): CurrentPositionTiltPercentageAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionTiltPercentageAttribute(
-    callback: CurrentPositionTiltPercentageAttributeCallback,
+  suspend fun subscribeCurrentPositionTiltPercentageAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionTiltPercentageAttribute {
     // Implementation needs to be added here
   }
 
-  fun readOperationalStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readOperationalStatusAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeOperationalStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeOperationalStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readTargetPositionLiftPercent100thsAttribute(
-    callback: TargetPositionLiftPercent100thsAttributeCallback
-  ) {
+  suspend fun readTargetPositionLiftPercent100thsAttribute():
+    TargetPositionLiftPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTargetPositionLiftPercent100thsAttribute(
-    callback: TargetPositionLiftPercent100thsAttributeCallback,
+  suspend fun subscribeTargetPositionLiftPercent100thsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): TargetPositionLiftPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readTargetPositionTiltPercent100thsAttribute(
-    callback: TargetPositionTiltPercent100thsAttributeCallback
-  ) {
+  suspend fun readTargetPositionTiltPercent100thsAttribute():
+    TargetPositionTiltPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeTargetPositionTiltPercent100thsAttribute(
-    callback: TargetPositionTiltPercent100thsAttributeCallback,
+  suspend fun subscribeTargetPositionTiltPercent100thsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): TargetPositionTiltPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEndProductTypeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readEndProductTypeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeEndProductTypeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEndProductTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionLiftPercent100thsAttribute(
-    callback: CurrentPositionLiftPercent100thsAttributeCallback
-  ) {
+  suspend fun readCurrentPositionLiftPercent100thsAttribute():
+    CurrentPositionLiftPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionLiftPercent100thsAttribute(
-    callback: CurrentPositionLiftPercent100thsAttributeCallback,
+  suspend fun subscribeCurrentPositionLiftPercent100thsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionLiftPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readCurrentPositionTiltPercent100thsAttribute(
-    callback: CurrentPositionTiltPercent100thsAttributeCallback
-  ) {
+  suspend fun readCurrentPositionTiltPercent100thsAttribute():
+    CurrentPositionTiltPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeCurrentPositionTiltPercent100thsAttribute(
-    callback: CurrentPositionTiltPercent100thsAttributeCallback,
+  suspend fun subscribeCurrentPositionTiltPercent100thsAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): CurrentPositionTiltPercent100thsAttribute {
     // Implementation needs to be added here
   }
 
-  fun readInstalledOpenLimitLiftAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstalledOpenLimitLiftAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstalledOpenLimitLiftAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInstalledOpenLimitLiftAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readInstalledClosedLimitLiftAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstalledClosedLimitLiftAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstalledClosedLimitLiftAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeInstalledClosedLimitLiftAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readInstalledOpenLimitTiltAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstalledOpenLimitTiltAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstalledOpenLimitTiltAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeInstalledOpenLimitTiltAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readInstalledClosedLimitTiltAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readInstalledClosedLimitTiltAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeInstalledClosedLimitTiltAttribute(
-    callback: IntegerAttributeCallback,
+  suspend fun subscribeInstalledClosedLimitTiltAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): UShort {
     // Implementation needs to be added here
   }
 
-  fun readModeAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readModeAttribute(): UByte {
     // Implementation needs to be added here
   }
 
-  fun writeModeAttribute(callback: DefaultClusterCallback, value: Integer) {
-    // Implementation needs to be added here
+  suspend fun writeModeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
+    if (timedWriteTimeoutMs != null) {
+      // Do the action with timedWriteTimeoutMs
+    } else {
+      // Do the action without timedWriteTimeoutMs
+    }
   }
 
-  fun writeModeAttribute(
-    callback: DefaultClusterCallback,
-    value: Integer,
-    timedWriteTimeoutMs: Int
-  ) {
+  suspend fun subscribeModeAttribute(minInterval: Int, maxInterval: Int): UByte {
     // Implementation needs to be added here
   }
 
-  fun subscribeModeAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
-    // Implementation needs to be added here
-  }
-
-  fun readSafetyStatusAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readSafetyStatusAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeSafetyStatusAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeSafetyStatusAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
 
-  fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) {
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeGeneratedCommandListAttribute(
-    callback: GeneratedCommandListAttributeCallback,
+  suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) {
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAcceptedCommandListAttribute(
-    callback: AcceptedCommandListAttributeCallback,
+  suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AcceptedCommandListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readEventListAttribute(callback: EventListAttributeCallback) {
+  suspend fun readEventListAttribute(): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeEventListAttribute(
-    callback: EventListAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readAttributeListAttribute(callback: AttributeListAttributeCallback) {
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun subscribeAttributeListAttribute(
-    callback: AttributeListAttributeCallback,
+  suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
     maxInterval: Int
-  ) {
+  ): AttributeListAttribute {
     // Implementation needs to be added here
   }
 
-  fun readFeatureMapAttribute(callback: LongAttributeCallback) {
+  suspend fun readFeatureMapAttribute(): UInt {
     // Implementation needs to be added here
   }
 
-  fun subscribeFeatureMapAttribute(
-    callback: LongAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
     // Implementation needs to be added here
   }
 
-  fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) {
+  suspend fun readClusterRevisionAttribute(): UShort {
     // Implementation needs to be added here
   }
 
-  fun subscribeClusterRevisionAttribute(
-    callback: IntegerAttributeCallback,
-    minInterval: Int,
-    maxInterval: Int
-  ) {
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
     // Implementation needs to be added here
   }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 258u
+  }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
new file mode 100644
index 00000000000000..50ec0a54a8ec73
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AccessControlClusterAccessControlEntryChangedEvent(
+  val adminNodeID: ULong?,
+  val adminPasscodeID: UShort?,
+  val changeType: UInt,
+  val latestValue:
+    matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("AccessControlClusterAccessControlEntryChangedEvent {\n")
+    append("\tadminNodeID : $adminNodeID\n")
+    append("\tadminPasscodeID : $adminPasscodeID\n")
+    append("\tchangeType : $changeType\n")
+    append("\tlatestValue : $latestValue\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (adminNodeID != null) {
+        put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
+      } else {
+        putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+      }
+      if (adminPasscodeID != null) {
+        put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
+      } else {
+        putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+      }
+      put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
+      if (latestValue != null) {
+        latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
+      } else {
+        putNull(ContextSpecificTag(TAG_LATEST_VALUE))
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ADMIN_NODE_I_D = 1
+    private const val TAG_ADMIN_PASSCODE_I_D = 2
+    private const val TAG_CHANGE_TYPE = 3
+    private const val TAG_LATEST_VALUE = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): AccessControlClusterAccessControlEntryChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val adminNodeID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+          null
+        }
+      val adminPasscodeID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+          null
+        }
+      val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
+      val latestValue =
+        if (!tlvReader.isNull()) {
+          matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
+            .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
+          null
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return AccessControlClusterAccessControlEntryChangedEvent(
+        adminNodeID,
+        adminPasscodeID,
+        changeType,
+        latestValue,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
new file mode 100644
index 00000000000000..c6721f29f88959
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AccessControlClusterAccessControlExtensionChangedEvent(
+  val adminNodeID: ULong?,
+  val adminPasscodeID: UShort?,
+  val changeType: UInt,
+  val latestValue:
+    matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("AccessControlClusterAccessControlExtensionChangedEvent {\n")
+    append("\tadminNodeID : $adminNodeID\n")
+    append("\tadminPasscodeID : $adminPasscodeID\n")
+    append("\tchangeType : $changeType\n")
+    append("\tlatestValue : $latestValue\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (adminNodeID != null) {
+        put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
+      } else {
+        putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+      }
+      if (adminPasscodeID != null) {
+        put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
+      } else {
+        putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+      }
+      put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
+      if (latestValue != null) {
+        latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
+      } else {
+        putNull(ContextSpecificTag(TAG_LATEST_VALUE))
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ADMIN_NODE_I_D = 1
+    private const val TAG_ADMIN_PASSCODE_I_D = 2
+    private const val TAG_CHANGE_TYPE = 3
+    private const val TAG_LATEST_VALUE = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): AccessControlClusterAccessControlExtensionChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val adminNodeID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+          null
+        }
+      val adminPasscodeID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+          null
+        }
+      val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
+      val latestValue =
+        if (!tlvReader.isNull()) {
+          matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct
+            .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
+          null
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return AccessControlClusterAccessControlExtensionChangedEvent(
+        adminNodeID,
+        adminPasscodeID,
+        changeType,
+        latestValue,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
new file mode 100644
index 00000000000000..7def1a047e9a3a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ActionsClusterActionFailedEvent(
+  val actionID: UShort,
+  val invokeID: UInt,
+  val newState: UInt,
+  val error: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ActionsClusterActionFailedEvent {\n")
+    append("\tactionID : $actionID\n")
+    append("\tinvokeID : $invokeID\n")
+    append("\tnewState : $newState\n")
+    append("\terror : $error\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTION_I_D), actionID)
+      put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID)
+      put(ContextSpecificTag(TAG_NEW_STATE), newState)
+      put(ContextSpecificTag(TAG_ERROR), error)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTION_I_D = 0
+    private const val TAG_INVOKE_I_D = 1
+    private const val TAG_NEW_STATE = 2
+    private const val TAG_ERROR = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D))
+      val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_I_D))
+      val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
+      val error = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR))
+
+      tlvReader.exitContainer()
+
+      return ActionsClusterActionFailedEvent(actionID, invokeID, newState, error)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
new file mode 100644
index 00000000000000..81ed599b956c26
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ActionsClusterStateChangedEvent(
+  val actionID: UShort,
+  val invokeID: UInt,
+  val newState: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ActionsClusterStateChangedEvent {\n")
+    append("\tactionID : $actionID\n")
+    append("\tinvokeID : $invokeID\n")
+    append("\tnewState : $newState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTION_I_D), actionID)
+      put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID)
+      put(ContextSpecificTag(TAG_NEW_STATE), newState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTION_I_D = 0
+    private const val TAG_INVOKE_I_D = 1
+    private const val TAG_NEW_STATE = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D))
+      val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_I_D))
+      val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
+
+      tlvReader.exitContainer()
+
+      return ActionsClusterStateChangedEvent(actionID, invokeID, newState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
new file mode 100644
index 00000000000000..527ca9e747d32d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BasicInformationClusterLeaveEvent(val fabricIndex: UByte) {
+  override fun toString(): String = buildString {
+    append("BasicInformationClusterLeaveEvent {\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FABRIC_INDEX = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterLeaveEvent {
+      tlvReader.enterStructure(tlvTag)
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return BasicInformationClusterLeaveEvent(fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
new file mode 100644
index 00000000000000..117e3e4472bedf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BasicInformationClusterReachableChangedEvent(val reachableNewValue: Boolean) {
+  override fun toString(): String = buildString {
+    append("BasicInformationClusterReachableChangedEvent {\n")
+    append("\treachableNewValue : $reachableNewValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE), reachableNewValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_REACHABLE_NEW_VALUE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterReachableChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val reachableNewValue = tlvReader.getBoolean(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE))
+
+      tlvReader.exitContainer()
+
+      return BasicInformationClusterReachableChangedEvent(reachableNewValue)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
new file mode 100644
index 00000000000000..cbcb04d823ae49
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BasicInformationClusterStartUpEvent(val softwareVersion: UInt) {
+  override fun toString(): String = buildString {
+    append("BasicInformationClusterStartUpEvent {\n")
+    append("\tsoftwareVersion : $softwareVersion\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SOFTWARE_VERSION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterStartUpEvent {
+      tlvReader.enterStructure(tlvTag)
+      val softwareVersion = tlvReader.getUInt(ContextSpecificTag(TAG_SOFTWARE_VERSION))
+
+      tlvReader.exitContainer()
+
+      return BasicInformationClusterStartUpEvent(softwareVersion)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
new file mode 100644
index 00000000000000..bf64761f255688
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+  val alarmsActive: UInt,
+  val alarmsSuppressed: Optional<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("BooleanSensorConfigurationClusterAlarmsStateChangedEvent {\n")
+    append("\talarmsActive : $alarmsActive\n")
+    append("\talarmsSuppressed : $alarmsSuppressed\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARMS_ACTIVE), alarmsActive)
+      if (alarmsSuppressed.isPresent) {
+        val optalarmsSuppressed = alarmsSuppressed.get()
+        put(ContextSpecificTag(TAG_ALARMS_SUPPRESSED), optalarmsSuppressed)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARMS_ACTIVE = 0
+    private const val TAG_ALARMS_SUPPRESSED = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BooleanSensorConfigurationClusterAlarmsStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmsActive = tlvReader.getUInt(ContextSpecificTag(TAG_ALARMS_ACTIVE))
+      val alarmsSuppressed =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ALARMS_SUPPRESSED))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ALARMS_SUPPRESSED)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return BooleanSensorConfigurationClusterAlarmsStateChangedEvent(
+        alarmsActive,
+        alarmsSuppressed
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
new file mode 100644
index 00000000000000..b3ac5fad687aac
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BooleanStateClusterStateChangeEvent(val stateValue: Boolean) {
+  override fun toString(): String = buildString {
+    append("BooleanStateClusterStateChangeEvent {\n")
+    append("\tstateValue : $stateValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_STATE_VALUE), stateValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_STATE_VALUE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BooleanStateClusterStateChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val stateValue = tlvReader.getBoolean(ContextSpecificTag(TAG_STATE_VALUE))
+
+      tlvReader.exitContainer()
+
+      return BooleanStateClusterStateChangeEvent(stateValue)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
new file mode 100644
index 00000000000000..f153ed3f64cc07
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BridgedDeviceBasicInformationClusterReachableChangedEvent(val reachableNewValue: Boolean) {
+  override fun toString(): String = buildString {
+    append("BridgedDeviceBasicInformationClusterReachableChangedEvent {\n")
+    append("\treachableNewValue : $reachableNewValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE), reachableNewValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_REACHABLE_NEW_VALUE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BridgedDeviceBasicInformationClusterReachableChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val reachableNewValue = tlvReader.getBoolean(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE))
+
+      tlvReader.exitContainer()
+
+      return BridgedDeviceBasicInformationClusterReachableChangedEvent(reachableNewValue)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
new file mode 100644
index 00000000000000..2df7a457951adf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BridgedDeviceBasicInformationClusterStartUpEvent(val softwareVersion: UInt) {
+  override fun toString(): String = buildString {
+    append("BridgedDeviceBasicInformationClusterStartUpEvent {\n")
+    append("\tsoftwareVersion : $softwareVersion\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SOFTWARE_VERSION = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BridgedDeviceBasicInformationClusterStartUpEvent {
+      tlvReader.enterStructure(tlvTag)
+      val softwareVersion = tlvReader.getUInt(ContextSpecificTag(TAG_SOFTWARE_VERSION))
+
+      tlvReader.exitContainer()
+
+      return BridgedDeviceBasicInformationClusterStartUpEvent(softwareVersion)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
new file mode 100644
index 00000000000000..92b680ff01eb05
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
@@ -0,0 +1,244 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+  val eventID: ByteArray,
+  val transitionIndex: UByte?,
+  val status: UInt,
+  val criticality: UInt,
+  val control: UInt,
+  val temperatureControl:
+    Optional<
+      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterTemperatureControlStruct
+    >?,
+  val averageLoadControl:
+    Optional<
+      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterAverageLoadControlStruct
+    >?,
+  val dutyCycleControl:
+    Optional<
+      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterDutyCycleControlStruct
+    >?,
+  val powerSavingsControl:
+    Optional<
+      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterPowerSavingsControlStruct
+    >?,
+  val heatingSourceControl:
+    Optional<
+      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterHeatingSourceControlStruct
+    >?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {\n")
+    append("\teventID : $eventID\n")
+    append("\ttransitionIndex : $transitionIndex\n")
+    append("\tstatus : $status\n")
+    append("\tcriticality : $criticality\n")
+    append("\tcontrol : $control\n")
+    append("\ttemperatureControl : $temperatureControl\n")
+    append("\taverageLoadControl : $averageLoadControl\n")
+    append("\tdutyCycleControl : $dutyCycleControl\n")
+    append("\tpowerSavingsControl : $powerSavingsControl\n")
+    append("\theatingSourceControl : $heatingSourceControl\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      if (transitionIndex != null) {
+        put(ContextSpecificTag(TAG_TRANSITION_INDEX), transitionIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_TRANSITION_INDEX))
+      }
+      put(ContextSpecificTag(TAG_STATUS), status)
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      if (temperatureControl != null) {
+        if (temperatureControl.isPresent) {
+          val opttemperatureControl = temperatureControl.get()
+          opttemperatureControl.toTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))
+      }
+      if (averageLoadControl != null) {
+        if (averageLoadControl.isPresent) {
+          val optaverageLoadControl = averageLoadControl.get()
+          optaverageLoadControl.toTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))
+      }
+      if (dutyCycleControl != null) {
+        if (dutyCycleControl.isPresent) {
+          val optdutyCycleControl = dutyCycleControl.get()
+          optdutyCycleControl.toTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))
+      }
+      if (powerSavingsControl != null) {
+        if (powerSavingsControl.isPresent) {
+          val optpowerSavingsControl = powerSavingsControl.get()
+          optpowerSavingsControl.toTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))
+      }
+      if (heatingSourceControl != null) {
+        if (heatingSourceControl.isPresent) {
+          val optheatingSourceControl = heatingSourceControl.get()
+          optheatingSourceControl.toTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_TRANSITION_INDEX = 1
+    private const val TAG_STATUS = 2
+    private const val TAG_CRITICALITY = 3
+    private const val TAG_CONTROL = 4
+    private const val TAG_TEMPERATURE_CONTROL = 5
+    private const val TAG_AVERAGE_LOAD_CONTROL = 6
+    private const val TAG_DUTY_CYCLE_CONTROL = 7
+    private const val TAG_POWER_SAVINGS_CONTROL = 8
+    private const val TAG_HEATING_SOURCE_CONTROL = 9
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val transitionIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_TRANSITION_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TRANSITION_INDEX))
+          null
+        }
+      val status = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS))
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val temperatureControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))) {
+            Optional.of(
+              matter.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterTemperatureControlStruct
+                .fromTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))
+          null
+        }
+      val averageLoadControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))) {
+            Optional.of(
+              matter.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterAverageLoadControlStruct
+                .fromTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))
+          null
+        }
+      val dutyCycleControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))) {
+            Optional.of(
+              matter.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterDutyCycleControlStruct
+                .fromTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))
+          null
+        }
+      val powerSavingsControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))) {
+            Optional.of(
+              matter.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterPowerSavingsControlStruct
+                .fromTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))
+          null
+        }
+      val heatingSourceControl =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))) {
+            Optional.of(
+              matter.devicecontroller.cluster.structs
+                .DemandResponseLoadControlClusterHeatingSourceControlStruct
+                .fromTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), tlvReader)
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent(
+        eventID,
+        transitionIndex,
+        status,
+        criticality,
+        control,
+        temperatureControl,
+        averageLoadControl,
+        dutyCycleControl,
+        powerSavingsControl,
+        heatingSourceControl
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
new file mode 100644
index 00000000000000..3b0bd74a1fd5c7
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DishwasherAlarmClusterNotifyEvent(
+  val active: ULong,
+  val inactive: ULong,
+  val state: ULong,
+  val mask: ULong
+) {
+  override fun toString(): String = buildString {
+    append("DishwasherAlarmClusterNotifyEvent {\n")
+    append("\tactive : $active\n")
+    append("\tinactive : $inactive\n")
+    append("\tstate : $state\n")
+    append("\tmask : $mask\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTIVE), active)
+      put(ContextSpecificTag(TAG_INACTIVE), inactive)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_MASK), mask)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTIVE = 0
+    private const val TAG_INACTIVE = 1
+    private const val TAG_STATE = 2
+    private const val TAG_MASK = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DishwasherAlarmClusterNotifyEvent {
+      tlvReader.enterStructure(tlvTag)
+      val active = tlvReader.getULong(ContextSpecificTag(TAG_ACTIVE))
+      val inactive = tlvReader.getULong(ContextSpecificTag(TAG_INACTIVE))
+      val state = tlvReader.getULong(ContextSpecificTag(TAG_STATE))
+      val mask = tlvReader.getULong(ContextSpecificTag(TAG_MASK))
+
+      tlvReader.exitContainer()
+
+      return DishwasherAlarmClusterNotifyEvent(active, inactive, state, mask)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
new file mode 100644
index 00000000000000..5acde4acb5f40d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterDoorLockAlarmEvent(val alarmCode: UInt) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterDoorLockAlarmEvent {\n")
+    append("\talarmCode : $alarmCode\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_CODE), alarmCode)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_CODE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterDoorLockAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmCode = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_CODE))
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterDoorLockAlarmEvent(alarmCode)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
new file mode 100644
index 00000000000000..cc693ce9d5d390
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterDoorStateChangeEvent(val doorState: UInt) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterDoorStateChangeEvent {\n")
+    append("\tdoorState : $doorState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DOOR_STATE), doorState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DOOR_STATE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterDoorStateChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val doorState = tlvReader.getUInt(ContextSpecificTag(TAG_DOOR_STATE))
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterDoorStateChangeEvent(doorState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
new file mode 100644
index 00000000000000..84b682fc2d55bb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
@@ -0,0 +1,159 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterLockOperationErrorEvent(
+  val lockOperationType: UInt,
+  val operationSource: UInt,
+  val operationError: UInt,
+  val userIndex: UShort?,
+  val fabricIndex: UByte?,
+  val sourceNode: ULong?,
+  val credentials:
+    Optional<List<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct>>?
+) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterLockOperationErrorEvent {\n")
+    append("\tlockOperationType : $lockOperationType\n")
+    append("\toperationSource : $operationSource\n")
+    append("\toperationError : $operationError\n")
+    append("\tuserIndex : $userIndex\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("\tsourceNode : $sourceNode\n")
+    append("\tcredentials : $credentials\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LOCK_OPERATION_TYPE), lockOperationType)
+      put(ContextSpecificTag(TAG_OPERATION_SOURCE), operationSource)
+      put(ContextSpecificTag(TAG_OPERATION_ERROR), operationError)
+      if (userIndex != null) {
+        put(ContextSpecificTag(TAG_USER_INDEX), userIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_USER_INDEX))
+      }
+      if (fabricIndex != null) {
+        put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+      }
+      if (sourceNode != null) {
+        put(ContextSpecificTag(TAG_SOURCE_NODE), sourceNode)
+      } else {
+        putNull(ContextSpecificTag(TAG_SOURCE_NODE))
+      }
+      if (credentials != null) {
+        if (credentials.isPresent) {
+          val optcredentials = credentials.get()
+          startArray(ContextSpecificTag(TAG_CREDENTIALS))
+          for (item in optcredentials.iterator()) {
+            item.toTlv(AnonymousTag, this)
+          }
+          endArray()
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_CREDENTIALS))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LOCK_OPERATION_TYPE = 0
+    private const val TAG_OPERATION_SOURCE = 1
+    private const val TAG_OPERATION_ERROR = 2
+    private const val TAG_USER_INDEX = 3
+    private const val TAG_FABRIC_INDEX = 4
+    private const val TAG_SOURCE_NODE = 5
+    private const val TAG_CREDENTIALS = 6
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterLockOperationErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val lockOperationType = tlvReader.getUInt(ContextSpecificTag(TAG_LOCK_OPERATION_TYPE))
+      val operationSource = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATION_SOURCE))
+      val operationError = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATION_ERROR))
+      val userIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_USER_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_USER_INDEX))
+          null
+        }
+      val fabricIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+          null
+        }
+      val sourceNode =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_SOURCE_NODE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_SOURCE_NODE))
+          null
+        }
+      val credentials =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_CREDENTIALS))) {
+            Optional.of(
+              buildList<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct> {
+                tlvReader.enterArray(ContextSpecificTag(TAG_CREDENTIALS))
+                while (!tlvReader.isEndOfContainer()) {
+                  this.add(
+                    matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
+                      AnonymousTag,
+                      tlvReader
+                    )
+                  )
+                }
+                tlvReader.exitContainer()
+              }
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_CREDENTIALS))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterLockOperationErrorEvent(
+        lockOperationType,
+        operationSource,
+        operationError,
+        userIndex,
+        fabricIndex,
+        sourceNode,
+        credentials
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
new file mode 100644
index 00000000000000..4708017ff6fcae
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
@@ -0,0 +1,153 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterLockOperationEvent(
+  val lockOperationType: UInt,
+  val operationSource: UInt,
+  val userIndex: UShort?,
+  val fabricIndex: UByte?,
+  val sourceNode: ULong?,
+  val credentials:
+    Optional<List<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct>>?
+) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterLockOperationEvent {\n")
+    append("\tlockOperationType : $lockOperationType\n")
+    append("\toperationSource : $operationSource\n")
+    append("\tuserIndex : $userIndex\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("\tsourceNode : $sourceNode\n")
+    append("\tcredentials : $credentials\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LOCK_OPERATION_TYPE), lockOperationType)
+      put(ContextSpecificTag(TAG_OPERATION_SOURCE), operationSource)
+      if (userIndex != null) {
+        put(ContextSpecificTag(TAG_USER_INDEX), userIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_USER_INDEX))
+      }
+      if (fabricIndex != null) {
+        put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+      }
+      if (sourceNode != null) {
+        put(ContextSpecificTag(TAG_SOURCE_NODE), sourceNode)
+      } else {
+        putNull(ContextSpecificTag(TAG_SOURCE_NODE))
+      }
+      if (credentials != null) {
+        if (credentials.isPresent) {
+          val optcredentials = credentials.get()
+          startArray(ContextSpecificTag(TAG_CREDENTIALS))
+          for (item in optcredentials.iterator()) {
+            item.toTlv(AnonymousTag, this)
+          }
+          endArray()
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_CREDENTIALS))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LOCK_OPERATION_TYPE = 0
+    private const val TAG_OPERATION_SOURCE = 1
+    private const val TAG_USER_INDEX = 2
+    private const val TAG_FABRIC_INDEX = 3
+    private const val TAG_SOURCE_NODE = 4
+    private const val TAG_CREDENTIALS = 5
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterLockOperationEvent {
+      tlvReader.enterStructure(tlvTag)
+      val lockOperationType = tlvReader.getUInt(ContextSpecificTag(TAG_LOCK_OPERATION_TYPE))
+      val operationSource = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATION_SOURCE))
+      val userIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_USER_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_USER_INDEX))
+          null
+        }
+      val fabricIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+          null
+        }
+      val sourceNode =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_SOURCE_NODE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_SOURCE_NODE))
+          null
+        }
+      val credentials =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_CREDENTIALS))) {
+            Optional.of(
+              buildList<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct> {
+                tlvReader.enterArray(ContextSpecificTag(TAG_CREDENTIALS))
+                while (!tlvReader.isEndOfContainer()) {
+                  this.add(
+                    matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
+                      AnonymousTag,
+                      tlvReader
+                    )
+                  )
+                }
+                tlvReader.exitContainer()
+              }
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_CREDENTIALS))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterLockOperationEvent(
+        lockOperationType,
+        operationSource,
+        userIndex,
+        fabricIndex,
+        sourceNode,
+        credentials
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
new file mode 100644
index 00000000000000..81814e6393b670
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
@@ -0,0 +1,132 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterLockUserChangeEvent(
+  val lockDataType: UInt,
+  val dataOperationType: UInt,
+  val operationSource: UInt,
+  val userIndex: UShort?,
+  val fabricIndex: UByte?,
+  val sourceNode: ULong?,
+  val dataIndex: UShort?
+) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterLockUserChangeEvent {\n")
+    append("\tlockDataType : $lockDataType\n")
+    append("\tdataOperationType : $dataOperationType\n")
+    append("\toperationSource : $operationSource\n")
+    append("\tuserIndex : $userIndex\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("\tsourceNode : $sourceNode\n")
+    append("\tdataIndex : $dataIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LOCK_DATA_TYPE), lockDataType)
+      put(ContextSpecificTag(TAG_DATA_OPERATION_TYPE), dataOperationType)
+      put(ContextSpecificTag(TAG_OPERATION_SOURCE), operationSource)
+      if (userIndex != null) {
+        put(ContextSpecificTag(TAG_USER_INDEX), userIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_USER_INDEX))
+      }
+      if (fabricIndex != null) {
+        put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+      }
+      if (sourceNode != null) {
+        put(ContextSpecificTag(TAG_SOURCE_NODE), sourceNode)
+      } else {
+        putNull(ContextSpecificTag(TAG_SOURCE_NODE))
+      }
+      if (dataIndex != null) {
+        put(ContextSpecificTag(TAG_DATA_INDEX), dataIndex)
+      } else {
+        putNull(ContextSpecificTag(TAG_DATA_INDEX))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LOCK_DATA_TYPE = 0
+    private const val TAG_DATA_OPERATION_TYPE = 1
+    private const val TAG_OPERATION_SOURCE = 2
+    private const val TAG_USER_INDEX = 3
+    private const val TAG_FABRIC_INDEX = 4
+    private const val TAG_SOURCE_NODE = 5
+    private const val TAG_DATA_INDEX = 6
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterLockUserChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val lockDataType = tlvReader.getUInt(ContextSpecificTag(TAG_LOCK_DATA_TYPE))
+      val dataOperationType = tlvReader.getUInt(ContextSpecificTag(TAG_DATA_OPERATION_TYPE))
+      val operationSource = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATION_SOURCE))
+      val userIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_USER_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_USER_INDEX))
+          null
+        }
+      val fabricIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_FABRIC_INDEX))
+          null
+        }
+      val sourceNode =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_SOURCE_NODE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_SOURCE_NODE))
+          null
+        }
+      val dataIndex =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_DATA_INDEX))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_DATA_INDEX))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterLockUserChangeEvent(
+        lockDataType,
+        dataOperationType,
+        operationSource,
+        userIndex,
+        fabricIndex,
+        sourceNode,
+        dataIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
new file mode 100644
index 00000000000000..d3357439368b80
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEVConnectedEvent(val sessionID: UInt) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEVConnectedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVConnectedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEVConnectedEvent(sessionID)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
new file mode 100644
index 00000000000000..8f38fc18fdbacf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEVNotDetectedEvent(
+  val sessionID: UInt,
+  val state: UInt,
+  val sessionDuration: UInt,
+  val sessionEnergyCharged: Long,
+  val sessionEnergyDischarged: Optional<Long>
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEVNotDetectedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tsessionDuration : $sessionDuration\n")
+    append("\tsessionEnergyCharged : $sessionEnergyCharged\n")
+    append("\tsessionEnergyDischarged : $sessionEnergyDischarged\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_SESSION_DURATION), sessionDuration)
+      put(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED), sessionEnergyCharged)
+      if (sessionEnergyDischarged.isPresent) {
+        val optsessionEnergyDischarged = sessionEnergyDischarged.get()
+        put(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED), optsessionEnergyDischarged)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_SESSION_DURATION = 2
+    private const val TAG_SESSION_ENERGY_CHARGED = 3
+    private const val TAG_SESSION_ENERGY_DISCHARGED = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVNotDetectedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val sessionDuration = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_DURATION))
+      val sessionEnergyCharged = tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED))
+      val sessionEnergyDischarged =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED))) {
+          Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_DISCHARGED)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEVNotDetectedEvent(
+        sessionID,
+        state,
+        sessionDuration,
+        sessionEnergyCharged,
+        sessionEnergyDischarged
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
new file mode 100644
index 00000000000000..14630d9043c38d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEnergyTransferStartedEvent(
+  val sessionID: UInt,
+  val state: UInt,
+  val maximumCurrent: Long
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEnergyTransferStartedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tmaximumCurrent : $maximumCurrent\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_MAXIMUM_CURRENT = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEnergyTransferStartedEvent(sessionID, state, maximumCurrent)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
new file mode 100644
index 00000000000000..8ce39cc2ccef2c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterEnergyTransferStoppedEvent(
+  val sessionID: UInt,
+  val state: UInt,
+  val reason: UInt,
+  val energyTransferred: Long
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterEnergyTransferStoppedEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\treason : $reason\n")
+    append("\tenergyTransferred : $energyTransferred\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_REASON), reason)
+      put(ContextSpecificTag(TAG_ENERGY_TRANSFERRED), energyTransferred)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_REASON = 2
+    private const val TAG_ENERGY_TRANSFERRED = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStoppedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val reason = tlvReader.getUInt(ContextSpecificTag(TAG_REASON))
+      val energyTransferred = tlvReader.getLong(ContextSpecificTag(TAG_ENERGY_TRANSFERRED))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterEnergyTransferStoppedEvent(
+        sessionID,
+        state,
+        reason,
+        energyTransferred
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
new file mode 100644
index 00000000000000..71cdcae9dc193f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterFaultEvent(
+  val sessionID: UInt,
+  val state: UInt,
+  val faultStatePreviousState: UInt,
+  val faultStateCurrentState: UInt
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterFaultEvent {\n")
+    append("\tsessionID : $sessionID\n")
+    append("\tstate : $state\n")
+    append("\tfaultStatePreviousState : $faultStatePreviousState\n")
+    append("\tfaultStateCurrentState : $faultStateCurrentState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE), faultStatePreviousState)
+      put(ContextSpecificTag(TAG_FAULT_STATE_CURRENT_STATE), faultStateCurrentState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SESSION_I_D = 0
+    private const val TAG_STATE = 1
+    private const val TAG_FAULT_STATE_PREVIOUS_STATE = 2
+    private const val TAG_FAULT_STATE_CURRENT_STATE = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterFaultEvent {
+      tlvReader.enterStructure(tlvTag)
+      val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+      val faultStatePreviousState =
+        tlvReader.getUInt(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE))
+      val faultStateCurrentState =
+        tlvReader.getUInt(ContextSpecificTag(TAG_FAULT_STATE_CURRENT_STATE))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterFaultEvent(
+        sessionID,
+        state,
+        faultStatePreviousState,
+        faultStateCurrentState
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
new file mode 100644
index 00000000000000..65558cac9a6b7a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterRFIDEvent(val uid: ByteArray) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterRFIDEvent {\n")
+    append("\tuid : $uid\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_UID), uid)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_UID = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterRFIDEvent {
+      tlvReader.enterStructure(tlvTag)
+      val uid = tlvReader.getByteArray(ContextSpecificTag(TAG_UID))
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterRFIDEvent(uid)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
new file mode 100644
index 00000000000000..39205bf4badbef
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralDiagnosticsClusterBootReasonEvent(val bootReason: UInt) {
+  override fun toString(): String = buildString {
+    append("GeneralDiagnosticsClusterBootReasonEvent {\n")
+    append("\tbootReason : $bootReason\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_BOOT_REASON), bootReason)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_BOOT_REASON = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GeneralDiagnosticsClusterBootReasonEvent {
+      tlvReader.enterStructure(tlvTag)
+      val bootReason = tlvReader.getUInt(ContextSpecificTag(TAG_BOOT_REASON))
+
+      tlvReader.exitContainer()
+
+      return GeneralDiagnosticsClusterBootReasonEvent(bootReason)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
new file mode 100644
index 00000000000000..b24c90d6904e36
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralDiagnosticsClusterHardwareFaultChangeEvent(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("GeneralDiagnosticsClusterHardwareFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): GeneralDiagnosticsClusterHardwareFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return GeneralDiagnosticsClusterHardwareFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
new file mode 100644
index 00000000000000..f4423fa23b3783
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralDiagnosticsClusterNetworkFaultChangeEvent(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("GeneralDiagnosticsClusterNetworkFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): GeneralDiagnosticsClusterNetworkFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return GeneralDiagnosticsClusterNetworkFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
new file mode 100644
index 00000000000000..f42f34f9689d63
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
@@ -0,0 +1,82 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralDiagnosticsClusterRadioFaultChangeEvent(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("GeneralDiagnosticsClusterRadioFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GeneralDiagnosticsClusterRadioFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return GeneralDiagnosticsClusterRadioFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
new file mode 100644
index 00000000000000..f2f65bc0d0e509
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalStateClusterOperationCompletionEvent(
+  val completionErrorCode: UInt,
+  val totalOperationalTime: Optional<UInt>?,
+  val pausedTime: Optional<UInt>?
+) {
+  override fun toString(): String = buildString {
+    append("OperationalStateClusterOperationCompletionEvent {\n")
+    append("\tcompletionErrorCode : $completionErrorCode\n")
+    append("\ttotalOperationalTime : $totalOperationalTime\n")
+    append("\tpausedTime : $pausedTime\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE), completionErrorCode)
+      if (totalOperationalTime != null) {
+        if (totalOperationalTime.isPresent) {
+          val opttotalOperationalTime = totalOperationalTime.get()
+          put(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME), opttotalOperationalTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+      }
+      if (pausedTime != null) {
+        if (pausedTime.isPresent) {
+          val optpausedTime = pausedTime.get()
+          put(ContextSpecificTag(TAG_PAUSED_TIME), optpausedTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_PAUSED_TIME))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COMPLETION_ERROR_CODE = 0
+    private const val TAG_TOTAL_OPERATIONAL_TIME = 1
+    private const val TAG_PAUSED_TIME = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OperationalStateClusterOperationCompletionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val completionErrorCode = tlvReader.getUInt(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE))
+      val totalOperationalTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+          null
+        }
+      val pausedTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAUSED_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_PAUSED_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PAUSED_TIME))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return OperationalStateClusterOperationCompletionEvent(
+        completionErrorCode,
+        totalOperationalTime,
+        pausedTime
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
new file mode 100644
index 00000000000000..802e306c594c80
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
@@ -0,0 +1,58 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalStateClusterOperationalErrorEvent(
+  val errorState: matter.devicecontroller.cluster.structs.OperationalStateClusterErrorStateStruct
+) {
+  override fun toString(): String = buildString {
+    append("OperationalStateClusterOperationalErrorEvent {\n")
+    append("\terrorState : $errorState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      errorState.toTlv(ContextSpecificTag(TAG_ERROR_STATE), this)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterOperationalErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val errorState =
+        matter.devicecontroller.cluster.structs.OperationalStateClusterErrorStateStruct.fromTlv(
+          ContextSpecificTag(TAG_ERROR_STATE),
+          tlvReader
+        )
+
+      tlvReader.exitContainer()
+
+      return OperationalStateClusterOperationalErrorEvent(errorState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
new file mode 100644
index 00000000000000..a36f9161a81b62
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
@@ -0,0 +1,97 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
+  val softwareVersion: UInt,
+  val bytesDownloaded: ULong,
+  val progressPercent: UByte?,
+  val platformCode: Long?
+) {
+  override fun toString(): String = buildString {
+    append("OtaSoftwareUpdateRequestorClusterDownloadErrorEvent {\n")
+    append("\tsoftwareVersion : $softwareVersion\n")
+    append("\tbytesDownloaded : $bytesDownloaded\n")
+    append("\tprogressPercent : $progressPercent\n")
+    append("\tplatformCode : $platformCode\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
+      put(ContextSpecificTag(TAG_BYTES_DOWNLOADED), bytesDownloaded)
+      if (progressPercent != null) {
+        put(ContextSpecificTag(TAG_PROGRESS_PERCENT), progressPercent)
+      } else {
+        putNull(ContextSpecificTag(TAG_PROGRESS_PERCENT))
+      }
+      if (platformCode != null) {
+        put(ContextSpecificTag(TAG_PLATFORM_CODE), platformCode)
+      } else {
+        putNull(ContextSpecificTag(TAG_PLATFORM_CODE))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SOFTWARE_VERSION = 0
+    private const val TAG_BYTES_DOWNLOADED = 1
+    private const val TAG_PROGRESS_PERCENT = 2
+    private const val TAG_PLATFORM_CODE = 3
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OtaSoftwareUpdateRequestorClusterDownloadErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val softwareVersion = tlvReader.getUInt(ContextSpecificTag(TAG_SOFTWARE_VERSION))
+      val bytesDownloaded = tlvReader.getULong(ContextSpecificTag(TAG_BYTES_DOWNLOADED))
+      val progressPercent =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_PROGRESS_PERCENT))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PROGRESS_PERCENT))
+          null
+        }
+      val platformCode =
+        if (!tlvReader.isNull()) {
+          tlvReader.getLong(ContextSpecificTag(TAG_PLATFORM_CODE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PLATFORM_CODE))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
+        softwareVersion,
+        bytesDownloaded,
+        progressPercent,
+        platformCode
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
new file mode 100644
index 00000000000000..993efa8e9c93fc
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
@@ -0,0 +1,87 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
+  val previousState: UInt,
+  val newState: UInt,
+  val reason: UInt,
+  val targetSoftwareVersion: UInt?
+) {
+  override fun toString(): String = buildString {
+    append("OtaSoftwareUpdateRequestorClusterStateTransitionEvent {\n")
+    append("\tpreviousState : $previousState\n")
+    append("\tnewState : $newState\n")
+    append("\treason : $reason\n")
+    append("\ttargetSoftwareVersion : $targetSoftwareVersion\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PREVIOUS_STATE), previousState)
+      put(ContextSpecificTag(TAG_NEW_STATE), newState)
+      put(ContextSpecificTag(TAG_REASON), reason)
+      if (targetSoftwareVersion != null) {
+        put(ContextSpecificTag(TAG_TARGET_SOFTWARE_VERSION), targetSoftwareVersion)
+      } else {
+        putNull(ContextSpecificTag(TAG_TARGET_SOFTWARE_VERSION))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PREVIOUS_STATE = 0
+    private const val TAG_NEW_STATE = 1
+    private const val TAG_REASON = 2
+    private const val TAG_TARGET_SOFTWARE_VERSION = 3
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OtaSoftwareUpdateRequestorClusterStateTransitionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val previousState = tlvReader.getUInt(ContextSpecificTag(TAG_PREVIOUS_STATE))
+      val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
+      val reason = tlvReader.getUInt(ContextSpecificTag(TAG_REASON))
+      val targetSoftwareVersion =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_TARGET_SOFTWARE_VERSION))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TARGET_SOFTWARE_VERSION))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
+        previousState,
+        newState,
+        reason,
+        targetSoftwareVersion
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
new file mode 100644
index 00000000000000..f8b32d0d560892
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
@@ -0,0 +1,62 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(
+  val softwareVersion: UInt,
+  val productID: UShort
+) {
+  override fun toString(): String = buildString {
+    append("OtaSoftwareUpdateRequestorClusterVersionAppliedEvent {\n")
+    append("\tsoftwareVersion : $softwareVersion\n")
+    append("\tproductID : $productID\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
+      put(ContextSpecificTag(TAG_PRODUCT_I_D), productID)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SOFTWARE_VERSION = 0
+    private const val TAG_PRODUCT_I_D = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OtaSoftwareUpdateRequestorClusterVersionAppliedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val softwareVersion = tlvReader.getUInt(ContextSpecificTag(TAG_SOFTWARE_VERSION))
+      val productID = tlvReader.getUShort(ContextSpecificTag(TAG_PRODUCT_I_D))
+
+      tlvReader.exitContainer()
+
+      return OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(softwareVersion, productID)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
new file mode 100644
index 00000000000000..ea444f0c055c3f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationCompletionEvent(
+  val completionErrorCode: UInt,
+  val totalOperationalTime: Optional<UInt>?,
+  val pausedTime: Optional<UInt>?
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationCompletionEvent {\n")
+    append("\tcompletionErrorCode : $completionErrorCode\n")
+    append("\ttotalOperationalTime : $totalOperationalTime\n")
+    append("\tpausedTime : $pausedTime\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE), completionErrorCode)
+      if (totalOperationalTime != null) {
+        if (totalOperationalTime.isPresent) {
+          val opttotalOperationalTime = totalOperationalTime.get()
+          put(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME), opttotalOperationalTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+      }
+      if (pausedTime != null) {
+        if (pausedTime.isPresent) {
+          val optpausedTime = pausedTime.get()
+          put(ContextSpecificTag(TAG_PAUSED_TIME), optpausedTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_PAUSED_TIME))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COMPLETION_ERROR_CODE = 0
+    private const val TAG_TOTAL_OPERATIONAL_TIME = 1
+    private const val TAG_PAUSED_TIME = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationCompletionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val completionErrorCode = tlvReader.getUInt(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE))
+      val totalOperationalTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+          null
+        }
+      val pausedTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAUSED_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_PAUSED_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PAUSED_TIME))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationCompletionEvent(
+        completionErrorCode,
+        totalOperationalTime,
+        pausedTime
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
new file mode 100644
index 00000000000000..fbc411ab8f4d19
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationalErrorEvent(
+  val errorState:
+    matter.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationalErrorEvent {\n")
+    append("\terrorState : $errorState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      errorState.toTlv(ContextSpecificTag(TAG_ERROR_STATE), this)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationalErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val errorState =
+        matter.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
+          .fromTlv(ContextSpecificTag(TAG_ERROR_STATE), tlvReader)
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationalErrorEvent(errorState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
new file mode 100644
index 00000000000000..21cdcf674fa338
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
@@ -0,0 +1,82 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterBatChargeFaultChangeEvent(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterBatChargeFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterBatChargeFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterBatChargeFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
new file mode 100644
index 00000000000000..d1fd41e582dc94
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
@@ -0,0 +1,79 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterBatFaultChangeEvent(val current: List<UInt>, val previous: List<UInt>) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterBatFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterBatFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterBatFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
new file mode 100644
index 00000000000000..8aaacc0cb49fc4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
@@ -0,0 +1,79 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterWiredFaultChangeEvent(val current: List<UInt>, val previous: List<UInt>) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterWiredFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterWiredFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterWiredFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
new file mode 100644
index 00000000000000..ee7c9b8ebfaae6
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RefrigeratorAlarmClusterNotifyEvent(
+  val active: ULong,
+  val inactive: ULong,
+  val state: ULong,
+  val mask: ULong
+) {
+  override fun toString(): String = buildString {
+    append("RefrigeratorAlarmClusterNotifyEvent {\n")
+    append("\tactive : $active\n")
+    append("\tinactive : $inactive\n")
+    append("\tstate : $state\n")
+    append("\tmask : $mask\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTIVE), active)
+      put(ContextSpecificTag(TAG_INACTIVE), inactive)
+      put(ContextSpecificTag(TAG_STATE), state)
+      put(ContextSpecificTag(TAG_MASK), mask)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTIVE = 0
+    private const val TAG_INACTIVE = 1
+    private const val TAG_STATE = 2
+    private const val TAG_MASK = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RefrigeratorAlarmClusterNotifyEvent {
+      tlvReader.enterStructure(tlvTag)
+      val active = tlvReader.getULong(ContextSpecificTag(TAG_ACTIVE))
+      val inactive = tlvReader.getULong(ContextSpecificTag(TAG_INACTIVE))
+      val state = tlvReader.getULong(ContextSpecificTag(TAG_STATE))
+      val mask = tlvReader.getULong(ContextSpecificTag(TAG_MASK))
+
+      tlvReader.exitContainer()
+
+      return RefrigeratorAlarmClusterNotifyEvent(active, inactive, state, mask)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
new file mode 100644
index 00000000000000..3004686f8b67d8
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcOperationalStateClusterOperationCompletionEvent(
+  val completionErrorCode: UInt,
+  val totalOperationalTime: Optional<UInt>?,
+  val pausedTime: Optional<UInt>?
+) {
+  override fun toString(): String = buildString {
+    append("RvcOperationalStateClusterOperationCompletionEvent {\n")
+    append("\tcompletionErrorCode : $completionErrorCode\n")
+    append("\ttotalOperationalTime : $totalOperationalTime\n")
+    append("\tpausedTime : $pausedTime\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE), completionErrorCode)
+      if (totalOperationalTime != null) {
+        if (totalOperationalTime.isPresent) {
+          val opttotalOperationalTime = totalOperationalTime.get()
+          put(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME), opttotalOperationalTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+      }
+      if (pausedTime != null) {
+        if (pausedTime.isPresent) {
+          val optpausedTime = pausedTime.get()
+          put(ContextSpecificTag(TAG_PAUSED_TIME), optpausedTime)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_PAUSED_TIME))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COMPLETION_ERROR_CODE = 0
+    private const val TAG_TOTAL_OPERATIONAL_TIME = 1
+    private const val TAG_PAUSED_TIME = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): RvcOperationalStateClusterOperationCompletionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val completionErrorCode = tlvReader.getUInt(ContextSpecificTag(TAG_COMPLETION_ERROR_CODE))
+      val totalOperationalTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TOTAL_OPERATIONAL_TIME))
+          null
+        }
+      val pausedTime =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAUSED_TIME))) {
+            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_PAUSED_TIME)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PAUSED_TIME))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return RvcOperationalStateClusterOperationCompletionEvent(
+        completionErrorCode,
+        totalOperationalTime,
+        pausedTime
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
new file mode 100644
index 00000000000000..ff973d17fe9684
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
@@ -0,0 +1,61 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcOperationalStateClusterOperationalErrorEvent(
+  val errorState: matter.devicecontroller.cluster.structs.RvcOperationalStateClusterErrorStateStruct
+) {
+  override fun toString(): String = buildString {
+    append("RvcOperationalStateClusterOperationalErrorEvent {\n")
+    append("\terrorState : $errorState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      errorState.toTlv(ContextSpecificTag(TAG_ERROR_STATE), this)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): RvcOperationalStateClusterOperationalErrorEvent {
+      tlvReader.enterStructure(tlvTag)
+      val errorState =
+        matter.devicecontroller.cluster.structs.RvcOperationalStateClusterErrorStateStruct.fromTlv(
+          ContextSpecificTag(TAG_ERROR_STATE),
+          tlvReader
+        )
+
+      tlvReader.exitContainer()
+
+      return RvcOperationalStateClusterOperationalErrorEvent(errorState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
new file mode 100644
index 00000000000000..e70b19a92636d3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SmokeCoAlarmClusterCOAlarmEvent(val alarmSeverityLevel: UInt) {
+  override fun toString(): String = buildString {
+    append("SmokeCoAlarmClusterCOAlarmEvent {\n")
+    append("\talarmSeverityLevel : $alarmSeverityLevel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL), alarmSeverityLevel)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_SEVERITY_LEVEL = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SmokeCoAlarmClusterCOAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmSeverityLevel = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL))
+
+      tlvReader.exitContainer()
+
+      return SmokeCoAlarmClusterCOAlarmEvent(alarmSeverityLevel)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
new file mode 100644
index 00000000000000..51aa58966bfd4c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SmokeCoAlarmClusterInterconnectCOAlarmEvent(val alarmSeverityLevel: UInt) {
+  override fun toString(): String = buildString {
+    append("SmokeCoAlarmClusterInterconnectCOAlarmEvent {\n")
+    append("\talarmSeverityLevel : $alarmSeverityLevel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL), alarmSeverityLevel)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_SEVERITY_LEVEL = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SmokeCoAlarmClusterInterconnectCOAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmSeverityLevel = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL))
+
+      tlvReader.exitContainer()
+
+      return SmokeCoAlarmClusterInterconnectCOAlarmEvent(alarmSeverityLevel)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
new file mode 100644
index 00000000000000..4f2f7187caaa90
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(val alarmSeverityLevel: UInt) {
+  override fun toString(): String = buildString {
+    append("SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {\n")
+    append("\talarmSeverityLevel : $alarmSeverityLevel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL), alarmSeverityLevel)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_SEVERITY_LEVEL = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmSeverityLevel = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL))
+
+      tlvReader.exitContainer()
+
+      return SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(alarmSeverityLevel)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
new file mode 100644
index 00000000000000..0fd098880eddcf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SmokeCoAlarmClusterLowBatteryEvent(val alarmSeverityLevel: UInt) {
+  override fun toString(): String = buildString {
+    append("SmokeCoAlarmClusterLowBatteryEvent {\n")
+    append("\talarmSeverityLevel : $alarmSeverityLevel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL), alarmSeverityLevel)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_SEVERITY_LEVEL = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SmokeCoAlarmClusterLowBatteryEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmSeverityLevel = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL))
+
+      tlvReader.exitContainer()
+
+      return SmokeCoAlarmClusterLowBatteryEvent(alarmSeverityLevel)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
new file mode 100644
index 00000000000000..f2b985b06eb48f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SmokeCoAlarmClusterSmokeAlarmEvent(val alarmSeverityLevel: UInt) {
+  override fun toString(): String = buildString {
+    append("SmokeCoAlarmClusterSmokeAlarmEvent {\n")
+    append("\talarmSeverityLevel : $alarmSeverityLevel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL), alarmSeverityLevel)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ALARM_SEVERITY_LEVEL = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SmokeCoAlarmClusterSmokeAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
+      val alarmSeverityLevel = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_SEVERITY_LEVEL))
+
+      tlvReader.exitContainer()
+
+      return SmokeCoAlarmClusterSmokeAlarmEvent(alarmSeverityLevel)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
new file mode 100644
index 00000000000000..f7e1378e5ed2b7
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
@@ -0,0 +1,81 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SoftwareDiagnosticsClusterSoftwareFaultEvent(
+  val id: ULong,
+  val name: Optional<String>,
+  val faultRecording: Optional<ByteArray>
+) {
+  override fun toString(): String = buildString {
+    append("SoftwareDiagnosticsClusterSoftwareFaultEvent {\n")
+    append("\tid : $id\n")
+    append("\tname : $name\n")
+    append("\tfaultRecording : $faultRecording\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ID), id)
+      if (name.isPresent) {
+        val optname = name.get()
+        put(ContextSpecificTag(TAG_NAME), optname)
+      }
+      if (faultRecording.isPresent) {
+        val optfaultRecording = faultRecording.get()
+        put(ContextSpecificTag(TAG_FAULT_RECORDING), optfaultRecording)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ID = 0
+    private const val TAG_NAME = 1
+    private const val TAG_FAULT_RECORDING = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SoftwareDiagnosticsClusterSoftwareFaultEvent {
+      tlvReader.enterStructure(tlvTag)
+      val id = tlvReader.getULong(ContextSpecificTag(TAG_ID))
+      val name =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NAME)))
+        } else {
+          Optional.empty()
+        }
+      val faultRecording =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_FAULT_RECORDING))) {
+          Optional.of(tlvReader.getByteArray(ContextSpecificTag(TAG_FAULT_RECORDING)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return SoftwareDiagnosticsClusterSoftwareFaultEvent(id, name, faultRecording)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
new file mode 100644
index 00000000000000..630fd921464fad
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterInitialPressEvent(val newPosition: UByte) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterInitialPressEvent {\n")
+    append("\tnewPosition : $newPosition\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NEW_POSITION), newPosition)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NEW_POSITION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterInitialPressEvent {
+      tlvReader.enterStructure(tlvTag)
+      val newPosition = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_POSITION))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterInitialPressEvent(newPosition)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
new file mode 100644
index 00000000000000..b586d1687d64a9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterLongPressEvent(val newPosition: UByte) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterLongPressEvent {\n")
+    append("\tnewPosition : $newPosition\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NEW_POSITION), newPosition)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NEW_POSITION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterLongPressEvent {
+      tlvReader.enterStructure(tlvTag)
+      val newPosition = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_POSITION))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterLongPressEvent(newPosition)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
new file mode 100644
index 00000000000000..6b7ea992a3821e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterLongReleaseEvent(val previousPosition: UByte) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterLongReleaseEvent {\n")
+    append("\tpreviousPosition : $previousPosition\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PREVIOUS_POSITION), previousPosition)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PREVIOUS_POSITION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterLongReleaseEvent {
+      tlvReader.enterStructure(tlvTag)
+      val previousPosition = tlvReader.getUByte(ContextSpecificTag(TAG_PREVIOUS_POSITION))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterLongReleaseEvent(previousPosition)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
new file mode 100644
index 00000000000000..79bbef0ee9dd7d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterMultiPressCompleteEvent(
+  val previousPosition: UByte,
+  val totalNumberOfPressesCounted: UByte
+) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterMultiPressCompleteEvent {\n")
+    append("\tpreviousPosition : $previousPosition\n")
+    append("\ttotalNumberOfPressesCounted : $totalNumberOfPressesCounted\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PREVIOUS_POSITION), previousPosition)
+      put(ContextSpecificTag(TAG_TOTAL_NUMBER_OF_PRESSES_COUNTED), totalNumberOfPressesCounted)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PREVIOUS_POSITION = 0
+    private const val TAG_TOTAL_NUMBER_OF_PRESSES_COUNTED = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterMultiPressCompleteEvent {
+      tlvReader.enterStructure(tlvTag)
+      val previousPosition = tlvReader.getUByte(ContextSpecificTag(TAG_PREVIOUS_POSITION))
+      val totalNumberOfPressesCounted =
+        tlvReader.getUByte(ContextSpecificTag(TAG_TOTAL_NUMBER_OF_PRESSES_COUNTED))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterMultiPressCompleteEvent(previousPosition, totalNumberOfPressesCounted)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
new file mode 100644
index 00000000000000..bced01633d76ef
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterMultiPressOngoingEvent(
+  val newPosition: UByte,
+  val currentNumberOfPressesCounted: UByte
+) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterMultiPressOngoingEvent {\n")
+    append("\tnewPosition : $newPosition\n")
+    append("\tcurrentNumberOfPressesCounted : $currentNumberOfPressesCounted\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NEW_POSITION), newPosition)
+      put(ContextSpecificTag(TAG_CURRENT_NUMBER_OF_PRESSES_COUNTED), currentNumberOfPressesCounted)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NEW_POSITION = 0
+    private const val TAG_CURRENT_NUMBER_OF_PRESSES_COUNTED = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterMultiPressOngoingEvent {
+      tlvReader.enterStructure(tlvTag)
+      val newPosition = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_POSITION))
+      val currentNumberOfPressesCounted =
+        tlvReader.getUByte(ContextSpecificTag(TAG_CURRENT_NUMBER_OF_PRESSES_COUNTED))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterMultiPressOngoingEvent(newPosition, currentNumberOfPressesCounted)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
new file mode 100644
index 00000000000000..6c9c2272f2ab38
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterShortReleaseEvent(val previousPosition: UByte) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterShortReleaseEvent {\n")
+    append("\tpreviousPosition : $previousPosition\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PREVIOUS_POSITION), previousPosition)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PREVIOUS_POSITION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterShortReleaseEvent {
+      tlvReader.enterStructure(tlvTag)
+      val previousPosition = tlvReader.getUByte(ContextSpecificTag(TAG_PREVIOUS_POSITION))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterShortReleaseEvent(previousPosition)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
new file mode 100644
index 00000000000000..8c5ee4f9f83edf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SwitchClusterSwitchLatchedEvent(val newPosition: UByte) {
+  override fun toString(): String = buildString {
+    append("SwitchClusterSwitchLatchedEvent {\n")
+    append("\tnewPosition : $newPosition\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NEW_POSITION), newPosition)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NEW_POSITION = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SwitchClusterSwitchLatchedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val newPosition = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_POSITION))
+
+      tlvReader.exitContainer()
+
+      return SwitchClusterSwitchLatchedEvent(newPosition)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
new file mode 100644
index 00000000000000..b771bd2b0f402c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterConnectionStatusEvent(val connectionStatus: UInt) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterConnectionStatusEvent {\n")
+    append("\tconnectionStatus : $connectionStatus\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CONNECTION_STATUS), connectionStatus)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CONNECTION_STATUS = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ThreadNetworkDiagnosticsClusterConnectionStatusEvent {
+      tlvReader.enterStructure(tlvTag)
+      val connectionStatus = tlvReader.getUInt(ContextSpecificTag(TAG_CONNECTION_STATUS))
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterConnectionStatusEvent(connectionStatus)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
new file mode 100644
index 00000000000000..827abfa1377c6a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
new file mode 100644
index 00000000000000..e20bc34335426f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterDSTStatusEvent(val DSTOffsetActive: Boolean) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterDSTStatusEvent {\n")
+    append("\tDSTOffsetActive : $DSTOffsetActive\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE), DSTOffsetActive)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_D_S_T_OFFSET_ACTIVE = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterDSTStatusEvent {
+      tlvReader.enterStructure(tlvTag)
+      val DSTOffsetActive = tlvReader.getBoolean(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE))
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterDSTStatusEvent(DSTOffsetActive)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
new file mode 100644
index 00000000000000..552027845f991d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterTimeZoneStatusEvent(val offset: Int, val name: Optional<String>) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterTimeZoneStatusEvent {\n")
+    append("\toffset : $offset\n")
+    append("\tname : $name\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OFFSET), offset)
+      if (name.isPresent) {
+        val optname = name.get()
+        put(ContextSpecificTag(TAG_NAME), optname)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OFFSET = 0
+    private const val TAG_NAME = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterTimeZoneStatusEvent {
+      tlvReader.enterStructure(tlvTag)
+      val offset = tlvReader.getInt(ContextSpecificTag(TAG_OFFSET))
+      val name =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NAME)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterTimeZoneStatusEvent(offset, name)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
new file mode 100644
index 00000000000000..2993e43dedc6cd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
@@ -0,0 +1,111 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterTestEventEvent(
+  val arg1: UByte,
+  val arg2: UInt,
+  val arg3: Boolean,
+  val arg4: matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct,
+  val arg5: List<matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct>,
+  val arg6: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterTestEventEvent {\n")
+    append("\targ1 : $arg1\n")
+    append("\targ2 : $arg2\n")
+    append("\targ3 : $arg3\n")
+    append("\targ4 : $arg4\n")
+    append("\targ5 : $arg5\n")
+    append("\targ6 : $arg6\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ARG1), arg1)
+      put(ContextSpecificTag(TAG_ARG2), arg2)
+      put(ContextSpecificTag(TAG_ARG3), arg3)
+      arg4.toTlv(ContextSpecificTag(TAG_ARG4), this)
+      startArray(ContextSpecificTag(TAG_ARG5))
+      for (item in arg5.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_ARG6))
+      for (item in arg6.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ARG1 = 1
+    private const val TAG_ARG2 = 2
+    private const val TAG_ARG3 = 3
+    private const val TAG_ARG4 = 4
+    private const val TAG_ARG5 = 5
+    private const val TAG_ARG6 = 6
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterTestEventEvent {
+      tlvReader.enterStructure(tlvTag)
+      val arg1 = tlvReader.getUByte(ContextSpecificTag(TAG_ARG1))
+      val arg2 = tlvReader.getUInt(ContextSpecificTag(TAG_ARG2))
+      val arg3 = tlvReader.getBoolean(ContextSpecificTag(TAG_ARG3))
+      val arg4 =
+        matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
+          ContextSpecificTag(TAG_ARG4),
+          tlvReader
+        )
+      val arg5 =
+        buildList<matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_ARG5))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(
+              matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+      val arg6 =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_ARG6))
+          while (!tlvReader.isEndOfContainer()) {
+            this.add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterTestEventEvent(arg1, arg2, arg3, arg4, arg5, arg6)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
new file mode 100644
index 00000000000000..bdf1b54a00b31f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterTestFabricScopedEventEvent(val fabricIndex: UByte) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterTestFabricScopedEventEvent {\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterTestFabricScopedEventEvent {
+      tlvReader.enterStructure(tlvTag)
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterTestFabricScopedEventEvent(fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
new file mode 100644
index 00000000000000..6aa0f2c8ea44bf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ValveConfigurationAndControlClusterValveFaultEvent(val valveFault: UInt) {
+  override fun toString(): String = buildString {
+    append("ValveConfigurationAndControlClusterValveFaultEvent {\n")
+    append("\tvalveFault : $valveFault\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_VALVE_FAULT), valveFault)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_VALVE_FAULT = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ValveConfigurationAndControlClusterValveFaultEvent {
+      tlvReader.enterStructure(tlvTag)
+      val valveFault = tlvReader.getUInt(ContextSpecificTag(TAG_VALVE_FAULT))
+
+      tlvReader.exitContainer()
+
+      return ValveConfigurationAndControlClusterValveFaultEvent(valveFault)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
new file mode 100644
index 00000000000000..37e58c25cea495
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ValveConfigurationAndControlClusterValveStateChangedEvent(val valveState: UInt) {
+  override fun toString(): String = buildString {
+    append("ValveConfigurationAndControlClusterValveStateChangedEvent {\n")
+    append("\tvalveState : $valveState\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_VALVE_STATE), valveState)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_VALVE_STATE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ValveConfigurationAndControlClusterValveStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val valveState = tlvReader.getUInt(ContextSpecificTag(TAG_VALVE_STATE))
+
+      tlvReader.exitContainer()
+
+      return ValveConfigurationAndControlClusterValveStateChangedEvent(valveState)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
new file mode 100644
index 00000000000000..04b408b87c41c2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
@@ -0,0 +1,63 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
+  val associationFailureCause: UInt,
+  val status: UShort
+) {
+  override fun toString(): String = buildString {
+    append("WiFiNetworkDiagnosticsClusterAssociationFailureEvent {\n")
+    append("\tassociationFailureCause : $associationFailureCause\n")
+    append("\tstatus : $status\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ASSOCIATION_FAILURE_CAUSE), associationFailureCause)
+      put(ContextSpecificTag(TAG_STATUS), status)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ASSOCIATION_FAILURE_CAUSE = 0
+    private const val TAG_STATUS = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): WiFiNetworkDiagnosticsClusterAssociationFailureEvent {
+      tlvReader.enterStructure(tlvTag)
+      val associationFailureCause =
+        tlvReader.getUInt(ContextSpecificTag(TAG_ASSOCIATION_FAILURE_CAUSE))
+      val status = tlvReader.getUShort(ContextSpecificTag(TAG_STATUS))
+
+      tlvReader.exitContainer()
+
+      return WiFiNetworkDiagnosticsClusterAssociationFailureEvent(associationFailureCause, status)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
new file mode 100644
index 00000000000000..653e02a013159d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class WiFiNetworkDiagnosticsClusterConnectionStatusEvent(val connectionStatus: UInt) {
+  override fun toString(): String = buildString {
+    append("WiFiNetworkDiagnosticsClusterConnectionStatusEvent {\n")
+    append("\tconnectionStatus : $connectionStatus\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CONNECTION_STATUS), connectionStatus)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CONNECTION_STATUS = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): WiFiNetworkDiagnosticsClusterConnectionStatusEvent {
+      tlvReader.enterStructure(tlvTag)
+      val connectionStatus = tlvReader.getUInt(ContextSpecificTag(TAG_CONNECTION_STATUS))
+
+      tlvReader.exitContainer()
+
+      return WiFiNetworkDiagnosticsClusterConnectionStatusEvent(connectionStatus)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
new file mode 100644
index 00000000000000..518f3ece0161d2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.eventstructs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class WiFiNetworkDiagnosticsClusterDisconnectionEvent(val reasonCode: UShort) {
+  override fun toString(): String = buildString {
+    append("WiFiNetworkDiagnosticsClusterDisconnectionEvent {\n")
+    append("\treasonCode : $reasonCode\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_REASON_CODE), reasonCode)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_REASON_CODE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): WiFiNetworkDiagnosticsClusterDisconnectionEvent {
+      tlvReader.enterStructure(tlvTag)
+      val reasonCode = tlvReader.getUShort(ContextSpecificTag(TAG_REASON_CODE))
+
+      tlvReader.exitContainer()
+
+      return WiFiNetworkDiagnosticsClusterDisconnectionEvent(reasonCode)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
index 62be491751fec7..b5c3b1f2f2bf3b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
@@ -1,6 +1,174 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
+matter_structs_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt",
+]
+
+matter_eventstructs_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt",
+]
+
 matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt",
@@ -16,6 +184,7 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt",
@@ -23,12 +192,14 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt",
@@ -44,6 +215,7 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt",
@@ -51,6 +223,8 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt",
@@ -61,6 +235,8 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt",
@@ -92,11 +268,13 @@ matter_clusters_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt",
   "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt",
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
new file mode 100644
index 00000000000000..7160b776b170fb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
@@ -0,0 +1,121 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AccessControlClusterAccessControlEntryStruct(
+  val privilege: UInt,
+  val authMode: UInt,
+  val subjects: List<ULong>?,
+  val targets: List<AccessControlClusterAccessControlTargetStruct>?,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("AccessControlClusterAccessControlEntryStruct {\n")
+    append("\tprivilege : $privilege\n")
+    append("\tauthMode : $authMode\n")
+    append("\tsubjects : $subjects\n")
+    append("\ttargets : $targets\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PRIVILEGE), privilege)
+      put(ContextSpecificTag(TAG_AUTH_MODE), authMode)
+      if (subjects != null) {
+        startArray(ContextSpecificTag(TAG_SUBJECTS))
+        for (item in subjects.iterator()) {
+          put(AnonymousTag, item)
+        }
+        endArray()
+      } else {
+        putNull(ContextSpecificTag(TAG_SUBJECTS))
+      }
+      if (targets != null) {
+        startArray(ContextSpecificTag(TAG_TARGETS))
+        for (item in targets.iterator()) {
+          item.toTlv(AnonymousTag, this)
+        }
+        endArray()
+      } else {
+        putNull(ContextSpecificTag(TAG_TARGETS))
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PRIVILEGE = 1
+    private const val TAG_AUTH_MODE = 2
+    private const val TAG_SUBJECTS = 3
+    private const val TAG_TARGETS = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): AccessControlClusterAccessControlEntryStruct {
+      tlvReader.enterStructure(tlvTag)
+      val privilege = tlvReader.getUInt(ContextSpecificTag(TAG_PRIVILEGE))
+      val authMode = tlvReader.getUInt(ContextSpecificTag(TAG_AUTH_MODE))
+      val subjects =
+        if (!tlvReader.isNull()) {
+          buildList<ULong> {
+            tlvReader.enterArray(ContextSpecificTag(TAG_SUBJECTS))
+            while (!tlvReader.isEndOfContainer()) {
+              add(tlvReader.getULong(AnonymousTag))
+            }
+            tlvReader.exitContainer()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_SUBJECTS))
+          null
+        }
+      val targets =
+        if (!tlvReader.isNull()) {
+          buildList<AccessControlClusterAccessControlTargetStruct> {
+            tlvReader.enterArray(ContextSpecificTag(TAG_TARGETS))
+            while (!tlvReader.isEndOfContainer()) {
+              add(AccessControlClusterAccessControlTargetStruct.fromTlv(AnonymousTag, tlvReader))
+            }
+            tlvReader.exitContainer()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_TARGETS))
+          null
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return AccessControlClusterAccessControlEntryStruct(
+        privilege,
+        authMode,
+        subjects,
+        targets,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
new file mode 100644
index 00000000000000..92f871d9cc054d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
@@ -0,0 +1,62 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AccessControlClusterAccessControlExtensionStruct(
+  val data: ByteArray,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("AccessControlClusterAccessControlExtensionStruct {\n")
+    append("\tdata : $data\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DATA), data)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DATA = 1
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): AccessControlClusterAccessControlExtensionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val data = tlvReader.getByteArray(ContextSpecificTag(TAG_DATA))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return AccessControlClusterAccessControlExtensionStruct(data, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
new file mode 100644
index 00000000000000..24905a80d950d9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
@@ -0,0 +1,94 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AccessControlClusterAccessControlTargetStruct(
+  val cluster: UInt?,
+  val endpoint: UShort?,
+  val deviceType: UInt?
+) {
+  override fun toString(): String = buildString {
+    append("AccessControlClusterAccessControlTargetStruct {\n")
+    append("\tcluster : $cluster\n")
+    append("\tendpoint : $endpoint\n")
+    append("\tdeviceType : $deviceType\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (cluster != null) {
+        put(ContextSpecificTag(TAG_CLUSTER), cluster)
+      } else {
+        putNull(ContextSpecificTag(TAG_CLUSTER))
+      }
+      if (endpoint != null) {
+        put(ContextSpecificTag(TAG_ENDPOINT), endpoint)
+      } else {
+        putNull(ContextSpecificTag(TAG_ENDPOINT))
+      }
+      if (deviceType != null) {
+        put(ContextSpecificTag(TAG_DEVICE_TYPE), deviceType)
+      } else {
+        putNull(ContextSpecificTag(TAG_DEVICE_TYPE))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CLUSTER = 0
+    private const val TAG_ENDPOINT = 1
+    private const val TAG_DEVICE_TYPE = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): AccessControlClusterAccessControlTargetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val cluster =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_CLUSTER))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_CLUSTER))
+          null
+        }
+      val endpoint =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ENDPOINT))
+          null
+        }
+      val deviceType =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_DEVICE_TYPE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_DEVICE_TYPE))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return AccessControlClusterAccessControlTargetStruct(cluster, endpoint, deviceType)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt
new file mode 100644
index 00000000000000..43a6ed963d8b52
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt
@@ -0,0 +1,86 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ActionsClusterActionStruct(
+  val actionID: UShort,
+  val name: String,
+  val type: UInt,
+  val endpointListID: UShort,
+  val supportedCommands: UInt,
+  val state: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ActionsClusterActionStruct {\n")
+    append("\tactionID : $actionID\n")
+    append("\tname : $name\n")
+    append("\ttype : $type\n")
+    append("\tendpointListID : $endpointListID\n")
+    append("\tsupportedCommands : $supportedCommands\n")
+    append("\tstate : $state\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTION_I_D), actionID)
+      put(ContextSpecificTag(TAG_NAME), name)
+      put(ContextSpecificTag(TAG_TYPE), type)
+      put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID)
+      put(ContextSpecificTag(TAG_SUPPORTED_COMMANDS), supportedCommands)
+      put(ContextSpecificTag(TAG_STATE), state)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTION_I_D = 0
+    private const val TAG_NAME = 1
+    private const val TAG_TYPE = 2
+    private const val TAG_ENDPOINT_LIST_I_D = 3
+    private const val TAG_SUPPORTED_COMMANDS = 4
+    private const val TAG_STATE = 5
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE))
+      val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D))
+      val supportedCommands = tlvReader.getUInt(ContextSpecificTag(TAG_SUPPORTED_COMMANDS))
+      val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
+
+      tlvReader.exitContainer()
+
+      return ActionsClusterActionStruct(
+        actionID,
+        name,
+        type,
+        endpointListID,
+        supportedCommands,
+        state
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt
new file mode 100644
index 00000000000000..7b0f6a5616f52f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt
@@ -0,0 +1,81 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ActionsClusterEndpointListStruct(
+  val endpointListID: UShort,
+  val name: String,
+  val type: UInt,
+  val endpoints: List<UShort>
+) {
+  override fun toString(): String = buildString {
+    append("ActionsClusterEndpointListStruct {\n")
+    append("\tendpointListID : $endpointListID\n")
+    append("\tname : $name\n")
+    append("\ttype : $type\n")
+    append("\tendpoints : $endpoints\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID)
+      put(ContextSpecificTag(TAG_NAME), name)
+      put(ContextSpecificTag(TAG_TYPE), type)
+      startArray(ContextSpecificTag(TAG_ENDPOINTS))
+      for (item in endpoints.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ENDPOINT_LIST_I_D = 0
+    private const val TAG_NAME = 1
+    private const val TAG_TYPE = 2
+    private const val TAG_ENDPOINTS = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterEndpointListStruct {
+      tlvReader.enterStructure(tlvTag)
+      val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE))
+      val endpoints =
+        buildList<UShort> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_ENDPOINTS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUShort(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return ActionsClusterEndpointListStruct(endpointListID, name, type, endpoints)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
new file mode 100644
index 00000000000000..3f3b66764532b4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
+  val productIdentifierType: UInt,
+  val productIdentifierValue: String
+) {
+  override fun toString(): String = buildString {
+    append("ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {\n")
+    append("\tproductIdentifierType : $productIdentifierType\n")
+    append("\tproductIdentifierValue : $productIdentifierValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_TYPE), productIdentifierType)
+      put(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_VALUE), productIdentifierValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PRODUCT_IDENTIFIER_TYPE = 0
+    private const val TAG_PRODUCT_IDENTIFIER_VALUE = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {
+      tlvReader.enterStructure(tlvTag)
+      val productIdentifierType = tlvReader.getUInt(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_TYPE))
+      val productIdentifierValue =
+        tlvReader.getString(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_VALUE))
+
+      tlvReader.exitContainer()
+
+      return ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
+        productIdentifierType,
+        productIdentifierValue
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
new file mode 100644
index 00000000000000..90dae8f1054f47
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
@@ -0,0 +1,59 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ApplicationBasicClusterApplicationStruct(
+  val catalogVendorID: UShort,
+  val applicationID: String
+) {
+  override fun toString(): String = buildString {
+    append("ApplicationBasicClusterApplicationStruct {\n")
+    append("\tcatalogVendorID : $catalogVendorID\n")
+    append("\tapplicationID : $applicationID\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID)
+      put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CATALOG_VENDOR_I_D = 0
+    private const val TAG_APPLICATION_I_D = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationBasicClusterApplicationStruct {
+      tlvReader.enterStructure(tlvTag)
+      val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D))
+      val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D))
+
+      tlvReader.exitContainer()
+
+      return ApplicationBasicClusterApplicationStruct(catalogVendorID, applicationID)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
new file mode 100644
index 00000000000000..62fc820b748084
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
@@ -0,0 +1,72 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ApplicationLauncherClusterApplicationEPStruct(
+  val application: ApplicationLauncherClusterApplicationStruct,
+  val endpoint: Optional<UShort>
+) {
+  override fun toString(): String = buildString {
+    append("ApplicationLauncherClusterApplicationEPStruct {\n")
+    append("\tapplication : $application\n")
+    append("\tendpoint : $endpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      application.toTlv(ContextSpecificTag(TAG_APPLICATION), this)
+      if (endpoint.isPresent) {
+        val optendpoint = endpoint.get()
+        put(ContextSpecificTag(TAG_ENDPOINT), optendpoint)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_APPLICATION = 0
+    private const val TAG_ENDPOINT = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationLauncherClusterApplicationEPStruct {
+      tlvReader.enterStructure(tlvTag)
+      val application =
+        ApplicationLauncherClusterApplicationStruct.fromTlv(
+          ContextSpecificTag(TAG_APPLICATION),
+          tlvReader
+        )
+      val endpoint =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENDPOINT))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return ApplicationLauncherClusterApplicationEPStruct(application, endpoint)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
new file mode 100644
index 00000000000000..39fa26c5279bbc
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
@@ -0,0 +1,59 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ApplicationLauncherClusterApplicationStruct(
+  val catalogVendorID: UShort,
+  val applicationID: String
+) {
+  override fun toString(): String = buildString {
+    append("ApplicationLauncherClusterApplicationStruct {\n")
+    append("\tcatalogVendorID : $catalogVendorID\n")
+    append("\tapplicationID : $applicationID\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID)
+      put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CATALOG_VENDOR_I_D = 0
+    private const val TAG_APPLICATION_I_D = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationLauncherClusterApplicationStruct {
+      tlvReader.enterStructure(tlvTag)
+      val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D))
+      val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D))
+
+      tlvReader.exitContainer()
+
+      return ApplicationLauncherClusterApplicationStruct(catalogVendorID, applicationID)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
new file mode 100644
index 00000000000000..07c6c02e0e16af
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AudioOutputClusterOutputInfoStruct(val index: UByte, val outputType: UInt, val name: String) {
+  override fun toString(): String = buildString {
+    append("AudioOutputClusterOutputInfoStruct {\n")
+    append("\tindex : $index\n")
+    append("\toutputType : $outputType\n")
+    append("\tname : $name\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_INDEX), index)
+      put(ContextSpecificTag(TAG_OUTPUT_TYPE), outputType)
+      put(ContextSpecificTag(TAG_NAME), name)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_INDEX = 0
+    private const val TAG_OUTPUT_TYPE = 1
+    private const val TAG_NAME = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): AudioOutputClusterOutputInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val index = tlvReader.getUByte(ContextSpecificTag(TAG_INDEX))
+      val outputType = tlvReader.getUInt(ContextSpecificTag(TAG_OUTPUT_TYPE))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+
+      tlvReader.exitContainer()
+
+      return AudioOutputClusterOutputInfoStruct(index, outputType, name)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
new file mode 100644
index 00000000000000..57ffe931e64877
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BasicInformationClusterCapabilityMinimaStruct(
+  val caseSessionsPerFabric: UShort,
+  val subscriptionsPerFabric: UShort
+) {
+  override fun toString(): String = buildString {
+    append("BasicInformationClusterCapabilityMinimaStruct {\n")
+    append("\tcaseSessionsPerFabric : $caseSessionsPerFabric\n")
+    append("\tsubscriptionsPerFabric : $subscriptionsPerFabric\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CASE_SESSIONS_PER_FABRIC), caseSessionsPerFabric)
+      put(ContextSpecificTag(TAG_SUBSCRIPTIONS_PER_FABRIC), subscriptionsPerFabric)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CASE_SESSIONS_PER_FABRIC = 0
+    private const val TAG_SUBSCRIPTIONS_PER_FABRIC = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterCapabilityMinimaStruct {
+      tlvReader.enterStructure(tlvTag)
+      val caseSessionsPerFabric =
+        tlvReader.getUShort(ContextSpecificTag(TAG_CASE_SESSIONS_PER_FABRIC))
+      val subscriptionsPerFabric =
+        tlvReader.getUShort(ContextSpecificTag(TAG_SUBSCRIPTIONS_PER_FABRIC))
+
+      tlvReader.exitContainer()
+
+      return BasicInformationClusterCapabilityMinimaStruct(
+        caseSessionsPerFabric,
+        subscriptionsPerFabric
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
new file mode 100644
index 00000000000000..b1bd7ea2c5599b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BasicInformationClusterProductAppearanceStruct(val finish: UInt, val primaryColor: UInt?) {
+  override fun toString(): String = buildString {
+    append("BasicInformationClusterProductAppearanceStruct {\n")
+    append("\tfinish : $finish\n")
+    append("\tprimaryColor : $primaryColor\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FINISH), finish)
+      if (primaryColor != null) {
+        put(ContextSpecificTag(TAG_PRIMARY_COLOR), primaryColor)
+      } else {
+        putNull(ContextSpecificTag(TAG_PRIMARY_COLOR))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FINISH = 0
+    private const val TAG_PRIMARY_COLOR = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterProductAppearanceStruct {
+      tlvReader.enterStructure(tlvTag)
+      val finish = tlvReader.getUInt(ContextSpecificTag(TAG_FINISH))
+      val primaryColor =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_PRIMARY_COLOR))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PRIMARY_COLOR))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return BasicInformationClusterProductAppearanceStruct(finish, primaryColor)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt
new file mode 100644
index 00000000000000..2f41f19897474b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt
@@ -0,0 +1,107 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BindingClusterTargetStruct(
+  val node: Optional<ULong>,
+  val group: Optional<UShort>,
+  val endpoint: Optional<UShort>,
+  val cluster: Optional<UInt>,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("BindingClusterTargetStruct {\n")
+    append("\tnode : $node\n")
+    append("\tgroup : $group\n")
+    append("\tendpoint : $endpoint\n")
+    append("\tcluster : $cluster\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (node.isPresent) {
+        val optnode = node.get()
+        put(ContextSpecificTag(TAG_NODE), optnode)
+      }
+      if (group.isPresent) {
+        val optgroup = group.get()
+        put(ContextSpecificTag(TAG_GROUP), optgroup)
+      }
+      if (endpoint.isPresent) {
+        val optendpoint = endpoint.get()
+        put(ContextSpecificTag(TAG_ENDPOINT), optendpoint)
+      }
+      if (cluster.isPresent) {
+        val optcluster = cluster.get()
+        put(ContextSpecificTag(TAG_CLUSTER), optcluster)
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NODE = 1
+    private const val TAG_GROUP = 2
+    private const val TAG_ENDPOINT = 3
+    private const val TAG_CLUSTER = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BindingClusterTargetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val node =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NODE))) {
+          Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_NODE)))
+        } else {
+          Optional.empty()
+        }
+      val group =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_GROUP))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_GROUP)))
+        } else {
+          Optional.empty()
+        }
+      val endpoint =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENDPOINT))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT)))
+        } else {
+          Optional.empty()
+        }
+      val cluster =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_CLUSTER))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_CLUSTER)))
+        } else {
+          Optional.empty()
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return BindingClusterTargetStruct(node, group, endpoint, cluster, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
new file mode 100644
index 00000000000000..c6b0dea505512d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
@@ -0,0 +1,72 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class BridgedDeviceBasicInformationClusterProductAppearanceStruct(
+  val finish: UInt,
+  val primaryColor: UInt?
+) {
+  override fun toString(): String = buildString {
+    append("BridgedDeviceBasicInformationClusterProductAppearanceStruct {\n")
+    append("\tfinish : $finish\n")
+    append("\tprimaryColor : $primaryColor\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FINISH), finish)
+      if (primaryColor != null) {
+        put(ContextSpecificTag(TAG_PRIMARY_COLOR), primaryColor)
+      } else {
+        putNull(ContextSpecificTag(TAG_PRIMARY_COLOR))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FINISH = 0
+    private const val TAG_PRIMARY_COLOR = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BridgedDeviceBasicInformationClusterProductAppearanceStruct {
+      tlvReader.enterStructure(tlvTag)
+      val finish = tlvReader.getUInt(ContextSpecificTag(TAG_FINISH))
+      val primaryColor =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_PRIMARY_COLOR))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PRIMARY_COLOR))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return BridgedDeviceBasicInformationClusterProductAppearanceStruct(finish, primaryColor)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt
new file mode 100644
index 00000000000000..78dbdfba00b026
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt
@@ -0,0 +1,105 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ChannelClusterChannelInfoStruct(
+  val majorNumber: UShort,
+  val minorNumber: UShort,
+  val name: Optional<String>,
+  val callSign: Optional<String>,
+  val affiliateCallSign: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("ChannelClusterChannelInfoStruct {\n")
+    append("\tmajorNumber : $majorNumber\n")
+    append("\tminorNumber : $minorNumber\n")
+    append("\tname : $name\n")
+    append("\tcallSign : $callSign\n")
+    append("\taffiliateCallSign : $affiliateCallSign\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_MAJOR_NUMBER), majorNumber)
+      put(ContextSpecificTag(TAG_MINOR_NUMBER), minorNumber)
+      if (name.isPresent) {
+        val optname = name.get()
+        put(ContextSpecificTag(TAG_NAME), optname)
+      }
+      if (callSign.isPresent) {
+        val optcallSign = callSign.get()
+        put(ContextSpecificTag(TAG_CALL_SIGN), optcallSign)
+      }
+      if (affiliateCallSign.isPresent) {
+        val optaffiliateCallSign = affiliateCallSign.get()
+        put(ContextSpecificTag(TAG_AFFILIATE_CALL_SIGN), optaffiliateCallSign)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MAJOR_NUMBER = 0
+    private const val TAG_MINOR_NUMBER = 1
+    private const val TAG_NAME = 2
+    private const val TAG_CALL_SIGN = 3
+    private const val TAG_AFFILIATE_CALL_SIGN = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChannelClusterChannelInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val majorNumber = tlvReader.getUShort(ContextSpecificTag(TAG_MAJOR_NUMBER))
+      val minorNumber = tlvReader.getUShort(ContextSpecificTag(TAG_MINOR_NUMBER))
+      val name =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NAME)))
+        } else {
+          Optional.empty()
+        }
+      val callSign =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_CALL_SIGN))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_CALL_SIGN)))
+        } else {
+          Optional.empty()
+        }
+      val affiliateCallSign =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_AFFILIATE_CALL_SIGN))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_AFFILIATE_CALL_SIGN)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return ChannelClusterChannelInfoStruct(
+        majorNumber,
+        minorNumber,
+        name,
+        callSign,
+        affiliateCallSign
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt
new file mode 100644
index 00000000000000..cb1ab50c1e95db
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt
@@ -0,0 +1,86 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ChannelClusterLineupInfoStruct(
+  val operatorName: String,
+  val lineupName: Optional<String>,
+  val postalCode: Optional<String>,
+  val lineupInfoType: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ChannelClusterLineupInfoStruct {\n")
+    append("\toperatorName : $operatorName\n")
+    append("\tlineupName : $lineupName\n")
+    append("\tpostalCode : $postalCode\n")
+    append("\tlineupInfoType : $lineupInfoType\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OPERATOR_NAME), operatorName)
+      if (lineupName.isPresent) {
+        val optlineupName = lineupName.get()
+        put(ContextSpecificTag(TAG_LINEUP_NAME), optlineupName)
+      }
+      if (postalCode.isPresent) {
+        val optpostalCode = postalCode.get()
+        put(ContextSpecificTag(TAG_POSTAL_CODE), optpostalCode)
+      }
+      put(ContextSpecificTag(TAG_LINEUP_INFO_TYPE), lineupInfoType)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OPERATOR_NAME = 0
+    private const val TAG_LINEUP_NAME = 1
+    private const val TAG_POSTAL_CODE = 2
+    private const val TAG_LINEUP_INFO_TYPE = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChannelClusterLineupInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val operatorName = tlvReader.getString(ContextSpecificTag(TAG_OPERATOR_NAME))
+      val lineupName =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_LINEUP_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_LINEUP_NAME)))
+        } else {
+          Optional.empty()
+        }
+      val postalCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_POSTAL_CODE))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_POSTAL_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val lineupInfoType = tlvReader.getUInt(ContextSpecificTag(TAG_LINEUP_INFO_TYPE))
+
+      tlvReader.exitContainer()
+
+      return ChannelClusterLineupInfoStruct(operatorName, lineupName, postalCode, lineupInfoType)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
new file mode 100644
index 00000000000000..e58a8923415e3b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterAdditionalInfoStruct(val name: String, val value: String) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterAdditionalInfoStruct {\n")
+    append("\tname : $name\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NAME), name)
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NAME = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterAdditionalInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterAdditionalInfoStruct(name, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
new file mode 100644
index 00000000000000..7fc9456852969f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
@@ -0,0 +1,155 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterBrandingInformationStruct(
+  val providerName: String,
+  val background: Optional<ContentLauncherClusterStyleInformationStruct>,
+  val logo: Optional<ContentLauncherClusterStyleInformationStruct>,
+  val progressBar: Optional<ContentLauncherClusterStyleInformationStruct>,
+  val splash: Optional<ContentLauncherClusterStyleInformationStruct>,
+  val waterMark: Optional<ContentLauncherClusterStyleInformationStruct>
+) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterBrandingInformationStruct {\n")
+    append("\tproviderName : $providerName\n")
+    append("\tbackground : $background\n")
+    append("\tlogo : $logo\n")
+    append("\tprogressBar : $progressBar\n")
+    append("\tsplash : $splash\n")
+    append("\twaterMark : $waterMark\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PROVIDER_NAME), providerName)
+      if (background.isPresent) {
+        val optbackground = background.get()
+        optbackground.toTlv(ContextSpecificTag(TAG_BACKGROUND), this)
+      }
+      if (logo.isPresent) {
+        val optlogo = logo.get()
+        optlogo.toTlv(ContextSpecificTag(TAG_LOGO), this)
+      }
+      if (progressBar.isPresent) {
+        val optprogressBar = progressBar.get()
+        optprogressBar.toTlv(ContextSpecificTag(TAG_PROGRESS_BAR), this)
+      }
+      if (splash.isPresent) {
+        val optsplash = splash.get()
+        optsplash.toTlv(ContextSpecificTag(TAG_SPLASH), this)
+      }
+      if (waterMark.isPresent) {
+        val optwaterMark = waterMark.get()
+        optwaterMark.toTlv(ContextSpecificTag(TAG_WATER_MARK), this)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PROVIDER_NAME = 0
+    private const val TAG_BACKGROUND = 1
+    private const val TAG_LOGO = 2
+    private const val TAG_PROGRESS_BAR = 3
+    private const val TAG_SPLASH = 4
+    private const val TAG_WATER_MARK = 5
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ContentLauncherClusterBrandingInformationStruct {
+      tlvReader.enterStructure(tlvTag)
+      val providerName = tlvReader.getString(ContextSpecificTag(TAG_PROVIDER_NAME))
+      val background =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_BACKGROUND))) {
+          Optional.of(
+            ContentLauncherClusterStyleInformationStruct.fromTlv(
+              ContextSpecificTag(TAG_BACKGROUND),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val logo =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_LOGO))) {
+          Optional.of(
+            ContentLauncherClusterStyleInformationStruct.fromTlv(
+              ContextSpecificTag(TAG_LOGO),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val progressBar =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_PROGRESS_BAR))) {
+          Optional.of(
+            ContentLauncherClusterStyleInformationStruct.fromTlv(
+              ContextSpecificTag(TAG_PROGRESS_BAR),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val splash =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_SPLASH))) {
+          Optional.of(
+            ContentLauncherClusterStyleInformationStruct.fromTlv(
+              ContextSpecificTag(TAG_SPLASH),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val waterMark =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_WATER_MARK))) {
+          Optional.of(
+            ContentLauncherClusterStyleInformationStruct.fromTlv(
+              ContextSpecificTag(TAG_WATER_MARK),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterBrandingInformationStruct(
+        providerName,
+        background,
+        logo,
+        progressBar,
+        splash,
+        waterMark
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
new file mode 100644
index 00000000000000..edb9b9abc81976
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterContentSearchStruct(
+  val parameterList: List<ContentLauncherClusterParameterStruct>
+) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterContentSearchStruct {\n")
+    append("\tparameterList : $parameterList\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_PARAMETER_LIST))
+      for (item in parameterList.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PARAMETER_LIST = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterContentSearchStruct {
+      tlvReader.enterStructure(tlvTag)
+      val parameterList =
+        buildList<ContentLauncherClusterParameterStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PARAMETER_LIST))
+          while (!tlvReader.isEndOfContainer()) {
+            add(ContentLauncherClusterParameterStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterContentSearchStruct(parameterList)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
new file mode 100644
index 00000000000000..02b1322f5f9f17
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterDimensionStruct(
+  val width: Double,
+  val height: Double,
+  val metric: UInt
+) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterDimensionStruct {\n")
+    append("\twidth : $width\n")
+    append("\theight : $height\n")
+    append("\tmetric : $metric\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_WIDTH), width)
+      put(ContextSpecificTag(TAG_HEIGHT), height)
+      put(ContextSpecificTag(TAG_METRIC), metric)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_WIDTH = 0
+    private const val TAG_HEIGHT = 1
+    private const val TAG_METRIC = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterDimensionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val width = tlvReader.getDouble(ContextSpecificTag(TAG_WIDTH))
+      val height = tlvReader.getDouble(ContextSpecificTag(TAG_HEIGHT))
+      val metric = tlvReader.getUInt(ContextSpecificTag(TAG_METRIC))
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterDimensionStruct(width, height, metric)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt
new file mode 100644
index 00000000000000..ee1efa7365917b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt
@@ -0,0 +1,86 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterParameterStruct(
+  val type: UInt,
+  val value: String,
+  val externalIDList: Optional<List<ContentLauncherClusterAdditionalInfoStruct>>
+) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterParameterStruct {\n")
+    append("\ttype : $type\n")
+    append("\tvalue : $value\n")
+    append("\texternalIDList : $externalIDList\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_TYPE), type)
+      put(ContextSpecificTag(TAG_VALUE), value)
+      if (externalIDList.isPresent) {
+        val optexternalIDList = externalIDList.get()
+        startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))
+        for (item in optexternalIDList.iterator()) {
+          item.toTlv(AnonymousTag, this)
+        }
+        endArray()
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_TYPE = 0
+    private const val TAG_VALUE = 1
+    private const val TAG_EXTERNAL_I_D_LIST = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterParameterStruct {
+      tlvReader.enterStructure(tlvTag)
+      val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE))
+      val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE))
+      val externalIDList =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))) {
+          Optional.of(
+            buildList<ContentLauncherClusterAdditionalInfoStruct> {
+              tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))
+              while (!tlvReader.isEndOfContainer()) {
+                add(ContentLauncherClusterAdditionalInfoStruct.fromTlv(AnonymousTag, tlvReader))
+              }
+              tlvReader.exitContainer()
+            }
+          )
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterParameterStruct(type, value, externalIDList)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
new file mode 100644
index 00000000000000..217d11a7712d03
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ContentLauncherClusterStyleInformationStruct(
+  val imageURL: Optional<String>,
+  val color: Optional<String>,
+  val size: Optional<ContentLauncherClusterDimensionStruct>
+) {
+  override fun toString(): String = buildString {
+    append("ContentLauncherClusterStyleInformationStruct {\n")
+    append("\timageURL : $imageURL\n")
+    append("\tcolor : $color\n")
+    append("\tsize : $size\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (imageURL.isPresent) {
+        val optimageURL = imageURL.get()
+        put(ContextSpecificTag(TAG_IMAGE_U_R_L), optimageURL)
+      }
+      if (color.isPresent) {
+        val optcolor = color.get()
+        put(ContextSpecificTag(TAG_COLOR), optcolor)
+      }
+      if (size.isPresent) {
+        val optsize = size.get()
+        optsize.toTlv(ContextSpecificTag(TAG_SIZE), this)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_IMAGE_U_R_L = 0
+    private const val TAG_COLOR = 1
+    private const val TAG_SIZE = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterStyleInformationStruct {
+      tlvReader.enterStructure(tlvTag)
+      val imageURL =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_IMAGE_U_R_L))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_IMAGE_U_R_L)))
+        } else {
+          Optional.empty()
+        }
+      val color =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_COLOR))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_COLOR)))
+        } else {
+          Optional.empty()
+        }
+      val size =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_SIZE))) {
+          Optional.of(
+            ContentLauncherClusterDimensionStruct.fromTlv(ContextSpecificTag(TAG_SIZE), tlvReader)
+          )
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return ContentLauncherClusterStyleInformationStruct(imageURL, color, size)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
new file mode 100644
index 00000000000000..1e4fd9f18cfe1d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterAverageLoadControlStruct(val loadAdjustment: Byte) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterAverageLoadControlStruct {\n")
+    append("\tloadAdjustment : $loadAdjustment\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LOAD_ADJUSTMENT), loadAdjustment)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LOAD_ADJUSTMENT = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterAverageLoadControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val loadAdjustment = tlvReader.getByte(ContextSpecificTag(TAG_LOAD_ADJUSTMENT))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterAverageLoadControlStruct(loadAdjustment)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
new file mode 100644
index 00000000000000..1e23b648c727a9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterDutyCycleControlStruct(val dutyCycle: UByte) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterDutyCycleControlStruct {\n")
+    append("\tdutyCycle : $dutyCycle\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DUTY_CYCLE), dutyCycle)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DUTY_CYCLE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterDutyCycleControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val dutyCycle = tlvReader.getUByte(ContextSpecificTag(TAG_DUTY_CYCLE))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterDutyCycleControlStruct(dutyCycle)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
new file mode 100644
index 00000000000000..0be25f2696b61c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterHeatingSourceControlStruct(val heatingSource: UInt) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterHeatingSourceControlStruct {\n")
+    append("\theatingSource : $heatingSource\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_HEATING_SOURCE), heatingSource)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_HEATING_SOURCE = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterHeatingSourceControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val heatingSource = tlvReader.getUInt(ContextSpecificTag(TAG_HEATING_SOURCE))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterHeatingSourceControlStruct(heatingSource)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
new file mode 100644
index 00000000000000..fff221a680f729
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
@@ -0,0 +1,147 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventStruct(
+  val eventID: ByteArray,
+  val programID: ByteArray?,
+  val control: UInt,
+  val deviceClass: ULong,
+  val enrollmentGroup: Optional<UByte>,
+  val criticality: UInt,
+  val startTime: UInt?,
+  val transitions: List<DemandResponseLoadControlClusterLoadControlEventTransitionStruct>
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventStruct {\n")
+    append("\teventID : $eventID\n")
+    append("\tprogramID : $programID\n")
+    append("\tcontrol : $control\n")
+    append("\tdeviceClass : $deviceClass\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\tcriticality : $criticality\n")
+    append("\tstartTime : $startTime\n")
+    append("\ttransitions : $transitions\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      if (programID != null) {
+        put(ContextSpecificTag(TAG_PROGRAM_I_D), programID)
+      } else {
+        putNull(ContextSpecificTag(TAG_PROGRAM_I_D))
+      }
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass)
+      if (enrollmentGroup.isPresent) {
+        val optenrollmentGroup = enrollmentGroup.get()
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), optenrollmentGroup)
+      }
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      if (startTime != null) {
+        put(ContextSpecificTag(TAG_START_TIME), startTime)
+      } else {
+        putNull(ContextSpecificTag(TAG_START_TIME))
+      }
+      startArray(ContextSpecificTag(TAG_TRANSITIONS))
+      for (item in transitions.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_PROGRAM_I_D = 1
+    private const val TAG_CONTROL = 2
+    private const val TAG_DEVICE_CLASS = 3
+    private const val TAG_ENROLLMENT_GROUP = 4
+    private const val TAG_CRITICALITY = 5
+    private const val TAG_START_TIME = 6
+    private const val TAG_TRANSITIONS = 7
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventStruct {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val programID =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_I_D))
+          null
+        }
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val deviceClass = tlvReader.getULong(ContextSpecificTag(TAG_DEVICE_CLASS))
+      val enrollmentGroup =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENROLLMENT_GROUP))) {
+          Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_ENROLLMENT_GROUP)))
+        } else {
+          Optional.empty()
+        }
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val startTime =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_START_TIME))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_START_TIME))
+          null
+        }
+      val transitions =
+        buildList<DemandResponseLoadControlClusterLoadControlEventTransitionStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_TRANSITIONS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(
+              DemandResponseLoadControlClusterLoadControlEventTransitionStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventStruct(
+        eventID,
+        programID,
+        control,
+        deviceClass,
+        enrollmentGroup,
+        criticality,
+        startTime,
+        transitions
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
new file mode 100644
index 00000000000000..46c70edba6e5c8
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
@@ -0,0 +1,161 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+  val duration: UShort,
+  val control: UInt,
+  val temperatureControl: Optional<DemandResponseLoadControlClusterTemperatureControlStruct>,
+  val averageLoadControl: Optional<DemandResponseLoadControlClusterAverageLoadControlStruct>,
+  val dutyCycleControl: Optional<DemandResponseLoadControlClusterDutyCycleControlStruct>,
+  val powerSavingsControl: Optional<DemandResponseLoadControlClusterPowerSavingsControlStruct>,
+  val heatingSourceControl: Optional<DemandResponseLoadControlClusterHeatingSourceControlStruct>
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlEventTransitionStruct {\n")
+    append("\tduration : $duration\n")
+    append("\tcontrol : $control\n")
+    append("\ttemperatureControl : $temperatureControl\n")
+    append("\taverageLoadControl : $averageLoadControl\n")
+    append("\tdutyCycleControl : $dutyCycleControl\n")
+    append("\tpowerSavingsControl : $powerSavingsControl\n")
+    append("\theatingSourceControl : $heatingSourceControl\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DURATION), duration)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      if (temperatureControl.isPresent) {
+        val opttemperatureControl = temperatureControl.get()
+        opttemperatureControl.toTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), this)
+      }
+      if (averageLoadControl.isPresent) {
+        val optaverageLoadControl = averageLoadControl.get()
+        optaverageLoadControl.toTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), this)
+      }
+      if (dutyCycleControl.isPresent) {
+        val optdutyCycleControl = dutyCycleControl.get()
+        optdutyCycleControl.toTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), this)
+      }
+      if (powerSavingsControl.isPresent) {
+        val optpowerSavingsControl = powerSavingsControl.get()
+        optpowerSavingsControl.toTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), this)
+      }
+      if (heatingSourceControl.isPresent) {
+        val optheatingSourceControl = heatingSourceControl.get()
+        optheatingSourceControl.toTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), this)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DURATION = 0
+    private const val TAG_CONTROL = 1
+    private const val TAG_TEMPERATURE_CONTROL = 2
+    private const val TAG_AVERAGE_LOAD_CONTROL = 3
+    private const val TAG_DUTY_CYCLE_CONTROL = 4
+    private const val TAG_POWER_SAVINGS_CONTROL = 5
+    private const val TAG_HEATING_SOURCE_CONTROL = 6
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlEventTransitionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val duration = tlvReader.getUShort(ContextSpecificTag(TAG_DURATION))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val temperatureControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterTemperatureControlStruct.fromTlv(
+              ContextSpecificTag(TAG_TEMPERATURE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val averageLoadControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterAverageLoadControlStruct.fromTlv(
+              ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val dutyCycleControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterDutyCycleControlStruct.fromTlv(
+              ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val powerSavingsControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterPowerSavingsControlStruct.fromTlv(
+              ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val heatingSourceControl =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))) {
+          Optional.of(
+            DemandResponseLoadControlClusterHeatingSourceControlStruct.fromTlv(
+              ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlEventTransitionStruct(
+        duration,
+        control,
+        temperatureControl,
+        averageLoadControl,
+        dutyCycleControl,
+        powerSavingsControl,
+        heatingSourceControl
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
new file mode 100644
index 00000000000000..fd21d4d07fb729
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
@@ -0,0 +1,113 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterLoadControlProgramStruct(
+  val programID: ByteArray,
+  val name: String,
+  val enrollmentGroup: UByte?,
+  val randomStartMinutes: UByte?,
+  val randomDurationMinutes: UByte?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterLoadControlProgramStruct {\n")
+    append("\tprogramID : $programID\n")
+    append("\tname : $name\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\trandomStartMinutes : $randomStartMinutes\n")
+    append("\trandomDurationMinutes : $randomDurationMinutes\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PROGRAM_I_D), programID)
+      put(ContextSpecificTag(TAG_NAME), name)
+      if (enrollmentGroup != null) {
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup)
+      } else {
+        putNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+      }
+      if (randomStartMinutes != null) {
+        put(ContextSpecificTag(TAG_RANDOM_START_MINUTES), randomStartMinutes)
+      } else {
+        putNull(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+      }
+      if (randomDurationMinutes != null) {
+        put(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES), randomDurationMinutes)
+      } else {
+        putNull(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PROGRAM_I_D = 0
+    private const val TAG_NAME = 1
+    private const val TAG_ENROLLMENT_GROUP = 2
+    private const val TAG_RANDOM_START_MINUTES = 3
+    private const val TAG_RANDOM_DURATION_MINUTES = 4
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterLoadControlProgramStruct {
+      tlvReader.enterStructure(tlvTag)
+      val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val enrollmentGroup =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+          null
+        }
+      val randomStartMinutes =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_RANDOM_START_MINUTES))
+          null
+        }
+      val randomDurationMinutes =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_RANDOM_DURATION_MINUTES))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterLoadControlProgramStruct(
+        programID,
+        name,
+        enrollmentGroup,
+        randomStartMinutes,
+        randomDurationMinutes
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
new file mode 100644
index 00000000000000..363970d31ad65a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterPowerSavingsControlStruct(val powerSavings: UByte) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterPowerSavingsControlStruct {\n")
+    append("\tpowerSavings : $powerSavings\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_POWER_SAVINGS), powerSavings)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_POWER_SAVINGS = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterPowerSavingsControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val powerSavings = tlvReader.getUByte(ContextSpecificTag(TAG_POWER_SAVINGS))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterPowerSavingsControlStruct(powerSavings)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt
new file mode 100644
index 00000000000000..f9ea556026897f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterScopedLoadControlEventStruct.kt
@@ -0,0 +1,144 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterScopedLoadControlEventStruct(
+  val eventID: ByteArray,
+  val programControl: ByteArray,
+  val control: UInt,
+  val deviceClass: ULong,
+  val enrollmentGroup: UByte?,
+  val criticality: UInt,
+  val startTime: UInt?,
+  val transitions: List<DemandResponseLoadControlClusterLoadControlEventTransitionStruct>,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterScopedLoadControlEventStruct {\n")
+    append("\teventID : $eventID\n")
+    append("\tprogramControl : $programControl\n")
+    append("\tcontrol : $control\n")
+    append("\tdeviceClass : $deviceClass\n")
+    append("\tenrollmentGroup : $enrollmentGroup\n")
+    append("\tcriticality : $criticality\n")
+    append("\tstartTime : $startTime\n")
+    append("\ttransitions : $transitions\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EVENT_I_D), eventID)
+      put(ContextSpecificTag(TAG_PROGRAM_CONTROL), programControl)
+      put(ContextSpecificTag(TAG_CONTROL), control)
+      put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass)
+      if (enrollmentGroup != null) {
+        put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup)
+      } else {
+        putNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+      }
+      put(ContextSpecificTag(TAG_CRITICALITY), criticality)
+      if (startTime != null) {
+        put(ContextSpecificTag(TAG_START_TIME), startTime)
+      } else {
+        putNull(ContextSpecificTag(TAG_START_TIME))
+      }
+      startArray(ContextSpecificTag(TAG_TRANSITIONS))
+      for (item in transitions.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EVENT_I_D = 0
+    private const val TAG_PROGRAM_CONTROL = 1
+    private const val TAG_CONTROL = 2
+    private const val TAG_DEVICE_CLASS = 3
+    private const val TAG_ENROLLMENT_GROUP = 4
+    private const val TAG_CRITICALITY = 5
+    private const val TAG_START_TIME = 6
+    private const val TAG_TRANSITIONS = 7
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterScopedLoadControlEventStruct {
+      tlvReader.enterStructure(tlvTag)
+      val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D))
+      val programControl = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_CONTROL))
+      val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL))
+      val deviceClass = tlvReader.getULong(ContextSpecificTag(TAG_DEVICE_CLASS))
+      val enrollmentGroup =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ENROLLMENT_GROUP))
+          null
+        }
+      val criticality = tlvReader.getUInt(ContextSpecificTag(TAG_CRITICALITY))
+      val startTime =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUInt(ContextSpecificTag(TAG_START_TIME))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_START_TIME))
+          null
+        }
+      val transitions =
+        buildList<DemandResponseLoadControlClusterLoadControlEventTransitionStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_TRANSITIONS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(
+              DemandResponseLoadControlClusterLoadControlEventTransitionStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterScopedLoadControlEventStruct(
+        eventID,
+        programControl,
+        control,
+        deviceClass,
+        enrollmentGroup,
+        criticality,
+        startTime,
+        transitions,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
new file mode 100644
index 00000000000000..89d78db74606f3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
@@ -0,0 +1,146 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DemandResponseLoadControlClusterTemperatureControlStruct(
+  val coolingTempOffset: Optional<UShort>?,
+  val heatingtTempOffset: Optional<UShort>?,
+  val coolingTempSetpoint: Optional<Short>?,
+  val heatingTempSetpoint: Optional<Short>?
+) {
+  override fun toString(): String = buildString {
+    append("DemandResponseLoadControlClusterTemperatureControlStruct {\n")
+    append("\tcoolingTempOffset : $coolingTempOffset\n")
+    append("\theatingtTempOffset : $heatingtTempOffset\n")
+    append("\tcoolingTempSetpoint : $coolingTempSetpoint\n")
+    append("\theatingTempSetpoint : $heatingTempSetpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (coolingTempOffset != null) {
+        if (coolingTempOffset.isPresent) {
+          val optcoolingTempOffset = coolingTempOffset.get()
+          put(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET), optcoolingTempOffset)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))
+      }
+      if (heatingtTempOffset != null) {
+        if (heatingtTempOffset.isPresent) {
+          val optheatingtTempOffset = heatingtTempOffset.get()
+          put(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET), optheatingtTempOffset)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))
+      }
+      if (coolingTempSetpoint != null) {
+        if (coolingTempSetpoint.isPresent) {
+          val optcoolingTempSetpoint = coolingTempSetpoint.get()
+          put(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT), optcoolingTempSetpoint)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))
+      }
+      if (heatingTempSetpoint != null) {
+        if (heatingTempSetpoint.isPresent) {
+          val optheatingTempSetpoint = heatingTempSetpoint.get()
+          put(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT), optheatingTempSetpoint)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COOLING_TEMP_OFFSET = 0
+    private const val TAG_HEATINGT_TEMP_OFFSET = 1
+    private const val TAG_COOLING_TEMP_SETPOINT = 2
+    private const val TAG_HEATING_TEMP_SETPOINT = 3
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): DemandResponseLoadControlClusterTemperatureControlStruct {
+      tlvReader.enterStructure(tlvTag)
+      val coolingTempOffset =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))) {
+            Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_COOLING_TEMP_OFFSET))
+          null
+        }
+      val heatingtTempOffset =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))) {
+            Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATINGT_TEMP_OFFSET))
+          null
+        }
+      val coolingTempSetpoint =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))) {
+            Optional.of(tlvReader.getShort(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_COOLING_TEMP_SETPOINT))
+          null
+        }
+      val heatingTempSetpoint =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))) {
+            Optional.of(tlvReader.getShort(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEATING_TEMP_SETPOINT))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DemandResponseLoadControlClusterTemperatureControlStruct(
+        coolingTempOffset,
+        heatingtTempOffset,
+        coolingTempSetpoint,
+        heatingTempSetpoint
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
new file mode 100644
index 00000000000000..b7b19082af7379
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DescriptorClusterDeviceTypeStruct(val deviceType: UInt, val revision: UShort) {
+  override fun toString(): String = buildString {
+    append("DescriptorClusterDeviceTypeStruct {\n")
+    append("\tdeviceType : $deviceType\n")
+    append("\trevision : $revision\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_DEVICE_TYPE), deviceType)
+      put(ContextSpecificTag(TAG_REVISION), revision)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_DEVICE_TYPE = 0
+    private const val TAG_REVISION = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DescriptorClusterDeviceTypeStruct {
+      tlvReader.enterStructure(tlvTag)
+      val deviceType = tlvReader.getUInt(ContextSpecificTag(TAG_DEVICE_TYPE))
+      val revision = tlvReader.getUShort(ContextSpecificTag(TAG_REVISION))
+
+      tlvReader.exitContainer()
+
+      return DescriptorClusterDeviceTypeStruct(deviceType, revision)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
new file mode 100644
index 00000000000000..2dd5869528c27f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
@@ -0,0 +1,97 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DescriptorClusterSemanticTagStruct(
+  val mfgCode: UShort?,
+  val namespaceID: UInt,
+  val tag: UInt,
+  val label: Optional<String>?
+) {
+  override fun toString(): String = buildString {
+    append("DescriptorClusterSemanticTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tnamespaceID : $namespaceID\n")
+    append("\ttag : $tag\n")
+    append("\tlabel : $label\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode != null) {
+        put(ContextSpecificTag(TAG_MFG_CODE), mfgCode)
+      } else {
+        putNull(ContextSpecificTag(TAG_MFG_CODE))
+      }
+      put(ContextSpecificTag(TAG_NAMESPACE_I_D), namespaceID)
+      put(ContextSpecificTag(TAG_TAG), tag)
+      if (label != null) {
+        if (label.isPresent) {
+          val optlabel = label.get()
+          put(ContextSpecificTag(TAG_LABEL), optlabel)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_LABEL))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_NAMESPACE_I_D = 1
+    private const val TAG_TAG = 2
+    private const val TAG_LABEL = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DescriptorClusterSemanticTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_MFG_CODE))
+          null
+        }
+      val namespaceID = tlvReader.getUInt(ContextSpecificTag(TAG_NAMESPACE_I_D))
+      val tag = tlvReader.getUInt(ContextSpecificTag(TAG_TAG))
+      val label =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_LABEL))) {
+            Optional.of(tlvReader.getString(ContextSpecificTag(TAG_LABEL)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_LABEL))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return DescriptorClusterSemanticTagStruct(mfgCode, namespaceID, tag, label)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..d35df126ab13bd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DishwasherModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<DishwasherModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("DishwasherModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DishwasherModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<DishwasherModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(DishwasherModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return DishwasherModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..7e3d6bbe24ecdb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DishwasherModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("DishwasherModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DishwasherModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return DishwasherModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt
new file mode 100644
index 00000000000000..4ee0122fa76b0c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class DoorLockClusterCredentialStruct(val credentialType: UInt, val credentialIndex: UShort) {
+  override fun toString(): String = buildString {
+    append("DoorLockClusterCredentialStruct {\n")
+    append("\tcredentialType : $credentialType\n")
+    append("\tcredentialIndex : $credentialIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CREDENTIAL_TYPE), credentialType)
+      put(ContextSpecificTag(TAG_CREDENTIAL_INDEX), credentialIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CREDENTIAL_TYPE = 0
+    private const val TAG_CREDENTIAL_INDEX = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterCredentialStruct {
+      tlvReader.enterStructure(tlvTag)
+      val credentialType = tlvReader.getUInt(ContextSpecificTag(TAG_CREDENTIAL_TYPE))
+      val credentialIndex = tlvReader.getUShort(ContextSpecificTag(TAG_CREDENTIAL_INDEX))
+
+      tlvReader.exitContainer()
+
+      return DoorLockClusterCredentialStruct(credentialType, credentialIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
new file mode 100644
index 00000000000000..a81f4c8716c8e8
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
@@ -0,0 +1,81 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class EnergyEvseClusterChargingTargetStruct(
+  val targetTime: UShort,
+  val targetSoC: Optional<UByte>,
+  val addedEnergy: Optional<Long>
+) {
+  override fun toString(): String = buildString {
+    append("EnergyEvseClusterChargingTargetStruct {\n")
+    append("\ttargetTime : $targetTime\n")
+    append("\ttargetSoC : $targetSoC\n")
+    append("\taddedEnergy : $addedEnergy\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_TARGET_TIME), targetTime)
+      if (targetSoC.isPresent) {
+        val opttargetSoC = targetSoC.get()
+        put(ContextSpecificTag(TAG_TARGET_SO_C), opttargetSoC)
+      }
+      if (addedEnergy.isPresent) {
+        val optaddedEnergy = addedEnergy.get()
+        put(ContextSpecificTag(TAG_ADDED_ENERGY), optaddedEnergy)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_TARGET_TIME = 0
+    private const val TAG_TARGET_SO_C = 1
+    private const val TAG_ADDED_ENERGY = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterChargingTargetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val targetTime = tlvReader.getUShort(ContextSpecificTag(TAG_TARGET_TIME))
+      val targetSoC =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_TARGET_SO_C))) {
+          Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_TARGET_SO_C)))
+        } else {
+          Optional.empty()
+        }
+      val addedEnergy =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ADDED_ENERGY))) {
+          Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_ADDED_ENERGY)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return EnergyEvseClusterChargingTargetStruct(targetTime, targetSoC, addedEnergy)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt
new file mode 100644
index 00000000000000..07a231555999fa
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class FixedLabelClusterLabelStruct(val label: String, val value: String) {
+  override fun toString(): String = buildString {
+    append("FixedLabelClusterLabelStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): FixedLabelClusterLabelStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return FixedLabelClusterLabelStruct(label, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
new file mode 100644
index 00000000000000..e8638055916ae0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
@@ -0,0 +1,67 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralCommissioningClusterBasicCommissioningInfo(
+  val failSafeExpiryLengthSeconds: UShort,
+  val maxCumulativeFailsafeSeconds: UShort
+) {
+  override fun toString(): String = buildString {
+    append("GeneralCommissioningClusterBasicCommissioningInfo {\n")
+    append("\tfailSafeExpiryLengthSeconds : $failSafeExpiryLengthSeconds\n")
+    append("\tmaxCumulativeFailsafeSeconds : $maxCumulativeFailsafeSeconds\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FAIL_SAFE_EXPIRY_LENGTH_SECONDS), failSafeExpiryLengthSeconds)
+      put(ContextSpecificTag(TAG_MAX_CUMULATIVE_FAILSAFE_SECONDS), maxCumulativeFailsafeSeconds)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FAIL_SAFE_EXPIRY_LENGTH_SECONDS = 0
+    private const val TAG_MAX_CUMULATIVE_FAILSAFE_SECONDS = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): GeneralCommissioningClusterBasicCommissioningInfo {
+      tlvReader.enterStructure(tlvTag)
+      val failSafeExpiryLengthSeconds =
+        tlvReader.getUShort(ContextSpecificTag(TAG_FAIL_SAFE_EXPIRY_LENGTH_SECONDS))
+      val maxCumulativeFailsafeSeconds =
+        tlvReader.getUShort(ContextSpecificTag(TAG_MAX_CUMULATIVE_FAILSAFE_SECONDS))
+
+      tlvReader.exitContainer()
+
+      return GeneralCommissioningClusterBasicCommissioningInfo(
+        failSafeExpiryLengthSeconds,
+        maxCumulativeFailsafeSeconds
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
new file mode 100644
index 00000000000000..900e71adea7c6d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
@@ -0,0 +1,147 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GeneralDiagnosticsClusterNetworkInterface(
+  val name: String,
+  val isOperational: Boolean,
+  val offPremiseServicesReachableIPv4: Boolean?,
+  val offPremiseServicesReachableIPv6: Boolean?,
+  val hardwareAddress: ByteArray,
+  val IPv4Addresses: List<ByteArray>,
+  val IPv6Addresses: List<ByteArray>,
+  val type: UInt
+) {
+  override fun toString(): String = buildString {
+    append("GeneralDiagnosticsClusterNetworkInterface {\n")
+    append("\tname : $name\n")
+    append("\tisOperational : $isOperational\n")
+    append("\toffPremiseServicesReachableIPv4 : $offPremiseServicesReachableIPv4\n")
+    append("\toffPremiseServicesReachableIPv6 : $offPremiseServicesReachableIPv6\n")
+    append("\thardwareAddress : $hardwareAddress\n")
+    append("\tIPv4Addresses : $IPv4Addresses\n")
+    append("\tIPv6Addresses : $IPv6Addresses\n")
+    append("\ttype : $type\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NAME), name)
+      put(ContextSpecificTag(TAG_IS_OPERATIONAL), isOperational)
+      if (offPremiseServicesReachableIPv4 != null) {
+        put(
+          ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV4),
+          offPremiseServicesReachableIPv4
+        )
+      } else {
+        putNull(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV4))
+      }
+      if (offPremiseServicesReachableIPv6 != null) {
+        put(
+          ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV6),
+          offPremiseServicesReachableIPv6
+        )
+      } else {
+        putNull(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV6))
+      }
+      put(ContextSpecificTag(TAG_HARDWARE_ADDRESS), hardwareAddress)
+      startArray(ContextSpecificTag(TAG_I_PV4_ADDRESSES))
+      for (item in IPv4Addresses.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_I_PV6_ADDRESSES))
+      for (item in IPv6Addresses.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      put(ContextSpecificTag(TAG_TYPE), type)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NAME = 0
+    private const val TAG_IS_OPERATIONAL = 1
+    private const val TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV4 = 2
+    private const val TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV6 = 3
+    private const val TAG_HARDWARE_ADDRESS = 4
+    private const val TAG_I_PV4_ADDRESSES = 5
+    private const val TAG_I_PV6_ADDRESSES = 6
+    private const val TAG_TYPE = 7
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GeneralDiagnosticsClusterNetworkInterface {
+      tlvReader.enterStructure(tlvTag)
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val isOperational = tlvReader.getBoolean(ContextSpecificTag(TAG_IS_OPERATIONAL))
+      val offPremiseServicesReachableIPv4 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getBoolean(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV4))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV4))
+          null
+        }
+      val offPremiseServicesReachableIPv6 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getBoolean(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV6))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_OFF_PREMISE_SERVICES_REACHABLE_I_PV6))
+          null
+        }
+      val hardwareAddress = tlvReader.getByteArray(ContextSpecificTag(TAG_HARDWARE_ADDRESS))
+      val IPv4Addresses =
+        buildList<ByteArray> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_I_PV4_ADDRESSES))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getByteArray(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val IPv6Addresses =
+        buildList<ByteArray> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_I_PV6_ADDRESSES))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getByteArray(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE))
+
+      tlvReader.exitContainer()
+
+      return GeneralDiagnosticsClusterNetworkInterface(
+        name,
+        isOperational,
+        offPremiseServicesReachableIPv4,
+        offPremiseServicesReachableIPv6,
+        hardwareAddress,
+        IPv4Addresses,
+        IPv6Addresses,
+        type
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
new file mode 100644
index 00000000000000..cfa9eb7e88060c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
@@ -0,0 +1,90 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GroupKeyManagementClusterGroupInfoMapStruct(
+  val groupId: UShort,
+  val endpoints: List<UShort>,
+  val groupName: Optional<String>,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("GroupKeyManagementClusterGroupInfoMapStruct {\n")
+    append("\tgroupId : $groupId\n")
+    append("\tendpoints : $endpoints\n")
+    append("\tgroupName : $groupName\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_GROUP_ID), groupId)
+      startArray(ContextSpecificTag(TAG_ENDPOINTS))
+      for (item in endpoints.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      if (groupName.isPresent) {
+        val optgroupName = groupName.get()
+        put(ContextSpecificTag(TAG_GROUP_NAME), optgroupName)
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_GROUP_ID = 1
+    private const val TAG_ENDPOINTS = 2
+    private const val TAG_GROUP_NAME = 3
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupInfoMapStruct {
+      tlvReader.enterStructure(tlvTag)
+      val groupId = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_ID))
+      val endpoints =
+        buildList<UShort> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_ENDPOINTS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUShort(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val groupName =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_GROUP_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_GROUP_NAME)))
+        } else {
+          Optional.empty()
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return GroupKeyManagementClusterGroupInfoMapStruct(groupId, endpoints, groupName, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
new file mode 100644
index 00000000000000..96460161128bbe
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GroupKeyManagementClusterGroupKeyMapStruct(
+  val groupId: UShort,
+  val groupKeySetID: UShort,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("GroupKeyManagementClusterGroupKeyMapStruct {\n")
+    append("\tgroupId : $groupId\n")
+    append("\tgroupKeySetID : $groupKeySetID\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_GROUP_ID), groupId)
+      put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_GROUP_ID = 1
+    private const val TAG_GROUP_KEY_SET_I_D = 2
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeyMapStruct {
+      tlvReader.enterStructure(tlvTag)
+      val groupId = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_ID))
+      val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return GroupKeyManagementClusterGroupKeyMapStruct(groupId, groupKeySetID, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
new file mode 100644
index 00000000000000..2c8d334a4cffd9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
@@ -0,0 +1,159 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GroupKeyManagementClusterGroupKeySetStruct(
+  val groupKeySetID: UShort,
+  val groupKeySecurityPolicy: UInt,
+  val epochKey0: ByteArray?,
+  val epochStartTime0: ULong?,
+  val epochKey1: ByteArray?,
+  val epochStartTime1: ULong?,
+  val epochKey2: ByteArray?,
+  val epochStartTime2: ULong?
+) {
+  override fun toString(): String = buildString {
+    append("GroupKeyManagementClusterGroupKeySetStruct {\n")
+    append("\tgroupKeySetID : $groupKeySetID\n")
+    append("\tgroupKeySecurityPolicy : $groupKeySecurityPolicy\n")
+    append("\tepochKey0 : $epochKey0\n")
+    append("\tepochStartTime0 : $epochStartTime0\n")
+    append("\tepochKey1 : $epochKey1\n")
+    append("\tepochStartTime1 : $epochStartTime1\n")
+    append("\tepochKey2 : $epochKey2\n")
+    append("\tepochStartTime2 : $epochStartTime2\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID)
+      put(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY), groupKeySecurityPolicy)
+      if (epochKey0 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_KEY0), epochKey0)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_KEY0))
+      }
+      if (epochStartTime0 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_START_TIME0), epochStartTime0)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_START_TIME0))
+      }
+      if (epochKey1 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_KEY1), epochKey1)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_KEY1))
+      }
+      if (epochStartTime1 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_START_TIME1), epochStartTime1)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_START_TIME1))
+      }
+      if (epochKey2 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_KEY2), epochKey2)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_KEY2))
+      }
+      if (epochStartTime2 != null) {
+        put(ContextSpecificTag(TAG_EPOCH_START_TIME2), epochStartTime2)
+      } else {
+        putNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_GROUP_KEY_SET_I_D = 0
+    private const val TAG_GROUP_KEY_SECURITY_POLICY = 1
+    private const val TAG_EPOCH_KEY0 = 2
+    private const val TAG_EPOCH_START_TIME0 = 3
+    private const val TAG_EPOCH_KEY1 = 4
+    private const val TAG_EPOCH_START_TIME1 = 5
+    private const val TAG_EPOCH_KEY2 = 6
+    private const val TAG_EPOCH_START_TIME2 = 7
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeySetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D))
+      val groupKeySecurityPolicy =
+        tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY))
+      val epochKey0 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_EPOCH_KEY0))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_KEY0))
+          null
+        }
+      val epochStartTime0 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_EPOCH_START_TIME0))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_START_TIME0))
+          null
+        }
+      val epochKey1 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_EPOCH_KEY1))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_KEY1))
+          null
+        }
+      val epochStartTime1 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_EPOCH_START_TIME1))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_START_TIME1))
+          null
+        }
+      val epochKey2 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_EPOCH_KEY2))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_KEY2))
+          null
+        }
+      val epochStartTime2 =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_EPOCH_START_TIME2))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return GroupKeyManagementClusterGroupKeySetStruct(
+        groupKeySetID,
+        groupKeySecurityPolicy,
+        epochKey0,
+        epochStartTime0,
+        epochKey1,
+        epochStartTime1,
+        epochKey2,
+        epochStartTime2
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
new file mode 100644
index 00000000000000..32ce0e6298f485
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class HepaFilterMonitoringClusterReplacementProductStruct(
+  val productIdentifierType: UInt,
+  val productIdentifierValue: String
+) {
+  override fun toString(): String = buildString {
+    append("HepaFilterMonitoringClusterReplacementProductStruct {\n")
+    append("\tproductIdentifierType : $productIdentifierType\n")
+    append("\tproductIdentifierValue : $productIdentifierValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_TYPE), productIdentifierType)
+      put(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_VALUE), productIdentifierValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PRODUCT_IDENTIFIER_TYPE = 0
+    private const val TAG_PRODUCT_IDENTIFIER_VALUE = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): HepaFilterMonitoringClusterReplacementProductStruct {
+      tlvReader.enterStructure(tlvTag)
+      val productIdentifierType = tlvReader.getUInt(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_TYPE))
+      val productIdentifierValue =
+        tlvReader.getString(ContextSpecificTag(TAG_PRODUCT_IDENTIFIER_VALUE))
+
+      tlvReader.exitContainer()
+
+      return HepaFilterMonitoringClusterReplacementProductStruct(
+        productIdentifierType,
+        productIdentifierValue
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
new file mode 100644
index 00000000000000..2a7a56c9a650dd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class IcdManagementClusterMonitoringRegistrationStruct(
+  val checkInNodeID: ULong,
+  val monitoredSubject: ULong,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("IcdManagementClusterMonitoringRegistrationStruct {\n")
+    append("\tcheckInNodeID : $checkInNodeID\n")
+    append("\tmonitoredSubject : $monitoredSubject\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D), checkInNodeID)
+      put(ContextSpecificTag(TAG_MONITORED_SUBJECT), monitoredSubject)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CHECK_IN_NODE_I_D = 1
+    private const val TAG_MONITORED_SUBJECT = 2
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): IcdManagementClusterMonitoringRegistrationStruct {
+      tlvReader.enterStructure(tlvTag)
+      val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D))
+      val monitoredSubject = tlvReader.getULong(ContextSpecificTag(TAG_MONITORED_SUBJECT))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return IcdManagementClusterMonitoringRegistrationStruct(
+        checkInNodeID,
+        monitoredSubject,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..08988b2b2dfa27
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class LaundryWasherModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<LaundryWasherModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("LaundryWasherModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): LaundryWasherModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<LaundryWasherModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(LaundryWasherModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return LaundryWasherModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..0284a239b9b610
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class LaundryWasherModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("LaundryWasherModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): LaundryWasherModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return LaundryWasherModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt
new file mode 100644
index 00000000000000..ef3a028b680b8a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MediaInputClusterInputInfoStruct(
+  val index: UByte,
+  val inputType: UInt,
+  val name: String,
+  val description: String
+) {
+  override fun toString(): String = buildString {
+    append("MediaInputClusterInputInfoStruct {\n")
+    append("\tindex : $index\n")
+    append("\tinputType : $inputType\n")
+    append("\tname : $name\n")
+    append("\tdescription : $description\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_INDEX), index)
+      put(ContextSpecificTag(TAG_INPUT_TYPE), inputType)
+      put(ContextSpecificTag(TAG_NAME), name)
+      put(ContextSpecificTag(TAG_DESCRIPTION), description)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_INDEX = 0
+    private const val TAG_INPUT_TYPE = 1
+    private const val TAG_NAME = 2
+    private const val TAG_DESCRIPTION = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MediaInputClusterInputInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val index = tlvReader.getUByte(ContextSpecificTag(TAG_INDEX))
+      val inputType = tlvReader.getUInt(ContextSpecificTag(TAG_INPUT_TYPE))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+      val description = tlvReader.getString(ContextSpecificTag(TAG_DESCRIPTION))
+
+      tlvReader.exitContainer()
+
+      return MediaInputClusterInputInfoStruct(index, inputType, name, description)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
new file mode 100644
index 00000000000000..3052f1984c2412
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MediaPlaybackClusterPlaybackPositionStruct(val updatedAt: ULong, val position: ULong?) {
+  override fun toString(): String = buildString {
+    append("MediaPlaybackClusterPlaybackPositionStruct {\n")
+    append("\tupdatedAt : $updatedAt\n")
+    append("\tposition : $position\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_UPDATED_AT), updatedAt)
+      if (position != null) {
+        put(ContextSpecificTag(TAG_POSITION), position)
+      } else {
+        putNull(ContextSpecificTag(TAG_POSITION))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_UPDATED_AT = 0
+    private const val TAG_POSITION = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MediaPlaybackClusterPlaybackPositionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val updatedAt = tlvReader.getULong(ContextSpecificTag(TAG_UPDATED_AT))
+      val position =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_POSITION))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_POSITION))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return MediaPlaybackClusterPlaybackPositionStruct(updatedAt, position)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..481ae34118a03b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MicrowaveOvenModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<MicrowaveOvenModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("MicrowaveOvenModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MicrowaveOvenModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<MicrowaveOvenModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(MicrowaveOvenModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return MicrowaveOvenModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..d0d088a1d77b42
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class MicrowaveOvenModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("MicrowaveOvenModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MicrowaveOvenModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return MicrowaveOvenModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..8cb331e77ade86
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ModeSelectClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val semanticTags: List<ModeSelectClusterSemanticTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("ModeSelectClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tsemanticTags : $semanticTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_SEMANTIC_TAGS))
+      for (item in semanticTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_SEMANTIC_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ModeSelectClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val semanticTags =
+        buildList<ModeSelectClusterSemanticTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_SEMANTIC_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(ModeSelectClusterSemanticTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return ModeSelectClusterModeOptionStruct(label, mode, semanticTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
new file mode 100644
index 00000000000000..5b6d1ae0fb71f0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ModeSelectClusterSemanticTagStruct(val mfgCode: UShort, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("ModeSelectClusterSemanticTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_MFG_CODE), mfgCode)
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ModeSelectClusterSemanticTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode = tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE))
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return ModeSelectClusterSemanticTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
new file mode 100644
index 00000000000000..245061cc19fc46
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
@@ -0,0 +1,109 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class NetworkCommissioningClusterNetworkInfoStruct(
+  val networkID: ByteArray,
+  val connected: Boolean,
+  val networkIdentifier: Optional<ByteArray>?,
+  val clientIdentifier: Optional<ByteArray>?
+) {
+  override fun toString(): String = buildString {
+    append("NetworkCommissioningClusterNetworkInfoStruct {\n")
+    append("\tnetworkID : $networkID\n")
+    append("\tconnected : $connected\n")
+    append("\tnetworkIdentifier : $networkIdentifier\n")
+    append("\tclientIdentifier : $clientIdentifier\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NETWORK_I_D), networkID)
+      put(ContextSpecificTag(TAG_CONNECTED), connected)
+      if (networkIdentifier != null) {
+        if (networkIdentifier.isPresent) {
+          val optnetworkIdentifier = networkIdentifier.get()
+          put(ContextSpecificTag(TAG_NETWORK_IDENTIFIER), optnetworkIdentifier)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))
+      }
+      if (clientIdentifier != null) {
+        if (clientIdentifier.isPresent) {
+          val optclientIdentifier = clientIdentifier.get()
+          put(ContextSpecificTag(TAG_CLIENT_IDENTIFIER), optclientIdentifier)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NETWORK_I_D = 0
+    private const val TAG_CONNECTED = 1
+    private const val TAG_NETWORK_IDENTIFIER = 2
+    private const val TAG_CLIENT_IDENTIFIER = 3
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): NetworkCommissioningClusterNetworkInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_I_D))
+      val connected = tlvReader.getBoolean(ContextSpecificTag(TAG_CONNECTED))
+      val networkIdentifier =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))) {
+            Optional.of(tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_IDENTIFIER)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NETWORK_IDENTIFIER))
+          null
+        }
+      val clientIdentifier =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))) {
+            Optional.of(tlvReader.getByteArray(ContextSpecificTag(TAG_CLIENT_IDENTIFIER)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_CLIENT_IDENTIFIER))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return NetworkCommissioningClusterNetworkInfoStruct(
+        networkID,
+        connected,
+        networkIdentifier,
+        clientIdentifier
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
new file mode 100644
index 00000000000000..5057fa34bc1cbe
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
@@ -0,0 +1,101 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class NetworkCommissioningClusterThreadInterfaceScanResultStruct(
+  val panId: UShort,
+  val extendedPanId: ULong,
+  val networkName: String,
+  val channel: UShort,
+  val version: UByte,
+  val extendedAddress: ByteArray,
+  val rssi: Byte,
+  val lqi: UByte
+) {
+  override fun toString(): String = buildString {
+    append("NetworkCommissioningClusterThreadInterfaceScanResultStruct {\n")
+    append("\tpanId : $panId\n")
+    append("\textendedPanId : $extendedPanId\n")
+    append("\tnetworkName : $networkName\n")
+    append("\tchannel : $channel\n")
+    append("\tversion : $version\n")
+    append("\textendedAddress : $extendedAddress\n")
+    append("\trssi : $rssi\n")
+    append("\tlqi : $lqi\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PAN_ID), panId)
+      put(ContextSpecificTag(TAG_EXTENDED_PAN_ID), extendedPanId)
+      put(ContextSpecificTag(TAG_NETWORK_NAME), networkName)
+      put(ContextSpecificTag(TAG_CHANNEL), channel)
+      put(ContextSpecificTag(TAG_VERSION), version)
+      put(ContextSpecificTag(TAG_EXTENDED_ADDRESS), extendedAddress)
+      put(ContextSpecificTag(TAG_RSSI), rssi)
+      put(ContextSpecificTag(TAG_LQI), lqi)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PAN_ID = 0
+    private const val TAG_EXTENDED_PAN_ID = 1
+    private const val TAG_NETWORK_NAME = 2
+    private const val TAG_CHANNEL = 3
+    private const val TAG_VERSION = 4
+    private const val TAG_EXTENDED_ADDRESS = 5
+    private const val TAG_RSSI = 6
+    private const val TAG_LQI = 7
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): NetworkCommissioningClusterThreadInterfaceScanResultStruct {
+      tlvReader.enterStructure(tlvTag)
+      val panId = tlvReader.getUShort(ContextSpecificTag(TAG_PAN_ID))
+      val extendedPanId = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_ID))
+      val networkName = tlvReader.getString(ContextSpecificTag(TAG_NETWORK_NAME))
+      val channel = tlvReader.getUShort(ContextSpecificTag(TAG_CHANNEL))
+      val version = tlvReader.getUByte(ContextSpecificTag(TAG_VERSION))
+      val extendedAddress = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_ADDRESS))
+      val rssi = tlvReader.getByte(ContextSpecificTag(TAG_RSSI))
+      val lqi = tlvReader.getUByte(ContextSpecificTag(TAG_LQI))
+
+      tlvReader.exitContainer()
+
+      return NetworkCommissioningClusterThreadInterfaceScanResultStruct(
+        panId,
+        extendedPanId,
+        networkName,
+        channel,
+        version,
+        extendedAddress,
+        rssi,
+        lqi
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
new file mode 100644
index 00000000000000..3d2c8ea65a32bd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
+  val security: UInt,
+  val ssid: ByteArray,
+  val bssid: ByteArray,
+  val channel: UShort,
+  val wiFiBand: UInt,
+  val rssi: Byte
+) {
+  override fun toString(): String = buildString {
+    append("NetworkCommissioningClusterWiFiInterfaceScanResultStruct {\n")
+    append("\tsecurity : $security\n")
+    append("\tssid : $ssid\n")
+    append("\tbssid : $bssid\n")
+    append("\tchannel : $channel\n")
+    append("\twiFiBand : $wiFiBand\n")
+    append("\trssi : $rssi\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SECURITY), security)
+      put(ContextSpecificTag(TAG_SSID), ssid)
+      put(ContextSpecificTag(TAG_BSSID), bssid)
+      put(ContextSpecificTag(TAG_CHANNEL), channel)
+      put(ContextSpecificTag(TAG_WI_FI_BAND), wiFiBand)
+      put(ContextSpecificTag(TAG_RSSI), rssi)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SECURITY = 0
+    private const val TAG_SSID = 1
+    private const val TAG_BSSID = 2
+    private const val TAG_CHANNEL = 3
+    private const val TAG_WI_FI_BAND = 4
+    private const val TAG_RSSI = 5
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): NetworkCommissioningClusterWiFiInterfaceScanResultStruct {
+      tlvReader.enterStructure(tlvTag)
+      val security = tlvReader.getUInt(ContextSpecificTag(TAG_SECURITY))
+      val ssid = tlvReader.getByteArray(ContextSpecificTag(TAG_SSID))
+      val bssid = tlvReader.getByteArray(ContextSpecificTag(TAG_BSSID))
+      val channel = tlvReader.getUShort(ContextSpecificTag(TAG_CHANNEL))
+      val wiFiBand = tlvReader.getUInt(ContextSpecificTag(TAG_WI_FI_BAND))
+      val rssi = tlvReader.getByte(ContextSpecificTag(TAG_RSSI))
+
+      tlvReader.exitContainer()
+
+      return NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
+        security,
+        ssid,
+        bssid,
+        channel,
+        wiFiBand,
+        rssi
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
new file mode 100644
index 00000000000000..66de75d6e3efc1
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalCredentialsClusterFabricDescriptorStruct(
+  val rootPublicKey: ByteArray,
+  val vendorID: UShort,
+  val fabricID: ULong,
+  val nodeID: ULong,
+  val label: String,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("OperationalCredentialsClusterFabricDescriptorStruct {\n")
+    append("\trootPublicKey : $rootPublicKey\n")
+    append("\tvendorID : $vendorID\n")
+    append("\tfabricID : $fabricID\n")
+    append("\tnodeID : $nodeID\n")
+    append("\tlabel : $label\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY), rootPublicKey)
+      put(ContextSpecificTag(TAG_VENDOR_I_D), vendorID)
+      put(ContextSpecificTag(TAG_FABRIC_I_D), fabricID)
+      put(ContextSpecificTag(TAG_NODE_I_D), nodeID)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ROOT_PUBLIC_KEY = 1
+    private const val TAG_VENDOR_I_D = 2
+    private const val TAG_FABRIC_I_D = 3
+    private const val TAG_NODE_I_D = 4
+    private const val TAG_LABEL = 5
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OperationalCredentialsClusterFabricDescriptorStruct {
+      tlvReader.enterStructure(tlvTag)
+      val rootPublicKey = tlvReader.getByteArray(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY))
+      val vendorID = tlvReader.getUShort(ContextSpecificTag(TAG_VENDOR_I_D))
+      val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_I_D))
+      val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D))
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return OperationalCredentialsClusterFabricDescriptorStruct(
+        rootPublicKey,
+        vendorID,
+        fabricID,
+        nodeID,
+        label,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
new file mode 100644
index 00000000000000..ab86611164d93d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalCredentialsClusterNOCStruct(
+  val noc: ByteArray,
+  val icac: ByteArray?,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("OperationalCredentialsClusterNOCStruct {\n")
+    append("\tnoc : $noc\n")
+    append("\ticac : $icac\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NOC), noc)
+      if (icac != null) {
+        put(ContextSpecificTag(TAG_ICAC), icac)
+      } else {
+        putNull(ContextSpecificTag(TAG_ICAC))
+      }
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NOC = 1
+    private const val TAG_ICAC = 2
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalCredentialsClusterNOCStruct {
+      tlvReader.enterStructure(tlvTag)
+      val noc = tlvReader.getByteArray(ContextSpecificTag(TAG_NOC))
+      val icac =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByteArray(ContextSpecificTag(TAG_ICAC))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_ICAC))
+          null
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return OperationalCredentialsClusterNOCStruct(noc, icac, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
new file mode 100644
index 00000000000000..f49646d015d186
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalStateClusterErrorStateStruct(
+  val errorStateID: UInt,
+  val errorStateLabel: Optional<String>,
+  val errorStateDetails: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OperationalStateClusterErrorStateStruct {\n")
+    append("\terrorStateID : $errorStateID\n")
+    append("\terrorStateLabel : $errorStateLabel\n")
+    append("\terrorStateDetails : $errorStateDetails\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID)
+      if (errorStateLabel.isPresent) {
+        val opterrorStateLabel = errorStateLabel.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel)
+      }
+      if (errorStateDetails.isPresent) {
+        val opterrorStateDetails = errorStateDetails.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_DETAILS), opterrorStateDetails)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE_I_D = 0
+    private const val TAG_ERROR_STATE_LABEL = 1
+    private const val TAG_ERROR_STATE_DETAILS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterErrorStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D))
+      val errorStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+      val errorStateDetails =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_DETAILS))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_DETAILS)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OperationalStateClusterErrorStateStruct(
+        errorStateID,
+        errorStateLabel,
+        errorStateDetails
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
new file mode 100644
index 00000000000000..238035d38a060e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OperationalStateClusterOperationalStateStruct(
+  val operationalStateID: UInt,
+  val operationalStateLabel: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OperationalStateClusterOperationalStateStruct {\n")
+    append("\toperationalStateID : $operationalStateID\n")
+    append("\toperationalStateLabel : $operationalStateLabel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID)
+      if (operationalStateLabel.isPresent) {
+        val optoperationalStateLabel = operationalStateLabel.get()
+        put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OPERATIONAL_STATE_I_D = 0
+    private const val TAG_OPERATIONAL_STATE_LABEL = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterOperationalStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D))
+      val operationalStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OperationalStateClusterOperationalStateStruct(
+        operationalStateID,
+        operationalStateLabel
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
new file mode 100644
index 00000000000000..1fe882a3da1674
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OtaSoftwareUpdateRequestorClusterProviderLocation(
+  val providerNodeID: ULong,
+  val endpoint: UShort,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("OtaSoftwareUpdateRequestorClusterProviderLocation {\n")
+    append("\tproviderNodeID : $providerNodeID\n")
+    append("\tendpoint : $endpoint\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_PROVIDER_NODE_I_D), providerNodeID)
+      put(ContextSpecificTag(TAG_ENDPOINT), endpoint)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_PROVIDER_NODE_I_D = 1
+    private const val TAG_ENDPOINT = 2
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OtaSoftwareUpdateRequestorClusterProviderLocation {
+      tlvReader.enterStructure(tlvTag)
+      val providerNodeID = tlvReader.getULong(ContextSpecificTag(TAG_PROVIDER_NODE_I_D))
+      val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return OtaSoftwareUpdateRequestorClusterProviderLocation(
+        providerNodeID,
+        endpoint,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
new file mode 100644
index 00000000000000..5b98278cda9aa4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterErrorStateStruct(
+  val errorStateID: UInt,
+  val errorStateLabel: Optional<String>,
+  val errorStateDetails: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterErrorStateStruct {\n")
+    append("\terrorStateID : $errorStateID\n")
+    append("\terrorStateLabel : $errorStateLabel\n")
+    append("\terrorStateDetails : $errorStateDetails\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID)
+      if (errorStateLabel.isPresent) {
+        val opterrorStateLabel = errorStateLabel.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel)
+      }
+      if (errorStateDetails.isPresent) {
+        val opterrorStateDetails = errorStateDetails.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_DETAILS), opterrorStateDetails)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE_I_D = 0
+    private const val TAG_ERROR_STATE_LABEL = 1
+    private const val TAG_ERROR_STATE_DETAILS = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterErrorStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D))
+      val errorStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+      val errorStateDetails =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_DETAILS))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_DETAILS)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterErrorStateStruct(
+        errorStateID,
+        errorStateLabel,
+        errorStateDetails
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
new file mode 100644
index 00000000000000..51b2811215e0cc
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenCavityOperationalStateClusterOperationalStateStruct(
+  val operationalStateID: UInt,
+  val operationalStateLabel: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("OvenCavityOperationalStateClusterOperationalStateStruct {\n")
+    append("\toperationalStateID : $operationalStateID\n")
+    append("\toperationalStateLabel : $operationalStateLabel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID)
+      if (operationalStateLabel.isPresent) {
+        val optoperationalStateLabel = operationalStateLabel.get()
+        put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OPERATIONAL_STATE_I_D = 0
+    private const val TAG_OPERATIONAL_STATE_LABEL = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): OvenCavityOperationalStateClusterOperationalStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D))
+      val operationalStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenCavityOperationalStateClusterOperationalStateStruct(
+        operationalStateID,
+        operationalStateLabel
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..de09bc2413be77
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<OvenModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("OvenModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OvenModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<OvenModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(OvenModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return OvenModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..f957f7073fa77a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class OvenModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("OvenModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OvenModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return OvenModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
new file mode 100644
index 00000000000000..b052cd4bd801ed
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
@@ -0,0 +1,82 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterBatChargeFaultChangeType(
+  val current: List<UInt>,
+  val previous: List<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterBatChargeFaultChangeType {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterBatChargeFaultChangeType {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterBatChargeFaultChangeType(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
new file mode 100644
index 00000000000000..e6ed2093eea21a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
@@ -0,0 +1,79 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterBatFaultChangeType(val current: List<UInt>, val previous: List<UInt>) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterBatFaultChangeType {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterBatFaultChangeType {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterBatFaultChangeType(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
new file mode 100644
index 00000000000000..e2849017a263c9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
@@ -0,0 +1,79 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class PowerSourceClusterWiredFaultChangeType(val current: List<UInt>, val previous: List<UInt>) {
+  override fun toString(): String = buildString {
+    append("PowerSourceClusterWiredFaultChangeType {\n")
+    append("\tcurrent : $current\n")
+    append("\tprevious : $previous\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_CURRENT))
+      for (item in current.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_PREVIOUS))
+      for (item in previous.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CURRENT = 0
+    private const val TAG_PREVIOUS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): PowerSourceClusterWiredFaultChangeType {
+      tlvReader.enterStructure(tlvTag)
+      val current =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_CURRENT))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val previous =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_PREVIOUS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return PowerSourceClusterWiredFaultChangeType(current, previous)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..41c4276b72942a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(
+              RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
+            )
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
+        label,
+        mode,
+        modeTags
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..66ac75104984a2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(
+  val mfgCode: Optional<UShort>,
+  val value: UInt
+) {
+  override fun toString(): String = buildString {
+    append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..b718ee935b7990
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcCleanModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<RvcCleanModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("RvcCleanModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcCleanModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<RvcCleanModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(RvcCleanModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return RvcCleanModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..b6670bdcd7b955
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcCleanModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("RvcCleanModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcCleanModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return RvcCleanModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
new file mode 100644
index 00000000000000..4907820103b662
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcOperationalStateClusterErrorStateStruct(
+  val errorStateID: UInt,
+  val errorStateLabel: Optional<String>,
+  val errorStateDetails: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("RvcOperationalStateClusterErrorStateStruct {\n")
+    append("\terrorStateID : $errorStateID\n")
+    append("\terrorStateLabel : $errorStateLabel\n")
+    append("\terrorStateDetails : $errorStateDetails\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID)
+      if (errorStateLabel.isPresent) {
+        val opterrorStateLabel = errorStateLabel.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel)
+      }
+      if (errorStateDetails.isPresent) {
+        val opterrorStateDetails = errorStateDetails.get()
+        put(ContextSpecificTag(TAG_ERROR_STATE_DETAILS), opterrorStateDetails)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ERROR_STATE_I_D = 0
+    private const val TAG_ERROR_STATE_LABEL = 1
+    private const val TAG_ERROR_STATE_DETAILS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcOperationalStateClusterErrorStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D))
+      val errorStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+      val errorStateDetails =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_DETAILS))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_DETAILS)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return RvcOperationalStateClusterErrorStateStruct(
+        errorStateID,
+        errorStateLabel,
+        errorStateDetails
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
new file mode 100644
index 00000000000000..1e5548ff7677a9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcOperationalStateClusterOperationalStateStruct(
+  val operationalStateID: UInt,
+  val operationalStateLabel: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("RvcOperationalStateClusterOperationalStateStruct {\n")
+    append("\toperationalStateID : $operationalStateID\n")
+    append("\toperationalStateLabel : $operationalStateLabel\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID)
+      if (operationalStateLabel.isPresent) {
+        val optoperationalStateLabel = operationalStateLabel.get()
+        put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OPERATIONAL_STATE_I_D = 0
+    private const val TAG_OPERATIONAL_STATE_LABEL = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): RvcOperationalStateClusterOperationalStateStruct {
+      tlvReader.enterStructure(tlvTag)
+      val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D))
+      val operationalStateLabel =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return RvcOperationalStateClusterOperationalStateStruct(
+        operationalStateID,
+        operationalStateLabel
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
new file mode 100644
index 00000000000000..937a0303a98b04
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcRunModeClusterModeOptionStruct(
+  val label: String,
+  val mode: UByte,
+  val modeTags: List<RvcRunModeClusterModeTagStruct>
+) {
+  override fun toString(): String = buildString {
+    append("RvcRunModeClusterModeOptionStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tmode : $mode\n")
+    append("\tmodeTags : $modeTags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_MODE), mode)
+      startArray(ContextSpecificTag(TAG_MODE_TAGS))
+      for (item in modeTags.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_MODE = 1
+    private const val TAG_MODE_TAGS = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcRunModeClusterModeOptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val mode = tlvReader.getUByte(ContextSpecificTag(TAG_MODE))
+      val modeTags =
+        buildList<RvcRunModeClusterModeTagStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_MODE_TAGS))
+          while (!tlvReader.isEndOfContainer()) {
+            add(RvcRunModeClusterModeTagStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return RvcRunModeClusterModeOptionStruct(label, mode, modeTags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
new file mode 100644
index 00000000000000..055336e7a1e250
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class RvcRunModeClusterModeTagStruct(val mfgCode: Optional<UShort>, val value: UInt) {
+  override fun toString(): String = buildString {
+    append("RvcRunModeClusterModeTagStruct {\n")
+    append("\tmfgCode : $mfgCode\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (mfgCode.isPresent) {
+        val optmfgCode = mfgCode.get()
+        put(ContextSpecificTag(TAG_MFG_CODE), optmfgCode)
+      }
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MFG_CODE = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcRunModeClusterModeTagStruct {
+      tlvReader.enterStructure(tlvTag)
+      val mfgCode =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_MFG_CODE))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MFG_CODE)))
+        } else {
+          Optional.empty()
+        }
+      val value = tlvReader.getUInt(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return RvcRunModeClusterModeTagStruct(mfgCode, value)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt
new file mode 100644
index 00000000000000..df599d883e82ca
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ScenesClusterAttributeValuePair(val attributeID: UInt, val attributeValue: UInt) {
+  override fun toString(): String = buildString {
+    append("ScenesClusterAttributeValuePair {\n")
+    append("\tattributeID : $attributeID\n")
+    append("\tattributeValue : $attributeValue\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ATTRIBUTE_I_D), attributeID)
+      put(ContextSpecificTag(TAG_ATTRIBUTE_VALUE), attributeValue)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ATTRIBUTE_I_D = 0
+    private const val TAG_ATTRIBUTE_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesClusterAttributeValuePair {
+      tlvReader.enterStructure(tlvTag)
+      val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_I_D))
+      val attributeValue = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_VALUE))
+
+      tlvReader.exitContainer()
+
+      return ScenesClusterAttributeValuePair(attributeID, attributeValue)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt
new file mode 100644
index 00000000000000..88d60856d7460b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ScenesClusterExtensionFieldSet(
+  val clusterID: UInt,
+  val attributeValueList: List<ScenesClusterAttributeValuePair>
+) {
+  override fun toString(): String = buildString {
+    append("ScenesClusterExtensionFieldSet {\n")
+    append("\tclusterID : $clusterID\n")
+    append("\tattributeValueList : $attributeValueList\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_CLUSTER_I_D), clusterID)
+      startArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST))
+      for (item in attributeValueList.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_CLUSTER_I_D = 0
+    private const val TAG_ATTRIBUTE_VALUE_LIST = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesClusterExtensionFieldSet {
+      tlvReader.enterStructure(tlvTag)
+      val clusterID = tlvReader.getUInt(ContextSpecificTag(TAG_CLUSTER_I_D))
+      val attributeValueList =
+        buildList<ScenesClusterAttributeValuePair> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST))
+          while (!tlvReader.isEndOfContainer()) {
+            add(ScenesClusterAttributeValuePair.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return ScenesClusterExtensionFieldSet(clusterID, attributeValueList)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
new file mode 100644
index 00000000000000..7d21ccd8c87802
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
@@ -0,0 +1,86 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ScenesClusterSceneInfoStruct(
+  val sceneCount: UByte,
+  val currentScene: UByte,
+  val currentGroup: UShort,
+  val sceneValid: Boolean,
+  val remainingCapacity: UByte,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("ScenesClusterSceneInfoStruct {\n")
+    append("\tsceneCount : $sceneCount\n")
+    append("\tcurrentScene : $currentScene\n")
+    append("\tcurrentGroup : $currentGroup\n")
+    append("\tsceneValid : $sceneValid\n")
+    append("\tremainingCapacity : $remainingCapacity\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_SCENE_COUNT), sceneCount)
+      put(ContextSpecificTag(TAG_CURRENT_SCENE), currentScene)
+      put(ContextSpecificTag(TAG_CURRENT_GROUP), currentGroup)
+      put(ContextSpecificTag(TAG_SCENE_VALID), sceneValid)
+      put(ContextSpecificTag(TAG_REMAINING_CAPACITY), remainingCapacity)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_SCENE_COUNT = 0
+    private const val TAG_CURRENT_SCENE = 1
+    private const val TAG_CURRENT_GROUP = 2
+    private const val TAG_SCENE_VALID = 3
+    private const val TAG_REMAINING_CAPACITY = 4
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesClusterSceneInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val sceneCount = tlvReader.getUByte(ContextSpecificTag(TAG_SCENE_COUNT))
+      val currentScene = tlvReader.getUByte(ContextSpecificTag(TAG_CURRENT_SCENE))
+      val currentGroup = tlvReader.getUShort(ContextSpecificTag(TAG_CURRENT_GROUP))
+      val sceneValid = tlvReader.getBoolean(ContextSpecificTag(TAG_SCENE_VALID))
+      val remainingCapacity = tlvReader.getUByte(ContextSpecificTag(TAG_REMAINING_CAPACITY))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return ScenesClusterSceneInfoStruct(
+        sceneCount,
+        currentScene,
+        currentGroup,
+        sceneValid,
+        remainingCapacity,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
new file mode 100644
index 00000000000000..c5f2429f4af83b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
@@ -0,0 +1,113 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class SoftwareDiagnosticsClusterThreadMetricsStruct(
+  val id: ULong,
+  val name: Optional<String>,
+  val stackFreeCurrent: Optional<UInt>,
+  val stackFreeMinimum: Optional<UInt>,
+  val stackSize: Optional<UInt>
+) {
+  override fun toString(): String = buildString {
+    append("SoftwareDiagnosticsClusterThreadMetricsStruct {\n")
+    append("\tid : $id\n")
+    append("\tname : $name\n")
+    append("\tstackFreeCurrent : $stackFreeCurrent\n")
+    append("\tstackFreeMinimum : $stackFreeMinimum\n")
+    append("\tstackSize : $stackSize\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ID), id)
+      if (name.isPresent) {
+        val optname = name.get()
+        put(ContextSpecificTag(TAG_NAME), optname)
+      }
+      if (stackFreeCurrent.isPresent) {
+        val optstackFreeCurrent = stackFreeCurrent.get()
+        put(ContextSpecificTag(TAG_STACK_FREE_CURRENT), optstackFreeCurrent)
+      }
+      if (stackFreeMinimum.isPresent) {
+        val optstackFreeMinimum = stackFreeMinimum.get()
+        put(ContextSpecificTag(TAG_STACK_FREE_MINIMUM), optstackFreeMinimum)
+      }
+      if (stackSize.isPresent) {
+        val optstackSize = stackSize.get()
+        put(ContextSpecificTag(TAG_STACK_SIZE), optstackSize)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ID = 0
+    private const val TAG_NAME = 1
+    private const val TAG_STACK_FREE_CURRENT = 2
+    private const val TAG_STACK_FREE_MINIMUM = 3
+    private const val TAG_STACK_SIZE = 4
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): SoftwareDiagnosticsClusterThreadMetricsStruct {
+      tlvReader.enterStructure(tlvTag)
+      val id = tlvReader.getULong(ContextSpecificTag(TAG_ID))
+      val name =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NAME)))
+        } else {
+          Optional.empty()
+        }
+      val stackFreeCurrent =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_STACK_FREE_CURRENT))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_STACK_FREE_CURRENT)))
+        } else {
+          Optional.empty()
+        }
+      val stackFreeMinimum =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_STACK_FREE_MINIMUM))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_STACK_FREE_MINIMUM)))
+        } else {
+          Optional.empty()
+        }
+      val stackSize =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_STACK_SIZE))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_STACK_SIZE)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return SoftwareDiagnosticsClusterThreadMetricsStruct(
+        id,
+        name,
+        stackFreeCurrent,
+        stackFreeMinimum,
+        stackSize
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
new file mode 100644
index 00000000000000..14c27a55df4da9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TargetNavigatorClusterTargetInfoStruct(val identifier: UByte, val name: String) {
+  override fun toString(): String = buildString {
+    append("TargetNavigatorClusterTargetInfoStruct {\n")
+    append("\tidentifier : $identifier\n")
+    append("\tname : $name\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_IDENTIFIER), identifier)
+      put(ContextSpecificTag(TAG_NAME), name)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_IDENTIFIER = 0
+    private const val TAG_NAME = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TargetNavigatorClusterTargetInfoStruct {
+      tlvReader.enterStructure(tlvTag)
+      val identifier = tlvReader.getUByte(ContextSpecificTag(TAG_IDENTIFIER))
+      val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
+
+      tlvReader.exitContainer()
+
+      return TargetNavigatorClusterTargetInfoStruct(identifier, name)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt
new file mode 100644
index 00000000000000..ecd2bf08eb8fcb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThermostatClusterThermostatScheduleTransition(
+  val transitionTime: UShort,
+  val heatSetpoint: Short?,
+  val coolSetpoint: Short?
+) {
+  override fun toString(): String = buildString {
+    append("ThermostatClusterThermostatScheduleTransition {\n")
+    append("\ttransitionTime : $transitionTime\n")
+    append("\theatSetpoint : $heatSetpoint\n")
+    append("\tcoolSetpoint : $coolSetpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_TRANSITION_TIME), transitionTime)
+      if (heatSetpoint != null) {
+        put(ContextSpecificTag(TAG_HEAT_SETPOINT), heatSetpoint)
+      } else {
+        putNull(ContextSpecificTag(TAG_HEAT_SETPOINT))
+      }
+      if (coolSetpoint != null) {
+        put(ContextSpecificTag(TAG_COOL_SETPOINT), coolSetpoint)
+      } else {
+        putNull(ContextSpecificTag(TAG_COOL_SETPOINT))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_TRANSITION_TIME = 0
+    private const val TAG_HEAT_SETPOINT = 1
+    private const val TAG_COOL_SETPOINT = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterThermostatScheduleTransition {
+      tlvReader.enterStructure(tlvTag)
+      val transitionTime = tlvReader.getUShort(ContextSpecificTag(TAG_TRANSITION_TIME))
+      val heatSetpoint =
+        if (!tlvReader.isNull()) {
+          tlvReader.getShort(ContextSpecificTag(TAG_HEAT_SETPOINT))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_HEAT_SETPOINT))
+          null
+        }
+      val coolSetpoint =
+        if (!tlvReader.isNull()) {
+          tlvReader.getShort(ContextSpecificTag(TAG_COOL_SETPOINT))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_COOL_SETPOINT))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return ThermostatClusterThermostatScheduleTransition(
+        transitionTime,
+        heatSetpoint,
+        coolSetpoint
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
new file mode 100644
index 00000000000000..001698e66b5dce
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
@@ -0,0 +1,157 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterNeighborTableStruct(
+  val extAddress: ULong,
+  val age: UInt,
+  val rloc16: UShort,
+  val linkFrameCounter: UInt,
+  val mleFrameCounter: UInt,
+  val lqi: UByte,
+  val averageRssi: Byte?,
+  val lastRssi: Byte?,
+  val frameErrorRate: UByte,
+  val messageErrorRate: UByte,
+  val rxOnWhenIdle: Boolean,
+  val fullThreadDevice: Boolean,
+  val fullNetworkData: Boolean,
+  val isChild: Boolean
+) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterNeighborTableStruct {\n")
+    append("\textAddress : $extAddress\n")
+    append("\tage : $age\n")
+    append("\trloc16 : $rloc16\n")
+    append("\tlinkFrameCounter : $linkFrameCounter\n")
+    append("\tmleFrameCounter : $mleFrameCounter\n")
+    append("\tlqi : $lqi\n")
+    append("\taverageRssi : $averageRssi\n")
+    append("\tlastRssi : $lastRssi\n")
+    append("\tframeErrorRate : $frameErrorRate\n")
+    append("\tmessageErrorRate : $messageErrorRate\n")
+    append("\trxOnWhenIdle : $rxOnWhenIdle\n")
+    append("\tfullThreadDevice : $fullThreadDevice\n")
+    append("\tfullNetworkData : $fullNetworkData\n")
+    append("\tisChild : $isChild\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EXT_ADDRESS), extAddress)
+      put(ContextSpecificTag(TAG_AGE), age)
+      put(ContextSpecificTag(TAG_RLOC16), rloc16)
+      put(ContextSpecificTag(TAG_LINK_FRAME_COUNTER), linkFrameCounter)
+      put(ContextSpecificTag(TAG_MLE_FRAME_COUNTER), mleFrameCounter)
+      put(ContextSpecificTag(TAG_LQI), lqi)
+      if (averageRssi != null) {
+        put(ContextSpecificTag(TAG_AVERAGE_RSSI), averageRssi)
+      } else {
+        putNull(ContextSpecificTag(TAG_AVERAGE_RSSI))
+      }
+      if (lastRssi != null) {
+        put(ContextSpecificTag(TAG_LAST_RSSI), lastRssi)
+      } else {
+        putNull(ContextSpecificTag(TAG_LAST_RSSI))
+      }
+      put(ContextSpecificTag(TAG_FRAME_ERROR_RATE), frameErrorRate)
+      put(ContextSpecificTag(TAG_MESSAGE_ERROR_RATE), messageErrorRate)
+      put(ContextSpecificTag(TAG_RX_ON_WHEN_IDLE), rxOnWhenIdle)
+      put(ContextSpecificTag(TAG_FULL_THREAD_DEVICE), fullThreadDevice)
+      put(ContextSpecificTag(TAG_FULL_NETWORK_DATA), fullNetworkData)
+      put(ContextSpecificTag(TAG_IS_CHILD), isChild)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EXT_ADDRESS = 0
+    private const val TAG_AGE = 1
+    private const val TAG_RLOC16 = 2
+    private const val TAG_LINK_FRAME_COUNTER = 3
+    private const val TAG_MLE_FRAME_COUNTER = 4
+    private const val TAG_LQI = 5
+    private const val TAG_AVERAGE_RSSI = 6
+    private const val TAG_LAST_RSSI = 7
+    private const val TAG_FRAME_ERROR_RATE = 8
+    private const val TAG_MESSAGE_ERROR_RATE = 9
+    private const val TAG_RX_ON_WHEN_IDLE = 10
+    private const val TAG_FULL_THREAD_DEVICE = 11
+    private const val TAG_FULL_NETWORK_DATA = 12
+    private const val TAG_IS_CHILD = 13
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ThreadNetworkDiagnosticsClusterNeighborTableStruct {
+      tlvReader.enterStructure(tlvTag)
+      val extAddress = tlvReader.getULong(ContextSpecificTag(TAG_EXT_ADDRESS))
+      val age = tlvReader.getUInt(ContextSpecificTag(TAG_AGE))
+      val rloc16 = tlvReader.getUShort(ContextSpecificTag(TAG_RLOC16))
+      val linkFrameCounter = tlvReader.getUInt(ContextSpecificTag(TAG_LINK_FRAME_COUNTER))
+      val mleFrameCounter = tlvReader.getUInt(ContextSpecificTag(TAG_MLE_FRAME_COUNTER))
+      val lqi = tlvReader.getUByte(ContextSpecificTag(TAG_LQI))
+      val averageRssi =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByte(ContextSpecificTag(TAG_AVERAGE_RSSI))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_AVERAGE_RSSI))
+          null
+        }
+      val lastRssi =
+        if (!tlvReader.isNull()) {
+          tlvReader.getByte(ContextSpecificTag(TAG_LAST_RSSI))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_LAST_RSSI))
+          null
+        }
+      val frameErrorRate = tlvReader.getUByte(ContextSpecificTag(TAG_FRAME_ERROR_RATE))
+      val messageErrorRate = tlvReader.getUByte(ContextSpecificTag(TAG_MESSAGE_ERROR_RATE))
+      val rxOnWhenIdle = tlvReader.getBoolean(ContextSpecificTag(TAG_RX_ON_WHEN_IDLE))
+      val fullThreadDevice = tlvReader.getBoolean(ContextSpecificTag(TAG_FULL_THREAD_DEVICE))
+      val fullNetworkData = tlvReader.getBoolean(ContextSpecificTag(TAG_FULL_NETWORK_DATA))
+      val isChild = tlvReader.getBoolean(ContextSpecificTag(TAG_IS_CHILD))
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterNeighborTableStruct(
+        extAddress,
+        age,
+        rloc16,
+        linkFrameCounter,
+        mleFrameCounter,
+        lqi,
+        averageRssi,
+        lastRssi,
+        frameErrorRate,
+        messageErrorRate,
+        rxOnWhenIdle,
+        fullThreadDevice,
+        fullNetworkData,
+        isChild
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
new file mode 100644
index 00000000000000..7aa8d606fbcc21
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
@@ -0,0 +1,130 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
+  val activeTimestampPresent: Boolean,
+  val pendingTimestampPresent: Boolean,
+  val masterKeyPresent: Boolean,
+  val networkNamePresent: Boolean,
+  val extendedPanIdPresent: Boolean,
+  val meshLocalPrefixPresent: Boolean,
+  val delayPresent: Boolean,
+  val panIdPresent: Boolean,
+  val channelPresent: Boolean,
+  val pskcPresent: Boolean,
+  val securityPolicyPresent: Boolean,
+  val channelMaskPresent: Boolean
+) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {\n")
+    append("\tactiveTimestampPresent : $activeTimestampPresent\n")
+    append("\tpendingTimestampPresent : $pendingTimestampPresent\n")
+    append("\tmasterKeyPresent : $masterKeyPresent\n")
+    append("\tnetworkNamePresent : $networkNamePresent\n")
+    append("\textendedPanIdPresent : $extendedPanIdPresent\n")
+    append("\tmeshLocalPrefixPresent : $meshLocalPrefixPresent\n")
+    append("\tdelayPresent : $delayPresent\n")
+    append("\tpanIdPresent : $panIdPresent\n")
+    append("\tchannelPresent : $channelPresent\n")
+    append("\tpskcPresent : $pskcPresent\n")
+    append("\tsecurityPolicyPresent : $securityPolicyPresent\n")
+    append("\tchannelMaskPresent : $channelMaskPresent\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP_PRESENT), activeTimestampPresent)
+      put(ContextSpecificTag(TAG_PENDING_TIMESTAMP_PRESENT), pendingTimestampPresent)
+      put(ContextSpecificTag(TAG_MASTER_KEY_PRESENT), masterKeyPresent)
+      put(ContextSpecificTag(TAG_NETWORK_NAME_PRESENT), networkNamePresent)
+      put(ContextSpecificTag(TAG_EXTENDED_PAN_ID_PRESENT), extendedPanIdPresent)
+      put(ContextSpecificTag(TAG_MESH_LOCAL_PREFIX_PRESENT), meshLocalPrefixPresent)
+      put(ContextSpecificTag(TAG_DELAY_PRESENT), delayPresent)
+      put(ContextSpecificTag(TAG_PAN_ID_PRESENT), panIdPresent)
+      put(ContextSpecificTag(TAG_CHANNEL_PRESENT), channelPresent)
+      put(ContextSpecificTag(TAG_PSKC_PRESENT), pskcPresent)
+      put(ContextSpecificTag(TAG_SECURITY_POLICY_PRESENT), securityPolicyPresent)
+      put(ContextSpecificTag(TAG_CHANNEL_MASK_PRESENT), channelMaskPresent)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ACTIVE_TIMESTAMP_PRESENT = 0
+    private const val TAG_PENDING_TIMESTAMP_PRESENT = 1
+    private const val TAG_MASTER_KEY_PRESENT = 2
+    private const val TAG_NETWORK_NAME_PRESENT = 3
+    private const val TAG_EXTENDED_PAN_ID_PRESENT = 4
+    private const val TAG_MESH_LOCAL_PREFIX_PRESENT = 5
+    private const val TAG_DELAY_PRESENT = 6
+    private const val TAG_PAN_ID_PRESENT = 7
+    private const val TAG_CHANNEL_PRESENT = 8
+    private const val TAG_PSKC_PRESENT = 9
+    private const val TAG_SECURITY_POLICY_PRESENT = 10
+    private const val TAG_CHANNEL_MASK_PRESENT = 11
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {
+      tlvReader.enterStructure(tlvTag)
+      val activeTimestampPresent =
+        tlvReader.getBoolean(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP_PRESENT))
+      val pendingTimestampPresent =
+        tlvReader.getBoolean(ContextSpecificTag(TAG_PENDING_TIMESTAMP_PRESENT))
+      val masterKeyPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_MASTER_KEY_PRESENT))
+      val networkNamePresent = tlvReader.getBoolean(ContextSpecificTag(TAG_NETWORK_NAME_PRESENT))
+      val extendedPanIdPresent =
+        tlvReader.getBoolean(ContextSpecificTag(TAG_EXTENDED_PAN_ID_PRESENT))
+      val meshLocalPrefixPresent =
+        tlvReader.getBoolean(ContextSpecificTag(TAG_MESH_LOCAL_PREFIX_PRESENT))
+      val delayPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_DELAY_PRESENT))
+      val panIdPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_PAN_ID_PRESENT))
+      val channelPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_CHANNEL_PRESENT))
+      val pskcPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_PSKC_PRESENT))
+      val securityPolicyPresent =
+        tlvReader.getBoolean(ContextSpecificTag(TAG_SECURITY_POLICY_PRESENT))
+      val channelMaskPresent = tlvReader.getBoolean(ContextSpecificTag(TAG_CHANNEL_MASK_PRESENT))
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
+        activeTimestampPresent,
+        pendingTimestampPresent,
+        masterKeyPresent,
+        networkNamePresent,
+        extendedPanIdPresent,
+        meshLocalPrefixPresent,
+        delayPresent,
+        panIdPresent,
+        channelPresent,
+        pskcPresent,
+        securityPolicyPresent,
+        channelMaskPresent
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
new file mode 100644
index 00000000000000..58a9599025b985
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
@@ -0,0 +1,113 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterRouteTableStruct(
+  val extAddress: ULong,
+  val rloc16: UShort,
+  val routerId: UByte,
+  val nextHop: UByte,
+  val pathCost: UByte,
+  val LQIIn: UByte,
+  val LQIOut: UByte,
+  val age: UByte,
+  val allocated: Boolean,
+  val linkEstablished: Boolean
+) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterRouteTableStruct {\n")
+    append("\textAddress : $extAddress\n")
+    append("\trloc16 : $rloc16\n")
+    append("\trouterId : $routerId\n")
+    append("\tnextHop : $nextHop\n")
+    append("\tpathCost : $pathCost\n")
+    append("\tLQIIn : $LQIIn\n")
+    append("\tLQIOut : $LQIOut\n")
+    append("\tage : $age\n")
+    append("\tallocated : $allocated\n")
+    append("\tlinkEstablished : $linkEstablished\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_EXT_ADDRESS), extAddress)
+      put(ContextSpecificTag(TAG_RLOC16), rloc16)
+      put(ContextSpecificTag(TAG_ROUTER_ID), routerId)
+      put(ContextSpecificTag(TAG_NEXT_HOP), nextHop)
+      put(ContextSpecificTag(TAG_PATH_COST), pathCost)
+      put(ContextSpecificTag(TAG_L_Q_I_IN), LQIIn)
+      put(ContextSpecificTag(TAG_L_Q_I_OUT), LQIOut)
+      put(ContextSpecificTag(TAG_AGE), age)
+      put(ContextSpecificTag(TAG_ALLOCATED), allocated)
+      put(ContextSpecificTag(TAG_LINK_ESTABLISHED), linkEstablished)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_EXT_ADDRESS = 0
+    private const val TAG_RLOC16 = 1
+    private const val TAG_ROUTER_ID = 2
+    private const val TAG_NEXT_HOP = 3
+    private const val TAG_PATH_COST = 4
+    private const val TAG_L_Q_I_IN = 5
+    private const val TAG_L_Q_I_OUT = 6
+    private const val TAG_AGE = 7
+    private const val TAG_ALLOCATED = 8
+    private const val TAG_LINK_ESTABLISHED = 9
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): ThreadNetworkDiagnosticsClusterRouteTableStruct {
+      tlvReader.enterStructure(tlvTag)
+      val extAddress = tlvReader.getULong(ContextSpecificTag(TAG_EXT_ADDRESS))
+      val rloc16 = tlvReader.getUShort(ContextSpecificTag(TAG_RLOC16))
+      val routerId = tlvReader.getUByte(ContextSpecificTag(TAG_ROUTER_ID))
+      val nextHop = tlvReader.getUByte(ContextSpecificTag(TAG_NEXT_HOP))
+      val pathCost = tlvReader.getUByte(ContextSpecificTag(TAG_PATH_COST))
+      val LQIIn = tlvReader.getUByte(ContextSpecificTag(TAG_L_Q_I_IN))
+      val LQIOut = tlvReader.getUByte(ContextSpecificTag(TAG_L_Q_I_OUT))
+      val age = tlvReader.getUByte(ContextSpecificTag(TAG_AGE))
+      val allocated = tlvReader.getBoolean(ContextSpecificTag(TAG_ALLOCATED))
+      val linkEstablished = tlvReader.getBoolean(ContextSpecificTag(TAG_LINK_ESTABLISHED))
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterRouteTableStruct(
+        extAddress,
+        rloc16,
+        routerId,
+        nextHop,
+        pathCost,
+        LQIIn,
+        LQIOut,
+        age,
+        allocated,
+        linkEstablished
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
new file mode 100644
index 00000000000000..313ac3dda11319
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class ThreadNetworkDiagnosticsClusterSecurityPolicy(val rotationTime: UShort, val flags: UShort) {
+  override fun toString(): String = buildString {
+    append("ThreadNetworkDiagnosticsClusterSecurityPolicy {\n")
+    append("\trotationTime : $rotationTime\n")
+    append("\tflags : $flags\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_ROTATION_TIME), rotationTime)
+      put(ContextSpecificTag(TAG_FLAGS), flags)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_ROTATION_TIME = 0
+    private const val TAG_FLAGS = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThreadNetworkDiagnosticsClusterSecurityPolicy {
+      tlvReader.enterStructure(tlvTag)
+      val rotationTime = tlvReader.getUShort(ContextSpecificTag(TAG_ROTATION_TIME))
+      val flags = tlvReader.getUShort(ContextSpecificTag(TAG_FLAGS))
+
+      tlvReader.exitContainer()
+
+      return ThreadNetworkDiagnosticsClusterSecurityPolicy(rotationTime, flags)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
new file mode 100644
index 00000000000000..a3b6fd3d55188f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
@@ -0,0 +1,74 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterDSTOffsetStruct(
+  val offset: Int,
+  val validStarting: ULong,
+  val validUntil: ULong?
+) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterDSTOffsetStruct {\n")
+    append("\toffset : $offset\n")
+    append("\tvalidStarting : $validStarting\n")
+    append("\tvalidUntil : $validUntil\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OFFSET), offset)
+      put(ContextSpecificTag(TAG_VALID_STARTING), validStarting)
+      if (validUntil != null) {
+        put(ContextSpecificTag(TAG_VALID_UNTIL), validUntil)
+      } else {
+        putNull(ContextSpecificTag(TAG_VALID_UNTIL))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OFFSET = 0
+    private const val TAG_VALID_STARTING = 1
+    private const val TAG_VALID_UNTIL = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterDSTOffsetStruct {
+      tlvReader.enterStructure(tlvTag)
+      val offset = tlvReader.getInt(ContextSpecificTag(TAG_OFFSET))
+      val validStarting = tlvReader.getULong(ContextSpecificTag(TAG_VALID_STARTING))
+      val validUntil =
+        if (!tlvReader.isNull()) {
+          tlvReader.getULong(ContextSpecificTag(TAG_VALID_UNTIL))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_VALID_UNTIL))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterDSTOffsetStruct(offset, validStarting, validUntil)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
new file mode 100644
index 00000000000000..152f42081f7ab8
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
@@ -0,0 +1,62 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(
+  val nodeID: ULong,
+  val endpoint: UShort
+) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct {\n")
+    append("\tnodeID : $nodeID\n")
+    append("\tendpoint : $endpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_NODE_I_D), nodeID)
+      put(ContextSpecificTag(TAG_ENDPOINT), endpoint)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NODE_I_D = 0
+    private const val TAG_ENDPOINT = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct {
+      tlvReader.enterStructure(tlvTag)
+      val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D))
+      val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT))
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(nodeID, endpoint)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
new file mode 100644
index 00000000000000..4dd53317007f70
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
@@ -0,0 +1,73 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterTimeZoneStruct(
+  val offset: Int,
+  val validAt: ULong,
+  val name: Optional<String>
+) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterTimeZoneStruct {\n")
+    append("\toffset : $offset\n")
+    append("\tvalidAt : $validAt\n")
+    append("\tname : $name\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_OFFSET), offset)
+      put(ContextSpecificTag(TAG_VALID_AT), validAt)
+      if (name.isPresent) {
+        val optname = name.get()
+        put(ContextSpecificTag(TAG_NAME), optname)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_OFFSET = 0
+    private const val TAG_VALID_AT = 1
+    private const val TAG_NAME = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterTimeZoneStruct {
+      tlvReader.enterStructure(tlvTag)
+      val offset = tlvReader.getInt(ContextSpecificTag(TAG_OFFSET))
+      val validAt = tlvReader.getULong(ContextSpecificTag(TAG_VALID_AT))
+      val name =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_NAME))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NAME)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterTimeZoneStruct(offset, validAt, name)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
new file mode 100644
index 00000000000000..034d6d0d7e21e3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
@@ -0,0 +1,67 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class TimeSynchronizationClusterTrustedTimeSourceStruct(
+  val fabricIndex: UByte,
+  val nodeID: ULong,
+  val endpoint: UShort
+) {
+  override fun toString(): String = buildString {
+    append("TimeSynchronizationClusterTrustedTimeSourceStruct {\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("\tnodeID : $nodeID\n")
+    append("\tendpoint : $endpoint\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      put(ContextSpecificTag(TAG_NODE_I_D), nodeID)
+      put(ContextSpecificTag(TAG_ENDPOINT), endpoint)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FABRIC_INDEX = 0
+    private const val TAG_NODE_I_D = 1
+    private const val TAG_ENDPOINT = 2
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): TimeSynchronizationClusterTrustedTimeSourceStruct {
+      tlvReader.enterStructure(tlvTag)
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+      val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D))
+      val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT))
+
+      tlvReader.exitContainer()
+
+      return TimeSynchronizationClusterTrustedTimeSourceStruct(fabricIndex, nodeID, endpoint)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
new file mode 100644
index 00000000000000..546255c64a2d1b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterDoubleNestedStructList(val a: List<UnitTestingClusterNestedStructList>) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterDoubleNestedStructList {\n")
+    append("\ta : $a\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      startArray(ContextSpecificTag(TAG_A))
+      for (item in a.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_A = 0
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterDoubleNestedStructList {
+      tlvReader.enterStructure(tlvTag)
+      val a =
+        buildList<UnitTestingClusterNestedStructList> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_A))
+          while (!tlvReader.isEndOfContainer()) {
+            add(UnitTestingClusterNestedStructList.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterDoubleNestedStructList(a)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt
new file mode 100644
index 00000000000000..0891c3106fbadf
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterNestedStruct(
+  val a: UByte,
+  val b: Boolean,
+  val c: UnitTestingClusterSimpleStruct
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterNestedStruct {\n")
+    append("\ta : $a\n")
+    append("\tb : $b\n")
+    append("\tc : $c\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_A), a)
+      put(ContextSpecificTag(TAG_B), b)
+      c.toTlv(ContextSpecificTag(TAG_C), this)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_A = 0
+    private const val TAG_B = 1
+    private const val TAG_C = 2
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterNestedStruct {
+      tlvReader.enterStructure(tlvTag)
+      val a = tlvReader.getUByte(ContextSpecificTag(TAG_A))
+      val b = tlvReader.getBoolean(ContextSpecificTag(TAG_B))
+      val c = UnitTestingClusterSimpleStruct.fromTlv(ContextSpecificTag(TAG_C), tlvReader)
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterNestedStruct(a, b, c)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt
new file mode 100644
index 00000000000000..b22100fdf31dda
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt
@@ -0,0 +1,129 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterNestedStructList(
+  val a: UByte,
+  val b: Boolean,
+  val c: UnitTestingClusterSimpleStruct,
+  val d: List<UnitTestingClusterSimpleStruct>,
+  val e: List<UInt>,
+  val f: List<ByteArray>,
+  val g: List<UByte>
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterNestedStructList {\n")
+    append("\ta : $a\n")
+    append("\tb : $b\n")
+    append("\tc : $c\n")
+    append("\td : $d\n")
+    append("\te : $e\n")
+    append("\tf : $f\n")
+    append("\tg : $g\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_A), a)
+      put(ContextSpecificTag(TAG_B), b)
+      c.toTlv(ContextSpecificTag(TAG_C), this)
+      startArray(ContextSpecificTag(TAG_D))
+      for (item in d.iterator()) {
+        item.toTlv(AnonymousTag, this)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_E))
+      for (item in e.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_F))
+      for (item in f.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      startArray(ContextSpecificTag(TAG_G))
+      for (item in g.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_A = 0
+    private const val TAG_B = 1
+    private const val TAG_C = 2
+    private const val TAG_D = 3
+    private const val TAG_E = 4
+    private const val TAG_F = 5
+    private const val TAG_G = 6
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterNestedStructList {
+      tlvReader.enterStructure(tlvTag)
+      val a = tlvReader.getUByte(ContextSpecificTag(TAG_A))
+      val b = tlvReader.getBoolean(ContextSpecificTag(TAG_B))
+      val c = UnitTestingClusterSimpleStruct.fromTlv(ContextSpecificTag(TAG_C), tlvReader)
+      val d =
+        buildList<UnitTestingClusterSimpleStruct> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_D))
+          while (!tlvReader.isEndOfContainer()) {
+            add(UnitTestingClusterSimpleStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+      val e =
+        buildList<UInt> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_E))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUInt(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val f =
+        buildList<ByteArray> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_F))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getByteArray(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val g =
+        buildList<UByte> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_G))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUByte(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterNestedStructList(a, b, c, d, e, f, g)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
new file mode 100644
index 00000000000000..5098411f07e58d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
@@ -0,0 +1,308 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterNullablesAndOptionalsStruct(
+  val nullableInt: UShort?,
+  val optionalInt: Optional<UShort>,
+  val nullableOptionalInt: Optional<UShort>?,
+  val nullableString: String?,
+  val optionalString: Optional<String>,
+  val nullableOptionalString: Optional<String>?,
+  val nullableStruct: UnitTestingClusterSimpleStruct?,
+  val optionalStruct: Optional<UnitTestingClusterSimpleStruct>,
+  val nullableOptionalStruct: Optional<UnitTestingClusterSimpleStruct>?,
+  val nullableList: List<UInt>?,
+  val optionalList: Optional<List<UInt>>,
+  val nullableOptionalList: Optional<List<UInt>>?
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterNullablesAndOptionalsStruct {\n")
+    append("\tnullableInt : $nullableInt\n")
+    append("\toptionalInt : $optionalInt\n")
+    append("\tnullableOptionalInt : $nullableOptionalInt\n")
+    append("\tnullableString : $nullableString\n")
+    append("\toptionalString : $optionalString\n")
+    append("\tnullableOptionalString : $nullableOptionalString\n")
+    append("\tnullableStruct : $nullableStruct\n")
+    append("\toptionalStruct : $optionalStruct\n")
+    append("\tnullableOptionalStruct : $nullableOptionalStruct\n")
+    append("\tnullableList : $nullableList\n")
+    append("\toptionalList : $optionalList\n")
+    append("\tnullableOptionalList : $nullableOptionalList\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (nullableInt != null) {
+        put(ContextSpecificTag(TAG_NULLABLE_INT), nullableInt)
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_INT))
+      }
+      if (optionalInt.isPresent) {
+        val optoptionalInt = optionalInt.get()
+        put(ContextSpecificTag(TAG_OPTIONAL_INT), optoptionalInt)
+      }
+      if (nullableOptionalInt != null) {
+        if (nullableOptionalInt.isPresent) {
+          val optnullableOptionalInt = nullableOptionalInt.get()
+          put(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_INT), optnullableOptionalInt)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_INT))
+      }
+      if (nullableString != null) {
+        put(ContextSpecificTag(TAG_NULLABLE_STRING), nullableString)
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_STRING))
+      }
+      if (optionalString.isPresent) {
+        val optoptionalString = optionalString.get()
+        put(ContextSpecificTag(TAG_OPTIONAL_STRING), optoptionalString)
+      }
+      if (nullableOptionalString != null) {
+        if (nullableOptionalString.isPresent) {
+          val optnullableOptionalString = nullableOptionalString.get()
+          put(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRING), optnullableOptionalString)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRING))
+      }
+      if (nullableStruct != null) {
+        nullableStruct.toTlv(ContextSpecificTag(TAG_NULLABLE_STRUCT), this)
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_STRUCT))
+      }
+      if (optionalStruct.isPresent) {
+        val optoptionalStruct = optionalStruct.get()
+        optoptionalStruct.toTlv(ContextSpecificTag(TAG_OPTIONAL_STRUCT), this)
+      }
+      if (nullableOptionalStruct != null) {
+        if (nullableOptionalStruct.isPresent) {
+          val optnullableOptionalStruct = nullableOptionalStruct.get()
+          optnullableOptionalStruct.toTlv(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRUCT), this)
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRUCT))
+      }
+      if (nullableList != null) {
+        startArray(ContextSpecificTag(TAG_NULLABLE_LIST))
+        for (item in nullableList.iterator()) {
+          put(AnonymousTag, item)
+        }
+        endArray()
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_LIST))
+      }
+      if (optionalList.isPresent) {
+        val optoptionalList = optionalList.get()
+        startArray(ContextSpecificTag(TAG_OPTIONAL_LIST))
+        for (item in optoptionalList.iterator()) {
+          put(AnonymousTag, item)
+        }
+        endArray()
+      }
+      if (nullableOptionalList != null) {
+        if (nullableOptionalList.isPresent) {
+          val optnullableOptionalList = nullableOptionalList.get()
+          startArray(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_LIST))
+          for (item in optnullableOptionalList.iterator()) {
+            put(AnonymousTag, item)
+          }
+          endArray()
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_LIST))
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_NULLABLE_INT = 0
+    private const val TAG_OPTIONAL_INT = 1
+    private const val TAG_NULLABLE_OPTIONAL_INT = 2
+    private const val TAG_NULLABLE_STRING = 3
+    private const val TAG_OPTIONAL_STRING = 4
+    private const val TAG_NULLABLE_OPTIONAL_STRING = 5
+    private const val TAG_NULLABLE_STRUCT = 6
+    private const val TAG_OPTIONAL_STRUCT = 7
+    private const val TAG_NULLABLE_OPTIONAL_STRUCT = 8
+    private const val TAG_NULLABLE_LIST = 9
+    private const val TAG_OPTIONAL_LIST = 10
+    private const val TAG_NULLABLE_OPTIONAL_LIST = 11
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterNullablesAndOptionalsStruct {
+      tlvReader.enterStructure(tlvTag)
+      val nullableInt =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUShort(ContextSpecificTag(TAG_NULLABLE_INT))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_INT))
+          null
+        }
+      val optionalInt =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPTIONAL_INT))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_OPTIONAL_INT)))
+        } else {
+          Optional.empty()
+        }
+      val nullableOptionalInt =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_INT))) {
+            Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_INT)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_INT))
+          null
+        }
+      val nullableString =
+        if (!tlvReader.isNull()) {
+          tlvReader.getString(ContextSpecificTag(TAG_NULLABLE_STRING))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_STRING))
+          null
+        }
+      val optionalString =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPTIONAL_STRING))) {
+          Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPTIONAL_STRING)))
+        } else {
+          Optional.empty()
+        }
+      val nullableOptionalString =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRING))) {
+            Optional.of(tlvReader.getString(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRING)))
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRING))
+          null
+        }
+      val nullableStruct =
+        if (!tlvReader.isNull()) {
+          UnitTestingClusterSimpleStruct.fromTlv(ContextSpecificTag(TAG_NULLABLE_STRUCT), tlvReader)
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_STRUCT))
+          null
+        }
+      val optionalStruct =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPTIONAL_STRUCT))) {
+          Optional.of(
+            UnitTestingClusterSimpleStruct.fromTlv(
+              ContextSpecificTag(TAG_OPTIONAL_STRUCT),
+              tlvReader
+            )
+          )
+        } else {
+          Optional.empty()
+        }
+      val nullableOptionalStruct =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRUCT))) {
+            Optional.of(
+              UnitTestingClusterSimpleStruct.fromTlv(
+                ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRUCT),
+                tlvReader
+              )
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_STRUCT))
+          null
+        }
+      val nullableList =
+        if (!tlvReader.isNull()) {
+          buildList<UInt> {
+            tlvReader.enterArray(ContextSpecificTag(TAG_NULLABLE_LIST))
+            while (!tlvReader.isEndOfContainer()) {
+              add(tlvReader.getUInt(AnonymousTag))
+            }
+            tlvReader.exitContainer()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_LIST))
+          null
+        }
+      val optionalList =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPTIONAL_LIST))) {
+          Optional.of(
+            buildList<UInt> {
+              tlvReader.enterArray(ContextSpecificTag(TAG_OPTIONAL_LIST))
+              while (!tlvReader.isEndOfContainer()) {
+                add(tlvReader.getUInt(AnonymousTag))
+              }
+              tlvReader.exitContainer()
+            }
+          )
+        } else {
+          Optional.empty()
+        }
+      val nullableOptionalList =
+        if (!tlvReader.isNull()) {
+          if (tlvReader.isNextTag(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_LIST))) {
+            Optional.of(
+              buildList<UInt> {
+                tlvReader.enterArray(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_LIST))
+                while (!tlvReader.isEndOfContainer()) {
+                  add(tlvReader.getUInt(AnonymousTag))
+                }
+                tlvReader.exitContainer()
+              }
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_LIST))
+          null
+        }
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterNullablesAndOptionalsStruct(
+        nullableInt,
+        optionalInt,
+        nullableOptionalInt,
+        nullableString,
+        optionalString,
+        nullableOptionalString,
+        nullableStruct,
+        optionalStruct,
+        nullableOptionalStruct,
+        nullableList,
+        optionalList,
+        nullableOptionalList
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt
new file mode 100644
index 00000000000000..4c1dfe9e93b76e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterSimpleStruct(
+  val a: UByte,
+  val b: Boolean,
+  val c: UInt,
+  val d: ByteArray,
+  val e: String,
+  val f: UInt,
+  val g: Float,
+  val h: Double
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterSimpleStruct {\n")
+    append("\ta : $a\n")
+    append("\tb : $b\n")
+    append("\tc : $c\n")
+    append("\td : $d\n")
+    append("\te : $e\n")
+    append("\tf : $f\n")
+    append("\tg : $g\n")
+    append("\th : $h\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_A), a)
+      put(ContextSpecificTag(TAG_B), b)
+      put(ContextSpecificTag(TAG_C), c)
+      put(ContextSpecificTag(TAG_D), d)
+      put(ContextSpecificTag(TAG_E), e)
+      put(ContextSpecificTag(TAG_F), f)
+      put(ContextSpecificTag(TAG_G), g)
+      put(ContextSpecificTag(TAG_H), h)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_A = 0
+    private const val TAG_B = 1
+    private const val TAG_C = 2
+    private const val TAG_D = 3
+    private const val TAG_E = 4
+    private const val TAG_F = 5
+    private const val TAG_G = 6
+    private const val TAG_H = 7
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterSimpleStruct {
+      tlvReader.enterStructure(tlvTag)
+      val a = tlvReader.getUByte(ContextSpecificTag(TAG_A))
+      val b = tlvReader.getBoolean(ContextSpecificTag(TAG_B))
+      val c = tlvReader.getUInt(ContextSpecificTag(TAG_C))
+      val d = tlvReader.getByteArray(ContextSpecificTag(TAG_D))
+      val e = tlvReader.getString(ContextSpecificTag(TAG_E))
+      val f = tlvReader.getUInt(ContextSpecificTag(TAG_F))
+      val g = tlvReader.getFloat(ContextSpecificTag(TAG_G))
+      val h = tlvReader.getDouble(ContextSpecificTag(TAG_H))
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterSimpleStruct(a, b, c, d, e, f, g, h)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
new file mode 100644
index 00000000000000..0fae66d5d86dc0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
@@ -0,0 +1,161 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import java.util.Optional
+import matter.devicecontroller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterTestFabricScoped(
+  val fabricSensitiveInt8u: UByte,
+  val optionalFabricSensitiveInt8u: Optional<UByte>,
+  val nullableFabricSensitiveInt8u: UByte?,
+  val nullableOptionalFabricSensitiveInt8u: Optional<UByte>?,
+  val fabricSensitiveCharString: String,
+  val fabricSensitiveStruct: UnitTestingClusterSimpleStruct,
+  val fabricSensitiveInt8uList: List<UByte>,
+  val fabricIndex: UByte
+) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterTestFabricScoped {\n")
+    append("\tfabricSensitiveInt8u : $fabricSensitiveInt8u\n")
+    append("\toptionalFabricSensitiveInt8u : $optionalFabricSensitiveInt8u\n")
+    append("\tnullableFabricSensitiveInt8u : $nullableFabricSensitiveInt8u\n")
+    append("\tnullableOptionalFabricSensitiveInt8u : $nullableOptionalFabricSensitiveInt8u\n")
+    append("\tfabricSensitiveCharString : $fabricSensitiveCharString\n")
+    append("\tfabricSensitiveStruct : $fabricSensitiveStruct\n")
+    append("\tfabricSensitiveInt8uList : $fabricSensitiveInt8uList\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_FABRIC_SENSITIVE_INT8U), fabricSensitiveInt8u)
+      if (optionalFabricSensitiveInt8u.isPresent) {
+        val optoptionalFabricSensitiveInt8u = optionalFabricSensitiveInt8u.get()
+        put(
+          ContextSpecificTag(TAG_OPTIONAL_FABRIC_SENSITIVE_INT8U),
+          optoptionalFabricSensitiveInt8u
+        )
+      }
+      if (nullableFabricSensitiveInt8u != null) {
+        put(ContextSpecificTag(TAG_NULLABLE_FABRIC_SENSITIVE_INT8U), nullableFabricSensitiveInt8u)
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_FABRIC_SENSITIVE_INT8U))
+      }
+      if (nullableOptionalFabricSensitiveInt8u != null) {
+        if (nullableOptionalFabricSensitiveInt8u.isPresent) {
+          val optnullableOptionalFabricSensitiveInt8u = nullableOptionalFabricSensitiveInt8u.get()
+          put(
+            ContextSpecificTag(TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U),
+            optnullableOptionalFabricSensitiveInt8u
+          )
+        }
+      } else {
+        putNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U))
+      }
+      put(ContextSpecificTag(TAG_FABRIC_SENSITIVE_CHAR_STRING), fabricSensitiveCharString)
+      fabricSensitiveStruct.toTlv(ContextSpecificTag(TAG_FABRIC_SENSITIVE_STRUCT), this)
+      startArray(ContextSpecificTag(TAG_FABRIC_SENSITIVE_INT8U_LIST))
+      for (item in fabricSensitiveInt8uList.iterator()) {
+        put(AnonymousTag, item)
+      }
+      endArray()
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_FABRIC_SENSITIVE_INT8U = 1
+    private const val TAG_OPTIONAL_FABRIC_SENSITIVE_INT8U = 2
+    private const val TAG_NULLABLE_FABRIC_SENSITIVE_INT8U = 3
+    private const val TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U = 4
+    private const val TAG_FABRIC_SENSITIVE_CHAR_STRING = 5
+    private const val TAG_FABRIC_SENSITIVE_STRUCT = 6
+    private const val TAG_FABRIC_SENSITIVE_INT8U_LIST = 7
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterTestFabricScoped {
+      tlvReader.enterStructure(tlvTag)
+      val fabricSensitiveInt8u = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_SENSITIVE_INT8U))
+      val optionalFabricSensitiveInt8u =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPTIONAL_FABRIC_SENSITIVE_INT8U))) {
+          Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_OPTIONAL_FABRIC_SENSITIVE_INT8U)))
+        } else {
+          Optional.empty()
+        }
+      val nullableFabricSensitiveInt8u =
+        if (!tlvReader.isNull()) {
+          tlvReader.getUByte(ContextSpecificTag(TAG_NULLABLE_FABRIC_SENSITIVE_INT8U))
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_FABRIC_SENSITIVE_INT8U))
+          null
+        }
+      val nullableOptionalFabricSensitiveInt8u =
+        if (!tlvReader.isNull()) {
+          if (
+            tlvReader.isNextTag(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U))
+          ) {
+            Optional.of(
+              tlvReader.getUByte(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U))
+            )
+          } else {
+            Optional.empty()
+          }
+        } else {
+          tlvReader.getNull(ContextSpecificTag(TAG_NULLABLE_OPTIONAL_FABRIC_SENSITIVE_INT8U))
+          null
+        }
+      val fabricSensitiveCharString =
+        tlvReader.getString(ContextSpecificTag(TAG_FABRIC_SENSITIVE_CHAR_STRING))
+      val fabricSensitiveStruct =
+        UnitTestingClusterSimpleStruct.fromTlv(
+          ContextSpecificTag(TAG_FABRIC_SENSITIVE_STRUCT),
+          tlvReader
+        )
+      val fabricSensitiveInt8uList =
+        buildList<UByte> {
+          tlvReader.enterArray(ContextSpecificTag(TAG_FABRIC_SENSITIVE_INT8U_LIST))
+          while (!tlvReader.isEndOfContainer()) {
+            add(tlvReader.getUByte(AnonymousTag))
+          }
+          tlvReader.exitContainer()
+        }
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterTestFabricScoped(
+        fabricSensitiveInt8u,
+        optionalFabricSensitiveInt8u,
+        nullableFabricSensitiveInt8u,
+        nullableOptionalFabricSensitiveInt8u,
+        fabricSensitiveCharString,
+        fabricSensitiveStruct,
+        fabricSensitiveInt8uList,
+        fabricIndex
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
new file mode 100644
index 00000000000000..9e49970a89db9c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UnitTestingClusterTestListStructOctet(val member1: ULong, val member2: ByteArray) {
+  override fun toString(): String = buildString {
+    append("UnitTestingClusterTestListStructOctet {\n")
+    append("\tmember1 : $member1\n")
+    append("\tmember2 : $member2\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_MEMBER1), member1)
+      put(ContextSpecificTag(TAG_MEMBER2), member2)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_MEMBER1 = 0
+    private const val TAG_MEMBER2 = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UnitTestingClusterTestListStructOctet {
+      tlvReader.enterStructure(tlvTag)
+      val member1 = tlvReader.getULong(ContextSpecificTag(TAG_MEMBER1))
+      val member2 = tlvReader.getByteArray(ContextSpecificTag(TAG_MEMBER2))
+
+      tlvReader.exitContainer()
+
+      return UnitTestingClusterTestListStructOctet(member1, member2)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt
new file mode 100644
index 00000000000000..ffc34fe8515c2c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt
@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package matter.devicecontroller.cluster.structs
+
+import matter.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class UserLabelClusterLabelStruct(val label: String, val value: String) {
+  override fun toString(): String = buildString {
+    append("UserLabelClusterLabelStruct {\n")
+    append("\tlabel : $label\n")
+    append("\tvalue : $value\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_LABEL), label)
+      put(ContextSpecificTag(TAG_VALUE), value)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_LABEL = 0
+    private const val TAG_VALUE = 1
+
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): UserLabelClusterLabelStruct {
+      tlvReader.enterStructure(tlvTag)
+      val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL))
+      val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE))
+
+      tlvReader.exitContainer()
+
+      return UserLabelClusterLabelStruct(label, value)
+    }
+  }
+}
diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index 6f14e5ea584df2..846ed32a84c6b1 100644
--- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
+++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -23,6 +23,7 @@
 import chip.devicecontroller.model.AttributeWriteRequest;
 import chip.devicecontroller.model.ChipAttributePath;
 import chip.devicecontroller.model.ChipEventPath;
+import chip.devicecontroller.model.DataVersionFilter;
 import chip.devicecontroller.model.InvokeElement;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -120,6 +121,20 @@ public void setAttestationTrustStoreDelegate(
     setAttestationTrustStoreDelegate(deviceControllerPtr, attestationTrustStoreDelegate);
   }
 
+  /**
+   * Set the delegate of OTA Provider for firmware Update
+   *
+   * @param aOTAProviderDelegate Delegate for OTA Provider
+   */
+  public void startOTAProvider(OTAProviderDelegate aOTAProviderDelegate) {
+    startOTAProvider(deviceControllerPtr, aOTAProviderDelegate);
+  }
+
+  /** Disable OTA Provider server cluster */
+  public void finishOTAProvider() {
+    finishOTAProvider(deviceControllerPtr);
+  }
+
   public void pairDevice(
       BluetoothGatt bleServer,
       int connId,
@@ -657,6 +672,7 @@ public void subscribeToAttributePath(
         devicePtr,
         attributePaths,
         null,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -694,6 +710,7 @@ public void subscribeToEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -719,6 +736,7 @@ public void subscribeToEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -730,6 +748,40 @@ public void subscribeToEventPath(
   /**
    * @brief Auto-Resubscribe to the given attribute/event path with keepSubscriptions and
    *     isFabricFiltered
+   */
+  public void subscribeToPath(
+      SubscriptionEstablishedCallback subscriptionEstablishedCallback,
+      ResubscriptionAttemptCallback resubscriptionAttemptCallback,
+      ReportCallback reportCallback,
+      long devicePtr,
+      List<ChipAttributePath> attributePaths,
+      List<ChipEventPath> eventPaths,
+      int minInterval,
+      int maxInterval,
+      boolean keepSubscriptions,
+      boolean isFabricFiltered,
+      int imTimeoutMs) {
+    ReportCallbackJni jniCallback =
+        new ReportCallbackJni(
+            subscriptionEstablishedCallback, reportCallback, resubscriptionAttemptCallback);
+    subscribe(
+        deviceControllerPtr,
+        jniCallback.getCallbackHandle(),
+        devicePtr,
+        attributePaths,
+        eventPaths,
+        null,
+        minInterval,
+        maxInterval,
+        keepSubscriptions,
+        isFabricFiltered,
+        imTimeoutMs,
+        null);
+  }
+
+  /**
+   * @brief Auto-Resubscribe to the given attribute/event/dataVersionFilter path with
+   *     keepSubscriptions and isFabricFiltered
    * @param SubscriptionEstablishedCallback Callback when a subscribe response has been received and
    *     processed
    * @param ResubscriptionAttemptCallback Callback when a resubscirption haoppens, the termination
@@ -739,6 +791,7 @@ public void subscribeToEventPath(
    * @param devicePtr connected device pointer
    * @param attributePaths a list of attribute paths
    * @param eventPaths a list of event paths
+   * @param dataVersionFilters a list of data version filter
    * @param minInterval the requested minimum interval boundary floor in seconds
    * @param maxInterval the requested maximum interval boundary ceiling in seconds
    * @param keepSubscriptions If KeepSubscriptions is FALSE, all existing or pending subscriptions
@@ -754,6 +807,7 @@ public void subscribeToPath(
       long devicePtr,
       List<ChipAttributePath> attributePaths,
       List<ChipEventPath> eventPaths,
+      List<DataVersionFilter> dataVersionFilters,
       int minInterval,
       int maxInterval,
       boolean keepSubscriptions,
@@ -768,6 +822,7 @@ public void subscribeToPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        dataVersionFilters,
         minInterval,
         maxInterval,
         keepSubscriptions,
@@ -798,6 +853,7 @@ public void subscribeToPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         keepSubscriptions,
@@ -827,6 +883,7 @@ public void readAttributePath(
         devicePtr,
         attributePaths,
         null,
+        null,
         true,
         imTimeoutMs,
         null);
@@ -850,6 +907,7 @@ public void readEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         true,
         imTimeoutMs,
         null);
@@ -869,18 +927,41 @@ public void readEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         true,
         imTimeoutMs,
         eventMin);
   }
 
+  /** Read the given attribute/event path with isFabricFiltered flag. */
+  public void readPath(
+      ReportCallback callback,
+      long devicePtr,
+      List<ChipAttributePath> attributePaths,
+      List<ChipEventPath> eventPaths,
+      boolean isFabricFiltered,
+      int imTimeoutMs) {
+    ReportCallbackJni jniCallback = new ReportCallbackJni(null, callback, null);
+    read(
+        deviceControllerPtr,
+        jniCallback.getCallbackHandle(),
+        devicePtr,
+        attributePaths,
+        eventPaths,
+        null,
+        isFabricFiltered,
+        imTimeoutMs,
+        null);
+  }
+
   /**
-   * @brief read the given attribute/event path with isFabricFiltered
+   * @brief read the given attribute/event/dataVersionFilter path
    * @param ReportCallback Callback when a report data has been received and processed for the given
    *     paths.
    * @param devicePtr connected device pointer
    * @param attributePaths a list of attribute paths
    * @param eventPaths a list of event paths
+   * @param dataVersionFilters a list of data version filter
    * @param imTimeoutMs im interaction time out value, it would override the default value in c++ im
    *     layer if this value is non-zero.
    */
@@ -889,6 +970,7 @@ public void readPath(
       long devicePtr,
       List<ChipAttributePath> attributePaths,
       List<ChipEventPath> eventPaths,
+      List<DataVersionFilter> dataVersionFilters,
       boolean isFabricFiltered,
       int imTimeoutMs) {
     ReportCallbackJni jniCallback = new ReportCallbackJni(null, callback, null);
@@ -898,6 +980,7 @@ public void readPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        dataVersionFilters,
         isFabricFiltered,
         imTimeoutMs,
         null);
@@ -919,6 +1002,7 @@ public void readPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        null,
         isFabricFiltered,
         imTimeoutMs,
         eventMin);
@@ -1105,12 +1189,13 @@ public void shutdownCommissioning() {
   private native PaseVerifierParams computePaseVerifier(
       long deviceControllerPtr, long devicePtr, long setupPincode, long iterations, byte[] salt);
 
-  private native void subscribe(
+  static native void subscribe(
       long deviceControllerPtr,
       long callbackHandle,
       long devicePtr,
       List<ChipAttributePath> attributePaths,
       List<ChipEventPath> eventPaths,
+      List<DataVersionFilter> dataVersionFilters,
       int minInterval,
       int maxInterval,
       boolean keepSubscriptions,
@@ -1118,17 +1203,18 @@ private native void subscribe(
       int imTimeoutMs,
       @Nullable Long eventMin);
 
-  private native void read(
+  static native void read(
       long deviceControllerPtr,
       long callbackHandle,
       long devicePtr,
       List<ChipAttributePath> attributePaths,
       List<ChipEventPath> eventPaths,
+      List<DataVersionFilter> dataVersionFilters,
       boolean isFabricFiltered,
       int imTimeoutMs,
       @Nullable Long eventMin);
 
-  private native void write(
+  static native void write(
       long deviceControllerPtr,
       long callbackHandle,
       long devicePtr,
@@ -1136,7 +1222,7 @@ private native void write(
       int timedRequestTimeoutMs,
       int imTimeoutMs);
 
-  private native void invoke(
+  static native void invoke(
       long deviceControllerPtr,
       long callbackHandle,
       long devicePtr,
@@ -1152,6 +1238,10 @@ private native void setDeviceAttestationDelegate(
   private native void setAttestationTrustStoreDelegate(
       long deviceControllerPtr, AttestationTrustStoreDelegate delegate);
 
+  private native void startOTAProvider(long deviceControllerPtr, OTAProviderDelegate delegate);
+
+  private native void finishOTAProvider(long deviceControllerPtr);
+
   private native void pairDevice(
       long deviceControllerPtr,
       long deviceId,
diff --git a/src/controller/java/src/chip/devicecontroller/ChipTLVType.java b/src/controller/java/src/chip/devicecontroller/ChipTLVType.java
new file mode 100644
index 00000000000000..2ec14b975d508d
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/ChipTLVType.java
@@ -0,0 +1,366 @@
+package chip.devicecontroller;
+
+import java.util.ArrayList;
+
+public class ChipTLVType {
+  public enum TLVType {
+    UInt,
+    Int,
+    String,
+    ByteArray,
+    Boolean,
+    Float,
+    Double,
+    Null,
+    Struct,
+    Array,
+    Empty;
+  }
+
+  public static interface BaseTLVType {
+    TLVType type();
+
+    <T> T value(Class<T> clazz);
+  }
+
+  public static class UIntType implements BaseTLVType {
+    private long value;
+
+    public UIntType(long value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      Object ret;
+      if (clazz.equals(Integer.class)) {
+        ret = (int) value;
+      } else if (clazz.equals(Long.class)) {
+        ret = value;
+      } else {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(ret);
+    }
+
+    public long value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.UInt;
+    }
+  }
+
+  public static class IntType implements BaseTLVType {
+    private long value;
+
+    public IntType(long value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      Object ret;
+      if (clazz.equals(Integer.class)) {
+        ret = (int) value;
+      } else if (clazz.equals(Long.class)) {
+        ret = value;
+      } else {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(ret);
+    }
+
+    public long value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Int;
+    }
+  }
+
+  public static class StringType implements BaseTLVType {
+    private String value;
+
+    public StringType(String value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(String.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public String value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.String;
+    }
+  }
+
+  public static class ByteArrayType implements BaseTLVType {
+    private byte[] value;
+
+    public ByteArrayType(byte[] value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(byte[].class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public byte[] value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.ByteArray;
+    }
+  }
+
+  public static class BooleanType implements BaseTLVType {
+    private boolean value;
+
+    public BooleanType(boolean value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(Boolean.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public boolean value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Boolean;
+    }
+  }
+
+  public static class FloatType implements BaseTLVType {
+    private float value;
+
+    public FloatType(float value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(Float.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public float value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Float;
+    }
+  }
+
+  public static class DoubleType implements BaseTLVType {
+    private double value;
+
+    public DoubleType(double value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(Double.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public double value() {
+      return value;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Double;
+    }
+  }
+
+  public static class NullType implements BaseTLVType {
+    @Override
+    public <T> T value(Class<T> clazz) {
+      return null;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Null;
+    }
+  }
+
+  public static class StructType implements BaseTLVType {
+    private ArrayList<StructElement> value;
+
+    public StructType(ArrayList<StructElement> value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(ArrayList.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public ArrayList<StructElement> value() {
+      return value;
+    }
+
+    public StructElement value(int index) {
+      return value.get(index);
+    }
+
+    public int size() {
+      return value.size();
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Struct;
+    }
+  }
+
+  public static class StructElement {
+    private long contextTagNum;
+    private BaseTLVType value;
+
+    public StructElement(long contextTagNum, BaseTLVType value) {
+      this.contextTagNum = contextTagNum;
+      this.value = value;
+    }
+
+    public long contextTagNum() {
+      return contextTagNum;
+    }
+
+    public <T> T value(Class<T> clazz) {
+      try {
+        return clazz.cast(value);
+      } catch (ClassCastException e) {
+        return null;
+      }
+    }
+
+    public BaseTLVType value() {
+      return value;
+    }
+  }
+
+  public interface ArrayEncodeMapMethod<T> {
+    BaseTLVType map(T value);
+  }
+
+  public interface ArrayDecodeMapMethod<T> {
+    T map(BaseTLVType value);
+  }
+
+  public static class ArrayType implements BaseTLVType {
+    private ArrayList<BaseTLVType> value;
+
+    public ArrayType(ArrayList<BaseTLVType> value) {
+      this.value = value;
+    }
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      if (!clazz.equals(ArrayList.class)) {
+        throw new ClassCastException();
+      }
+
+      return clazz.cast(value);
+    }
+
+    public static <T> ArrayType generateArrayType(
+        ArrayList<T> rawValue, ArrayEncodeMapMethod<T> method) {
+      ArrayList<BaseTLVType> ret = new ArrayList<>();
+      for (T value : rawValue) {
+        ret.add(method.map(value));
+      }
+      return new ArrayType(ret);
+    }
+
+    public <T> ArrayList<T> map(ArrayDecodeMapMethod<T> method) {
+      ArrayList<T> ret = new ArrayList<>();
+      for (BaseTLVType v : value) {
+        ret.add(method.map(v));
+      }
+      return ret;
+    }
+
+    public <T> ArrayList<T> valuesAll(Class<T> clazz) {
+      try {
+        return this.<T>map(v -> clazz.cast(v));
+      } catch (ClassCastException e) {
+        return null;
+      }
+    }
+
+    public BaseTLVType value(int index) {
+      return value.get(index);
+    }
+
+    public int size() {
+      return value.size();
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Array;
+    }
+  }
+
+  public static class EmptyType implements BaseTLVType {
+    public EmptyType() {}
+
+    @Override
+    public <T> T value(Class<T> clazz) {
+      return null;
+    }
+
+    @Override
+    public TLVType type() {
+      return TLVType.Empty;
+    }
+  }
+}
diff --git a/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java b/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java
new file mode 100644
index 00000000000000..7cfd90d38a54ec
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java
@@ -0,0 +1,197 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+
+/**
+ * Delegate for OTA Provider.
+ *
+ * <p>See detailed in {@link ChipDeviceController#startOTAProvider(OTAProviderDelegate)}
+ */
+public interface OTAProviderDelegate {
+  /**
+   * Called to handle a QueryImage command and is responsible for sending the response (if success)
+   * or status (if error).
+   *
+   * @param vendorId Vendor ID applying to the OTA Requestor’s Node.
+   * @param productId Product ID applying to the OTA Requestor’s Node.
+   * @param softwareVersion Current version running on the OTA Requestor.
+   * @param hardwareVersion OTA Requestor’s hardware version. Can be set null.
+   * @param location OTA Requestor's current location. Can be set null.
+   * @param requestorCanConsent Variable for whether user consent is required. Can be set null.
+   * @param metadataForProvider Manufacturer-specific payload. Can be set null.
+   * @return QueryImageResponse Send Firmware image information, See detailed in {@link
+   *     OTAProviderDelegate#QueryImageResponse}
+   */
+  public QueryImageResponse handleQueryImage(
+      int vendorId,
+      int productId,
+      long softwareVersion,
+      @Nullable Integer hardwareVersion,
+      @Nullable String location,
+      @Nullable Boolean requestorCanConsent,
+      @Nullable byte[] metadataForProvider);
+
+  /**
+   * The callback will be invoked when receiving or responding to a QueryImage, it is called with an
+   * ErrorCode.
+   */
+  public void handleOTAQueryFailure(int error);
+
+  /**
+   * The callback will be invoked when BDX Transfer session is begined.
+   *
+   * @param nodeId OTA Requester's Node ID
+   * @param fileDesignator a variable-length identifier chosen by the Initiator to identify the
+   *     payload to be transferred.
+   * @param offset image's offset
+   */
+  public void handleBDXTransferSessionBegin(long nodeId, String fileDesignator, long offset);
+
+  /**
+   * The callback will be invoked when a BDX Query message has been received for some node.
+   *
+   * @param nodeId OTA Requester's Node ID
+   * @param blockSize Max blockSize that can be sent
+   * @param blockIndex block Index value
+   * @param bytesToSkip Bytes to skip
+   * @return BDXData sending packet in image, See detailed in {@link OTAProviderDelegate#BDXData}
+   */
+  public BDXData handleBDXQuery(long nodeId, int blockSize, long blockIndex, long bytesToSkip);
+
+  /**
+   * The callback will be invoked when BDX Transfer session is ended.
+   *
+   * @param nodeId errorCode if transfer is failed.
+   * @param nodeId OTA Requester's Node ID
+   */
+  public void handleBDXTransferSessionEnd(long errorCode, long nodeId);
+
+  /**
+   * Called to handle an ApplyUpdateRequest command and is responsible for sending the response (if
+   * success) or status (if error).
+   *
+   * @param nodeId OTA Requester's Node ID
+   * @param newVersion New version to update
+   * @return ApplyUpdateResponse response for future action. See detailed in {@link
+   *     OTAProvider#ApplyUpdateResponse}
+   */
+  public ApplyUpdateResponse handleApplyUpdateRequest(long nodeId, long newVersion);
+
+  /**
+   * Called to handle a NotifyUpdateApplied command and is responsible for sending the status.
+   *
+   * @param nodeId OTA Requester's Node ID
+   */
+  public default void handleNotifyUpdateApplied(long nodeId) {}
+
+  /**
+   * This is a class used when transmitting using the BDX Protocol. If isEOF value set true, OTA
+   * Requester treats the data transfer as finished.
+   */
+  public class BDXData {
+    @Nullable private byte[] data;
+    private boolean isEOF;
+
+    public BDXData(byte[] data, boolean isEOF) {
+      this.data = data;
+      this.isEOF = isEOF;
+    }
+
+    public byte[] getData() {
+      return data;
+    }
+
+    public boolean isEOF() {
+      return isEOF;
+    }
+  }
+
+  /** This is a class used to send Image information. */
+  public class QueryImageResponse {
+    @Nullable Long softwareVersion;
+    @Nullable String softwareVersionString;
+    @Nullable String filePath;
+
+    public QueryImageResponse(
+        @Nullable Long softwareVersion, @Nullable String softwareVersionString, String filePath) {
+      this.softwareVersion = softwareVersion;
+      this.softwareVersionString = softwareVersionString;
+      this.filePath = filePath;
+    }
+
+    public Long getSoftwareVersion() {
+      return softwareVersion;
+    }
+
+    public String getSoftwareVersionString() {
+      return softwareVersionString;
+    }
+
+    public String getFilePath() {
+      return filePath;
+    }
+  }
+
+  /**
+   * This class is used to inform whether the OTA Requester starts updating. Class can set Delay
+   * Time and Enum value for next action. See {@link OTAProviderDelegate#ApplyUpdateActionEnum} for
+   * more information.
+   */
+  public class ApplyUpdateResponse {
+    private ApplyUpdateActionEnum action;
+    private long delayedActionTime;
+
+    public ApplyUpdateResponse(ApplyUpdateActionEnum action, long delayedActionTime) {
+      this.action = action;
+      this.delayedActionTime = delayedActionTime;
+    }
+
+    public int getAction() {
+      return action.getValue();
+    }
+
+    public long getDelayedActionTime() {
+      return delayedActionTime;
+    }
+  }
+  /**
+   * The Action field SHALL express the action that the OTA Provider requests from the OTA
+   * Requestor.
+   */
+  public enum ApplyUpdateActionEnum {
+    /** Apply the update. */
+    Proceed(0),
+    /** Wait at least the given delay time. */
+    AwaitNextAction(1),
+    /** The OTA Provider is conveying a desire to rescind a previously provided Software Image. */
+    Discontinue(2);
+
+    private int value;
+
+    ApplyUpdateActionEnum(int value) {
+      this.value = value;
+    }
+
+    public int getValue() {
+      return value;
+    }
+  }
+}
diff --git a/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt b/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt
deleted file mode 100644
index 136e64e4b555fd..00000000000000
--- a/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package chip.devicecontroller.cluster
-
-import matter.tlv.NullValue
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-
-fun TlvReader.getBoolean(tag: Tag): Boolean {
-  return getBool(tag)
-}
-
-fun TlvReader.getString(tag: Tag): String {
-  return getUtf8String(tag)
-}
-
-fun TlvReader.getByteArray(tag: Tag): ByteArray {
-  return getByteString(tag)
-}
-
-fun TlvReader.isNull(): Boolean {
-  val value = peekElement().value
-  return (value is NullValue)
-}
-
-fun TlvReader.isNextTag(tag: Tag): Boolean {
-  val nextTag = peekElement().tag
-  return (nextTag == tag)
-}
diff --git a/src/controller/java/src/chip/devicecontroller/model/DataVersionFilter.java b/src/controller/java/src/chip/devicecontroller/model/DataVersionFilter.java
new file mode 100644
index 00000000000000..9eb9aa7b8e407a
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/model/DataVersionFilter.java
@@ -0,0 +1,74 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package chip.devicecontroller.model;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.logging.Logger;
+
+/** A data version filter that should be used for interaction model write interaction. */
+public final class DataVersionFilter {
+  private static final Logger logger = Logger.getLogger(DataVersionFilter.class.getName());
+  private final ChipPathId endpointId;
+  private final ChipPathId clusterId;
+  private final long dataVersion;
+
+  private DataVersionFilter(ChipPathId endpointId, ChipPathId clusterId, long dataVersion) {
+    this.endpointId = endpointId;
+    this.clusterId = clusterId;
+    this.dataVersion = dataVersion;
+  }
+
+  public ChipPathId getEndpointId() {
+    return endpointId;
+  }
+
+  public ChipPathId getClusterId() {
+    return clusterId;
+  }
+
+  public long getDataVersion() {
+    return dataVersion;
+  }
+
+  // check whether the current DataVersionFilter has same path as others.
+  @Override
+  public boolean equals(Object object) {
+    if (object instanceof DataVersionFilter) {
+      DataVersionFilter that = (DataVersionFilter) object;
+      return Objects.equals(this.endpointId, that.endpointId)
+          && Objects.equals(this.clusterId, that.clusterId);
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(endpointId, clusterId);
+  }
+
+  @Override
+  public String toString() {
+    return String.format(Locale.ENGLISH, "Endpoint %s, cluster %s", endpointId, clusterId);
+  }
+
+  public static DataVersionFilter newInstance(
+      ChipPathId endpointId, ChipPathId clusterId, long dataVersion) {
+    return new DataVersionFilter(endpointId, clusterId, dataVersion);
+  }
+}
diff --git a/src/controller/java/src/matter/controller/MatterControllerImpl.kt b/src/controller/java/src/matter/controller/MatterControllerImpl.kt
index 5583b69f330636..fdc1a4c769deeb 100644
--- a/src/controller/java/src/matter/controller/MatterControllerImpl.kt
+++ b/src/controller/java/src/matter/controller/MatterControllerImpl.kt
@@ -604,7 +604,7 @@ class MatterControllerImpl(params: ControllerParams) : MatterController {
 
     // im interaction time out value, it would override the default value in c++ im
     // layer if this value is non-zero.
-    private const val CHIP_IM_TIMEOUT_MS = 0
+    private const val CHIP_IM_TIMEOUT_MS = 3000
 
     // CHIP error values, lift from ChipError.h in the Matter SDK.
     private const val CHIP_ERROR_UNEXPECTED_EVENT: UInt = 0xc0u
diff --git a/src/controller/java/src/matter/tlv/TlvReader.kt b/src/controller/java/src/matter/tlv/TlvReader.kt
index 94fefe0b07f5cf..d8ce4d187a08f8 100644
--- a/src/controller/java/src/matter/tlv/TlvReader.kt
+++ b/src/controller/java/src/matter/tlv/TlvReader.kt
@@ -265,6 +265,57 @@ class TlvReader(bytes: ByteArray) : Iterable<Element> {
     require(value is NullValue) { "Unexpected value $value at index $index (expected NullValue)" }
   }
 
+  /**
+   * Retrieves a Boolean value associated with the given tag.
+   *
+   * @param tag The Tag to query for.
+   * @return The Boolean value associated with the tag.
+   */
+  fun getBoolean(tag: Tag): Boolean {
+    return getBool(tag)
+  }
+
+  /**
+   * Retrieves a String value associated with the given tag. The returned string is in UTF-8 format.
+   *
+   * @param tag The Tag to query for.
+   * @return The String value associated with the tag.
+   */
+  fun getString(tag: Tag): String {
+    return getUtf8String(tag)
+  }
+
+  /**
+   * Retrieves a ByteArray value associated with the given tag.
+   *
+   * @param tag The Tag to query for.
+   * @return The ByteArray value associated with the tag.
+   */
+  fun getByteArray(tag: Tag): ByteArray {
+    return getByteString(tag)
+  }
+
+  /**
+   * Checks if the current element's value is of type NullValue.
+   *
+   * @return True if the current element's value is NullValue, otherwise false.
+   */
+  fun isNull(): Boolean {
+    val value = peekElement().value
+    return (value is NullValue)
+  }
+
+  /**
+   * Checks if the next tag in sequence matches the provided tag.
+   *
+   * @param tag The Tag to compare against the next tag.
+   * @return True if the next tag matches the provided tag, otherwise false.
+   */
+  fun isNextTag(tag: Tag): Boolean {
+    val nextTag = peekElement().tag
+    return (nextTag == tag)
+  }
+
   /**
    * Verifies that the current element is a start of a Structure and advances to the next element.
    *
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index a6d9ea102648fb..97a9dbfde50f2f 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -448,7 +448,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
+            jint jnivalue                  = static_cast<jint>(cppValue.Raw());
             chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
                                                                        value);
             return value;
@@ -492,8 +492,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::RemainingCapacity::Id: {
-            using TypeInfo = Attributes::RemainingCapacity::TypeInfo;
+        case Attributes::FabricSceneInfo::Id: {
+            using TypeInfo = Attributes::FabricSceneInfo::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -501,11 +501,79 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_sceneCount;
+                std::string newElement_0_sceneCountClassName     = "java/lang/Integer";
+                std::string newElement_0_sceneCountCtorSignature = "(I)V";
+                jint jninewElement_0_sceneCount                  = static_cast<jint>(entry_0.sceneCount);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_sceneCountClassName.c_str(),
+                                                                           newElement_0_sceneCountCtorSignature.c_str(),
+                                                                           jninewElement_0_sceneCount, newElement_0_sceneCount);
+                jobject newElement_0_currentScene;
+                std::string newElement_0_currentSceneClassName     = "java/lang/Integer";
+                std::string newElement_0_currentSceneCtorSignature = "(I)V";
+                jint jninewElement_0_currentScene                  = static_cast<jint>(entry_0.currentScene);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_currentSceneClassName.c_str(),
+                                                                           newElement_0_currentSceneCtorSignature.c_str(),
+                                                                           jninewElement_0_currentScene, newElement_0_currentScene);
+                jobject newElement_0_currentGroup;
+                std::string newElement_0_currentGroupClassName     = "java/lang/Integer";
+                std::string newElement_0_currentGroupCtorSignature = "(I)V";
+                jint jninewElement_0_currentGroup                  = static_cast<jint>(entry_0.currentGroup);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_currentGroupClassName.c_str(),
+                                                                           newElement_0_currentGroupCtorSignature.c_str(),
+                                                                           jninewElement_0_currentGroup, newElement_0_currentGroup);
+                jobject newElement_0_sceneValid;
+                std::string newElement_0_sceneValidClassName     = "java/lang/Boolean";
+                std::string newElement_0_sceneValidCtorSignature = "(Z)V";
+                jboolean jninewElement_0_sceneValid              = static_cast<jboolean>(entry_0.sceneValid);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(newElement_0_sceneValidClassName.c_str(),
+                                                                               newElement_0_sceneValidCtorSignature.c_str(),
+                                                                               jninewElement_0_sceneValid, newElement_0_sceneValid);
+                jobject newElement_0_remainingCapacity;
+                std::string newElement_0_remainingCapacityClassName     = "java/lang/Integer";
+                std::string newElement_0_remainingCapacityCtorSignature = "(I)V";
+                jint jninewElement_0_remainingCapacity                  = static_cast<jint>(entry_0.remainingCapacity);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_remainingCapacityClassName.c_str(), newElement_0_remainingCapacityCtorSignature.c_str(),
+                    jninewElement_0_remainingCapacity, newElement_0_remainingCapacity);
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                jint jninewElement_0_fabricIndex                  = static_cast<jint>(entry_0.fabricIndex);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_fabricIndexClassName.c_str(),
+                                                                           newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                           jninewElement_0_fabricIndex, newElement_0_fabricIndex);
+
+                jclass sceneInfoStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ScenesClusterSceneInfoStruct", sceneInfoStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterSceneInfoStruct");
+                    return nullptr;
+                }
+                jmethodID sceneInfoStructStructCtor_1 =
+                    env->GetMethodID(sceneInfoStructStructClass_1, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/"
+                                     "Integer;Ljava/lang/Integer;)V");
+                if (sceneInfoStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterSceneInfoStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(sceneInfoStructStructClass_1, sceneInfoStructStructCtor_1, newElement_0_sceneCount,
+                                              newElement_0_currentScene, newElement_0_currentGroup, newElement_0_sceneValid,
+                                              newElement_0_remainingCapacity, newElement_0_fabricIndex);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -3555,6 +3623,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                    value_primaryColor);
             return value;
         }
+        case Attributes::SpecificationVersion::Id: {
+            using TypeInfo = Attributes::SpecificationVersion::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::MaxPathsPerInvoke::Id: {
+            using TypeInfo = Attributes::MaxPathsPerInvoke::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -5821,6 +5921,54 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(newElement_0_connectedClassName.c_str(),
                                                                                newElement_0_connectedCtorSignature.c_str(),
                                                                                jninewElement_0_connected, newElement_0_connected);
+                jobject newElement_0_networkIdentifier;
+                if (!entry_0.networkIdentifier.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_networkIdentifier);
+                }
+                else
+                {
+                    jobject newElement_0_networkIdentifierInsideOptional;
+                    if (entry_0.networkIdentifier.Value().IsNull())
+                    {
+                        newElement_0_networkIdentifierInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        jbyteArray newElement_0_networkIdentifierInsideOptionalByteArray =
+                            env->NewByteArray(static_cast<jsize>(entry_0.networkIdentifier.Value().Value().size()));
+                        env->SetByteArrayRegion(newElement_0_networkIdentifierInsideOptionalByteArray, 0,
+                                                static_cast<jsize>(entry_0.networkIdentifier.Value().Value().size()),
+                                                reinterpret_cast<const jbyte *>(entry_0.networkIdentifier.Value().Value().data()));
+                        newElement_0_networkIdentifierInsideOptional = newElement_0_networkIdentifierInsideOptionalByteArray;
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_networkIdentifierInsideOptional,
+                                                                      newElement_0_networkIdentifier);
+                }
+                jobject newElement_0_clientIdentifier;
+                if (!entry_0.clientIdentifier.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_clientIdentifier);
+                }
+                else
+                {
+                    jobject newElement_0_clientIdentifierInsideOptional;
+                    if (entry_0.clientIdentifier.Value().IsNull())
+                    {
+                        newElement_0_clientIdentifierInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        jbyteArray newElement_0_clientIdentifierInsideOptionalByteArray =
+                            env->NewByteArray(static_cast<jsize>(entry_0.clientIdentifier.Value().Value().size()));
+                        env->SetByteArrayRegion(newElement_0_clientIdentifierInsideOptionalByteArray, 0,
+                                                static_cast<jsize>(entry_0.clientIdentifier.Value().Value().size()),
+                                                reinterpret_cast<const jbyte *>(entry_0.clientIdentifier.Value().Value().data()));
+                        newElement_0_clientIdentifierInsideOptional = newElement_0_clientIdentifierInsideOptionalByteArray;
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_clientIdentifierInsideOptional,
+                                                                      newElement_0_clientIdentifier);
+                }
 
                 jclass networkInfoStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
@@ -5831,16 +5979,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfoStruct");
                     return nullptr;
                 }
-                jmethodID networkInfoStructStructCtor_1 =
-                    env->GetMethodID(networkInfoStructStructClass_1, "<init>", "([BLjava/lang/Boolean;)V");
+                jmethodID networkInfoStructStructCtor_1 = env->GetMethodID(
+                    networkInfoStructStructClass_1, "<init>", "([BLjava/lang/Boolean;Ljava/util/Optional;Ljava/util/Optional;)V");
                 if (networkInfoStructStructCtor_1 == nullptr)
                 {
                     ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfoStruct constructor");
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(networkInfoStructStructClass_1, networkInfoStructStructCtor_1, newElement_0_networkID,
-                                              newElement_0_connected);
+                newElement_0 =
+                    env->NewObject(networkInfoStructStructClass_1, networkInfoStructStructCtor_1, newElement_0_networkID,
+                                   newElement_0_connected, newElement_0_networkIdentifier, newElement_0_clientIdentifier);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
@@ -6584,22 +6733,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            jnivalue, value);
             return value;
         }
-        case Attributes::AverageWearCount::Id: {
-            using TypeInfo = Attributes::AverageWearCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
-            return value;
-        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -12663,12 +12796,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ModeSelect::Id: {
-        using namespace app::Clusters::ModeSelect;
+    case app::Clusters::Timer::Id: {
+        using namespace app::Clusters::Timer;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Description::Id: {
-            using TypeInfo = Attributes::Description::TypeInfo;
+        case Attributes::SetTime::Id: {
+            using TypeInfo = Attributes::SetTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12676,11 +12809,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value));
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
             return value;
         }
-        case Attributes::StandardNamespace::Id: {
-            using TypeInfo = Attributes::StandardNamespace::TypeInfo;
+        case Attributes::TimeRemaining::Id: {
+            using TypeInfo = Attributes::TimeRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12688,22 +12825,31 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::TimerState::Id: {
+            using TypeInfo = Attributes::TimerState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12718,84 +12864,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_label;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-                jobject newElement_0_mode;
-                std::string newElement_0_modeClassName     = "java/lang/Integer";
-                std::string newElement_0_modeCtorSignature = "(I)V";
-                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
-                                                                           newElement_0_modeCtorSignature.c_str(),
-                                                                           jninewElement_0_mode, newElement_0_mode);
-                jobject newElement_0_semanticTags;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags);
-
-                auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin();
-                while (iter_newElement_0_semanticTags_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue();
-                    jobject newElement_2;
-                    jobject newElement_2_mfgCode;
-                    std::string newElement_2_mfgCodeClassName     = "java/lang/Integer";
-                    std::string newElement_2_mfgCodeCtorSignature = "(I)V";
-                    jint jninewElement_2_mfgCode                  = static_cast<jint>(entry_2.mfgCode);
-                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_mfgCodeClassName.c_str(),
-                                                                               newElement_2_mfgCodeCtorSignature.c_str(),
-                                                                               jninewElement_2_mfgCode, newElement_2_mfgCode);
-                    jobject newElement_2_value;
-                    std::string newElement_2_valueClassName     = "java/lang/Integer";
-                    std::string newElement_2_valueCtorSignature = "(I)V";
-                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
-                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
-                                                                               newElement_2_valueCtorSignature.c_str(),
-                                                                               jninewElement_2_value, newElement_2_value);
-
-                    jclass semanticTagStructStructClass_3;
-                    err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct",
-                        semanticTagStructStructClass_3);
-                    if (err != CHIP_NO_ERROR)
-                    {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct");
-                        return nullptr;
-                    }
-                    jmethodID semanticTagStructStructCtor_3 =
-                        env->GetMethodID(semanticTagStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                    if (semanticTagStructStructCtor_3 == nullptr)
-                    {
-                        ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor");
-                        return nullptr;
-                    }
-
-                    newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3,
-                                                  newElement_2_mfgCode, newElement_2_value);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2);
-                }
-
-                jclass modeOptionStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeOptionStruct");
-                    return nullptr;
-                }
-                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
-                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
-                if (modeOptionStructStructCtor_1 == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterModeOptionStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                              newElement_0_mode, newElement_0_semanticTags);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12803,15 +12882,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::StartUpMode::Id: {
-            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12819,106 +12907,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
-            }
-            return value;
-        }
-        case Attributes::OnMode::Id: {
-            using TypeInfo = Attributes::OnMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::EventList::Id: {
-            using TypeInfo = Attributes::EventList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
@@ -12994,12 +12986,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LaundryWasherMode::Id: {
-        using namespace app::Clusters::LaundryWasherMode;
+    case app::Clusters::OvenCavityOperationalState::Id: {
+        using namespace app::Clusters::OvenCavityOperationalState;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::PhaseList::Id: {
+            using TypeInfo = Attributes::PhaseList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13007,117 +12999,27 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_label;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-                jobject newElement_0_mode;
-                std::string newElement_0_modeClassName     = "java/lang/Integer";
-                std::string newElement_0_modeCtorSignature = "(I)V";
-                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
-                                                                           newElement_0_modeCtorSignature.c_str(),
-                                                                           jninewElement_0_mode, newElement_0_mode);
-                jobject newElement_0_modeTags;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
-
-                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
-                while (iter_newElement_0_modeTags_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
-                    jobject newElement_2;
-                    jobject newElement_2_mfgCode;
-                    if (!entry_2.mfgCode.HasValue())
-                    {
-                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
-                    }
-                    else
-                    {
-                        jobject newElement_2_mfgCodeInsideOptional;
-                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
-                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
-                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
-                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
-                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
-                            newElement_2_mfgCodeInsideOptional);
-                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
-                    }
-                    jobject newElement_2_value;
-                    std::string newElement_2_valueClassName     = "java/lang/Integer";
-                    std::string newElement_2_valueCtorSignature = "(I)V";
-                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
-                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
-                                                                               newElement_2_valueCtorSignature.c_str(),
-                                                                               jninewElement_2_value, newElement_2_value);
-
-                    jclass modeTagStructStructClass_3;
-                    err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
-                    if (err != CHIP_NO_ERROR)
-                    {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct");
-                        return nullptr;
-                    }
-                    jmethodID modeTagStructStructCtor_3 =
-                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
-                    if (modeTagStructStructCtor_3 == nullptr)
-                    {
-                        ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor");
-                        return nullptr;
-                    }
-
-                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
-                                                  newElement_2_value);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
-                }
+                value = nullptr;
+            }
+            else
+            {
+                chip::JniReferences::GetInstance().CreateArrayList(value);
 
-                jclass modeOptionStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct",
-                    modeOptionStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct");
-                    return nullptr;
-                }
-                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
-                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
-                if (modeOptionStructStructCtor_1 == nullptr)
+                auto iter_value_1 = cppValue.Value().begin();
+                while (iter_value_1.Next())
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor");
-                    return nullptr;
+                    auto & entry_1 = iter_value_1.GetValue();
+                    jobject newElement_1;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+                    chip::JniReferences::GetInstance().AddToList(value, newElement_1);
                 }
-
-                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                              newElement_0_mode, newElement_0_modeTags);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
             return value;
         }
-        case Attributes::StartUpMode::Id: {
-            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        case Attributes::CurrentPhase::Id: {
+            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13139,8 +13041,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::OnMode::Id: {
-            using TypeInfo = Attributes::OnMode::TypeInfo;
+        case Attributes::CountdownTime::Id: {
+            using TypeInfo = Attributes::CountdownTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13154,16 +13056,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::OperationalStateList::Id: {
+            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13178,27 +13080,166 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
+                jobject newElement_0_operationalStateID;
+                std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+                std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+                jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+                    jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+                jobject newElement_0_operationalStateLabel;
+                if (!entry_0.operationalStateLabel.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+                }
+                else
+                {
+                    jobject newElement_0_operationalStateLabelInsideOptional;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                        entry_0.operationalStateLabel.Value(), newElement_0_operationalStateLabelInsideOptional));
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                                      newElement_0_operationalStateLabel);
+                }
+
+                jclass operationalStateStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct",
+                    operationalStateStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct");
+                    return nullptr;
+                }
+                jmethodID operationalStateStructStructCtor_1 =
+                    env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+                if (operationalStateStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                              newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::OperationalState::Id: {
+            using TypeInfo = Attributes::OperationalState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::OperationalError::Id: {
+            using TypeInfo = Attributes::OperationalError::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_errorStateID;
+            std::string value_errorStateIDClassName     = "java/lang/Integer";
+            std::string value_errorStateIDCtorSignature = "(I)V";
+            jint jnivalue_errorStateID                  = static_cast<jint>(cppValue.errorStateID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_errorStateIDClassName.c_str(),
+                                                                       value_errorStateIDCtorSignature.c_str(),
+                                                                       jnivalue_errorStateID, value_errorStateID);
+            jobject value_errorStateLabel;
+            if (!cppValue.errorStateLabel.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateLabel);
+            }
+            else
+            {
+                jobject value_errorStateLabelInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateLabel.Value(),
+                                                                                     value_errorStateLabelInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateLabelInsideOptional, value_errorStateLabel);
+            }
+            jobject value_errorStateDetails;
+            if (!cppValue.errorStateDetails.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
+            }
+            else
+            {
+                jobject value_errorStateDetailsInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
+                                                                                     value_errorStateDetailsInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
+            }
+
+            jclass errorStateStructStructClass_0;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct",
+                errorStateStructStructClass_0);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct");
+                return nullptr;
+            }
+            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
+                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (errorStateStructStructCtor_0 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct constructor");
+                return nullptr;
+            }
+
+            value = env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorStateID,
+                                   value_errorStateLabel, value_errorStateDetails);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
             while (iter_value_0.Next())
             {
                 auto & entry_0 = iter_value_0.GetValue();
@@ -13300,8 +13341,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: {
-        using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
+    case app::Clusters::OvenMode::Id: {
+        using namespace app::Clusters::OvenMode;
         switch (aPath.mAttributeId)
         {
         case Attributes::SupportedModes::Id: {
@@ -13364,23 +13405,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                     jclass modeTagStructStructClass_3;
                     err = chip::JniReferences::GetInstance().GetClassRef(
-                        env,
-                        "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
-                        modeTagStructStructClass_3);
+                        env, "chip/devicecontroller/ChipStructs$OvenModeClusterModeTagStruct", modeTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(
-                            Zcl,
-                            "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
+                        ChipLogError(Zcl, "Could not find class ChipStructs$OvenModeClusterModeTagStruct");
                         return nullptr;
                     }
                     jmethodID modeTagStructStructCtor_3 =
                         env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
                     if (modeTagStructStructCtor_3 == nullptr)
                     {
-                        ChipLogError(Zcl,
-                                     "Could not find "
-                                     "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
+                        ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeTagStruct constructor");
                         return nullptr;
                     }
 
@@ -13391,22 +13426,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                 jclass modeOptionStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
-                    modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$OvenModeClusterModeOptionStruct", modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(
-                        Zcl,
-                        "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OvenModeClusterModeOptionStruct");
                     return nullptr;
                 }
                 jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
                     modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
                 if (modeOptionStructStructCtor_1 == nullptr)
                 {
-                    ChipLogError(Zcl,
-                                 "Could not find "
-                                 "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
@@ -13616,12 +13646,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LaundryWasherControls::Id: {
-        using namespace app::Clusters::LaundryWasherControls;
+    case app::Clusters::LaundryDryerControls::Id: {
+        using namespace app::Clusters::LaundryDryerControls;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SpinSpeeds::Id: {
-            using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
+        case Attributes::SupportedDrynessLevels::Id: {
+            using TypeInfo = Attributes::SupportedDrynessLevels::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13636,13 +13666,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                jint jninewElement_0                  = static_cast<jint>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::SpinSpeedCurrent::Id: {
-            using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
+        case Attributes::SelectedDrynessLevel::Id: {
+            using TypeInfo = Attributes::SelectedDrynessLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13664,47 +13698,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::NumberOfRinses::Id: {
-            using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::SupportedRinses::Id: {
-            using TypeInfo = Attributes::SupportedRinses::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                jint jninewElement_0                  = static_cast<jint>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -13843,12 +13836,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcRunMode::Id: {
-        using namespace app::Clusters::RvcRunMode;
+    case app::Clusters::ModeSelect::Id: {
+        using namespace app::Clusters::ModeSelect;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13856,47 +13849,72 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value));
+            return value;
+        }
+        case Attributes::StandardNamespace::Id: {
+            using TypeInfo = Attributes::StandardNamespace::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_label;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-                jobject newElement_0_mode;
-                std::string newElement_0_modeClassName     = "java/lang/Integer";
-                std::string newElement_0_modeCtorSignature = "(I)V";
-                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
-                                                                           newElement_0_modeCtorSignature.c_str(),
-                                                                           jninewElement_0_mode, newElement_0_mode);
-                jobject newElement_0_modeTags;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
 
-                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
-                while (iter_newElement_0_modeTags_2.Next())
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+                jobject newElement_0_mode;
+                std::string newElement_0_modeClassName     = "java/lang/Integer";
+                std::string newElement_0_modeCtorSignature = "(I)V";
+                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
+                                                                           newElement_0_modeCtorSignature.c_str(),
+                                                                           jninewElement_0_mode, newElement_0_mode);
+                jobject newElement_0_semanticTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags);
+
+                auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin();
+                while (iter_newElement_0_semanticTags_2.Next())
                 {
-                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+                    auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue();
                     jobject newElement_2;
                     jobject newElement_2_mfgCode;
-                    if (!entry_2.mfgCode.HasValue())
-                    {
-                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
-                    }
-                    else
-                    {
-                        jobject newElement_2_mfgCodeInsideOptional;
-                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
-                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
-                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
-                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
-                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
-                            newElement_2_mfgCodeInsideOptional);
-                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
-                    }
+                    std::string newElement_2_mfgCodeClassName     = "java/lang/Integer";
+                    std::string newElement_2_mfgCodeCtorSignature = "(I)V";
+                    jint jninewElement_2_mfgCode                  = static_cast<jint>(entry_2.mfgCode);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_mfgCodeClassName.c_str(),
+                                                                               newElement_2_mfgCodeCtorSignature.c_str(),
+                                                                               jninewElement_2_mfgCode, newElement_2_mfgCode);
                     jobject newElement_2_value;
                     std::string newElement_2_valueClassName     = "java/lang/Integer";
                     std::string newElement_2_valueCtorSignature = "(I)V";
@@ -13905,45 +13923,46 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                                newElement_2_valueCtorSignature.c_str(),
                                                                                jninewElement_2_value, newElement_2_value);
 
-                    jclass modeTagStructStructClass_3;
+                    jclass semanticTagStructStructClass_3;
                     err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
+                        env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct",
+                        semanticTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
+                        ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct");
                         return nullptr;
                     }
-                    jmethodID modeTagStructStructCtor_3 =
-                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
-                    if (modeTagStructStructCtor_3 == nullptr)
+                    jmethodID semanticTagStructStructCtor_3 =
+                        env->GetMethodID(semanticTagStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                    if (semanticTagStructStructCtor_3 == nullptr)
                     {
-                        ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor");
+                        ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor");
                         return nullptr;
                     }
 
-                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
-                                                  newElement_2_value);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+                    newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3,
+                                                  newElement_2_mfgCode, newElement_2_value);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2);
                 }
 
                 jclass modeOptionStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeOptionStruct");
                     return nullptr;
                 }
                 jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
                     modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
                 if (modeOptionStructStructCtor_1 == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
                 newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                              newElement_0_mode, newElement_0_modeTags);
+                                              newElement_0_mode, newElement_0_semanticTags);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
@@ -13964,6 +13983,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
         case Attributes::OnMode::Id: {
             using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -14125,8 +14167,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcCleanMode::Id: {
-        using namespace app::Clusters::RvcCleanMode;
+    case app::Clusters::LaundryWasherMode::Id: {
+        using namespace app::Clusters::LaundryWasherMode;
         switch (aPath.mAttributeId)
         {
         case Attributes::SupportedModes::Id: {
@@ -14189,17 +14231,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                     jclass modeTagStructStructClass_3;
                     err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3);
+                        env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct");
+                        ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct");
                         return nullptr;
                     }
                     jmethodID modeTagStructStructCtor_3 =
                         env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
                     if (modeTagStructStructCtor_3 == nullptr)
                     {
-                        ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor");
+                        ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor");
                         return nullptr;
                     }
 
@@ -14210,17 +14252,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                 jclass modeOptionStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct",
+                    modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct");
                     return nullptr;
                 }
                 jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
                     modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
                 if (modeOptionStructStructCtor_1 == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
@@ -14246,6 +14289,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
         case Attributes::OnMode::Id: {
             using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -14407,92 +14473,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::TemperatureControl::Id: {
-        using namespace app::Clusters::TemperatureControl;
+    case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: {
+        using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::TemperatureSetpoint::Id: {
-            using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::MinTemperature::Id: {
-            using TypeInfo = Attributes::MinTemperature::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::MaxTemperature::Id: {
-            using TypeInfo = Attributes::MaxTemperature::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::Step::Id: {
-            using TypeInfo = Attributes::Step::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::SelectedTemperatureLevel::Id: {
-            using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::SupportedTemperatureLevels::Id: {
-            using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14507,8 +14493,161 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                jobject newElement_0_label;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+                jobject newElement_0_mode;
+                std::string newElement_0_modeClassName     = "java/lang/Integer";
+                std::string newElement_0_modeCtorSignature = "(I)V";
+                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
+                                                                           newElement_0_modeCtorSignature.c_str(),
+                                                                           jninewElement_0_mode, newElement_0_mode);
+                jobject newElement_0_modeTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+
+                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+                while (iter_newElement_0_modeTags_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_mfgCode;
+                    if (!entry_2.mfgCode.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+                    }
+                    else
+                    {
+                        jobject newElement_2_mfgCodeInsideOptional;
+                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
+                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
+                            newElement_2_mfgCodeInsideOptional);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+                    }
+                    jobject newElement_2_value;
+                    std::string newElement_2_valueClassName     = "java/lang/Integer";
+                    std::string newElement_2_valueCtorSignature = "(I)V";
+                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                               newElement_2_valueCtorSignature.c_str(),
+                                                                               jninewElement_2_value, newElement_2_value);
+
+                    jclass modeTagStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env,
+                        "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
+                        modeTagStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(
+                            Zcl,
+                            "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
+                        return nullptr;
+                    }
+                    jmethodID modeTagStructStructCtor_3 =
+                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+                    if (modeTagStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find "
+                                     "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
+                                                  newElement_2_value);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+                }
+
+                jclass modeOptionStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
+                    modeOptionStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(
+                        Zcl,
+                        "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
+                    return nullptr;
+                }
+                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
+                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+                if (modeOptionStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find "
+                                 "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                              newElement_0_mode, newElement_0_modeTags);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
             }
             return value;
         }
@@ -14650,12 +14789,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RefrigeratorAlarm::Id: {
-        using namespace app::Clusters::RefrigeratorAlarm;
+    case app::Clusters::LaundryWasherControls::Id: {
+        using namespace app::Clusters::LaundryWasherControls;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Mask::Id: {
-            using TypeInfo = Attributes::Mask::TypeInfo;
+        case Attributes::SpinSpeeds::Id: {
+            using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14663,15 +14802,20 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::State::Id: {
-            using TypeInfo = Attributes::State::TypeInfo;
+        case Attributes::SpinSpeedCurrent::Id: {
+            using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14679,15 +14823,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
             return value;
         }
-        case Attributes::Supported::Id: {
-            using TypeInfo = Attributes::Supported::TypeInfo;
+        case Attributes::NumberOfRinses::Id: {
+            using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14695,11 +14846,36 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::SupportedRinses::Id: {
+            using TypeInfo = Attributes::SupportedRinses::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                jint jninewElement_0                  = static_cast<jint>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -14840,8 +15016,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::DishwasherMode::Id: {
-        using namespace app::Clusters::DishwasherMode;
+    case app::Clusters::RvcRunMode::Id: {
+        using namespace app::Clusters::RvcRunMode;
         switch (aPath.mAttributeId)
         {
         case Attributes::SupportedModes::Id: {
@@ -14904,17 +15080,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                     jclass modeTagStructStructClass_3;
                     err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+                        env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct");
+                        ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
                         return nullptr;
                     }
                     jmethodID modeTagStructStructCtor_3 =
                         env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
                     if (modeTagStructStructCtor_3 == nullptr)
                     {
-                        ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor");
+                        ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor");
                         return nullptr;
                     }
 
@@ -14925,17 +15101,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                 jclass modeOptionStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
                     return nullptr;
                 }
                 jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
                     modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
                 if (modeOptionStructStructCtor_1 == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
@@ -14961,29 +15137,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::StartUpMode::Id: {
-            using TypeInfo = Attributes::StartUpMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
-            }
-            return value;
-        }
         case Attributes::OnMode::Id: {
             using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -15145,12 +15298,113 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::AirQuality::Id: {
-        using namespace app::Clusters::AirQuality;
+    case app::Clusters::RvcCleanMode::Id: {
+        using namespace app::Clusters::RvcCleanMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::AirQuality::Id: {
-            using TypeInfo = Attributes::AirQuality::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+                jobject newElement_0_mode;
+                std::string newElement_0_modeClassName     = "java/lang/Integer";
+                std::string newElement_0_modeCtorSignature = "(I)V";
+                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
+                                                                           newElement_0_modeCtorSignature.c_str(),
+                                                                           jninewElement_0_mode, newElement_0_mode);
+                jobject newElement_0_modeTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+
+                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+                while (iter_newElement_0_modeTags_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_mfgCode;
+                    if (!entry_2.mfgCode.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+                    }
+                    else
+                    {
+                        jobject newElement_2_mfgCodeInsideOptional;
+                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
+                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
+                            newElement_2_mfgCodeInsideOptional);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+                    }
+                    jobject newElement_2_value;
+                    std::string newElement_2_valueClassName     = "java/lang/Integer";
+                    std::string newElement_2_valueCtorSignature = "(I)V";
+                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                               newElement_2_valueCtorSignature.c_str(),
+                                                                               jninewElement_2_value, newElement_2_value);
+
+                    jclass modeTagStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct");
+                        return nullptr;
+                    }
+                    jmethodID modeTagStructStructCtor_3 =
+                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+                    if (modeTagStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
+                                                  newElement_2_value);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+                }
+
+                jclass modeOptionStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct");
+                    return nullptr;
+                }
+                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
+                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+                if (modeOptionStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                              newElement_0_mode, newElement_0_modeTags);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15165,6 +15419,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -15303,12 +15580,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::SmokeCoAlarm::Id: {
-        using namespace app::Clusters::SmokeCoAlarm;
+    case app::Clusters::TemperatureControl::Id: {
+        using namespace app::Clusters::TemperatureControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::ExpressedState::Id: {
-            using TypeInfo = Attributes::ExpressedState::TypeInfo;
+        case Attributes::TemperatureSetpoint::Id: {
+            using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15323,8 +15600,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::SmokeState::Id: {
-            using TypeInfo = Attributes::SmokeState::TypeInfo;
+        case Attributes::MinTemperature::Id: {
+            using TypeInfo = Attributes::MinTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15339,8 +15616,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::COState::Id: {
-            using TypeInfo = Attributes::COState::TypeInfo;
+        case Attributes::MaxTemperature::Id: {
+            using TypeInfo = Attributes::MaxTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15355,8 +15632,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::BatteryAlert::Id: {
-            using TypeInfo = Attributes::BatteryAlert::TypeInfo;
+        case Attributes::Step::Id: {
+            using TypeInfo = Attributes::Step::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15371,8 +15648,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::DeviceMuted::Id: {
-            using TypeInfo = Attributes::DeviceMuted::TypeInfo;
+        case Attributes::SelectedTemperatureLevel::Id: {
+            using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15387,8 +15664,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::TestInProgress::Id: {
-            using TypeInfo = Attributes::TestInProgress::TypeInfo;
+        case Attributes::SupportedTemperatureLevels::Id: {
+            using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15396,15 +15673,20 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            jboolean jnivalue              = static_cast<jboolean>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::HardwareFaultAlert::Id: {
-            using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15412,15 +15694,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            jboolean jnivalue              = static_cast<jboolean>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::EndOfServiceAlert::Id: {
-            using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15428,145 +15719,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::InterconnectSmokeAlarm::Id: {
-            using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::InterconnectCOAlarm::Id: {
-            using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::ContaminationState::Id: {
-            using TypeInfo = Attributes::ContaminationState::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::SmokeSensitivityLevel::Id: {
-            using TypeInfo = Attributes::SmokeSensitivityLevel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::ExpiryDate::Id: {
-            using TypeInfo = Attributes::ExpiryDate::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::EventList::Id: {
-            using TypeInfo = Attributes::EventList::TypeInfo;
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15653,8 +15823,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::DishwasherAlarm::Id: {
-        using namespace app::Clusters::DishwasherAlarm;
+    case app::Clusters::RefrigeratorAlarm::Id: {
+        using namespace app::Clusters::RefrigeratorAlarm;
         switch (aPath.mAttributeId)
         {
         case Attributes::Mask::Id: {
@@ -15673,22 +15843,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                         jnivalue, value);
             return value;
         }
-        case Attributes::Latch::Id: {
-            using TypeInfo = Attributes::Latch::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
-            return value;
-        }
         case Attributes::State::Id: {
             using TypeInfo = Attributes::State::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -15859,12 +16013,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::OperationalState::Id: {
-        using namespace app::Clusters::OperationalState;
+    case app::Clusters::DishwasherMode::Id: {
+        using namespace app::Clusters::DishwasherMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::PhaseList::Id: {
-            using TypeInfo = Attributes::PhaseList::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15872,27 +16026,100 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                chip::JniReferences::GetInstance().CreateArrayList(value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+                jobject newElement_0_mode;
+                std::string newElement_0_modeClassName     = "java/lang/Integer";
+                std::string newElement_0_modeCtorSignature = "(I)V";
+                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
+                                                                           newElement_0_modeCtorSignature.c_str(),
+                                                                           jninewElement_0_mode, newElement_0_mode);
+                jobject newElement_0_modeTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
 
-                auto iter_value_1 = cppValue.Value().begin();
-                while (iter_value_1.Next())
+                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+                while (iter_newElement_0_modeTags_2.Next())
                 {
-                    auto & entry_1 = iter_value_1.GetValue();
-                    jobject newElement_1;
-                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
-                    chip::JniReferences::GetInstance().AddToList(value, newElement_1);
+                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_mfgCode;
+                    if (!entry_2.mfgCode.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+                    }
+                    else
+                    {
+                        jobject newElement_2_mfgCodeInsideOptional;
+                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
+                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
+                            newElement_2_mfgCodeInsideOptional);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+                    }
+                    jobject newElement_2_value;
+                    std::string newElement_2_valueClassName     = "java/lang/Integer";
+                    std::string newElement_2_valueCtorSignature = "(I)V";
+                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                               newElement_2_valueCtorSignature.c_str(),
+                                                                               jninewElement_2_value, newElement_2_value);
+
+                    jclass modeTagStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct");
+                        return nullptr;
+                    }
+                    jmethodID modeTagStructStructCtor_3 =
+                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+                    if (modeTagStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
+                                                  newElement_2_value);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+                }
+
+                jclass modeOptionStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct");
+                    return nullptr;
+                }
+                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
+                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+                if (modeOptionStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor");
+                    return nullptr;
                 }
+
+                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                              newElement_0_mode, newElement_0_modeTags);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::CurrentPhase::Id: {
-            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15900,13 +16127,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
                 jint jnivalue                  = static_cast<jint>(cppValue.Value());
                 chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
@@ -15914,8 +16157,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::CountdownTime::Id: {
-            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15929,16 +16172,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                            jnivalue, value);
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
             }
             return value;
         }
-        case Attributes::OperationalStateList::Id: {
-            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15953,52 +16196,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_operationalStateID;
-                std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
-                std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
-                jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
-                    jninewElement_0_operationalStateID, newElement_0_operationalStateID);
-                jobject newElement_0_operationalStateLabel;
-                if (!entry_0.operationalStateLabel.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
-                }
-                else
-                {
-                    jobject newElement_0_operationalStateLabelInsideOptional;
-                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
-                        entry_0.operationalStateLabel.Value(), newElement_0_operationalStateLabelInsideOptional));
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
-                                                                      newElement_0_operationalStateLabel);
-                }
-
-                jclass operationalStateStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$OperationalStateClusterOperationalStateStruct",
-                    operationalStateStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterOperationalStateStruct");
-                    return nullptr;
-                }
-                jmethodID operationalStateStructStructCtor_1 =
-                    env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
-                if (operationalStateStructStructCtor_1 == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterOperationalStateStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
-                                              newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::OperationalState::Id: {
-            using TypeInfo = Attributes::OperationalState::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16006,15 +16214,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::OperationalError::Id: {
-            using TypeInfo = Attributes::OperationalError::TypeInfo;
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16022,56 +16239,103 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_errorStateID;
-            std::string value_errorStateIDClassName     = "java/lang/Integer";
-            std::string value_errorStateIDCtorSignature = "(I)V";
-            jint jnivalue_errorStateID                  = static_cast<jint>(cppValue.errorStateID);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_errorStateIDClassName.c_str(),
-                                                                       value_errorStateIDCtorSignature.c_str(),
-                                                                       jnivalue_errorStateID, value_errorStateID);
-            jobject value_errorStateLabel;
-            if (!cppValue.errorStateLabel.HasValue())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateLabel);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                jobject value_errorStateLabelInsideOptional;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateLabel.Value(),
-                                                                                     value_errorStateLabelInsideOptional));
-                chip::JniReferences::GetInstance().CreateOptional(value_errorStateLabelInsideOptional, value_errorStateLabel);
+                return nullptr;
             }
-            jobject value_errorStateDetails;
-            if (!cppValue.errorStateDetails.HasValue())
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                jobject value_errorStateDetailsInsideOptional;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
-                                                                                     value_errorStateDetailsInsideOptional));
-                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
+                return nullptr;
             }
-
-            jclass errorStateStructStructClass_0;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$OperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
-            if (err != CHIP_NO_ERROR)
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterErrorStateStruct");
                 return nullptr;
             }
-            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
-                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
-            if (errorStateStructStructCtor_0 == nullptr)
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::AirQuality::Id: {
+        using namespace app::Clusters::AirQuality;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::AirQuality::Id: {
+            using TypeInfo = Attributes::AirQuality::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterErrorStateStruct constructor");
                 return nullptr;
             }
-
-            value = env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorStateID,
-                                   value_errorStateLabel, value_errorStateDetails);
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -16212,12 +16476,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcOperationalState::Id: {
-        using namespace app::Clusters::RvcOperationalState;
+    case app::Clusters::SmokeCoAlarm::Id: {
+        using namespace app::Clusters::SmokeCoAlarm;
         switch (aPath.mAttributeId)
         {
-        case Attributes::PhaseList::Id: {
-            using TypeInfo = Attributes::PhaseList::TypeInfo;
+        case Attributes::ExpressedState::Id: {
+            using TypeInfo = Attributes::ExpressedState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16225,27 +16489,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::SmokeState::Id: {
+            using TypeInfo = Attributes::SmokeState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::COState::Id: {
+            using TypeInfo = Attributes::COState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                chip::JniReferences::GetInstance().CreateArrayList(value);
-
-                auto iter_value_1 = cppValue.Value().begin();
-                while (iter_value_1.Next())
-                {
-                    auto & entry_1 = iter_value_1.GetValue();
-                    jobject newElement_1;
-                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
-                    chip::JniReferences::GetInstance().AddToList(value, newElement_1);
-                }
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
-        case Attributes::CurrentPhase::Id: {
-            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        case Attributes::BatteryAlert::Id: {
+            using TypeInfo = Attributes::BatteryAlert::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16253,22 +16537,63 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::DeviceMuted::Id: {
+            using TypeInfo = Attributes::DeviceMuted::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::TestInProgress::Id: {
+            using TypeInfo = Attributes::TestInProgress::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                jint jnivalue                  = static_cast<jint>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            jnivalue, value);
+            return value;
+        }
+        case Attributes::HardwareFaultAlert::Id: {
+            using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
             return value;
         }
-        case Attributes::CountdownTime::Id: {
-            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        case Attributes::EndOfServiceAlert::Id: {
+            using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16276,22 +16601,95 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::InterconnectSmokeAlarm::Id: {
+            using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::InterconnectCOAlarm::Id: {
+            using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                            jnivalue, value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
-        case Attributes::OperationalStateList::Id: {
-            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+        case Attributes::ContaminationState::Id: {
+            using TypeInfo = Attributes::ContaminationState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::SmokeSensitivityLevel::Id: {
+            using TypeInfo = Attributes::SmokeSensitivityLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::ExpiryDate::Id: {
+            using TypeInfo = Attributes::ExpiryDate::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16306,52 +16704,3846 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_operationalStateID;
-                std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
-                std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
-                jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
-                    jninewElement_0_operationalStateID, newElement_0_operationalStateID);
-                jobject newElement_0_operationalStateLabel;
-                if (!entry_0.operationalStateLabel.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
-                }
-                else
-                {
-                    jobject newElement_0_operationalStateLabelInsideOptional;
-                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
-                        entry_0.operationalStateLabel.Value(), newElement_0_operationalStateLabelInsideOptional));
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
-                                                                      newElement_0_operationalStateLabel);
-                }
-
-                jclass operationalStateStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterOperationalStateStruct",
-                    operationalStateStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterOperationalStateStruct");
-                    return nullptr;
-                }
-                jmethodID operationalStateStructStructCtor_1 =
-                    env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
-                if (operationalStateStructStructCtor_1 == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterOperationalStateStruct constructor");
-                    return nullptr;
-                }
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
 
-                newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
-                                              newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::OperationalState::Id: {
-            using TypeInfo = Attributes::OperationalState::TypeInfo;
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::DishwasherAlarm::Id: {
+        using namespace app::Clusters::DishwasherAlarm;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Mask::Id: {
+            using TypeInfo = Attributes::Mask::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::Latch::Id: {
+            using TypeInfo = Attributes::Latch::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::State::Id: {
+            using TypeInfo = Attributes::State::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::Supported::Id: {
+            using TypeInfo = Attributes::Supported::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::MicrowaveOvenMode::Id: {
+        using namespace app::Clusters::MicrowaveOvenMode;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+                jobject newElement_0_mode;
+                std::string newElement_0_modeClassName     = "java/lang/Integer";
+                std::string newElement_0_modeCtorSignature = "(I)V";
+                jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_modeClassName.c_str(),
+                                                                           newElement_0_modeCtorSignature.c_str(),
+                                                                           jninewElement_0_mode, newElement_0_mode);
+                jobject newElement_0_modeTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+
+                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+                while (iter_newElement_0_modeTags_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_mfgCode;
+                    if (!entry_2.mfgCode.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+                    }
+                    else
+                    {
+                        jobject newElement_2_mfgCodeInsideOptional;
+                        std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                        std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                        jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_mfgCodeInsideOptionalClassName.c_str(),
+                            newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), jninewElement_2_mfgCodeInsideOptional,
+                            newElement_2_mfgCodeInsideOptional);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+                    }
+                    jobject newElement_2_value;
+                    std::string newElement_2_valueClassName     = "java/lang/Integer";
+                    std::string newElement_2_valueCtorSignature = "(I)V";
+                    jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                               newElement_2_valueCtorSignature.c_str(),
+                                                                               jninewElement_2_value, newElement_2_value);
+
+                    jclass modeTagStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$MicrowaveOvenModeClusterModeTagStruct", modeTagStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$MicrowaveOvenModeClusterModeTagStruct");
+                        return nullptr;
+                    }
+                    jmethodID modeTagStructStructCtor_3 =
+                        env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+                    if (modeTagStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl, "Could not find ChipStructs$MicrowaveOvenModeClusterModeTagStruct constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode,
+                                                  newElement_2_value);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+                }
+
+                jclass modeOptionStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$MicrowaveOvenModeClusterModeOptionStruct",
+                    modeOptionStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$MicrowaveOvenModeClusterModeOptionStruct");
+                    return nullptr;
+                }
+                jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(
+                    modeOptionStructStructClass_1, "<init>", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+                if (modeOptionStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$MicrowaveOvenModeClusterModeOptionStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                              newElement_0_mode, newElement_0_modeTags);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::MicrowaveOvenControl::Id: {
+        using namespace app::Clusters::MicrowaveOvenControl;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::CookTime::Id: {
+            using TypeInfo = Attributes::CookTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::PowerSetting::Id: {
+            using TypeInfo = Attributes::PowerSetting::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::MinPower::Id: {
+            using TypeInfo = Attributes::MinPower::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::MaxPower::Id: {
+            using TypeInfo = Attributes::MaxPower::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::PowerStep::Id: {
+            using TypeInfo = Attributes::PowerStep::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OperationalState::Id: {
+        using namespace app::Clusters::OperationalState;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::PhaseList::Id: {
+            using TypeInfo = Attributes::PhaseList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                chip::JniReferences::GetInstance().CreateArrayList(value);
+
+                auto iter_value_1 = cppValue.Value().begin();
+                while (iter_value_1.Next())
+                {
+                    auto & entry_1 = iter_value_1.GetValue();
+                    jobject newElement_1;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+                    chip::JniReferences::GetInstance().AddToList(value, newElement_1);
+                }
+            }
+            return value;
+        }
+        case Attributes::CurrentPhase::Id: {
+            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::CountdownTime::Id: {
+            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::OperationalStateList::Id: {
+            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_operationalStateID;
+                std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+                std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+                jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+                    jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+                jobject newElement_0_operationalStateLabel;
+                if (!entry_0.operationalStateLabel.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+                }
+                else
+                {
+                    jobject newElement_0_operationalStateLabelInsideOptional;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                        entry_0.operationalStateLabel.Value(), newElement_0_operationalStateLabelInsideOptional));
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                                      newElement_0_operationalStateLabel);
+                }
+
+                jclass operationalStateStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$OperationalStateClusterOperationalStateStruct",
+                    operationalStateStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterOperationalStateStruct");
+                    return nullptr;
+                }
+                jmethodID operationalStateStructStructCtor_1 =
+                    env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+                if (operationalStateStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterOperationalStateStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                              newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::OperationalState::Id: {
+            using TypeInfo = Attributes::OperationalState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::OperationalError::Id: {
+            using TypeInfo = Attributes::OperationalError::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_errorStateID;
+            std::string value_errorStateIDClassName     = "java/lang/Integer";
+            std::string value_errorStateIDCtorSignature = "(I)V";
+            jint jnivalue_errorStateID                  = static_cast<jint>(cppValue.errorStateID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_errorStateIDClassName.c_str(),
+                                                                       value_errorStateIDCtorSignature.c_str(),
+                                                                       jnivalue_errorStateID, value_errorStateID);
+            jobject value_errorStateLabel;
+            if (!cppValue.errorStateLabel.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateLabel);
+            }
+            else
+            {
+                jobject value_errorStateLabelInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateLabel.Value(),
+                                                                                     value_errorStateLabelInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateLabelInsideOptional, value_errorStateLabel);
+            }
+            jobject value_errorStateDetails;
+            if (!cppValue.errorStateDetails.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
+            }
+            else
+            {
+                jobject value_errorStateDetailsInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
+                                                                                     value_errorStateDetailsInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
+            }
+
+            jclass errorStateStructStructClass_0;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$OperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterErrorStateStruct");
+                return nullptr;
+            }
+            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
+                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (errorStateStructStructCtor_0 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterErrorStateStruct constructor");
+                return nullptr;
+            }
+
+            value = env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorStateID,
+                                   value_errorStateLabel, value_errorStateDetails);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::RvcOperationalState::Id: {
+        using namespace app::Clusters::RvcOperationalState;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::PhaseList::Id: {
+            using TypeInfo = Attributes::PhaseList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                chip::JniReferences::GetInstance().CreateArrayList(value);
+
+                auto iter_value_1 = cppValue.Value().begin();
+                while (iter_value_1.Next())
+                {
+                    auto & entry_1 = iter_value_1.GetValue();
+                    jobject newElement_1;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+                    chip::JniReferences::GetInstance().AddToList(value, newElement_1);
+                }
+            }
+            return value;
+        }
+        case Attributes::CurrentPhase::Id: {
+            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::CountdownTime::Id: {
+            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::OperationalStateList::Id: {
+            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_operationalStateID;
+                std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+                std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+                jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+                    jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+                jobject newElement_0_operationalStateLabel;
+                if (!entry_0.operationalStateLabel.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+                }
+                else
+                {
+                    jobject newElement_0_operationalStateLabelInsideOptional;
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                        entry_0.operationalStateLabel.Value(), newElement_0_operationalStateLabelInsideOptional));
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                                      newElement_0_operationalStateLabel);
+                }
+
+                jclass operationalStateStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterOperationalStateStruct",
+                    operationalStateStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterOperationalStateStruct");
+                    return nullptr;
+                }
+                jmethodID operationalStateStructStructCtor_1 =
+                    env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+                if (operationalStateStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterOperationalStateStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                              newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::OperationalState::Id: {
+            using TypeInfo = Attributes::OperationalState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::OperationalError::Id: {
+            using TypeInfo = Attributes::OperationalError::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_errorStateID;
+            std::string value_errorStateIDClassName     = "java/lang/Integer";
+            std::string value_errorStateIDCtorSignature = "(I)V";
+            jint jnivalue_errorStateID                  = static_cast<jint>(cppValue.errorStateID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_errorStateIDClassName.c_str(),
+                                                                       value_errorStateIDCtorSignature.c_str(),
+                                                                       jnivalue_errorStateID, value_errorStateID);
+            jobject value_errorStateLabel;
+            if (!cppValue.errorStateLabel.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateLabel);
+            }
+            else
+            {
+                jobject value_errorStateLabelInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateLabel.Value(),
+                                                                                     value_errorStateLabelInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateLabelInsideOptional, value_errorStateLabel);
+            }
+            jobject value_errorStateDetails;
+            if (!cppValue.errorStateDetails.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
+            }
+            else
+            {
+                jobject value_errorStateDetailsInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
+                                                                                     value_errorStateDetailsInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
+            }
+
+            jclass errorStateStructStructClass_0;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterErrorStateStruct");
+                return nullptr;
+            }
+            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
+                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (errorStateStructStructCtor_0 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterErrorStateStruct constructor");
+                return nullptr;
+            }
+
+            value = env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorStateID,
+                                   value_errorStateLabel, value_errorStateDetails);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::HepaFilterMonitoring::Id: {
+        using namespace app::Clusters::HepaFilterMonitoring;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Condition::Id: {
+            using TypeInfo = Attributes::Condition::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::DegradationDirection::Id: {
+            using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::ChangeIndication::Id: {
+            using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::InPlaceIndicator::Id: {
+            using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            return value;
+        }
+        case Attributes::LastChangedTime::Id: {
+            using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::ReplacementProductList::Id: {
+            using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_productIdentifierType;
+                std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
+                std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
+                jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
+                    jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
+                jobject newElement_0_productIdentifierValue;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
+                                                                                     newElement_0_productIdentifierValue));
+
+                jclass replacementProductStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct",
+                    replacementProductStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct");
+                    return nullptr;
+                }
+                jmethodID replacementProductStructStructCtor_1 =
+                    env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+                if (replacementProductStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
+                                              newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ActivatedCarbonFilterMonitoring::Id: {
+        using namespace app::Clusters::ActivatedCarbonFilterMonitoring;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Condition::Id: {
+            using TypeInfo = Attributes::Condition::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::DegradationDirection::Id: {
+            using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::ChangeIndication::Id: {
+            using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::InPlaceIndicator::Id: {
+            using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            return value;
+        }
+        case Attributes::LastChangedTime::Id: {
+            using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::ReplacementProductList::Id: {
+            using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_productIdentifierType;
+                std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
+                std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
+                jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
+                    jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
+                jobject newElement_0_productIdentifierValue;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
+                                                                                     newElement_0_productIdentifierValue));
+
+                jclass replacementProductStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
+                    replacementProductStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find class ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct");
+                    return nullptr;
+                }
+                jmethodID replacementProductStructStructCtor_1 =
+                    env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+                if (replacementProductStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(
+                        Zcl,
+                        "Could not find ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
+                                              newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::BooleanSensorConfiguration::Id: {
+        using namespace app::Clusters::BooleanSensorConfiguration;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::SensitivityLevel::Id: {
+            using TypeInfo = Attributes::SensitivityLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::AlarmsActive::Id: {
+            using TypeInfo = Attributes::AlarmsActive::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::AlarmsSuppressed::Id: {
+            using TypeInfo = Attributes::AlarmsSuppressed::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::AlarmsEnabled::Id: {
+            using TypeInfo = Attributes::AlarmsEnabled::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ValveConfigurationAndControl::Id: {
+        using namespace app::Clusters::ValveConfigurationAndControl;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::OpenDuration::Id: {
+            using TypeInfo = Attributes::OpenDuration::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::AutoCloseTime::Id: {
+            using TypeInfo = Attributes::AutoCloseTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::RemainingDuration::Id: {
+            using TypeInfo = Attributes::RemainingDuration::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::CurrentState::Id: {
+            using TypeInfo = Attributes::CurrentState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::TargetState::Id: {
+            using TypeInfo = Attributes::TargetState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::StartUpState::Id: {
+            using TypeInfo = Attributes::StartUpState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::CurrentLevel::Id: {
+            using TypeInfo = Attributes::CurrentLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::TargetLevel::Id: {
+            using TypeInfo = Attributes::TargetLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::OpenLevel::Id: {
+            using TypeInfo = Attributes::OpenLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
+            return value;
+        }
+        case Attributes::ValveFault::Id: {
+            using TypeInfo = Attributes::ValveFault::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::DemandResponseLoadControl::Id: {
+        using namespace app::Clusters::DemandResponseLoadControl;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::LoadControlPrograms::Id: {
+            using TypeInfo = Attributes::LoadControlPrograms::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_programID;
+                jbyteArray newElement_0_programIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.programID.size()));
+                env->SetByteArrayRegion(newElement_0_programIDByteArray, 0, static_cast<jsize>(entry_0.programID.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.programID.data()));
+                newElement_0_programID = newElement_0_programIDByteArray;
+                jobject newElement_0_name;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name));
+                jobject newElement_0_enrollmentGroup;
+                if (entry_0.enrollmentGroup.IsNull())
+                {
+                    newElement_0_enrollmentGroup = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_enrollmentGroupClassName     = "java/lang/Integer";
+                    std::string newElement_0_enrollmentGroupCtorSignature = "(I)V";
+                    jint jninewElement_0_enrollmentGroup                  = static_cast<jint>(entry_0.enrollmentGroup.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        newElement_0_enrollmentGroupClassName.c_str(), newElement_0_enrollmentGroupCtorSignature.c_str(),
+                        jninewElement_0_enrollmentGroup, newElement_0_enrollmentGroup);
+                }
+                jobject newElement_0_randomStartMinutes;
+                if (entry_0.randomStartMinutes.IsNull())
+                {
+                    newElement_0_randomStartMinutes = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_randomStartMinutesClassName     = "java/lang/Integer";
+                    std::string newElement_0_randomStartMinutesCtorSignature = "(I)V";
+                    jint jninewElement_0_randomStartMinutes = static_cast<jint>(entry_0.randomStartMinutes.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        newElement_0_randomStartMinutesClassName.c_str(), newElement_0_randomStartMinutesCtorSignature.c_str(),
+                        jninewElement_0_randomStartMinutes, newElement_0_randomStartMinutes);
+                }
+                jobject newElement_0_randomDurationMinutes;
+                if (entry_0.randomDurationMinutes.IsNull())
+                {
+                    newElement_0_randomDurationMinutes = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_randomDurationMinutesClassName     = "java/lang/Integer";
+                    std::string newElement_0_randomDurationMinutesCtorSignature = "(I)V";
+                    jint jninewElement_0_randomDurationMinutes = static_cast<jint>(entry_0.randomDurationMinutes.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        newElement_0_randomDurationMinutesClassName.c_str(),
+                        newElement_0_randomDurationMinutesCtorSignature.c_str(), jninewElement_0_randomDurationMinutes,
+                        newElement_0_randomDurationMinutes);
+                }
+
+                jclass loadControlProgramStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct",
+                    loadControlProgramStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct");
+                    return nullptr;
+                }
+                jmethodID loadControlProgramStructStructCtor_1 =
+                    env->GetMethodID(loadControlProgramStructStructClass_1, "<init>",
+                                     "([BLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                if (loadControlProgramStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(loadControlProgramStructStructClass_1, loadControlProgramStructStructCtor_1,
+                                              newElement_0_programID, newElement_0_name, newElement_0_enrollmentGroup,
+                                              newElement_0_randomStartMinutes, newElement_0_randomDurationMinutes);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::NumberOfLoadControlPrograms::Id: {
+            using TypeInfo = Attributes::NumberOfLoadControlPrograms::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::Events::Id: {
+            using TypeInfo = Attributes::Events::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_eventID;
+                jbyteArray newElement_0_eventIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.eventID.size()));
+                env->SetByteArrayRegion(newElement_0_eventIDByteArray, 0, static_cast<jsize>(entry_0.eventID.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.eventID.data()));
+                newElement_0_eventID = newElement_0_eventIDByteArray;
+                jobject newElement_0_programID;
+                if (entry_0.programID.IsNull())
+                {
+                    newElement_0_programID = nullptr;
+                }
+                else
+                {
+                    jbyteArray newElement_0_programIDByteArray =
+                        env->NewByteArray(static_cast<jsize>(entry_0.programID.Value().size()));
+                    env->SetByteArrayRegion(newElement_0_programIDByteArray, 0,
+                                            static_cast<jsize>(entry_0.programID.Value().size()),
+                                            reinterpret_cast<const jbyte *>(entry_0.programID.Value().data()));
+                    newElement_0_programID = newElement_0_programIDByteArray;
+                }
+                jobject newElement_0_control;
+                std::string newElement_0_controlClassName     = "java/lang/Integer";
+                std::string newElement_0_controlCtorSignature = "(I)V";
+                jint jninewElement_0_control                  = static_cast<jint>(entry_0.control.Raw());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_controlClassName.c_str(),
+                                                                           newElement_0_controlCtorSignature.c_str(),
+                                                                           jninewElement_0_control, newElement_0_control);
+                jobject newElement_0_deviceClass;
+                std::string newElement_0_deviceClassClassName     = "java/lang/Long";
+                std::string newElement_0_deviceClassCtorSignature = "(J)V";
+                jlong jninewElement_0_deviceClass                 = static_cast<jlong>(entry_0.deviceClass.Raw());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_deviceClassClassName.c_str(),
+                                                                            newElement_0_deviceClassCtorSignature.c_str(),
+                                                                            jninewElement_0_deviceClass, newElement_0_deviceClass);
+                jobject newElement_0_enrollmentGroup;
+                if (!entry_0.enrollmentGroup.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_enrollmentGroup);
+                }
+                else
+                {
+                    jobject newElement_0_enrollmentGroupInsideOptional;
+                    std::string newElement_0_enrollmentGroupInsideOptionalClassName     = "java/lang/Integer";
+                    std::string newElement_0_enrollmentGroupInsideOptionalCtorSignature = "(I)V";
+                    jint jninewElement_0_enrollmentGroupInsideOptional = static_cast<jint>(entry_0.enrollmentGroup.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        newElement_0_enrollmentGroupInsideOptionalClassName.c_str(),
+                        newElement_0_enrollmentGroupInsideOptionalCtorSignature.c_str(),
+                        jninewElement_0_enrollmentGroupInsideOptional, newElement_0_enrollmentGroupInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_enrollmentGroupInsideOptional,
+                                                                      newElement_0_enrollmentGroup);
+                }
+                jobject newElement_0_criticality;
+                std::string newElement_0_criticalityClassName     = "java/lang/Integer";
+                std::string newElement_0_criticalityCtorSignature = "(I)V";
+                jint jninewElement_0_criticality                  = static_cast<jint>(entry_0.criticality);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_criticalityClassName.c_str(),
+                                                                           newElement_0_criticalityCtorSignature.c_str(),
+                                                                           jninewElement_0_criticality, newElement_0_criticality);
+                jobject newElement_0_startTime;
+                if (entry_0.startTime.IsNull())
+                {
+                    newElement_0_startTime = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_startTimeClassName     = "java/lang/Long";
+                    std::string newElement_0_startTimeCtorSignature = "(J)V";
+                    jlong jninewElement_0_startTime                 = static_cast<jlong>(entry_0.startTime.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_startTimeClassName.c_str(),
+                                                                                newElement_0_startTimeCtorSignature.c_str(),
+                                                                                jninewElement_0_startTime, newElement_0_startTime);
+                }
+                jobject newElement_0_transitions;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_transitions);
+
+                auto iter_newElement_0_transitions_2 = entry_0.transitions.begin();
+                while (iter_newElement_0_transitions_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_transitions_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_duration;
+                    std::string newElement_2_durationClassName     = "java/lang/Integer";
+                    std::string newElement_2_durationCtorSignature = "(I)V";
+                    jint jninewElement_2_duration                  = static_cast<jint>(entry_2.duration);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_durationClassName.c_str(),
+                                                                               newElement_2_durationCtorSignature.c_str(),
+                                                                               jninewElement_2_duration, newElement_2_duration);
+                    jobject newElement_2_control;
+                    std::string newElement_2_controlClassName     = "java/lang/Integer";
+                    std::string newElement_2_controlCtorSignature = "(I)V";
+                    jint jninewElement_2_control                  = static_cast<jint>(entry_2.control.Raw());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_controlClassName.c_str(),
+                                                                               newElement_2_controlCtorSignature.c_str(),
+                                                                               jninewElement_2_control, newElement_2_control);
+                    jobject newElement_2_temperatureControl;
+                    if (!entry_2.temperatureControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_temperatureControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_temperatureControlInsideOptional;
+                        jobject newElement_2_temperatureControlInsideOptional_coolingTempOffset;
+                        if (!entry_2.temperatureControl.Value().coolingTempOffset.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional;
+                            if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName =
+                                    "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().coolingTempOffset.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName.c_str(),
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffset;
+                        if (!entry_2.temperatureControl.Value().heatingtTempOffset.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional;
+                            if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName.c_str(),
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpoint;
+                        if (!entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional;
+                            if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName
+                                        .c_str(),
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpoint;
+                        if (!entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional;
+                            if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName
+                                        .c_str(),
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        }
+
+                        jclass temperatureControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct",
+                            temperatureControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID temperatureControlStructStructCtor_5 =
+                            env->GetMethodID(temperatureControlStructStructClass_5, "<init>",
+                                             "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                        if (temperatureControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_temperatureControlInsideOptional =
+                            env->NewObject(temperatureControlStructStructClass_5, temperatureControlStructStructCtor_5,
+                                           newElement_2_temperatureControlInsideOptional_coolingTempOffset,
+                                           newElement_2_temperatureControlInsideOptional_heatingtTempOffset,
+                                           newElement_2_temperatureControlInsideOptional_coolingTempSetpoint,
+                                           newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_temperatureControlInsideOptional,
+                                                                          newElement_2_temperatureControl);
+                    }
+                    jobject newElement_2_averageLoadControl;
+                    if (!entry_2.averageLoadControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_averageLoadControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_averageLoadControlInsideOptional;
+                        jobject newElement_2_averageLoadControlInsideOptional_loadAdjustment;
+                        std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName     = "java/lang/Integer";
+                        std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature = "(I)V";
+                        jint jninewElement_2_averageLoadControlInsideOptional_loadAdjustment =
+                            static_cast<jint>(entry_2.averageLoadControl.Value().loadAdjustment);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName.c_str(),
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature.c_str(),
+                            jninewElement_2_averageLoadControlInsideOptional_loadAdjustment,
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+
+                        jclass averageLoadControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct",
+                            averageLoadControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID averageLoadControlStructStructCtor_5 =
+                            env->GetMethodID(averageLoadControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (averageLoadControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_averageLoadControlInsideOptional =
+                            env->NewObject(averageLoadControlStructStructClass_5, averageLoadControlStructStructCtor_5,
+                                           newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_averageLoadControlInsideOptional,
+                                                                          newElement_2_averageLoadControl);
+                    }
+                    jobject newElement_2_dutyCycleControl;
+                    if (!entry_2.dutyCycleControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_dutyCycleControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_dutyCycleControlInsideOptional;
+                        jobject newElement_2_dutyCycleControlInsideOptional_dutyCycle;
+                        std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName     = "java/lang/Integer";
+                        std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature = "(I)V";
+                        jint jninewElement_2_dutyCycleControlInsideOptional_dutyCycle =
+                            static_cast<jint>(entry_2.dutyCycleControl.Value().dutyCycle);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName.c_str(),
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature.c_str(),
+                            jninewElement_2_dutyCycleControlInsideOptional_dutyCycle,
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+
+                        jclass dutyCycleControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct",
+                            dutyCycleControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(Zcl,
+                                         "Could not find class ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID dutyCycleControlStructStructCtor_5 =
+                            env->GetMethodID(dutyCycleControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (dutyCycleControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_dutyCycleControlInsideOptional =
+                            env->NewObject(dutyCycleControlStructStructClass_5, dutyCycleControlStructStructCtor_5,
+                                           newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_dutyCycleControlInsideOptional,
+                                                                          newElement_2_dutyCycleControl);
+                    }
+                    jobject newElement_2_powerSavingsControl;
+                    if (!entry_2.powerSavingsControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_powerSavingsControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_powerSavingsControlInsideOptional;
+                        jobject newElement_2_powerSavingsControlInsideOptional_powerSavings;
+                        std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName     = "java/lang/Integer";
+                        std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature = "(I)V";
+                        jint jninewElement_2_powerSavingsControlInsideOptional_powerSavings =
+                            static_cast<jint>(entry_2.powerSavingsControl.Value().powerSavings);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName.c_str(),
+                            newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature.c_str(),
+                            jninewElement_2_powerSavingsControlInsideOptional_powerSavings,
+                            newElement_2_powerSavingsControlInsideOptional_powerSavings);
+
+                        jclass powerSavingsControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct",
+                            powerSavingsControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID powerSavingsControlStructStructCtor_5 =
+                            env->GetMethodID(powerSavingsControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (powerSavingsControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_powerSavingsControlInsideOptional =
+                            env->NewObject(powerSavingsControlStructStructClass_5, powerSavingsControlStructStructCtor_5,
+                                           newElement_2_powerSavingsControlInsideOptional_powerSavings);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_powerSavingsControlInsideOptional,
+                                                                          newElement_2_powerSavingsControl);
+                    }
+                    jobject newElement_2_heatingSourceControl;
+                    if (!entry_2.heatingSourceControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_heatingSourceControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_heatingSourceControlInsideOptional;
+                        jobject newElement_2_heatingSourceControlInsideOptional_heatingSource;
+                        std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName = "java/lang/Integer";
+                        std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature = "(I)V";
+                        jint jninewElement_2_heatingSourceControlInsideOptional_heatingSource =
+                            static_cast<jint>(entry_2.heatingSourceControl.Value().heatingSource);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName.c_str(),
+                            newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature.c_str(),
+                            jninewElement_2_heatingSourceControlInsideOptional_heatingSource,
+                            newElement_2_heatingSourceControlInsideOptional_heatingSource);
+
+                        jclass heatingSourceControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct",
+                            heatingSourceControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID heatingSourceControlStructStructCtor_5 =
+                            env->GetMethodID(heatingSourceControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (heatingSourceControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(Zcl,
+                                         "Could not find ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct "
+                                         "constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_heatingSourceControlInsideOptional =
+                            env->NewObject(heatingSourceControlStructStructClass_5, heatingSourceControlStructStructCtor_5,
+                                           newElement_2_heatingSourceControlInsideOptional_heatingSource);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_heatingSourceControlInsideOptional,
+                                                                          newElement_2_heatingSourceControl);
+                    }
+
+                    jclass loadControlEventTransitionStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct",
+                        loadControlEventTransitionStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(
+                            Zcl,
+                            "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct");
+                        return nullptr;
+                    }
+                    jmethodID loadControlEventTransitionStructStructCtor_3 =
+                        env->GetMethodID(loadControlEventTransitionStructStructClass_3, "<init>",
+                                         "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/"
+                                         "util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                    if (loadControlEventTransitionStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct "
+                                     "constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 =
+                        env->NewObject(loadControlEventTransitionStructStructClass_3, loadControlEventTransitionStructStructCtor_3,
+                                       newElement_2_duration, newElement_2_control, newElement_2_temperatureControl,
+                                       newElement_2_averageLoadControl, newElement_2_dutyCycleControl,
+                                       newElement_2_powerSavingsControl, newElement_2_heatingSourceControl);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_transitions, newElement_2);
+                }
+
+                jclass loadControlEventStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+                    loadControlEventStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
+                    return nullptr;
+                }
+                jmethodID loadControlEventStructStructCtor_1 =
+                    env->GetMethodID(loadControlEventStructStructClass_1, "<init>",
+                                     "([B[BLjava/lang/Integer;Ljava/lang/Long;Ljava/util/Optional;Ljava/lang/Integer;Ljava/lang/"
+                                     "Long;Ljava/util/ArrayList;)V");
+                if (loadControlEventStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(loadControlEventStructStructClass_1, loadControlEventStructStructCtor_1,
+                                              newElement_0_eventID, newElement_0_programID, newElement_0_control,
+                                              newElement_0_deviceClass, newElement_0_enrollmentGroup, newElement_0_criticality,
+                                              newElement_0_startTime, newElement_0_transitions);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::ActiveEvents::Id: {
+            using TypeInfo = Attributes::ActiveEvents::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_eventID;
+                jbyteArray newElement_0_eventIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.eventID.size()));
+                env->SetByteArrayRegion(newElement_0_eventIDByteArray, 0, static_cast<jsize>(entry_0.eventID.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.eventID.data()));
+                newElement_0_eventID = newElement_0_eventIDByteArray;
+                jobject newElement_0_programID;
+                if (entry_0.programID.IsNull())
+                {
+                    newElement_0_programID = nullptr;
+                }
+                else
+                {
+                    jbyteArray newElement_0_programIDByteArray =
+                        env->NewByteArray(static_cast<jsize>(entry_0.programID.Value().size()));
+                    env->SetByteArrayRegion(newElement_0_programIDByteArray, 0,
+                                            static_cast<jsize>(entry_0.programID.Value().size()),
+                                            reinterpret_cast<const jbyte *>(entry_0.programID.Value().data()));
+                    newElement_0_programID = newElement_0_programIDByteArray;
+                }
+                jobject newElement_0_control;
+                std::string newElement_0_controlClassName     = "java/lang/Integer";
+                std::string newElement_0_controlCtorSignature = "(I)V";
+                jint jninewElement_0_control                  = static_cast<jint>(entry_0.control.Raw());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_controlClassName.c_str(),
+                                                                           newElement_0_controlCtorSignature.c_str(),
+                                                                           jninewElement_0_control, newElement_0_control);
+                jobject newElement_0_deviceClass;
+                std::string newElement_0_deviceClassClassName     = "java/lang/Long";
+                std::string newElement_0_deviceClassCtorSignature = "(J)V";
+                jlong jninewElement_0_deviceClass                 = static_cast<jlong>(entry_0.deviceClass.Raw());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_deviceClassClassName.c_str(),
+                                                                            newElement_0_deviceClassCtorSignature.c_str(),
+                                                                            jninewElement_0_deviceClass, newElement_0_deviceClass);
+                jobject newElement_0_enrollmentGroup;
+                if (!entry_0.enrollmentGroup.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_enrollmentGroup);
+                }
+                else
+                {
+                    jobject newElement_0_enrollmentGroupInsideOptional;
+                    std::string newElement_0_enrollmentGroupInsideOptionalClassName     = "java/lang/Integer";
+                    std::string newElement_0_enrollmentGroupInsideOptionalCtorSignature = "(I)V";
+                    jint jninewElement_0_enrollmentGroupInsideOptional = static_cast<jint>(entry_0.enrollmentGroup.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        newElement_0_enrollmentGroupInsideOptionalClassName.c_str(),
+                        newElement_0_enrollmentGroupInsideOptionalCtorSignature.c_str(),
+                        jninewElement_0_enrollmentGroupInsideOptional, newElement_0_enrollmentGroupInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_enrollmentGroupInsideOptional,
+                                                                      newElement_0_enrollmentGroup);
+                }
+                jobject newElement_0_criticality;
+                std::string newElement_0_criticalityClassName     = "java/lang/Integer";
+                std::string newElement_0_criticalityCtorSignature = "(I)V";
+                jint jninewElement_0_criticality                  = static_cast<jint>(entry_0.criticality);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_criticalityClassName.c_str(),
+                                                                           newElement_0_criticalityCtorSignature.c_str(),
+                                                                           jninewElement_0_criticality, newElement_0_criticality);
+                jobject newElement_0_startTime;
+                if (entry_0.startTime.IsNull())
+                {
+                    newElement_0_startTime = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_startTimeClassName     = "java/lang/Long";
+                    std::string newElement_0_startTimeCtorSignature = "(J)V";
+                    jlong jninewElement_0_startTime                 = static_cast<jlong>(entry_0.startTime.Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_startTimeClassName.c_str(),
+                                                                                newElement_0_startTimeCtorSignature.c_str(),
+                                                                                jninewElement_0_startTime, newElement_0_startTime);
+                }
+                jobject newElement_0_transitions;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_transitions);
+
+                auto iter_newElement_0_transitions_2 = entry_0.transitions.begin();
+                while (iter_newElement_0_transitions_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_transitions_2.GetValue();
+                    jobject newElement_2;
+                    jobject newElement_2_duration;
+                    std::string newElement_2_durationClassName     = "java/lang/Integer";
+                    std::string newElement_2_durationCtorSignature = "(I)V";
+                    jint jninewElement_2_duration                  = static_cast<jint>(entry_2.duration);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_durationClassName.c_str(),
+                                                                               newElement_2_durationCtorSignature.c_str(),
+                                                                               jninewElement_2_duration, newElement_2_duration);
+                    jobject newElement_2_control;
+                    std::string newElement_2_controlClassName     = "java/lang/Integer";
+                    std::string newElement_2_controlCtorSignature = "(I)V";
+                    jint jninewElement_2_control                  = static_cast<jint>(entry_2.control.Raw());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_controlClassName.c_str(),
+                                                                               newElement_2_controlCtorSignature.c_str(),
+                                                                               jninewElement_2_control, newElement_2_control);
+                    jobject newElement_2_temperatureControl;
+                    if (!entry_2.temperatureControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_temperatureControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_temperatureControlInsideOptional;
+                        jobject newElement_2_temperatureControlInsideOptional_coolingTempOffset;
+                        if (!entry_2.temperatureControl.Value().coolingTempOffset.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional;
+                            if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName =
+                                    "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().coolingTempOffset.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName.c_str(),
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffset;
+                        if (!entry_2.temperatureControl.Value().heatingtTempOffset.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional;
+                            if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName.c_str(),
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpoint;
+                        if (!entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional;
+                            if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName
+                                        .c_str(),
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                        }
+                        jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpoint;
+                        if (!entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue())
+                        {
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                nullptr, newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        }
+                        else
+                        {
+                            jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional;
+                            if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull())
+                            {
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName =
+                                        "java/lang/Integer";
+                                std::string
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature =
+                                        "(I)V";
+                                jint jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional =
+                                    static_cast<jint>(entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value());
+                                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName
+                                        .c_str(),
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature
+                                        .c_str(),
+                                    jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                                    newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional);
+                            }
+                            chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                                newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        }
+
+                        jclass temperatureControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct",
+                            temperatureControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID temperatureControlStructStructCtor_5 =
+                            env->GetMethodID(temperatureControlStructStructClass_5, "<init>",
+                                             "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                        if (temperatureControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_temperatureControlInsideOptional =
+                            env->NewObject(temperatureControlStructStructClass_5, temperatureControlStructStructCtor_5,
+                                           newElement_2_temperatureControlInsideOptional_coolingTempOffset,
+                                           newElement_2_temperatureControlInsideOptional_heatingtTempOffset,
+                                           newElement_2_temperatureControlInsideOptional_coolingTempSetpoint,
+                                           newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_temperatureControlInsideOptional,
+                                                                          newElement_2_temperatureControl);
+                    }
+                    jobject newElement_2_averageLoadControl;
+                    if (!entry_2.averageLoadControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_averageLoadControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_averageLoadControlInsideOptional;
+                        jobject newElement_2_averageLoadControlInsideOptional_loadAdjustment;
+                        std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName     = "java/lang/Integer";
+                        std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature = "(I)V";
+                        jint jninewElement_2_averageLoadControlInsideOptional_loadAdjustment =
+                            static_cast<jint>(entry_2.averageLoadControl.Value().loadAdjustment);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName.c_str(),
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature.c_str(),
+                            jninewElement_2_averageLoadControlInsideOptional_loadAdjustment,
+                            newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+
+                        jclass averageLoadControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct",
+                            averageLoadControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID averageLoadControlStructStructCtor_5 =
+                            env->GetMethodID(averageLoadControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (averageLoadControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_averageLoadControlInsideOptional =
+                            env->NewObject(averageLoadControlStructStructClass_5, averageLoadControlStructStructCtor_5,
+                                           newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_averageLoadControlInsideOptional,
+                                                                          newElement_2_averageLoadControl);
+                    }
+                    jobject newElement_2_dutyCycleControl;
+                    if (!entry_2.dutyCycleControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_dutyCycleControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_dutyCycleControlInsideOptional;
+                        jobject newElement_2_dutyCycleControlInsideOptional_dutyCycle;
+                        std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName     = "java/lang/Integer";
+                        std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature = "(I)V";
+                        jint jninewElement_2_dutyCycleControlInsideOptional_dutyCycle =
+                            static_cast<jint>(entry_2.dutyCycleControl.Value().dutyCycle);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName.c_str(),
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature.c_str(),
+                            jninewElement_2_dutyCycleControlInsideOptional_dutyCycle,
+                            newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+
+                        jclass dutyCycleControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct",
+                            dutyCycleControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(Zcl,
+                                         "Could not find class ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID dutyCycleControlStructStructCtor_5 =
+                            env->GetMethodID(dutyCycleControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (dutyCycleControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_dutyCycleControlInsideOptional =
+                            env->NewObject(dutyCycleControlStructStructClass_5, dutyCycleControlStructStructCtor_5,
+                                           newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_dutyCycleControlInsideOptional,
+                                                                          newElement_2_dutyCycleControl);
+                    }
+                    jobject newElement_2_powerSavingsControl;
+                    if (!entry_2.powerSavingsControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_powerSavingsControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_powerSavingsControlInsideOptional;
+                        jobject newElement_2_powerSavingsControlInsideOptional_powerSavings;
+                        std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName     = "java/lang/Integer";
+                        std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature = "(I)V";
+                        jint jninewElement_2_powerSavingsControlInsideOptional_powerSavings =
+                            static_cast<jint>(entry_2.powerSavingsControl.Value().powerSavings);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName.c_str(),
+                            newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature.c_str(),
+                            jninewElement_2_powerSavingsControlInsideOptional_powerSavings,
+                            newElement_2_powerSavingsControlInsideOptional_powerSavings);
+
+                        jclass powerSavingsControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct",
+                            powerSavingsControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID powerSavingsControlStructStructCtor_5 =
+                            env->GetMethodID(powerSavingsControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (powerSavingsControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(
+                                Zcl,
+                                "Could not find ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_powerSavingsControlInsideOptional =
+                            env->NewObject(powerSavingsControlStructStructClass_5, powerSavingsControlStructStructCtor_5,
+                                           newElement_2_powerSavingsControlInsideOptional_powerSavings);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_powerSavingsControlInsideOptional,
+                                                                          newElement_2_powerSavingsControl);
+                    }
+                    jobject newElement_2_heatingSourceControl;
+                    if (!entry_2.heatingSourceControl.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_heatingSourceControl);
+                    }
+                    else
+                    {
+                        jobject newElement_2_heatingSourceControlInsideOptional;
+                        jobject newElement_2_heatingSourceControlInsideOptional_heatingSource;
+                        std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName = "java/lang/Integer";
+                        std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature = "(I)V";
+                        jint jninewElement_2_heatingSourceControlInsideOptional_heatingSource =
+                            static_cast<jint>(entry_2.heatingSourceControl.Value().heatingSource);
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName.c_str(),
+                            newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature.c_str(),
+                            jninewElement_2_heatingSourceControlInsideOptional_heatingSource,
+                            newElement_2_heatingSourceControlInsideOptional_heatingSource);
+
+                        jclass heatingSourceControlStructStructClass_5;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct",
+                            heatingSourceControlStructStructClass_5);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(
+                                Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct");
+                            return nullptr;
+                        }
+                        jmethodID heatingSourceControlStructStructCtor_5 =
+                            env->GetMethodID(heatingSourceControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                        if (heatingSourceControlStructStructCtor_5 == nullptr)
+                        {
+                            ChipLogError(Zcl,
+                                         "Could not find ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct "
+                                         "constructor");
+                            return nullptr;
+                        }
+
+                        newElement_2_heatingSourceControlInsideOptional =
+                            env->NewObject(heatingSourceControlStructStructClass_5, heatingSourceControlStructStructCtor_5,
+                                           newElement_2_heatingSourceControlInsideOptional_heatingSource);
+                        chip::JniReferences::GetInstance().CreateOptional(newElement_2_heatingSourceControlInsideOptional,
+                                                                          newElement_2_heatingSourceControl);
+                    }
+
+                    jclass loadControlEventTransitionStructStructClass_3;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct",
+                        loadControlEventTransitionStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(
+                            Zcl,
+                            "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct");
+                        return nullptr;
+                    }
+                    jmethodID loadControlEventTransitionStructStructCtor_3 =
+                        env->GetMethodID(loadControlEventTransitionStructStructClass_3, "<init>",
+                                         "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/"
+                                         "util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                    if (loadControlEventTransitionStructStructCtor_3 == nullptr)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct "
+                                     "constructor");
+                        return nullptr;
+                    }
+
+                    newElement_2 =
+                        env->NewObject(loadControlEventTransitionStructStructClass_3, loadControlEventTransitionStructStructCtor_3,
+                                       newElement_2_duration, newElement_2_control, newElement_2_temperatureControl,
+                                       newElement_2_averageLoadControl, newElement_2_dutyCycleControl,
+                                       newElement_2_powerSavingsControl, newElement_2_heatingSourceControl);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_transitions, newElement_2);
+                }
+
+                jclass loadControlEventStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+                    loadControlEventStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
+                    return nullptr;
+                }
+                jmethodID loadControlEventStructStructCtor_1 =
+                    env->GetMethodID(loadControlEventStructStructClass_1, "<init>",
+                                     "([B[BLjava/lang/Integer;Ljava/lang/Long;Ljava/util/Optional;Ljava/lang/Integer;Ljava/lang/"
+                                     "Long;Ljava/util/ArrayList;)V");
+                if (loadControlEventStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(loadControlEventStructStructClass_1, loadControlEventStructStructCtor_1,
+                                              newElement_0_eventID, newElement_0_programID, newElement_0_control,
+                                              newElement_0_deviceClass, newElement_0_enrollmentGroup, newElement_0_criticality,
+                                              newElement_0_startTime, newElement_0_transitions);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::NumberOfEventsPerProgram::Id: {
+            using TypeInfo = Attributes::NumberOfEventsPerProgram::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::NumberOfTransitions::Id: {
+            using TypeInfo = Attributes::NumberOfTransitions::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::DefaultRandomStart::Id: {
+            using TypeInfo = Attributes::DefaultRandomStart::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16366,8 +20558,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::OperationalError::Id: {
-            using TypeInfo = Attributes::OperationalError::TypeInfo;
+        case Attributes::DefaultRandomDuration::Id: {
+            using TypeInfo = Attributes::DefaultRandomDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16375,56 +20567,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_errorStateID;
-            std::string value_errorStateIDClassName     = "java/lang/Integer";
-            std::string value_errorStateIDCtorSignature = "(I)V";
-            jint jnivalue_errorStateID                  = static_cast<jint>(cppValue.errorStateID);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_errorStateIDClassName.c_str(),
-                                                                       value_errorStateIDCtorSignature.c_str(),
-                                                                       jnivalue_errorStateID, value_errorStateID);
-            jobject value_errorStateLabel;
-            if (!cppValue.errorStateLabel.HasValue())
-            {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateLabel);
-            }
-            else
-            {
-                jobject value_errorStateLabelInsideOptional;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateLabel.Value(),
-                                                                                     value_errorStateLabelInsideOptional));
-                chip::JniReferences::GetInstance().CreateOptional(value_errorStateLabelInsideOptional, value_errorStateLabel);
-            }
-            jobject value_errorStateDetails;
-            if (!cppValue.errorStateDetails.HasValue())
-            {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
-            }
-            else
-            {
-                jobject value_errorStateDetailsInsideOptional;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
-                                                                                     value_errorStateDetailsInsideOptional));
-                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
-            }
-
-            jclass errorStateStructStructClass_0;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterErrorStateStruct");
-                return nullptr;
-            }
-            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
-                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
-            if (errorStateStructStructCtor_0 == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterErrorStateStruct constructor");
-                return nullptr;
-            }
-
-            value = env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorStateID,
-                                   value_errorStateLabel, value_errorStateDetails);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -16565,12 +20712,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::HepaFilterMonitoring::Id: {
-        using namespace app::Clusters::HepaFilterMonitoring;
+    case app::Clusters::EnergyEvse::Id: {
+        using namespace app::Clusters::EnergyEvse;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Condition::Id: {
-            using TypeInfo = Attributes::Condition::TypeInfo;
+        case Attributes::State::Id: {
+            using TypeInfo = Attributes::State::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16578,15 +20725,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
             return value;
         }
-        case Attributes::DegradationDirection::Id: {
-            using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+        case Attributes::SupplyState::Id: {
+            using TypeInfo = Attributes::SupplyState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16601,8 +20755,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::ChangeIndication::Id: {
-            using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+        case Attributes::FaultState::Id: {
+            using TypeInfo = Attributes::FaultState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16617,8 +20771,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::InPlaceIndicator::Id: {
-            using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+        case Attributes::ChargingEnabledUntil::Id: {
+            using TypeInfo = Attributes::ChargingEnabledUntil::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16626,15 +20780,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            jboolean jnivalue              = static_cast<jboolean>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
             return value;
         }
-        case Attributes::LastChangedTime::Id: {
-            using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+        case Attributes::DischargingEnabledUntil::Id: {
+            using TypeInfo = Attributes::DischargingEnabledUntil::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16656,8 +20817,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::ReplacementProductList::Id: {
-            using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+        case Attributes::CircuitCapacity::Id: {
+            using TypeInfo = Attributes::CircuitCapacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16665,49 +20826,31 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::MinimumChargeCurrent::Id: {
+            using TypeInfo = Attributes::MinimumChargeCurrent::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_productIdentifierType;
-                std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
-                std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
-                jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
-                    jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
-                jobject newElement_0_productIdentifierValue;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
-                                                                                     newElement_0_productIdentifierValue));
-
-                jclass replacementProductStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct",
-                    replacementProductStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct");
-                    return nullptr;
-                }
-                jmethodID replacementProductStructStructCtor_1 =
-                    env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (replacementProductStructStructCtor_1 == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
-                                              newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MaximumChargeCurrent::Id: {
+            using TypeInfo = Attributes::MaximumChargeCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16715,24 +20858,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::MaximumDischargeCurrent::Id: {
+            using TypeInfo = Attributes::MaximumDischargeCurrent::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::UserMaximumChargeCurrent::Id: {
+            using TypeInfo = Attributes::UserMaximumChargeCurrent::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RandomizationDelayWindow::Id: {
+            using TypeInfo = Attributes::RandomizationDelayWindow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16740,24 +20906,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::NumberOfWeeklyTargets::Id: {
+            using TypeInfo = Attributes::NumberOfWeeklyTargets::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::NumberOfDailyTargets::Id: {
+            using TypeInfo = Attributes::NumberOfDailyTargets::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
+                                                                       value);
             return value;
         }
-        case Attributes::EventList::Id: {
-            using TypeInfo = Attributes::EventList::TypeInfo;
+        case Attributes::NextChargeStartTime::Id: {
+            using TypeInfo = Attributes::NextChargeStartTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16765,24 +20954,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::NextChargeTargetTime::Id: {
+            using TypeInfo = Attributes::NextChargeTargetTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16790,24 +20977,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::NextChargeRequiredEnergy::Id: {
+            using TypeInfo = Attributes::NextChargeRequiredEnergy::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16815,15 +21000,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        jnivalue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::NextChargeTargetSoC::Id: {
+            using TypeInfo = Attributes::NextChargeTargetSoC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16831,25 +21023,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::ActivatedCarbonFilterMonitoring::Id: {
-        using namespace app::Clusters::ActivatedCarbonFilterMonitoring;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Condition::Id: {
-            using TypeInfo = Attributes::Condition::TypeInfo;
+        case Attributes::ApproximateEVEfficiency::Id: {
+            using TypeInfo = Attributes::ApproximateEVEfficiency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16857,15 +21046,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
             return value;
         }
-        case Attributes::DegradationDirection::Id: {
-            using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+        case Attributes::StateOfCharge::Id: {
+            using TypeInfo = Attributes::StateOfCharge::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16873,15 +21069,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                jint jnivalue                  = static_cast<jint>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           jnivalue, value);
+            }
             return value;
         }
-        case Attributes::ChangeIndication::Id: {
-            using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+        case Attributes::BatteryCapacity::Id: {
+            using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16889,15 +21092,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            jint jnivalue                  = static_cast<jint>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                jlong jnivalue                 = static_cast<jlong>(cppValue.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            jnivalue, value);
+            }
             return value;
         }
-        case Attributes::InPlaceIndicator::Id: {
-            using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+        case Attributes::VehicleID::Id: {
+            using TypeInfo = Attributes::VehicleID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16905,15 +21115,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            jboolean jnivalue              = static_cast<jboolean>(cppValue);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           jnivalue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.Value(), value));
+            }
             return value;
         }
-        case Attributes::LastChangedTime::Id: {
-            using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+        case Attributes::SessionID::Id: {
+            using TypeInfo = Attributes::SessionID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16935,8 +21148,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::ReplacementProductList::Id: {
-            using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+        case Attributes::SessionDuration::Id: {
+            using TypeInfo = Attributes::SessionDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16944,48 +21157,43 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::SessionEnergyCharged::Id: {
+            using TypeInfo = Attributes::SessionEnergyCharged::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_productIdentifierType;
-                std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
-                std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
-                jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
-                    jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
-                jobject newElement_0_productIdentifierValue;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
-                                                                                     newElement_0_productIdentifierValue));
-
-                jclass replacementProductStructStructClass_1;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
-                    replacementProductStructStructClass_1);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl,
-                                 "Could not find class ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct");
-                    return nullptr;
-                }
-                jmethodID replacementProductStructStructCtor_1 =
-                    env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (replacementProductStructStructCtor_1 == nullptr)
-                {
-                    ChipLogError(
-                        Zcl,
-                        "Could not find ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
-                                              newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
+            return value;
+        }
+        case Attributes::SessionEnergyDischarged::Id: {
+            using TypeInfo = Attributes::SessionEnergyDischarged::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        jnivalue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -27462,6 +31670,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value));
             return value;
         }
+        case Attributes::LinkLocalAddress::Id: {
+            using TypeInfo = Attributes::LinkLocalAddress::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
+            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.data()));
+            value = valueByteArray;
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -29061,7 +33284,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            jlong jnivalue                 = static_cast<jlong>(cppValue);
+            jlong jnivalue                 = static_cast<jlong>(cppValue.Raw());
             chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                         jnivalue, value);
             return value;
diff --git a/src/controller/java/zap-generated/CHIPClientCallbacks.h b/src/controller/java/zap-generated/CHIPClientCallbacks.h
index 76f215309f6705..719e2592192f60 100644
--- a/src/controller/java/zap-generated/CHIPClientCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPClientCallbacks.h
@@ -44,6 +44,9 @@ typedef void (*GroupsEventListListAttributeCallback)(void * context,
                                                      const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ScenesFabricSceneInfoListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType> & data);
 typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
@@ -210,8 +213,8 @@ typedef void (*UnitLocalizationEventListListAttributeCallback)(void * context,
                                                                const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
 typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
@@ -471,6 +474,49 @@ typedef void (*IcdManagementEventListListAttributeCallback)(void * context,
                                                             const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*IcdManagementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*TimerGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*TimerAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*TimerEventListListAttributeCallback)(void * context,
+                                                    const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*TimerAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OvenCavityOperationalStatePhaseListListAttributeCallback)(
+    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & data);
+typedef void (*OvenCavityOperationalStateOperationalStateListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::DecodableType> & data);
+typedef void (*OvenCavityOperationalStateGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OvenCavityOperationalStateAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OvenCavityOperationalStateEventListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*OvenCavityOperationalStateAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OvenModeSupportedModesListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::DecodableType> & data);
+typedef void (*OvenModeGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OvenModeAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OvenModeEventListListAttributeCallback)(void * context,
+                                                       const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*OvenModeAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*LaundryDryerControlsSupportedDrynessLevelsListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & data);
+typedef void (*LaundryDryerControlsGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*LaundryDryerControlsAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*LaundryDryerControlsEventListListAttributeCallback)(void * context,
+                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*LaundryDryerControlsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
@@ -595,6 +641,26 @@ typedef void (*DishwasherAlarmEventListListAttributeCallback)(void * context,
                                                               const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*DishwasherAlarmAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*MicrowaveOvenModeSupportedModesListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType> &
+        data);
+typedef void (*MicrowaveOvenModeGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MicrowaveOvenModeAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MicrowaveOvenModeEventListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*MicrowaveOvenModeAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*MicrowaveOvenControlGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MicrowaveOvenControlAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MicrowaveOvenControlEventListListAttributeCallback)(void * context,
+                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*MicrowaveOvenControlAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*OperationalStatePhaseListListAttributeCallback)(
     void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & data);
 typedef void (*OperationalStateOperationalStateListListAttributeCallback)(
@@ -647,6 +713,50 @@ typedef void (*ActivatedCarbonFilterMonitoringEventListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*ActivatedCarbonFilterMonitoringAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BooleanSensorConfigurationGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BooleanSensorConfigurationAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BooleanSensorConfigurationEventListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*BooleanSensorConfigurationAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ValveConfigurationAndControlGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ValveConfigurationAndControlAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ValveConfigurationAndControlEventListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*ValveConfigurationAndControlAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*DemandResponseLoadControlLoadControlProgramsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType> & data);
+typedef void (*DemandResponseLoadControlEventsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> & data);
+typedef void (*DemandResponseLoadControlActiveEventsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> & data);
+typedef void (*DemandResponseLoadControlGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DemandResponseLoadControlAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DemandResponseLoadControlEventListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*DemandResponseLoadControlAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*EnergyEvseGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*EnergyEvseAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*EnergyEvseEventListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::EventId> & data);
+typedef void (*EnergyEvseAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
index 00009ac07695a1..e55f6a63f9297c 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -2222,6 +2222,186 @@ JNI_METHOD(void, UserLabelCluster, writeLabelListAttribute)
     onFailure.release();
 }
 
+JNI_METHOD(void, OvenModeCluster, writeStartUpModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::OvenMode::Attributes::StartUpMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    OvenModeCluster * cppCluster = reinterpret_cast<OvenModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, OvenModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::OvenMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    OvenModeCluster * cppCluster = reinterpret_cast<OvenModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, LaundryDryerControlsCluster, writeSelectedDrynessLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::LaundryDryerControls::Attributes::SelectedDrynessLevel::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    LaundryDryerControlsCluster * cppCluster = reinterpret_cast<LaundryDryerControlsCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
 JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
@@ -2402,12 +2582,598 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
+JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                        = CHIP_NO_ERROR;
+    LaundryWasherModeCluster * cppCluster = reinterpret_cast<LaundryWasherModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeStartUpModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    RefrigeratorAndTemperatureControlledCabinetModeCluster * cppCluster =
+        reinterpret_cast<RefrigeratorAndTemperatureControlledCabinetModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    RefrigeratorAndTemperatureControlledCabinetModeCluster * cppCluster =
+        reinterpret_cast<RefrigeratorAndTemperatureControlledCabinetModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    LaundryWasherControlsCluster * cppCluster = reinterpret_cast<LaundryWasherControlsCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    LaundryWasherControlsCluster * cppCluster = reinterpret_cast<LaundryWasherControlsCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::RvcRunMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    RvcRunModeCluster * cppCluster = reinterpret_cast<RvcRunModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    RvcCleanModeCluster * cppCluster = reinterpret_cast<RvcCleanModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::OnMode::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    SmokeCoAlarmCluster * cppCluster = reinterpret_cast<SmokeCoAlarmCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2421,7 +3187,7 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -2436,8 +3202,8 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                        = CHIP_NO_ERROR;
-    LaundryWasherModeCluster * cppCluster = reinterpret_cast<LaundryWasherModeCluster *>(clusterPtr);
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    HepaFilterMonitoringCluster * cppCluster = reinterpret_cast<HepaFilterMonitoringCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2462,12 +3228,12 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeStartUpModeAttribute)
+JNI_METHOD(void, ActivatedCarbonFilterMonitoringCluster, writeLastChangedTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2481,7 +3247,7 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeSt
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -2496,9 +3262,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeSt
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    RefrigeratorAndTemperatureControlledCabinetModeCluster * cppCluster =
-        reinterpret_cast<RefrigeratorAndTemperatureControlledCabinetModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                      = CHIP_NO_ERROR;
+    ActivatedCarbonFilterMonitoringCluster * cppCluster = reinterpret_cast<ActivatedCarbonFilterMonitoringCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2523,27 +3288,19 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeSt
     onFailure.release();
 }
 
-JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOnModeAttribute)
+JNI_METHOD(void, BooleanSensorConfigurationCluster, writeSensitivityLevelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2557,9 +3314,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOn
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    RefrigeratorAndTemperatureControlledCabinetModeCluster * cppCluster =
-        reinterpret_cast<RefrigeratorAndTemperatureControlledCabinetModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    BooleanSensorConfigurationCluster * cppCluster = reinterpret_cast<BooleanSensorConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2584,27 +3340,19 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOn
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
+JNI_METHOD(void, BooleanSensorConfigurationCluster, writeAlarmsEnabledAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    using TypeInfo = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue.SetRaw(static_cast<std::remove_reference_t<decltype(cppValue)>::IntegerType>(
+        chip::JniReferences::GetInstance().IntegerToPrimitive(value)));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2618,8 +3366,8 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
-    LaundryWasherControlsCluster * cppCluster = reinterpret_cast<LaundryWasherControlsCluster *>(clusterPtr);
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    BooleanSensorConfigurationCluster * cppCluster = reinterpret_cast<BooleanSensorConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2644,19 +3392,27 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
+JNI_METHOD(void, ValveConfigurationAndControlCluster, writeOpenDurationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2670,8 +3426,8 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
-    LaundryWasherControlsCluster * cppCluster = reinterpret_cast<LaundryWasherControlsCluster *>(clusterPtr);
+    CHIP_ERROR err                                   = CHIP_NO_ERROR;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2696,27 +3452,19 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
+JNI_METHOD(void, ValveConfigurationAndControlCluster, writeStartUpStateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::RvcRunMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2730,8 +3478,8 @@ JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    RvcRunModeCluster * cppCluster = reinterpret_cast<RvcRunModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                   = CHIP_NO_ERROR;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2756,12 +3504,12 @@ JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
+JNI_METHOD(void, ValveConfigurationAndControlCluster, writeOpenLevelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2790,8 +3538,8 @@ JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    RvcCleanModeCluster * cppCluster = reinterpret_cast<RvcCleanModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                   = CHIP_NO_ERROR;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2816,27 +3564,19 @@ JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
+JNI_METHOD(void, DemandResponseLoadControlCluster, writeDefaultRandomStartAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2850,8 +3590,8 @@ JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
-    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                = CHIP_NO_ERROR;
+    DemandResponseLoadControlCluster * cppCluster = reinterpret_cast<DemandResponseLoadControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2876,27 +3616,19 @@ JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute)
+JNI_METHOD(void, DemandResponseLoadControlCluster, writeDefaultRandomDurationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2910,8 +3642,8 @@ JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
-    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
+    CHIP_ERROR err                                = CHIP_NO_ERROR;
+    DemandResponseLoadControlCluster * cppCluster = reinterpret_cast<DemandResponseLoadControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2936,19 +3668,18 @@ JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
+JNI_METHOD(void, EnergyEvseCluster, writeUserMaximumChargeCurrentAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::EnergyEvse::Attributes::UserMaximumChargeCurrent::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2962,8 +3693,8 @@ JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    SmokeCoAlarmCluster * cppCluster = reinterpret_cast<SmokeCoAlarmCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    EnergyEvseCluster * cppCluster = reinterpret_cast<EnergyEvseCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2988,27 +3719,18 @@ JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
+JNI_METHOD(void, EnergyEvseCluster, writeRandomizationDelayWindowAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::EnergyEvse::Attributes::RandomizationDelayWindow::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3022,8 +3744,8 @@ JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
-    HepaFilterMonitoringCluster * cppCluster = reinterpret_cast<HepaFilterMonitoringCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    EnergyEvseCluster * cppCluster = reinterpret_cast<EnergyEvseCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3048,12 +3770,12 @@ JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ActivatedCarbonFilterMonitoringCluster, writeLastChangedTimeAttribute)
+JNI_METHOD(void, EnergyEvseCluster, writeApproximateEVEfficiencyAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::EnergyEvse::Attributes::ApproximateEVEfficiency::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3067,7 +3789,7 @@ JNI_METHOD(void, ActivatedCarbonFilterMonitoringCluster, writeLastChangedTimeAtt
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -3082,8 +3804,8 @@ JNI_METHOD(void, ActivatedCarbonFilterMonitoringCluster, writeLastChangedTimeAtt
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                      = CHIP_NO_ERROR;
-    ActivatedCarbonFilterMonitoringCluster * cppCluster = reinterpret_cast<ActivatedCarbonFilterMonitoringCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    EnergyEvseCluster * cppCluster = reinterpret_cast<EnergyEvseCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -6108,58 +6830,6 @@ JNI_METHOD(void, FanControlCluster, writeFanModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeFanModeSequenceAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
-{
-    chip::DeviceLayer::StackLock lock;
-    ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::FanModeSequence::TypeInfo;
-    TypeInfo::Type cppValue;
-
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
-
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
-
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
-    }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
 JNI_METHOD(void, FanControlCluster, writePercentSettingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
@@ -8331,57 +9001,6 @@ JNI_METHOD(void, OccupancySensingCluster, writePhysicalContactUnoccupiedToOccupi
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, writeSupportedStreamingProtocolsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
-{
-    chip::DeviceLayer::StackLock lock;
-    ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
-    TypeInfo::Type cppValue;
-
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
-
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
-    ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
-
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
-    }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
 JNI_METHOD(void, ElectricalMeasurementCluster, writeAverageRmsVoltageMeasurementPeriodAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index 0a096db6a8e36c..0101a65b66a52f 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -1680,13 +1680,13 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
             {
                 return nullptr;
             }
-            jobject value_associationFailure;
-            std::string value_associationFailureClassName     = "java/lang/Integer";
-            std::string value_associationFailureCtorSignature = "(I)V";
-            jint jnivalue_associationFailure                  = static_cast<jint>(cppValue.associationFailure);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_associationFailureClassName.c_str(),
-                                                                       value_associationFailureCtorSignature.c_str(),
-                                                                       jnivalue_associationFailure, value_associationFailure);
+            jobject value_associationFailureCause;
+            std::string value_associationFailureCauseClassName     = "java/lang/Integer";
+            std::string value_associationFailureCauseCtorSignature = "(I)V";
+            jint jnivalue_associationFailureCause                  = static_cast<jint>(cppValue.associationFailureCause);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_associationFailureCauseClassName.c_str(), value_associationFailureCauseCtorSignature.c_str(),
+                jnivalue_associationFailureCause, value_associationFailureCause);
 
             jobject value_status;
             std::string value_statusClassName     = "java/lang/Integer";
@@ -1713,8 +1713,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
                 return nullptr;
             }
 
-            jobject value =
-                env->NewObject(associationFailureStructClass, associationFailureStructCtor, value_associationFailure, value_status);
+            jobject value = env->NewObject(associationFailureStructClass, associationFailureStructCtor,
+                                           value_associationFailureCause, value_status);
 
             return value;
         }
@@ -2479,6 +2479,222 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
         }
         break;
     }
+    case app::Clusters::Timer::Id: {
+        using namespace app::Clusters::Timer;
+        switch (aPath.mEventId)
+        {
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OvenCavityOperationalState::Id: {
+        using namespace app::Clusters::OvenCavityOperationalState;
+        switch (aPath.mEventId)
+        {
+        case Events::OperationalError::Id: {
+            Events::OperationalError::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_errorState;
+            jobject value_errorState_errorStateID;
+            std::string value_errorState_errorStateIDClassName     = "java/lang/Integer";
+            std::string value_errorState_errorStateIDCtorSignature = "(I)V";
+            jint jnivalue_errorState_errorStateID                  = static_cast<jint>(cppValue.errorState.errorStateID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_errorState_errorStateIDClassName.c_str(), value_errorState_errorStateIDCtorSignature.c_str(),
+                jnivalue_errorState_errorStateID, value_errorState_errorStateID);
+            jobject value_errorState_errorStateLabel;
+            if (!cppValue.errorState.errorStateLabel.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorState_errorStateLabel);
+            }
+            else
+            {
+                jobject value_errorState_errorStateLabelInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                    cppValue.errorState.errorStateLabel.Value(), value_errorState_errorStateLabelInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorState_errorStateLabelInsideOptional,
+                                                                  value_errorState_errorStateLabel);
+            }
+            jobject value_errorState_errorStateDetails;
+            if (!cppValue.errorState.errorStateDetails.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorState_errorStateDetails);
+            }
+            else
+            {
+                jobject value_errorState_errorStateDetailsInsideOptional;
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                    cppValue.errorState.errorStateDetails.Value(), value_errorState_errorStateDetailsInsideOptional));
+                chip::JniReferences::GetInstance().CreateOptional(value_errorState_errorStateDetailsInsideOptional,
+                                                                  value_errorState_errorStateDetails);
+            }
+
+            jclass errorStateStructStructClass_0;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct",
+                errorStateStructStructClass_0);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct");
+                return nullptr;
+            }
+            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
+                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (errorStateStructStructCtor_0 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct constructor");
+                return nullptr;
+            }
+
+            value_errorState =
+                env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, value_errorState_errorStateID,
+                               value_errorState_errorStateLabel, value_errorState_errorStateDetails);
+
+            jclass operationalErrorStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$OvenCavityOperationalStateClusterOperationalErrorEvent",
+                operationalErrorStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$OvenCavityOperationalStateClusterOperationalErrorEvent");
+                return nullptr;
+            }
+            jmethodID operationalErrorStructCtor =
+                env->GetMethodID(operationalErrorStructClass, "<init>",
+                                 "(Lchip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct;)V");
+            if (operationalErrorStructCtor == nullptr)
+            {
+                ChipLogError(Zcl,
+                             "Could not find ChipEventStructs$OvenCavityOperationalStateClusterOperationalErrorEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(operationalErrorStructClass, operationalErrorStructCtor, value_errorState);
+
+            return value;
+        }
+        case Events::OperationCompletion::Id: {
+            Events::OperationCompletion::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_completionErrorCode;
+            std::string value_completionErrorCodeClassName     = "java/lang/Integer";
+            std::string value_completionErrorCodeCtorSignature = "(I)V";
+            jint jnivalue_completionErrorCode                  = static_cast<jint>(cppValue.completionErrorCode);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_completionErrorCodeClassName.c_str(),
+                                                                       value_completionErrorCodeCtorSignature.c_str(),
+                                                                       jnivalue_completionErrorCode, value_completionErrorCode);
+
+            jobject value_totalOperationalTime;
+            if (!cppValue.totalOperationalTime.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_totalOperationalTime);
+            }
+            else
+            {
+                jobject value_totalOperationalTimeInsideOptional;
+                if (cppValue.totalOperationalTime.Value().IsNull())
+                {
+                    value_totalOperationalTimeInsideOptional = nullptr;
+                }
+                else
+                {
+                    std::string value_totalOperationalTimeInsideOptionalClassName     = "java/lang/Long";
+                    std::string value_totalOperationalTimeInsideOptionalCtorSignature = "(J)V";
+                    jlong jnivalue_totalOperationalTimeInsideOptional =
+                        static_cast<jlong>(cppValue.totalOperationalTime.Value().Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                        value_totalOperationalTimeInsideOptionalClassName.c_str(),
+                        value_totalOperationalTimeInsideOptionalCtorSignature.c_str(), jnivalue_totalOperationalTimeInsideOptional,
+                        value_totalOperationalTimeInsideOptional);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_totalOperationalTimeInsideOptional,
+                                                                  value_totalOperationalTime);
+            }
+
+            jobject value_pausedTime;
+            if (!cppValue.pausedTime.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_pausedTime);
+            }
+            else
+            {
+                jobject value_pausedTimeInsideOptional;
+                if (cppValue.pausedTime.Value().IsNull())
+                {
+                    value_pausedTimeInsideOptional = nullptr;
+                }
+                else
+                {
+                    std::string value_pausedTimeInsideOptionalClassName     = "java/lang/Long";
+                    std::string value_pausedTimeInsideOptionalCtorSignature = "(J)V";
+                    jlong jnivalue_pausedTimeInsideOptional = static_cast<jlong>(cppValue.pausedTime.Value().Value());
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                        value_pausedTimeInsideOptionalClassName.c_str(), value_pausedTimeInsideOptionalCtorSignature.c_str(),
+                        jnivalue_pausedTimeInsideOptional, value_pausedTimeInsideOptional);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_pausedTimeInsideOptional, value_pausedTime);
+            }
+
+            jclass operationCompletionStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$OvenCavityOperationalStateClusterOperationCompletionEvent",
+                operationCompletionStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl,
+                             "Could not find class ChipEventStructs$OvenCavityOperationalStateClusterOperationCompletionEvent");
+                return nullptr;
+            }
+            jmethodID operationCompletionStructCtor = env->GetMethodID(
+                operationCompletionStructClass, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (operationCompletionStructCtor == nullptr)
+            {
+                ChipLogError(
+                    Zcl, "Could not find ChipEventStructs$OvenCavityOperationalStateClusterOperationCompletionEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(operationCompletionStructClass, operationCompletionStructCtor, value_completionErrorCode,
+                                           value_totalOperationalTime, value_pausedTime);
+
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OvenMode::Id: {
+        using namespace app::Clusters::OvenMode;
+        switch (aPath.mEventId)
+        {
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::LaundryDryerControls::Id: {
+        using namespace app::Clusters::LaundryDryerControls;
+        switch (aPath.mEventId)
+        {
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
     case app::Clusters::ModeSelect::Id: {
         using namespace app::Clusters::ModeSelect;
         switch (aPath.mEventId)
@@ -3043,6 +3259,26 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
         }
         break;
     }
+    case app::Clusters::MicrowaveOvenMode::Id: {
+        using namespace app::Clusters::MicrowaveOvenMode;
+        switch (aPath.mEventId)
+        {
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::MicrowaveOvenControl::Id: {
+        using namespace app::Clusters::MicrowaveOvenControl;
+        switch (aPath.mEventId)
+        {
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
     case app::Clusters::OperationalState::Id: {
         using namespace app::Clusters::OperationalState;
         switch (aPath.mEventId)
@@ -3427,6 +3663,966 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
         }
         break;
     }
+    case app::Clusters::BooleanSensorConfiguration::Id: {
+        using namespace app::Clusters::BooleanSensorConfiguration;
+        switch (aPath.mEventId)
+        {
+        case Events::AlarmsStateChanged::Id: {
+            Events::AlarmsStateChanged::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_alarmsActive;
+            std::string value_alarmsActiveClassName     = "java/lang/Integer";
+            std::string value_alarmsActiveCtorSignature = "(I)V";
+            jint jnivalue_alarmsActive                  = static_cast<jint>(cppValue.alarmsActive.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_alarmsActiveClassName.c_str(),
+                                                                       value_alarmsActiveCtorSignature.c_str(),
+                                                                       jnivalue_alarmsActive, value_alarmsActive);
+
+            jobject value_alarmsSuppressed;
+            if (!cppValue.alarmsSuppressed.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_alarmsSuppressed);
+            }
+            else
+            {
+                jobject value_alarmsSuppressedInsideOptional;
+                std::string value_alarmsSuppressedInsideOptionalClassName     = "java/lang/Integer";
+                std::string value_alarmsSuppressedInsideOptionalCtorSignature = "(I)V";
+                jint jnivalue_alarmsSuppressedInsideOptional = static_cast<jint>(cppValue.alarmsSuppressed.Value().Raw());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    value_alarmsSuppressedInsideOptionalClassName.c_str(),
+                    value_alarmsSuppressedInsideOptionalCtorSignature.c_str(), jnivalue_alarmsSuppressedInsideOptional,
+                    value_alarmsSuppressedInsideOptional);
+                chip::JniReferences::GetInstance().CreateOptional(value_alarmsSuppressedInsideOptional, value_alarmsSuppressed);
+            }
+
+            jclass alarmsStateChangedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$BooleanSensorConfigurationClusterAlarmsStateChangedEvent",
+                alarmsStateChangedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$BooleanSensorConfigurationClusterAlarmsStateChangedEvent");
+                return nullptr;
+            }
+            jmethodID alarmsStateChangedStructCtor =
+                env->GetMethodID(alarmsStateChangedStructClass, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+            if (alarmsStateChangedStructCtor == nullptr)
+            {
+                ChipLogError(
+                    Zcl, "Could not find ChipEventStructs$BooleanSensorConfigurationClusterAlarmsStateChangedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(alarmsStateChangedStructClass, alarmsStateChangedStructCtor, value_alarmsActive,
+                                           value_alarmsSuppressed);
+
+            return value;
+        }
+        case Events::SensorFault::Id: {
+            Events::SensorFault::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jclass sensorFaultStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$BooleanSensorConfigurationClusterSensorFaultEvent",
+                sensorFaultStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$BooleanSensorConfigurationClusterSensorFaultEvent");
+                return nullptr;
+            }
+            jmethodID sensorFaultStructCtor = env->GetMethodID(sensorFaultStructClass, "<init>", "()V");
+            if (sensorFaultStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$BooleanSensorConfigurationClusterSensorFaultEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(sensorFaultStructClass, sensorFaultStructCtor);
+
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ValveConfigurationAndControl::Id: {
+        using namespace app::Clusters::ValveConfigurationAndControl;
+        switch (aPath.mEventId)
+        {
+        case Events::ValveStateChanged::Id: {
+            Events::ValveStateChanged::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_valveState;
+            std::string value_valveStateClassName     = "java/lang/Integer";
+            std::string value_valveStateCtorSignature = "(I)V";
+            jint jnivalue_valveState                  = static_cast<jint>(cppValue.valveState);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_valveStateClassName.c_str(), value_valveStateCtorSignature.c_str(), jnivalue_valveState, value_valveState);
+
+            jclass valveStateChangedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$ValveConfigurationAndControlClusterValveStateChangedEvent",
+                valveStateChangedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl,
+                             "Could not find class ChipEventStructs$ValveConfigurationAndControlClusterValveStateChangedEvent");
+                return nullptr;
+            }
+            jmethodID valveStateChangedStructCtor =
+                env->GetMethodID(valveStateChangedStructClass, "<init>", "(Ljava/lang/Integer;)V");
+            if (valveStateChangedStructCtor == nullptr)
+            {
+                ChipLogError(
+                    Zcl, "Could not find ChipEventStructs$ValveConfigurationAndControlClusterValveStateChangedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(valveStateChangedStructClass, valveStateChangedStructCtor, value_valveState);
+
+            return value;
+        }
+        case Events::ValveFault::Id: {
+            Events::ValveFault::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_valveFault;
+            std::string value_valveFaultClassName     = "java/lang/Integer";
+            std::string value_valveFaultCtorSignature = "(I)V";
+            jint jnivalue_valveFault                  = static_cast<jint>(cppValue.valveFault.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_valveFaultClassName.c_str(), value_valveFaultCtorSignature.c_str(), jnivalue_valveFault, value_valveFault);
+
+            jclass valveFaultStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$ValveConfigurationAndControlClusterValveFaultEvent",
+                valveFaultStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$ValveConfigurationAndControlClusterValveFaultEvent");
+                return nullptr;
+            }
+            jmethodID valveFaultStructCtor = env->GetMethodID(valveFaultStructClass, "<init>", "(Ljava/lang/Integer;)V");
+            if (valveFaultStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$ValveConfigurationAndControlClusterValveFaultEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(valveFaultStructClass, valveFaultStructCtor, value_valveFault);
+
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::DemandResponseLoadControl::Id: {
+        using namespace app::Clusters::DemandResponseLoadControl;
+        switch (aPath.mEventId)
+        {
+        case Events::LoadControlEventStatusChange::Id: {
+            Events::LoadControlEventStatusChange::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_eventID;
+            jbyteArray value_eventIDByteArray = env->NewByteArray(static_cast<jsize>(cppValue.eventID.size()));
+            env->SetByteArrayRegion(value_eventIDByteArray, 0, static_cast<jsize>(cppValue.eventID.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.eventID.data()));
+            value_eventID = value_eventIDByteArray;
+
+            jobject value_transitionIndex;
+            if (cppValue.transitionIndex.IsNull())
+            {
+                value_transitionIndex = nullptr;
+            }
+            else
+            {
+                std::string value_transitionIndexClassName     = "java/lang/Integer";
+                std::string value_transitionIndexCtorSignature = "(I)V";
+                jint jnivalue_transitionIndex                  = static_cast<jint>(cppValue.transitionIndex.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_transitionIndexClassName.c_str(),
+                                                                           value_transitionIndexCtorSignature.c_str(),
+                                                                           jnivalue_transitionIndex, value_transitionIndex);
+            }
+
+            jobject value_status;
+            std::string value_statusClassName     = "java/lang/Integer";
+            std::string value_statusCtorSignature = "(I)V";
+            jint jnivalue_status                  = static_cast<jint>(cppValue.status);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_statusClassName.c_str(), value_statusCtorSignature.c_str(), jnivalue_status, value_status);
+
+            jobject value_criticality;
+            std::string value_criticalityClassName     = "java/lang/Integer";
+            std::string value_criticalityCtorSignature = "(I)V";
+            jint jnivalue_criticality                  = static_cast<jint>(cppValue.criticality);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_criticalityClassName.c_str(),
+                                                                       value_criticalityCtorSignature.c_str(), jnivalue_criticality,
+                                                                       value_criticality);
+
+            jobject value_control;
+            std::string value_controlClassName     = "java/lang/Integer";
+            std::string value_controlCtorSignature = "(I)V";
+            jint jnivalue_control                  = static_cast<jint>(cppValue.control.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_controlClassName.c_str(), value_controlCtorSignature.c_str(), jnivalue_control, value_control);
+
+            jobject value_temperatureControl;
+            if (!cppValue.temperatureControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_temperatureControl);
+            }
+            else
+            {
+                jobject value_temperatureControlInsideOptional;
+                if (cppValue.temperatureControl.Value().IsNull())
+                {
+                    value_temperatureControlInsideOptional = nullptr;
+                }
+                else
+                {
+                    jobject value_temperatureControlInsideOptional_coolingTempOffset;
+                    if (!cppValue.temperatureControl.Value().Value().coolingTempOffset.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(nullptr,
+                                                                          value_temperatureControlInsideOptional_coolingTempOffset);
+                    }
+                    else
+                    {
+                        jobject value_temperatureControlInsideOptional_coolingTempOffsetInsideOptional;
+                        if (cppValue.temperatureControl.Value().Value().coolingTempOffset.Value().IsNull())
+                        {
+                            value_temperatureControlInsideOptional_coolingTempOffsetInsideOptional = nullptr;
+                        }
+                        else
+                        {
+                            std::string value_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName =
+                                "java/lang/Integer";
+                            std::string value_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature =
+                                "(I)V";
+                            jint jnivalue_temperatureControlInsideOptional_coolingTempOffsetInsideOptional =
+                                static_cast<jint>(cppValue.temperatureControl.Value().Value().coolingTempOffset.Value().Value());
+                            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                value_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName.c_str(),
+                                value_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature.c_str(),
+                                jnivalue_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                                value_temperatureControlInsideOptional_coolingTempOffsetInsideOptional);
+                        }
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            value_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                            value_temperatureControlInsideOptional_coolingTempOffset);
+                    }
+                    jobject value_temperatureControlInsideOptional_heatingtTempOffset;
+                    if (!cppValue.temperatureControl.Value().Value().heatingtTempOffset.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            nullptr, value_temperatureControlInsideOptional_heatingtTempOffset);
+                    }
+                    else
+                    {
+                        jobject value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional;
+                        if (cppValue.temperatureControl.Value().Value().heatingtTempOffset.Value().IsNull())
+                        {
+                            value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional = nullptr;
+                        }
+                        else
+                        {
+                            std::string value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName =
+                                "java/lang/Integer";
+                            std::string value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature =
+                                "(I)V";
+                            jint jnivalue_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional =
+                                static_cast<jint>(cppValue.temperatureControl.Value().Value().heatingtTempOffset.Value().Value());
+                            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName.c_str(),
+                                value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature.c_str(),
+                                jnivalue_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                                value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional);
+                        }
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            value_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                            value_temperatureControlInsideOptional_heatingtTempOffset);
+                    }
+                    jobject value_temperatureControlInsideOptional_coolingTempSetpoint;
+                    if (!cppValue.temperatureControl.Value().Value().coolingTempSetpoint.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            nullptr, value_temperatureControlInsideOptional_coolingTempSetpoint);
+                    }
+                    else
+                    {
+                        jobject value_temperatureControlInsideOptional_coolingTempSetpointInsideOptional;
+                        if (cppValue.temperatureControl.Value().Value().coolingTempSetpoint.Value().IsNull())
+                        {
+                            value_temperatureControlInsideOptional_coolingTempSetpointInsideOptional = nullptr;
+                        }
+                        else
+                        {
+                            std::string value_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName =
+                                "java/lang/Integer";
+                            std::string value_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature =
+                                "(I)V";
+                            jint jnivalue_temperatureControlInsideOptional_coolingTempSetpointInsideOptional =
+                                static_cast<jint>(cppValue.temperatureControl.Value().Value().coolingTempSetpoint.Value().Value());
+                            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                value_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName.c_str(),
+                                value_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature.c_str(),
+                                jnivalue_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                                value_temperatureControlInsideOptional_coolingTempSetpointInsideOptional);
+                        }
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            value_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                            value_temperatureControlInsideOptional_coolingTempSetpoint);
+                    }
+                    jobject value_temperatureControlInsideOptional_heatingTempSetpoint;
+                    if (!cppValue.temperatureControl.Value().Value().heatingTempSetpoint.HasValue())
+                    {
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            nullptr, value_temperatureControlInsideOptional_heatingTempSetpoint);
+                    }
+                    else
+                    {
+                        jobject value_temperatureControlInsideOptional_heatingTempSetpointInsideOptional;
+                        if (cppValue.temperatureControl.Value().Value().heatingTempSetpoint.Value().IsNull())
+                        {
+                            value_temperatureControlInsideOptional_heatingTempSetpointInsideOptional = nullptr;
+                        }
+                        else
+                        {
+                            std::string value_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName =
+                                "java/lang/Integer";
+                            std::string value_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature =
+                                "(I)V";
+                            jint jnivalue_temperatureControlInsideOptional_heatingTempSetpointInsideOptional =
+                                static_cast<jint>(cppValue.temperatureControl.Value().Value().heatingTempSetpoint.Value().Value());
+                            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                value_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName.c_str(),
+                                value_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature.c_str(),
+                                jnivalue_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                                value_temperatureControlInsideOptional_heatingTempSetpointInsideOptional);
+                        }
+                        chip::JniReferences::GetInstance().CreateOptional(
+                            value_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                            value_temperatureControlInsideOptional_heatingTempSetpoint);
+                    }
+
+                    jclass temperatureControlStructStructClass_2;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct",
+                        temperatureControlStructStructClass_2);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find class ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct");
+                        return nullptr;
+                    }
+                    jmethodID temperatureControlStructStructCtor_2 =
+                        env->GetMethodID(temperatureControlStructStructClass_2, "<init>",
+                                         "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                    if (temperatureControlStructStructCtor_2 == nullptr)
+                    {
+                        ChipLogError(
+                            Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct constructor");
+                        return nullptr;
+                    }
+
+                    value_temperatureControlInsideOptional =
+                        env->NewObject(temperatureControlStructStructClass_2, temperatureControlStructStructCtor_2,
+                                       value_temperatureControlInsideOptional_coolingTempOffset,
+                                       value_temperatureControlInsideOptional_heatingtTempOffset,
+                                       value_temperatureControlInsideOptional_coolingTempSetpoint,
+                                       value_temperatureControlInsideOptional_heatingTempSetpoint);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_temperatureControlInsideOptional, value_temperatureControl);
+            }
+
+            jobject value_averageLoadControl;
+            if (!cppValue.averageLoadControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_averageLoadControl);
+            }
+            else
+            {
+                jobject value_averageLoadControlInsideOptional;
+                if (cppValue.averageLoadControl.Value().IsNull())
+                {
+                    value_averageLoadControlInsideOptional = nullptr;
+                }
+                else
+                {
+                    jobject value_averageLoadControlInsideOptional_loadAdjustment;
+                    std::string value_averageLoadControlInsideOptional_loadAdjustmentClassName     = "java/lang/Integer";
+                    std::string value_averageLoadControlInsideOptional_loadAdjustmentCtorSignature = "(I)V";
+                    jint jnivalue_averageLoadControlInsideOptional_loadAdjustment =
+                        static_cast<jint>(cppValue.averageLoadControl.Value().Value().loadAdjustment);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        value_averageLoadControlInsideOptional_loadAdjustmentClassName.c_str(),
+                        value_averageLoadControlInsideOptional_loadAdjustmentCtorSignature.c_str(),
+                        jnivalue_averageLoadControlInsideOptional_loadAdjustment,
+                        value_averageLoadControlInsideOptional_loadAdjustment);
+
+                    jclass averageLoadControlStructStructClass_2;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct",
+                        averageLoadControlStructStructClass_2);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find class ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct");
+                        return nullptr;
+                    }
+                    jmethodID averageLoadControlStructStructCtor_2 =
+                        env->GetMethodID(averageLoadControlStructStructClass_2, "<init>", "(Ljava/lang/Integer;)V");
+                    if (averageLoadControlStructStructCtor_2 == nullptr)
+                    {
+                        ChipLogError(
+                            Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct constructor");
+                        return nullptr;
+                    }
+
+                    value_averageLoadControlInsideOptional =
+                        env->NewObject(averageLoadControlStructStructClass_2, averageLoadControlStructStructCtor_2,
+                                       value_averageLoadControlInsideOptional_loadAdjustment);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_averageLoadControlInsideOptional, value_averageLoadControl);
+            }
+
+            jobject value_dutyCycleControl;
+            if (!cppValue.dutyCycleControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_dutyCycleControl);
+            }
+            else
+            {
+                jobject value_dutyCycleControlInsideOptional;
+                if (cppValue.dutyCycleControl.Value().IsNull())
+                {
+                    value_dutyCycleControlInsideOptional = nullptr;
+                }
+                else
+                {
+                    jobject value_dutyCycleControlInsideOptional_dutyCycle;
+                    std::string value_dutyCycleControlInsideOptional_dutyCycleClassName     = "java/lang/Integer";
+                    std::string value_dutyCycleControlInsideOptional_dutyCycleCtorSignature = "(I)V";
+                    jint jnivalue_dutyCycleControlInsideOptional_dutyCycle =
+                        static_cast<jint>(cppValue.dutyCycleControl.Value().Value().dutyCycle);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        value_dutyCycleControlInsideOptional_dutyCycleClassName.c_str(),
+                        value_dutyCycleControlInsideOptional_dutyCycleCtorSignature.c_str(),
+                        jnivalue_dutyCycleControlInsideOptional_dutyCycle, value_dutyCycleControlInsideOptional_dutyCycle);
+
+                    jclass dutyCycleControlStructStructClass_2;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct",
+                        dutyCycleControlStructStructClass_2);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find class ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct");
+                        return nullptr;
+                    }
+                    jmethodID dutyCycleControlStructStructCtor_2 =
+                        env->GetMethodID(dutyCycleControlStructStructClass_2, "<init>", "(Ljava/lang/Integer;)V");
+                    if (dutyCycleControlStructStructCtor_2 == nullptr)
+                    {
+                        ChipLogError(
+                            Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct constructor");
+                        return nullptr;
+                    }
+
+                    value_dutyCycleControlInsideOptional =
+                        env->NewObject(dutyCycleControlStructStructClass_2, dutyCycleControlStructStructCtor_2,
+                                       value_dutyCycleControlInsideOptional_dutyCycle);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_dutyCycleControlInsideOptional, value_dutyCycleControl);
+            }
+
+            jobject value_powerSavingsControl;
+            if (!cppValue.powerSavingsControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_powerSavingsControl);
+            }
+            else
+            {
+                jobject value_powerSavingsControlInsideOptional;
+                if (cppValue.powerSavingsControl.Value().IsNull())
+                {
+                    value_powerSavingsControlInsideOptional = nullptr;
+                }
+                else
+                {
+                    jobject value_powerSavingsControlInsideOptional_powerSavings;
+                    std::string value_powerSavingsControlInsideOptional_powerSavingsClassName     = "java/lang/Integer";
+                    std::string value_powerSavingsControlInsideOptional_powerSavingsCtorSignature = "(I)V";
+                    jint jnivalue_powerSavingsControlInsideOptional_powerSavings =
+                        static_cast<jint>(cppValue.powerSavingsControl.Value().Value().powerSavings);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        value_powerSavingsControlInsideOptional_powerSavingsClassName.c_str(),
+                        value_powerSavingsControlInsideOptional_powerSavingsCtorSignature.c_str(),
+                        jnivalue_powerSavingsControlInsideOptional_powerSavings,
+                        value_powerSavingsControlInsideOptional_powerSavings);
+
+                    jclass powerSavingsControlStructStructClass_2;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct",
+                        powerSavingsControlStructStructClass_2);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find class ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct");
+                        return nullptr;
+                    }
+                    jmethodID powerSavingsControlStructStructCtor_2 =
+                        env->GetMethodID(powerSavingsControlStructStructClass_2, "<init>", "(Ljava/lang/Integer;)V");
+                    if (powerSavingsControlStructStructCtor_2 == nullptr)
+                    {
+                        ChipLogError(
+                            Zcl,
+                            "Could not find ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct constructor");
+                        return nullptr;
+                    }
+
+                    value_powerSavingsControlInsideOptional =
+                        env->NewObject(powerSavingsControlStructStructClass_2, powerSavingsControlStructStructCtor_2,
+                                       value_powerSavingsControlInsideOptional_powerSavings);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_powerSavingsControlInsideOptional,
+                                                                  value_powerSavingsControl);
+            }
+
+            jobject value_heatingSourceControl;
+            if (!cppValue.heatingSourceControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_heatingSourceControl);
+            }
+            else
+            {
+                jobject value_heatingSourceControlInsideOptional;
+                if (cppValue.heatingSourceControl.Value().IsNull())
+                {
+                    value_heatingSourceControlInsideOptional = nullptr;
+                }
+                else
+                {
+                    jobject value_heatingSourceControlInsideOptional_heatingSource;
+                    std::string value_heatingSourceControlInsideOptional_heatingSourceClassName     = "java/lang/Integer";
+                    std::string value_heatingSourceControlInsideOptional_heatingSourceCtorSignature = "(I)V";
+                    jint jnivalue_heatingSourceControlInsideOptional_heatingSource =
+                        static_cast<jint>(cppValue.heatingSourceControl.Value().Value().heatingSource);
+                    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                        value_heatingSourceControlInsideOptional_heatingSourceClassName.c_str(),
+                        value_heatingSourceControlInsideOptional_heatingSourceCtorSignature.c_str(),
+                        jnivalue_heatingSourceControlInsideOptional_heatingSource,
+                        value_heatingSourceControlInsideOptional_heatingSource);
+
+                    jclass heatingSourceControlStructStructClass_2;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct",
+                        heatingSourceControlStructStructClass_2);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find class ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct");
+                        return nullptr;
+                    }
+                    jmethodID heatingSourceControlStructStructCtor_2 =
+                        env->GetMethodID(heatingSourceControlStructStructClass_2, "<init>", "(Ljava/lang/Integer;)V");
+                    if (heatingSourceControlStructStructCtor_2 == nullptr)
+                    {
+                        ChipLogError(
+                            Zcl,
+                            "Could not find ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct constructor");
+                        return nullptr;
+                    }
+
+                    value_heatingSourceControlInsideOptional =
+                        env->NewObject(heatingSourceControlStructStructClass_2, heatingSourceControlStructStructCtor_2,
+                                       value_heatingSourceControlInsideOptional_heatingSource);
+                }
+                chip::JniReferences::GetInstance().CreateOptional(value_heatingSourceControlInsideOptional,
+                                                                  value_heatingSourceControl);
+            }
+
+            jclass loadControlEventStatusChangeStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent",
+                loadControlEventStatusChangeStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(
+                    Zcl, "Could not find class ChipEventStructs$DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent");
+                return nullptr;
+            }
+            jmethodID loadControlEventStatusChangeStructCtor =
+                env->GetMethodID(loadControlEventStatusChangeStructClass, "<init>",
+                                 "([BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/"
+                                 "Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (loadControlEventStatusChangeStructCtor == nullptr)
+            {
+                ChipLogError(Zcl,
+                             "Could not find ChipEventStructs$DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent "
+                             "constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(loadControlEventStatusChangeStructClass, loadControlEventStatusChangeStructCtor,
+                                           value_eventID, value_transitionIndex, value_status, value_criticality, value_control,
+                                           value_temperatureControl, value_averageLoadControl, value_dutyCycleControl,
+                                           value_powerSavingsControl, value_heatingSourceControl);
+
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::EnergyEvse::Id: {
+        using namespace app::Clusters::EnergyEvse;
+        switch (aPath.mEventId)
+        {
+        case Events::EVConnected::Id: {
+            Events::EVConnected::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_sessionID;
+            std::string value_sessionIDClassName     = "java/lang/Long";
+            std::string value_sessionIDCtorSignature = "(J)V";
+            jlong jnivalue_sessionID                 = static_cast<jlong>(cppValue.sessionID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_sessionIDClassName.c_str(), value_sessionIDCtorSignature.c_str(), jnivalue_sessionID, value_sessionID);
+
+            jclass EVConnectedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterEVConnectedEvent", EVConnectedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterEVConnectedEvent");
+                return nullptr;
+            }
+            jmethodID EVConnectedStructCtor = env->GetMethodID(EVConnectedStructClass, "<init>", "(Ljava/lang/Long;)V");
+            if (EVConnectedStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterEVConnectedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(EVConnectedStructClass, EVConnectedStructCtor, value_sessionID);
+
+            return value;
+        }
+        case Events::EVNotDetected::Id: {
+            Events::EVNotDetected::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_sessionID;
+            std::string value_sessionIDClassName     = "java/lang/Long";
+            std::string value_sessionIDCtorSignature = "(J)V";
+            jlong jnivalue_sessionID                 = static_cast<jlong>(cppValue.sessionID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_sessionIDClassName.c_str(), value_sessionIDCtorSignature.c_str(), jnivalue_sessionID, value_sessionID);
+
+            jobject value_state;
+            std::string value_stateClassName     = "java/lang/Integer";
+            std::string value_stateCtorSignature = "(I)V";
+            jint jnivalue_state                  = static_cast<jint>(cppValue.state);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_stateClassName.c_str(), value_stateCtorSignature.c_str(), jnivalue_state, value_state);
+
+            jobject value_sessionDuration;
+            std::string value_sessionDurationClassName     = "java/lang/Long";
+            std::string value_sessionDurationCtorSignature = "(J)V";
+            jlong jnivalue_sessionDuration                 = static_cast<jlong>(cppValue.sessionDuration);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(value_sessionDurationClassName.c_str(),
+                                                                        value_sessionDurationCtorSignature.c_str(),
+                                                                        jnivalue_sessionDuration, value_sessionDuration);
+
+            jobject value_sessionEnergyCharged;
+            std::string value_sessionEnergyChargedClassName     = "java/lang/Long";
+            std::string value_sessionEnergyChargedCtorSignature = "(J)V";
+            jlong jnivalue_sessionEnergyCharged                 = static_cast<jlong>(cppValue.sessionEnergyCharged);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(value_sessionEnergyChargedClassName.c_str(),
+                                                                        value_sessionEnergyChargedCtorSignature.c_str(),
+                                                                        jnivalue_sessionEnergyCharged, value_sessionEnergyCharged);
+
+            jobject value_sessionEnergyDischarged;
+            if (!cppValue.sessionEnergyDischarged.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_sessionEnergyDischarged);
+            }
+            else
+            {
+                jobject value_sessionEnergyDischargedInsideOptional;
+                std::string value_sessionEnergyDischargedInsideOptionalClassName     = "java/lang/Long";
+                std::string value_sessionEnergyDischargedInsideOptionalCtorSignature = "(J)V";
+                jlong jnivalue_sessionEnergyDischargedInsideOptional = static_cast<jlong>(cppValue.sessionEnergyDischarged.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                    value_sessionEnergyDischargedInsideOptionalClassName.c_str(),
+                    value_sessionEnergyDischargedInsideOptionalCtorSignature.c_str(),
+                    jnivalue_sessionEnergyDischargedInsideOptional, value_sessionEnergyDischargedInsideOptional);
+                chip::JniReferences::GetInstance().CreateOptional(value_sessionEnergyDischargedInsideOptional,
+                                                                  value_sessionEnergyDischarged);
+            }
+
+            jclass EVNotDetectedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterEVNotDetectedEvent", EVNotDetectedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterEVNotDetectedEvent");
+                return nullptr;
+            }
+            jmethodID EVNotDetectedStructCtor =
+                env->GetMethodID(EVNotDetectedStructClass, "<init>",
+                                 "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/util/Optional;)V");
+            if (EVNotDetectedStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterEVNotDetectedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(EVNotDetectedStructClass, EVNotDetectedStructCtor, value_sessionID, value_state,
+                                           value_sessionDuration, value_sessionEnergyCharged, value_sessionEnergyDischarged);
+
+            return value;
+        }
+        case Events::EnergyTransferStarted::Id: {
+            Events::EnergyTransferStarted::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_sessionID;
+            std::string value_sessionIDClassName     = "java/lang/Long";
+            std::string value_sessionIDCtorSignature = "(J)V";
+            jlong jnivalue_sessionID                 = static_cast<jlong>(cppValue.sessionID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_sessionIDClassName.c_str(), value_sessionIDCtorSignature.c_str(), jnivalue_sessionID, value_sessionID);
+
+            jobject value_state;
+            std::string value_stateClassName     = "java/lang/Integer";
+            std::string value_stateCtorSignature = "(I)V";
+            jint jnivalue_state                  = static_cast<jint>(cppValue.state);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_stateClassName.c_str(), value_stateCtorSignature.c_str(), jnivalue_state, value_state);
+
+            jobject value_maximumCurrent;
+            std::string value_maximumCurrentClassName     = "java/lang/Long";
+            std::string value_maximumCurrentCtorSignature = "(J)V";
+            jlong jnivalue_maximumCurrent                 = static_cast<jlong>(cppValue.maximumCurrent);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(value_maximumCurrentClassName.c_str(),
+                                                                        value_maximumCurrentCtorSignature.c_str(),
+                                                                        jnivalue_maximumCurrent, value_maximumCurrent);
+
+            jclass energyTransferStartedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterEnergyTransferStartedEvent",
+                energyTransferStartedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterEnergyTransferStartedEvent");
+                return nullptr;
+            }
+            jmethodID energyTransferStartedStructCtor = env->GetMethodID(energyTransferStartedStructClass, "<init>",
+                                                                         "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+            if (energyTransferStartedStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterEnergyTransferStartedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(energyTransferStartedStructClass, energyTransferStartedStructCtor, value_sessionID,
+                                           value_state, value_maximumCurrent);
+
+            return value;
+        }
+        case Events::EnergyTransferStopped::Id: {
+            Events::EnergyTransferStopped::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_sessionID;
+            std::string value_sessionIDClassName     = "java/lang/Long";
+            std::string value_sessionIDCtorSignature = "(J)V";
+            jlong jnivalue_sessionID                 = static_cast<jlong>(cppValue.sessionID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_sessionIDClassName.c_str(), value_sessionIDCtorSignature.c_str(), jnivalue_sessionID, value_sessionID);
+
+            jobject value_state;
+            std::string value_stateClassName     = "java/lang/Integer";
+            std::string value_stateCtorSignature = "(I)V";
+            jint jnivalue_state                  = static_cast<jint>(cppValue.state);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_stateClassName.c_str(), value_stateCtorSignature.c_str(), jnivalue_state, value_state);
+
+            jobject value_reason;
+            std::string value_reasonClassName     = "java/lang/Integer";
+            std::string value_reasonCtorSignature = "(I)V";
+            jint jnivalue_reason                  = static_cast<jint>(cppValue.reason);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_reasonClassName.c_str(), value_reasonCtorSignature.c_str(), jnivalue_reason, value_reason);
+
+            jobject value_energyTransferred;
+            std::string value_energyTransferredClassName     = "java/lang/Long";
+            std::string value_energyTransferredCtorSignature = "(J)V";
+            jlong jnivalue_energyTransferred                 = static_cast<jlong>(cppValue.energyTransferred);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(value_energyTransferredClassName.c_str(),
+                                                                        value_energyTransferredCtorSignature.c_str(),
+                                                                        jnivalue_energyTransferred, value_energyTransferred);
+
+            jclass energyTransferStoppedStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterEnergyTransferStoppedEvent",
+                energyTransferStoppedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterEnergyTransferStoppedEvent");
+                return nullptr;
+            }
+            jmethodID energyTransferStoppedStructCtor =
+                env->GetMethodID(energyTransferStoppedStructClass, "<init>",
+                                 "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V");
+            if (energyTransferStoppedStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterEnergyTransferStoppedEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(energyTransferStoppedStructClass, energyTransferStoppedStructCtor, value_sessionID,
+                                           value_state, value_reason, value_energyTransferred);
+
+            return value;
+        }
+        case Events::Fault::Id: {
+            Events::Fault::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_sessionID;
+            std::string value_sessionIDClassName     = "java/lang/Long";
+            std::string value_sessionIDCtorSignature = "(J)V";
+            jlong jnivalue_sessionID                 = static_cast<jlong>(cppValue.sessionID);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_sessionIDClassName.c_str(), value_sessionIDCtorSignature.c_str(), jnivalue_sessionID, value_sessionID);
+
+            jobject value_state;
+            std::string value_stateClassName     = "java/lang/Integer";
+            std::string value_stateCtorSignature = "(I)V";
+            jint jnivalue_state                  = static_cast<jint>(cppValue.state);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_stateClassName.c_str(), value_stateCtorSignature.c_str(), jnivalue_state, value_state);
+
+            jobject value_faultStatePreviousState;
+            std::string value_faultStatePreviousStateClassName     = "java/lang/Integer";
+            std::string value_faultStatePreviousStateCtorSignature = "(I)V";
+            jint jnivalue_faultStatePreviousState                  = static_cast<jint>(cppValue.faultStatePreviousState);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_faultStatePreviousStateClassName.c_str(), value_faultStatePreviousStateCtorSignature.c_str(),
+                jnivalue_faultStatePreviousState, value_faultStatePreviousState);
+
+            jobject value_faultStateCurrentState;
+            std::string value_faultStateCurrentStateClassName     = "java/lang/Integer";
+            std::string value_faultStateCurrentStateCtorSignature = "(I)V";
+            jint jnivalue_faultStateCurrentState                  = static_cast<jint>(cppValue.faultStateCurrentState);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_faultStateCurrentStateClassName.c_str(), value_faultStateCurrentStateCtorSignature.c_str(),
+                jnivalue_faultStateCurrentState, value_faultStateCurrentState);
+
+            jclass faultStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterFaultEvent", faultStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterFaultEvent");
+                return nullptr;
+            }
+            jmethodID faultStructCtor = env->GetMethodID(
+                faultStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (faultStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterFaultEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(faultStructClass, faultStructCtor, value_sessionID, value_state,
+                                           value_faultStatePreviousState, value_faultStateCurrentState);
+
+            return value;
+        }
+        case Events::Rfid::Id: {
+            Events::Rfid::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_uid;
+            jbyteArray value_uidByteArray = env->NewByteArray(static_cast<jsize>(cppValue.uid.size()));
+            env->SetByteArrayRegion(value_uidByteArray, 0, static_cast<jsize>(cppValue.uid.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.uid.data()));
+            value_uid = value_uidByteArray;
+
+            jclass rfidStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$EnergyEvseClusterRfidEvent", rfidStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipEventStructs$EnergyEvseClusterRfidEvent");
+                return nullptr;
+            }
+            jmethodID rfidStructCtor = env->GetMethodID(rfidStructClass, "<init>", "([B)V");
+            if (rfidStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipEventStructs$EnergyEvseClusterRfidEvent constructor");
+                return nullptr;
+            }
+
+            jobject value = env->NewObject(rfidStructClass, rfidStructCtor, value_uid);
+
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
     case app::Clusters::DoorLock::Id: {
         using namespace app::Clusters::DoorLock;
         switch (aPath.mEventId)
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index f2a81f98fc819b..1fd6b07d2068a0 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -1975,8 +1975,9 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
     jobject NetworkingStatus;
@@ -2013,8 +2014,41 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
                                                                    jniNetworkIndexInsideOptional, NetworkIndexInsideOptional);
         chip::JniReferences::GetInstance().CreateOptional(NetworkIndexInsideOptional, NetworkIndex);
     }
+    jobject ClientIdentity;
+    if (!dataResponse.clientIdentity.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, ClientIdentity);
+    }
+    else
+    {
+        jobject ClientIdentityInsideOptional;
+        jbyteArray ClientIdentityInsideOptionalByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.clientIdentity.Value().size()));
+        env->SetByteArrayRegion(ClientIdentityInsideOptionalByteArray, 0,
+                                static_cast<jsize>(dataResponse.clientIdentity.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.clientIdentity.Value().data()));
+        ClientIdentityInsideOptional = ClientIdentityInsideOptionalByteArray;
+        chip::JniReferences::GetInstance().CreateOptional(ClientIdentityInsideOptional, ClientIdentity);
+    }
+    jobject PossessionSignature;
+    if (!dataResponse.possessionSignature.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, PossessionSignature);
+    }
+    else
+    {
+        jobject PossessionSignatureInsideOptional;
+        jbyteArray PossessionSignatureInsideOptionalByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.possessionSignature.Value().size()));
+        env->SetByteArrayRegion(PossessionSignatureInsideOptionalByteArray, 0,
+                                static_cast<jsize>(dataResponse.possessionSignature.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.possessionSignature.Value().data()));
+        PossessionSignatureInsideOptional = PossessionSignatureInsideOptionalByteArray;
+        chip::JniReferences::GetInstance().CreateOptional(PossessionSignatureInsideOptional, PossessionSignature);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, NetworkIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, NetworkIndex, ClientIdentity,
+                        PossessionSignature);
 }
 CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(
     jobject javaCallback) : Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>(CallbackFn, this)
@@ -2103,6 +2137,82 @@ void CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, ErrorValue);
 }
+CHIPNetworkCommissioningClusterQueryIdentityResponseCallback::CHIPNetworkCommissioningClusterQueryIdentityResponseCallback(
+    jobject javaCallback) : Callback::Callback<CHIPNetworkCommissioningClusterQueryIdentityResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPNetworkCommissioningClusterQueryIdentityResponseCallback::~CHIPNetworkCommissioningClusterQueryIdentityResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPNetworkCommissioningClusterQueryIdentityResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPNetworkCommissioningClusterQueryIdentityResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterQueryIdentityResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterQueryIdentityResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPNetworkCommissioningClusterQueryIdentityResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([BLjava/util/Optional;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject Identity;
+    jbyteArray IdentityByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.identity.size()));
+    env->SetByteArrayRegion(IdentityByteArray, 0, static_cast<jsize>(dataResponse.identity.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.identity.data()));
+    Identity = IdentityByteArray;
+    jobject PossessionSignature;
+    if (!dataResponse.possessionSignature.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, PossessionSignature);
+    }
+    else
+    {
+        jobject PossessionSignatureInsideOptional;
+        jbyteArray PossessionSignatureInsideOptionalByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.possessionSignature.Value().size()));
+        env->SetByteArrayRegion(PossessionSignatureInsideOptionalByteArray, 0,
+                                static_cast<jsize>(dataResponse.possessionSignature.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.possessionSignature.Value().data()));
+        PossessionSignatureInsideOptional = PossessionSignatureInsideOptionalByteArray;
+        chip::JniReferences::GetInstance().CreateOptional(PossessionSignatureInsideOptional, PossessionSignature);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Identity, PossessionSignature);
+}
 CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>(CallbackFn, this)
 {
@@ -2202,6 +2312,81 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, LogContent, UTCTimeStamp, TimeSinceBoot);
 }
+CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback(
+    jobject javaCallback) : Callback::Callback<CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::~CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback,
+                    void (*)(CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;Ljava/lang/Long;)V",
+                                                  &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject SystemTimeUs;
+    std::string SystemTimeUsClassName     = "java/lang/Long";
+    std::string SystemTimeUsCtorSignature = "(J)V";
+    jlong jniSystemTimeUs                 = static_cast<jlong>(dataResponse.systemTimeUs);
+    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(SystemTimeUsClassName.c_str(), SystemTimeUsCtorSignature.c_str(),
+                                                                jniSystemTimeUs, SystemTimeUs);
+    jobject UTCTimeUs;
+    if (dataResponse.UTCTimeUs.IsNull())
+    {
+        UTCTimeUs = nullptr;
+    }
+    else
+    {
+        std::string UTCTimeUsClassName     = "java/lang/Long";
+        std::string UTCTimeUsCtorSignature = "(J)V";
+        jlong jniUTCTimeUs                 = static_cast<jlong>(dataResponse.UTCTimeUs.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(UTCTimeUsClassName.c_str(), UTCTimeUsCtorSignature.c_str(),
+                                                                    jniUTCTimeUs, UTCTimeUs);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, SystemTimeUs, UTCTimeUs);
+}
 CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback::CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback(
     jobject javaCallback) : Callback::Callback<CHIPTimeSynchronizationClusterSetTimeZoneResponseCallbackType>(CallbackFn, this)
 {
@@ -2858,6 +3043,255 @@ void CHIPIcdManagementClusterRegisterClientResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, ICDCounter);
 }
+CHIPIcdManagementClusterStayActiveResponseCallback::CHIPIcdManagementClusterStayActiveResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPIcdManagementClusterStayActiveResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPIcdManagementClusterStayActiveResponseCallback::~CHIPIcdManagementClusterStayActiveResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPIcdManagementClusterStayActiveResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPIcdManagementClusterStayActiveResponseCallback,
+                    void (*)(CHIPIcdManagementClusterStayActiveResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPIcdManagementClusterStayActiveResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPIcdManagementClusterStayActiveResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject PromisedActiveDuration;
+    std::string PromisedActiveDurationClassName     = "java/lang/Long";
+    std::string PromisedActiveDurationCtorSignature = "(J)V";
+    jlong jniPromisedActiveDuration                 = static_cast<jlong>(dataResponse.promisedActiveDuration);
+    chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(PromisedActiveDurationClassName.c_str(),
+                                                                PromisedActiveDurationCtorSignature.c_str(),
+                                                                jniPromisedActiveDuration, PromisedActiveDuration);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, PromisedActiveDuration);
+}
+CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback::
+CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback::~
+CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback::CallbackFn(
+    void * context,
+    const chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback,
+                    void (*)(CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Lchip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject CommandResponseState;
+    jobject CommandResponseState_errorStateID;
+    std::string CommandResponseState_errorStateIDClassName     = "java/lang/Integer";
+    std::string CommandResponseState_errorStateIDCtorSignature = "(I)V";
+    jint jniCommandResponseState_errorStateID                  = static_cast<jint>(dataResponse.commandResponseState.errorStateID);
+    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+        CommandResponseState_errorStateIDClassName.c_str(), CommandResponseState_errorStateIDCtorSignature.c_str(),
+        jniCommandResponseState_errorStateID, CommandResponseState_errorStateID);
+    jobject CommandResponseState_errorStateLabel;
+    if (!dataResponse.commandResponseState.errorStateLabel.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, CommandResponseState_errorStateLabel);
+    }
+    else
+    {
+        jobject CommandResponseState_errorStateLabelInsideOptional;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+            dataResponse.commandResponseState.errorStateLabel.Value(), CommandResponseState_errorStateLabelInsideOptional));
+        chip::JniReferences::GetInstance().CreateOptional(CommandResponseState_errorStateLabelInsideOptional,
+                                                          CommandResponseState_errorStateLabel);
+    }
+    jobject CommandResponseState_errorStateDetails;
+    if (!dataResponse.commandResponseState.errorStateDetails.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, CommandResponseState_errorStateDetails);
+    }
+    else
+    {
+        jobject CommandResponseState_errorStateDetailsInsideOptional;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+            dataResponse.commandResponseState.errorStateDetails.Value(), CommandResponseState_errorStateDetailsInsideOptional));
+        chip::JniReferences::GetInstance().CreateOptional(CommandResponseState_errorStateDetailsInsideOptional,
+                                                          CommandResponseState_errorStateDetails);
+    }
+
+    jclass errorStateStructStructClass_0;
+    err = chip::JniReferences::GetInstance().GetClassRef(
+        env, "chip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "Could not find class ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct");
+        return;
+    }
+    jmethodID errorStateStructStructCtor_0 =
+        env->GetMethodID(errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+    if (errorStateStructStructCtor_0 == nullptr)
+    {
+        ChipLogError(Zcl, "Could not find ChipStructs$OvenCavityOperationalStateClusterErrorStateStruct constructor");
+        return;
+    }
+
+    CommandResponseState =
+        env->NewObject(errorStateStructStructClass_0, errorStateStructStructCtor_0, CommandResponseState_errorStateID,
+                       CommandResponseState_errorStateLabel, CommandResponseState_errorStateDetails);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, CommandResponseState);
+}
+CHIPOvenModeClusterChangeToModeResponseCallback::CHIPOvenModeClusterChangeToModeResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPOvenModeClusterChangeToModeResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOvenModeClusterChangeToModeResponseCallback::~CHIPOvenModeClusterChangeToModeResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPOvenModeClusterChangeToModeResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPOvenModeClusterChangeToModeResponseCallback, void (*)(CHIPOvenModeClusterChangeToModeResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOvenModeClusterChangeToModeResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOvenModeClusterChangeToModeResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
+                                                  &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    jint jniStatus                  = static_cast<jint>(dataResponse.status);
+    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(StatusClassName.c_str(), StatusCtorSignature.c_str(), jniStatus,
+                                                               Status);
+    jobject StatusText;
+    if (!dataResponse.statusText.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, StatusText);
+    }
+    else
+    {
+        jobject StatusTextInsideOptional;
+        LogErrorOnFailure(
+            chip::JniReferences::GetInstance().CharToStringUTF(dataResponse.statusText.Value(), StatusTextInsideOptional));
+        chip::JniReferences::GetInstance().CreateOptional(StatusTextInsideOptional, StatusText);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText);
+}
 CHIPLaundryWasherModeClusterChangeToModeResponseCallback::CHIPLaundryWasherModeClusterChangeToModeResponseCallback(
     jobject javaCallback) : Callback::Callback<CHIPLaundryWasherModeClusterChangeToModeResponseCallbackType>(CallbackFn, this)
 {
@@ -3458,6 +3892,137 @@ void CHIPRvcOperationalStateClusterOperationalCommandResponseCallback::CallbackF
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, CommandResponseState);
 }
+CHIPEnergyEvseClusterGetTargetsResponseCallback::CHIPEnergyEvseClusterGetTargetsResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPEnergyEvseClusterGetTargetsResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseClusterGetTargetsResponseCallback::~CHIPEnergyEvseClusterGetTargetsResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPEnergyEvseClusterGetTargetsResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPEnergyEvseClusterGetTargetsResponseCallback, void (*)(CHIPEnergyEvseClusterGetTargetsResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPEnergyEvseClusterGetTargetsResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPEnergyEvseClusterGetTargetsResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/ArrayList;)V",
+                                                  &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject DayOfWeekforSequence;
+    std::string DayOfWeekforSequenceClassName     = "java/lang/Integer";
+    std::string DayOfWeekforSequenceCtorSignature = "(I)V";
+    jint jniDayOfWeekforSequence                  = static_cast<jint>(dataResponse.dayOfWeekforSequence.Raw());
+    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(DayOfWeekforSequenceClassName.c_str(),
+                                                               DayOfWeekforSequenceCtorSignature.c_str(), jniDayOfWeekforSequence,
+                                                               DayOfWeekforSequence);
+    jobject ChargingTargets;
+    chip::JniReferences::GetInstance().CreateArrayList(ChargingTargets);
+
+    auto iter_ChargingTargets_0 = dataResponse.chargingTargets.begin();
+    while (iter_ChargingTargets_0.Next())
+    {
+        auto & entry_0 = iter_ChargingTargets_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_targetTime;
+        std::string newElement_0_targetTimeClassName     = "java/lang/Integer";
+        std::string newElement_0_targetTimeCtorSignature = "(I)V";
+        jint jninewElement_0_targetTime                  = static_cast<jint>(entry_0.targetTime);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_targetTimeClassName.c_str(),
+                                                                   newElement_0_targetTimeCtorSignature.c_str(),
+                                                                   jninewElement_0_targetTime, newElement_0_targetTime);
+        jobject newElement_0_targetSoC;
+        if (!entry_0.targetSoC.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_targetSoC);
+        }
+        else
+        {
+            jobject newElement_0_targetSoCInsideOptional;
+            std::string newElement_0_targetSoCInsideOptionalClassName     = "java/lang/Integer";
+            std::string newElement_0_targetSoCInsideOptionalCtorSignature = "(I)V";
+            jint jninewElement_0_targetSoCInsideOptional                  = static_cast<jint>(entry_0.targetSoC.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_targetSoCInsideOptionalClassName.c_str(), newElement_0_targetSoCInsideOptionalCtorSignature.c_str(),
+                jninewElement_0_targetSoCInsideOptional, newElement_0_targetSoCInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_targetSoCInsideOptional, newElement_0_targetSoC);
+        }
+        jobject newElement_0_addedEnergy;
+        if (!entry_0.addedEnergy.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_addedEnergy);
+        }
+        else
+        {
+            jobject newElement_0_addedEnergyInsideOptional;
+            std::string newElement_0_addedEnergyInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_addedEnergyInsideOptionalCtorSignature = "(J)V";
+            jlong jninewElement_0_addedEnergyInsideOptional                 = static_cast<jlong>(entry_0.addedEnergy.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_addedEnergyInsideOptionalClassName.c_str(),
+                                                                        newElement_0_addedEnergyInsideOptionalCtorSignature.c_str(),
+                                                                        jninewElement_0_addedEnergyInsideOptional,
+                                                                        newElement_0_addedEnergyInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_addedEnergyInsideOptional, newElement_0_addedEnergy);
+        }
+
+        jclass chargingTargetStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$EnergyEvseClusterChargingTargetStruct", chargingTargetStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$EnergyEvseClusterChargingTargetStruct");
+            return;
+        }
+        jmethodID chargingTargetStructStructCtor_1 = env->GetMethodID(
+            chargingTargetStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
+        if (chargingTargetStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$EnergyEvseClusterChargingTargetStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(chargingTargetStructStructClass_1, chargingTargetStructStructCtor_1, newElement_0_targetTime,
+                                      newElement_0_targetSoC, newElement_0_addedEnergy);
+        chip::JniReferences::GetInstance().AddToList(ChargingTargets, newElement_0);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, DayOfWeekforSequence, ChargingTargets);
+}
 CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>(CallbackFn, this)
 {
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
index 4bb4afe2fe72ba..e280da36f6237b 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
@@ -327,6 +327,21 @@ class CHIPNetworkCommissioningClusterConnectNetworkResponseCallback
     jobject javaCallbackRef;
 };
 
+class CHIPNetworkCommissioningClusterQueryIdentityResponseCallback
+    : public Callback::Callback<CHIPNetworkCommissioningClusterQueryIdentityResponseCallbackType>
+{
+public:
+    CHIPNetworkCommissioningClusterQueryIdentityResponseCallback(jobject javaCallback);
+
+    ~CHIPNetworkCommissioningClusterQueryIdentityResponseCallback();
+
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
 class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
     : public Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>
 {
@@ -342,6 +357,21 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
     jobject javaCallbackRef;
 };
 
+class CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback
+    : public Callback::Callback<CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallbackType>
+{
+public:
+    CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback(jobject javaCallback);
+
+    ~CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback();
+
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
 class CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback
     : public Callback::Callback<CHIPTimeSynchronizationClusterSetTimeZoneResponseCallbackType>
 {
@@ -464,6 +494,52 @@ class CHIPIcdManagementClusterRegisterClientResponseCallback
     jobject javaCallbackRef;
 };
 
+class CHIPIcdManagementClusterStayActiveResponseCallback
+    : public Callback::Callback<CHIPIcdManagementClusterStayActiveResponseCallbackType>
+{
+public:
+    CHIPIcdManagementClusterStayActiveResponseCallback(jobject javaCallback);
+
+    ~CHIPIcdManagementClusterStayActiveResponseCallback();
+
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback
+    : public Callback::Callback<CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallbackType>
+{
+public:
+    CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback(jobject javaCallback);
+
+    ~CHIPOvenCavityOperationalStateClusterOperationalCommandResponseCallback();
+
+    static void
+    CallbackFn(void * context,
+               const chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPOvenModeClusterChangeToModeResponseCallback
+    : public Callback::Callback<CHIPOvenModeClusterChangeToModeResponseCallbackType>
+{
+public:
+    CHIPOvenModeClusterChangeToModeResponseCallback(jobject javaCallback);
+
+    ~CHIPOvenModeClusterChangeToModeResponseCallback();
+
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
 class CHIPLaundryWasherModeClusterChangeToModeResponseCallback
     : public Callback::Callback<CHIPLaundryWasherModeClusterChangeToModeResponseCallbackType>
 {
@@ -572,6 +648,21 @@ class CHIPRvcOperationalStateClusterOperationalCommandResponseCallback
     jobject javaCallbackRef;
 };
 
+class CHIPEnergyEvseClusterGetTargetsResponseCallback
+    : public Callback::Callback<CHIPEnergyEvseClusterGetTargetsResponseCallbackType>
+{
+public:
+    CHIPEnergyEvseClusterGetTargetsResponseCallback(jobject javaCallback);
+
+    ~CHIPEnergyEvseClusterGetTargetsResponseCallback();
+
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType & data);
+
+private:
+    jobject javaCallbackRef;
+};
+
 class CHIPDoorLockClusterGetWeekDayScheduleResponseCallback
     : public Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
 {
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 23ceb0dfcdfa32..7d1ed3695fe5ab 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -657,6 +657,135 @@ void CHIPScenesLastConfiguredByAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
+CHIPScenesFabricSceneInfoAttributeCallback::CHIPScenesFabricSceneInfoAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPScenesClusterFabricSceneInfoAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPScenesFabricSceneInfoAttributeCallback::~CHIPScenesFabricSceneInfoAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPScenesFabricSceneInfoAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPScenesFabricSceneInfoAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPScenesFabricSceneInfoAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_sceneCount;
+        std::string newElement_0_sceneCountClassName     = "java/lang/Integer";
+        std::string newElement_0_sceneCountCtorSignature = "(I)V";
+        jint jninewElement_0_sceneCount                  = static_cast<jint>(entry_0.sceneCount);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_sceneCountClassName.c_str(),
+                                                                   newElement_0_sceneCountCtorSignature.c_str(),
+                                                                   jninewElement_0_sceneCount, newElement_0_sceneCount);
+        jobject newElement_0_currentScene;
+        std::string newElement_0_currentSceneClassName     = "java/lang/Integer";
+        std::string newElement_0_currentSceneCtorSignature = "(I)V";
+        jint jninewElement_0_currentScene                  = static_cast<jint>(entry_0.currentScene);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_currentSceneClassName.c_str(),
+                                                                   newElement_0_currentSceneCtorSignature.c_str(),
+                                                                   jninewElement_0_currentScene, newElement_0_currentScene);
+        jobject newElement_0_currentGroup;
+        std::string newElement_0_currentGroupClassName     = "java/lang/Integer";
+        std::string newElement_0_currentGroupCtorSignature = "(I)V";
+        jint jninewElement_0_currentGroup                  = static_cast<jint>(entry_0.currentGroup);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_currentGroupClassName.c_str(),
+                                                                   newElement_0_currentGroupCtorSignature.c_str(),
+                                                                   jninewElement_0_currentGroup, newElement_0_currentGroup);
+        jobject newElement_0_sceneValid;
+        std::string newElement_0_sceneValidClassName     = "java/lang/Boolean";
+        std::string newElement_0_sceneValidCtorSignature = "(Z)V";
+        jboolean jninewElement_0_sceneValid              = static_cast<jboolean>(entry_0.sceneValid);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(newElement_0_sceneValidClassName.c_str(),
+                                                                       newElement_0_sceneValidCtorSignature.c_str(),
+                                                                       jninewElement_0_sceneValid, newElement_0_sceneValid);
+        jobject newElement_0_remainingCapacity;
+        std::string newElement_0_remainingCapacityClassName     = "java/lang/Integer";
+        std::string newElement_0_remainingCapacityCtorSignature = "(I)V";
+        jint jninewElement_0_remainingCapacity                  = static_cast<jint>(entry_0.remainingCapacity);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_remainingCapacityClassName.c_str(), newElement_0_remainingCapacityCtorSignature.c_str(),
+            jninewElement_0_remainingCapacity, newElement_0_remainingCapacity);
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        jint jninewElement_0_fabricIndex                  = static_cast<jint>(entry_0.fabricIndex);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_fabricIndexClassName.c_str(),
+                                                                   newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                   jninewElement_0_fabricIndex, newElement_0_fabricIndex);
+
+        jclass sceneInfoStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$ScenesClusterSceneInfoStruct",
+                                                             sceneInfoStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterSceneInfoStruct");
+            return;
+        }
+        jmethodID sceneInfoStructStructCtor_1 = env->GetMethodID(sceneInfoStructStructClass_1, "<init>",
+                                                                 "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/"
+                                                                 "lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+        if (sceneInfoStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterSceneInfoStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(sceneInfoStructStructClass_1, sceneInfoStructStructCtor_1, newElement_0_sceneCount,
+                                      newElement_0_currentScene, newElement_0_currentGroup, newElement_0_sceneValid,
+                                      newElement_0_remainingCapacity, newElement_0_fabricIndex);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
 CHIPScenesGeneratedCommandListAttributeCallback::CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
     chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
@@ -7193,8 +7322,8 @@ CHIPPowerSourceConfigurationSourcesAttributeCallback::~CHIPPowerSourceConfigurat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8989,6 +9118,54 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
         chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(newElement_0_connectedClassName.c_str(),
                                                                        newElement_0_connectedCtorSignature.c_str(),
                                                                        jninewElement_0_connected, newElement_0_connected);
+        jobject newElement_0_networkIdentifier;
+        if (!entry_0.networkIdentifier.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_networkIdentifier);
+        }
+        else
+        {
+            jobject newElement_0_networkIdentifierInsideOptional;
+            if (entry_0.networkIdentifier.Value().IsNull())
+            {
+                newElement_0_networkIdentifierInsideOptional = nullptr;
+            }
+            else
+            {
+                jbyteArray newElement_0_networkIdentifierInsideOptionalByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.networkIdentifier.Value().Value().size()));
+                env->SetByteArrayRegion(newElement_0_networkIdentifierInsideOptionalByteArray, 0,
+                                        static_cast<jsize>(entry_0.networkIdentifier.Value().Value().size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.networkIdentifier.Value().Value().data()));
+                newElement_0_networkIdentifierInsideOptional = newElement_0_networkIdentifierInsideOptionalByteArray;
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_networkIdentifierInsideOptional,
+                                                              newElement_0_networkIdentifier);
+        }
+        jobject newElement_0_clientIdentifier;
+        if (!entry_0.clientIdentifier.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_clientIdentifier);
+        }
+        else
+        {
+            jobject newElement_0_clientIdentifierInsideOptional;
+            if (entry_0.clientIdentifier.Value().IsNull())
+            {
+                newElement_0_clientIdentifierInsideOptional = nullptr;
+            }
+            else
+            {
+                jbyteArray newElement_0_clientIdentifierInsideOptionalByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.clientIdentifier.Value().Value().size()));
+                env->SetByteArrayRegion(newElement_0_clientIdentifierInsideOptionalByteArray, 0,
+                                        static_cast<jsize>(entry_0.clientIdentifier.Value().Value().size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.clientIdentifier.Value().Value().data()));
+                newElement_0_clientIdentifierInsideOptional = newElement_0_clientIdentifierInsideOptionalByteArray;
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_clientIdentifierInsideOptional,
+                                                              newElement_0_clientIdentifier);
+        }
 
         jclass networkInfoStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
@@ -8998,8 +9175,8 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
             ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfoStruct");
             return;
         }
-        jmethodID networkInfoStructStructCtor_1 =
-            env->GetMethodID(networkInfoStructStructClass_1, "<init>", "([BLjava/lang/Boolean;)V");
+        jmethodID networkInfoStructStructCtor_1 = env->GetMethodID(
+            networkInfoStructStructClass_1, "<init>", "([BLjava/lang/Boolean;Ljava/util/Optional;Ljava/util/Optional;)V");
         if (networkInfoStructStructCtor_1 == nullptr)
         {
             ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfoStruct constructor");
@@ -9007,7 +9184,7 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
         }
 
         newElement_0 = env->NewObject(networkInfoStructStructClass_1, networkInfoStructStructCtor_1, newElement_0_networkID,
-                                      newElement_0_connected);
+                                      newElement_0_connected, newElement_0_networkIdentifier, newElement_0_clientIdentifier);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -11854,7 +12031,7 @@ CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::~CHIPThreadNetworkDiagno
 }
 
 void CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<uint8_t> & value)
+                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11922,7 +12099,7 @@ CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::~CHIPThreadNetworkDiag
 }
 
 void CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint8_t> & value)
+                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11990,7 +12167,7 @@ CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::~CHIPThreadNetwo
 }
 
 void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19496,9 +19673,9 @@ void CHIPIcdManagementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTimerGeneratedCommandListAttributeCallback::CHIPTimerGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTimerClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19514,7 +19691,7 @@ CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespac
     }
 }
 
-CHIPModeSelectStandardNamespaceAttributeCallback::~CHIPModeSelectStandardNamespaceAttributeCallback()
+CHIPTimerGeneratedCommandListAttributeCallback::~CHIPTimerGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19525,8 +19702,8 @@ CHIPModeSelectStandardNamespaceAttributeCallback::~CHIPModeSelectStandardNamespa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPTimerGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19534,8 +19711,9 @@ void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPModeSelectStandardNamespaceAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectStandardNamespaceAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimerGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimerGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19543,28 +19721,31 @@ void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectSupportedModesAttributeCallback::CHIPModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTimerAcceptedCommandListAttributeCallback::CHIPTimerAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimerClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19580,7 +19761,7 @@ CHIPModeSelectSupportedModesAttributeCallback::CHIPModeSelectSupportedModesAttri
     }
 }
 
-CHIPModeSelectSupportedModesAttributeCallback::~CHIPModeSelectSupportedModesAttributeCallback()
+CHIPTimerAcceptedCommandListAttributeCallback::~CHIPTimerAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19591,9 +19772,8 @@ CHIPModeSelectSupportedModesAttributeCallback::~CHIPModeSelectSupportedModesAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & list)
+void CHIPTimerAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19602,8 +19782,8 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPModeSelectSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectSupportedModesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTimerAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimerAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19622,76 +19802,11 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_label;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-        jobject newElement_0_mode;
-        std::string newElement_0_modeClassName     = "java/lang/Integer";
-        std::string newElement_0_modeCtorSignature = "(I)V";
-        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
-        jobject newElement_0_semanticTags;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags);
-
-        auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin();
-        while (iter_newElement_0_semanticTags_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue();
-            jobject newElement_2;
-            jobject newElement_2_mfgCode;
-            std::string newElement_2_mfgCodeClassName     = "java/lang/Integer";
-            std::string newElement_2_mfgCodeCtorSignature = "(I)V";
-            jint jninewElement_2_mfgCode                  = static_cast<jint>(entry_2.mfgCode);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_mfgCodeClassName.c_str(),
-                                                                       newElement_2_mfgCodeCtorSignature.c_str(),
-                                                                       jninewElement_2_mfgCode, newElement_2_mfgCode);
-            jobject newElement_2_value;
-            std::string newElement_2_valueClassName     = "java/lang/Integer";
-            std::string newElement_2_valueCtorSignature = "(I)V";
-            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
-                                                                       newElement_2_valueCtorSignature.c_str(),
-                                                                       jninewElement_2_value, newElement_2_value);
-
-            jclass semanticTagStructStructClass_3;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct");
-                return;
-            }
-            jmethodID semanticTagStructStructCtor_3 =
-                env->GetMethodID(semanticTagStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (semanticTagStructStructCtor_3 == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor");
-                return;
-            }
-
-            newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, newElement_2_mfgCode,
-                                          newElement_2_value);
-            chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2);
-        }
-
-        jclass modeOptionStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeOptionStruct");
-            return;
-        }
-        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
-                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
-        if (modeOptionStructStructCtor_1 == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterModeOptionStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                      newElement_0_mode, newElement_0_semanticTags);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -19699,8 +19814,8 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectStartUpModeAttributeCallback::CHIPModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTimerEventListAttributeCallback::CHIPTimerEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimerClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19716,7 +19831,7 @@ CHIPModeSelectStartUpModeAttributeCallback::CHIPModeSelectStartUpModeAttributeCa
     }
 }
 
-CHIPModeSelectStartUpModeAttributeCallback::~CHIPModeSelectStartUpModeAttributeCallback()
+CHIPTimerEventListAttributeCallback::~CHIPTimerEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19727,7 +19842,8 @@ CHIPModeSelectStartUpModeAttributeCallback::~CHIPModeSelectStartUpModeAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTimerEventListAttributeCallback::CallbackFn(void * context,
+                                                     const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19735,8 +19851,9 @@ void CHIPModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, cons
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPModeSelectStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectStartUpModeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimerEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimerEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19744,28 +19861,31 @@ void CHIPModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, cons
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectOnModeAttributeCallback::CHIPModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTimerAttributeListAttributeCallback::CHIPTimerAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimerClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19781,7 +19901,7 @@ CHIPModeSelectOnModeAttributeCallback::CHIPModeSelectOnModeAttributeCallback(job
     }
 }
 
-CHIPModeSelectOnModeAttributeCallback::~CHIPModeSelectOnModeAttributeCallback()
+CHIPTimerAttributeListAttributeCallback::~CHIPTimerAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19792,7 +19912,8 @@ CHIPModeSelectOnModeAttributeCallback::~CHIPModeSelectOnModeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTimerAttributeListAttributeCallback::CallbackFn(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19800,8 +19921,9 @@ void CHIPModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPModeSelectOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectOnModeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimerAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimerAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19809,29 +19931,33 @@ void CHIPModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chi
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenCavityOperationalStatePhaseListAttributeCallback::CHIPOvenCavityOperationalStatePhaseListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19847,7 +19973,7 @@ CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedComm
     }
 }
 
-CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCommandListAttributeCallback()
+CHIPOvenCavityOperationalStatePhaseListAttributeCallback::~CHIPOvenCavityOperationalStatePhaseListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19858,8 +19984,8 @@ CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOvenCavityOperationalStatePhaseListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19868,8 +19994,8 @@ void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPModeSelectGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenCavityOperationalStatePhaseListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStatePhaseListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19881,28 +20007,32 @@ void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    if (list.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        arrayListObj = nullptr;
+    }
+    else
+    {
+        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+        auto iter_arrayListObj_1 = list.Value().begin();
+        while (iter_arrayListObj_1.Next())
+        {
+            auto & entry_1 = iter_arrayListObj_1.GetValue();
+            jobject newElement_1;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+            chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1);
+        }
     }
 
     env->ExceptionClear();
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback::CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19918,7 +20048,7 @@ CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedComman
     }
 }
 
-CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedCommandListAttributeCallback()
+CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback::~CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19929,8 +20059,8 @@ CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19938,9 +20068,8 @@ void CHIPModeSelectAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPModeSelectAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateCurrentPhaseAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19948,31 +20077,98 @@ void CHIPModeSelectAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback::CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
 }
 
-CHIPModeSelectEventListAttributeCallback::CHIPModeSelectEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback::~CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback::
+CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19988,7 +20184,8 @@ CHIPModeSelectEventListAttributeCallback::CHIPModeSelectEventListAttributeCallba
     }
 }
 
-CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallback()
+CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback::~
+CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19999,8 +20196,10 @@ CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20009,8 +20208,8 @@ void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPModeSelectEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateOperationalStateListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20029,11 +20228,46 @@ void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        jobject newElement_0_operationalStateID;
+        std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+        std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+        jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+            jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+        jobject newElement_0_operationalStateLabel;
+        if (!entry_0.operationalStateLabel.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+        }
+        else
+        {
+            jobject newElement_0_operationalStateLabelInsideOptional;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.operationalStateLabel.Value(),
+                                                                                 newElement_0_operationalStateLabelInsideOptional));
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                              newElement_0_operationalStateLabel);
+        }
+
+        jclass operationalStateStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct",
+            operationalStateStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct");
+            return;
+        }
+        jmethodID operationalStateStructStructCtor_1 =
+            env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+        if (operationalStateStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$OvenCavityOperationalStateClusterOperationalStateStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                      newElement_0_operationalStateID, newElement_0_operationalStateLabel);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20041,8 +20275,10 @@ void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback::
+CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20058,7 +20294,8 @@ CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttribu
     }
 }
 
-CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttributeCallback()
+CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback::~
+CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20069,8 +20306,8 @@ CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20079,8 +20316,8 @@ void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPModeSelectAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPModeSelectAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20111,9 +20348,9 @@ void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
+CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback::
+CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20130,7 +20367,8 @@ CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSuppo
     }
 }
 
-CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupportedModesAttributeCallback()
+CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback::~
+CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20141,10 +20379,8 @@ CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupp
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType> &
-        list)
+void CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20153,8 +20389,8 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20173,9 +20409,224 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_label;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-        jobject newElement_0_mode;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOvenCavityOperationalStateEventListAttributeCallback::CHIPOvenCavityOperationalStateEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOvenCavityOperationalStateEventListAttributeCallback::~CHIPOvenCavityOperationalStateEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenCavityOperationalStateEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOvenCavityOperationalStateEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOvenCavityOperationalStateAttributeListAttributeCallback::CHIPOvenCavityOperationalStateAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenCavityOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOvenCavityOperationalStateAttributeListAttributeCallback::~CHIPOvenCavityOperationalStateAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenCavityOperationalStateAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOvenCavityOperationalStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenCavityOperationalStateAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOvenModeSupportedModesAttributeCallback::CHIPOvenModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOvenModeSupportedModesAttributeCallback::~CHIPOvenModeSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOvenModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_label;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+        jobject newElement_0_mode;
         std::string newElement_0_modeClassName     = "java/lang/Integer";
         std::string newElement_0_modeCtorSignature = "(I)V";
         jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
@@ -20215,17 +20666,17 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$OvenModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct");
+                ChipLogError(Zcl, "Could not find class ChipStructs$OvenModeClusterModeTagStruct");
                 return;
             }
             jmethodID modeTagStructStructCtor_3 =
                 env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
             if (modeTagStructStructCtor_3 == nullptr)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -20236,17 +20687,17 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$OvenModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct");
+            ChipLogError(Zcl, "Could not find class ChipStructs$OvenModeClusterModeOptionStruct");
             return;
         }
         jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
                                                                   "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
         if (modeOptionStructStructCtor_1 == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -20259,9 +20710,8 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenModeStartUpModeAttributeCallback::CHIPOvenModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20277,7 +20727,7 @@ CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpM
     }
 }
 
-CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUpModeAttributeCallback()
+CHIPOvenModeStartUpModeAttributeCallback::~CHIPOvenModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20288,8 +20738,7 @@ CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUp
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPOvenModeStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20297,8 +20746,8 @@ void CHIPLaundryWasherModeStartUpModeAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLaundryWasherModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeStartUpModeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeStartUpModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20326,8 +20775,8 @@ void CHIPLaundryWasherModeStartUpModeAttributeCallback::CallbackFn(void * contex
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenModeOnModeAttributeCallback::CHIPOvenModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20343,7 +20792,7 @@ CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttribu
     }
 }
 
-CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttributeCallback()
+CHIPOvenModeOnModeAttributeCallback::~CHIPOvenModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20354,7 +20803,7 @@ CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPOvenModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20362,8 +20811,8 @@ void CHIPLaundryWasherModeOnModeAttributeCallback::CallbackFn(void * context, co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLaundryWasherModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeOnModeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeOnModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20391,10 +20840,9 @@ void CHIPLaundryWasherModeOnModeAttributeCallback::CallbackFn(void * context, co
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CHIPLaundryWasherModeGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOvenModeGeneratedCommandListAttributeCallback::CHIPOvenModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20410,7 +20858,7 @@ CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CHIPLaundryWasherMod
     }
 }
 
-CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherModeGeneratedCommandListAttributeCallback()
+CHIPOvenModeGeneratedCommandListAttributeCallback::~CHIPOvenModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20421,7 +20869,7 @@ CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherMo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -20431,8 +20879,8 @@ void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20463,10 +20911,9 @@ void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOvenModeAcceptedCommandListAttributeCallback::CHIPOvenModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20482,7 +20929,7 @@ CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherMode
     }
 }
 
-CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeAcceptedCommandListAttributeCallback()
+CHIPOvenModeAcceptedCommandListAttributeCallback::~CHIPOvenModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20493,8 +20940,8 @@ CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherMod
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOvenModeAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20503,8 +20950,8 @@ void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20535,9 +20982,8 @@ void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenModeEventListAttributeCallback::CHIPOvenModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20553,7 +20999,7 @@ CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListA
     }
 }
 
-CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventListAttributeCallback()
+CHIPOvenModeEventListAttributeCallback::~CHIPOvenModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20564,8 +21010,8 @@ CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPOvenModeEventListAttributeCallback::CallbackFn(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20574,8 +21020,8 @@ void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20606,9 +21052,8 @@ void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOvenModeAttributeListAttributeCallback::CHIPOvenModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20624,7 +21069,7 @@ CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttrib
     }
 }
 
-CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttributeListAttributeCallback()
+CHIPOvenModeAttributeListAttributeCallback::~CHIPOvenModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20635,8 +21080,8 @@ CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOvenModeAttributeListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20645,8 +21090,8 @@ void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherModeAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOvenModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOvenModeAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20677,10 +21122,9 @@ void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallbackType>(
-        CallbackFn, this),
+CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback::CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterSupportedDrynessLevelsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20697,8 +21141,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallba
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
+CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback::~CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20709,10 +21152,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallba
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> & list)
+void CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20721,9 +21162,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsSupportedDrynessLevelsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20742,93 +21182,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_label;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
-        jobject newElement_0_mode;
-        std::string newElement_0_modeClassName     = "java/lang/Integer";
-        std::string newElement_0_modeCtorSignature = "(I)V";
-        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
-        jobject newElement_0_modeTags;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
-
-        auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
-        while (iter_newElement_0_modeTags_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
-            jobject newElement_2;
-            jobject newElement_2_mfgCode;
-            if (!entry_2.mfgCode.HasValue())
-            {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
-            }
-            else
-            {
-                jobject newElement_2_mfgCodeInsideOptional;
-                std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
-                std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
-                jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                    newElement_2_mfgCodeInsideOptionalClassName.c_str(), newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(),
-                    jninewElement_2_mfgCodeInsideOptional, newElement_2_mfgCodeInsideOptional);
-                chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
-            }
-            jobject newElement_2_value;
-            std::string newElement_2_valueClassName     = "java/lang/Integer";
-            std::string newElement_2_valueCtorSignature = "(I)V";
-            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
-                                                                       newElement_2_valueCtorSignature.c_str(),
-                                                                       jninewElement_2_value, newElement_2_value);
-
-            jclass modeTagStructStructClass_3;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
-                modeTagStructStructClass_3);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(
-                    Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
-                return;
-            }
-            jmethodID modeTagStructStructCtor_3 =
-                env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
-            if (modeTagStructStructCtor_3 == nullptr)
-            {
-                ChipLogError(
-                    Zcl,
-                    "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
-                return;
-            }
-
-            newElement_2 =
-                env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value);
-            chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
-        }
-
-        jclass modeOptionStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
-            modeOptionStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl,
-                         "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
-            return;
-        }
-        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
-                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
-        if (modeOptionStructStructCtor_1 == nullptr)
-        {
-            ChipLogError(
-                Zcl,
-                "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                      newElement_0_mode, newElement_0_modeTags);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        jint jninewElement_0                  = static_cast<jint>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(),
+                                                                   jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20836,81 +21194,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallbackType>(CallbackFn,
-                                                                                                                         this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback *>(context),
-                    maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallbackType>(CallbackFn,
-                                                                                                                    this),
+CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback::CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterSelectedDrynessLevelAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20927,8 +21213,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobje
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
+CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback::~CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20939,8 +21224,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20948,9 +21233,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsSelectedDrynessLevelAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20978,10 +21262,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallbackType>(
-        CallbackFn, this),
+CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback::CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20998,8 +21281,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttribute
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
+CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback::~CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21010,7 +21292,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21020,11 +21302,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttr
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback,
-                    decltype(&maybeDestroy)>
-        cppCallback(
-            reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback *>(context),
-            maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21055,10 +21334,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttr
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallbackType>(
-        CallbackFn, this),
+CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback::CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21075,8 +21353,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeC
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
+CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback::~CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21087,7 +21364,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21097,11 +21374,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttri
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback,
-                    decltype(&maybeDestroy)>
-        cppCallback(
-            reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback *>(context),
-            maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21132,11 +21406,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttri
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallbackType>(CallbackFn,
-                                                                                                                       this),
-    keepAlive(keepAlive)
+CHIPLaundryDryerControlsEventListAttributeCallback::CHIPLaundryDryerControlsEventListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21152,8 +21424,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jo
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
+CHIPLaundryDryerControlsEventListAttributeCallback::~CHIPLaundryDryerControlsEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21164,8 +21435,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPLaundryDryerControlsEventListAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21174,9 +21445,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21207,10 +21477,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallbackType>(
-        CallbackFn, this),
+CHIPLaundryDryerControlsAttributeListAttributeCallback::CHIPLaundryDryerControlsAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryDryerControlsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21227,8 +21496,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallbac
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
+CHIPLaundryDryerControlsAttributeListAttributeCallback::~CHIPLaundryDryerControlsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21239,7 +21507,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::CallbackFn(
+void CHIPLaundryDryerControlsAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21249,9 +21517,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCa
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPLaundryDryerControlsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryDryerControlsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21282,10 +21549,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCa
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsSpinSpeedsAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21301,7 +21567,7 @@ CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsS
     }
 }
 
-CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedsAttributeCallback()
+CHIPModeSelectStandardNamespaceAttributeCallback::~CHIPModeSelectStandardNamespaceAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21312,8 +21578,8 @@ CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControls
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21321,9 +21587,76 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPModeSelectStandardNamespaceAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectStandardNamespaceAttributeCallback *>(context), maybeDestroy);
 
-    std::unique_ptr<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback *>(context), maybeDestroy);
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPModeSelectSupportedModesAttributeCallback::CHIPModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPModeSelectSupportedModesAttributeCallback::~CHIPModeSelectSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPModeSelectSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectSupportedModesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21342,7 +21675,76 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+        jobject newElement_0_label;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+        jobject newElement_0_mode;
+        std::string newElement_0_modeClassName     = "java/lang/Integer";
+        std::string newElement_0_modeCtorSignature = "(I)V";
+        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
+        jobject newElement_0_semanticTags;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags);
+
+        auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin();
+        while (iter_newElement_0_semanticTags_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_mfgCode;
+            std::string newElement_2_mfgCodeClassName     = "java/lang/Integer";
+            std::string newElement_2_mfgCodeCtorSignature = "(I)V";
+            jint jninewElement_2_mfgCode                  = static_cast<jint>(entry_2.mfgCode);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_mfgCodeClassName.c_str(),
+                                                                       newElement_2_mfgCodeCtorSignature.c_str(),
+                                                                       jninewElement_2_mfgCode, newElement_2_mfgCode);
+            jobject newElement_2_value;
+            std::string newElement_2_valueClassName     = "java/lang/Integer";
+            std::string newElement_2_valueCtorSignature = "(I)V";
+            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                       newElement_2_valueCtorSignature.c_str(),
+                                                                       jninewElement_2_value, newElement_2_value);
+
+            jclass semanticTagStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct");
+                return;
+            }
+            jmethodID semanticTagStructStructCtor_3 =
+                env->GetMethodID(semanticTagStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (semanticTagStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor");
+                return;
+            }
+
+            newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, newElement_2_mfgCode,
+                                          newElement_2_value);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2);
+        }
+
+        jclass modeOptionStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeOptionStruct");
+            return;
+        }
+        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
+                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+        if (modeOptionStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterModeOptionStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                      newElement_0_mode, newElement_0_semanticTags);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -21350,10 +21752,8 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectStartUpModeAttributeCallback::CHIPModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21369,7 +21769,7 @@ CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherCon
     }
 }
 
-CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback()
+CHIPModeSelectStartUpModeAttributeCallback::~CHIPModeSelectStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21380,8 +21780,7 @@ CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherCo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CallbackFn(void * context,
-                                                                            const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21389,8 +21788,8 @@ void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CallbackFn(void
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectStartUpModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21418,10 +21817,8 @@ void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CallbackFn(void
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherControlsSupportedRinsesAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSupportedRinsesAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectOnModeAttributeCallback::CHIPModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21437,7 +21834,7 @@ CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherCont
     }
 }
 
-CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherControlsSupportedRinsesAttributeCallback()
+CHIPModeSelectOnModeAttributeCallback::~CHIPModeSelectOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21448,9 +21845,7 @@ CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherCon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> & list)
+void CHIPModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21458,9 +21853,8 @@ void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPLaundryWasherControlsSupportedRinsesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsSupportedRinsesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectOnModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21468,33 +21862,29 @@ void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        jint jninewElement_0                  = static_cast<jint>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(),
-                                                                   jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21510,7 +21900,7 @@ CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWashe
     }
 }
 
-CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback()
+CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21521,7 +21911,7 @@ CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWash
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21531,8 +21921,8 @@ void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21563,10 +21953,9 @@ void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21582,7 +21971,7 @@ CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasher
     }
 }
 
-CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback()
+CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21593,7 +21982,7 @@ CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWashe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPModeSelectAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21603,8 +21992,8 @@ void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21635,9 +22024,8 @@ void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEventListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPModeSelectEventListAttributeCallback::CHIPModeSelectEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21653,7 +22041,7 @@ CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEv
     }
 }
 
-CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsEventListAttributeCallback()
+CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21664,8 +22052,8 @@ CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsE
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21674,8 +22062,8 @@ void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherControlsEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21706,10 +22094,8 @@ void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherControlsAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21725,7 +22111,7 @@ CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherContro
     }
 }
 
-CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherControlsAttributeListAttributeCallback()
+CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21736,8 +22122,8 @@ CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherContr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21746,8 +22132,8 @@ void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherControlsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPModeSelectAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21778,8 +22164,10 @@ void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21795,7 +22183,7 @@ CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttri
     }
 }
 
-CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttributeCallback()
+CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21806,9 +22194,10 @@ CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
+void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> & list)
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21817,8 +22206,8 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcRunModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeSupportedModesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21879,17 +22268,17 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
+                ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct");
                 return;
             }
             jmethodID modeTagStructStructCtor_3 =
                 env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
             if (modeTagStructStructCtor_3 == nullptr)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -21900,17 +22289,17 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
+            ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct");
             return;
         }
         jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
                                                                   "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
         if (modeOptionStructStructCtor_1 == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -21923,8 +22312,9 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21940,7 +22330,7 @@ CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(job
     }
 }
 
-CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
+CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21951,7 +22341,8 @@ CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPLaundryWasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21959,8 +22350,8 @@ void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRvcRunModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeOnModeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeStartUpModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21988,9 +22379,8 @@ void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chi
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22006,7 +22396,7 @@ CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedComm
     }
 }
 
-CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCommandListAttributeCallback()
+CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22017,7 +22407,74 @@ CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPLaundryWasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPLaundryWasherModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeOnModeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CHIPLaundryWasherModeGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherModeGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22027,8 +22484,8 @@ void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcRunModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22059,9 +22516,10 @@ void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22077,7 +22535,7 @@ CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedComman
     }
 }
 
-CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedCommandListAttributeCallback()
+CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22088,7 +22546,7 @@ CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22098,8 +22556,8 @@ void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcRunModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22130,8 +22588,9 @@ void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22147,7 +22606,7 @@ CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallba
     }
 }
 
-CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallback()
+CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22158,8 +22617,8 @@ CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22168,8 +22627,8 @@ void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcRunModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22200,8 +22659,9 @@ void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22217,7 +22677,7 @@ CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttribu
     }
 }
 
-CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttributeCallback()
+CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22228,8 +22688,8 @@ CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22238,8 +22698,8 @@ void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcRunModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherModeAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22270,9 +22730,11 @@ void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallbackType>(
+        CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22288,7 +22750,8 @@ CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesA
     }
 }
 
-CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModesAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22299,9 +22762,10 @@ CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModes
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> & list)
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22310,8 +22774,9 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcCleanModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22372,17 +22837,21 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
+                modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct");
+                ChipLogError(
+                    Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
                 return;
             }
             jmethodID modeTagStructStructCtor_3 =
                 env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
             if (modeTagStructStructCtor_3 == nullptr)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor");
+                ChipLogError(
+                    Zcl,
+                    "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -22393,17 +22862,21 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
+            modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct");
+            ChipLogError(Zcl,
+                         "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
             return;
         }
         jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
                                                                   "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
         if (modeOptionStructStructCtor_1 == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor");
+            ChipLogError(
+                Zcl,
+                "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -22416,8 +22889,11 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallbackType>(CallbackFn,
+                                                                                                                         this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22433,7 +22909,8 @@ CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback
     }
 }
 
-CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22444,7 +22921,8 @@ CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22452,8 +22930,9 @@ void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRvcCleanModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeOnModeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22481,9 +22960,10 @@ void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const c
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallbackType>(CallbackFn,
+                                                                                                                    this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22500,7 +22980,8 @@ CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGenerated
     }
 }
 
-CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGeneratedCommandListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22511,8 +22992,8 @@ CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22520,9 +23001,9 @@ void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPRvcCleanModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22530,32 +23011,30 @@ void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallbackType>(
+        CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22572,7 +23051,8 @@ CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCo
     }
 }
 
-CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedCommandListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22583,7 +23063,7 @@ CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22593,8 +23073,11 @@ void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcCleanModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback,
+                    decltype(&maybeDestroy)>
+        cppCallback(
+            reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback *>(context),
+            maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22625,8 +23108,11 @@ void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallbackType>(
+        CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22642,7 +23128,8 @@ CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCa
     }
 }
 
-CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22653,8 +23140,8 @@ CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22663,8 +23150,11 @@ void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcCleanModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback,
+                    decltype(&maybeDestroy)>
+        cppCallback(
+            reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback *>(context),
+            maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22695,9 +23185,11 @@ void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallbackType>(CallbackFn,
+                                                                                                                       this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22713,7 +23205,8 @@ CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAtt
     }
 }
 
-CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22724,8 +23217,8 @@ CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22734,8 +23227,9 @@ void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcCleanModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22766,9 +23260,10 @@ void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterSupportedTemperatureLevelsAttributeCallbackType>(CallbackFn, this),
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallbackType>(
+        CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22785,8 +23280,8 @@ CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCa
     }
 }
 
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::~
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22797,8 +23292,8 @@ CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22807,8 +23302,9 @@ void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::Callback
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22827,7 +23323,11 @@ void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::Callback
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -22835,9 +23335,9 @@ void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::Callback
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureControlGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsSpinSpeedsAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22854,7 +23354,7 @@ CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureCont
     }
 }
 
-CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureControlGeneratedCommandListAttributeCallback()
+CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22865,8 +23365,8 @@ CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureCon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22875,8 +23375,8 @@ void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTemperatureControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22895,11 +23395,7 @@ void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -22907,9 +23403,9 @@ void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureControlAcceptedCommandListAttributeCallback(
+CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22926,7 +23422,7 @@ CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureContr
     }
 }
 
-CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureControlAcceptedCommandListAttributeCallback()
+CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22937,8 +23433,8 @@ CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureCont
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CallbackFn(void * context,
+                                                                            const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22946,9 +23442,8 @@ void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTemperatureControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22956,32 +23451,30 @@ void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherControlsSupportedRinsesAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSupportedRinsesAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22997,7 +23490,7 @@ CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventLis
     }
 }
 
-CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventListAttributeCallback()
+CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherControlsSupportedRinsesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23008,8 +23501,9 @@ CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23018,8 +23512,8 @@ void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTemperatureControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureControlEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsSupportedRinsesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsSupportedRinsesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23038,11 +23532,11 @@ void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        jint jninewElement_0                  = static_cast<jint>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(),
+                                                                   jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -23050,9 +23544,9 @@ void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23069,7 +23563,7 @@ CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttr
     }
 }
 
-CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAttributeListAttributeCallback()
+CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23080,8 +23574,8 @@ CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAtt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23090,8 +23584,8 @@ void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTemperatureControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23122,9 +23616,9 @@ void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback(
+CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23141,7 +23635,7 @@ CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlar
     }
 }
 
-CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback()
+CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23152,7 +23646,7 @@ CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAla
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23162,8 +23656,8 @@ void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23194,10 +23688,9 @@ void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEventListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23213,7 +23706,7 @@ CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarm
     }
 }
 
-CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback()
+CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23224,8 +23717,8 @@ CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlar
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23234,8 +23727,8 @@ void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23266,80 +23759,10 @@ void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmEventListAttributeCallback::CHIPRefrigeratorAlarmEventListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPRefrigeratorAlarmEventListAttributeCallback::~CHIPRefrigeratorAlarmEventListAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPRefrigeratorAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRefrigeratorAlarmEventListAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherControlsAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23355,7 +23778,7 @@ CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttrib
     }
 }
 
-CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttributeListAttributeCallback()
+CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherControlsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23366,7 +23789,7 @@ CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
+void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23376,8 +23799,8 @@ void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRefrigeratorAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLaundryWasherControlsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLaundryWasherControlsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23408,9 +23831,8 @@ void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23426,7 +23848,7 @@ CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedMo
     }
 }
 
-CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedModesAttributeCallback()
+CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23437,9 +23859,9 @@ CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedM
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
+void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType> & list)
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23448,8 +23870,8 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcRunModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeSupportedModesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23510,17 +23932,17 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct");
+                ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
                 return;
             }
             jmethodID modeTagStructStructCtor_3 =
                 env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
             if (modeTagStructStructCtor_3 == nullptr)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -23531,17 +23953,17 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct");
+            ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
             return;
         }
         jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
                                                                   "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
         if (modeOptionStructStructCtor_1 == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -23554,9 +23976,8 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23572,7 +23993,7 @@ CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAtt
     }
 }
 
-CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAttributeCallback()
+CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23583,8 +24004,7 @@ CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23592,8 +24012,8 @@ void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPDishwasherModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeStartUpModeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcRunModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeOnModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23621,8 +24041,9 @@ void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23638,7 +24059,7 @@ CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCall
     }
 }
 
-CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCallback()
+CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23649,7 +24070,8 @@ CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23657,8 +24079,9 @@ void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPDishwasherModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeOnModeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPRvcRunModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23666,30 +24089,32 @@ void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23705,7 +24130,7 @@ CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGener
     }
 }
 
-CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGeneratedCommandListAttributeCallback()
+CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23716,7 +24141,7 @@ CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGene
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23726,8 +24151,8 @@ void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcRunModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23758,10 +24183,8 @@ void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23777,7 +24200,7 @@ CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAccept
     }
 }
 
-CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAcceptedCommandListAttributeCallback()
+CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23788,8 +24211,8 @@ CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAccep
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23798,8 +24221,8 @@ void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcRunModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23830,8 +24253,8 @@ void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23847,7 +24270,7 @@ CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttribu
     }
 }
 
-CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttributeCallback()
+CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23858,8 +24281,8 @@ CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23868,8 +24291,8 @@ void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcRunModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcRunModeAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23900,9 +24323,9 @@ void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23918,7 +24341,7 @@ CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeLis
     }
 }
 
-CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeListAttributeCallback()
+CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23929,8 +24352,9 @@ CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23939,8 +24363,8 @@ void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherModeAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeSupportedModesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23959,25 +24383,98 @@ void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
+        jobject newElement_0_label;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+        jobject newElement_0_mode;
+        std::string newElement_0_modeClassName     = "java/lang/Integer";
+        std::string newElement_0_modeCtorSignature = "(I)V";
+        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
+        jobject newElement_0_modeTags;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
 
-CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
+        auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+        while (iter_newElement_0_modeTags_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_mfgCode;
+            if (!entry_2.mfgCode.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+            }
+            else
+            {
+                jobject newElement_2_mfgCodeInsideOptional;
+                std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_mfgCodeInsideOptionalClassName.c_str(), newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(),
+                    jninewElement_2_mfgCodeInsideOptional, newElement_2_mfgCodeInsideOptional);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+            }
+            jobject newElement_2_value;
+            std::string newElement_2_valueClassName     = "java/lang/Integer";
+            std::string newElement_2_valueCtorSignature = "(I)V";
+            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                       newElement_2_valueCtorSignature.c_str(),
+                                                                       jninewElement_2_value, newElement_2_value);
+
+            jclass modeTagStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct");
+                return;
+            }
+            jmethodID modeTagStructStructCtor_3 =
+                env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+            if (modeTagStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor");
+                return;
+            }
+
+            newElement_2 =
+                env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+        }
+
+        jclass modeOptionStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct");
+            return;
+        }
+        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
+                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+        if (modeOptionStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                      newElement_0_mode, newElement_0_modeTags);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
         ChipLogError(Zcl, "Could not create global reference for Java callback");
         return;
     }
@@ -23989,7 +24486,7 @@ CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedComm
     }
 }
 
-CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCommandListAttributeCallback()
+CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24000,8 +24497,7 @@ CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24009,9 +24505,8 @@ void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPAirQualityGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAirQualityGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeOnModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24019,32 +24514,30 @@ void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24060,7 +24553,7 @@ CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedComman
     }
 }
 
-CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedCommandListAttributeCallback()
+CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24071,7 +24564,7 @@ CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -24081,8 +24574,8 @@ void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAirQualityAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAirQualityAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24113,8 +24606,10 @@ void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAirQualityEventListAttributeCallback::CHIPAirQualityEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24130,7 +24625,7 @@ CHIPAirQualityEventListAttributeCallback::CHIPAirQualityEventListAttributeCallba
     }
 }
 
-CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallback()
+CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24141,8 +24636,8 @@ CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24151,8 +24646,8 @@ void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAirQualityEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAirQualityEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24183,8 +24678,8 @@ void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAirQualityAttributeListAttributeCallback::CHIPAirQualityAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24200,7 +24695,7 @@ CHIPAirQualityAttributeListAttributeCallback::CHIPAirQualityAttributeListAttribu
     }
 }
 
-CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttributeCallback()
+CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24211,8 +24706,8 @@ CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24221,8 +24716,8 @@ void CHIPAirQualityAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAirQualityAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAirQualityAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24253,10 +24748,9 @@ void CHIPAirQualityAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24272,7 +24766,7 @@ CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CHIPSmokeCoAlarmGenerated
     }
 }
 
-CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback()
+CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24283,8 +24777,8 @@ CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24293,8 +24787,8 @@ void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRvcCleanModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcCleanModeAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24325,9 +24819,9 @@ void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterSupportedTemperatureLevelsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24344,7 +24838,8 @@ CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCo
     }
 }
 
-CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback()
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::~
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24355,8 +24850,8 @@ CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24365,8 +24860,8 @@ void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24385,11 +24880,7 @@ void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -24397,8 +24888,10 @@ void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmEventListAttributeCallback::CHIPSmokeCoAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureControlGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24414,7 +24907,7 @@ CHIPSmokeCoAlarmEventListAttributeCallback::CHIPSmokeCoAlarmEventListAttributeCa
     }
 }
 
-CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeCallback()
+CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24425,8 +24918,8 @@ CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24435,8 +24928,8 @@ void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPSmokeCoAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSmokeCoAlarmEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24467,9 +24960,10 @@ void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureControlAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24485,7 +24979,7 @@ CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAtt
     }
 }
 
-CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAttributeCallback()
+CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24496,8 +24990,8 @@ CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24506,8 +25000,8 @@ void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPSmokeCoAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSmokeCoAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24538,10 +25032,9 @@ void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24557,7 +25050,7 @@ CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGen
     }
 }
 
-CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGeneratedCommandListAttributeCallback()
+CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24568,8 +25061,8 @@ CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24578,8 +25071,8 @@ void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureControlEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24610,9 +25103,9 @@ void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24629,7 +25122,7 @@ CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcce
     }
 }
 
-CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcceptedCommandListAttributeCallback()
+CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24640,8 +25133,8 @@ CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24650,8 +25143,8 @@ void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24682,8 +25175,10 @@ void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24699,7 +25194,7 @@ CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttri
     }
 }
 
-CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttributeCallback()
+CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24710,8 +25205,8 @@ CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24720,8 +25215,8 @@ void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherAlarmEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24752,9 +25247,10 @@ void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24770,7 +25266,7 @@ CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeL
     }
 }
 
-CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttributeListAttributeCallback()
+CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24781,8 +25277,8 @@ CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24791,8 +25287,8 @@ void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDishwasherAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDishwasherAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24823,9 +25319,9 @@ void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAlarmEventListAttributeCallback::CHIPRefrigeratorAlarmEventListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24841,7 +25337,7 @@ CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAtt
     }
 }
 
-CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAttributeCallback()
+CHIPRefrigeratorAlarmEventListAttributeCallback::~CHIPRefrigeratorAlarmEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24852,8 +25348,8 @@ CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24862,8 +25358,8 @@ void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOperationalStatePhaseListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStatePhaseListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRefrigeratorAlarmEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24875,31 +25371,28 @@ void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject arrayListObj;
-    if (list.IsNull())
-    {
-        arrayListObj = nullptr;
-    }
-    else
-    {
-        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-        auto iter_arrayListObj_1 = list.Value().begin();
-        while (iter_arrayListObj_1.Next())
-        {
-            auto & entry_1 = iter_arrayListObj_1.GetValue();
-            jobject newElement_1;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
-            chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1);
-        }
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
     env->ExceptionClear();
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24915,7 +25408,7 @@ CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPh
     }
 }
 
-CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentPhaseAttributeCallback()
+CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24926,8 +25419,8 @@ CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentP
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24935,75 +25428,9 @@ void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPOperationalStateCurrentPhaseAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateCurrentPhaseAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
-    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPOperationalStateCountdownTimeAttributeCallback::~CHIPOperationalStateCountdownTimeAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRefrigeratorAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRefrigeratorAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25011,30 +25438,32 @@ void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                    jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateOperationalStateListAttributeCallback::CHIPOperationalStateOperationalStateListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25050,7 +25479,7 @@ CHIPOperationalStateOperationalStateListAttributeCallback::CHIPOperationalStateO
     }
 }
 
-CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalStateOperationalStateListAttributeCallback()
+CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25061,10 +25490,9 @@ CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalState
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
+void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType> & list)
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25073,8 +25501,8 @@ void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOperationalStateOperationalStateListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateOperationalStateListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeSupportedModesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25093,46 +25521,85 @@ void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_operationalStateID;
-        std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
-        std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
-        jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+        jobject newElement_0_label;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+        jobject newElement_0_mode;
+        std::string newElement_0_modeClassName     = "java/lang/Integer";
+        std::string newElement_0_modeCtorSignature = "(I)V";
+        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
         chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
-            jninewElement_0_operationalStateID, newElement_0_operationalStateID);
-        jobject newElement_0_operationalStateLabel;
-        if (!entry_0.operationalStateLabel.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
-        }
-        else
-        {
-            jobject newElement_0_operationalStateLabelInsideOptional;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.operationalStateLabel.Value(),
-                                                                                 newElement_0_operationalStateLabelInsideOptional));
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
-                                                              newElement_0_operationalStateLabel);
-        }
+            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
+        jobject newElement_0_modeTags;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
 
-        jclass operationalStateStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$OperationalStateClusterOperationalStateStruct",
-            operationalStateStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
+        auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+        while (iter_newElement_0_modeTags_2.Next())
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterOperationalStateStruct");
+            auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_mfgCode;
+            if (!entry_2.mfgCode.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+            }
+            else
+            {
+                jobject newElement_2_mfgCodeInsideOptional;
+                std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_mfgCodeInsideOptionalClassName.c_str(), newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(),
+                    jninewElement_2_mfgCodeInsideOptional, newElement_2_mfgCodeInsideOptional);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+            }
+            jobject newElement_2_value;
+            std::string newElement_2_valueClassName     = "java/lang/Integer";
+            std::string newElement_2_valueCtorSignature = "(I)V";
+            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                       newElement_2_valueCtorSignature.c_str(),
+                                                                       jninewElement_2_value, newElement_2_value);
+
+            jclass modeTagStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct");
+                return;
+            }
+            jmethodID modeTagStructStructCtor_3 =
+                env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+            if (modeTagStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor");
+                return;
+            }
+
+            newElement_2 =
+                env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+        }
+
+        jclass modeOptionStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct");
             return;
         }
-        jmethodID operationalStateStructStructCtor_1 =
-            env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
-        if (operationalStateStructStructCtor_1 == nullptr)
+        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
+                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+        if (modeOptionStructStructCtor_1 == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterOperationalStateStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor");
             return;
         }
 
-        newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
-                                      newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                      newElement_0_mode, newElement_0_modeTags);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -25140,10 +25607,9 @@ void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25159,7 +25625,7 @@ CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateG
     }
 }
 
-CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalStateGeneratedCommandListAttributeCallback()
+CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25170,8 +25636,8 @@ CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalState
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25179,9 +25645,8 @@ void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeStartUpModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25189,33 +25654,28 @@ void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25231,7 +25691,7 @@ CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAc
     }
 }
 
-CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateAcceptedCommandListAttributeCallback()
+CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25242,8 +25702,7 @@ CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25251,9 +25710,8 @@ void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeOnModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeOnModeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25261,32 +25719,30 @@ void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25302,7 +25758,7 @@ CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAtt
     }
 }
 
-CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAttributeCallback()
+CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25313,8 +25769,8 @@ CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25323,8 +25779,8 @@ void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOperationalStateEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25355,9 +25811,10 @@ void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25373,7 +25830,7 @@ CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttribut
     }
 }
 
-CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttributeListAttributeCallback()
+CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25384,8 +25841,8 @@ CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25394,8 +25851,8 @@ void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOperationalStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalStateAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25426,9 +25883,8 @@ void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25444,7 +25900,7 @@ CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseL
     }
 }
 
-CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhaseListAttributeCallback()
+CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25455,8 +25911,8 @@ CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhase
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStatePhaseListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25465,8 +25921,8 @@ void CHIPRvcOperationalStatePhaseListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStatePhaseListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStatePhaseListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25478,32 +25934,28 @@ void CHIPRvcOperationalStatePhaseListAttributeCallback::CallbackFn(
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject arrayListObj;
-    if (list.IsNull())
-    {
-        arrayListObj = nullptr;
-    }
-    else
-    {
-        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-        auto iter_arrayListObj_1 = list.Value().begin();
-        while (iter_arrayListObj_1.Next())
-        {
-            auto & entry_1 = iter_arrayListObj_1.GetValue();
-            jobject newElement_1;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
-            chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1);
-        }
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
     env->ExceptionClear();
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CHIPRvcOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25519,7 +25971,7 @@ CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CHIPRvcOperationalStateCur
     }
 }
 
-CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCurrentPhaseAttributeCallback()
+CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25530,8 +25982,8 @@ CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25539,8 +25991,9 @@ void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRvcOperationalStateCurrentPhaseAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateCurrentPhaseAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPDishwasherModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherModeAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25548,30 +26001,32 @@ void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * con
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        jint jnijavaValue                  = static_cast<jint>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPAirQualityClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25587,7 +26042,7 @@ CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCo
     }
 }
 
-CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateCountdownTimeAttributeCallback()
+CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25598,8 +26053,8 @@ CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25607,8 +26062,9 @@ void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRvcOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAirQualityGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAirQualityGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25616,30 +26072,32 @@ void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                    jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperationalStateOperationalStateListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25655,7 +26113,7 @@ CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperational
     }
 }
 
-CHIPRvcOperationalStateOperationalStateListAttributeCallback::~CHIPRvcOperationalStateOperationalStateListAttributeCallback()
+CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25666,10 +26124,8 @@ CHIPRvcOperationalStateOperationalStateListAttributeCallback::~CHIPRvcOperationa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType> & list)
+void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25678,8 +26134,8 @@ void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStateOperationalStateListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateOperationalStateListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAirQualityAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAirQualityAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25698,46 +26154,11 @@ void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_operationalStateID;
-        std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
-        std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
-        jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
-            jninewElement_0_operationalStateID, newElement_0_operationalStateID);
-        jobject newElement_0_operationalStateLabel;
-        if (!entry_0.operationalStateLabel.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
-        }
-        else
-        {
-            jobject newElement_0_operationalStateLabelInsideOptional;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.operationalStateLabel.Value(),
-                                                                                 newElement_0_operationalStateLabelInsideOptional));
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
-                                                              newElement_0_operationalStateLabel);
-        }
-
-        jclass operationalStateStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterOperationalStateStruct",
-            operationalStateStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterOperationalStateStruct");
-            return;
-        }
-        jmethodID operationalStateStructStructCtor_1 =
-            env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
-        if (operationalStateStructStructCtor_1 == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterOperationalStateStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
-                                      newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -25745,10 +26166,8 @@ void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperationalStateGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAirQualityEventListAttributeCallback::CHIPAirQualityEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAirQualityClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25764,7 +26183,7 @@ CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperational
     }
 }
 
-CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationalStateGeneratedCommandListAttributeCallback()
+CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25775,8 +26194,8 @@ CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25785,8 +26204,8 @@ void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAirQualityEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAirQualityEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25817,10 +26236,8 @@ void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalStateAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAirQualityAttributeListAttributeCallback::CHIPAirQualityAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAirQualityClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25836,7 +26253,7 @@ CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalS
     }
 }
 
-CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperationalStateAcceptedCommandListAttributeCallback()
+CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25847,8 +26264,8 @@ CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperational
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAirQualityAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25857,8 +26274,8 @@ void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAirQualityAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAirQualityAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25889,9 +26306,10 @@ void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25907,7 +26325,7 @@ CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventL
     }
 }
 
-CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEventListAttributeCallback()
+CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25918,8 +26336,8 @@ CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEvent
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25928,8 +26346,8 @@ void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * contex
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStateEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25960,9 +26378,9 @@ void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * contex
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25979,7 +26397,7 @@ CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAt
     }
 }
 
-CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateAttributeListAttributeCallback()
+CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25990,8 +26408,8 @@ CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26000,8 +26418,8 @@ void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRvcOperationalStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26032,10 +26450,8 @@ void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPSmokeCoAlarmEventListAttributeCallback::CHIPSmokeCoAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26051,7 +26467,7 @@ CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitori
     }
 }
 
-CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback()
+CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26062,8 +26478,8 @@ CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitor
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26071,8 +26487,9 @@ void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPSmokeCoAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSmokeCoAlarmEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26080,30 +26497,32 @@ void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void *
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                    jnijavaValue, javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterMonitoringReplacementProductListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26119,7 +26538,7 @@ CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterM
     }
 }
 
-CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::~CHIPHepaFilterMonitoringReplacementProductListAttributeCallback()
+CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26130,10 +26549,8 @@ CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::~CHIPHepaFilter
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> & list)
+void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26142,8 +26559,8 @@ void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPHepaFilterMonitoringReplacementProductListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringReplacementProductListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSmokeCoAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSmokeCoAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26162,36 +26579,83 @@ void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_productIdentifierType;
-        std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
-        std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
-        jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
-            jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
-        jobject newElement_0_productIdentifierValue;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
-                                                                             newElement_0_productIdentifierValue));
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
 
-        jclass replacementProductStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct",
-            replacementProductStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct");
-            return;
-        }
-        jmethodID replacementProductStructStructCtor_1 =
-            env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-        if (replacementProductStructStructCtor_1 == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct constructor");
-            return;
-        }
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
 
-        newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
-                                      newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDishwasherAlarmGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherAlarmGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -26199,9 +26663,9 @@ void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback(
+CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26218,7 +26682,7 @@ CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMon
     }
 }
 
-CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback()
+CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26229,7 +26693,7 @@ CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -26239,8 +26703,78 @@ void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDishwasherAlarmAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherAlarmAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDishwasherAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherAlarmEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26267,13 +26801,6051 @@ void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDishwasherAlarmAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDishwasherAlarmAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CHIPMicrowaveOvenModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenModeSupportedModesAttributeCallback::~CHIPMicrowaveOvenModeSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType> &
+        list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_label;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.label, newElement_0_label));
+        jobject newElement_0_mode;
+        std::string newElement_0_modeClassName     = "java/lang/Integer";
+        std::string newElement_0_modeCtorSignature = "(I)V";
+        jint jninewElement_0_mode                  = static_cast<jint>(entry_0.mode);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), jninewElement_0_mode, newElement_0_mode);
+        jobject newElement_0_modeTags;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+
+        auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
+        while (iter_newElement_0_modeTags_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_modeTags_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_mfgCode;
+            if (!entry_2.mfgCode.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode);
+            }
+            else
+            {
+                jobject newElement_2_mfgCodeInsideOptional;
+                std::string newElement_2_mfgCodeInsideOptionalClassName     = "java/lang/Integer";
+                std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V";
+                jint jninewElement_2_mfgCodeInsideOptional                  = static_cast<jint>(entry_2.mfgCode.Value());
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_mfgCodeInsideOptionalClassName.c_str(), newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(),
+                    jninewElement_2_mfgCodeInsideOptional, newElement_2_mfgCodeInsideOptional);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode);
+            }
+            jobject newElement_2_value;
+            std::string newElement_2_valueClassName     = "java/lang/Integer";
+            std::string newElement_2_valueCtorSignature = "(I)V";
+            jint jninewElement_2_value                  = static_cast<jint>(entry_2.value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_valueClassName.c_str(),
+                                                                       newElement_2_valueCtorSignature.c_str(),
+                                                                       jninewElement_2_value, newElement_2_value);
+
+            jclass modeTagStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$MicrowaveOvenModeClusterModeTagStruct", modeTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$MicrowaveOvenModeClusterModeTagStruct");
+                return;
+            }
+            jmethodID modeTagStructStructCtor_3 =
+                env->GetMethodID(modeTagStructStructClass_3, "<init>", "(Ljava/util/Optional;Ljava/lang/Integer;)V");
+            if (modeTagStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$MicrowaveOvenModeClusterModeTagStruct constructor");
+                return;
+            }
+
+            newElement_2 =
+                env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
+        }
+
+        jclass modeOptionStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$MicrowaveOvenModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$MicrowaveOvenModeClusterModeOptionStruct");
+            return;
+        }
+        jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "<init>",
+                                                                  "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+        if (modeOptionStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$MicrowaveOvenModeClusterModeOptionStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
+                                      newElement_0_mode, newElement_0_modeTags);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenModeEventListAttributeCallback::CHIPMicrowaveOvenModeEventListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenModeEventListAttributeCallback::~CHIPMicrowaveOvenModeEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenModeEventListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenModeEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenModeAttributeListAttributeCallback::CHIPMicrowaveOvenModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenModeAttributeListAttributeCallback::~CHIPMicrowaveOvenModeAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenModeAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenControlEventListAttributeCallback::CHIPMicrowaveOvenControlEventListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenControlEventListAttributeCallback::~CHIPMicrowaveOvenControlEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenControlEventListAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenControlEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPMicrowaveOvenControlAttributeListAttributeCallback::CHIPMicrowaveOvenControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPMicrowaveOvenControlAttributeListAttributeCallback::~CHIPMicrowaveOvenControlAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPMicrowaveOvenControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPMicrowaveOvenControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMicrowaveOvenControlAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStatePhaseListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStatePhaseListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    if (list.IsNull())
+    {
+        arrayListObj = nullptr;
+    }
+    else
+    {
+        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+        auto iter_arrayListObj_1 = list.Value().begin();
+        while (iter_arrayListObj_1.Next())
+        {
+            auto & entry_1 = iter_arrayListObj_1.GetValue();
+            jobject newElement_1;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+            chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1);
+        }
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentPhaseAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPOperationalStateCurrentPhaseAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateCurrentPhaseAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateCountdownTimeAttributeCallback::~CHIPOperationalStateCountdownTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPOperationalStateOperationalStateListAttributeCallback::CHIPOperationalStateOperationalStateListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalStateOperationalStateListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStateOperationalStateListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateOperationalStateListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_operationalStateID;
+        std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+        std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+        jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+            jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+        jobject newElement_0_operationalStateLabel;
+        if (!entry_0.operationalStateLabel.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+        }
+        else
+        {
+            jobject newElement_0_operationalStateLabelInsideOptional;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.operationalStateLabel.Value(),
+                                                                                 newElement_0_operationalStateLabelInsideOptional));
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                              newElement_0_operationalStateLabel);
+        }
+
+        jclass operationalStateStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$OperationalStateClusterOperationalStateStruct",
+            operationalStateStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterOperationalStateStruct");
+            return;
+        }
+        jmethodID operationalStateStructStructCtor_1 =
+            env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+        if (operationalStateStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$OperationalStateClusterOperationalStateStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                      newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalStateGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStateEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOperationalStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalStateAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhaseListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStatePhaseListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStatePhaseListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStatePhaseListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    if (list.IsNull())
+    {
+        arrayListObj = nullptr;
+    }
+    else
+    {
+        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+        auto iter_arrayListObj_1 = list.Value().begin();
+        while (iter_arrayListObj_1.Next())
+        {
+            auto & entry_1 = iter_arrayListObj_1.GetValue();
+            jobject newElement_1;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_1, newElement_1));
+            chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1);
+        }
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CHIPRvcOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCurrentPhaseAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPRvcOperationalStateCurrentPhaseAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateCurrentPhaseAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateCountdownTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPRvcOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperationalStateOperationalStateListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateOperationalStateListAttributeCallback::~CHIPRvcOperationalStateOperationalStateListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStateOperationalStateListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateOperationalStateListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_operationalStateID;
+        std::string newElement_0_operationalStateIDClassName     = "java/lang/Integer";
+        std::string newElement_0_operationalStateIDCtorSignature = "(I)V";
+        jint jninewElement_0_operationalStateID                  = static_cast<jint>(entry_0.operationalStateID);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_operationalStateIDClassName.c_str(), newElement_0_operationalStateIDCtorSignature.c_str(),
+            jninewElement_0_operationalStateID, newElement_0_operationalStateID);
+        jobject newElement_0_operationalStateLabel;
+        if (!entry_0.operationalStateLabel.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_operationalStateLabel);
+        }
+        else
+        {
+            jobject newElement_0_operationalStateLabelInsideOptional;
+            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.operationalStateLabel.Value(),
+                                                                                 newElement_0_operationalStateLabelInsideOptional));
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_operationalStateLabelInsideOptional,
+                                                              newElement_0_operationalStateLabel);
+        }
+
+        jclass operationalStateStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$RvcOperationalStateClusterOperationalStateStruct",
+            operationalStateStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$RvcOperationalStateClusterOperationalStateStruct");
+            return;
+        }
+        jmethodID operationalStateStructStructCtor_1 =
+            env->GetMethodID(operationalStateStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;)V");
+        if (operationalStateStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$RvcOperationalStateClusterOperationalStateStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(operationalStateStructStructClass_1, operationalStateStructStructCtor_1,
+                                      newElement_0_operationalStateID, newElement_0_operationalStateLabel);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperationalStateGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationalStateGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalStateAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperationalStateAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStateEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPRvcOperationalStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRvcOperationalStateAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterMonitoringReplacementProductListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::~CHIPHepaFilterMonitoringReplacementProductListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPHepaFilterMonitoringReplacementProductListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringReplacementProductListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_productIdentifierType;
+        std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
+        std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
+        jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
+            jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
+        jobject newElement_0_productIdentifierValue;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
+                                                                             newElement_0_productIdentifierValue));
+
+        jclass replacementProductStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct",
+            replacementProductStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct");
+            return;
+        }
+        jmethodID replacementProductStructStructCtor_1 =
+            env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+        if (replacementProductStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
+                                      newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEventListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPHepaFilterMonitoringEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoringAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitoringAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPHepaFilterMonitoringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPHepaFilterMonitoringAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn,
+                                                                                                                    this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback *>(context),
+                    maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_productIdentifierType;
+        std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
+        std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
+        jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
+            jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
+        jobject newElement_0_productIdentifierValue;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
+                                                                             newElement_0_productIdentifierValue));
+
+        jclass replacementProductStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
+            replacementProductStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct");
+            return;
+        }
+        jmethodID replacementProductStructStructCtor_1 =
+            env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+        if (replacementProductStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl,
+                         "Could not find ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
+                                      newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::~
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::~
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPBooleanSensorConfigurationEventListAttributeCallback::CHIPBooleanSensorConfigurationEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPBooleanSensorConfigurationEventListAttributeCallback::~CHIPBooleanSensorConfigurationEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPBooleanSensorConfigurationEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPBooleanSensorConfigurationEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanSensorConfigurationEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPBooleanSensorConfigurationAttributeListAttributeCallback::CHIPBooleanSensorConfigurationAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPBooleanSensorConfigurationAttributeListAttributeCallback::~CHIPBooleanSensorConfigurationAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPBooleanSensorConfigurationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPBooleanSensorConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanSensorConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPValveConfigurationAndControlOpenDurationAttributeCallback::CHIPValveConfigurationAndControlOpenDurationAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterOpenDurationAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlOpenDurationAttributeCallback::~CHIPValveConfigurationAndControlOpenDurationAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlOpenDurationAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlOpenDurationAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlOpenDurationAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback::CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAutoCloseTimeAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback::~CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterRemainingDurationAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::~
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlRemainingDurationAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlRemainingDurationAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlCurrentStateAttributeCallback::CHIPValveConfigurationAndControlCurrentStateAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterCurrentStateAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlCurrentStateAttributeCallback::~CHIPValveConfigurationAndControlCurrentStateAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlCurrentStateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlCurrentStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlCurrentStateAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlTargetStateAttributeCallback::CHIPValveConfigurationAndControlTargetStateAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterTargetStateAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlTargetStateAttributeCallback::~CHIPValveConfigurationAndControlTargetStateAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlTargetStateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlTargetStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlTargetStateAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::CHIPValveConfigurationAndControlCurrentLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterCurrentLevelAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::~CHIPValveConfigurationAndControlCurrentLevelAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlCurrentLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlCurrentLevelAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlTargetLevelAttributeCallback::CHIPValveConfigurationAndControlTargetLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterTargetLevelAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlTargetLevelAttributeCallback::~CHIPValveConfigurationAndControlTargetLevelAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlTargetLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlTargetLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlTargetLevelAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlOpenLevelAttributeCallback::CHIPValveConfigurationAndControlOpenLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterOpenLevelAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlOpenLevelAttributeCallback::~CHIPValveConfigurationAndControlOpenLevelAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlOpenLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPValveConfigurationAndControlOpenLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlOpenLevelAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::~
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::~
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPValveConfigurationAndControlEventListAttributeCallback::CHIPValveConfigurationAndControlEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlEventListAttributeCallback::~CHIPValveConfigurationAndControlEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPValveConfigurationAndControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPValveConfigurationAndControlAttributeListAttributeCallback::CHIPValveConfigurationAndControlAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPValveConfigurationAndControlAttributeListAttributeCallback::~CHIPValveConfigurationAndControlAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPValveConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPValveConfigurationAndControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPValveConfigurationAndControlAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback::
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterLoadControlProgramsAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback::~
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_programID;
+        jbyteArray newElement_0_programIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.programID.size()));
+        env->SetByteArrayRegion(newElement_0_programIDByteArray, 0, static_cast<jsize>(entry_0.programID.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.programID.data()));
+        newElement_0_programID = newElement_0_programIDByteArray;
+        jobject newElement_0_name;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name));
+        jobject newElement_0_enrollmentGroup;
+        if (entry_0.enrollmentGroup.IsNull())
+        {
+            newElement_0_enrollmentGroup = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_enrollmentGroupClassName     = "java/lang/Integer";
+            std::string newElement_0_enrollmentGroupCtorSignature = "(I)V";
+            jint jninewElement_0_enrollmentGroup                  = static_cast<jint>(entry_0.enrollmentGroup.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_enrollmentGroupClassName.c_str(), newElement_0_enrollmentGroupCtorSignature.c_str(),
+                jninewElement_0_enrollmentGroup, newElement_0_enrollmentGroup);
+        }
+        jobject newElement_0_randomStartMinutes;
+        if (entry_0.randomStartMinutes.IsNull())
+        {
+            newElement_0_randomStartMinutes = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_randomStartMinutesClassName     = "java/lang/Integer";
+            std::string newElement_0_randomStartMinutesCtorSignature = "(I)V";
+            jint jninewElement_0_randomStartMinutes                  = static_cast<jint>(entry_0.randomStartMinutes.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_randomStartMinutesClassName.c_str(), newElement_0_randomStartMinutesCtorSignature.c_str(),
+                jninewElement_0_randomStartMinutes, newElement_0_randomStartMinutes);
+        }
+        jobject newElement_0_randomDurationMinutes;
+        if (entry_0.randomDurationMinutes.IsNull())
+        {
+            newElement_0_randomDurationMinutes = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_randomDurationMinutesClassName     = "java/lang/Integer";
+            std::string newElement_0_randomDurationMinutesCtorSignature = "(I)V";
+            jint jninewElement_0_randomDurationMinutes                  = static_cast<jint>(entry_0.randomDurationMinutes.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_randomDurationMinutesClassName.c_str(), newElement_0_randomDurationMinutesCtorSignature.c_str(),
+                jninewElement_0_randomDurationMinutes, newElement_0_randomDurationMinutes);
+        }
+
+        jclass loadControlProgramStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct",
+            loadControlProgramStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct");
+            return;
+        }
+        jmethodID loadControlProgramStructStructCtor_1 =
+            env->GetMethodID(loadControlProgramStructStructClass_1, "<init>",
+                             "([BLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+        if (loadControlProgramStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlProgramStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(loadControlProgramStructStructClass_1, loadControlProgramStructStructCtor_1,
+                                      newElement_0_programID, newElement_0_name, newElement_0_enrollmentGroup,
+                                      newElement_0_randomStartMinutes, newElement_0_randomDurationMinutes);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlEventsAttributeCallback::CHIPDemandResponseLoadControlEventsAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterEventsAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlEventsAttributeCallback::~CHIPDemandResponseLoadControlEventsAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlEventsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlEventsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlEventsAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_eventID;
+        jbyteArray newElement_0_eventIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.eventID.size()));
+        env->SetByteArrayRegion(newElement_0_eventIDByteArray, 0, static_cast<jsize>(entry_0.eventID.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.eventID.data()));
+        newElement_0_eventID = newElement_0_eventIDByteArray;
+        jobject newElement_0_programID;
+        if (entry_0.programID.IsNull())
+        {
+            newElement_0_programID = nullptr;
+        }
+        else
+        {
+            jbyteArray newElement_0_programIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.programID.Value().size()));
+            env->SetByteArrayRegion(newElement_0_programIDByteArray, 0, static_cast<jsize>(entry_0.programID.Value().size()),
+                                    reinterpret_cast<const jbyte *>(entry_0.programID.Value().data()));
+            newElement_0_programID = newElement_0_programIDByteArray;
+        }
+        jobject newElement_0_control;
+        std::string newElement_0_controlClassName     = "java/lang/Integer";
+        std::string newElement_0_controlCtorSignature = "(I)V";
+        jint jninewElement_0_control                  = static_cast<jint>(entry_0.control.Raw());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_controlClassName.c_str(),
+                                                                   newElement_0_controlCtorSignature.c_str(),
+                                                                   jninewElement_0_control, newElement_0_control);
+        jobject newElement_0_deviceClass;
+        std::string newElement_0_deviceClassClassName     = "java/lang/Long";
+        std::string newElement_0_deviceClassCtorSignature = "(J)V";
+        jlong jninewElement_0_deviceClass                 = static_cast<jlong>(entry_0.deviceClass.Raw());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_deviceClassClassName.c_str(),
+                                                                    newElement_0_deviceClassCtorSignature.c_str(),
+                                                                    jninewElement_0_deviceClass, newElement_0_deviceClass);
+        jobject newElement_0_enrollmentGroup;
+        if (!entry_0.enrollmentGroup.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_enrollmentGroup);
+        }
+        else
+        {
+            jobject newElement_0_enrollmentGroupInsideOptional;
+            std::string newElement_0_enrollmentGroupInsideOptionalClassName     = "java/lang/Integer";
+            std::string newElement_0_enrollmentGroupInsideOptionalCtorSignature = "(I)V";
+            jint jninewElement_0_enrollmentGroupInsideOptional = static_cast<jint>(entry_0.enrollmentGroup.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_enrollmentGroupInsideOptionalClassName.c_str(),
+                newElement_0_enrollmentGroupInsideOptionalCtorSignature.c_str(), jninewElement_0_enrollmentGroupInsideOptional,
+                newElement_0_enrollmentGroupInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_enrollmentGroupInsideOptional,
+                                                              newElement_0_enrollmentGroup);
+        }
+        jobject newElement_0_criticality;
+        std::string newElement_0_criticalityClassName     = "java/lang/Integer";
+        std::string newElement_0_criticalityCtorSignature = "(I)V";
+        jint jninewElement_0_criticality                  = static_cast<jint>(entry_0.criticality);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_criticalityClassName.c_str(),
+                                                                   newElement_0_criticalityCtorSignature.c_str(),
+                                                                   jninewElement_0_criticality, newElement_0_criticality);
+        jobject newElement_0_startTime;
+        if (entry_0.startTime.IsNull())
+        {
+            newElement_0_startTime = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_startTimeClassName     = "java/lang/Long";
+            std::string newElement_0_startTimeCtorSignature = "(J)V";
+            jlong jninewElement_0_startTime                 = static_cast<jlong>(entry_0.startTime.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_startTimeClassName.c_str(),
+                                                                        newElement_0_startTimeCtorSignature.c_str(),
+                                                                        jninewElement_0_startTime, newElement_0_startTime);
+        }
+        jobject newElement_0_transitions;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_transitions);
+
+        auto iter_newElement_0_transitions_2 = entry_0.transitions.begin();
+        while (iter_newElement_0_transitions_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_transitions_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_duration;
+            std::string newElement_2_durationClassName     = "java/lang/Integer";
+            std::string newElement_2_durationCtorSignature = "(I)V";
+            jint jninewElement_2_duration                  = static_cast<jint>(entry_2.duration);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_durationClassName.c_str(),
+                                                                       newElement_2_durationCtorSignature.c_str(),
+                                                                       jninewElement_2_duration, newElement_2_duration);
+            jobject newElement_2_control;
+            std::string newElement_2_controlClassName     = "java/lang/Integer";
+            std::string newElement_2_controlCtorSignature = "(I)V";
+            jint jninewElement_2_control                  = static_cast<jint>(entry_2.control.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_controlClassName.c_str(),
+                                                                       newElement_2_controlCtorSignature.c_str(),
+                                                                       jninewElement_2_control, newElement_2_control);
+            jobject newElement_2_temperatureControl;
+            if (!entry_2.temperatureControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_temperatureControl);
+            }
+            else
+            {
+                jobject newElement_2_temperatureControlInsideOptional;
+                jobject newElement_2_temperatureControlInsideOptional_coolingTempOffset;
+                if (!entry_2.temperatureControl.Value().coolingTempOffset.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional;
+                    if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().coolingTempOffset.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffset;
+                if (!entry_2.temperatureControl.Value().heatingtTempOffset.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional;
+                    if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpoint;
+                if (!entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional;
+                    if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpoint;
+                if (!entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional;
+                    if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                }
+
+                jclass temperatureControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct",
+                    temperatureControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct");
+                    return;
+                }
+                jmethodID temperatureControlStructStructCtor_5 =
+                    env->GetMethodID(temperatureControlStructStructClass_5, "<init>",
+                                     "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (temperatureControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_temperatureControlInsideOptional =
+                    env->NewObject(temperatureControlStructStructClass_5, temperatureControlStructStructCtor_5,
+                                   newElement_2_temperatureControlInsideOptional_coolingTempOffset,
+                                   newElement_2_temperatureControlInsideOptional_heatingtTempOffset,
+                                   newElement_2_temperatureControlInsideOptional_coolingTempSetpoint,
+                                   newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_temperatureControlInsideOptional,
+                                                                  newElement_2_temperatureControl);
+            }
+            jobject newElement_2_averageLoadControl;
+            if (!entry_2.averageLoadControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_averageLoadControl);
+            }
+            else
+            {
+                jobject newElement_2_averageLoadControlInsideOptional;
+                jobject newElement_2_averageLoadControlInsideOptional_loadAdjustment;
+                std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName     = "java/lang/Integer";
+                std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature = "(I)V";
+                jint jninewElement_2_averageLoadControlInsideOptional_loadAdjustment =
+                    static_cast<jint>(entry_2.averageLoadControl.Value().loadAdjustment);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName.c_str(),
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature.c_str(),
+                    jninewElement_2_averageLoadControlInsideOptional_loadAdjustment,
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+
+                jclass averageLoadControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct",
+                    averageLoadControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct");
+                    return;
+                }
+                jmethodID averageLoadControlStructStructCtor_5 =
+                    env->GetMethodID(averageLoadControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (averageLoadControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_averageLoadControlInsideOptional =
+                    env->NewObject(averageLoadControlStructStructClass_5, averageLoadControlStructStructCtor_5,
+                                   newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_averageLoadControlInsideOptional,
+                                                                  newElement_2_averageLoadControl);
+            }
+            jobject newElement_2_dutyCycleControl;
+            if (!entry_2.dutyCycleControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_dutyCycleControl);
+            }
+            else
+            {
+                jobject newElement_2_dutyCycleControlInsideOptional;
+                jobject newElement_2_dutyCycleControlInsideOptional_dutyCycle;
+                std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName     = "java/lang/Integer";
+                std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature = "(I)V";
+                jint jninewElement_2_dutyCycleControlInsideOptional_dutyCycle =
+                    static_cast<jint>(entry_2.dutyCycleControl.Value().dutyCycle);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName.c_str(),
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature.c_str(),
+                    jninewElement_2_dutyCycleControlInsideOptional_dutyCycle,
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+
+                jclass dutyCycleControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct",
+                    dutyCycleControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct");
+                    return;
+                }
+                jmethodID dutyCycleControlStructStructCtor_5 =
+                    env->GetMethodID(dutyCycleControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (dutyCycleControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_dutyCycleControlInsideOptional =
+                    env->NewObject(dutyCycleControlStructStructClass_5, dutyCycleControlStructStructCtor_5,
+                                   newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_dutyCycleControlInsideOptional,
+                                                                  newElement_2_dutyCycleControl);
+            }
+            jobject newElement_2_powerSavingsControl;
+            if (!entry_2.powerSavingsControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_powerSavingsControl);
+            }
+            else
+            {
+                jobject newElement_2_powerSavingsControlInsideOptional;
+                jobject newElement_2_powerSavingsControlInsideOptional_powerSavings;
+                std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName     = "java/lang/Integer";
+                std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature = "(I)V";
+                jint jninewElement_2_powerSavingsControlInsideOptional_powerSavings =
+                    static_cast<jint>(entry_2.powerSavingsControl.Value().powerSavings);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName.c_str(),
+                    newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature.c_str(),
+                    jninewElement_2_powerSavingsControlInsideOptional_powerSavings,
+                    newElement_2_powerSavingsControlInsideOptional_powerSavings);
+
+                jclass powerSavingsControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct",
+                    powerSavingsControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct");
+                    return;
+                }
+                jmethodID powerSavingsControlStructStructCtor_5 =
+                    env->GetMethodID(powerSavingsControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (powerSavingsControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(
+                        Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_powerSavingsControlInsideOptional =
+                    env->NewObject(powerSavingsControlStructStructClass_5, powerSavingsControlStructStructCtor_5,
+                                   newElement_2_powerSavingsControlInsideOptional_powerSavings);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_powerSavingsControlInsideOptional,
+                                                                  newElement_2_powerSavingsControl);
+            }
+            jobject newElement_2_heatingSourceControl;
+            if (!entry_2.heatingSourceControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_heatingSourceControl);
+            }
+            else
+            {
+                jobject newElement_2_heatingSourceControlInsideOptional;
+                jobject newElement_2_heatingSourceControlInsideOptional_heatingSource;
+                std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName     = "java/lang/Integer";
+                std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature = "(I)V";
+                jint jninewElement_2_heatingSourceControlInsideOptional_heatingSource =
+                    static_cast<jint>(entry_2.heatingSourceControl.Value().heatingSource);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName.c_str(),
+                    newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature.c_str(),
+                    jninewElement_2_heatingSourceControlInsideOptional_heatingSource,
+                    newElement_2_heatingSourceControlInsideOptional_heatingSource);
+
+                jclass heatingSourceControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct",
+                    heatingSourceControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find class ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct");
+                    return;
+                }
+                jmethodID heatingSourceControlStructStructCtor_5 =
+                    env->GetMethodID(heatingSourceControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (heatingSourceControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(
+                        Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_heatingSourceControlInsideOptional =
+                    env->NewObject(heatingSourceControlStructStructClass_5, heatingSourceControlStructStructCtor_5,
+                                   newElement_2_heatingSourceControlInsideOptional_heatingSource);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_heatingSourceControlInsideOptional,
+                                                                  newElement_2_heatingSourceControl);
+            }
+
+            jclass loadControlEventTransitionStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct",
+                loadControlEventTransitionStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl,
+                             "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct");
+                return;
+            }
+            jmethodID loadControlEventTransitionStructStructCtor_3 =
+                env->GetMethodID(loadControlEventTransitionStructStructClass_3, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
+                                 "Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (loadControlEventTransitionStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(
+                    Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct constructor");
+                return;
+            }
+
+            newElement_2 = env->NewObject(
+                loadControlEventTransitionStructStructClass_3, loadControlEventTransitionStructStructCtor_3, newElement_2_duration,
+                newElement_2_control, newElement_2_temperatureControl, newElement_2_averageLoadControl,
+                newElement_2_dutyCycleControl, newElement_2_powerSavingsControl, newElement_2_heatingSourceControl);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_transitions, newElement_2);
+        }
+
+        jclass loadControlEventStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+            loadControlEventStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
+            return;
+        }
+        jmethodID loadControlEventStructStructCtor_1 =
+            env->GetMethodID(loadControlEventStructStructClass_1, "<init>",
+                             "([B[BLjava/lang/Integer;Ljava/lang/Long;Ljava/util/Optional;Ljava/lang/Integer;Ljava/lang/Long;Ljava/"
+                             "util/ArrayList;)V");
+        if (loadControlEventStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct constructor");
+            return;
+        }
+
+        newElement_0 =
+            env->NewObject(loadControlEventStructStructClass_1, loadControlEventStructStructCtor_1, newElement_0_eventID,
+                           newElement_0_programID, newElement_0_control, newElement_0_deviceClass, newElement_0_enrollmentGroup,
+                           newElement_0_criticality, newElement_0_startTime, newElement_0_transitions);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlActiveEventsAttributeCallback::CHIPDemandResponseLoadControlActiveEventsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterActiveEventsAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlActiveEventsAttributeCallback::~CHIPDemandResponseLoadControlActiveEventsAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlActiveEventsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlActiveEventsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlActiveEventsAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_eventID;
+        jbyteArray newElement_0_eventIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.eventID.size()));
+        env->SetByteArrayRegion(newElement_0_eventIDByteArray, 0, static_cast<jsize>(entry_0.eventID.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.eventID.data()));
+        newElement_0_eventID = newElement_0_eventIDByteArray;
+        jobject newElement_0_programID;
+        if (entry_0.programID.IsNull())
+        {
+            newElement_0_programID = nullptr;
+        }
+        else
+        {
+            jbyteArray newElement_0_programIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.programID.Value().size()));
+            env->SetByteArrayRegion(newElement_0_programIDByteArray, 0, static_cast<jsize>(entry_0.programID.Value().size()),
+                                    reinterpret_cast<const jbyte *>(entry_0.programID.Value().data()));
+            newElement_0_programID = newElement_0_programIDByteArray;
+        }
+        jobject newElement_0_control;
+        std::string newElement_0_controlClassName     = "java/lang/Integer";
+        std::string newElement_0_controlCtorSignature = "(I)V";
+        jint jninewElement_0_control                  = static_cast<jint>(entry_0.control.Raw());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_controlClassName.c_str(),
+                                                                   newElement_0_controlCtorSignature.c_str(),
+                                                                   jninewElement_0_control, newElement_0_control);
+        jobject newElement_0_deviceClass;
+        std::string newElement_0_deviceClassClassName     = "java/lang/Long";
+        std::string newElement_0_deviceClassCtorSignature = "(J)V";
+        jlong jninewElement_0_deviceClass                 = static_cast<jlong>(entry_0.deviceClass.Raw());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_deviceClassClassName.c_str(),
+                                                                    newElement_0_deviceClassCtorSignature.c_str(),
+                                                                    jninewElement_0_deviceClass, newElement_0_deviceClass);
+        jobject newElement_0_enrollmentGroup;
+        if (!entry_0.enrollmentGroup.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_enrollmentGroup);
+        }
+        else
+        {
+            jobject newElement_0_enrollmentGroupInsideOptional;
+            std::string newElement_0_enrollmentGroupInsideOptionalClassName     = "java/lang/Integer";
+            std::string newElement_0_enrollmentGroupInsideOptionalCtorSignature = "(I)V";
+            jint jninewElement_0_enrollmentGroupInsideOptional = static_cast<jint>(entry_0.enrollmentGroup.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                newElement_0_enrollmentGroupInsideOptionalClassName.c_str(),
+                newElement_0_enrollmentGroupInsideOptionalCtorSignature.c_str(), jninewElement_0_enrollmentGroupInsideOptional,
+                newElement_0_enrollmentGroupInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_enrollmentGroupInsideOptional,
+                                                              newElement_0_enrollmentGroup);
+        }
+        jobject newElement_0_criticality;
+        std::string newElement_0_criticalityClassName     = "java/lang/Integer";
+        std::string newElement_0_criticalityCtorSignature = "(I)V";
+        jint jninewElement_0_criticality                  = static_cast<jint>(entry_0.criticality);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_criticalityClassName.c_str(),
+                                                                   newElement_0_criticalityCtorSignature.c_str(),
+                                                                   jninewElement_0_criticality, newElement_0_criticality);
+        jobject newElement_0_startTime;
+        if (entry_0.startTime.IsNull())
+        {
+            newElement_0_startTime = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_startTimeClassName     = "java/lang/Long";
+            std::string newElement_0_startTimeCtorSignature = "(J)V";
+            jlong jninewElement_0_startTime                 = static_cast<jlong>(entry_0.startTime.Value());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(newElement_0_startTimeClassName.c_str(),
+                                                                        newElement_0_startTimeCtorSignature.c_str(),
+                                                                        jninewElement_0_startTime, newElement_0_startTime);
+        }
+        jobject newElement_0_transitions;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_transitions);
+
+        auto iter_newElement_0_transitions_2 = entry_0.transitions.begin();
+        while (iter_newElement_0_transitions_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_transitions_2.GetValue();
+            jobject newElement_2;
+            jobject newElement_2_duration;
+            std::string newElement_2_durationClassName     = "java/lang/Integer";
+            std::string newElement_2_durationCtorSignature = "(I)V";
+            jint jninewElement_2_duration                  = static_cast<jint>(entry_2.duration);
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_durationClassName.c_str(),
+                                                                       newElement_2_durationCtorSignature.c_str(),
+                                                                       jninewElement_2_duration, newElement_2_duration);
+            jobject newElement_2_control;
+            std::string newElement_2_controlClassName     = "java/lang/Integer";
+            std::string newElement_2_controlCtorSignature = "(I)V";
+            jint jninewElement_2_control                  = static_cast<jint>(entry_2.control.Raw());
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_2_controlClassName.c_str(),
+                                                                       newElement_2_controlCtorSignature.c_str(),
+                                                                       jninewElement_2_control, newElement_2_control);
+            jobject newElement_2_temperatureControl;
+            if (!entry_2.temperatureControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_temperatureControl);
+            }
+            else
+            {
+                jobject newElement_2_temperatureControlInsideOptional;
+                jobject newElement_2_temperatureControlInsideOptional_coolingTempOffset;
+                if (!entry_2.temperatureControl.Value().coolingTempOffset.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional;
+                    if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().coolingTempOffset.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffsetInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_coolingTempOffset);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffset;
+                if (!entry_2.temperatureControl.Value().heatingtTempOffset.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional;
+                    if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffsetInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_heatingtTempOffset);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpoint;
+                if (!entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional;
+                    if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpointInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_coolingTempSetpoint);
+                }
+                jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpoint;
+                if (!entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        nullptr, newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                }
+                else
+                {
+                    jobject newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional;
+                    if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull())
+                    {
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName =
+                            "java/lang/Integer";
+                        std::string newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature =
+                            "(I)V";
+                        jint jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional =
+                            static_cast<jint>(entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value());
+                        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalClassName.c_str(),
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptionalCtorSignature.c_str(),
+                            jninewElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                            newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpointInsideOptional,
+                        newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                }
+
+                jclass temperatureControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct",
+                    temperatureControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct");
+                    return;
+                }
+                jmethodID temperatureControlStructStructCtor_5 =
+                    env->GetMethodID(temperatureControlStructStructClass_5, "<init>",
+                                     "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (temperatureControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterTemperatureControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_temperatureControlInsideOptional =
+                    env->NewObject(temperatureControlStructStructClass_5, temperatureControlStructStructCtor_5,
+                                   newElement_2_temperatureControlInsideOptional_coolingTempOffset,
+                                   newElement_2_temperatureControlInsideOptional_heatingtTempOffset,
+                                   newElement_2_temperatureControlInsideOptional_coolingTempSetpoint,
+                                   newElement_2_temperatureControlInsideOptional_heatingTempSetpoint);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_temperatureControlInsideOptional,
+                                                                  newElement_2_temperatureControl);
+            }
+            jobject newElement_2_averageLoadControl;
+            if (!entry_2.averageLoadControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_averageLoadControl);
+            }
+            else
+            {
+                jobject newElement_2_averageLoadControlInsideOptional;
+                jobject newElement_2_averageLoadControlInsideOptional_loadAdjustment;
+                std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName     = "java/lang/Integer";
+                std::string newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature = "(I)V";
+                jint jninewElement_2_averageLoadControlInsideOptional_loadAdjustment =
+                    static_cast<jint>(entry_2.averageLoadControl.Value().loadAdjustment);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustmentClassName.c_str(),
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustmentCtorSignature.c_str(),
+                    jninewElement_2_averageLoadControlInsideOptional_loadAdjustment,
+                    newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+
+                jclass averageLoadControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct",
+                    averageLoadControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct");
+                    return;
+                }
+                jmethodID averageLoadControlStructStructCtor_5 =
+                    env->GetMethodID(averageLoadControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (averageLoadControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterAverageLoadControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_averageLoadControlInsideOptional =
+                    env->NewObject(averageLoadControlStructStructClass_5, averageLoadControlStructStructCtor_5,
+                                   newElement_2_averageLoadControlInsideOptional_loadAdjustment);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_averageLoadControlInsideOptional,
+                                                                  newElement_2_averageLoadControl);
+            }
+            jobject newElement_2_dutyCycleControl;
+            if (!entry_2.dutyCycleControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_dutyCycleControl);
+            }
+            else
+            {
+                jobject newElement_2_dutyCycleControlInsideOptional;
+                jobject newElement_2_dutyCycleControlInsideOptional_dutyCycle;
+                std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName     = "java/lang/Integer";
+                std::string newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature = "(I)V";
+                jint jninewElement_2_dutyCycleControlInsideOptional_dutyCycle =
+                    static_cast<jint>(entry_2.dutyCycleControl.Value().dutyCycle);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycleClassName.c_str(),
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycleCtorSignature.c_str(),
+                    jninewElement_2_dutyCycleControlInsideOptional_dutyCycle,
+                    newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+
+                jclass dutyCycleControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct",
+                    dutyCycleControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct");
+                    return;
+                }
+                jmethodID dutyCycleControlStructStructCtor_5 =
+                    env->GetMethodID(dutyCycleControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (dutyCycleControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterDutyCycleControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_dutyCycleControlInsideOptional =
+                    env->NewObject(dutyCycleControlStructStructClass_5, dutyCycleControlStructStructCtor_5,
+                                   newElement_2_dutyCycleControlInsideOptional_dutyCycle);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_dutyCycleControlInsideOptional,
+                                                                  newElement_2_dutyCycleControl);
+            }
+            jobject newElement_2_powerSavingsControl;
+            if (!entry_2.powerSavingsControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_powerSavingsControl);
+            }
+            else
+            {
+                jobject newElement_2_powerSavingsControlInsideOptional;
+                jobject newElement_2_powerSavingsControlInsideOptional_powerSavings;
+                std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName     = "java/lang/Integer";
+                std::string newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature = "(I)V";
+                jint jninewElement_2_powerSavingsControlInsideOptional_powerSavings =
+                    static_cast<jint>(entry_2.powerSavingsControl.Value().powerSavings);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_powerSavingsControlInsideOptional_powerSavingsClassName.c_str(),
+                    newElement_2_powerSavingsControlInsideOptional_powerSavingsCtorSignature.c_str(),
+                    jninewElement_2_powerSavingsControlInsideOptional_powerSavings,
+                    newElement_2_powerSavingsControlInsideOptional_powerSavings);
+
+                jclass powerSavingsControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct",
+                    powerSavingsControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct");
+                    return;
+                }
+                jmethodID powerSavingsControlStructStructCtor_5 =
+                    env->GetMethodID(powerSavingsControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (powerSavingsControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(
+                        Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterPowerSavingsControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_powerSavingsControlInsideOptional =
+                    env->NewObject(powerSavingsControlStructStructClass_5, powerSavingsControlStructStructCtor_5,
+                                   newElement_2_powerSavingsControlInsideOptional_powerSavings);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_powerSavingsControlInsideOptional,
+                                                                  newElement_2_powerSavingsControl);
+            }
+            jobject newElement_2_heatingSourceControl;
+            if (!entry_2.heatingSourceControl.HasValue())
+            {
+                chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_heatingSourceControl);
+            }
+            else
+            {
+                jobject newElement_2_heatingSourceControlInsideOptional;
+                jobject newElement_2_heatingSourceControlInsideOptional_heatingSource;
+                std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName     = "java/lang/Integer";
+                std::string newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature = "(I)V";
+                jint jninewElement_2_heatingSourceControlInsideOptional_heatingSource =
+                    static_cast<jint>(entry_2.heatingSourceControl.Value().heatingSource);
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_2_heatingSourceControlInsideOptional_heatingSourceClassName.c_str(),
+                    newElement_2_heatingSourceControlInsideOptional_heatingSourceCtorSignature.c_str(),
+                    jninewElement_2_heatingSourceControlInsideOptional_heatingSource,
+                    newElement_2_heatingSourceControlInsideOptional_heatingSource);
+
+                jclass heatingSourceControlStructStructClass_5;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct",
+                    heatingSourceControlStructStructClass_5);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find class ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct");
+                    return;
+                }
+                jmethodID heatingSourceControlStructStructCtor_5 =
+                    env->GetMethodID(heatingSourceControlStructStructClass_5, "<init>", "(Ljava/lang/Integer;)V");
+                if (heatingSourceControlStructStructCtor_5 == nullptr)
+                {
+                    ChipLogError(
+                        Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterHeatingSourceControlStruct constructor");
+                    return;
+                }
+
+                newElement_2_heatingSourceControlInsideOptional =
+                    env->NewObject(heatingSourceControlStructStructClass_5, heatingSourceControlStructStructCtor_5,
+                                   newElement_2_heatingSourceControlInsideOptional_heatingSource);
+                chip::JniReferences::GetInstance().CreateOptional(newElement_2_heatingSourceControlInsideOptional,
+                                                                  newElement_2_heatingSourceControl);
+            }
+
+            jclass loadControlEventTransitionStructStructClass_3;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct",
+                loadControlEventTransitionStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl,
+                             "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct");
+                return;
+            }
+            jmethodID loadControlEventTransitionStructStructCtor_3 =
+                env->GetMethodID(loadControlEventTransitionStructStructClass_3, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
+                                 "Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+            if (loadControlEventTransitionStructStructCtor_3 == nullptr)
+            {
+                ChipLogError(
+                    Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventTransitionStruct constructor");
+                return;
+            }
+
+            newElement_2 = env->NewObject(
+                loadControlEventTransitionStructStructClass_3, loadControlEventTransitionStructStructCtor_3, newElement_2_duration,
+                newElement_2_control, newElement_2_temperatureControl, newElement_2_averageLoadControl,
+                newElement_2_dutyCycleControl, newElement_2_powerSavingsControl, newElement_2_heatingSourceControl);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_transitions, newElement_2);
+        }
+
+        jclass loadControlEventStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+            loadControlEventStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
+            return;
+        }
+        jmethodID loadControlEventStructStructCtor_1 =
+            env->GetMethodID(loadControlEventStructStructClass_1, "<init>",
+                             "([B[BLjava/lang/Integer;Ljava/lang/Long;Ljava/util/Optional;Ljava/lang/Integer;Ljava/lang/Long;Ljava/"
+                             "util/ArrayList;)V");
+        if (loadControlEventStructStructCtor_1 == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct constructor");
+            return;
+        }
+
+        newElement_0 =
+            env->NewObject(loadControlEventStructStructClass_1, loadControlEventStructStructCtor_1, newElement_0_eventID,
+                           newElement_0_programID, newElement_0_control, newElement_0_deviceClass, newElement_0_enrollmentGroup,
+                           newElement_0_criticality, newElement_0_startTime, newElement_0_transitions);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::~
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::~
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlEventListAttributeCallback::CHIPDemandResponseLoadControlEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlEventListAttributeCallback::~CHIPDemandResponseLoadControlEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlEventListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDemandResponseLoadControlAttributeListAttributeCallback::CHIPDemandResponseLoadControlAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDemandResponseLoadControlAttributeListAttributeCallback::~CHIPDemandResponseLoadControlAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDemandResponseLoadControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDemandResponseLoadControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDemandResponseLoadControlAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPEnergyEvseStateAttributeCallback::CHIPEnergyEvseStateAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterStateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseStateAttributeCallback::~CHIPEnergyEvseStateAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseStateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseStateAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseChargingEnabledUntilAttributeCallback::CHIPEnergyEvseChargingEnabledUntilAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterChargingEnabledUntilAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseChargingEnabledUntilAttributeCallback::~CHIPEnergyEvseChargingEnabledUntilAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseChargingEnabledUntilAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseChargingEnabledUntilAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseChargingEnabledUntilAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseDischargingEnabledUntilAttributeCallback::CHIPEnergyEvseDischargingEnabledUntilAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterDischargingEnabledUntilAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseDischargingEnabledUntilAttributeCallback::~CHIPEnergyEvseDischargingEnabledUntilAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseDischargingEnabledUntilAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseDischargingEnabledUntilAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseDischargingEnabledUntilAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseNextChargeStartTimeAttributeCallback::CHIPEnergyEvseNextChargeStartTimeAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterNextChargeStartTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseNextChargeStartTimeAttributeCallback::~CHIPEnergyEvseNextChargeStartTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseNextChargeStartTimeAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseNextChargeStartTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseNextChargeStartTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseNextChargeTargetTimeAttributeCallback::CHIPEnergyEvseNextChargeTargetTimeAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterNextChargeTargetTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseNextChargeTargetTimeAttributeCallback::~CHIPEnergyEvseNextChargeTargetTimeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseNextChargeTargetTimeAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseNextChargeTargetTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseNextChargeTargetTimeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback::CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterNextChargeRequiredEnergyAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback::~CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback::CallbackFn(void * context,
+                                                                         const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseNextChargeRequiredEnergyAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPEnergyEvseNextChargeTargetSoCAttributeCallback::CHIPEnergyEvseNextChargeTargetSoCAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterNextChargeTargetSoCAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPEnergyEvseNextChargeTargetSoCAttributeCallback::~CHIPEnergyEvseNextChargeTargetSoCAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPEnergyEvseNextChargeTargetSoCAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPEnergyEvseNextChargeTargetSoCAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseNextChargeTargetSoCAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback::CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterApproximateEVEfficiencyAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26290,7 +32862,7 @@ CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMoni
     }
 }
 
-CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback()
+CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback::~CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26301,8 +32873,8 @@ CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26310,9 +32882,8 @@ void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseApproximateEVEfficiencyAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26320,32 +32891,28 @@ void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEventListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPEnergyEvseStateOfChargeAttributeCallback::CHIPEnergyEvseStateOfChargeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterStateOfChargeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26361,7 +32928,7 @@ CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEven
     }
 }
 
-CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEventListAttributeCallback()
+CHIPEnergyEvseStateOfChargeAttributeCallback::~CHIPEnergyEvseStateOfChargeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26372,8 +32939,8 @@ CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEve
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPEnergyEvseStateOfChargeAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26381,9 +32948,8 @@ void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPHepaFilterMonitoringEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseStateOfChargeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseStateOfChargeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26391,33 +32957,29 @@ void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        jint jnijavaValue                  = static_cast<jint>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoringAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseBatteryCapacityAttributeCallback::CHIPEnergyEvseBatteryCapacityAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterBatteryCapacityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26433,7 +32995,7 @@ CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoring
     }
 }
 
-CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitoringAttributeListAttributeCallback()
+CHIPEnergyEvseBatteryCapacityAttributeCallback::~CHIPEnergyEvseBatteryCapacityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26444,8 +33006,8 @@ CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitorin
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPEnergyEvseBatteryCapacityAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26453,9 +33015,8 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPHepaFilterMonitoringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPHepaFilterMonitoringAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseBatteryCapacityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseBatteryCapacityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26463,33 +33024,28 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        jlong jninewElement_0                 = static_cast<jlong>(entry_0);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseVehicleIDAttributeCallback::CHIPEnergyEvseVehicleIDAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterVehicleIDAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26505,8 +33061,7 @@ CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject java
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
+CHIPEnergyEvseVehicleIDAttributeCallback::~CHIPEnergyEvseVehicleIDAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26517,8 +33072,8 @@ CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPEnergyEvseVehicleIDAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::Nullable<chip::CharSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26526,8 +33081,8 @@ void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::Callba
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseVehicleIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseVehicleIDAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26535,7 +33090,7 @@ void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::Callba
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26545,21 +33100,14 @@ void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::Callba
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
-        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                    jnijavaValue, javaValue);
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(value.Value(), javaValue));
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn,
-                                                                                                                    this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseSessionIDAttributeCallback::CHIPEnergyEvseSessionIDAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterSessionIDAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26575,8 +33123,7 @@ CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobje
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
+CHIPEnergyEvseSessionIDAttributeCallback::~CHIPEnergyEvseSessionIDAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26587,10 +33134,7 @@ CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> & list)
+void CHIPEnergyEvseSessionIDAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26598,10 +33142,8 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseSessionIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseSessionIDAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26609,59 +33151,29 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_productIdentifierType;
-        std::string newElement_0_productIdentifierTypeClassName     = "java/lang/Integer";
-        std::string newElement_0_productIdentifierTypeCtorSignature = "(I)V";
-        jint jninewElement_0_productIdentifierType                  = static_cast<jint>(entry_0.productIdentifierType);
-        chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-            newElement_0_productIdentifierTypeClassName.c_str(), newElement_0_productIdentifierTypeCtorSignature.c_str(),
-            jninewElement_0_productIdentifierType, newElement_0_productIdentifierType);
-        jobject newElement_0_productIdentifierValue;
-        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.productIdentifierValue,
-                                                                             newElement_0_productIdentifierValue));
-
-        jclass replacementProductStructStructClass_1;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
-            replacementProductStructStructClass_1);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct");
-            return;
-        }
-        jmethodID replacementProductStructStructCtor_1 =
-            env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-        if (replacementProductStructStructCtor_1 == nullptr)
-        {
-            ChipLogError(Zcl,
-                         "Could not find ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
-                                      newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        jlong jnijavaValue                 = static_cast<jlong>(value.Value());
+        chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    jnijavaValue, javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseGeneratedCommandListAttributeCallback::CHIPEnergyEvseGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26677,8 +33189,7 @@ CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
+CHIPEnergyEvseGeneratedCommandListAttributeCallback::~CHIPEnergyEvseGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26689,7 +33200,7 @@ CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPEnergyEvseGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -26699,8 +33210,8 @@ void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::C
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26731,10 +33242,9 @@ void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::C
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseAcceptedCommandListAttributeCallback::CHIPEnergyEvseAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26750,8 +33260,7 @@ CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
+CHIPEnergyEvseAcceptedCommandListAttributeCallback::~CHIPEnergyEvseAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26762,7 +33271,7 @@ CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPEnergyEvseAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -26772,8 +33281,8 @@ void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::Ca
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26804,10 +33313,8 @@ void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::Ca
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseEventListAttributeCallback::CHIPEnergyEvseEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26823,7 +33330,7 @@ CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarb
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback()
+CHIPEnergyEvseEventListAttributeCallback::~CHIPEnergyEvseEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26834,8 +33341,8 @@ CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCar
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPEnergyEvseEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26844,8 +33351,8 @@ void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseEventListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26876,10 +33383,8 @@ void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPEnergyEvseAttributeListAttributeCallback::CHIPEnergyEvseAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEnergyEvseClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26895,8 +33400,7 @@ CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCa
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
+CHIPEnergyEvseAttributeListAttributeCallback::~CHIPEnergyEvseAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26907,8 +33411,8 @@ CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPEnergyEvseAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26917,8 +33421,8 @@ void CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::Callback
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEnergyEvseAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEnergyEvseAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
new file mode 100644
index 00000000000000..99db5abbfecc9f
--- /dev/null
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -0,0 +1,40492 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public class ChipClusters {
+
+  public interface DefaultClusterCallback {
+    void onSuccess();
+    void onError(Exception error);
+  }
+
+  public interface CharStringAttributeCallback {
+    /** Indicates a successful read for a CHAR_STRING attribute. */
+    void onSuccess(String value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface OctetStringAttributeCallback {
+    /** Indicates a successful read for an OCTET_STRING attribute. */
+    void onSuccess(byte[] value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface IntegerAttributeCallback {
+    void onSuccess(int value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface LongAttributeCallback {
+    void onSuccess(long value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface BooleanAttributeCallback {
+    void onSuccess(boolean value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface FloatAttributeCallback {
+    void onSuccess(float value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public interface DoubleAttributeCallback {
+    void onSuccess(double value);
+    void onError(Exception error);
+    default void onSubscriptionEstablished(long subscriptionId) {}
+  }
+
+  public static abstract class BaseChipCluster {
+    protected long chipClusterPtr;
+
+    public BaseChipCluster(long devicePtr, int endpointId) {
+      chipClusterPtr = initWithDevice(devicePtr, endpointId);
+    }
+
+    /**
+     * Sets the timeout, in milliseconds, after which commands sent through this cluster will fail
+     * with a timeout (regardless of whether or not a response has been received). If set to an
+     * empty optional, the default timeout will be used.
+     */
+    public void setCommandTimeout(Optional<Long> timeoutMillis) {
+      setCommandTimeout(chipClusterPtr, timeoutMillis);
+    }
+
+    private native void setCommandTimeout(long clusterPtr, Optional<Long> timeoutMillis);
+
+    /** Returns the current timeout (in milliseconds) for commands sent through this cluster. */
+    public Optional<Long> getCommandTimeout() {
+      Optional<Long> timeout = getCommandTimeout(chipClusterPtr);
+      return timeout == null ? Optional.empty() : timeout;
+    }
+
+    private native Optional<Long> getCommandTimeout(long clusterPtr);
+
+    public abstract long initWithDevice(long devicePtr, int endpointId);
+
+    public native void deleteCluster(long chipClusterPtr);
+    
+    @SuppressWarnings("deprecation")
+    protected void finalize() throws Throwable {
+      super.finalize();
+
+      if (chipClusterPtr != 0) {
+        deleteCluster(chipClusterPtr);
+        chipClusterPtr = 0;
+      }
+    }
+  }
+
+  public static class IdentifyCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000003L;
+
+    public IdentifyCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void identify(DefaultClusterCallback callback
+      , Integer identifyTime) {
+      identify(chipClusterPtr, callback, identifyTime, null);
+    }
+
+    public void identify(DefaultClusterCallback callback
+      , Integer identifyTime
+      , int timedInvokeTimeoutMs) {
+      identify(chipClusterPtr, callback, identifyTime, timedInvokeTimeoutMs);
+    }
+
+    public void triggerEffect(DefaultClusterCallback callback
+      , Integer effectIdentifier, Integer effectVariant) {
+      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
+    }
+
+    public void triggerEffect(DefaultClusterCallback callback
+      , Integer effectIdentifier, Integer effectVariant
+      , int timedInvokeTimeoutMs) {
+      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
+    }
+    private native void identify(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer identifyTime
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void triggerEffect(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer effectIdentifier, Integer effectVariant
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readIdentifyTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readIdentifyTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeIdentifyTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeIdentifyTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readIdentifyTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readIdentifyTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeIdentifyTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeIdentifyTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readIdentifyTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeIdentifyTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeIdentifyTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readIdentifyTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeIdentifyTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class GroupsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000004L;
+
+    public GroupsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void addGroup(AddGroupResponseCallback callback
+      , Integer groupID, String groupName) {
+      addGroup(chipClusterPtr, callback, groupID, groupName, null);
+    }
+
+    public void addGroup(AddGroupResponseCallback callback
+      , Integer groupID, String groupName
+      , int timedInvokeTimeoutMs) {
+      addGroup(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
+    }
+
+    public void viewGroup(ViewGroupResponseCallback callback
+      , Integer groupID) {
+      viewGroup(chipClusterPtr, callback, groupID, null);
+    }
+
+    public void viewGroup(ViewGroupResponseCallback callback
+      , Integer groupID
+      , int timedInvokeTimeoutMs) {
+      viewGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+    }
+
+    public void getGroupMembership(GetGroupMembershipResponseCallback callback
+      , ArrayList<Integer> groupList) {
+      getGroupMembership(chipClusterPtr, callback, groupList, null);
+    }
+
+    public void getGroupMembership(GetGroupMembershipResponseCallback callback
+      , ArrayList<Integer> groupList
+      , int timedInvokeTimeoutMs) {
+      getGroupMembership(chipClusterPtr, callback, groupList, timedInvokeTimeoutMs);
+    }
+
+    public void removeGroup(RemoveGroupResponseCallback callback
+      , Integer groupID) {
+      removeGroup(chipClusterPtr, callback, groupID, null);
+    }
+
+    public void removeGroup(RemoveGroupResponseCallback callback
+      , Integer groupID
+      , int timedInvokeTimeoutMs) {
+      removeGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+    }
+
+    public void removeAllGroups(DefaultClusterCallback callback
+      ) {
+      removeAllGroups(chipClusterPtr, callback, null);
+    }
+
+    public void removeAllGroups(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      removeAllGroups(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void addGroupIfIdentifying(DefaultClusterCallback callback
+      , Integer groupID, String groupName) {
+      addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, null);
+    }
+
+    public void addGroupIfIdentifying(DefaultClusterCallback callback
+      , Integer groupID, String groupName
+      , int timedInvokeTimeoutMs) {
+      addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
+    }
+    private native void addGroup(long chipClusterPtr, AddGroupResponseCallback Callback
+      , Integer groupID, String groupName
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void viewGroup(long chipClusterPtr, ViewGroupResponseCallback Callback
+      , Integer groupID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getGroupMembership(long chipClusterPtr, GetGroupMembershipResponseCallback Callback
+      , ArrayList<Integer> groupList
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeGroup(long chipClusterPtr, RemoveGroupResponseCallback Callback
+      , Integer groupID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeAllGroups(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addGroupIfIdentifying(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer groupID, String groupName
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface AddGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupID);
+
+      void onError(Exception error);
+    }
+
+    public interface ViewGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupID, String groupName);
+
+      void onError(Exception error);
+    }
+
+    public interface GetGroupMembershipResponseCallback {
+      void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupID);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readNameSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNameSupportAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNameSupportAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readNameSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNameSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ScenesCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000005L;
+
+    public ScenesCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void addScene(AddSceneResponseCallback callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
+      addScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, null);
+    }
+
+    public void addScene(AddSceneResponseCallback callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets
+      , int timedInvokeTimeoutMs) {
+      addScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, timedInvokeTimeoutMs);
+    }
+
+    public void viewScene(ViewSceneResponseCallback callback
+      , Integer groupID, Integer sceneID) {
+      viewScene(chipClusterPtr, callback, groupID, sceneID, null);
+    }
+
+    public void viewScene(ViewSceneResponseCallback callback
+      , Integer groupID, Integer sceneID
+      , int timedInvokeTimeoutMs) {
+      viewScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+    }
+
+    public void removeScene(RemoveSceneResponseCallback callback
+      , Integer groupID, Integer sceneID) {
+      removeScene(chipClusterPtr, callback, groupID, sceneID, null);
+    }
+
+    public void removeScene(RemoveSceneResponseCallback callback
+      , Integer groupID, Integer sceneID
+      , int timedInvokeTimeoutMs) {
+      removeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+    }
+
+    public void removeAllScenes(RemoveAllScenesResponseCallback callback
+      , Integer groupID) {
+      removeAllScenes(chipClusterPtr, callback, groupID, null);
+    }
+
+    public void removeAllScenes(RemoveAllScenesResponseCallback callback
+      , Integer groupID
+      , int timedInvokeTimeoutMs) {
+      removeAllScenes(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+    }
+
+    public void storeScene(StoreSceneResponseCallback callback
+      , Integer groupID, Integer sceneID) {
+      storeScene(chipClusterPtr, callback, groupID, sceneID, null);
+    }
+
+    public void storeScene(StoreSceneResponseCallback callback
+      , Integer groupID, Integer sceneID
+      , int timedInvokeTimeoutMs) {
+      storeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+    }
+
+    public void recallScene(DefaultClusterCallback callback
+      , Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime) {
+      recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, null);
+    }
+
+    public void recallScene(DefaultClusterCallback callback
+      , Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime
+      , int timedInvokeTimeoutMs) {
+      recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, timedInvokeTimeoutMs);
+    }
+
+    public void getSceneMembership(GetSceneMembershipResponseCallback callback
+      , Integer groupID) {
+      getSceneMembership(chipClusterPtr, callback, groupID, null);
+    }
+
+    public void getSceneMembership(GetSceneMembershipResponseCallback callback
+      , Integer groupID
+      , int timedInvokeTimeoutMs) {
+      getSceneMembership(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedAddScene(EnhancedAddSceneResponseCallback callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
+      enhancedAddScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, null);
+    }
+
+    public void enhancedAddScene(EnhancedAddSceneResponseCallback callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets
+      , int timedInvokeTimeoutMs) {
+      enhancedAddScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, sceneName, extensionFieldSets, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedViewScene(EnhancedViewSceneResponseCallback callback
+      , Integer groupID, Integer sceneID) {
+      enhancedViewScene(chipClusterPtr, callback, groupID, sceneID, null);
+    }
+
+    public void enhancedViewScene(EnhancedViewSceneResponseCallback callback
+      , Integer groupID, Integer sceneID
+      , int timedInvokeTimeoutMs) {
+      enhancedViewScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs);
+    }
+
+    public void copyScene(CopySceneResponseCallback callback
+      , Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo) {
+      copyScene(chipClusterPtr, callback, mode, groupIdentifierFrom, sceneIdentifierFrom, groupIdentifierTo, sceneIdentifierTo, null);
+    }
+
+    public void copyScene(CopySceneResponseCallback callback
+      , Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo
+      , int timedInvokeTimeoutMs) {
+      copyScene(chipClusterPtr, callback, mode, groupIdentifierFrom, sceneIdentifierFrom, groupIdentifierTo, sceneIdentifierTo, timedInvokeTimeoutMs);
+    }
+    private native void addScene(long chipClusterPtr, AddSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void viewScene(long chipClusterPtr, ViewSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeScene(long chipClusterPtr, RemoveSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeAllScenes(long chipClusterPtr, RemoveAllScenesResponseCallback Callback
+      , Integer groupID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void storeScene(long chipClusterPtr, StoreSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void recallScene(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer groupID, Integer sceneID, @Nullable Optional<Integer> transitionTime
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getSceneMembership(long chipClusterPtr, GetSceneMembershipResponseCallback Callback
+      , Integer groupID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedAddScene(long chipClusterPtr, EnhancedAddSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID, Integer transitionTime, String sceneName, ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedViewScene(long chipClusterPtr, EnhancedViewSceneResponseCallback Callback
+      , Integer groupID, Integer sceneID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void copyScene(long chipClusterPtr, CopySceneResponseCallback Callback
+      , Integer mode, Integer groupIdentifierFrom, Integer sceneIdentifierFrom, Integer groupIdentifierTo, Integer sceneIdentifierTo
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface AddSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID);
+
+      void onError(Exception error);
+    }
+
+    public interface ViewSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveAllScenesResponseCallback {
+      void onSuccess(Integer status, Integer groupID);
+
+      void onError(Exception error);
+    }
+
+    public interface StoreSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID);
+
+      void onError(Exception error);
+    }
+
+    public interface GetSceneMembershipResponseCallback {
+      void onSuccess(Integer status, @Nullable Integer capacity, Integer groupID, Optional<ArrayList<Integer>> sceneList);
+
+      void onError(Exception error);
+    }
+
+    public interface EnhancedAddSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID);
+
+      void onError(Exception error);
+    }
+
+    public interface EnhancedViewSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
+
+      void onError(Exception error);
+    }
+
+    public interface CopySceneResponseCallback {
+      void onSuccess(Integer status, Integer groupIdentifierFrom, Integer sceneIdentifierFrom);
+
+      void onError(Exception error);
+    }
+
+
+      public interface LastConfiguredByAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSceneCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSceneCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSceneCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSceneCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentSceneAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentSceneAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentSceneAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentSceneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentGroupAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentGroupAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentGroupAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentGroupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSceneValidAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readSceneValidAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSceneValidAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSceneValidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNameSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNameSupportAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNameSupportAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastConfiguredByAttribute(
+      LastConfiguredByAttributeCallback callback
+    ) {
+      readLastConfiguredByAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLastConfiguredByAttribute(
+        LastConfiguredByAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastConfiguredByAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSceneTableSizeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSceneTableSizeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSceneTableSizeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSceneTableSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRemainingCapacityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRemainingCapacityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRemainingCapacityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRemainingCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSceneCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSceneCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentSceneAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentSceneAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentGroupAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentGroupAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSceneValidAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeSceneValidAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNameSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNameSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLastConfiguredByAttribute(long chipClusterPtr,
+        LastConfiguredByAttributeCallback callback
+    );
+    private native void subscribeLastConfiguredByAttribute(long chipClusterPtr,
+        LastConfiguredByAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSceneTableSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSceneTableSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRemainingCapacityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRemainingCapacityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OnOffCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000006L;
+
+    public OnOffCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void off(DefaultClusterCallback callback
+      ) {
+      off(chipClusterPtr, callback, null);
+    }
+
+    public void off(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      off(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void on(DefaultClusterCallback callback
+      ) {
+      on(chipClusterPtr, callback, null);
+    }
+
+    public void on(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      on(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void toggle(DefaultClusterCallback callback
+      ) {
+      toggle(chipClusterPtr, callback, null);
+    }
+
+    public void toggle(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      toggle(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void offWithEffect(DefaultClusterCallback callback
+      , Integer effectIdentifier, Integer effectVariant) {
+      offWithEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
+    }
+
+    public void offWithEffect(DefaultClusterCallback callback
+      , Integer effectIdentifier, Integer effectVariant
+      , int timedInvokeTimeoutMs) {
+      offWithEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
+    }
+
+    public void onWithRecallGlobalScene(DefaultClusterCallback callback
+      ) {
+      onWithRecallGlobalScene(chipClusterPtr, callback, null);
+    }
+
+    public void onWithRecallGlobalScene(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      onWithRecallGlobalScene(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void onWithTimedOff(DefaultClusterCallback callback
+      , Integer onOffControl, Integer onTime, Integer offWaitTime) {
+      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, null);
+    }
+
+    public void onWithTimedOff(DefaultClusterCallback callback
+      , Integer onOffControl, Integer onTime, Integer offWaitTime
+      , int timedInvokeTimeoutMs) {
+      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, timedInvokeTimeoutMs);
+    }
+    private native void off(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void on(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void toggle(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void offWithEffect(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer effectIdentifier, Integer effectVariant
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void onWithRecallGlobalScene(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void onWithTimedOff(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer onOffControl, Integer onTime, Integer offWaitTime
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface StartUpOnOffAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readOnOffAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readOnOffAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOnOffAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGlobalSceneControlAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readGlobalSceneControlAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGlobalSceneControlAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeGlobalSceneControlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOnTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOnTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOffWaitTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOffWaitTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOffWaitTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOffWaitTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpOnOffAttribute(
+      StartUpOnOffAttributeCallback callback
+    ) {
+      readStartUpOnOffAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpOnOffAttribute(
+        StartUpOnOffAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readOnOffAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeOnOffAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGlobalSceneControlAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeGlobalSceneControlAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOnTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOnTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOffWaitTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOffWaitTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOffWaitTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpOnOffAttribute(long chipClusterPtr,
+        StartUpOnOffAttributeCallback callback
+    );
+
+    private native void writeStartUpOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpOnOffAttribute(long chipClusterPtr,
+        StartUpOnOffAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000007L;
+
+    public OnOffSwitchConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSwitchTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSwitchTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSwitchTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSwitchTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSwitchActionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSwitchActionsAttribute(chipClusterPtr, callback);
+    }
+    public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSwitchActionsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSwitchActionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSwitchActionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSwitchActionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSwitchTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSwitchTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSwitchActionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeSwitchActionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSwitchActionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class LevelControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000008L;
+
+    public LevelControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void moveToLevel(DefaultClusterCallback callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToLevel(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToLevel(DefaultClusterCallback callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToLevel(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void move(DefaultClusterCallback callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride) {
+      move(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    }
+
+    public void move(DefaultClusterCallback callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      move(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void step(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void step(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stop(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride) {
+      stop(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+    }
+
+    public void stop(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stop(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToLevelWithOnOff(DefaultClusterCallback callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToLevelWithOnOff(DefaultClusterCallback callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveWithOnOff(DefaultClusterCallback callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    }
+
+    public void moveWithOnOff(DefaultClusterCallback callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stepWithOnOff(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void stepWithOnOff(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stopWithOnOff(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride) {
+      stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+    }
+
+    public void stopWithOnOff(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToClosestFrequency(DefaultClusterCallback callback
+      , Integer frequency) {
+      moveToClosestFrequency(chipClusterPtr, callback, frequency, null);
+    }
+
+    public void moveToClosestFrequency(DefaultClusterCallback callback
+      , Integer frequency
+      , int timedInvokeTimeoutMs) {
+      moveToClosestFrequency(chipClusterPtr, callback, frequency, timedInvokeTimeoutMs);
+    }
+    private native void moveToLevel(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void move(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void step(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stop(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToLevelWithOnOff(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer level, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveWithOnOff(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, @Nullable Integer rate, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stepWithOnOff(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, @Nullable Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToClosestFrequency(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer frequency
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface CurrentLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnTransitionTimeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OffTransitionTimeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DefaultMoveRateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpCurrentLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readCurrentLevelAttribute(
+      CurrentLevelAttributeCallback callback
+    ) {
+      readCurrentLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentLevelAttribute(
+        CurrentLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRemainingTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRemainingTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRemainingTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentFrequencyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentFrequencyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinFrequencyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinFrequencyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxFrequencyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxFrequencyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOptionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOptionsAttribute(chipClusterPtr, callback);
+    }
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOptionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnOffTransitionTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnOffTransitionTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOnOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnLevelAttribute(
+      OnLevelAttributeCallback callback
+    ) {
+      readOnLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnLevelAttribute(
+        OnLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnTransitionTimeAttribute(
+      OnTransitionTimeAttributeCallback callback
+    ) {
+      readOnTransitionTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnTransitionTimeAttribute(
+        OnTransitionTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOffTransitionTimeAttribute(
+      OffTransitionTimeAttributeCallback callback
+    ) {
+      readOffTransitionTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOffTransitionTimeAttribute(
+        OffTransitionTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDefaultMoveRateAttribute(
+      DefaultMoveRateAttributeCallback callback
+    ) {
+      readDefaultMoveRateAttribute(chipClusterPtr, callback);
+    }
+    public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeDefaultMoveRateAttribute(
+        DefaultMoveRateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDefaultMoveRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpCurrentLevelAttribute(
+      StartUpCurrentLevelAttributeCallback callback
+    ) {
+      readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpCurrentLevelAttribute(
+        StartUpCurrentLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readCurrentLevelAttribute(long chipClusterPtr,
+        CurrentLevelAttributeCallback callback
+    );
+    private native void subscribeCurrentLevelAttribute(long chipClusterPtr,
+        CurrentLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRemainingTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRemainingTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMinFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOptionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOptionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOnOffTransitionTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOnOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnOffTransitionTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOnLevelAttribute(long chipClusterPtr,
+        OnLevelAttributeCallback callback
+    );
+
+    private native void writeOnLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnLevelAttribute(long chipClusterPtr,
+        OnLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnTransitionTimeAttribute(long chipClusterPtr,
+        OnTransitionTimeAttributeCallback callback
+    );
+
+    private native void writeOnTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnTransitionTimeAttribute(long chipClusterPtr,
+        OnTransitionTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOffTransitionTimeAttribute(long chipClusterPtr,
+        OffTransitionTimeAttributeCallback callback
+    );
+
+    private native void writeOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOffTransitionTimeAttribute(long chipClusterPtr,
+        OffTransitionTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDefaultMoveRateAttribute(long chipClusterPtr,
+        DefaultMoveRateAttributeCallback callback
+    );
+
+    private native void writeDefaultMoveRateAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeDefaultMoveRateAttribute(long chipClusterPtr,
+        DefaultMoveRateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readStartUpCurrentLevelAttribute(long chipClusterPtr,
+        StartUpCurrentLevelAttributeCallback callback
+    );
+
+    private native void writeStartUpCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpCurrentLevelAttribute(long chipClusterPtr,
+        StartUpCurrentLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BinaryInputBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000000FL;
+
+    public BinaryInputBasicCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readActiveTextAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readActiveTextAttribute(chipClusterPtr, callback);
+    }
+    public void writeActiveTextAttribute(DefaultClusterCallback callback, String value) {
+      writeActiveTextAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeActiveTextAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeActiveTextAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeActiveTextAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDescriptionAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readDescriptionAttribute(chipClusterPtr, callback);
+    }
+    public void writeDescriptionAttribute(DefaultClusterCallback callback, String value) {
+      writeDescriptionAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeDescriptionAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeDescriptionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInactiveTextAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readInactiveTextAttribute(chipClusterPtr, callback);
+    }
+    public void writeInactiveTextAttribute(DefaultClusterCallback callback, String value) {
+      writeInactiveTextAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInactiveTextAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeInactiveTextAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInactiveTextAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInactiveTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOutOfServiceAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readOutOfServiceAttribute(chipClusterPtr, callback);
+    }
+    public void writeOutOfServiceAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeOutOfServiceAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOutOfServiceAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeOutOfServiceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOutOfServiceAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOutOfServiceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPolarityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPolarityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePolarityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePolarityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPresentValueAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readPresentValueAttribute(chipClusterPtr, callback);
+    }
+    public void writePresentValueAttribute(DefaultClusterCallback callback, Boolean value) {
+      writePresentValueAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePresentValueAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writePresentValueAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePresentValueAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePresentValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReliabilityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReliabilityAttribute(chipClusterPtr, callback);
+    }
+    public void writeReliabilityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeReliabilityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeReliabilityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeReliabilityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeReliabilityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReliabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStatusFlagsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStatusFlagsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStatusFlagsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStatusFlagsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApplicationTypeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readApplicationTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApplicationTypeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApplicationTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readActiveTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeActiveTextAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeActiveTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeDescriptionAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInactiveTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeInactiveTextAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInactiveTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOutOfServiceAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeOutOfServiceAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOutOfServiceAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPolarityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePolarityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPresentValueAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePresentValueAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReliabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeReliabilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeReliabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStatusFlagsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeStatusFlagsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApplicationTypeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeApplicationTypeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class PulseWidthModulationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000001CL;
+
+    public PulseWidthModulationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class DescriptorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000001DL;
+
+    public DescriptorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface DeviceTypeListAttributeCallback {
+        void onSuccess( List<ChipStructs.DescriptorClusterDeviceTypeStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ServerListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ClientListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PartsListAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TagListAttributeCallback {
+        void onSuccess( List<ChipStructs.DescriptorClusterSemanticTagStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readDeviceTypeListAttribute(
+      DeviceTypeListAttributeCallback callback
+    ) {
+      readDeviceTypeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDeviceTypeListAttribute(
+        DeviceTypeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDeviceTypeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readServerListAttribute(
+      ServerListAttributeCallback callback
+    ) {
+      readServerListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeServerListAttribute(
+        ServerListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeServerListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClientListAttribute(
+      ClientListAttributeCallback callback
+    ) {
+      readClientListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClientListAttribute(
+        ClientListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeClientListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartsListAttribute(
+      PartsListAttributeCallback callback
+    ) {
+      readPartsListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePartsListAttribute(
+        PartsListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePartsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTagListAttribute(
+      TagListAttributeCallback callback
+    ) {
+      readTagListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTagListAttribute(
+        TagListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTagListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readDeviceTypeListAttribute(long chipClusterPtr,
+        DeviceTypeListAttributeCallback callback
+    );
+    private native void subscribeDeviceTypeListAttribute(long chipClusterPtr,
+        DeviceTypeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readServerListAttribute(long chipClusterPtr,
+        ServerListAttributeCallback callback
+    );
+    private native void subscribeServerListAttribute(long chipClusterPtr,
+        ServerListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readClientListAttribute(long chipClusterPtr,
+        ClientListAttributeCallback callback
+    );
+    private native void subscribeClientListAttribute(long chipClusterPtr,
+        ClientListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPartsListAttribute(long chipClusterPtr,
+        PartsListAttributeCallback callback
+    );
+    private native void subscribePartsListAttribute(long chipClusterPtr,
+        PartsListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTagListAttribute(long chipClusterPtr,
+        TagListAttributeCallback callback
+    );
+    private native void subscribeTagListAttribute(long chipClusterPtr,
+        TagListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BindingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000001EL;
+
+    public BindingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface BindingAttributeCallback {
+        void onSuccess( List<ChipStructs.BindingClusterTargetStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readBindingAttribute(
+      BindingAttributeCallback callback
+    ) {
+      readBindingAttribute(chipClusterPtr, callback, true);
+    }
+    public void readBindingAttributeWithFabricFilter(
+      BindingAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readBindingAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeBindingAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value) {
+      writeBindingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBindingAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value, int timedWriteTimeoutMs) {
+      writeBindingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBindingAttribute(
+        BindingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBindingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readBindingAttribute(long chipClusterPtr,
+        BindingAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeBindingAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBindingAttribute(long chipClusterPtr,
+        BindingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class AccessControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000001FL;
+
+    public AccessControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface AclAttributeCallback {
+        void onSuccess( List<ChipStructs.AccessControlClusterAccessControlEntryStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ExtensionAttributeCallback {
+        void onSuccess( List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readAclAttribute(
+      AclAttributeCallback callback
+    ) {
+      readAclAttribute(chipClusterPtr, callback, true);
+    }
+    public void readAclAttributeWithFabricFilter(
+      AclAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readAclAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeAclAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value) {
+      writeAclAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAclAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value, int timedWriteTimeoutMs) {
+      writeAclAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAclAttribute(
+        AclAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAclAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readExtensionAttribute(
+      ExtensionAttributeCallback callback
+    ) {
+      readExtensionAttribute(chipClusterPtr, callback, true);
+    }
+    public void readExtensionAttributeWithFabricFilter(
+      ExtensionAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readExtensionAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeExtensionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value) {
+      writeExtensionAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeExtensionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value, int timedWriteTimeoutMs) {
+      writeExtensionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeExtensionAttribute(
+        ExtensionAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeExtensionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSubjectsPerAccessControlEntryAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSubjectsPerAccessControlEntryAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTargetsPerAccessControlEntryAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetsPerAccessControlEntryAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAccessControlEntriesPerFabricAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAccessControlEntriesPerFabricAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readAclAttribute(long chipClusterPtr,
+        AclAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeAclAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAclAttribute(long chipClusterPtr,
+        AclAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readExtensionAttribute(long chipClusterPtr,
+        ExtensionAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeExtensionAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeExtensionAttribute(long chipClusterPtr,
+        ExtensionAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSubjectsPerAccessControlEntryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSubjectsPerAccessControlEntryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTargetsPerAccessControlEntryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTargetsPerAccessControlEntryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAccessControlEntriesPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAccessControlEntriesPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ActionsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000025L;
+
+    public ActionsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void instantAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      instantAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void instantAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      instantAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void instantActionWithTransition(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Integer transitionTime) {
+      instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime, null);
+    }
+
+    public void instantActionWithTransition(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Integer transitionTime
+      , int timedInvokeTimeoutMs) {
+      instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime, timedInvokeTimeoutMs);
+    }
+
+    public void startAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      startAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void startAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      startAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void startActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration) {
+      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    }
+
+    public void startActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , int timedInvokeTimeoutMs) {
+      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    }
+
+    public void stopAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      stopAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void stopAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      stopAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void pauseAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      pauseAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void pauseAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      pauseAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void pauseActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration) {
+      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    }
+
+    public void pauseActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , int timedInvokeTimeoutMs) {
+      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    }
+
+    public void resumeAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      resumeAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void resumeAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      resumeAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void enableAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      enableAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void enableAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      enableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void enableActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration) {
+      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    }
+
+    public void enableActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , int timedInvokeTimeoutMs) {
+      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    }
+
+    public void disableAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID) {
+      disableAction(chipClusterPtr, callback, actionID, invokeID, null);
+    }
+
+    public void disableAction(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID
+      , int timedInvokeTimeoutMs) {
+      disableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
+
+    public void disableActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration) {
+      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    }
+
+    public void disableActionWithDuration(DefaultClusterCallback callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , int timedInvokeTimeoutMs) {
+      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    }
+    private native void instantAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void instantActionWithTransition(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID, Integer transitionTime
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void startAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void startActionWithDuration(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stopAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void pauseAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void pauseActionWithDuration(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void resumeAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enableAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enableActionWithDuration(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void disableAction(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void disableActionWithDuration(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer actionID, Optional<Long> invokeID, Long duration
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface ActionListAttributeCallback {
+        void onSuccess( List<ChipStructs.ActionsClusterActionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EndpointListsAttributeCallback {
+        void onSuccess( List<ChipStructs.ActionsClusterEndpointListStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readActionListAttribute(
+      ActionListAttributeCallback callback
+    ) {
+      readActionListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActionListAttribute(
+        ActionListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActionListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEndpointListsAttribute(
+      EndpointListsAttributeCallback callback
+    ) {
+      readEndpointListsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEndpointListsAttribute(
+        EndpointListsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEndpointListsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSetupURLAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readSetupURLAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSetupURLAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSetupURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readActionListAttribute(long chipClusterPtr,
+        ActionListAttributeCallback callback
+    );
+    private native void subscribeActionListAttribute(long chipClusterPtr,
+        ActionListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEndpointListsAttribute(long chipClusterPtr,
+        EndpointListsAttributeCallback callback
+    );
+    private native void subscribeEndpointListsAttribute(long chipClusterPtr,
+        EndpointListsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSetupURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeSetupURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BasicInformationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000028L;
+
+    public BasicInformationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void mfgSpecificPing(DefaultClusterCallback callback
+      ) {
+      mfgSpecificPing(chipClusterPtr, callback, null);
+    }
+
+    public void mfgSpecificPing(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      mfgSpecificPing(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void mfgSpecificPing(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readDataModelRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDataModelRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDataModelRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDataModelRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readVendorNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVendorIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readVendorIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorIDAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readProductIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductIDAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNodeLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readNodeLabelAttribute(chipClusterPtr, callback);
+    }
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNodeLabelAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocationAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readLocationAttribute(chipClusterPtr, callback);
+    }
+    public void writeLocationAttribute(DefaultClusterCallback callback, String value) {
+      writeLocationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocationAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLocationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLocationAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLocationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readHardwareVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHardwareVersionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHardwareVersionStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSoftwareVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSoftwareVersionAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSoftwareVersionStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readManufacturingDateAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readManufacturingDateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeManufacturingDateAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readPartNumberAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePartNumberAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductURLAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductURLAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductURLAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductLabelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductLabelAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSerialNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readSerialNumberAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSerialNumberAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocalConfigDisabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readLocalConfigDisabledAttribute(chipClusterPtr, callback);
+    }
+    public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLocalConfigDisabledAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLocalConfigDisabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReachableAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readReachableAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReachableAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUniqueIDAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readUniqueIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUniqueIDAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readDataModelRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDataModelRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeProductIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNodeLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeNodeLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNodeLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLocationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeLocationAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLocationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeHardwareVersionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeHardwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeSoftwareVersionAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeSoftwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readManufacturingDateAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeManufacturingDateAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPartNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribePartNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSerialNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeSerialNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLocalConfigDisabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeLocalConfigDisabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLocalConfigDisabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReachableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeReachableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUniqueIDAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeUniqueIDAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000029L;
+
+    public OtaSoftwareUpdateProviderCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void queryImage(QueryImageResponseCallback callback
+      , Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider) {
+      queryImage(chipClusterPtr, callback, vendorID, productID, softwareVersion, protocolsSupported, hardwareVersion, location, requestorCanConsent, metadataForProvider, null);
+    }
+
+    public void queryImage(QueryImageResponseCallback callback
+      , Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider
+      , int timedInvokeTimeoutMs) {
+      queryImage(chipClusterPtr, callback, vendorID, productID, softwareVersion, protocolsSupported, hardwareVersion, location, requestorCanConsent, metadataForProvider, timedInvokeTimeoutMs);
+    }
+
+    public void applyUpdateRequest(ApplyUpdateResponseCallback callback
+      , byte[] updateToken, Long newVersion) {
+      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, null);
+    }
+
+    public void applyUpdateRequest(ApplyUpdateResponseCallback callback
+      , byte[] updateToken, Long newVersion
+      , int timedInvokeTimeoutMs) {
+      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, timedInvokeTimeoutMs);
+    }
+
+    public void notifyUpdateApplied(DefaultClusterCallback callback
+      , byte[] updateToken, Long softwareVersion) {
+      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, null);
+    }
+
+    public void notifyUpdateApplied(DefaultClusterCallback callback
+      , byte[] updateToken, Long softwareVersion
+      , int timedInvokeTimeoutMs) {
+      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, timedInvokeTimeoutMs);
+    }
+    private native void queryImage(long chipClusterPtr, QueryImageResponseCallback Callback
+      , Integer vendorID, Integer productID, Long softwareVersion, ArrayList<Integer> protocolsSupported, Optional<Integer> hardwareVersion, Optional<String> location, Optional<Boolean> requestorCanConsent, Optional<byte[]> metadataForProvider
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void applyUpdateRequest(long chipClusterPtr, ApplyUpdateResponseCallback Callback
+      , byte[] updateToken, Long newVersion
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void notifyUpdateApplied(long chipClusterPtr, DefaultClusterCallback Callback
+      , byte[] updateToken, Long softwareVersion
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface QueryImageResponseCallback {
+      void onSuccess(Integer status, Optional<Long> delayedActionTime, Optional<String> imageURI, Optional<Long> softwareVersion, Optional<String> softwareVersionString, Optional<byte[]> updateToken, Optional<Boolean> userConsentNeeded, Optional<byte[]> metadataForRequestor);
+
+      void onError(Exception error);
+    }
+
+    public interface ApplyUpdateResponseCallback {
+      void onSuccess(Integer action, Long delayedActionTime);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002AL;
+
+    public OtaSoftwareUpdateRequestorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void announceOTAProvider(DefaultClusterCallback callback
+      , Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint) {
+      announceOTAProvider(chipClusterPtr, callback, providerNodeID, vendorID, announcementReason, metadataForNode, endpoint, null);
+    }
+
+    public void announceOTAProvider(DefaultClusterCallback callback
+      , Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint
+      , int timedInvokeTimeoutMs) {
+      announceOTAProvider(chipClusterPtr, callback, providerNodeID, vendorID, announcementReason, metadataForNode, endpoint, timedInvokeTimeoutMs);
+    }
+    private native void announceOTAProvider(long chipClusterPtr, DefaultClusterCallback Callback
+      , Long providerNodeID, Integer vendorID, Integer announcementReason, Optional<byte[]> metadataForNode, Integer endpoint
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface DefaultOTAProvidersAttributeCallback {
+        void onSuccess( List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface UpdateStateProgressAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readDefaultOTAProvidersAttribute(
+      DefaultOTAProvidersAttributeCallback callback
+    ) {
+      readDefaultOTAProvidersAttribute(chipClusterPtr, callback, true);
+    }
+    public void readDefaultOTAProvidersAttributeWithFabricFilter(
+      DefaultOTAProvidersAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readDefaultOTAProvidersAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value) {
+      writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value, int timedWriteTimeoutMs) {
+      writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeDefaultOTAProvidersAttribute(
+        DefaultOTAProvidersAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDefaultOTAProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUpdatePossibleAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readUpdatePossibleAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUpdatePossibleAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUpdatePossibleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUpdateStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUpdateStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUpdateStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUpdateStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUpdateStateProgressAttribute(
+      UpdateStateProgressAttributeCallback callback
+    ) {
+      readUpdateStateProgressAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUpdateStateProgressAttribute(
+        UpdateStateProgressAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeUpdateStateProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readDefaultOTAProvidersAttribute(long chipClusterPtr,
+        DefaultOTAProvidersAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeDefaultOTAProvidersAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeDefaultOTAProvidersAttribute(long chipClusterPtr,
+        DefaultOTAProvidersAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readUpdatePossibleAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeUpdatePossibleAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUpdateStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeUpdateStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUpdateStateProgressAttribute(long chipClusterPtr,
+        UpdateStateProgressAttributeCallback callback
+    );
+    private native void subscribeUpdateStateProgressAttribute(long chipClusterPtr,
+        UpdateStateProgressAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class LocalizationConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002BL;
+
+    public LocalizationConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface SupportedLocalesAttributeCallback {
+        void onSuccess( List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readActiveLocaleAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readActiveLocaleAttribute(chipClusterPtr, callback);
+    }
+    public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value) {
+      writeActiveLocaleAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeActiveLocaleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeActiveLocaleAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveLocaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedLocalesAttribute(
+      SupportedLocalesAttributeCallback callback
+    ) {
+      readSupportedLocalesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedLocalesAttribute(
+        SupportedLocalesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedLocalesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readActiveLocaleAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeActiveLocaleAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeActiveLocaleAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedLocalesAttribute(long chipClusterPtr,
+        SupportedLocalesAttributeCallback callback
+    );
+    private native void subscribeSupportedLocalesAttribute(long chipClusterPtr,
+        SupportedLocalesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TimeFormatLocalizationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002CL;
+
+    public TimeFormatLocalizationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface SupportedCalendarTypesAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readHourFormatAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readHourFormatAttribute(chipClusterPtr, callback);
+    }
+    public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value) {
+      writeHourFormatAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeHourFormatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeHourFormatAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHourFormatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveCalendarTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActiveCalendarTypeAttribute(chipClusterPtr, callback);
+    }
+    public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeActiveCalendarTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveCalendarTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedCalendarTypesAttribute(
+      SupportedCalendarTypesAttributeCallback callback
+    ) {
+      readSupportedCalendarTypesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedCalendarTypesAttribute(
+        SupportedCalendarTypesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedCalendarTypesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readHourFormatAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeHourFormatAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeHourFormatAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveCalendarTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeActiveCalendarTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeActiveCalendarTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedCalendarTypesAttribute(long chipClusterPtr,
+        SupportedCalendarTypesAttributeCallback callback
+    );
+    private native void subscribeSupportedCalendarTypesAttribute(long chipClusterPtr,
+        SupportedCalendarTypesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class UnitLocalizationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002DL;
+
+    public UnitLocalizationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readTemperatureUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTemperatureUnitAttribute(chipClusterPtr, callback);
+    }
+    public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeTemperatureUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTemperatureUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTemperatureUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeTemperatureUnitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTemperatureUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class PowerSourceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002EL;
+
+    public PowerSourceConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface SourcesAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSourcesAttribute(
+      SourcesAttributeCallback callback
+    ) {
+      readSourcesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSourcesAttribute(
+        SourcesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSourcesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSourcesAttribute(long chipClusterPtr,
+        SourcesAttributeCallback callback
+    );
+    private native void subscribeSourcesAttribute(long chipClusterPtr,
+        SourcesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class PowerSourceCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000002FL;
+
+    public PowerSourceCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface WiredAssessedInputVoltageAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface WiredAssessedInputFrequencyAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface WiredAssessedCurrentAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveWiredFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BatVoltageAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BatPercentRemainingAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BatTimeRemainingAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveBatFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BatTimeToFullChargeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BatChargingCurrentAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveBatChargeFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EndpointListAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOrderAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOrderAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOrderAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOrderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDescriptionAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readDescriptionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredAssessedInputVoltageAttribute(
+      WiredAssessedInputVoltageAttributeCallback callback
+    ) {
+      readWiredAssessedInputVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredAssessedInputVoltageAttribute(
+        WiredAssessedInputVoltageAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeWiredAssessedInputVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredAssessedInputFrequencyAttribute(
+      WiredAssessedInputFrequencyAttributeCallback callback
+    ) {
+      readWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredAssessedInputFrequencyAttribute(
+        WiredAssessedInputFrequencyAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredCurrentTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWiredCurrentTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredCurrentTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWiredCurrentTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredAssessedCurrentAttribute(
+      WiredAssessedCurrentAttributeCallback callback
+    ) {
+      readWiredAssessedCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredAssessedCurrentAttribute(
+        WiredAssessedCurrentAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeWiredAssessedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredNominalVoltageAttribute(
+      LongAttributeCallback callback
+    ) {
+      readWiredNominalVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredNominalVoltageAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWiredNominalVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredMaximumCurrentAttribute(
+      LongAttributeCallback callback
+    ) {
+      readWiredMaximumCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredMaximumCurrentAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWiredMaximumCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiredPresentAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readWiredPresentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiredPresentAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWiredPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveWiredFaultsAttribute(
+      ActiveWiredFaultsAttributeCallback callback
+    ) {
+      readActiveWiredFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveWiredFaultsAttribute(
+        ActiveWiredFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveWiredFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatVoltageAttribute(
+      BatVoltageAttributeCallback callback
+    ) {
+      readBatVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatVoltageAttribute(
+        BatVoltageAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBatVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatPercentRemainingAttribute(
+      BatPercentRemainingAttributeCallback callback
+    ) {
+      readBatPercentRemainingAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatPercentRemainingAttribute(
+        BatPercentRemainingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBatPercentRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatTimeRemainingAttribute(
+      BatTimeRemainingAttributeCallback callback
+    ) {
+      readBatTimeRemainingAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatTimeRemainingAttribute(
+        BatTimeRemainingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBatTimeRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatChargeLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatChargeLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatChargeLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatChargeLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatReplacementNeededAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readBatReplacementNeededAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatReplacementNeededAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatReplacementNeededAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatReplaceabilityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatReplaceabilityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatReplaceabilityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatReplaceabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatPresentAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readBatPresentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatPresentAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveBatFaultsAttribute(
+      ActiveBatFaultsAttributeCallback callback
+    ) {
+      readActiveBatFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveBatFaultsAttribute(
+        ActiveBatFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveBatFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatReplacementDescriptionAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readBatReplacementDescriptionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatReplacementDescriptionAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatReplacementDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatCommonDesignationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatCommonDesignationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatCommonDesignationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatCommonDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatANSIDesignationAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readBatANSIDesignationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatANSIDesignationAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatANSIDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatIECDesignationAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readBatIECDesignationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatIECDesignationAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatIECDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatApprovedChemistryAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatApprovedChemistryAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatApprovedChemistryAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatApprovedChemistryAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatCapacityAttribute(
+      LongAttributeCallback callback
+    ) {
+      readBatCapacityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatCapacityAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatQuantityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatQuantityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatQuantityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatChargeStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatChargeStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatChargeStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatChargeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatTimeToFullChargeAttribute(
+      BatTimeToFullChargeAttributeCallback callback
+    ) {
+      readBatTimeToFullChargeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatTimeToFullChargeAttribute(
+        BatTimeToFullChargeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBatTimeToFullChargeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatFunctionalWhileChargingAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readBatFunctionalWhileChargingAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatFunctionalWhileChargingAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatFunctionalWhileChargingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatChargingCurrentAttribute(
+      BatChargingCurrentAttributeCallback callback
+    ) {
+      readBatChargingCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatChargingCurrentAttribute(
+        BatChargingCurrentAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBatChargingCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveBatChargeFaultsAttribute(
+      ActiveBatChargeFaultsAttributeCallback callback
+    ) {
+      readActiveBatChargeFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveBatChargeFaultsAttribute(
+        ActiveBatChargeFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveBatChargeFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEndpointListAttribute(
+      EndpointListAttributeCallback callback
+    ) {
+      readEndpointListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEndpointListAttribute(
+        EndpointListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEndpointListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOrderAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOrderAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWiredAssessedInputVoltageAttribute(long chipClusterPtr,
+        WiredAssessedInputVoltageAttributeCallback callback
+    );
+    private native void subscribeWiredAssessedInputVoltageAttribute(long chipClusterPtr,
+        WiredAssessedInputVoltageAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWiredAssessedInputFrequencyAttribute(long chipClusterPtr,
+        WiredAssessedInputFrequencyAttributeCallback callback
+    );
+    private native void subscribeWiredAssessedInputFrequencyAttribute(long chipClusterPtr,
+        WiredAssessedInputFrequencyAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWiredCurrentTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeWiredCurrentTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWiredAssessedCurrentAttribute(long chipClusterPtr,
+        WiredAssessedCurrentAttributeCallback callback
+    );
+    private native void subscribeWiredAssessedCurrentAttribute(long chipClusterPtr,
+        WiredAssessedCurrentAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWiredNominalVoltageAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeWiredNominalVoltageAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWiredMaximumCurrentAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeWiredMaximumCurrentAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWiredPresentAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeWiredPresentAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveWiredFaultsAttribute(long chipClusterPtr,
+        ActiveWiredFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveWiredFaultsAttribute(long chipClusterPtr,
+        ActiveWiredFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatVoltageAttribute(long chipClusterPtr,
+        BatVoltageAttributeCallback callback
+    );
+    private native void subscribeBatVoltageAttribute(long chipClusterPtr,
+        BatVoltageAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatPercentRemainingAttribute(long chipClusterPtr,
+        BatPercentRemainingAttributeCallback callback
+    );
+    private native void subscribeBatPercentRemainingAttribute(long chipClusterPtr,
+        BatPercentRemainingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatTimeRemainingAttribute(long chipClusterPtr,
+        BatTimeRemainingAttributeCallback callback
+    );
+    private native void subscribeBatTimeRemainingAttribute(long chipClusterPtr,
+        BatTimeRemainingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatChargeLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatChargeLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatReplacementNeededAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeBatReplacementNeededAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatReplaceabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatReplaceabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatPresentAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeBatPresentAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveBatFaultsAttribute(long chipClusterPtr,
+        ActiveBatFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveBatFaultsAttribute(long chipClusterPtr,
+        ActiveBatFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatReplacementDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeBatReplacementDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatCommonDesignationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatCommonDesignationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatANSIDesignationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeBatANSIDesignationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatIECDesignationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeBatIECDesignationAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatApprovedChemistryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatApprovedChemistryAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatCapacityAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeBatCapacityAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatQuantityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatQuantityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatChargeStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatChargeStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatTimeToFullChargeAttribute(long chipClusterPtr,
+        BatTimeToFullChargeAttributeCallback callback
+    );
+    private native void subscribeBatTimeToFullChargeAttribute(long chipClusterPtr,
+        BatTimeToFullChargeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBatFunctionalWhileChargingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeBatFunctionalWhileChargingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatChargingCurrentAttribute(long chipClusterPtr,
+        BatChargingCurrentAttributeCallback callback
+    );
+    private native void subscribeBatChargingCurrentAttribute(long chipClusterPtr,
+        BatChargingCurrentAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readActiveBatChargeFaultsAttribute(long chipClusterPtr,
+        ActiveBatChargeFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveBatChargeFaultsAttribute(long chipClusterPtr,
+        ActiveBatChargeFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEndpointListAttribute(long chipClusterPtr,
+        EndpointListAttributeCallback callback
+    );
+    private native void subscribeEndpointListAttribute(long chipClusterPtr,
+        EndpointListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class GeneralCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000030L;
+
+    public GeneralCommissioningCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void armFailSafe(ArmFailSafeResponseCallback callback
+      , Integer expiryLengthSeconds, Long breadcrumb) {
+      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, null);
+    }
+
+    public void armFailSafe(ArmFailSafeResponseCallback callback
+      , Integer expiryLengthSeconds, Long breadcrumb
+      , int timedInvokeTimeoutMs) {
+      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback
+      , Integer newRegulatoryConfig, String countryCode, Long breadcrumb) {
+      setRegulatoryConfig(chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, null);
+    }
+
+    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback
+      , Integer newRegulatoryConfig, String countryCode, Long breadcrumb
+      , int timedInvokeTimeoutMs) {
+      setRegulatoryConfig(chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void commissioningComplete(CommissioningCompleteResponseCallback callback
+      ) {
+      commissioningComplete(chipClusterPtr, callback, null);
+    }
+
+    public void commissioningComplete(CommissioningCompleteResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      commissioningComplete(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void armFailSafe(long chipClusterPtr, ArmFailSafeResponseCallback Callback
+      , Integer expiryLengthSeconds, Long breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setRegulatoryConfig(long chipClusterPtr, SetRegulatoryConfigResponseCallback Callback
+      , Integer newRegulatoryConfig, String countryCode, Long breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void commissioningComplete(long chipClusterPtr, CommissioningCompleteResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ArmFailSafeResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
+    }
+
+    public interface SetRegulatoryConfigResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
+    }
+
+    public interface CommissioningCompleteResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readBreadcrumbAttribute(
+      LongAttributeCallback callback
+    ) {
+      readBreadcrumbAttribute(chipClusterPtr, callback);
+    }
+    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value) {
+      writeBreadcrumbAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBreadcrumbAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBreadcrumbAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBreadcrumbAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRegulatoryConfigAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRegulatoryConfigAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRegulatoryConfigAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRegulatoryConfigAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocationCapabilityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLocationCapabilityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLocationCapabilityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLocationCapabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportsConcurrentConnectionAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readSupportsConcurrentConnectionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportsConcurrentConnectionAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportsConcurrentConnectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readBreadcrumbAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeBreadcrumbAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBreadcrumbAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRegulatoryConfigAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRegulatoryConfigAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLocationCapabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLocationCapabilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportsConcurrentConnectionAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeSupportsConcurrentConnectionAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class NetworkCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000031L;
+
+    public NetworkCommissioningCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void scanNetworks(ScanNetworksResponseCallback callback
+      , @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb) {
+      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, null);
+    }
+
+    public void scanNetworks(ScanNetworksResponseCallback callback
+      , @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback
+      , byte[] ssid, byte[] credentials, Optional<Long> breadcrumb) {
+      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, null);
+    }
+
+    public void addOrUpdateWiFiNetwork(NetworkConfigResponseCallback callback
+      , byte[] ssid, byte[] credentials, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void addOrUpdateThreadNetwork(NetworkConfigResponseCallback callback
+      , byte[] operationalDataset, Optional<Long> breadcrumb) {
+      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, null);
+    }
+
+    public void addOrUpdateThreadNetwork(NetworkConfigResponseCallback callback
+      , byte[] operationalDataset, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void removeNetwork(NetworkConfigResponseCallback callback
+      , byte[] networkID, Optional<Long> breadcrumb) {
+      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+    }
+
+    public void removeNetwork(NetworkConfigResponseCallback callback
+      , byte[] networkID, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void connectNetwork(ConnectNetworkResponseCallback callback
+      , byte[] networkID, Optional<Long> breadcrumb) {
+      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+    }
+
+    public void connectNetwork(ConnectNetworkResponseCallback callback
+      , byte[] networkID, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+    }
+
+    public void reorderNetwork(NetworkConfigResponseCallback callback
+      , byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb) {
+      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, null);
+    }
+
+    public void reorderNetwork(NetworkConfigResponseCallback callback
+      , byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb
+      , int timedInvokeTimeoutMs) {
+      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, timedInvokeTimeoutMs);
+    }
+    private native void scanNetworks(long chipClusterPtr, ScanNetworksResponseCallback Callback
+      , @Nullable Optional<byte[]> ssid, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addOrUpdateWiFiNetwork(long chipClusterPtr, NetworkConfigResponseCallback Callback
+      , byte[] ssid, byte[] credentials, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addOrUpdateThreadNetwork(long chipClusterPtr, NetworkConfigResponseCallback Callback
+      , byte[] operationalDataset, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeNetwork(long chipClusterPtr, NetworkConfigResponseCallback Callback
+      , byte[] networkID, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void connectNetwork(long chipClusterPtr, ConnectNetworkResponseCallback Callback
+      , byte[] networkID, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void reorderNetwork(long chipClusterPtr, NetworkConfigResponseCallback Callback
+      , byte[] networkID, Integer networkIndex, Optional<Long> breadcrumb
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ScanNetworksResponseCallback {
+      void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>> wiFiScanResults, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>> threadScanResults);
+
+      void onError(Exception error);
+    }
+
+    public interface NetworkConfigResponseCallback {
+      void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex);
+
+      void onError(Exception error);
+    }
+
+    public interface ConnectNetworkResponseCallback {
+      void onSuccess(Integer networkingStatus, Optional<String> debugText, @Nullable Long errorValue);
+
+      void onError(Exception error);
+    }
+
+
+      public interface NetworksAttributeCallback {
+        void onSuccess( List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LastNetworkingStatusAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LastNetworkIDAttributeCallback {
+        void onSuccess(@Nullable byte[] value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LastConnectErrorValueAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMaxNetworksAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxNetworksAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxNetworksAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNetworksAttribute(
+      NetworksAttributeCallback callback
+    ) {
+      readNetworksAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNetworksAttribute(
+        NetworksAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readScanMaxTimeSecondsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readScanMaxTimeSecondsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeScanMaxTimeSecondsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeScanMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readConnectMaxTimeSecondsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readConnectMaxTimeSecondsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeConnectMaxTimeSecondsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeConnectMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInterfaceEnabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readInterfaceEnabledAttribute(chipClusterPtr, callback);
+    }
+    public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInterfaceEnabledAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInterfaceEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastNetworkingStatusAttribute(
+      LastNetworkingStatusAttributeCallback callback
+    ) {
+      readLastNetworkingStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLastNetworkingStatusAttribute(
+        LastNetworkingStatusAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastNetworkingStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastNetworkIDAttribute(
+      LastNetworkIDAttributeCallback callback
+    ) {
+      readLastNetworkIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLastNetworkIDAttribute(
+        LastNetworkIDAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastNetworkIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastConnectErrorValueAttribute(
+      LastConnectErrorValueAttributeCallback callback
+    ) {
+      readLastConnectErrorValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLastConnectErrorValueAttribute(
+        LastConnectErrorValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastConnectErrorValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMaxNetworksAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxNetworksAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNetworksAttribute(long chipClusterPtr,
+        NetworksAttributeCallback callback
+    );
+    private native void subscribeNetworksAttribute(long chipClusterPtr,
+        NetworksAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readScanMaxTimeSecondsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeScanMaxTimeSecondsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readConnectMaxTimeSecondsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeConnectMaxTimeSecondsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInterfaceEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeInterfaceEnabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInterfaceEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLastNetworkingStatusAttribute(long chipClusterPtr,
+        LastNetworkingStatusAttributeCallback callback
+    );
+    private native void subscribeLastNetworkingStatusAttribute(long chipClusterPtr,
+        LastNetworkingStatusAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLastNetworkIDAttribute(long chipClusterPtr,
+        LastNetworkIDAttributeCallback callback
+    );
+    private native void subscribeLastNetworkIDAttribute(long chipClusterPtr,
+        LastNetworkIDAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLastConnectErrorValueAttribute(long chipClusterPtr,
+        LastConnectErrorValueAttributeCallback callback
+    );
+    private native void subscribeLastConnectErrorValueAttribute(long chipClusterPtr,
+        LastConnectErrorValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class DiagnosticLogsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000032L;
+
+    public DiagnosticLogsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback
+      , Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator) {
+      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null);
+    }
+
+    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback
+      , Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator
+      , int timedInvokeTimeoutMs) {
+      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, timedInvokeTimeoutMs);
+    }
+    private native void retrieveLogsRequest(long chipClusterPtr, RetrieveLogsResponseCallback Callback
+      , Integer intent, Integer requestedProtocol, Optional<String> transferFileDesignator
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface RetrieveLogsResponseCallback {
+      void onSuccess(Integer status, byte[] logContent, Optional<Long> UTCTimeStamp, Optional<Long> timeSinceBoot);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class GeneralDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000033L;
+
+    public GeneralDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void testEventTrigger(DefaultClusterCallback callback
+      , byte[] enableKey, Long eventTrigger) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, null);
+    }
+
+    public void testEventTrigger(DefaultClusterCallback callback
+      , byte[] enableKey, Long eventTrigger
+      , int timedInvokeTimeoutMs) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs);
+    }
+    private native void testEventTrigger(long chipClusterPtr, DefaultClusterCallback Callback
+      , byte[] enableKey, Long eventTrigger
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface NetworkInterfacesAttributeCallback {
+        void onSuccess( List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveHardwareFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveRadioFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveNetworkFaultsAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readNetworkInterfacesAttribute(
+      NetworkInterfacesAttributeCallback callback
+    ) {
+      readNetworkInterfacesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNetworkInterfacesAttribute(
+        NetworkInterfacesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNetworkInterfacesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRebootCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRebootCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRebootCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRebootCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUpTimeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readUpTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUpTimeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUpTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTotalOperationalHoursAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTotalOperationalHoursAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTotalOperationalHoursAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTotalOperationalHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBootReasonAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBootReasonAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBootReasonAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBootReasonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveHardwareFaultsAttribute(
+      ActiveHardwareFaultsAttributeCallback callback
+    ) {
+      readActiveHardwareFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveHardwareFaultsAttribute(
+        ActiveHardwareFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveHardwareFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveRadioFaultsAttribute(
+      ActiveRadioFaultsAttributeCallback callback
+    ) {
+      readActiveRadioFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveRadioFaultsAttribute(
+        ActiveRadioFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveRadioFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveNetworkFaultsAttribute(
+      ActiveNetworkFaultsAttributeCallback callback
+    ) {
+      readActiveNetworkFaultsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveNetworkFaultsAttribute(
+        ActiveNetworkFaultsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveNetworkFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTestEventTriggersEnabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readTestEventTriggersEnabledAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTestEventTriggersEnabledAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTestEventTriggersEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageWearCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageWearCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageWearCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageWearCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readNetworkInterfacesAttribute(long chipClusterPtr,
+        NetworkInterfacesAttributeCallback callback
+    );
+    private native void subscribeNetworkInterfacesAttribute(long chipClusterPtr,
+        NetworkInterfacesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRebootCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRebootCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUpTimeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeUpTimeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTotalOperationalHoursAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTotalOperationalHoursAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBootReasonAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBootReasonAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveHardwareFaultsAttribute(long chipClusterPtr,
+        ActiveHardwareFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveHardwareFaultsAttribute(long chipClusterPtr,
+        ActiveHardwareFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readActiveRadioFaultsAttribute(long chipClusterPtr,
+        ActiveRadioFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveRadioFaultsAttribute(long chipClusterPtr,
+        ActiveRadioFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readActiveNetworkFaultsAttribute(long chipClusterPtr,
+        ActiveNetworkFaultsAttributeCallback callback
+    );
+    private native void subscribeActiveNetworkFaultsAttribute(long chipClusterPtr,
+        ActiveNetworkFaultsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTestEventTriggersEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeTestEventTriggersEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageWearCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageWearCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000034L;
+
+    public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetWatermarks(DefaultClusterCallback callback
+      ) {
+      resetWatermarks(chipClusterPtr, callback, null);
+    }
+
+    public void resetWatermarks(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetWatermarks(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetWatermarks(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface ThreadMetricsAttributeCallback {
+        void onSuccess( List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readThreadMetricsAttribute(
+      ThreadMetricsAttributeCallback callback
+    ) {
+      readThreadMetricsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeThreadMetricsAttribute(
+        ThreadMetricsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeThreadMetricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentHeapFreeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readCurrentHeapFreeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentHeapFreeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentHeapFreeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentHeapUsedAttribute(
+      LongAttributeCallback callback
+    ) {
+      readCurrentHeapUsedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentHeapUsedAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentHeapUsedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentHeapHighWatermarkAttribute(
+      LongAttributeCallback callback
+    ) {
+      readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentHeapHighWatermarkAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readThreadMetricsAttribute(long chipClusterPtr,
+        ThreadMetricsAttributeCallback callback
+    );
+    private native void subscribeThreadMetricsAttribute(long chipClusterPtr,
+        ThreadMetricsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentHeapFreeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeCurrentHeapFreeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentHeapUsedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeCurrentHeapUsedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentHeapHighWatermarkAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeCurrentHeapHighWatermarkAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000035L;
+
+    public ThreadNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetCounts(DefaultClusterCallback callback
+      ) {
+      resetCounts(chipClusterPtr, callback, null);
+    }
+
+    public void resetCounts(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface ChannelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface RoutingRoleAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NetworkNameAttributeCallback {
+        void onSuccess(@Nullable String value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PanIdAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ExtendedPanIdAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MeshLocalPrefixAttributeCallback {
+        void onSuccess(@Nullable byte[] value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NeighborTableAttributeCallback {
+        void onSuccess( List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface RouteTableAttributeCallback {
+        void onSuccess( List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PartitionIdAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface WeightingAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DataVersionAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StableDataVersionAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LeaderRouterIdAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveTimestampAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PendingTimestampAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DelayAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ChannelPage0MaskAttributeCallback {
+        void onSuccess(@Nullable byte[] value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ActiveNetworkFaultsListAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readChannelAttribute(
+      ChannelAttributeCallback callback
+    ) {
+      readChannelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChannelAttribute(
+        ChannelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeChannelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRoutingRoleAttribute(
+      RoutingRoleAttributeCallback callback
+    ) {
+      readRoutingRoleAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRoutingRoleAttribute(
+        RoutingRoleAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeRoutingRoleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNetworkNameAttribute(
+      NetworkNameAttributeCallback callback
+    ) {
+      readNetworkNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNetworkNameAttribute(
+        NetworkNameAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNetworkNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPanIdAttribute(
+      PanIdAttributeCallback callback
+    ) {
+      readPanIdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePanIdAttribute(
+        PanIdAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readExtendedPanIdAttribute(
+      ExtendedPanIdAttributeCallback callback
+    ) {
+      readExtendedPanIdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeExtendedPanIdAttribute(
+        ExtendedPanIdAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeExtendedPanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeshLocalPrefixAttribute(
+      MeshLocalPrefixAttributeCallback callback
+    ) {
+      readMeshLocalPrefixAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeshLocalPrefixAttribute(
+        MeshLocalPrefixAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeshLocalPrefixAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverrunCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOverrunCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNeighborTableAttribute(
+      NeighborTableAttributeCallback callback
+    ) {
+      readNeighborTableAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNeighborTableAttribute(
+        NeighborTableAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNeighborTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRouteTableAttribute(
+      RouteTableAttributeCallback callback
+    ) {
+      readRouteTableAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRouteTableAttribute(
+        RouteTableAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeRouteTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartitionIdAttribute(
+      PartitionIdAttributeCallback callback
+    ) {
+      readPartitionIdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePartitionIdAttribute(
+        PartitionIdAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePartitionIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWeightingAttribute(
+      WeightingAttributeCallback callback
+    ) {
+      readWeightingAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWeightingAttribute(
+        WeightingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeWeightingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDataVersionAttribute(
+      DataVersionAttributeCallback callback
+    ) {
+      readDataVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDataVersionAttribute(
+        DataVersionAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStableDataVersionAttribute(
+      StableDataVersionAttributeCallback callback
+    ) {
+      readStableDataVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStableDataVersionAttribute(
+        StableDataVersionAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStableDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLeaderRouterIdAttribute(
+      LeaderRouterIdAttributeCallback callback
+    ) {
+      readLeaderRouterIdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLeaderRouterIdAttribute(
+        LeaderRouterIdAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLeaderRouterIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDetachedRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDetachedRoleCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDetachedRoleCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDetachedRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChildRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readChildRoleCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChildRoleCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeChildRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRouterRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRouterRoleCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRouterRoleCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRouterRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLeaderRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLeaderRoleCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLeaderRoleCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLeaderRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttachAttemptCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAttachAttemptCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttachAttemptCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartitionIdChangeCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePartitionIdChangeCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePartitionIdChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBetterPartitionAttachAttemptCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBetterPartitionAttachAttemptCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readParentChangeCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readParentChangeCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeParentChangeCountAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeParentChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxTotalCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxTotalCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxTotalCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxUnicastCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxUnicastCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxUnicastCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxBroadcastCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxBroadcastCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxBroadcastCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxAckRequestedCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxAckRequestedCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxAckRequestedCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxAckedCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxAckedCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxAckedCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxAckedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxNoAckRequestedCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxNoAckRequestedCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxNoAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxDataCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxDataCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxDataCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxDataPollCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxDataPollCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxDataPollCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxBeaconCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxBeaconCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxBeaconCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxBeaconRequestCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxBeaconRequestCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxOtherCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxOtherCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxRetryCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxRetryCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxRetryCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxRetryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxDirectMaxRetryExpiryCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxDirectMaxRetryExpiryCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxIndirectMaxRetryExpiryCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxIndirectMaxRetryExpiryCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxErrCcaCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxErrCcaCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxErrCcaCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxErrCcaCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxErrAbortCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxErrAbortCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxErrAbortCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxErrAbortCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxErrBusyChannelCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxErrBusyChannelCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxErrBusyChannelCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxTotalCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxTotalCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxTotalCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxUnicastCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxUnicastCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxUnicastCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxBroadcastCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxBroadcastCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxBroadcastCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxDataCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxDataCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxDataCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxDataPollCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxDataPollCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxDataPollCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxBeaconCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxBeaconCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxBeaconCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxBeaconRequestCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxBeaconRequestCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxOtherCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxOtherCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxAddressFilteredCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxAddressFilteredCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxAddressFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxDestAddrFilteredCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxDestAddrFilteredCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxDestAddrFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxDuplicatedCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxDuplicatedCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxDuplicatedCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxDuplicatedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrNoFrameCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrNoFrameCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrNoFrameCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrUnknownNeighborCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrUnknownNeighborCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrInvalidSrcAddrCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrInvalidSrcAddrCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrSecCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrSecCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrSecCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrSecCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrFcsCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrFcsCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrFcsCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrFcsCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRxErrOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readRxErrOtherCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRxErrOtherCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRxErrOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveTimestampAttribute(
+      ActiveTimestampAttributeCallback callback
+    ) {
+      readActiveTimestampAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveTimestampAttribute(
+        ActiveTimestampAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPendingTimestampAttribute(
+      PendingTimestampAttributeCallback callback
+    ) {
+      readPendingTimestampAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePendingTimestampAttribute(
+        PendingTimestampAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePendingTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDelayAttribute(
+      DelayAttributeCallback callback
+    ) {
+      readDelayAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDelayAttribute(
+        DelayAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChannelPage0MaskAttribute(
+      ChannelPage0MaskAttributeCallback callback
+    ) {
+      readChannelPage0MaskAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChannelPage0MaskAttribute(
+        ChannelPage0MaskAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeChannelPage0MaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveNetworkFaultsListAttribute(
+      ActiveNetworkFaultsListAttributeCallback callback
+    ) {
+      readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveNetworkFaultsListAttribute(
+        ActiveNetworkFaultsListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeActiveNetworkFaultsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readChannelAttribute(long chipClusterPtr,
+        ChannelAttributeCallback callback
+    );
+    private native void subscribeChannelAttribute(long chipClusterPtr,
+        ChannelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRoutingRoleAttribute(long chipClusterPtr,
+        RoutingRoleAttributeCallback callback
+    );
+    private native void subscribeRoutingRoleAttribute(long chipClusterPtr,
+        RoutingRoleAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNetworkNameAttribute(long chipClusterPtr,
+        NetworkNameAttributeCallback callback
+    );
+    private native void subscribeNetworkNameAttribute(long chipClusterPtr,
+        NetworkNameAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPanIdAttribute(long chipClusterPtr,
+        PanIdAttributeCallback callback
+    );
+    private native void subscribePanIdAttribute(long chipClusterPtr,
+        PanIdAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readExtendedPanIdAttribute(long chipClusterPtr,
+        ExtendedPanIdAttributeCallback callback
+    );
+    private native void subscribeExtendedPanIdAttribute(long chipClusterPtr,
+        ExtendedPanIdAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMeshLocalPrefixAttribute(long chipClusterPtr,
+        MeshLocalPrefixAttributeCallback callback
+    );
+    private native void subscribeMeshLocalPrefixAttribute(long chipClusterPtr,
+        MeshLocalPrefixAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeOverrunCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNeighborTableAttribute(long chipClusterPtr,
+        NeighborTableAttributeCallback callback
+    );
+    private native void subscribeNeighborTableAttribute(long chipClusterPtr,
+        NeighborTableAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRouteTableAttribute(long chipClusterPtr,
+        RouteTableAttributeCallback callback
+    );
+    private native void subscribeRouteTableAttribute(long chipClusterPtr,
+        RouteTableAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPartitionIdAttribute(long chipClusterPtr,
+        PartitionIdAttributeCallback callback
+    );
+    private native void subscribePartitionIdAttribute(long chipClusterPtr,
+        PartitionIdAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWeightingAttribute(long chipClusterPtr,
+        WeightingAttributeCallback callback
+    );
+    private native void subscribeWeightingAttribute(long chipClusterPtr,
+        WeightingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDataVersionAttribute(long chipClusterPtr,
+        DataVersionAttributeCallback callback
+    );
+    private native void subscribeDataVersionAttribute(long chipClusterPtr,
+        DataVersionAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readStableDataVersionAttribute(long chipClusterPtr,
+        StableDataVersionAttributeCallback callback
+    );
+    private native void subscribeStableDataVersionAttribute(long chipClusterPtr,
+        StableDataVersionAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLeaderRouterIdAttribute(long chipClusterPtr,
+        LeaderRouterIdAttributeCallback callback
+    );
+    private native void subscribeLeaderRouterIdAttribute(long chipClusterPtr,
+        LeaderRouterIdAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDetachedRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDetachedRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readChildRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeChildRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRouterRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRouterRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLeaderRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLeaderRoleCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAttachAttemptCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAttachAttemptCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPartitionIdChangeCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePartitionIdChangeCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readParentChangeCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeParentChangeCountAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxTotalCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxTotalCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxUnicastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxUnicastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxBroadcastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxBroadcastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxAckRequestedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxAckRequestedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxAckedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxAckedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxNoAckRequestedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxNoAckRequestedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxDataCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxDataCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxDataPollCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxDataPollCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxBeaconCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxBeaconCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxBeaconRequestCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxBeaconRequestCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxRetryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxRetryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxErrCcaCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxErrCcaCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxErrAbortCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxErrAbortCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxErrBusyChannelCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxErrBusyChannelCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxTotalCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxTotalCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxUnicastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxUnicastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxBroadcastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxBroadcastCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxDataCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxDataCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxDataPollCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxDataPollCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxBeaconCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxBeaconCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxBeaconRequestCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxBeaconRequestCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxAddressFilteredCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxAddressFilteredCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxDestAddrFilteredCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxDestAddrFilteredCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxDuplicatedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxDuplicatedCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrNoFrameCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrNoFrameCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrUnknownNeighborCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrUnknownNeighborCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrSecCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrSecCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrFcsCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrFcsCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRxErrOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeRxErrOtherCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveTimestampAttribute(long chipClusterPtr,
+        ActiveTimestampAttributeCallback callback
+    );
+    private native void subscribeActiveTimestampAttribute(long chipClusterPtr,
+        ActiveTimestampAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPendingTimestampAttribute(long chipClusterPtr,
+        PendingTimestampAttributeCallback callback
+    );
+    private native void subscribePendingTimestampAttribute(long chipClusterPtr,
+        PendingTimestampAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDelayAttribute(long chipClusterPtr,
+        DelayAttributeCallback callback
+    );
+    private native void subscribeDelayAttribute(long chipClusterPtr,
+        DelayAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readChannelPage0MaskAttribute(long chipClusterPtr,
+        ChannelPage0MaskAttributeCallback callback
+    );
+    private native void subscribeChannelPage0MaskAttribute(long chipClusterPtr,
+        ChannelPage0MaskAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readActiveNetworkFaultsListAttribute(long chipClusterPtr,
+        ActiveNetworkFaultsListAttributeCallback callback
+    );
+    private native void subscribeActiveNetworkFaultsListAttribute(long chipClusterPtr,
+        ActiveNetworkFaultsListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000036L;
+
+    public WiFiNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetCounts(DefaultClusterCallback callback
+      ) {
+      resetCounts(chipClusterPtr, callback, null);
+    }
+
+    public void resetCounts(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface BssidAttributeCallback {
+        void onSuccess(@Nullable byte[] value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SecurityTypeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface WiFiVersionAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ChannelNumberAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface RssiAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BeaconLostCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BeaconRxCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PacketMulticastRxCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PacketMulticastTxCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PacketUnicastRxCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PacketUnicastTxCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentMaxRateAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OverrunCountAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readBssidAttribute(
+      BssidAttributeCallback callback
+    ) {
+      readBssidAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBssidAttribute(
+        BssidAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBssidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSecurityTypeAttribute(
+      SecurityTypeAttributeCallback callback
+    ) {
+      readSecurityTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSecurityTypeAttribute(
+        SecurityTypeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSecurityTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWiFiVersionAttribute(
+      WiFiVersionAttributeCallback callback
+    ) {
+      readWiFiVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWiFiVersionAttribute(
+        WiFiVersionAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeWiFiVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChannelNumberAttribute(
+      ChannelNumberAttributeCallback callback
+    ) {
+      readChannelNumberAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChannelNumberAttribute(
+        ChannelNumberAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeChannelNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRssiAttribute(
+      RssiAttributeCallback callback
+    ) {
+      readRssiAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRssiAttribute(
+        RssiAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeRssiAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBeaconLostCountAttribute(
+      BeaconLostCountAttributeCallback callback
+    ) {
+      readBeaconLostCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBeaconLostCountAttribute(
+        BeaconLostCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBeaconLostCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBeaconRxCountAttribute(
+      BeaconRxCountAttributeCallback callback
+    ) {
+      readBeaconRxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBeaconRxCountAttribute(
+        BeaconRxCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBeaconRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketMulticastRxCountAttribute(
+      PacketMulticastRxCountAttributeCallback callback
+    ) {
+      readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketMulticastRxCountAttribute(
+        PacketMulticastRxCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePacketMulticastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketMulticastTxCountAttribute(
+      PacketMulticastTxCountAttributeCallback callback
+    ) {
+      readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketMulticastTxCountAttribute(
+        PacketMulticastTxCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePacketMulticastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketUnicastRxCountAttribute(
+      PacketUnicastRxCountAttributeCallback callback
+    ) {
+      readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketUnicastRxCountAttribute(
+        PacketUnicastRxCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePacketUnicastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketUnicastTxCountAttribute(
+      PacketUnicastTxCountAttributeCallback callback
+    ) {
+      readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketUnicastTxCountAttribute(
+        PacketUnicastTxCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePacketUnicastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentMaxRateAttribute(
+      CurrentMaxRateAttributeCallback callback
+    ) {
+      readCurrentMaxRateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentMaxRateAttribute(
+        CurrentMaxRateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentMaxRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverrunCountAttribute(
+      OverrunCountAttributeCallback callback
+    ) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOverrunCountAttribute(
+        OverrunCountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readBssidAttribute(long chipClusterPtr,
+        BssidAttributeCallback callback
+    );
+    private native void subscribeBssidAttribute(long chipClusterPtr,
+        BssidAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSecurityTypeAttribute(long chipClusterPtr,
+        SecurityTypeAttributeCallback callback
+    );
+    private native void subscribeSecurityTypeAttribute(long chipClusterPtr,
+        SecurityTypeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWiFiVersionAttribute(long chipClusterPtr,
+        WiFiVersionAttributeCallback callback
+    );
+    private native void subscribeWiFiVersionAttribute(long chipClusterPtr,
+        WiFiVersionAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readChannelNumberAttribute(long chipClusterPtr,
+        ChannelNumberAttributeCallback callback
+    );
+    private native void subscribeChannelNumberAttribute(long chipClusterPtr,
+        ChannelNumberAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRssiAttribute(long chipClusterPtr,
+        RssiAttributeCallback callback
+    );
+    private native void subscribeRssiAttribute(long chipClusterPtr,
+        RssiAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBeaconLostCountAttribute(long chipClusterPtr,
+        BeaconLostCountAttributeCallback callback
+    );
+    private native void subscribeBeaconLostCountAttribute(long chipClusterPtr,
+        BeaconLostCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBeaconRxCountAttribute(long chipClusterPtr,
+        BeaconRxCountAttributeCallback callback
+    );
+    private native void subscribeBeaconRxCountAttribute(long chipClusterPtr,
+        BeaconRxCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPacketMulticastRxCountAttribute(long chipClusterPtr,
+        PacketMulticastRxCountAttributeCallback callback
+    );
+    private native void subscribePacketMulticastRxCountAttribute(long chipClusterPtr,
+        PacketMulticastRxCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPacketMulticastTxCountAttribute(long chipClusterPtr,
+        PacketMulticastTxCountAttributeCallback callback
+    );
+    private native void subscribePacketMulticastTxCountAttribute(long chipClusterPtr,
+        PacketMulticastTxCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPacketUnicastRxCountAttribute(long chipClusterPtr,
+        PacketUnicastRxCountAttributeCallback callback
+    );
+    private native void subscribePacketUnicastRxCountAttribute(long chipClusterPtr,
+        PacketUnicastRxCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPacketUnicastTxCountAttribute(long chipClusterPtr,
+        PacketUnicastTxCountAttributeCallback callback
+    );
+    private native void subscribePacketUnicastTxCountAttribute(long chipClusterPtr,
+        PacketUnicastTxCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentMaxRateAttribute(long chipClusterPtr,
+        CurrentMaxRateAttributeCallback callback
+    );
+    private native void subscribeCurrentMaxRateAttribute(long chipClusterPtr,
+        CurrentMaxRateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+        OverrunCountAttributeCallback callback
+    );
+    private native void subscribeOverrunCountAttribute(long chipClusterPtr,
+        OverrunCountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000037L;
+
+    public EthernetNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetCounts(DefaultClusterCallback callback
+      ) {
+      resetCounts(chipClusterPtr, callback, null);
+    }
+
+    public void resetCounts(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetCounts(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface PHYRateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface FullDuplexAttributeCallback {
+        void onSuccess(@Nullable Boolean value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CarrierDetectAttributeCallback {
+        void onSuccess(@Nullable Boolean value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readPHYRateAttribute(
+      PHYRateAttributeCallback callback
+    ) {
+      readPHYRateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePHYRateAttribute(
+        PHYRateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePHYRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFullDuplexAttribute(
+      FullDuplexAttributeCallback callback
+    ) {
+      readFullDuplexAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFullDuplexAttribute(
+        FullDuplexAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeFullDuplexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketRxCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPacketRxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketRxCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePacketRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPacketTxCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPacketTxCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePacketTxCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePacketTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTxErrCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTxErrCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTxErrCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTxErrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCollisionCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readCollisionCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCollisionCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCollisionCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverrunCountAttribute(
+      LongAttributeCallback callback
+    ) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOverrunCountAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCarrierDetectAttribute(
+      CarrierDetectAttributeCallback callback
+    ) {
+      readCarrierDetectAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCarrierDetectAttribute(
+        CarrierDetectAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCarrierDetectAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeSinceResetAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTimeSinceResetAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTimeSinceResetAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTimeSinceResetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readPHYRateAttribute(long chipClusterPtr,
+        PHYRateAttributeCallback callback
+    );
+    private native void subscribePHYRateAttribute(long chipClusterPtr,
+        PHYRateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFullDuplexAttribute(long chipClusterPtr,
+        FullDuplexAttributeCallback callback
+    );
+    private native void subscribeFullDuplexAttribute(long chipClusterPtr,
+        FullDuplexAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPacketRxCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePacketRxCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPacketTxCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePacketTxCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTxErrCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTxErrCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCollisionCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeCollisionCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeOverrunCountAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCarrierDetectAttribute(long chipClusterPtr,
+        CarrierDetectAttributeCallback callback
+    );
+    private native void subscribeCarrierDetectAttribute(long chipClusterPtr,
+        CarrierDetectAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTimeSinceResetAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTimeSinceResetAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TimeSynchronizationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000038L;
+
+    public TimeSynchronizationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void setUTCTime(DefaultClusterCallback callback
+      , Long UTCTime, Integer granularity, Optional<Integer> timeSource) {
+      setUTCTime(chipClusterPtr, callback, UTCTime, granularity, timeSource, null);
+    }
+
+    public void setUTCTime(DefaultClusterCallback callback
+      , Long UTCTime, Integer granularity, Optional<Integer> timeSource
+      , int timedInvokeTimeoutMs) {
+      setUTCTime(chipClusterPtr, callback, UTCTime, granularity, timeSource, timedInvokeTimeoutMs);
+    }
+
+    public void setTrustedTimeSource(DefaultClusterCallback callback
+      , @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource) {
+      setTrustedTimeSource(chipClusterPtr, callback, trustedTimeSource, null);
+    }
+
+    public void setTrustedTimeSource(DefaultClusterCallback callback
+      , @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource
+      , int timedInvokeTimeoutMs) {
+      setTrustedTimeSource(chipClusterPtr, callback, trustedTimeSource, timedInvokeTimeoutMs);
+    }
+
+    public void setTimeZone(SetTimeZoneResponseCallback callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone) {
+      setTimeZone(chipClusterPtr, callback, timeZone, null);
+    }
+
+    public void setTimeZone(SetTimeZoneResponseCallback callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone
+      , int timedInvokeTimeoutMs) {
+      setTimeZone(chipClusterPtr, callback, timeZone, timedInvokeTimeoutMs);
+    }
+
+    public void setDSTOffset(DefaultClusterCallback callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset) {
+      setDSTOffset(chipClusterPtr, callback, DSTOffset, null);
+    }
+
+    public void setDSTOffset(DefaultClusterCallback callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset
+      , int timedInvokeTimeoutMs) {
+      setDSTOffset(chipClusterPtr, callback, DSTOffset, timedInvokeTimeoutMs);
+    }
+
+    public void setDefaultNTP(DefaultClusterCallback callback
+      , @Nullable String defaultNTP) {
+      setDefaultNTP(chipClusterPtr, callback, defaultNTP, null);
+    }
+
+    public void setDefaultNTP(DefaultClusterCallback callback
+      , @Nullable String defaultNTP
+      , int timedInvokeTimeoutMs) {
+      setDefaultNTP(chipClusterPtr, callback, defaultNTP, timedInvokeTimeoutMs);
+    }
+    private native void setUTCTime(long chipClusterPtr, DefaultClusterCallback Callback
+      , Long UTCTime, Integer granularity, Optional<Integer> timeSource
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setTrustedTimeSource(long chipClusterPtr, DefaultClusterCallback Callback
+      , @Nullable ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct trustedTimeSource
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setTimeZone(long chipClusterPtr, SetTimeZoneResponseCallback Callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> timeZone
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setDSTOffset(long chipClusterPtr, DefaultClusterCallback Callback
+      , ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setDefaultNTP(long chipClusterPtr, DefaultClusterCallback Callback
+      , @Nullable String defaultNTP
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface SetTimeZoneResponseCallback {
+      void onSuccess(Boolean DSTOffsetRequired);
+
+      void onError(Exception error);
+    }
+
+
+      public interface UTCTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DefaultNTPAttributeCallback {
+        void onSuccess(@Nullable String value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TimeZoneAttributeCallback {
+        void onSuccess( List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DSTOffsetAttributeCallback {
+        void onSuccess( List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LocalTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readUTCTimeAttribute(
+      UTCTimeAttributeCallback callback
+    ) {
+      readUTCTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUTCTimeAttribute(
+        UTCTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeUTCTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGranularityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readGranularityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGranularityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeGranularityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeSourceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTimeSourceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTimeSourceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTimeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDefaultNTPAttribute(
+      DefaultNTPAttributeCallback callback
+    ) {
+      readDefaultNTPAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDefaultNTPAttribute(
+        DefaultNTPAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDefaultNTPAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeZoneAttribute(
+      TimeZoneAttributeCallback callback
+    ) {
+      readTimeZoneAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTimeZoneAttribute(
+        TimeZoneAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTimeZoneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDSTOffsetAttribute(
+      DSTOffsetAttributeCallback callback
+    ) {
+      readDSTOffsetAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDSTOffsetAttribute(
+        DSTOffsetAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDSTOffsetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocalTimeAttribute(
+      LocalTimeAttributeCallback callback
+    ) {
+      readLocalTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLocalTimeAttribute(
+        LocalTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLocalTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeZoneDatabaseAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTimeZoneDatabaseAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTimeZoneDatabaseAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTimeZoneDatabaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNTPServerAvailableAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readNTPServerAvailableAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNTPServerAvailableAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNTPServerAvailableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeZoneListMaxSizeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTimeZoneListMaxSizeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTimeZoneListMaxSizeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTimeZoneListMaxSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDSTOffsetListMaxSizeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDSTOffsetListMaxSizeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDSTOffsetListMaxSizeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDSTOffsetListMaxSizeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportsDNSResolveAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readSupportsDNSResolveAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportsDNSResolveAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportsDNSResolveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readUTCTimeAttribute(long chipClusterPtr,
+        UTCTimeAttributeCallback callback
+    );
+    private native void subscribeUTCTimeAttribute(long chipClusterPtr,
+        UTCTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGranularityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeGranularityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTimeSourceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTimeSourceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDefaultNTPAttribute(long chipClusterPtr,
+        DefaultNTPAttributeCallback callback
+    );
+    private native void subscribeDefaultNTPAttribute(long chipClusterPtr,
+        DefaultNTPAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTimeZoneAttribute(long chipClusterPtr,
+        TimeZoneAttributeCallback callback
+    );
+    private native void subscribeTimeZoneAttribute(long chipClusterPtr,
+        TimeZoneAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDSTOffsetAttribute(long chipClusterPtr,
+        DSTOffsetAttributeCallback callback
+    );
+    private native void subscribeDSTOffsetAttribute(long chipClusterPtr,
+        DSTOffsetAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLocalTimeAttribute(long chipClusterPtr,
+        LocalTimeAttributeCallback callback
+    );
+    private native void subscribeLocalTimeAttribute(long chipClusterPtr,
+        LocalTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTimeZoneDatabaseAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTimeZoneDatabaseAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNTPServerAvailableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeNTPServerAvailableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTimeZoneListMaxSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTimeZoneListMaxSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDSTOffsetListMaxSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDSTOffsetListMaxSizeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportsDNSResolveAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeSupportsDNSResolveAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BridgedDeviceBasicInformationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000039L;
+
+    public BridgedDeviceBasicInformationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readVendorNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVendorIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readVendorIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorIDAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNodeLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readNodeLabelAttribute(chipClusterPtr, callback);
+    }
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNodeLabelAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readHardwareVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHardwareVersionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHardwareVersionStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSoftwareVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSoftwareVersionAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSoftwareVersionStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readManufacturingDateAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readManufacturingDateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeManufacturingDateAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readPartNumberAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePartNumberAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductURLAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductURLAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductURLAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readProductLabelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductLabelAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSerialNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readSerialNumberAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSerialNumberAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReachableAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readReachableAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReachableAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUniqueIDAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readUniqueIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUniqueIDAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNodeLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeNodeLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNodeLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeHardwareVersionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeHardwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeSoftwareVersionAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeSoftwareVersionStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readManufacturingDateAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeManufacturingDateAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPartNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribePartNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductURLAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeProductLabelAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSerialNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeSerialNumberAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReachableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeReachableAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUniqueIDAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeUniqueIDAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class SwitchCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000003BL;
+
+    public SwitchCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readNumberOfPositionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfPositionsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfPositionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfPositionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentPositionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMultiPressMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMultiPressMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMultiPressMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMultiPressMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readNumberOfPositionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfPositionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMultiPressMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMultiPressMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class AdministratorCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000003CL;
+
+    public AdministratorCommissioningCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+
+    public void openCommissioningWindow(DefaultClusterCallback callback
+      , Integer commissioningTimeout, byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt
+      , int timedInvokeTimeoutMs) {
+      openCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, PAKEPasscodeVerifier, discriminator, iterations, salt, timedInvokeTimeoutMs);
+    }
+
+
+    public void openBasicCommissioningWindow(DefaultClusterCallback callback
+      , Integer commissioningTimeout
+      , int timedInvokeTimeoutMs) {
+      openBasicCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, timedInvokeTimeoutMs);
+    }
+
+
+    public void revokeCommissioning(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      revokeCommissioning(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void openCommissioningWindow(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer commissioningTimeout, byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void openBasicCommissioningWindow(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer commissioningTimeout
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void revokeCommissioning(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface AdminFabricIndexAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AdminVendorIdAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readWindowStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWindowStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWindowStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWindowStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAdminFabricIndexAttribute(
+      AdminFabricIndexAttributeCallback callback
+    ) {
+      readAdminFabricIndexAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAdminFabricIndexAttribute(
+        AdminFabricIndexAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAdminFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAdminVendorIdAttribute(
+      AdminVendorIdAttributeCallback callback
+    ) {
+      readAdminVendorIdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAdminVendorIdAttribute(
+        AdminVendorIdAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAdminVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readWindowStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeWindowStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAdminFabricIndexAttribute(long chipClusterPtr,
+        AdminFabricIndexAttributeCallback callback
+    );
+    private native void subscribeAdminFabricIndexAttribute(long chipClusterPtr,
+        AdminFabricIndexAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAdminVendorIdAttribute(long chipClusterPtr,
+        AdminVendorIdAttributeCallback callback
+    );
+    private native void subscribeAdminVendorIdAttribute(long chipClusterPtr,
+        AdminVendorIdAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OperationalCredentialsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000003EL;
+
+    public OperationalCredentialsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void attestationRequest(AttestationResponseCallback callback
+      , byte[] attestationNonce) {
+      attestationRequest(chipClusterPtr, callback, attestationNonce, null);
+    }
+
+    public void attestationRequest(AttestationResponseCallback callback
+      , byte[] attestationNonce
+      , int timedInvokeTimeoutMs) {
+      attestationRequest(chipClusterPtr, callback, attestationNonce, timedInvokeTimeoutMs);
+    }
+
+    public void certificateChainRequest(CertificateChainResponseCallback callback
+      , Integer certificateType) {
+      certificateChainRequest(chipClusterPtr, callback, certificateType, null);
+    }
+
+    public void certificateChainRequest(CertificateChainResponseCallback callback
+      , Integer certificateType
+      , int timedInvokeTimeoutMs) {
+      certificateChainRequest(chipClusterPtr, callback, certificateType, timedInvokeTimeoutMs);
+    }
+
+    public void CSRRequest(CSRResponseCallback callback
+      , byte[] CSRNonce, Optional<Boolean> isForUpdateNOC) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, null);
+    }
+
+    public void CSRRequest(CSRResponseCallback callback
+      , byte[] CSRNonce, Optional<Boolean> isForUpdateNOC
+      , int timedInvokeTimeoutMs) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, timedInvokeTimeoutMs);
+    }
+
+    public void addNOC(NOCResponseCallback callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId) {
+      addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminSubject, adminVendorId, null);
+    }
+
+    public void addNOC(NOCResponseCallback callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId
+      , int timedInvokeTimeoutMs) {
+      addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminSubject, adminVendorId, timedInvokeTimeoutMs);
+    }
+
+    public void updateNOC(NOCResponseCallback callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue) {
+      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, null);
+    }
+
+    public void updateNOC(NOCResponseCallback callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue
+      , int timedInvokeTimeoutMs) {
+      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, timedInvokeTimeoutMs);
+    }
+
+    public void updateFabricLabel(NOCResponseCallback callback
+      , String label) {
+      updateFabricLabel(chipClusterPtr, callback, label, null);
+    }
+
+    public void updateFabricLabel(NOCResponseCallback callback
+      , String label
+      , int timedInvokeTimeoutMs) {
+      updateFabricLabel(chipClusterPtr, callback, label, timedInvokeTimeoutMs);
+    }
+
+    public void removeFabric(NOCResponseCallback callback
+      , Integer fabricIndex) {
+      removeFabric(chipClusterPtr, callback, fabricIndex, null);
+    }
+
+    public void removeFabric(NOCResponseCallback callback
+      , Integer fabricIndex
+      , int timedInvokeTimeoutMs) {
+      removeFabric(chipClusterPtr, callback, fabricIndex, timedInvokeTimeoutMs);
+    }
+
+    public void addTrustedRootCertificate(DefaultClusterCallback callback
+      , byte[] rootCACertificate) {
+      addTrustedRootCertificate(chipClusterPtr, callback, rootCACertificate, null);
+    }
+
+    public void addTrustedRootCertificate(DefaultClusterCallback callback
+      , byte[] rootCACertificate
+      , int timedInvokeTimeoutMs) {
+      addTrustedRootCertificate(chipClusterPtr, callback, rootCACertificate, timedInvokeTimeoutMs);
+    }
+    private native void attestationRequest(long chipClusterPtr, AttestationResponseCallback Callback
+      , byte[] attestationNonce
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void certificateChainRequest(long chipClusterPtr, CertificateChainResponseCallback Callback
+      , Integer certificateType
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void CSRRequest(long chipClusterPtr, CSRResponseCallback Callback
+      , byte[] CSRNonce, Optional<Boolean> isForUpdateNOC
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addNOC(long chipClusterPtr, NOCResponseCallback Callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue, byte[] IPKValue, Long caseAdminSubject, Integer adminVendorId
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void updateNOC(long chipClusterPtr, NOCResponseCallback Callback
+      , byte[] NOCValue, Optional<byte[]> ICACValue
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void updateFabricLabel(long chipClusterPtr, NOCResponseCallback Callback
+      , String label
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void removeFabric(long chipClusterPtr, NOCResponseCallback Callback
+      , Integer fabricIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback Callback
+      , byte[] rootCACertificate
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface AttestationResponseCallback {
+      void onSuccess(byte[] attestationElements, byte[] attestationSignature);
+
+      void onError(Exception error);
+    }
+
+    public interface CertificateChainResponseCallback {
+      void onSuccess(byte[] certificate);
+
+      void onError(Exception error);
+    }
+
+    public interface CSRResponseCallback {
+      void onSuccess(byte[] NOCSRElements, byte[] attestationSignature);
+
+      void onError(Exception error);
+    }
+
+    public interface NOCResponseCallback {
+      void onSuccess(Integer statusCode, Optional<Integer> fabricIndex, Optional<String> debugText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface NOCsAttributeCallback {
+        void onSuccess( List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface FabricsAttributeCallback {
+        void onSuccess( List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TrustedRootCertificatesAttributeCallback {
+        void onSuccess( List<byte[]> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readNOCsAttribute(
+      NOCsAttributeCallback callback
+    ) {
+      readNOCsAttribute(chipClusterPtr, callback, true);
+    }
+    public void readNOCsAttributeWithFabricFilter(
+      NOCsAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readNOCsAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void subscribeNOCsAttribute(
+        NOCsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNOCsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFabricsAttribute(
+      FabricsAttributeCallback callback
+    ) {
+      readFabricsAttribute(chipClusterPtr, callback, true);
+    }
+    public void readFabricsAttributeWithFabricFilter(
+      FabricsAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readFabricsAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void subscribeFabricsAttribute(
+        FabricsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedFabricsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSupportedFabricsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedFabricsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCommissionedFabricsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCommissionedFabricsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCommissionedFabricsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCommissionedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTrustedRootCertificatesAttribute(
+      TrustedRootCertificatesAttributeCallback callback
+    ) {
+      readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTrustedRootCertificatesAttribute(
+        TrustedRootCertificatesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTrustedRootCertificatesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentFabricIndexAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentFabricIndexAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentFabricIndexAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readNOCsAttribute(long chipClusterPtr,
+        NOCsAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+    private native void subscribeNOCsAttribute(long chipClusterPtr,
+        NOCsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFabricsAttribute(long chipClusterPtr,
+        FabricsAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+    private native void subscribeFabricsAttribute(long chipClusterPtr,
+        FabricsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSupportedFabricsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSupportedFabricsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCommissionedFabricsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCommissionedFabricsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTrustedRootCertificatesAttribute(long chipClusterPtr,
+        TrustedRootCertificatesAttributeCallback callback
+    );
+    private native void subscribeTrustedRootCertificatesAttribute(long chipClusterPtr,
+        TrustedRootCertificatesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentFabricIndexAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentFabricIndexAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class GroupKeyManagementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000003FL;
+
+    public GroupKeyManagementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void keySetWrite(DefaultClusterCallback callback
+      , ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet) {
+      keySetWrite(chipClusterPtr, callback, groupKeySet, null);
+    }
+
+    public void keySetWrite(DefaultClusterCallback callback
+      , ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet
+      , int timedInvokeTimeoutMs) {
+      keySetWrite(chipClusterPtr, callback, groupKeySet, timedInvokeTimeoutMs);
+    }
+
+    public void keySetRead(KeySetReadResponseCallback callback
+      , Integer groupKeySetID) {
+      keySetRead(chipClusterPtr, callback, groupKeySetID, null);
+    }
+
+    public void keySetRead(KeySetReadResponseCallback callback
+      , Integer groupKeySetID
+      , int timedInvokeTimeoutMs) {
+      keySetRead(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
+    }
+
+    public void keySetRemove(DefaultClusterCallback callback
+      , Integer groupKeySetID) {
+      keySetRemove(chipClusterPtr, callback, groupKeySetID, null);
+    }
+
+    public void keySetRemove(DefaultClusterCallback callback
+      , Integer groupKeySetID
+      , int timedInvokeTimeoutMs) {
+      keySetRemove(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
+    }
+
+    public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback
+      ) {
+      keySetReadAllIndices(chipClusterPtr, callback, null);
+    }
+
+    public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      keySetReadAllIndices(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void keySetWrite(long chipClusterPtr, DefaultClusterCallback Callback
+      , ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void keySetRead(long chipClusterPtr, KeySetReadResponseCallback Callback
+      , Integer groupKeySetID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void keySetRemove(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer groupKeySetID
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void keySetReadAllIndices(long chipClusterPtr, KeySetReadAllIndicesResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface KeySetReadResponseCallback {
+      void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet);
+
+      void onError(Exception error);
+    }
+
+    public interface KeySetReadAllIndicesResponseCallback {
+      void onSuccess(ArrayList<Integer> groupKeySetIDs);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GroupKeyMapAttributeCallback {
+        void onSuccess( List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GroupTableAttributeCallback {
+        void onSuccess( List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGroupKeyMapAttribute(
+      GroupKeyMapAttributeCallback callback
+    ) {
+      readGroupKeyMapAttribute(chipClusterPtr, callback, true);
+    }
+    public void readGroupKeyMapAttributeWithFabricFilter(
+      GroupKeyMapAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readGroupKeyMapAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeGroupKeyMapAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value) {
+      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeGroupKeyMapAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value, int timedWriteTimeoutMs) {
+      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeGroupKeyMapAttribute(
+        GroupKeyMapAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGroupKeyMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGroupTableAttribute(
+      GroupTableAttributeCallback callback
+    ) {
+      readGroupTableAttribute(chipClusterPtr, callback, true);
+    }
+    public void readGroupTableAttributeWithFabricFilter(
+      GroupTableAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readGroupTableAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void subscribeGroupTableAttribute(
+        GroupTableAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGroupTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxGroupsPerFabricAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxGroupsPerFabricAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxGroupsPerFabricAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxGroupsPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxGroupKeysPerFabricAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxGroupKeysPerFabricAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGroupKeyMapAttribute(long chipClusterPtr,
+        GroupKeyMapAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeGroupKeyMapAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeGroupKeyMapAttribute(long chipClusterPtr,
+        GroupKeyMapAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGroupTableAttribute(long chipClusterPtr,
+        GroupTableAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+    private native void subscribeGroupTableAttribute(long chipClusterPtr,
+        GroupTableAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxGroupsPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxGroupsPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxGroupKeysPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxGroupKeysPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class FixedLabelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000040L;
+
+    public FixedLabelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface LabelListAttributeCallback {
+        void onSuccess( List<ChipStructs.FixedLabelClusterLabelStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readLabelListAttribute(
+      LabelListAttributeCallback callback
+    ) {
+      readLabelListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLabelListAttribute(
+        LabelListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readLabelListAttribute(long chipClusterPtr,
+        LabelListAttributeCallback callback
+    );
+    private native void subscribeLabelListAttribute(long chipClusterPtr,
+        LabelListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class UserLabelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000041L;
+
+    public UserLabelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface LabelListAttributeCallback {
+        void onSuccess( List<ChipStructs.UserLabelClusterLabelStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readLabelListAttribute(
+      LabelListAttributeCallback callback
+    ) {
+      readLabelListAttribute(chipClusterPtr, callback);
+    }
+    public void writeLabelListAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value) {
+      writeLabelListAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLabelListAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value, int timedWriteTimeoutMs) {
+      writeLabelListAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLabelListAttribute(
+        LabelListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readLabelListAttribute(long chipClusterPtr,
+        LabelListAttributeCallback callback
+    );
+
+    private native void writeLabelListAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLabelListAttribute(long chipClusterPtr,
+        LabelListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ProxyConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000042L;
+
+    public ProxyConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ProxyDiscoveryCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000043L;
+
+    public ProxyDiscoveryCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ProxyValidCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000044L;
+
+    public ProxyValidCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BooleanStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000045L;
+
+    public BooleanStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readStateValueAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readStateValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStateValueAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readStateValueAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeStateValueAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class IcdManagementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000046L;
+
+    public IcdManagementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void registerClient(RegisterClientResponseCallback callback
+      , Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey) {
+      registerClient(chipClusterPtr, callback, checkInNodeID, monitoredSubject, key, verificationKey, null);
+    }
+
+    public void registerClient(RegisterClientResponseCallback callback
+      , Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey
+      , int timedInvokeTimeoutMs) {
+      registerClient(chipClusterPtr, callback, checkInNodeID, monitoredSubject, key, verificationKey, timedInvokeTimeoutMs);
+    }
+
+    public void unregisterClient(DefaultClusterCallback callback
+      , Long checkInNodeID, Optional<byte[]> verificationKey) {
+      unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, null);
+    }
+
+    public void unregisterClient(DefaultClusterCallback callback
+      , Long checkInNodeID, Optional<byte[]> verificationKey
+      , int timedInvokeTimeoutMs) {
+      unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, timedInvokeTimeoutMs);
+    }
+
+    public void stayActiveRequest(DefaultClusterCallback callback
+      ) {
+      stayActiveRequest(chipClusterPtr, callback, null);
+    }
+
+    public void stayActiveRequest(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      stayActiveRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void registerClient(long chipClusterPtr, RegisterClientResponseCallback Callback
+      , Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void unregisterClient(long chipClusterPtr, DefaultClusterCallback Callback
+      , Long checkInNodeID, Optional<byte[]> verificationKey
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stayActiveRequest(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface RegisterClientResponseCallback {
+      void onSuccess(Long ICDCounter);
+
+      void onError(Exception error);
+    }
+
+
+      public interface RegisteredClientsAttributeCallback {
+        void onSuccess( List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readIdleModeIntervalAttribute(
+      LongAttributeCallback callback
+    ) {
+      readIdleModeIntervalAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeIdleModeIntervalAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeIdleModeIntervalAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveModeIntervalAttribute(
+      LongAttributeCallback callback
+    ) {
+      readActiveModeIntervalAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveModeIntervalAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveModeIntervalAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveModeThresholdAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActiveModeThresholdAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveModeThresholdAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveModeThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRegisteredClientsAttribute(
+      RegisteredClientsAttributeCallback callback
+    ) {
+      readRegisteredClientsAttribute(chipClusterPtr, callback, true);
+    }
+    public void readRegisteredClientsAttributeWithFabricFilter(
+      RegisteredClientsAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readRegisteredClientsAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void subscribeRegisteredClientsAttribute(
+        RegisteredClientsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeRegisteredClientsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readICDCounterAttribute(
+      LongAttributeCallback callback
+    ) {
+      readICDCounterAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeICDCounterAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeICDCounterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClientsSupportedPerFabricAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClientsSupportedPerFabricAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClientsSupportedPerFabricAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClientsSupportedPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readIdleModeIntervalAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeIdleModeIntervalAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveModeIntervalAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeActiveModeIntervalAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveModeThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActiveModeThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRegisteredClientsAttribute(long chipClusterPtr,
+        RegisteredClientsAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+    private native void subscribeRegisteredClientsAttribute(long chipClusterPtr,
+        RegisteredClientsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readICDCounterAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeICDCounterAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClientsSupportedPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClientsSupportedPerFabricAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ModeSelectCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000050L;
+
+    public ModeSelectCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(DefaultClusterCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(DefaultClusterCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface StandardNamespaceAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readDescriptionAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readDescriptionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStandardNamespaceAttribute(
+      StandardNamespaceAttributeCallback callback
+    ) {
+      readStandardNamespaceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStandardNamespaceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeDescriptionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStandardNamespaceAttribute(long chipClusterPtr,
+        StandardNamespaceAttributeCallback callback
+    );
+    private native void subscribeStandardNamespaceAttribute(long chipClusterPtr,
+        StandardNamespaceAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class LaundryWasherModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000051L;
+
+    public LaundryWasherModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeToModeResponseCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RefrigeratorAndTemperatureControlledCabinetModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000052L;
+
+    public RefrigeratorAndTemperatureControlledCabinetModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeToModeResponseCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class LaundryWasherControlsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000053L;
+
+    public LaundryWasherControlsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface SpinSpeedsAttributeCallback {
+        void onSuccess( List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SpinSpeedCurrentAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SupportedRinsesAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSpinSpeedsAttribute(
+      SpinSpeedsAttributeCallback callback
+    ) {
+      readSpinSpeedsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSpinSpeedsAttribute(
+        SpinSpeedsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSpinSpeedsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSpinSpeedCurrentAttribute(
+      SpinSpeedCurrentAttributeCallback callback
+    ) {
+      readSpinSpeedCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSpinSpeedCurrentAttribute(
+        SpinSpeedCurrentAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSpinSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfRinsesAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfRinsesAttribute(chipClusterPtr, callback);
+    }
+    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNumberOfRinsesAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfRinsesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedRinsesAttribute(
+      SupportedRinsesAttributeCallback callback
+    ) {
+      readSupportedRinsesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedRinsesAttribute(
+        SupportedRinsesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedRinsesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSpinSpeedsAttribute(long chipClusterPtr,
+        SpinSpeedsAttributeCallback callback
+    );
+    private native void subscribeSpinSpeedsAttribute(long chipClusterPtr,
+        SpinSpeedsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSpinSpeedCurrentAttribute(long chipClusterPtr,
+        SpinSpeedCurrentAttributeCallback callback
+    );
+
+    private native void writeSpinSpeedCurrentAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSpinSpeedCurrentAttribute(long chipClusterPtr,
+        SpinSpeedCurrentAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNumberOfRinsesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeNumberOfRinsesAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNumberOfRinsesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedRinsesAttribute(long chipClusterPtr,
+        SupportedRinsesAttributeCallback callback
+    );
+    private native void subscribeSupportedRinsesAttribute(long chipClusterPtr,
+        SupportedRinsesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RvcRunModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000054L;
+
+    public RvcRunModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeToModeResponseCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RvcCleanModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000055L;
+
+    public RvcCleanModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeToModeResponseCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TemperatureControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000056L;
+
+    public TemperatureControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void setTemperature(DefaultClusterCallback callback
+      , Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel) {
+      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, null);
+    }
+
+    public void setTemperature(DefaultClusterCallback callback
+      , Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel
+      , int timedInvokeTimeoutMs) {
+      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, timedInvokeTimeoutMs);
+    }
+    private native void setTemperature(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface SupportedTemperatureLevelsAttributeCallback {
+        void onSuccess( List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readTemperatureSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTemperatureSetpointAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTemperatureSetpointAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTemperatureSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinTemperatureAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinTemperatureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinTemperatureAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxTemperatureAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxTemperatureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxTemperatureAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStepAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStepAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStepAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStepAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSelectedTemperatureLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSelectedTemperatureLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSelectedTemperatureLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSelectedTemperatureLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedTemperatureLevelsAttribute(
+      SupportedTemperatureLevelsAttributeCallback callback
+    ) {
+      readSupportedTemperatureLevelsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedTemperatureLevelsAttribute(
+        SupportedTemperatureLevelsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedTemperatureLevelsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTemperatureSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTemperatureSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinTemperatureAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMinTemperatureAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxTemperatureAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxTemperatureAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStepAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeStepAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSelectedTemperatureLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSelectedTemperatureLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedTemperatureLevelsAttribute(long chipClusterPtr,
+        SupportedTemperatureLevelsAttributeCallback callback
+    );
+    private native void subscribeSupportedTemperatureLevelsAttribute(long chipClusterPtr,
+        SupportedTemperatureLevelsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RefrigeratorAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000057L;
+
+    public RefrigeratorAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMaskAttribute(
+      LongAttributeCallback callback
+    ) {
+      readMaskAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaskAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStateAttribute(
+      LongAttributeCallback callback
+    ) {
+      readStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStateAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMaskAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeMaskAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeStateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeSupportedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class DishwasherModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000059L;
+
+    public DishwasherModeCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback
+      , Integer newMode
+      , int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    }
+    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback
+      , Integer newMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeToModeResponseCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
+
+      void onError(Exception error);
+    }
+
+
+      public interface SupportedModesAttributeCallback {
+        void onSuccess( List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OnModeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSupportedModesAttribute(
+      SupportedModesAttributeCallback callback
+    ) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(
+      StartUpModeAttributeCallback callback
+    ) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(
+      OnModeAttributeCallback callback
+    ) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+    );
+    private native void subscribeSupportedModesAttribute(long chipClusterPtr,
+        SupportedModesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+    );
+
+    private native void writeStartUpModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpModeAttribute(long chipClusterPtr,
+        StartUpModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+    );
+
+    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOnModeAttribute(long chipClusterPtr,
+        OnModeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class AirQualityCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000005BL;
+
+    public AirQualityCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readAirQualityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAirQualityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAirQualityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAirQualityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readAirQualityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAirQualityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class SmokeCoAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000005CL;
+
+    public SmokeCoAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void selfTestRequest(DefaultClusterCallback callback
+      ) {
+      selfTestRequest(chipClusterPtr, callback, null);
+    }
+
+    public void selfTestRequest(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      selfTestRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void selfTestRequest(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readExpressedStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readExpressedStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeExpressedStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeExpressedStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSmokeStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSmokeStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSmokeStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSmokeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCOStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCOStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCOStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCOStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBatteryAlertAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBatteryAlertAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBatteryAlertAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBatteryAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDeviceMutedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDeviceMutedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDeviceMutedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDeviceMutedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTestInProgressAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readTestInProgressAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTestInProgressAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTestInProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareFaultAlertAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readHardwareFaultAlertAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHardwareFaultAlertAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHardwareFaultAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEndOfServiceAlertAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEndOfServiceAlertAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEndOfServiceAlertAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEndOfServiceAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInterconnectSmokeAlarmAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInterconnectSmokeAlarmAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInterconnectSmokeAlarmAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInterconnectSmokeAlarmAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInterconnectCOAlarmAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInterconnectCOAlarmAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInterconnectCOAlarmAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInterconnectCOAlarmAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readContaminationStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readContaminationStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeContaminationStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeContaminationStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSmokeSensitivityLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSmokeSensitivityLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSmokeSensitivityLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readExpiryDateAttribute(
+      LongAttributeCallback callback
+    ) {
+      readExpiryDateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeExpiryDateAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeExpiryDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readExpressedStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeExpressedStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSmokeStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSmokeStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCOStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCOStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBatteryAlertAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBatteryAlertAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDeviceMutedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDeviceMutedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTestInProgressAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeTestInProgressAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHardwareFaultAlertAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeHardwareFaultAlertAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEndOfServiceAlertAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEndOfServiceAlertAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInterconnectSmokeAlarmAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInterconnectSmokeAlarmAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInterconnectCOAlarmAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInterconnectCOAlarmAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readContaminationStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeContaminationStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSmokeSensitivityLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeSmokeSensitivityLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSmokeSensitivityLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readExpiryDateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeExpiryDateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class DishwasherAlarmCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000005DL;
+
+    public DishwasherAlarmCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void reset(DefaultClusterCallback callback
+      , Long alarms) {
+      reset(chipClusterPtr, callback, alarms, null);
+    }
+
+    public void reset(DefaultClusterCallback callback
+      , Long alarms
+      , int timedInvokeTimeoutMs) {
+      reset(chipClusterPtr, callback, alarms, timedInvokeTimeoutMs);
+    }
+
+    public void modifyEnabledAlarms(DefaultClusterCallback callback
+      , Long mask) {
+      modifyEnabledAlarms(chipClusterPtr, callback, mask, null);
+    }
+
+    public void modifyEnabledAlarms(DefaultClusterCallback callback
+      , Long mask
+      , int timedInvokeTimeoutMs) {
+      modifyEnabledAlarms(chipClusterPtr, callback, mask, timedInvokeTimeoutMs);
+    }
+    private native void reset(long chipClusterPtr, DefaultClusterCallback Callback
+      , Long alarms
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void modifyEnabledAlarms(long chipClusterPtr, DefaultClusterCallback Callback
+      , Long mask
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMaskAttribute(
+      LongAttributeCallback callback
+    ) {
+      readMaskAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaskAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLatchAttribute(
+      LongAttributeCallback callback
+    ) {
+      readLatchAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLatchAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLatchAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStateAttribute(
+      LongAttributeCallback callback
+    ) {
+      readStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStateAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMaskAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeMaskAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLatchAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeLatchAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeStateAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeSupportedAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000060L;
+
+    public OperationalStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void pause(OperationalCommandResponseCallback callback
+      ) {
+      pause(chipClusterPtr, callback, null);
+    }
+
+    public void pause(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void stop(OperationalCommandResponseCallback callback
+      ) {
+      stop(chipClusterPtr, callback, null);
+    }
+
+    public void stop(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void start(OperationalCommandResponseCallback callback
+      ) {
+      start(chipClusterPtr, callback, null);
+    }
+
+    public void start(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      start(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void resume(OperationalCommandResponseCallback callback
+      ) {
+      resume(chipClusterPtr, callback, null);
+    }
+
+    public void resume(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resume(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void pause(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stop(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void start(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void resume(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface OperationalCommandResponseCallback {
+      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState);
+
+      void onError(Exception error);
+    }
+
+
+      public interface PhaseListAttributeCallback {
+        void onSuccess(@Nullable List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPhaseAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CountdownTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OperationalStateListAttributeCallback {
+        void onSuccess( List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readPhaseListAttribute(
+      PhaseListAttributeCallback callback
+    ) {
+      readPhaseListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhaseListAttribute(
+        PhaseListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPhaseAttribute(
+      CurrentPhaseAttributeCallback callback
+    ) {
+      readCurrentPhaseAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCountdownTimeAttribute(
+      CountdownTimeAttributeCallback callback
+    ) {
+      readCountdownTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationalStateListAttribute(
+      OperationalStateListAttributeCallback callback
+    ) {
+      readOperationalStateListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationalStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOperationalStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOperationalStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readPhaseListAttribute(long chipClusterPtr,
+        PhaseListAttributeCallback callback
+    );
+    private native void subscribePhaseListAttribute(long chipClusterPtr,
+        PhaseListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentPhaseAttribute(long chipClusterPtr,
+        CurrentPhaseAttributeCallback callback
+    );
+    private native void subscribeCurrentPhaseAttribute(long chipClusterPtr,
+        CurrentPhaseAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCountdownTimeAttribute(long chipClusterPtr,
+        CountdownTimeAttributeCallback callback
+    );
+    private native void subscribeCountdownTimeAttribute(long chipClusterPtr,
+        CountdownTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationalStateListAttribute(long chipClusterPtr,
+        OperationalStateListAttributeCallback callback
+    );
+    private native void subscribeOperationalStateListAttribute(long chipClusterPtr,
+        OperationalStateListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationalStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOperationalStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RvcOperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000061L;
+
+    public RvcOperationalStateCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void pause(OperationalCommandResponseCallback callback
+      ) {
+      pause(chipClusterPtr, callback, null);
+    }
+
+    public void pause(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void stop(OperationalCommandResponseCallback callback
+      ) {
+      stop(chipClusterPtr, callback, null);
+    }
+
+    public void stop(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void start(OperationalCommandResponseCallback callback
+      ) {
+      start(chipClusterPtr, callback, null);
+    }
+
+    public void start(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      start(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void resume(OperationalCommandResponseCallback callback
+      ) {
+      resume(chipClusterPtr, callback, null);
+    }
+
+    public void resume(OperationalCommandResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resume(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void pause(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stop(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void start(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void resume(long chipClusterPtr, OperationalCommandResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface OperationalCommandResponseCallback {
+      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState);
+
+      void onError(Exception error);
+    }
+
+
+      public interface PhaseListAttributeCallback {
+        void onSuccess(@Nullable List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPhaseAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CountdownTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OperationalStateListAttributeCallback {
+        void onSuccess( List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readPhaseListAttribute(
+      PhaseListAttributeCallback callback
+    ) {
+      readPhaseListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhaseListAttribute(
+        PhaseListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPhaseAttribute(
+      CurrentPhaseAttributeCallback callback
+    ) {
+      readCurrentPhaseAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPhaseAttribute(
+        CurrentPhaseAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCountdownTimeAttribute(
+      CountdownTimeAttributeCallback callback
+    ) {
+      readCountdownTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCountdownTimeAttribute(
+        CountdownTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationalStateListAttribute(
+      OperationalStateListAttributeCallback callback
+    ) {
+      readOperationalStateListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOperationalStateListAttribute(
+        OperationalStateListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationalStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOperationalStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOperationalStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readPhaseListAttribute(long chipClusterPtr,
+        PhaseListAttributeCallback callback
+    );
+    private native void subscribePhaseListAttribute(long chipClusterPtr,
+        PhaseListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentPhaseAttribute(long chipClusterPtr,
+        CurrentPhaseAttributeCallback callback
+    );
+    private native void subscribeCurrentPhaseAttribute(long chipClusterPtr,
+        CurrentPhaseAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCountdownTimeAttribute(long chipClusterPtr,
+        CountdownTimeAttributeCallback callback
+    );
+    private native void subscribeCountdownTimeAttribute(long chipClusterPtr,
+        CountdownTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationalStateListAttribute(long chipClusterPtr,
+        OperationalStateListAttributeCallback callback
+    );
+    private native void subscribeOperationalStateListAttribute(long chipClusterPtr,
+        OperationalStateListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationalStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOperationalStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class HepaFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000071L;
+
+    public HepaFilterMonitoringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetCondition(DefaultClusterCallback callback
+      ) {
+      resetCondition(chipClusterPtr, callback, null);
+    }
+
+    public void resetCondition(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetCondition(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface LastChangedTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ReplacementProductListAttributeCallback {
+        void onSuccess( List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readConditionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readConditionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeConditionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDegradationDirectionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDegradationDirectionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDegradationDirectionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChangeIndicationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readChangeIndicationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChangeIndicationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInPlaceIndicatorAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readInPlaceIndicatorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastChangedTimeAttribute(
+      LastChangedTimeAttributeCallback callback
+    ) {
+      readLastChangedTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReplacementProductListAttribute(
+      ReplacementProductListAttributeCallback callback
+    ) {
+      readReplacementProductListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readConditionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeConditionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDegradationDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDegradationDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readChangeIndicationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeChangeIndicationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInPlaceIndicatorAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeInPlaceIndicatorAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLastChangedTimeAttribute(long chipClusterPtr,
+        LastChangedTimeAttributeCallback callback
+    );
+
+    private native void writeLastChangedTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLastChangedTimeAttribute(long chipClusterPtr,
+        LastChangedTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readReplacementProductListAttribute(long chipClusterPtr,
+        ReplacementProductListAttributeCallback callback
+    );
+    private native void subscribeReplacementProductListAttribute(long chipClusterPtr,
+        ReplacementProductListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ActivatedCarbonFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000072L;
+
+    public ActivatedCarbonFilterMonitoringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void resetCondition(DefaultClusterCallback callback
+      ) {
+      resetCondition(chipClusterPtr, callback, null);
+    }
+
+    public void resetCondition(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void resetCondition(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface LastChangedTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ReplacementProductListAttributeCallback {
+        void onSuccess( List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readConditionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readConditionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeConditionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDegradationDirectionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDegradationDirectionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDegradationDirectionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChangeIndicationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readChangeIndicationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChangeIndicationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInPlaceIndicatorAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readInPlaceIndicatorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInPlaceIndicatorAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLastChangedTimeAttribute(
+      LastChangedTimeAttributeCallback callback
+    ) {
+      readLastChangedTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLastChangedTimeAttribute(
+        LastChangedTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReplacementProductListAttribute(
+      ReplacementProductListAttributeCallback callback
+    ) {
+      readReplacementProductListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReplacementProductListAttribute(
+        ReplacementProductListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readConditionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeConditionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDegradationDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDegradationDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readChangeIndicationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeChangeIndicationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInPlaceIndicatorAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeInPlaceIndicatorAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLastChangedTimeAttribute(long chipClusterPtr,
+        LastChangedTimeAttributeCallback callback
+    );
+
+    private native void writeLastChangedTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLastChangedTimeAttribute(long chipClusterPtr,
+        LastChangedTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readReplacementProductListAttribute(long chipClusterPtr,
+        ReplacementProductListAttributeCallback callback
+    );
+    private native void subscribeReplacementProductListAttribute(long chipClusterPtr,
+        ReplacementProductListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BooleanSensorConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000080L;
+
+    public BooleanSensorConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void supressRequest(DefaultClusterCallback callback
+      , Integer alarmsToSuppress) {
+      supressRequest(chipClusterPtr, callback, alarmsToSuppress, null);
+    }
+
+    public void supressRequest(DefaultClusterCallback callback
+      , Integer alarmsToSuppress
+      , int timedInvokeTimeoutMs) {
+      supressRequest(chipClusterPtr, callback, alarmsToSuppress, timedInvokeTimeoutMs);
+    }
+    private native void supressRequest(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer alarmsToSuppress
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readSensitivityLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSensitivityLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSensitivityLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSensitivityLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAlarmsActiveAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAlarmsActiveAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAlarmsActiveAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAlarmsActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAlarmsSuppressedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAlarmsSuppressedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAlarmsSuppressedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAlarmsSuppressedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAlarmsEnabledAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAlarmsEnabledAttribute(chipClusterPtr, callback);
+    }
+    public void writeAlarmsEnabledAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAlarmsEnabledAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAlarmsEnabledAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeAlarmsEnabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAlarmsEnabledAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAlarmsEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSensitivityLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeSensitivityLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSensitivityLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAlarmsActiveAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAlarmsActiveAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAlarmsSuppressedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAlarmsSuppressedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAlarmsEnabledAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeAlarmsEnabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAlarmsEnabledAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ValveConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000081L;
+
+    public ValveConfigurationAndControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void open(DefaultClusterCallback callback
+      , Optional<Long> openDuration) {
+      open(chipClusterPtr, callback, openDuration, null);
+    }
+
+    public void open(DefaultClusterCallback callback
+      , Optional<Long> openDuration
+      , int timedInvokeTimeoutMs) {
+      open(chipClusterPtr, callback, openDuration, timedInvokeTimeoutMs);
+    }
+
+    public void close(DefaultClusterCallback callback
+      ) {
+      close(chipClusterPtr, callback, null);
+    }
+
+    public void close(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      close(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void setLevel(DefaultClusterCallback callback
+      , Integer level, Optional<Long> openDuration) {
+      setLevel(chipClusterPtr, callback, level, openDuration, null);
+    }
+
+    public void setLevel(DefaultClusterCallback callback
+      , Integer level, Optional<Long> openDuration
+      , int timedInvokeTimeoutMs) {
+      setLevel(chipClusterPtr, callback, level, openDuration, timedInvokeTimeoutMs);
+    }
+    private native void open(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<Long> openDuration
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void close(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setLevel(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer level, Optional<Long> openDuration
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface OpenDurationAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AutoCloseTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface RemainingDurationAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentStateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TargetStateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TargetLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OpenLevelAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readOpenDurationAttribute(
+      OpenDurationAttributeCallback callback
+    ) {
+      readOpenDurationAttribute(chipClusterPtr, callback);
+    }
+    public void writeOpenDurationAttribute(DefaultClusterCallback callback, Long value) {
+      writeOpenDurationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOpenDurationAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeOpenDurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOpenDurationAttribute(
+        OpenDurationAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOpenDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAutoCloseTimeAttribute(
+      AutoCloseTimeAttributeCallback callback
+    ) {
+      readAutoCloseTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAutoCloseTimeAttribute(
+        AutoCloseTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAutoCloseTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRemainingDurationAttribute(
+      RemainingDurationAttributeCallback callback
+    ) {
+      readRemainingDurationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRemainingDurationAttribute(
+        RemainingDurationAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeRemainingDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentStateAttribute(
+      CurrentStateAttributeCallback callback
+    ) {
+      readCurrentStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentStateAttribute(
+        CurrentStateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTargetStateAttribute(
+      TargetStateAttributeCallback callback
+    ) {
+      readTargetStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetStateAttribute(
+        TargetStateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTargetStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStartUpStateAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpStateAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpStateAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpStateAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpStateAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStartUpStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentLevelAttribute(
+      CurrentLevelAttributeCallback callback
+    ) {
+      readCurrentLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentLevelAttribute(
+        CurrentLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTargetLevelAttribute(
+      TargetLevelAttributeCallback callback
+    ) {
+      readTargetLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetLevelAttribute(
+        TargetLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTargetLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOpenLevelAttribute(
+      OpenLevelAttributeCallback callback
+    ) {
+      readOpenLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeOpenLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOpenLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOpenLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOpenLevelAttribute(
+        OpenLevelAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOpenLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readValveFaultAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readValveFaultAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeValveFaultAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeValveFaultAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readOpenDurationAttribute(long chipClusterPtr,
+        OpenDurationAttributeCallback callback
+    );
+
+    private native void writeOpenDurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOpenDurationAttribute(long chipClusterPtr,
+        OpenDurationAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAutoCloseTimeAttribute(long chipClusterPtr,
+        AutoCloseTimeAttributeCallback callback
+    );
+    private native void subscribeAutoCloseTimeAttribute(long chipClusterPtr,
+        AutoCloseTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readRemainingDurationAttribute(long chipClusterPtr,
+        RemainingDurationAttributeCallback callback
+    );
+    private native void subscribeRemainingDurationAttribute(long chipClusterPtr,
+        RemainingDurationAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentStateAttribute(long chipClusterPtr,
+        CurrentStateAttributeCallback callback
+    );
+    private native void subscribeCurrentStateAttribute(long chipClusterPtr,
+        CurrentStateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTargetStateAttribute(long chipClusterPtr,
+        TargetStateAttributeCallback callback
+    );
+    private native void subscribeTargetStateAttribute(long chipClusterPtr,
+        TargetStateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readStartUpStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeStartUpStateAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentLevelAttribute(long chipClusterPtr,
+        CurrentLevelAttributeCallback callback
+    );
+    private native void subscribeCurrentLevelAttribute(long chipClusterPtr,
+        CurrentLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTargetLevelAttribute(long chipClusterPtr,
+        TargetLevelAttributeCallback callback
+    );
+    private native void subscribeTargetLevelAttribute(long chipClusterPtr,
+        TargetLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOpenLevelAttribute(long chipClusterPtr,
+        OpenLevelAttributeCallback callback
+    );
+
+    private native void writeOpenLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOpenLevelAttribute(long chipClusterPtr,
+        OpenLevelAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readValveFaultAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeValveFaultAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class DoorLockCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000101L;
+
+    public DoorLockCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+
+    public void lockDoor(DefaultClusterCallback callback
+      , Optional<byte[]> PINCode
+      , int timedInvokeTimeoutMs) {
+      lockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+    }
+
+
+    public void unlockDoor(DefaultClusterCallback callback
+      , Optional<byte[]> PINCode
+      , int timedInvokeTimeoutMs) {
+      unlockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+    }
+
+
+    public void unlockWithTimeout(DefaultClusterCallback callback
+      , Integer timeout, Optional<byte[]> PINCode
+      , int timedInvokeTimeoutMs) {
+      unlockWithTimeout(chipClusterPtr, callback, timeout, PINCode, timedInvokeTimeoutMs);
+    }
+
+    public void setWeekDaySchedule(DefaultClusterCallback callback
+      , Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute) {
+      setWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, daysMask, startHour, startMinute, endHour, endMinute, null);
+    }
+
+    public void setWeekDaySchedule(DefaultClusterCallback callback
+      , Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute
+      , int timedInvokeTimeoutMs) {
+      setWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, daysMask, startHour, startMinute, endHour, endMinute, timedInvokeTimeoutMs);
+    }
+
+    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback
+      , Integer weekDayIndex, Integer userIndex) {
+      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    }
+
+    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback
+      , Integer weekDayIndex, Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void clearWeekDaySchedule(DefaultClusterCallback callback
+      , Integer weekDayIndex, Integer userIndex) {
+      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    }
+
+    public void clearWeekDaySchedule(DefaultClusterCallback callback
+      , Integer weekDayIndex, Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void setYearDaySchedule(DefaultClusterCallback callback
+      , Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime) {
+      setYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, null);
+    }
+
+    public void setYearDaySchedule(DefaultClusterCallback callback
+      , Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime
+      , int timedInvokeTimeoutMs) {
+      setYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, timedInvokeTimeoutMs);
+    }
+
+    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback
+      , Integer yearDayIndex, Integer userIndex) {
+      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
+    }
+
+    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback
+      , Integer yearDayIndex, Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void clearYearDaySchedule(DefaultClusterCallback callback
+      , Integer yearDayIndex, Integer userIndex) {
+      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
+    }
+
+    public void clearYearDaySchedule(DefaultClusterCallback callback
+      , Integer yearDayIndex, Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void setHolidaySchedule(DefaultClusterCallback callback
+      , Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode) {
+      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, null);
+    }
+
+    public void setHolidaySchedule(DefaultClusterCallback callback
+      , Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode
+      , int timedInvokeTimeoutMs) {
+      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, timedInvokeTimeoutMs);
+    }
+
+    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback
+      , Integer holidayIndex) {
+      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    }
+
+    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback
+      , Integer holidayIndex
+      , int timedInvokeTimeoutMs) {
+      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+    }
+
+    public void clearHolidaySchedule(DefaultClusterCallback callback
+      , Integer holidayIndex) {
+      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    }
+
+    public void clearHolidaySchedule(DefaultClusterCallback callback
+      , Integer holidayIndex
+      , int timedInvokeTimeoutMs) {
+      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+    }
+
+
+    public void setUser(DefaultClusterCallback callback
+      , Integer operationType, Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule
+      , int timedInvokeTimeoutMs) {
+      setUser(chipClusterPtr, callback, operationType, userIndex, userName, userUniqueID, userStatus, userType, credentialRule, timedInvokeTimeoutMs);
+    }
+
+    public void getUser(GetUserResponseCallback callback
+      , Integer userIndex) {
+      getUser(chipClusterPtr, callback, userIndex, null);
+    }
+
+    public void getUser(GetUserResponseCallback callback
+      , Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      getUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
+    }
+
+
+    public void clearUser(DefaultClusterCallback callback
+      , Integer userIndex
+      , int timedInvokeTimeoutMs) {
+      clearUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
+    }
+
+
+    public void setCredential(SetCredentialResponseCallback callback
+      , Integer operationType, ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @Nullable Integer userType
+      , int timedInvokeTimeoutMs) {
+      setCredential(chipClusterPtr, callback, operationType, credential, credentialData, userIndex, userStatus, userType, timedInvokeTimeoutMs);
+    }
+
+    public void getCredentialStatus(GetCredentialStatusResponseCallback callback
+      , ChipStructs.DoorLockClusterCredentialStruct credential) {
+      getCredentialStatus(chipClusterPtr, callback, credential, null);
+    }
+
+    public void getCredentialStatus(GetCredentialStatusResponseCallback callback
+      , ChipStructs.DoorLockClusterCredentialStruct credential
+      , int timedInvokeTimeoutMs) {
+      getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+    }
+
+
+    public void clearCredential(DefaultClusterCallback callback
+      , @Nullable ChipStructs.DoorLockClusterCredentialStruct credential
+      , int timedInvokeTimeoutMs) {
+      clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+    }
+
+
+    public void unboltDoor(DefaultClusterCallback callback
+      , Optional<byte[]> PINCode
+      , int timedInvokeTimeoutMs) {
+      unboltDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+    }
+    private native void lockDoor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<byte[]> PINCode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void unlockDoor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<byte[]> PINCode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void unlockWithTimeout(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer timeout, Optional<byte[]> PINCode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setWeekDaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer weekDayIndex, Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getWeekDaySchedule(long chipClusterPtr, GetWeekDayScheduleResponseCallback Callback
+      , Integer weekDayIndex, Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearWeekDaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer weekDayIndex, Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setYearDaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getYearDaySchedule(long chipClusterPtr, GetYearDayScheduleResponseCallback Callback
+      , Integer yearDayIndex, Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearYearDaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer yearDayIndex, Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setHolidaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getHolidaySchedule(long chipClusterPtr, GetHolidayScheduleResponseCallback Callback
+      , Integer holidayIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearHolidaySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer holidayIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setUser(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer operationType, Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getUser(long chipClusterPtr, GetUserResponseCallback Callback
+      , Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearUser(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer userIndex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setCredential(long chipClusterPtr, SetCredentialResponseCallback Callback
+      , Integer operationType, ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @Nullable Integer userType
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getCredentialStatus(long chipClusterPtr, GetCredentialStatusResponseCallback Callback
+      , ChipStructs.DoorLockClusterCredentialStruct credential
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearCredential(long chipClusterPtr, DefaultClusterCallback Callback
+      , @Nullable ChipStructs.DoorLockClusterCredentialStruct credential
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void unboltDoor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<byte[]> PINCode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetWeekDayScheduleResponseCallback {
+      void onSuccess(Integer weekDayIndex, Integer userIndex, Integer status, Optional<Integer> daysMask, Optional<Integer> startHour, Optional<Integer> startMinute, Optional<Integer> endHour, Optional<Integer> endMinute);
+
+      void onError(Exception error);
+    }
+
+    public interface GetYearDayScheduleResponseCallback {
+      void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime);
+
+      void onError(Exception error);
+    }
+
+    public interface GetHolidayScheduleResponseCallback {
+      void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode);
+
+      void onError(Exception error);
+    }
+
+    public interface GetUserResponseCallback {
+      void onSuccess(Integer userIndex, @Nullable String userName, @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> credentials, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextUserIndex);
+
+      void onError(Exception error);
+    }
+
+    public interface SetCredentialResponseCallback {
+      void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
+
+      void onError(Exception error);
+    }
+
+    public interface GetCredentialStatusResponseCallback {
+      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);
+
+      void onError(Exception error);
+    }
+
+
+      public interface LockStateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DoorStateAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readLockStateAttribute(
+      LockStateAttributeCallback callback
+    ) {
+      readLockStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLockStateAttribute(
+        LockStateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLockTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLockTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLockTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActuatorEnabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readActuatorEnabledAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActuatorEnabledAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActuatorEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDoorStateAttribute(
+      DoorStateAttributeCallback callback
+    ) {
+      readDoorStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDoorStateAttribute(
+        DoorStateAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDoorStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDoorOpenEventsAttribute(
+      LongAttributeCallback callback
+    ) {
+      readDoorOpenEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeDoorOpenEventsAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDoorOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDoorClosedEventsAttribute(
+      LongAttributeCallback callback
+    ) {
+      readDoorClosedEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeDoorClosedEventsAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDoorClosedEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOpenPeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOpenPeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOpenPeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOpenPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfTotalUsersSupportedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfTotalUsersSupportedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfPINUsersSupportedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfPINUsersSupportedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfRFIDUsersSupportedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfRFIDUsersSupportedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfHolidaySchedulesSupportedAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxPINCodeLengthAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxPINCodeLengthAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxPINCodeLengthAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinPINCodeLengthAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinPINCodeLengthAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinPINCodeLengthAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxRFIDCodeLengthAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinRFIDCodeLengthAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCredentialRulesSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCredentialRulesSupportAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCredentialRulesSupportAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCredentialRulesSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfCredentialsSupportedPerUserAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLanguageAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readLanguageAttribute(chipClusterPtr, callback);
+    }
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
+      writeLanguageAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLanguageAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLanguageAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLanguageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLEDSettingsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLEDSettingsAttribute(chipClusterPtr, callback);
+    }
+    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLEDSettingsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeLEDSettingsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLEDSettingsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLEDSettingsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAutoRelockTimeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAutoRelockTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAutoRelockTimeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAutoRelockTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoundVolumeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSoundVolumeAttribute(chipClusterPtr, callback);
+    }
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSoundVolumeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSoundVolumeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSoundVolumeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSoundVolumeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperatingModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOperatingModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperatingModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOperatingModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOperatingModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOperatingModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedOperatingModesAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSupportedOperatingModesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSupportedOperatingModesAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportedOperatingModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDefaultConfigurationRegisterAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDefaultConfigurationRegisterAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDefaultConfigurationRegisterAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDefaultConfigurationRegisterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnableLocalProgrammingAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readEnableLocalProgrammingAttribute(chipClusterPtr, callback);
+    }
+    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnableLocalProgrammingAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnableLocalProgrammingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnableOneTouchLockingAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readEnableOneTouchLockingAttribute(chipClusterPtr, callback);
+    }
+    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnableOneTouchLockingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnableInsideStatusLEDAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readEnableInsideStatusLEDAttribute(chipClusterPtr, callback);
+    }
+    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnableInsideStatusLEDAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnablePrivacyModeButtonAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readEnablePrivacyModeButtonAttribute(chipClusterPtr, callback);
+    }
+    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnablePrivacyModeButtonAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocalProgrammingFeaturesAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLocalProgrammingFeaturesAttribute(chipClusterPtr, callback);
+    }
+    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLocalProgrammingFeaturesAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWrongCodeEntryLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWrongCodeEntryLimitAttribute(chipClusterPtr, callback);
+    }
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeWrongCodeEntryLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUserCodeTemporaryDisableTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback);
+    }
+    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUserCodeTemporaryDisableTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSendPINOverTheAirAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readSendPINOverTheAirAttribute(chipClusterPtr, callback);
+    }
+    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeSendPINOverTheAirAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeSendPINOverTheAirAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSendPINOverTheAirAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSendPINOverTheAirAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRequirePINforRemoteOperationAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readRequirePINforRemoteOperationAttribute(chipClusterPtr, callback);
+    }
+    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRequirePINforRemoteOperationAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readExpiringUserTimeoutAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readExpiringUserTimeoutAttribute(chipClusterPtr, callback);
+    }
+    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeExpiringUserTimeoutAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeExpiringUserTimeoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readLockStateAttribute(long chipClusterPtr,
+        LockStateAttributeCallback callback
+    );
+    private native void subscribeLockStateAttribute(long chipClusterPtr,
+        LockStateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLockTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLockTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActuatorEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+    private native void subscribeActuatorEnabledAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDoorStateAttribute(long chipClusterPtr,
+        DoorStateAttributeCallback callback
+    );
+    private native void subscribeDoorStateAttribute(long chipClusterPtr,
+        DoorStateAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDoorOpenEventsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeDoorOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeDoorOpenEventsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDoorClosedEventsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeDoorClosedEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeDoorClosedEventsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOpenPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOpenPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfTotalUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfTotalUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfPINUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfPINUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfYearDaySchedulesSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxPINCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxPINCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinPINCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMinPINCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxRFIDCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMaxRFIDCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinRFIDCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMinRFIDCodeLengthAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCredentialRulesSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCredentialRulesSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfCredentialsSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfCredentialsSupportedPerUserAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLanguageAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeLanguageAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLanguageAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLEDSettingsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeLEDSettingsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLEDSettingsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAutoRelockTimeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeAutoRelockTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAutoRelockTimeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSoundVolumeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeSoundVolumeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSoundVolumeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOperatingModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOperatingModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOperatingModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSupportedOperatingModesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSupportedOperatingModesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDefaultConfigurationRegisterAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDefaultConfigurationRegisterAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnableLocalProgrammingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeEnableLocalProgrammingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnableLocalProgrammingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnableOneTouchLockingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeEnableOneTouchLockingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnableOneTouchLockingAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnableInsideStatusLEDAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeEnableInsideStatusLEDAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnableInsideStatusLEDAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnablePrivacyModeButtonAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeEnablePrivacyModeButtonAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnablePrivacyModeButtonAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLocalProgrammingFeaturesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeLocalProgrammingFeaturesAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLocalProgrammingFeaturesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWrongCodeEntryLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeWrongCodeEntryLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeWrongCodeEntryLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSendPINOverTheAirAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeSendPINOverTheAirAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSendPINOverTheAirAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRequirePINforRemoteOperationAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeRequirePINforRemoteOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRequirePINforRemoteOperationAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readExpiringUserTimeoutAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeExpiringUserTimeoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeExpiringUserTimeoutAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class WindowCoveringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000102L;
+
+    public WindowCoveringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void upOrOpen(DefaultClusterCallback callback
+      ) {
+      upOrOpen(chipClusterPtr, callback, null);
+    }
+
+    public void upOrOpen(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      upOrOpen(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void downOrClose(DefaultClusterCallback callback
+      ) {
+      downOrClose(chipClusterPtr, callback, null);
+    }
+
+    public void downOrClose(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      downOrClose(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void stopMotion(DefaultClusterCallback callback
+      ) {
+      stopMotion(chipClusterPtr, callback, null);
+    }
+
+    public void stopMotion(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      stopMotion(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void goToLiftValue(DefaultClusterCallback callback
+      , Integer liftValue) {
+      goToLiftValue(chipClusterPtr, callback, liftValue, null);
+    }
+
+    public void goToLiftValue(DefaultClusterCallback callback
+      , Integer liftValue
+      , int timedInvokeTimeoutMs) {
+      goToLiftValue(chipClusterPtr, callback, liftValue, timedInvokeTimeoutMs);
+    }
+
+    public void goToLiftPercentage(DefaultClusterCallback callback
+      , Integer liftPercent100thsValue) {
+      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, null);
+    }
+
+    public void goToLiftPercentage(DefaultClusterCallback callback
+      , Integer liftPercent100thsValue
+      , int timedInvokeTimeoutMs) {
+      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, timedInvokeTimeoutMs);
+    }
+
+    public void goToTiltValue(DefaultClusterCallback callback
+      , Integer tiltValue) {
+      goToTiltValue(chipClusterPtr, callback, tiltValue, null);
+    }
+
+    public void goToTiltValue(DefaultClusterCallback callback
+      , Integer tiltValue
+      , int timedInvokeTimeoutMs) {
+      goToTiltValue(chipClusterPtr, callback, tiltValue, timedInvokeTimeoutMs);
+    }
+
+    public void goToTiltPercentage(DefaultClusterCallback callback
+      , Integer tiltPercent100thsValue) {
+      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, null);
+    }
+
+    public void goToTiltPercentage(DefaultClusterCallback callback
+      , Integer tiltPercent100thsValue
+      , int timedInvokeTimeoutMs) {
+      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, timedInvokeTimeoutMs);
+    }
+    private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void downOrClose(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stopMotion(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void goToLiftValue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer liftValue
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void goToLiftPercentage(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer liftPercent100thsValue
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void goToTiltValue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer tiltValue
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void goToTiltPercentage(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer tiltPercent100thsValue
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface CurrentPositionLiftAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPositionTiltAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPositionLiftPercentageAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPositionTiltPercentageAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TargetPositionLiftPercent100thsAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TargetPositionTiltPercent100thsAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPositionLiftPercent100thsAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CurrentPositionTiltPercent100thsAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalClosedLimitLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalClosedLimitLiftAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalClosedLimitTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionLiftAttribute(
+      CurrentPositionLiftAttributeCallback callback
+    ) {
+      readCurrentPositionLiftAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionTiltAttribute(
+      CurrentPositionTiltAttributeCallback callback
+    ) {
+      readCurrentPositionTiltAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfActuationsLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfActuationsLiftAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfActuationsTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfActuationsTiltAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readConfigStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readConfigStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeConfigStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeConfigStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionLiftPercentageAttribute(
+      CurrentPositionLiftPercentageAttributeCallback callback
+    ) {
+      readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionTiltPercentageAttribute(
+      CurrentPositionTiltPercentageAttributeCallback callback
+    ) {
+      readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationalStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOperationalStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOperationalStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTargetPositionLiftPercent100thsAttribute(
+      TargetPositionLiftPercent100thsAttributeCallback callback
+    ) {
+      readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTargetPositionTiltPercent100thsAttribute(
+      TargetPositionTiltPercent100thsAttributeCallback callback
+    ) {
+      readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEndProductTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEndProductTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEndProductTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEndProductTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionLiftPercent100thsAttribute(
+      CurrentPositionLiftPercent100thsAttributeCallback callback
+    ) {
+      readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentPositionTiltPercent100thsAttribute(
+      CurrentPositionTiltPercent100thsAttributeCallback callback
+    ) {
+      readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstalledOpenLimitLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstalledOpenLimitLiftAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstalledOpenLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstalledClosedLimitLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstalledClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstalledOpenLimitTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstalledOpenLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstalledClosedLimitTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstalledClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSafetyStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSafetyStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSafetyStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalClosedLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePhysicalClosedLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalClosedLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePhysicalClosedLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentPositionLiftAttribute(long chipClusterPtr,
+        CurrentPositionLiftAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionLiftAttribute(long chipClusterPtr,
+        CurrentPositionLiftAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentPositionTiltAttribute(long chipClusterPtr,
+        CurrentPositionTiltAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionTiltAttribute(long chipClusterPtr,
+        CurrentPositionTiltAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNumberOfActuationsLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfActuationsLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfActuationsTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfActuationsTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readConfigStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeConfigStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentPositionLiftPercentageAttribute(long chipClusterPtr,
+        CurrentPositionLiftPercentageAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionLiftPercentageAttribute(long chipClusterPtr,
+        CurrentPositionLiftPercentageAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentPositionTiltPercentageAttribute(long chipClusterPtr,
+        CurrentPositionTiltPercentageAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionTiltPercentageAttribute(long chipClusterPtr,
+        CurrentPositionTiltPercentageAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationalStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOperationalStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTargetPositionLiftPercent100thsAttribute(long chipClusterPtr,
+        TargetPositionLiftPercent100thsAttributeCallback callback
+    );
+    private native void subscribeTargetPositionLiftPercent100thsAttribute(long chipClusterPtr,
+        TargetPositionLiftPercent100thsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTargetPositionTiltPercent100thsAttribute(long chipClusterPtr,
+        TargetPositionTiltPercent100thsAttributeCallback callback
+    );
+    private native void subscribeTargetPositionTiltPercent100thsAttribute(long chipClusterPtr,
+        TargetPositionTiltPercent100thsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEndProductTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEndProductTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr,
+        CurrentPositionLiftPercent100thsAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr,
+        CurrentPositionLiftPercent100thsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr,
+        CurrentPositionTiltPercent100thsAttributeCallback callback
+    );
+    private native void subscribeCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr,
+        CurrentPositionTiltPercent100thsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readInstalledOpenLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstalledOpenLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstalledClosedLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstalledClosedLimitLiftAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstalledOpenLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstalledOpenLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstalledClosedLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstalledClosedLimitTiltAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSafetyStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSafetyStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BarrierControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000103L;
+
+    public BarrierControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void barrierControlGoToPercent(DefaultClusterCallback callback
+      , Integer percentOpen) {
+      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, null);
+    }
+
+    public void barrierControlGoToPercent(DefaultClusterCallback callback
+      , Integer percentOpen
+      , int timedInvokeTimeoutMs) {
+      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, timedInvokeTimeoutMs);
+    }
+
+    public void barrierControlStop(DefaultClusterCallback callback
+      ) {
+      barrierControlStop(chipClusterPtr, callback, null);
+    }
+
+    public void barrierControlStop(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      barrierControlStop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void barrierControlGoToPercent(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer percentOpen
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readBarrierMovingStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierMovingStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBarrierMovingStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierMovingStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierSafetyStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBarrierSafetyStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierCapabilitiesAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBarrierCapabilitiesAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierOpenEventsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierOpenEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierOpenEventsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierCloseEventsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierCloseEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierCloseEventsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierCommandOpenEventsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierCommandOpenEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierCommandOpenEventsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierCommandCloseEventsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierCommandCloseEventsAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierCommandCloseEventsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierOpenPeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierOpenPeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierOpenPeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierOpenPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierClosePeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierClosePeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierClosePeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBarrierClosePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBarrierClosePeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierClosePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBarrierPositionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBarrierPositionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBarrierPositionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBarrierPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readBarrierMovingStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBarrierMovingStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierSafetyStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBarrierSafetyStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierCapabilitiesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBarrierCapabilitiesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierOpenEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierOpenEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierCloseEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierCloseEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierCloseEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierCommandOpenEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierCommandOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierCommandOpenEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierCommandCloseEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierCommandCloseEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierCommandCloseEventsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierOpenPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierOpenPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierClosePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBarrierClosePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBarrierClosePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBarrierPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBarrierPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000200L;
+
+    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MaxPressureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxSpeedAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxFlowAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinConstPressureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxConstPressureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinCompPressureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxCompPressureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinConstSpeedAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxConstSpeedAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinConstFlowAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxConstFlowAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinConstTempAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxConstTempAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface CapacityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SpeedAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LifetimeRunningHoursAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PowerAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LifetimeEnergyConsumedAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMaxPressureAttribute(
+      MaxPressureAttributeCallback callback
+    ) {
+      readMaxPressureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxPressureAttribute(
+        MaxPressureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxSpeedAttribute(
+      MaxSpeedAttributeCallback callback
+    ) {
+      readMaxSpeedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxFlowAttribute(
+      MaxFlowAttributeCallback callback
+    ) {
+      readMaxFlowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxFlowAttribute(
+        MaxFlowAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinConstPressureAttribute(
+      MinConstPressureAttributeCallback callback
+    ) {
+      readMinConstPressureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxConstPressureAttribute(
+      MaxConstPressureAttributeCallback callback
+    ) {
+      readMaxConstPressureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinCompPressureAttribute(
+      MinCompPressureAttributeCallback callback
+    ) {
+      readMinCompPressureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxCompPressureAttribute(
+      MaxCompPressureAttributeCallback callback
+    ) {
+      readMaxCompPressureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinConstSpeedAttribute(
+      MinConstSpeedAttributeCallback callback
+    ) {
+      readMinConstSpeedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxConstSpeedAttribute(
+      MaxConstSpeedAttributeCallback callback
+    ) {
+      readMaxConstSpeedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinConstFlowAttribute(
+      MinConstFlowAttributeCallback callback
+    ) {
+      readMinConstFlowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxConstFlowAttribute(
+      MaxConstFlowAttributeCallback callback
+    ) {
+      readMaxConstFlowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinConstTempAttribute(
+      MinConstTempAttributeCallback callback
+    ) {
+      readMinConstTempAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinConstTempAttribute(
+        MinConstTempAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxConstTempAttribute(
+      MaxConstTempAttributeCallback callback
+    ) {
+      readMaxConstTempAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPumpStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPumpStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePumpStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEffectiveOperationModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEffectiveOperationModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEffectiveOperationModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEffectiveOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEffectiveControlModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEffectiveControlModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEffectiveControlModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEffectiveControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCapacityAttribute(
+      CapacityAttributeCallback callback
+    ) {
+      readCapacityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCapacityAttribute(
+        CapacityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSpeedAttribute(
+      SpeedAttributeCallback callback
+    ) {
+      readSpeedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSpeedAttribute(
+        SpeedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLifetimeRunningHoursAttribute(
+      LifetimeRunningHoursAttributeCallback callback
+    ) {
+      readLifetimeRunningHoursAttribute(chipClusterPtr, callback);
+    }
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLifetimeRunningHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerAttribute(
+      PowerAttributeCallback callback
+    ) {
+      readPowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerAttribute(
+        PowerAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLifetimeEnergyConsumedAttribute(
+      LifetimeEnergyConsumedAttributeCallback callback
+    ) {
+      readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
+    }
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOperationModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOperationModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperationModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOperationModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readControlModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readControlModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeControlModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeControlModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMaxPressureAttribute(long chipClusterPtr,
+        MaxPressureAttributeCallback callback
+    );
+    private native void subscribeMaxPressureAttribute(long chipClusterPtr,
+        MaxPressureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxSpeedAttribute(long chipClusterPtr,
+        MaxSpeedAttributeCallback callback
+    );
+    private native void subscribeMaxSpeedAttribute(long chipClusterPtr,
+        MaxSpeedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxFlowAttribute(long chipClusterPtr,
+        MaxFlowAttributeCallback callback
+    );
+    private native void subscribeMaxFlowAttribute(long chipClusterPtr,
+        MaxFlowAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinConstPressureAttribute(long chipClusterPtr,
+        MinConstPressureAttributeCallback callback
+    );
+    private native void subscribeMinConstPressureAttribute(long chipClusterPtr,
+        MinConstPressureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxConstPressureAttribute(long chipClusterPtr,
+        MaxConstPressureAttributeCallback callback
+    );
+    private native void subscribeMaxConstPressureAttribute(long chipClusterPtr,
+        MaxConstPressureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinCompPressureAttribute(long chipClusterPtr,
+        MinCompPressureAttributeCallback callback
+    );
+    private native void subscribeMinCompPressureAttribute(long chipClusterPtr,
+        MinCompPressureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxCompPressureAttribute(long chipClusterPtr,
+        MaxCompPressureAttributeCallback callback
+    );
+    private native void subscribeMaxCompPressureAttribute(long chipClusterPtr,
+        MaxCompPressureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinConstSpeedAttribute(long chipClusterPtr,
+        MinConstSpeedAttributeCallback callback
+    );
+    private native void subscribeMinConstSpeedAttribute(long chipClusterPtr,
+        MinConstSpeedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxConstSpeedAttribute(long chipClusterPtr,
+        MaxConstSpeedAttributeCallback callback
+    );
+    private native void subscribeMaxConstSpeedAttribute(long chipClusterPtr,
+        MaxConstSpeedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinConstFlowAttribute(long chipClusterPtr,
+        MinConstFlowAttributeCallback callback
+    );
+    private native void subscribeMinConstFlowAttribute(long chipClusterPtr,
+        MinConstFlowAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxConstFlowAttribute(long chipClusterPtr,
+        MaxConstFlowAttributeCallback callback
+    );
+    private native void subscribeMaxConstFlowAttribute(long chipClusterPtr,
+        MaxConstFlowAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinConstTempAttribute(long chipClusterPtr,
+        MinConstTempAttributeCallback callback
+    );
+    private native void subscribeMinConstTempAttribute(long chipClusterPtr,
+        MinConstTempAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxConstTempAttribute(long chipClusterPtr,
+        MaxConstTempAttributeCallback callback
+    );
+    private native void subscribeMaxConstTempAttribute(long chipClusterPtr,
+        MaxConstTempAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPumpStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePumpStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEffectiveOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEffectiveOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEffectiveControlModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEffectiveControlModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCapacityAttribute(long chipClusterPtr,
+        CapacityAttributeCallback callback
+    );
+    private native void subscribeCapacityAttribute(long chipClusterPtr,
+        CapacityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSpeedAttribute(long chipClusterPtr,
+        SpeedAttributeCallback callback
+    );
+    private native void subscribeSpeedAttribute(long chipClusterPtr,
+        SpeedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLifetimeRunningHoursAttribute(long chipClusterPtr,
+        LifetimeRunningHoursAttributeCallback callback
+    );
+
+    private native void writeLifetimeRunningHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLifetimeRunningHoursAttribute(long chipClusterPtr,
+        LifetimeRunningHoursAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPowerAttribute(long chipClusterPtr,
+        PowerAttributeCallback callback
+    );
+    private native void subscribePowerAttribute(long chipClusterPtr,
+        PowerAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLifetimeEnergyConsumedAttribute(long chipClusterPtr,
+        LifetimeEnergyConsumedAttributeCallback callback
+    );
+
+    private native void writeLifetimeEnergyConsumedAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLifetimeEnergyConsumedAttribute(long chipClusterPtr,
+        LifetimeEnergyConsumedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readControlModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeControlModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeControlModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ThermostatCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000201L;
+
+    public ThermostatCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void setpointRaiseLower(DefaultClusterCallback callback
+      , Integer mode, Integer amount) {
+      setpointRaiseLower(chipClusterPtr, callback, mode, amount, null);
+    }
+
+    public void setpointRaiseLower(DefaultClusterCallback callback
+      , Integer mode, Integer amount
+      , int timedInvokeTimeoutMs) {
+      setpointRaiseLower(chipClusterPtr, callback, mode, amount, timedInvokeTimeoutMs);
+    }
+
+    public void setWeeklySchedule(DefaultClusterCallback callback
+      , Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
+      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, null);
+    }
+
+    public void setWeeklySchedule(DefaultClusterCallback callback
+      , Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions
+      , int timedInvokeTimeoutMs) {
+      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, timedInvokeTimeoutMs);
+    }
+
+    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback
+      , Integer daysToReturn, Integer modeToReturn) {
+      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, null);
+    }
+
+    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback
+      , Integer daysToReturn, Integer modeToReturn
+      , int timedInvokeTimeoutMs) {
+      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, timedInvokeTimeoutMs);
+    }
+
+    public void clearWeeklySchedule(DefaultClusterCallback callback
+      ) {
+      clearWeeklySchedule(chipClusterPtr, callback, null);
+    }
+
+    public void clearWeeklySchedule(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      clearWeeklySchedule(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void setpointRaiseLower(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer mode, Integer amount
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void setWeeklySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getWeeklySchedule(long chipClusterPtr, GetWeeklyScheduleResponseCallback Callback
+      , Integer daysToReturn, Integer modeToReturn
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetWeeklyScheduleResponseCallback {
+      void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
+
+      void onError(Exception error);
+    }
+
+
+      public interface LocalTemperatureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OutdoorTemperatureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface TemperatureSetpointHoldDurationAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SetpointChangeAmountAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OccupiedSetbackAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OccupiedSetbackMinAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface OccupiedSetbackMaxAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface UnoccupiedSetbackAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface UnoccupiedSetbackMinAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface UnoccupiedSetbackMaxAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ACCoilTemperatureAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readLocalTemperatureAttribute(
+      LocalTemperatureAttributeCallback callback
+    ) {
+      readLocalTemperatureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLocalTemperatureAttribute(
+        LocalTemperatureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOutdoorTemperatureAttribute(
+      OutdoorTemperatureAttributeCallback callback
+    ) {
+      readOutdoorTemperatureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOutdoorTemperatureAttribute(
+        OutdoorTemperatureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOutdoorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupancyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupancyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupancyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAbsMinHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAbsMinHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAbsMaxHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAbsMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAbsMinCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAbsMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAbsMaxCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAbsMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPICoolingDemandAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPICoolingDemandAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePICoolingDemandAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePICoolingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPIHeatingDemandAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPIHeatingDemandAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePIHeatingDemandAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePIHeatingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHVACSystemTypeConfigurationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback);
+    }
+    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeHVACSystemTypeConfigurationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocalTemperatureCalibrationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLocalTemperatureCalibrationAttribute(chipClusterPtr, callback);
+    }
+    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLocalTemperatureCalibrationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupiedCoolingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
+    }
+    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOccupiedCoolingSetpointAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupiedHeatingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+    }
+    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOccupiedHeatingSetpointAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnoccupiedCoolingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
+    }
+    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUnoccupiedCoolingSetpointAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnoccupiedHeatingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+    }
+    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUnoccupiedHeatingSetpointAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMinHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    }
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinSetpointDeadBandAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
+    }
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMinSetpointDeadBandAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinSetpointDeadBandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRemoteSensingAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRemoteSensingAttribute(chipClusterPtr, callback);
+    }
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRemoteSensingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRemoteSensingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRemoteSensingAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRemoteSensingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readControlSequenceOfOperationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
+    }
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeControlSequenceOfOperationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeControlSequenceOfOperationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSystemModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSystemModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSystemModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSystemModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSystemModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSystemModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readThermostatRunningModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readThermostatRunningModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeThermostatRunningModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeThermostatRunningModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartOfWeekAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStartOfWeekAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStartOfWeekAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStartOfWeekAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfWeeklyTransitionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfDailyTransitionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfDailyTransitionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfDailyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTemperatureSetpointHoldAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTemperatureSetpointHoldAttribute(chipClusterPtr, callback);
+    }
+    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeTemperatureSetpointHoldAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTemperatureSetpointHoldDurationAttribute(
+      TemperatureSetpointHoldDurationAttributeCallback callback
+    ) {
+      readTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback);
+    }
+    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeTemperatureSetpointHoldDurationAttribute(
+        TemperatureSetpointHoldDurationAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readThermostatProgrammingOperationModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeThermostatProgrammingOperationModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readThermostatRunningStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readThermostatRunningStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeThermostatRunningStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeThermostatRunningStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSetpointChangeSourceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSetpointChangeSourceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSetpointChangeSourceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSetpointChangeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSetpointChangeAmountAttribute(
+      SetpointChangeAmountAttributeCallback callback
+    ) {
+      readSetpointChangeAmountAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSetpointChangeAmountAttribute(
+        SetpointChangeAmountAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSetpointChangeAmountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSetpointChangeSourceTimestampAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSetpointChangeSourceTimestampAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupiedSetbackAttribute(
+      OccupiedSetbackAttributeCallback callback
+    ) {
+      readOccupiedSetbackAttribute(chipClusterPtr, callback);
+    }
+    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOccupiedSetbackAttribute(
+        OccupiedSetbackAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOccupiedSetbackAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupiedSetbackMinAttribute(
+      OccupiedSetbackMinAttributeCallback callback
+    ) {
+      readOccupiedSetbackMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupiedSetbackMinAttribute(
+        OccupiedSetbackMinAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOccupiedSetbackMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupiedSetbackMaxAttribute(
+      OccupiedSetbackMaxAttributeCallback callback
+    ) {
+      readOccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupiedSetbackMaxAttribute(
+        OccupiedSetbackMaxAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnoccupiedSetbackAttribute(
+      UnoccupiedSetbackAttributeCallback callback
+    ) {
+      readUnoccupiedSetbackAttribute(chipClusterPtr, callback);
+    }
+    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUnoccupiedSetbackAttribute(
+        UnoccupiedSetbackAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeUnoccupiedSetbackAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnoccupiedSetbackMinAttribute(
+      UnoccupiedSetbackMinAttributeCallback callback
+    ) {
+      readUnoccupiedSetbackMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUnoccupiedSetbackMinAttribute(
+        UnoccupiedSetbackMinAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeUnoccupiedSetbackMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnoccupiedSetbackMaxAttribute(
+      UnoccupiedSetbackMaxAttributeCallback callback
+    ) {
+      readUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUnoccupiedSetbackMaxAttribute(
+        UnoccupiedSetbackMaxAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEmergencyHeatDeltaAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEmergencyHeatDeltaAttribute(chipClusterPtr, callback);
+    }
+    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEmergencyHeatDeltaAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACTypeAttribute(chipClusterPtr, callback);
+    }
+    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACTypeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACCapacityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACCapacityAttribute(chipClusterPtr, callback);
+    }
+    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACCapacityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACCapacityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACRefrigerantTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACRefrigerantTypeAttribute(chipClusterPtr, callback);
+    }
+    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACRefrigerantTypeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACRefrigerantTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACRefrigerantTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACRefrigerantTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACCompressorTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACCompressorTypeAttribute(chipClusterPtr, callback);
+    }
+    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCompressorTypeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACCompressorTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACCompressorTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACCompressorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACErrorCodeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readACErrorCodeAttribute(chipClusterPtr, callback);
+    }
+    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) {
+      writeACErrorCodeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeACErrorCodeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACErrorCodeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACErrorCodeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACLouverPositionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACLouverPositionAttribute(chipClusterPtr, callback);
+    }
+    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACLouverPositionAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACLouverPositionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACLouverPositionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACLouverPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACCoilTemperatureAttribute(
+      ACCoilTemperatureAttributeCallback callback
+    ) {
+      readACCoilTemperatureAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeACCoilTemperatureAttribute(
+        ACCoilTemperatureAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeACCoilTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readACCapacityformatAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readACCapacityformatAttribute(chipClusterPtr, callback);
+    }
+    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityformatAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeACCapacityformatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeACCapacityformatAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeACCapacityformatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readLocalTemperatureAttribute(long chipClusterPtr,
+        LocalTemperatureAttributeCallback callback
+    );
+    private native void subscribeLocalTemperatureAttribute(long chipClusterPtr,
+        LocalTemperatureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOutdoorTemperatureAttribute(long chipClusterPtr,
+        OutdoorTemperatureAttributeCallback callback
+    );
+    private native void subscribeOutdoorTemperatureAttribute(long chipClusterPtr,
+        OutdoorTemperatureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOccupancyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOccupancyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAbsMinHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAbsMinHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAbsMinCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAbsMinCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPICoolingDemandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePICoolingDemandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPIHeatingDemandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePIHeatingDemandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHVACSystemTypeConfigurationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeHVACSystemTypeConfigurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeHVACSystemTypeConfigurationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLocalTemperatureCalibrationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeLocalTemperatureCalibrationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLocalTemperatureCalibrationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOccupiedCoolingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOccupiedCoolingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOccupiedHeatingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOccupiedHeatingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUnoccupiedCoolingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUnoccupiedCoolingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUnoccupiedHeatingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUnoccupiedHeatingSetpointAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMinHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMinHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMaxHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMinCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMinCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMaxCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinSetpointDeadBandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMinSetpointDeadBandAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMinSetpointDeadBandAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRemoteSensingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRemoteSensingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRemoteSensingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readControlSequenceOfOperationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeControlSequenceOfOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeControlSequenceOfOperationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSystemModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSystemModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readThermostatRunningModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeThermostatRunningModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartOfWeekAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeStartOfWeekAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfWeeklyTransitionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfWeeklyTransitionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfDailyTransitionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNumberOfDailyTransitionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTemperatureSetpointHoldAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeTemperatureSetpointHoldAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTemperatureSetpointHoldAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTemperatureSetpointHoldDurationAttribute(long chipClusterPtr,
+        TemperatureSetpointHoldDurationAttributeCallback callback
+    );
+
+    private native void writeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr,
+        TemperatureSetpointHoldDurationAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readThermostatProgrammingOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeThermostatProgrammingOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeThermostatProgrammingOperationModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readThermostatRunningStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeThermostatRunningStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSetpointChangeSourceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSetpointChangeSourceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSetpointChangeAmountAttribute(long chipClusterPtr,
+        SetpointChangeAmountAttributeCallback callback
+    );
+    private native void subscribeSetpointChangeAmountAttribute(long chipClusterPtr,
+        SetpointChangeAmountAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSetpointChangeSourceTimestampAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeSetpointChangeSourceTimestampAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOccupiedSetbackAttribute(long chipClusterPtr,
+        OccupiedSetbackAttributeCallback callback
+    );
+
+    private native void writeOccupiedSetbackAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOccupiedSetbackAttribute(long chipClusterPtr,
+        OccupiedSetbackAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOccupiedSetbackMinAttribute(long chipClusterPtr,
+        OccupiedSetbackMinAttributeCallback callback
+    );
+    private native void subscribeOccupiedSetbackMinAttribute(long chipClusterPtr,
+        OccupiedSetbackMinAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readOccupiedSetbackMaxAttribute(long chipClusterPtr,
+        OccupiedSetbackMaxAttributeCallback callback
+    );
+    private native void subscribeOccupiedSetbackMaxAttribute(long chipClusterPtr,
+        OccupiedSetbackMaxAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readUnoccupiedSetbackAttribute(long chipClusterPtr,
+        UnoccupiedSetbackAttributeCallback callback
+    );
+
+    private native void writeUnoccupiedSetbackAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUnoccupiedSetbackAttribute(long chipClusterPtr,
+        UnoccupiedSetbackAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readUnoccupiedSetbackMinAttribute(long chipClusterPtr,
+        UnoccupiedSetbackMinAttributeCallback callback
+    );
+    private native void subscribeUnoccupiedSetbackMinAttribute(long chipClusterPtr,
+        UnoccupiedSetbackMinAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readUnoccupiedSetbackMaxAttribute(long chipClusterPtr,
+        UnoccupiedSetbackMaxAttributeCallback callback
+    );
+    private native void subscribeUnoccupiedSetbackMaxAttribute(long chipClusterPtr,
+        UnoccupiedSetbackMaxAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEmergencyHeatDeltaAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeEmergencyHeatDeltaAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEmergencyHeatDeltaAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACCapacityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACCapacityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACCapacityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACRefrigerantTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACRefrigerantTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACRefrigerantTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACCompressorTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACCompressorTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACCompressorTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACErrorCodeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeACErrorCodeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACErrorCodeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACLouverPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACLouverPositionAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACLouverPositionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readACCoilTemperatureAttribute(long chipClusterPtr,
+        ACCoilTemperatureAttributeCallback callback
+    );
+    private native void subscribeACCoilTemperatureAttribute(long chipClusterPtr,
+        ACCoilTemperatureAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readACCapacityformatAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeACCapacityformatAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeACCapacityformatAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class FanControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000202L;
+
+    public FanControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void step(DefaultClusterCallback callback
+      , Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff) {
+      step(chipClusterPtr, callback, direction, wrap, lowestOff, null);
+    }
+
+    public void step(DefaultClusterCallback callback
+      , Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff
+      , int timedInvokeTimeoutMs) {
+      step(chipClusterPtr, callback, direction, wrap, lowestOff, timedInvokeTimeoutMs);
+    }
+    private native void step(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface PercentSettingAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SpeedSettingAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readFanModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readFanModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeFanModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeFanModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeFanModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFanModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFanModeSequenceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readFanModeSequenceAttribute(chipClusterPtr, callback);
+    }
+    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value) {
+      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeFanModeSequenceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFanModeSequenceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPercentSettingAttribute(
+      PercentSettingAttributeCallback callback
+    ) {
+      readPercentSettingAttribute(chipClusterPtr, callback);
+    }
+    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writePercentSettingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePercentSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePercentSettingAttribute(
+        PercentSettingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePercentSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPercentCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPercentCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePercentCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePercentCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSpeedMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSpeedMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSpeedMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSpeedMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSpeedSettingAttribute(
+      SpeedSettingAttributeCallback callback
+    ) {
+      readSpeedSettingAttribute(chipClusterPtr, callback);
+    }
+    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSpeedSettingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSpeedSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSpeedSettingAttribute(
+        SpeedSettingAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSpeedSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSpeedCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readSpeedCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSpeedCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRockSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRockSupportAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRockSupportAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRockSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRockSettingAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRockSettingAttribute(chipClusterPtr, callback);
+    }
+    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRockSettingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRockSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRockSettingAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRockSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWindSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWindSupportAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeWindSupportAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWindSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWindSettingAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWindSettingAttribute(chipClusterPtr, callback);
+    }
+    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWindSettingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWindSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeWindSettingAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWindSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAirflowDirectionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAirflowDirectionAttribute(chipClusterPtr, callback);
+    }
+    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAirflowDirectionAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeAirflowDirectionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAirflowDirectionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAirflowDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readFanModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeFanModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFanModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readFanModeSequenceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeFanModeSequenceAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFanModeSequenceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPercentSettingAttribute(long chipClusterPtr,
+        PercentSettingAttributeCallback callback
+    );
+
+    private native void writePercentSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePercentSettingAttribute(long chipClusterPtr,
+        PercentSettingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPercentCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePercentCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSpeedMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSpeedMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSpeedSettingAttribute(long chipClusterPtr,
+        SpeedSettingAttributeCallback callback
+    );
+
+    private native void writeSpeedSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSpeedSettingAttribute(long chipClusterPtr,
+        SpeedSettingAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSpeedCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeSpeedCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRockSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRockSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRockSettingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRockSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRockSettingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWindSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeWindSupportAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWindSettingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeWindSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeWindSettingAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAirflowDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeAirflowDirectionAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAirflowDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000204L;
+
+    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readTemperatureDisplayModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTemperatureDisplayModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readKeypadLockoutAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readKeypadLockoutAttribute(chipClusterPtr, callback);
+    }
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeKeypadLockoutAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeKeypadLockoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readScheduleProgrammingVisibilityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
+    }
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTemperatureDisplayModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeTemperatureDisplayModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTemperatureDisplayModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readKeypadLockoutAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeKeypadLockoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeKeypadLockoutAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readScheduleProgrammingVisibilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeScheduleProgrammingVisibilityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ColorControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000300L;
+
+    public ColorControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void moveToHue(DefaultClusterCallback callback
+      , Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToHue(DefaultClusterCallback callback
+      , Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveHue(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    }
+
+    public void moveHue(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stepHue(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void stepHue(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToSaturation(DefaultClusterCallback callback
+      , Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToSaturation(DefaultClusterCallback callback
+      , Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveSaturation(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    }
+
+    public void moveSaturation(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stepSaturation(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void stepSaturation(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToHueAndSaturation(DefaultClusterCallback callback
+      , Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToHueAndSaturation(DefaultClusterCallback callback
+      , Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToColor(DefaultClusterCallback callback
+      , Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToColor(DefaultClusterCallback callback
+      , Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveColor(DefaultClusterCallback callback
+      , Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride) {
+      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, null);
+    }
+
+    public void moveColor(DefaultClusterCallback callback
+      , Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stepColor(DefaultClusterCallback callback
+      , Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void stepColor(DefaultClusterCallback callback
+      , Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveToColorTemperature(DefaultClusterCallback callback
+      , Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void moveToColorTemperature(DefaultClusterCallback callback
+      , Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedMoveToHue(DefaultClusterCallback callback
+      , Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void enhancedMoveToHue(DefaultClusterCallback callback
+      , Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedMoveHue(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    }
+
+    public void enhancedMoveHue(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedStepHue(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void enhancedStepHue(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback
+      , Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, null);
+    }
+
+    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback
+      , Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void colorLoopSet(DefaultClusterCallback callback
+      , Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride) {
+      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, null);
+    }
+
+    public void colorLoopSet(DefaultClusterCallback callback
+      , Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stopMoveStep(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+    }
+
+    public void stopMoveStep(DefaultClusterCallback callback
+      , Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void moveColorTemperature(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
+      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, null);
+    }
+
+    public void moveColorTemperature(DefaultClusterCallback callback
+      , Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+
+    public void stepColorTemperature(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride) {
+      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, null);
+    }
+
+    public void stepColorTemperature(DefaultClusterCallback callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride
+      , int timedInvokeTimeoutMs) {
+      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimumMireds, colorTemperatureMaximumMireds, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+    }
+    private native void moveToHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stepHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToSaturation(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveSaturation(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stepSaturation(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToColor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveColor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stepColor(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveToColorTemperature(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedMoveToHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedMoveHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedStepHue(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void enhancedMoveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void colorLoopSet(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer updateFlags, Integer action, Integer direction, Integer time, Integer startHue, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stopMoveStep(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void moveColorTemperature(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stepColorTemperature(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer stepMode, Integer stepSize, Integer transitionTime, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface NumberOfPrimariesAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary1IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary2IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary3IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary4IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary5IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface Primary6IntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ColorPointRIntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ColorPointGIntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ColorPointBIntensityAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface StartUpColorTemperatureMiredsAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readCurrentHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentHueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentHueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentSaturationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentSaturationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentSaturationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRemainingTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRemainingTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRemainingTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentXAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentXAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentXAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentYAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentYAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentYAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDriftCompensationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDriftCompensationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDriftCompensationAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDriftCompensationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCompensationTextAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readCompensationTextAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCompensationTextAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorTemperatureMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorTemperatureMiredsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorTemperatureMiredsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOptionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOptionsAttribute(chipClusterPtr, callback);
+    }
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOptionsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfPrimariesAttribute(
+      NumberOfPrimariesAttributeCallback callback
+    ) {
+      readNumberOfPrimariesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNumberOfPrimariesAttribute(
+        NumberOfPrimariesAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary1XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary1XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary1XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary1XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary1YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary1YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary1YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary1IntensityAttribute(
+      Primary1IntensityAttributeCallback callback
+    ) {
+      readPrimary1IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary1IntensityAttribute(
+        Primary1IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary2XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary2XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary2XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary2XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary2YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary2YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary2YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary2IntensityAttribute(
+      Primary2IntensityAttributeCallback callback
+    ) {
+      readPrimary2IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary2IntensityAttribute(
+        Primary2IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary3XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary3XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary3XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary3XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary3YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary3YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary3YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary3IntensityAttribute(
+      Primary3IntensityAttributeCallback callback
+    ) {
+      readPrimary3IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary3IntensityAttribute(
+        Primary3IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary4XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary4XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary4XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary4XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary4YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary4YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary4YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary4IntensityAttribute(
+      Primary4IntensityAttributeCallback callback
+    ) {
+      readPrimary4IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary4IntensityAttribute(
+        Primary4IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary5XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary5XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary5XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary5XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary5YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary5YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary5YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary5IntensityAttribute(
+      Primary5IntensityAttributeCallback callback
+    ) {
+      readPrimary5IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary5IntensityAttribute(
+        Primary5IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary6XAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary6XAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary6XAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary6XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary6YAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPrimary6YAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary6YAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePrimary6YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary6IntensityAttribute(
+      Primary6IntensityAttributeCallback callback
+    ) {
+      readPrimary6IntensityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePrimary6IntensityAttribute(
+        Primary6IntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWhitePointXAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWhitePointXAttribute(chipClusterPtr, callback);
+    }
+    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointXAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWhitePointXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeWhitePointXAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWhitePointXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWhitePointYAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWhitePointYAttribute(chipClusterPtr, callback);
+    }
+    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointYAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWhitePointYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeWhitePointYAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWhitePointYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointRXAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointRXAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRXAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointRXAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointRXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointRYAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointRYAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRYAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointRYAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointRIntensityAttribute(
+      ColorPointRIntensityAttributeCallback callback
+    ) {
+      readColorPointRIntensityAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointRIntensityAttribute(
+        ColorPointRIntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointGXAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointGXAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGXAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointGXAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointGXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointGYAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointGYAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGYAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointGYAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointGIntensityAttribute(
+      ColorPointGIntensityAttributeCallback callback
+    ) {
+      readColorPointGIntensityAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointGIntensityAttribute(
+        ColorPointGIntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointBXAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointBXAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBXAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointBXAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointBXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointBYAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorPointBYAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBYAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointBYAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorPointBIntensityAttribute(
+      ColorPointBIntensityAttributeCallback callback
+    ) {
+      readColorPointBIntensityAttribute(chipClusterPtr, callback);
+    }
+    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeColorPointBIntensityAttribute(
+        ColorPointBIntensityAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnhancedCurrentHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEnhancedCurrentHueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnhancedCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnhancedColorModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEnhancedColorModeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEnhancedColorModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnhancedColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopActiveAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorLoopActiveAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorLoopActiveAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorLoopActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopDirectionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorLoopDirectionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorLoopDirectionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorLoopDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorLoopTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorLoopTimeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorLoopTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopStartEnhancedHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorLoopStartEnhancedHueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopStoredEnhancedHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorLoopStoredEnhancedHueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorCapabilitiesAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorCapabilitiesAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorCapabilitiesAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorTempPhysicalMinMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorTempPhysicalMinMiredsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorTempPhysicalMaxMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeColorTempPhysicalMaxMiredsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCoupleColorTempToLevelMinMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCoupleColorTempToLevelMinMiredsAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpColorTemperatureMiredsAttribute(
+      StartUpColorTemperatureMiredsAttributeCallback callback
+    ) {
+      readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
+    }
+    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeStartUpColorTemperatureMiredsAttribute(
+        StartUpColorTemperatureMiredsAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readCurrentHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentSaturationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentSaturationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRemainingTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRemainingTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDriftCompensationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDriftCompensationAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCompensationTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeCompensationTextAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorTemperatureMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorTemperatureMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOptionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOptionsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNumberOfPrimariesAttribute(long chipClusterPtr,
+        NumberOfPrimariesAttributeCallback callback
+    );
+    private native void subscribeNumberOfPrimariesAttribute(long chipClusterPtr,
+        NumberOfPrimariesAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary1XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary1XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary1YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary1YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary1IntensityAttribute(long chipClusterPtr,
+        Primary1IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary1IntensityAttribute(long chipClusterPtr,
+        Primary1IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary2XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary2XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary2YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary2YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary2IntensityAttribute(long chipClusterPtr,
+        Primary2IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary2IntensityAttribute(long chipClusterPtr,
+        Primary2IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary3XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary3XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary3YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary3YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary3IntensityAttribute(long chipClusterPtr,
+        Primary3IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary3IntensityAttribute(long chipClusterPtr,
+        Primary3IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary4XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary4XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary4YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary4YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary4IntensityAttribute(long chipClusterPtr,
+        Primary4IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary4IntensityAttribute(long chipClusterPtr,
+        Primary4IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary5XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary5XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary5YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary5YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary5IntensityAttribute(long chipClusterPtr,
+        Primary5IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary5IntensityAttribute(long chipClusterPtr,
+        Primary5IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPrimary6XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary6XAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary6YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePrimary6YAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPrimary6IntensityAttribute(long chipClusterPtr,
+        Primary6IntensityAttributeCallback callback
+    );
+    private native void subscribePrimary6IntensityAttribute(long chipClusterPtr,
+        Primary6IntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWhitePointXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeWhitePointXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeWhitePointXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readWhitePointYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeWhitePointYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeWhitePointYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointRXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointRXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointRXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointRYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointRYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointRYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointRIntensityAttribute(long chipClusterPtr,
+        ColorPointRIntensityAttributeCallback callback
+    );
+
+    private native void writeColorPointRIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointRIntensityAttribute(long chipClusterPtr,
+        ColorPointRIntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readColorPointGXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointGXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointGXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointGYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointGYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointGYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointGIntensityAttribute(long chipClusterPtr,
+        ColorPointGIntensityAttributeCallback callback
+    );
+
+    private native void writeColorPointGIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointGIntensityAttribute(long chipClusterPtr,
+        ColorPointGIntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readColorPointBXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointBXAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointBXAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointBYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeColorPointBYAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointBYAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorPointBIntensityAttribute(long chipClusterPtr,
+        ColorPointBIntensityAttributeCallback callback
+    );
+
+    private native void writeColorPointBIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeColorPointBIntensityAttribute(long chipClusterPtr,
+        ColorPointBIntensityAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEnhancedCurrentHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEnhancedCurrentHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnhancedColorModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeEnhancedColorModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorLoopActiveAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorLoopActiveAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorLoopDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorLoopDirectionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorLoopTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorLoopTimeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorLoopStartEnhancedHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorLoopStartEnhancedHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorLoopStoredEnhancedHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorLoopStoredEnhancedHueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorCapabilitiesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorCapabilitiesAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorTempPhysicalMinMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorTempPhysicalMinMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readColorTempPhysicalMaxMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeColorTempPhysicalMaxMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartUpColorTemperatureMiredsAttribute(long chipClusterPtr,
+        StartUpColorTemperatureMiredsAttributeCallback callback
+    );
+
+    private native void writeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr,
+        StartUpColorTemperatureMiredsAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class BallastConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000301L;
+
+    public BallastConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface IntrinsicBallastFactorAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface BallastFactorAdjustmentAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LampRatedHoursAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LampBurnHoursAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LampBurnHoursTripPointAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readPhysicalMinLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalMinLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhysicalMinLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalMaxLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalMaxLevelAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhysicalMaxLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBallastStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBallastStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeBallastStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBallastStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMinLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMinLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMaxLevelAttribute(chipClusterPtr, callback);
+    }
+    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxLevelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMaxLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeMaxLevelAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readIntrinsicBallastFactorAttribute(
+      IntrinsicBallastFactorAttributeCallback callback
+    ) {
+      readIntrinsicBallastFactorAttribute(chipClusterPtr, callback);
+    }
+    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value) {
+      writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeIntrinsicBallastFactorAttribute(
+        IntrinsicBallastFactorAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBallastFactorAdjustmentAttribute(
+      BallastFactorAdjustmentAttributeCallback callback
+    ) {
+      readBallastFactorAdjustmentAttribute(chipClusterPtr, callback);
+    }
+    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBallastFactorAdjustmentAttribute(
+        BallastFactorAdjustmentAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampQuantityAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLampQuantityAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLampQuantityAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLampQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampTypeAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readLampTypeAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value) {
+      writeLampTypeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampTypeAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLampTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampTypeAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLampTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampManufacturerAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readLampManufacturerAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value) {
+      writeLampManufacturerAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLampManufacturerAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampManufacturerAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLampManufacturerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampRatedHoursAttribute(
+      LampRatedHoursAttributeCallback callback
+    ) {
+      readLampRatedHoursAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampRatedHoursAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLampRatedHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampRatedHoursAttribute(
+        LampRatedHoursAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLampRatedHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampBurnHoursAttribute(
+      LampBurnHoursAttributeCallback callback
+    ) {
+      readLampBurnHoursAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampBurnHoursAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLampBurnHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampBurnHoursAttribute(
+        LampBurnHoursAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLampBurnHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampAlarmModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLampAlarmModeAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLampAlarmModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeLampAlarmModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampAlarmModeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLampAlarmModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLampBurnHoursTripPointAttribute(
+      LampBurnHoursTripPointAttributeCallback callback
+    ) {
+      readLampBurnHoursTripPointAttribute(chipClusterPtr, callback);
+    }
+    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value) {
+      writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLampBurnHoursTripPointAttribute(
+        LampBurnHoursTripPointAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readPhysicalMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePhysicalMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePhysicalMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBallastStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeBallastStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMinLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMinLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeMaxLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeMaxLevelAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readIntrinsicBallastFactorAttribute(long chipClusterPtr,
+        IntrinsicBallastFactorAttributeCallback callback
+    );
+
+    private native void writeIntrinsicBallastFactorAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeIntrinsicBallastFactorAttribute(long chipClusterPtr,
+        IntrinsicBallastFactorAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readBallastFactorAdjustmentAttribute(long chipClusterPtr,
+        BallastFactorAdjustmentAttributeCallback callback
+    );
+
+    private native void writeBallastFactorAdjustmentAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBallastFactorAdjustmentAttribute(long chipClusterPtr,
+        BallastFactorAdjustmentAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLampQuantityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLampQuantityAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLampTypeAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeLampTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampTypeAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLampManufacturerAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeLampManufacturerAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampManufacturerAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLampRatedHoursAttribute(long chipClusterPtr,
+        LampRatedHoursAttributeCallback callback
+    );
+
+    private native void writeLampRatedHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampRatedHoursAttribute(long chipClusterPtr,
+        LampRatedHoursAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLampBurnHoursAttribute(long chipClusterPtr,
+        LampBurnHoursAttributeCallback callback
+    );
+
+    private native void writeLampBurnHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampBurnHoursAttribute(long chipClusterPtr,
+        LampBurnHoursAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLampAlarmModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeLampAlarmModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampAlarmModeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLampBurnHoursTripPointAttribute(long chipClusterPtr,
+        LampBurnHoursTripPointAttributeCallback callback
+    );
+
+    private native void writeLampBurnHoursTripPointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLampBurnHoursTripPointAttribute(long chipClusterPtr,
+        LampBurnHoursTripPointAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class IlluminanceMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000400L;
+
+    public IlluminanceMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface LightSensorTypeAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLightSensorTypeAttribute(
+      LightSensorTypeAttributeCallback callback
+    ) {
+      readLightSensorTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLightSensorTypeAttribute(
+        LightSensorTypeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeLightSensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLightSensorTypeAttribute(long chipClusterPtr,
+        LightSensorTypeAttributeCallback callback
+    );
+    private native void subscribeLightSensorTypeAttribute(long chipClusterPtr,
+        LightSensorTypeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TemperatureMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000402L;
+
+    public TemperatureMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class PressureMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000403L;
+
+    public PressureMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ScaledValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinScaledValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxScaledValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readScaledValueAttribute(
+      ScaledValueAttributeCallback callback
+    ) {
+      readScaledValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeScaledValueAttribute(
+        ScaledValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinScaledValueAttribute(
+      MinScaledValueAttributeCallback callback
+    ) {
+      readMinScaledValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinScaledValueAttribute(
+        MinScaledValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxScaledValueAttribute(
+      MaxScaledValueAttributeCallback callback
+    ) {
+      readMaxScaledValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxScaledValueAttribute(
+        MaxScaledValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readScaledToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readScaledToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeScaledToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeScaledToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readScaleAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readScaleAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeScaleAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeScaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readScaledValueAttribute(long chipClusterPtr,
+        ScaledValueAttributeCallback callback
+    );
+    private native void subscribeScaledValueAttribute(long chipClusterPtr,
+        ScaledValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinScaledValueAttribute(long chipClusterPtr,
+        MinScaledValueAttributeCallback callback
+    );
+    private native void subscribeMinScaledValueAttribute(long chipClusterPtr,
+        MinScaledValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxScaledValueAttribute(long chipClusterPtr,
+        MaxScaledValueAttributeCallback callback
+    );
+    private native void subscribeMaxScaledValueAttribute(long chipClusterPtr,
+        MaxScaledValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readScaledToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeScaledToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readScaleAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeScaleAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class FlowMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000404L;
+
+    public FlowMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000405L;
+
+    public RelativeHumidityMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeToleranceAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OccupancySensingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000406L;
+
+    public OccupancySensingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readOccupancyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupancyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupancyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupancySensorTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupancySensorTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupancySensorTypeAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupancySensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOccupancySensorTypeBitmapAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOccupancySensorTypeBitmapAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPIROccupiedToUnoccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePIROccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPIRUnoccupiedToOccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePIRUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPIRUnoccupiedToOccupiedThresholdAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+    }
+    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePIRUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUltrasonicOccupiedToUnoccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUltrasonicUnoccupiedToOccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+    }
+    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+    }
+    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+    }
+    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
+      writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readOccupancyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOccupancyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOccupancySensorTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOccupancySensorTypeAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOccupancySensorTypeBitmapAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeOccupancySensorTypeBitmapAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePIROccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePIRUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePIRUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class CarbonMonoxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000040CL;
+
+    public CarbonMonoxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class CarbonDioxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000040DL;
+
+    public CarbonDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class NitrogenDioxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000413L;
+
+    public NitrogenDioxideConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class OzoneConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000415L;
+
+    public OzoneConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class Pm25ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042AL;
+
+    public Pm25ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class FormaldehydeConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042BL;
+
+    public FormaldehydeConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class Pm1ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042CL;
+
+    public Pm1ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class Pm10ConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042DL;
+
+    public Pm10ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042EL;
+
+    public TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class RadonConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000042FL;
+
+    public RadonConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface MeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MinMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface MaxMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface PeakMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AverageMeasuredValueAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasuredValueAttribute(
+      MeasuredValueAttributeCallback callback
+    ) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+      MinMeasuredValueAttributeCallback callback
+    ) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(
+      MaxMeasuredValueAttributeCallback callback
+    ) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueAttribute(
+      PeakMeasuredValueAttributeCallback callback
+    ) {
+      readPeakMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueAttribute(
+        PeakMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPeakMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPeakMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePeakMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePeakMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueAttribute(
+      AverageMeasuredValueAttributeCallback callback
+    ) {
+      readAverageMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueAttribute(
+        AverageMeasuredValueAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageMeasuredValueWindowAttribute(
+      LongAttributeCallback callback
+    ) {
+      readAverageMeasuredValueWindowAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageMeasuredValueWindowAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageMeasuredValueWindowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUncertaintyAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readUncertaintyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeUncertaintyAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUncertaintyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementUnitAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementUnitAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementUnitAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasurementMediumAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasurementMediumAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementMediumAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementMediumAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLevelValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLevelValueAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLevelValueAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLevelValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr,
+        MeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMinMeasuredValueAttribute(long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr,
+        PeakMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr,
+        AverageMeasuredValueAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribeUncertaintyAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementUnitAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasurementMediumAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLevelValueAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class WakeOnLanCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000503L;
+
+    public WakeOnLanCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMACAddressAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readMACAddressAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMACAddressAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMACAddressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMACAddressAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeMACAddressAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ChannelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000504L;
+
+    public ChannelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void changeChannel(ChangeChannelResponseCallback callback
+      , String match) {
+      changeChannel(chipClusterPtr, callback, match, null);
+    }
+
+    public void changeChannel(ChangeChannelResponseCallback callback
+      , String match
+      , int timedInvokeTimeoutMs) {
+      changeChannel(chipClusterPtr, callback, match, timedInvokeTimeoutMs);
+    }
+
+    public void changeChannelByNumber(DefaultClusterCallback callback
+      , Integer majorNumber, Integer minorNumber) {
+      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, null);
+    }
+
+    public void changeChannelByNumber(DefaultClusterCallback callback
+      , Integer majorNumber, Integer minorNumber
+      , int timedInvokeTimeoutMs) {
+      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, timedInvokeTimeoutMs);
+    }
+
+    public void skipChannel(DefaultClusterCallback callback
+      , Integer count) {
+      skipChannel(chipClusterPtr, callback, count, null);
+    }
+
+    public void skipChannel(DefaultClusterCallback callback
+      , Integer count
+      , int timedInvokeTimeoutMs) {
+      skipChannel(chipClusterPtr, callback, count, timedInvokeTimeoutMs);
+    }
+    private native void changeChannel(long chipClusterPtr, ChangeChannelResponseCallback Callback
+      , String match
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void changeChannelByNumber(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer majorNumber, Integer minorNumber
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void skipChannel(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer count
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface ChangeChannelResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
+
+      void onError(Exception error);
+    }
+
+
+      public interface ChannelListAttributeCallback {
+        void onSuccess( List<ChipStructs.ChannelClusterChannelInfoStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readChannelListAttribute(
+      ChannelListAttributeCallback callback
+    ) {
+      readChannelListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeChannelListAttribute(
+        ChannelListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readChannelListAttribute(long chipClusterPtr,
+        ChannelListAttributeCallback callback
+    );
+    private native void subscribeChannelListAttribute(long chipClusterPtr,
+        ChannelListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class TargetNavigatorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000505L;
+
+    public TargetNavigatorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void navigateTarget(NavigateTargetResponseCallback callback
+      , Integer target, Optional<String> data) {
+      navigateTarget(chipClusterPtr, callback, target, data, null);
+    }
+
+    public void navigateTarget(NavigateTargetResponseCallback callback
+      , Integer target, Optional<String> data
+      , int timedInvokeTimeoutMs) {
+      navigateTarget(chipClusterPtr, callback, target, data, timedInvokeTimeoutMs);
+    }
+    private native void navigateTarget(long chipClusterPtr, NavigateTargetResponseCallback Callback
+      , Integer target, Optional<String> data
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface NavigateTargetResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
+
+      void onError(Exception error);
+    }
+
+
+      public interface TargetListAttributeCallback {
+        void onSuccess( List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readTargetListAttribute(
+      TargetListAttributeCallback callback
+    ) {
+      readTargetListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTargetListAttribute(
+        TargetListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeTargetListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentTargetAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentTargetAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentTargetAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentTargetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTargetListAttribute(long chipClusterPtr,
+        TargetListAttributeCallback callback
+    );
+    private native void subscribeTargetListAttribute(long chipClusterPtr,
+        TargetListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentTargetAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentTargetAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class MediaPlaybackCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000506L;
+
+    public MediaPlaybackCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void play(PlaybackResponseCallback callback
+      ) {
+      play(chipClusterPtr, callback, null);
+    }
+
+    public void play(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      play(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void pause(PlaybackResponseCallback callback
+      ) {
+      pause(chipClusterPtr, callback, null);
+    }
+
+    public void pause(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void stop(PlaybackResponseCallback callback
+      ) {
+      stop(chipClusterPtr, callback, null);
+    }
+
+    public void stop(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      stop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void startOver(PlaybackResponseCallback callback
+      ) {
+      startOver(chipClusterPtr, callback, null);
+    }
+
+    public void startOver(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      startOver(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void previous(PlaybackResponseCallback callback
+      ) {
+      previous(chipClusterPtr, callback, null);
+    }
+
+    public void previous(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      previous(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void next(PlaybackResponseCallback callback
+      ) {
+      next(chipClusterPtr, callback, null);
+    }
+
+    public void next(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      next(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void rewind(PlaybackResponseCallback callback
+      ) {
+      rewind(chipClusterPtr, callback, null);
+    }
+
+    public void rewind(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      rewind(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void fastForward(PlaybackResponseCallback callback
+      ) {
+      fastForward(chipClusterPtr, callback, null);
+    }
+
+    public void fastForward(PlaybackResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      fastForward(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void skipForward(PlaybackResponseCallback callback
+      , Long deltaPositionMilliseconds) {
+      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+    }
+
+    public void skipForward(PlaybackResponseCallback callback
+      , Long deltaPositionMilliseconds
+      , int timedInvokeTimeoutMs) {
+      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+    }
+
+    public void skipBackward(PlaybackResponseCallback callback
+      , Long deltaPositionMilliseconds) {
+      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+    }
+
+    public void skipBackward(PlaybackResponseCallback callback
+      , Long deltaPositionMilliseconds
+      , int timedInvokeTimeoutMs) {
+      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+    }
+
+    public void seek(PlaybackResponseCallback callback
+      , Long position) {
+      seek(chipClusterPtr, callback, position, null);
+    }
+
+    public void seek(PlaybackResponseCallback callback
+      , Long position
+      , int timedInvokeTimeoutMs) {
+      seek(chipClusterPtr, callback, position, timedInvokeTimeoutMs);
+    }
+    private native void play(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void pause(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stop(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void startOver(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void previous(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void next(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void rewind(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void fastForward(long chipClusterPtr, PlaybackResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void skipForward(long chipClusterPtr, PlaybackResponseCallback Callback
+      , Long deltaPositionMilliseconds
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void skipBackward(long chipClusterPtr, PlaybackResponseCallback Callback
+      , Long deltaPositionMilliseconds
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void seek(long chipClusterPtr, PlaybackResponseCallback Callback
+      , Long position
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface PlaybackResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
+
+      void onError(Exception error);
+    }
+
+
+      public interface StartTimeAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface DurationAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SeekRangeEndAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface SeekRangeStartAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readCurrentStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentStateAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentStateAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartTimeAttribute(
+      StartTimeAttributeCallback callback
+    ) {
+      readStartTimeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStartTimeAttribute(
+        StartTimeAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeStartTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDurationAttribute(
+      DurationAttributeCallback callback
+    ) {
+      readDurationAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDurationAttribute(
+        DurationAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPlaybackSpeedAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readPlaybackSpeedAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePlaybackSpeedAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSeekRangeEndAttribute(
+      SeekRangeEndAttributeCallback callback
+    ) {
+      readSeekRangeEndAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSeekRangeStartAttribute(
+      SeekRangeStartAttributeCallback callback
+    ) {
+      readSeekRangeStartAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeSeekRangeStartAttribute(
+        SeekRangeStartAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeSeekRangeStartAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readCurrentStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentStateAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStartTimeAttribute(long chipClusterPtr,
+        StartTimeAttributeCallback callback
+    );
+    private native void subscribeStartTimeAttribute(long chipClusterPtr,
+        StartTimeAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readDurationAttribute(long chipClusterPtr,
+        DurationAttributeCallback callback
+    );
+    private native void subscribeDurationAttribute(long chipClusterPtr,
+        DurationAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readPlaybackSpeedAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+    private native void subscribePlaybackSpeedAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readSeekRangeEndAttribute(long chipClusterPtr,
+        SeekRangeEndAttributeCallback callback
+    );
+    private native void subscribeSeekRangeEndAttribute(long chipClusterPtr,
+        SeekRangeEndAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSeekRangeStartAttribute(long chipClusterPtr,
+        SeekRangeStartAttributeCallback callback
+    );
+    private native void subscribeSeekRangeStartAttribute(long chipClusterPtr,
+        SeekRangeStartAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class MediaInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000507L;
+
+    public MediaInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void selectInput(DefaultClusterCallback callback
+      , Integer index) {
+      selectInput(chipClusterPtr, callback, index, null);
+    }
+
+    public void selectInput(DefaultClusterCallback callback
+      , Integer index
+      , int timedInvokeTimeoutMs) {
+      selectInput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
+    }
+
+    public void showInputStatus(DefaultClusterCallback callback
+      ) {
+      showInputStatus(chipClusterPtr, callback, null);
+    }
+
+    public void showInputStatus(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      showInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void hideInputStatus(DefaultClusterCallback callback
+      ) {
+      hideInputStatus(chipClusterPtr, callback, null);
+    }
+
+    public void hideInputStatus(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      hideInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void renameInput(DefaultClusterCallback callback
+      , Integer index, String name) {
+      renameInput(chipClusterPtr, callback, index, name, null);
+    }
+
+    public void renameInput(DefaultClusterCallback callback
+      , Integer index, String name
+      , int timedInvokeTimeoutMs) {
+      renameInput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
+    }
+    private native void selectInput(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer index
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void renameInput(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer index, String name
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface InputListAttributeCallback {
+        void onSuccess( List<ChipStructs.MediaInputClusterInputInfoStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readInputListAttribute(
+      InputListAttributeCallback callback
+    ) {
+      readInputListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInputListAttribute(
+        InputListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeInputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentInputAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentInputAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentInputAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentInputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readInputListAttribute(long chipClusterPtr,
+        InputListAttributeCallback callback
+    );
+    private native void subscribeInputListAttribute(long chipClusterPtr,
+        InputListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentInputAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentInputAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class LowPowerCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000508L;
+
+    public LowPowerCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void sleep(DefaultClusterCallback callback
+      ) {
+      sleep(chipClusterPtr, callback, null);
+    }
+
+    public void sleep(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      sleep(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void sleep(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class KeypadInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000509L;
+
+    public KeypadInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void sendKey(SendKeyResponseCallback callback
+      , Integer keyCode) {
+      sendKey(chipClusterPtr, callback, keyCode, null);
+    }
+
+    public void sendKey(SendKeyResponseCallback callback
+      , Integer keyCode
+      , int timedInvokeTimeoutMs) {
+      sendKey(chipClusterPtr, callback, keyCode, timedInvokeTimeoutMs);
+    }
+    private native void sendKey(long chipClusterPtr, SendKeyResponseCallback Callback
+      , Integer keyCode
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface SendKeyResponseCallback {
+      void onSuccess(Integer status);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ContentLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000050AL;
+
+    public ContentLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void launchContent(LauncherResponseCallback callback
+      , ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data) {
+      launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
+    }
+
+    public void launchContent(LauncherResponseCallback callback
+      , ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data
+      , int timedInvokeTimeoutMs) {
+      launchContent(chipClusterPtr, callback, search, autoPlay, data, timedInvokeTimeoutMs);
+    }
+
+    public void launchURL(LauncherResponseCallback callback
+      , String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation) {
+      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
+    }
+
+    public void launchURL(LauncherResponseCallback callback
+      , String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation
+      , int timedInvokeTimeoutMs) {
+      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, timedInvokeTimeoutMs);
+    }
+    private native void launchContent(long chipClusterPtr, LauncherResponseCallback Callback
+      , ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void launchURL(long chipClusterPtr, LauncherResponseCallback Callback
+      , String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface LauncherResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
+
+      void onError(Exception error);
+    }
+
+
+      public interface AcceptHeaderAttributeCallback {
+        void onSuccess( List<String> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readAcceptHeaderAttribute(
+      AcceptHeaderAttributeCallback callback
+    ) {
+      readAcceptHeaderAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptHeaderAttribute(
+        AcceptHeaderAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptHeaderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedStreamingProtocolsAttribute(
+      LongAttributeCallback callback
+    ) {
+      readSupportedStreamingProtocolsAttribute(chipClusterPtr, callback);
+    }
+    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value) {
+      writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeSupportedStreamingProtocolsAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readAcceptHeaderAttribute(long chipClusterPtr,
+        AcceptHeaderAttributeCallback callback
+    );
+    private native void subscribeAcceptHeaderAttribute(long chipClusterPtr,
+        AcceptHeaderAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readSupportedStreamingProtocolsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeSupportedStreamingProtocolsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeSupportedStreamingProtocolsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class AudioOutputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000050BL;
+
+    public AudioOutputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void selectOutput(DefaultClusterCallback callback
+      , Integer index) {
+      selectOutput(chipClusterPtr, callback, index, null);
+    }
+
+    public void selectOutput(DefaultClusterCallback callback
+      , Integer index
+      , int timedInvokeTimeoutMs) {
+      selectOutput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
+    }
+
+    public void renameOutput(DefaultClusterCallback callback
+      , Integer index, String name) {
+      renameOutput(chipClusterPtr, callback, index, name, null);
+    }
+
+    public void renameOutput(DefaultClusterCallback callback
+      , Integer index, String name
+      , int timedInvokeTimeoutMs) {
+      renameOutput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
+    }
+    private native void selectOutput(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer index
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void renameOutput(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer index, String name
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface OutputListAttributeCallback {
+        void onSuccess( List<ChipStructs.AudioOutputClusterOutputInfoStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readOutputListAttribute(
+      OutputListAttributeCallback callback
+    ) {
+      readOutputListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeOutputListAttribute(
+        OutputListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeOutputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentOutputAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentOutputAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentOutputAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentOutputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readOutputListAttribute(long chipClusterPtr,
+        OutputListAttributeCallback callback
+    );
+    private native void subscribeOutputListAttribute(long chipClusterPtr,
+        OutputListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readCurrentOutputAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentOutputAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ApplicationLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000050CL;
+
+    public ApplicationLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void launchApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data) {
+      launchApp(chipClusterPtr, callback, application, data, null);
+    }
+
+    public void launchApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data
+      , int timedInvokeTimeoutMs) {
+      launchApp(chipClusterPtr, callback, application, data, timedInvokeTimeoutMs);
+    }
+
+    public void stopApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
+      stopApp(chipClusterPtr, callback, application, null);
+    }
+
+    public void stopApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application
+      , int timedInvokeTimeoutMs) {
+      stopApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+    }
+
+    public void hideApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
+      hideApp(chipClusterPtr, callback, application, null);
+    }
+
+    public void hideApp(LauncherResponseCallback callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application
+      , int timedInvokeTimeoutMs) {
+      hideApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+    }
+    private native void launchApp(long chipClusterPtr, LauncherResponseCallback Callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void stopApp(long chipClusterPtr, LauncherResponseCallback Callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void hideApp(long chipClusterPtr, LauncherResponseCallback Callback
+      , Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface LauncherResponseCallback {
+      void onSuccess(Integer status, Optional<byte[]> data);
+
+      void onError(Exception error);
+    }
+
+
+      public interface CatalogListAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readCatalogListAttribute(
+      CatalogListAttributeCallback callback
+    ) {
+      readCatalogListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCatalogListAttribute(
+        CatalogListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readCatalogListAttribute(long chipClusterPtr,
+        CatalogListAttributeCallback callback
+    );
+    private native void subscribeCatalogListAttribute(long chipClusterPtr,
+        CatalogListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ApplicationBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000050DL;
+
+    public ApplicationBasicCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+      public interface AllowedVendorListAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readVendorNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVendorIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readVendorIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVendorIDAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApplicationNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readApplicationNameAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApplicationNameAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApplicationNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readProductIDAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeProductIDAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readStatusAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeStatusAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApplicationVersionAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readApplicationVersionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApplicationVersionAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAllowedVendorListAttribute(
+      AllowedVendorListAttributeCallback callback
+    ) {
+      readAllowedVendorListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAllowedVendorListAttribute(
+        AllowedVendorListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAllowedVendorListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeVendorNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeVendorIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApplicationNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeApplicationNameAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readProductIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeProductIDAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeStatusAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApplicationVersionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+    private native void subscribeApplicationVersionAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAllowedVendorListAttribute(long chipClusterPtr,
+        AllowedVendorListAttributeCallback callback
+    );
+    private native void subscribeAllowedVendorListAttribute(long chipClusterPtr,
+        AllowedVendorListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class AccountLoginCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x0000050EL;
+
+    public AccountLoginCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+
+    public void getSetupPIN(GetSetupPINResponseCallback callback
+      , String tempAccountIdentifier
+      , int timedInvokeTimeoutMs) {
+      getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier, timedInvokeTimeoutMs);
+    }
+
+
+    public void login(DefaultClusterCallback callback
+      , String tempAccountIdentifier, String setupPIN
+      , int timedInvokeTimeoutMs) {
+      login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN, timedInvokeTimeoutMs);
+    }
+
+
+    public void logout(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      logout(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+    private native void getSetupPIN(long chipClusterPtr, GetSetupPINResponseCallback Callback
+      , String tempAccountIdentifier
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void login(long chipClusterPtr, DefaultClusterCallback Callback
+      , String tempAccountIdentifier, String setupPIN
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void logout(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetSetupPINResponseCallback {
+      void onSuccess(String setupPIN);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class ElectricalMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0x00000B04L;
+
+    public ElectricalMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void getProfileInfoCommand(DefaultClusterCallback callback
+      ) {
+      getProfileInfoCommand(chipClusterPtr, callback, null);
+    }
+
+    public void getProfileInfoCommand(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      getProfileInfoCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void getMeasurementProfileCommand(DefaultClusterCallback callback
+      , Integer attributeId, Long startTime, Integer numberOfIntervals) {
+      getMeasurementProfileCommand(chipClusterPtr, callback, attributeId, startTime, numberOfIntervals, null);
+    }
+
+    public void getMeasurementProfileCommand(DefaultClusterCallback callback
+      , Integer attributeId, Long startTime, Integer numberOfIntervals
+      , int timedInvokeTimeoutMs) {
+      getMeasurementProfileCommand(chipClusterPtr, callback, attributeId, startTime, numberOfIntervals, timedInvokeTimeoutMs);
+    }
+    private native void getProfileInfoCommand(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void getMeasurementProfileCommand(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer attributeId, Long startTime, Integer numberOfIntervals
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetProfileInfoResponseCommandCallback {
+      void onSuccess(Integer profileCount, Integer profileIntervalPeriod, Integer maxNumberOfIntervals, ArrayList<Integer> listOfAttributes);
+
+      void onError(Exception error);
+    }
+
+    public interface GetMeasurementProfileResponseCommandCallback {
+      void onSuccess(Long startTime, Integer status, Integer profileIntervalPeriod, Integer numberOfIntervalsDelivered, Integer attributeId, ArrayList<Integer> intervals);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readMeasurementTypeAttribute(
+      LongAttributeCallback callback
+    ) {
+      readMeasurementTypeAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasurementTypeAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasurementTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcVoltageMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcVoltageMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcVoltageMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcVoltageMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcVoltageMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcVoltageMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcCurrentMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcCurrentMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcCurrentMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcCurrentMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcCurrentMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcCurrentMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcPowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcPowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcPowerAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcPowerMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcPowerMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcPowerMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcPowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcPowerMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcPowerMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcPowerMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcPowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcVoltageMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcVoltageMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcVoltageMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcVoltageMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcVoltageDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcVoltageDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcVoltageDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcVoltageDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcCurrentMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcCurrentMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcCurrentDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcCurrentDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcCurrentDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcCurrentDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcPowerMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcPowerMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcPowerMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcPowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDcPowerDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readDcPowerDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeDcPowerDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeDcPowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcFrequencyAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcFrequencyAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcFrequencyMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcFrequencyMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcFrequencyMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcFrequencyMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcFrequencyMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcFrequencyMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcFrequencyMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcFrequencyMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNeutralCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readNeutralCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeNeutralCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeNeutralCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTotalActivePowerAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTotalActivePowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTotalActivePowerAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTotalActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTotalReactivePowerAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTotalReactivePowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTotalReactivePowerAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTotalReactivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTotalApparentPowerAttribute(
+      LongAttributeCallback callback
+    ) {
+      readTotalApparentPowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeTotalApparentPowerAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTotalApparentPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured1stHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured1stHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured1stHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured1stHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured3rdHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured3rdHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured3rdHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured3rdHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured5thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured5thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured5thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured5thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured7thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured7thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured7thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured7thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured9thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured9thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured9thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured9thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasured11thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasured11thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasured11thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasured11thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase1stHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase1stHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase1stHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase1stHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase3rdHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase3rdHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase3rdHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase5thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase5thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase5thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase5thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase7thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase7thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase7thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase7thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase9thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase9thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase9thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase9thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeasuredPhase11thHarmonicCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readMeasuredPhase11thHarmonicCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeMeasuredPhase11thHarmonicCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeMeasuredPhase11thHarmonicCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcFrequencyMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcFrequencyMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcFrequencyMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcFrequencyMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcFrequencyDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcFrequencyDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcFrequencyDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcFrequencyDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerMultiplierAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPowerMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerMultiplierAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerDivisorAttribute(
+      LongAttributeCallback callback
+    ) {
+      readPowerDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerDivisorAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHarmonicCurrentMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeHarmonicCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhaseHarmonicCurrentMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPhaseHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePhaseHarmonicCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePhaseHarmonicCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstantaneousVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstantaneousVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstantaneousVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstantaneousVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstantaneousLineCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstantaneousLineCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstantaneousLineCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstantaneousLineCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstantaneousActiveCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstantaneousActiveCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstantaneousActiveCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstantaneousActiveCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstantaneousReactiveCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstantaneousReactiveCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstantaneousReactiveCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstantaneousReactiveCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInstantaneousPowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInstantaneousPowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeInstantaneousPowerAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInstantaneousPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMinAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMinAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMaxAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMaxAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReactivePowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReactivePowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReactivePowerAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReactivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApparentPowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readApparentPowerAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApparentPowerAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApparentPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerFactorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPowerFactorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerFactorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePowerFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsVoltageMeasurementPeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAverageRmsVoltageMeasurementPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAverageRmsVoltageMeasurementPeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsVoltageMeasurementPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsUnderVoltageCounterAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback);
+    }
+    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAverageRmsUnderVoltageCounterAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAverageRmsUnderVoltageCounterAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsUnderVoltageCounterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeOverVoltagePeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRmsExtremeOverVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRmsExtremeOverVoltagePeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeOverVoltagePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeUnderVoltagePeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRmsExtremeUnderVoltagePeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRmsExtremeUnderVoltagePeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeUnderVoltagePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSagPeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSagPeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRmsVoltageSagPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRmsVoltageSagPeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSagPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSwellPeriodAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback);
+    }
+    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRmsVoltageSwellPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRmsVoltageSwellPeriodAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSwellPeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcVoltageMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcVoltageMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcVoltageMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcVoltageMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcVoltageDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcVoltageDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcVoltageDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcVoltageDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcCurrentMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcCurrentMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcCurrentMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcCurrentMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcCurrentDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcCurrentDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcCurrentDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcCurrentDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcPowerMultiplierAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcPowerMultiplierAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcPowerMultiplierAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcPowerMultiplierAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcPowerDivisorAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcPowerDivisorAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcPowerDivisorAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcPowerDivisorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverloadAlarmsMaskAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readOverloadAlarmsMaskAttribute(chipClusterPtr, callback);
+    }
+    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOverloadAlarmsMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVoltageOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readVoltageOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeVoltageOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVoltageOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readCurrentOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeCurrentOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCurrentOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcOverloadAlarmsMaskAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback);
+    }
+    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeAcOverloadAlarmsMaskAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeAcOverloadAlarmsMaskAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcOverloadAlarmsMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcVoltageOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcVoltageOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcVoltageOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcVoltageOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcCurrentOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcCurrentOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcCurrentOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcCurrentOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcActivePowerOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcActivePowerOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcActivePowerOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcActivePowerOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcReactivePowerOverloadAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAcReactivePowerOverloadAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcReactivePowerOverloadAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAcReactivePowerOverloadAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsOverVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsOverVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsOverVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsOverVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsUnderVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsUnderVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsUnderVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsUnderVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeOverVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeOverVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeOverVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeOverVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeUnderVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeUnderVoltageAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeUnderVoltageAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeUnderVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSagAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSagAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSagAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSagAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSwellAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSwellAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSwellAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSwellAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLineCurrentPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLineCurrentPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLineCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLineCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveCurrentPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActiveCurrentPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReactiveCurrentPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReactiveCurrentPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReactiveCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReactiveCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltagePhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltagePhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltagePhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltagePhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMinPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMinPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMinPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMaxPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMaxPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMaxPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMinPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMinPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMinPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMaxPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMaxPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMaxPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMinPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMinPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMinPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMinPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMaxPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMaxPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMaxPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMaxPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReactivePowerPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReactivePowerPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReactivePowerPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReactivePowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApparentPowerPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readApparentPowerPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApparentPowerPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApparentPowerPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerFactorPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPowerFactorPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerFactorPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePowerFactorPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsOverVoltageCounterPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsOverVoltageCounterPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsOverVoltageCounterPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsUnderVoltageCounterPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsUnderVoltageCounterPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeOverVoltagePeriodPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeOverVoltagePeriodPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeUnderVoltagePeriodPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSagPeriodPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSagPeriodPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSagPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSagPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSwellPeriodPhaseBAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSwellPeriodPhaseBAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSwellPeriodPhaseBAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSwellPeriodPhaseBAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLineCurrentPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readLineCurrentPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeLineCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLineCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveCurrentPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActiveCurrentPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActiveCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReactiveCurrentPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReactiveCurrentPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReactiveCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReactiveCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltagePhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltagePhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltagePhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltagePhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMinPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMinPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMinPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageMaxPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageMaxPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageMaxPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMinPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMinPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMinPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsCurrentMaxPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsCurrentMaxPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsCurrentMaxPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsCurrentMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMinPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMinPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMinPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMinPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActivePowerMaxPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readActivePowerMaxPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeActivePowerMaxPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeActivePowerMaxPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReactivePowerPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readReactivePowerPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeReactivePowerPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeReactivePowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readApparentPowerPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readApparentPowerPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeApparentPowerPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeApparentPowerPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPowerFactorPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readPowerFactorPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribePowerFactorPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribePowerFactorPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsOverVoltageCounterPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsOverVoltageCounterPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsOverVoltageCounterPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAverageRmsUnderVoltageCounterPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readAverageRmsUnderVoltageCounterPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeOverVoltagePeriodPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeOverVoltagePeriodPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsExtremeUnderVoltagePeriodPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSagPeriodPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSagPeriodPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSagPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSagPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRmsVoltageSwellPeriodPhaseCAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRmsVoltageSwellPeriodPhaseCAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeRmsVoltageSwellPeriodPhaseCAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRmsVoltageSwellPeriodPhaseCAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readMeasurementTypeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeMeasurementTypeAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcVoltageMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcVoltageMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcVoltageMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcVoltageMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcCurrentMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcCurrentMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcCurrentMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcCurrentMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcPowerMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcPowerMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcPowerMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcPowerMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcVoltageMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcVoltageMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcVoltageDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcVoltageDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcCurrentDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcCurrentDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcPowerMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcPowerMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readDcPowerDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeDcPowerDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcFrequencyAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcFrequencyMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcFrequencyMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcFrequencyMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcFrequencyMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNeutralCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeNeutralCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTotalActivePowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTotalActivePowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTotalReactivePowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTotalReactivePowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readTotalApparentPowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeTotalApparentPowerAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured1stHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured1stHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured3rdHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured3rdHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured5thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured5thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured7thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured7thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured9thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured9thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasured11thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasured11thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase1stHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase1stHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase3rdHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase3rdHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase5thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase5thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase7thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase7thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase9thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase9thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readMeasuredPhase11thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeMeasuredPhase11thHarmonicCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcFrequencyMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcFrequencyMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcFrequencyDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcFrequencyDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPowerMultiplierAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePowerMultiplierAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPowerDivisorAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribePowerDivisorAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readHarmonicCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeHarmonicCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPhaseHarmonicCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePhaseHarmonicCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstantaneousVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstantaneousVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstantaneousLineCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstantaneousLineCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstantaneousActiveCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstantaneousActiveCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstantaneousReactiveCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstantaneousReactiveCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInstantaneousPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeInstantaneousPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMinAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMaxAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReactivePowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeReactivePowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApparentPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeApparentPowerAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPowerFactorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePowerFactorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAverageRmsVoltageMeasurementPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAverageRmsUnderVoltageCounterAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRmsExtremeOverVoltagePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRmsExtremeUnderVoltagePeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSagPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRmsVoltageSagPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRmsVoltageSagPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSwellPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRmsVoltageSwellPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRmsVoltageSwellPeriodAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcVoltageMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcVoltageMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcVoltageDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcVoltageDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcCurrentMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcCurrentDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcCurrentDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcPowerMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcPowerMultiplierAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcPowerDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcPowerDivisorAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOverloadAlarmsMaskAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeOverloadAlarmsMaskAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOverloadAlarmsMaskAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVoltageOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeVoltageOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCurrentOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeCurrentOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcOverloadAlarmsMaskAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeAcOverloadAlarmsMaskAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeAcOverloadAlarmsMaskAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcVoltageOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcVoltageOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcCurrentOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcCurrentOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcActivePowerOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcActivePowerOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAcReactivePowerOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAcReactivePowerOverloadAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsOverVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsOverVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsUnderVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsUnderVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeOverVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeOverVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeUnderVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeUnderVoltageAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSagAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSagAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSwellAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSwellAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLineCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLineCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActiveCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReactiveCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeReactiveCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltagePhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltagePhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMinPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMaxPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReactivePowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeReactivePowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApparentPowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeApparentPowerPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPowerFactorPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePowerFactorPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsOverVoltageCounterPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsOverVoltageCounterPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsUnderVoltageCounterPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeOverVoltagePeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeUnderVoltagePeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSagPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSagPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSwellPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSwellPeriodPhaseBAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLineCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeLineCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActiveCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActiveCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReactiveCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeReactiveCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltagePhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltagePhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsCurrentMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsCurrentMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMinPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readActivePowerMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeActivePowerMaxPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readReactivePowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeReactivePowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readApparentPowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeApparentPowerPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readPowerFactorPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribePowerFactorPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsOverVoltageCounterPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsOverVoltageCounterPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readAverageRmsUnderVoltageCounterPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeOverVoltagePeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsExtremeUnderVoltagePeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSagPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSagPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRmsVoltageSwellPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeRmsVoltageSwellPeriodPhaseCAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class UnitTestingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0xFFF1FC05L;
+
+    public UnitTestingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void test(DefaultClusterCallback callback
+      ) {
+      test(chipClusterPtr, callback, null);
+    }
+
+    public void test(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      test(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void testNotHandled(DefaultClusterCallback callback
+      ) {
+      testNotHandled(chipClusterPtr, callback, null);
+    }
+
+    public void testNotHandled(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      testNotHandled(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void testSpecific(TestSpecificResponseCallback callback
+      ) {
+      testSpecific(chipClusterPtr, callback, null);
+    }
+
+    public void testSpecific(TestSpecificResponseCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      testSpecific(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void testUnknownCommand(DefaultClusterCallback callback
+      ) {
+      testUnknownCommand(chipClusterPtr, callback, null);
+    }
+
+    public void testUnknownCommand(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      testUnknownCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void testAddArguments(TestAddArgumentsResponseCallback callback
+      , Integer arg1, Integer arg2) {
+      testAddArguments(chipClusterPtr, callback, arg1, arg2, null);
+    }
+
+    public void testAddArguments(TestAddArgumentsResponseCallback callback
+      , Integer arg1, Integer arg2
+      , int timedInvokeTimeoutMs) {
+      testAddArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
+    }
+
+    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback
+      , Boolean arg1) {
+      testSimpleArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testSimpleArgumentRequest(TestSimpleArgumentResponseCallback callback
+      , Boolean arg1
+      , int timedInvokeTimeoutMs) {
+      testSimpleArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Integer> arg4, Integer arg5, Boolean arg6) {
+      testStructArrayArgumentRequest(chipClusterPtr, callback, arg1, arg2, arg3, arg4, arg5, arg6, null);
+    }
+
+    public void testStructArrayArgumentRequest(TestStructArrayArgumentResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Integer> arg4, Integer arg5, Boolean arg6
+      , int timedInvokeTimeoutMs) {
+      testStructArrayArgumentRequest(chipClusterPtr, callback, arg1, arg2, arg3, arg4, arg5, arg6, timedInvokeTimeoutMs);
+    }
+
+    public void testStructArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1) {
+      testStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testStructArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1
+      , int timedInvokeTimeoutMs) {
+      testStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testNestedStructArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterNestedStruct arg1) {
+      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testNestedStructArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterNestedStruct arg1
+      , int timedInvokeTimeoutMs) {
+      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListStructArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1) {
+      testListStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListStructArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1
+      , int timedInvokeTimeoutMs) {
+      testListStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListInt8UArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<Integer> arg1) {
+      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListInt8UArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<Integer> arg1
+      , int timedInvokeTimeoutMs) {
+      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterNestedStructList arg1) {
+      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testNestedStructListArgumentRequest(BooleanResponseCallback callback
+      , ChipStructs.UnitTestingClusterNestedStructList arg1
+      , int timedInvokeTimeoutMs) {
+      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1) {
+      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListNestedStructListArgumentRequest(BooleanResponseCallback callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1
+      , int timedInvokeTimeoutMs) {
+      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback
+      , ArrayList<Integer> arg1) {
+      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback
+      , ArrayList<Integer> arg1
+      , int timedInvokeTimeoutMs) {
+      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testEnumsRequest(TestEnumsResponseCallback callback
+      , Integer arg1, Integer arg2) {
+      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, null);
+    }
+
+    public void testEnumsRequest(TestEnumsResponseCallback callback
+      , Integer arg1, Integer arg2
+      , int timedInvokeTimeoutMs) {
+      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
+    }
+
+    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback
+      , @Nullable Optional<Integer> arg1) {
+      testNullableOptionalRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testNullableOptionalRequest(TestNullableOptionalResponseCallback callback
+      , @Nullable Optional<Integer> arg1
+      , int timedInvokeTimeoutMs) {
+      testNullableOptionalRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback
+      , @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList) {
+      testComplexNullableOptionalRequest(chipClusterPtr, callback, nullableInt, optionalInt, nullableOptionalInt, nullableString, optionalString, nullableOptionalString, nullableStruct, optionalStruct, nullableOptionalStruct, nullableList, optionalList, nullableOptionalList, null);
+    }
+
+    public void testComplexNullableOptionalRequest(TestComplexNullableOptionalResponseCallback callback
+      , @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList
+      , int timedInvokeTimeoutMs) {
+      testComplexNullableOptionalRequest(chipClusterPtr, callback, nullableInt, optionalInt, nullableOptionalInt, nullableString, optionalString, nullableOptionalString, nullableStruct, optionalStruct, nullableOptionalStruct, nullableList, optionalList, nullableOptionalList, timedInvokeTimeoutMs);
+    }
+
+    public void simpleStructEchoRequest(SimpleStructResponseCallback callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1) {
+      simpleStructEchoRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void simpleStructEchoRequest(SimpleStructResponseCallback callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1
+      , int timedInvokeTimeoutMs) {
+      simpleStructEchoRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+
+    public void timedInvokeRequest(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      timedInvokeRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback
+      , Optional<Boolean> arg1) {
+      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testSimpleOptionalArgumentRequest(DefaultClusterCallback callback
+      , Optional<Boolean> arg1
+      , int timedInvokeTimeoutMs) {
+      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback
+      , Integer arg1, Integer arg2, Boolean arg3) {
+      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, null);
+    }
+
+    public void testEmitTestEventRequest(TestEmitTestEventResponseCallback callback
+      , Integer arg1, Integer arg2, Boolean arg3
+      , int timedInvokeTimeoutMs) {
+      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, timedInvokeTimeoutMs);
+    }
+
+    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback
+      , Integer arg1) {
+      testEmitTestFabricScopedEventRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventResponseCallback callback
+      , Integer arg1
+      , int timedInvokeTimeoutMs) {
+      testEmitTestFabricScopedEventRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+    private native void test(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback Callback
+      , Integer arg1, Integer arg2
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testSimpleArgumentRequest(long chipClusterPtr, TestSimpleArgumentResponseCallback Callback
+      , Boolean arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testStructArrayArgumentRequest(long chipClusterPtr, TestStructArrayArgumentResponseCallback Callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Integer> arg4, Integer arg5, Boolean arg6
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testNestedStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ChipStructs.UnitTestingClusterNestedStruct arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testListStructArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testListInt8UArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ArrayList<Integer> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testNestedStructListArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ChipStructs.UnitTestingClusterNestedStructList arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testListNestedStructListArgumentRequest(long chipClusterPtr, BooleanResponseCallback Callback
+      , ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback Callback
+      , ArrayList<Integer> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testEnumsRequest(long chipClusterPtr, TestEnumsResponseCallback Callback
+      , Integer arg1, Integer arg2
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testNullableOptionalRequest(long chipClusterPtr, TestNullableOptionalResponseCallback Callback
+      , @Nullable Optional<Integer> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testComplexNullableOptionalRequest(long chipClusterPtr, TestComplexNullableOptionalResponseCallback Callback
+      , @Nullable Integer nullableInt, Optional<Integer> optionalInt, @Nullable Optional<Integer> nullableOptionalInt, @Nullable String nullableString, Optional<String> optionalString, @Nullable Optional<String> nullableOptionalString, @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct, @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct, @Nullable ArrayList<Integer> nullableList, Optional<ArrayList<Integer>> optionalList, @Nullable Optional<ArrayList<Integer>> nullableOptionalList
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void simpleStructEchoRequest(long chipClusterPtr, SimpleStructResponseCallback Callback
+      , ChipStructs.UnitTestingClusterSimpleStruct arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void timedInvokeRequest(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testSimpleOptionalArgumentRequest(long chipClusterPtr, DefaultClusterCallback Callback
+      , Optional<Boolean> arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testEmitTestEventRequest(long chipClusterPtr, TestEmitTestEventResponseCallback Callback
+      , Integer arg1, Integer arg2, Boolean arg3
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void testEmitTestFabricScopedEventRequest(long chipClusterPtr, TestEmitTestFabricScopedEventResponseCallback Callback
+      , Integer arg1
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface TestSpecificResponseCallback {
+      void onSuccess(Integer returnValue);
+
+      void onError(Exception error);
+    }
+
+    public interface TestAddArgumentsResponseCallback {
+      void onSuccess(Integer returnValue);
+
+      void onError(Exception error);
+    }
+
+    public interface TestSimpleArgumentResponseCallback {
+      void onSuccess(Boolean returnValue);
+
+      void onError(Exception error);
+    }
+
+    public interface TestStructArrayArgumentResponseCallback {
+      void onSuccess(ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Integer> arg4, Integer arg5, Boolean arg6);
+
+      void onError(Exception error);
+    }
+
+    public interface TestListInt8UReverseResponseCallback {
+      void onSuccess(ArrayList<Integer> arg1);
+
+      void onError(Exception error);
+    }
+
+    public interface TestEnumsResponseCallback {
+      void onSuccess(Integer arg1, Integer arg2);
+
+      void onError(Exception error);
+    }
+
+    public interface TestNullableOptionalResponseCallback {
+      void onSuccess(Boolean wasPresent, Optional<Boolean> wasNull, Optional<Integer> value, @Nullable Optional<Integer> originalValue);
+
+      void onError(Exception error);
+    }
+
+    public interface TestComplexNullableOptionalResponseCallback {
+      void onSuccess(Boolean nullableIntWasNull, Optional<Integer> nullableIntValue, Boolean optionalIntWasPresent, Optional<Integer> optionalIntValue, Boolean nullableOptionalIntWasPresent, Optional<Boolean> nullableOptionalIntWasNull, Optional<Integer> nullableOptionalIntValue, Boolean nullableStringWasNull, Optional<String> nullableStringValue, Boolean optionalStringWasPresent, Optional<String> optionalStringValue, Boolean nullableOptionalStringWasPresent, Optional<Boolean> nullableOptionalStringWasNull, Optional<String> nullableOptionalStringValue, Boolean nullableStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableStructValue, Boolean optionalStructWasPresent, Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStructValue, Boolean nullableOptionalStructWasPresent, Optional<Boolean> nullableOptionalStructWasNull, Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStructValue, Boolean nullableListWasNull, Optional<ArrayList<Integer>> nullableListValue, Boolean optionalListWasPresent, Optional<ArrayList<Integer>> optionalListValue, Boolean nullableOptionalListWasPresent, Optional<Boolean> nullableOptionalListWasNull, Optional<ArrayList<Integer>> nullableOptionalListValue);
+
+      void onError(Exception error);
+    }
+
+    public interface BooleanResponseCallback {
+      void onSuccess(Boolean value);
+
+      void onError(Exception error);
+    }
+
+    public interface SimpleStructResponseCallback {
+      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct arg1);
+
+      void onError(Exception error);
+    }
+
+    public interface TestEmitTestEventResponseCallback {
+      void onSuccess(Long value);
+
+      void onError(Exception error);
+    }
+
+    public interface TestEmitTestFabricScopedEventResponseCallback {
+      void onSuccess(Long value);
+
+      void onError(Exception error);
+    }
+
+
+      public interface ListInt8uAttributeCallback {
+        void onSuccess( List<Integer> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ListOctetStringAttributeCallback {
+        void onSuccess( List<byte[]> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ListStructOctetStringAttributeCallback {
+        void onSuccess( List<ChipStructs.UnitTestingClusterTestListStructOctet> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ListNullablesAndOptionalsStructAttributeCallback {
+        void onSuccess( List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ListLongOctetStringAttributeCallback {
+        void onSuccess( List<byte[]> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface ListFabricScopedAttributeCallback {
+        void onSuccess( List<ChipStructs.UnitTestingClusterTestFabricScoped> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableBooleanAttributeCallback {
+        void onSuccess(@Nullable Boolean value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableBitmap8AttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableBitmap16AttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableBitmap32AttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableBitmap64AttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt8uAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt16uAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt24uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt32uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt40uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt48uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt56uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt64uAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt8sAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt16sAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt24sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt32sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt40sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt48sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt56sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableInt64sAttributeCallback {
+        void onSuccess(@Nullable Long value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableEnum8AttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableEnum16AttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableFloatSingleAttributeCallback {
+        void onSuccess(@Nullable Float value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableFloatDoubleAttributeCallback {
+        void onSuccess(@Nullable Double value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableOctetStringAttributeCallback {
+        void onSuccess(@Nullable byte[] value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableCharStringAttributeCallback {
+        void onSuccess(@Nullable String value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableEnumAttrAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableRangeRestrictedInt8uAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableRangeRestrictedInt8sAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableRangeRestrictedInt16uAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface NullableRangeRestrictedInt16sAttributeCallback {
+        void onSuccess(@Nullable Integer value);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readBooleanAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readBooleanAttribute(chipClusterPtr, callback);
+    }
+    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeBooleanAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBooleanAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBitmap8Attribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBitmap8Attribute(chipClusterPtr, callback);
+    }
+    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap8Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBitmap8Attribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBitmap16Attribute(
+      IntegerAttributeCallback callback
+    ) {
+      readBitmap16Attribute(chipClusterPtr, callback);
+    }
+    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap16Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBitmap16Attribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBitmap32Attribute(
+      LongAttributeCallback callback
+    ) {
+      readBitmap32Attribute(chipClusterPtr, callback);
+    }
+    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap32Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBitmap32Attribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBitmap64Attribute(
+      LongAttributeCallback callback
+    ) {
+      readBitmap64Attribute(chipClusterPtr, callback);
+    }
+    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap64Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeBitmap64Attribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt8uAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt8uAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt16uAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInt16uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt16uAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt24uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt24uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt24uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt32uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt32uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt32uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt40uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt40uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt40uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt48uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt48uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt48uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt56uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt56uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt56uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt64uAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt64uAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt64uAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt8sAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInt8sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt8sAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt16sAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readInt16sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt16sAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt24sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt24sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt24sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt32sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt32sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt32sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt40sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt40sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt40sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt48sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt48sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt48sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt56sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt56sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt56sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readInt64sAttribute(
+      LongAttributeCallback callback
+    ) {
+      readInt64sAttribute(chipClusterPtr, callback);
+    }
+    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeInt64sAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnum8Attribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEnum8Attribute(chipClusterPtr, callback);
+    }
+    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum8Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnum8Attribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnum16Attribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEnum16Attribute(chipClusterPtr, callback);
+    }
+    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum16Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnum16Attribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFloatSingleAttribute(
+      FloatAttributeCallback callback
+    ) {
+      readFloatSingleAttribute(chipClusterPtr, callback);
+    }
+    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      writeFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeFloatSingleAttribute(
+        FloatAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFloatDoubleAttribute(
+      DoubleAttributeCallback callback
+    ) {
+      readFloatDoubleAttribute(chipClusterPtr, callback);
+    }
+    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      writeFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeFloatDoubleAttribute(
+        DoubleAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOctetStringAttribute(
+      OctetStringAttributeCallback callback
+    ) {
+      readOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeOctetStringAttribute(
+        OctetStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListInt8uAttribute(
+      ListInt8uAttributeCallback callback
+    ) {
+      readListInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Object> value) {
+      writeListInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Object> value, int timedWriteTimeoutMs) {
+      writeListInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListInt8uAttribute(
+        ListInt8uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListOctetStringAttribute(
+      ListOctetStringAttributeCallback callback
+    ) {
+      readListOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      writeListOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListOctetStringAttribute(
+        ListOctetStringAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListStructOctetStringAttribute(
+      ListStructOctetStringAttributeCallback callback
+    ) {
+      readListStructOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value) {
+      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListStructOctetStringAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value, int timedWriteTimeoutMs) {
+      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListStructOctetStringAttribute(
+        ListStructOctetStringAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListStructOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLongOctetStringAttribute(
+      OctetStringAttributeCallback callback
+    ) {
+      readLongOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeLongOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLongOctetStringAttribute(
+        OctetStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCharStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readCharStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeCharStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLongCharStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
+      readLongCharStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeLongCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLongCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeLongCharStringAttribute(
+        CharStringAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeLongCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEpochUsAttribute(
+      LongAttributeCallback callback
+    ) {
+      readEpochUsAttribute(chipClusterPtr, callback);
+    }
+    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochUsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeEpochUsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEpochUsAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEpochUsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEpochSAttribute(
+      LongAttributeCallback callback
+    ) {
+      readEpochSAttribute(chipClusterPtr, callback);
+    }
+    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochSAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeEpochSAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEpochSAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEpochSAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readVendorIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readVendorIdAttribute(chipClusterPtr, callback);
+    }
+    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value) {
+      writeVendorIdAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeVendorIdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeVendorIdAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListNullablesAndOptionalsStructAttribute(
+      ListNullablesAndOptionalsStructAttributeCallback callback
+    ) {
+      readListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback);
+    }
+    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value) {
+      writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListNullablesAndOptionalsStructAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value, int timedWriteTimeoutMs) {
+      writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListNullablesAndOptionalsStructAttribute(
+        ListNullablesAndOptionalsStructAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEnumAttrAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readEnumAttrAttribute(chipClusterPtr, callback);
+    }
+    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEnumAttrAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeEnumAttrAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRangeRestrictedInt8uAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRangeRestrictedInt8uAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRangeRestrictedInt8sAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
+    }
+    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRangeRestrictedInt8sAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRangeRestrictedInt16uAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
+    }
+    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRangeRestrictedInt16uAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRangeRestrictedInt16sAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
+    }
+    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeRangeRestrictedInt16sAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListLongOctetStringAttribute(
+      ListLongOctetStringAttributeCallback callback
+    ) {
+      readListLongOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListLongOctetStringAttribute(DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListLongOctetStringAttribute(
+        ListLongOctetStringAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readListFabricScopedAttribute(
+      ListFabricScopedAttributeCallback callback
+    ) {
+      readListFabricScopedAttribute(chipClusterPtr, callback, true);
+    }
+    public void readListFabricScopedAttributeWithFabricFilter(
+      ListFabricScopedAttributeCallback callback
+    ,
+      boolean isFabricFiltered
+    ) {
+      readListFabricScopedAttribute(chipClusterPtr, callback, isFabricFiltered);
+    }
+    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value) {
+      writeListFabricScopedAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListFabricScopedAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value, int timedWriteTimeoutMs) {
+      writeListFabricScopedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeListFabricScopedAttribute(
+        ListFabricScopedAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeListFabricScopedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimedWriteBooleanAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readTimedWriteBooleanAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeTimedWriteBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeTimedWriteBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeTimedWriteBooleanAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeTimedWriteBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneralErrorBooleanAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readGeneralErrorBooleanAttribute(chipClusterPtr, callback);
+    }
+    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeGeneralErrorBooleanAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeGeneralErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterErrorBooleanAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readClusterErrorBooleanAttribute(chipClusterPtr, callback);
+    }
+    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeClusterErrorBooleanAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUnsupportedAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readUnsupportedAttribute(chipClusterPtr, callback);
+    }
+    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeUnsupportedAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeUnsupportedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeUnsupportedAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeUnsupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableBooleanAttribute(
+      NullableBooleanAttributeCallback callback
+    ) {
+      readNullableBooleanAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeNullableBooleanAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeNullableBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableBooleanAttribute(
+        NullableBooleanAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableBitmap8Attribute(
+      NullableBitmap8AttributeCallback callback
+    ) {
+      readNullableBitmap8Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableBitmap8Attribute(
+        NullableBitmap8AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableBitmap16Attribute(
+      NullableBitmap16AttributeCallback callback
+    ) {
+      readNullableBitmap16Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableBitmap16Attribute(
+        NullableBitmap16AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableBitmap32Attribute(
+      NullableBitmap32AttributeCallback callback
+    ) {
+      readNullableBitmap32Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableBitmap32Attribute(
+        NullableBitmap32AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableBitmap64Attribute(
+      NullableBitmap64AttributeCallback callback
+    ) {
+      readNullableBitmap64Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableBitmap64Attribute(
+        NullableBitmap64AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt8uAttribute(
+      NullableInt8uAttributeCallback callback
+    ) {
+      readNullableInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt8uAttribute(
+        NullableInt8uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt16uAttribute(
+      NullableInt16uAttributeCallback callback
+    ) {
+      readNullableInt16uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt16uAttribute(
+        NullableInt16uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt24uAttribute(
+      NullableInt24uAttributeCallback callback
+    ) {
+      readNullableInt24uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt24uAttribute(
+        NullableInt24uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt32uAttribute(
+      NullableInt32uAttributeCallback callback
+    ) {
+      readNullableInt32uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt32uAttribute(
+        NullableInt32uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt40uAttribute(
+      NullableInt40uAttributeCallback callback
+    ) {
+      readNullableInt40uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt40uAttribute(
+        NullableInt40uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt48uAttribute(
+      NullableInt48uAttributeCallback callback
+    ) {
+      readNullableInt48uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt48uAttribute(
+        NullableInt48uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt56uAttribute(
+      NullableInt56uAttributeCallback callback
+    ) {
+      readNullableInt56uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt56uAttribute(
+        NullableInt56uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt64uAttribute(
+      NullableInt64uAttributeCallback callback
+    ) {
+      readNullableInt64uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt64uAttribute(
+        NullableInt64uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt8sAttribute(
+      NullableInt8sAttributeCallback callback
+    ) {
+      readNullableInt8sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt8sAttribute(
+        NullableInt8sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt16sAttribute(
+      NullableInt16sAttributeCallback callback
+    ) {
+      readNullableInt16sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt16sAttribute(
+        NullableInt16sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt24sAttribute(
+      NullableInt24sAttributeCallback callback
+    ) {
+      readNullableInt24sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt24sAttribute(
+        NullableInt24sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt32sAttribute(
+      NullableInt32sAttributeCallback callback
+    ) {
+      readNullableInt32sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt32sAttribute(
+        NullableInt32sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt40sAttribute(
+      NullableInt40sAttributeCallback callback
+    ) {
+      readNullableInt40sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt40sAttribute(
+        NullableInt40sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt48sAttribute(
+      NullableInt48sAttributeCallback callback
+    ) {
+      readNullableInt48sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt48sAttribute(
+        NullableInt48sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt56sAttribute(
+      NullableInt56sAttributeCallback callback
+    ) {
+      readNullableInt56sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt56sAttribute(
+        NullableInt56sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableInt64sAttribute(
+      NullableInt64sAttributeCallback callback
+    ) {
+      readNullableInt64sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableInt64sAttribute(
+        NullableInt64sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableEnum8Attribute(
+      NullableEnum8AttributeCallback callback
+    ) {
+      readNullableEnum8Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum8Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableEnum8Attribute(
+        NullableEnum8AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableEnum16Attribute(
+      NullableEnum16AttributeCallback callback
+    ) {
+      readNullableEnum16Attribute(chipClusterPtr, callback);
+    }
+    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum16Attribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableEnum16Attribute(
+        NullableEnum16AttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableFloatSingleAttribute(
+      NullableFloatSingleAttributeCallback callback
+    ) {
+      readNullableFloatSingleAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableFloatSingleAttribute(
+        NullableFloatSingleAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableFloatDoubleAttribute(
+      NullableFloatDoubleAttributeCallback callback
+    ) {
+      readNullableFloatDoubleAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableFloatDoubleAttribute(
+        NullableFloatDoubleAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableOctetStringAttribute(
+      NullableOctetStringAttributeCallback callback
+    ) {
+      readNullableOctetStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableOctetStringAttribute(
+        NullableOctetStringAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableCharStringAttribute(
+      NullableCharStringAttributeCallback callback
+    ) {
+      readNullableCharStringAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeNullableCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNullableCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableCharStringAttribute(
+        NullableCharStringAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableEnumAttrAttribute(
+      NullableEnumAttrAttributeCallback callback
+    ) {
+      readNullableEnumAttrAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableEnumAttrAttribute(
+        NullableEnumAttrAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableRangeRestrictedInt8uAttribute(
+      NullableRangeRestrictedInt8uAttributeCallback callback
+    ) {
+      readNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableRangeRestrictedInt8uAttribute(
+        NullableRangeRestrictedInt8uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableRangeRestrictedInt8sAttribute(
+      NullableRangeRestrictedInt8sAttributeCallback callback
+    ) {
+      readNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableRangeRestrictedInt8sAttribute(
+        NullableRangeRestrictedInt8sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableRangeRestrictedInt16uAttribute(
+      NullableRangeRestrictedInt16uAttributeCallback callback
+    ) {
+      readNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableRangeRestrictedInt16uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableRangeRestrictedInt16uAttribute(
+        NullableRangeRestrictedInt16uAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNullableRangeRestrictedInt16sAttribute(
+      NullableRangeRestrictedInt16sAttributeCallback callback
+    ) {
+      readNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
+    }
+    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableRangeRestrictedInt16sAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeNullableRangeRestrictedInt16sAttribute(
+        NullableRangeRestrictedInt16sAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWriteOnlyInt8uAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readWriteOnlyInt8uAttribute(chipClusterPtr, callback);
+    }
+    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWriteOnlyInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeWriteOnlyInt8uAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWriteOnlyInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeWriteOnlyInt8uAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeWriteOnlyInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBitmap8Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBitmap8Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBitmap16Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBitmap16Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBitmap32Attribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBitmap32Attribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readBitmap64Attribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeBitmap64Attribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt16uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt16uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt24uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt24uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt24uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt32uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt32uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt40uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt40uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt40uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt48uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt48uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt48uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt56uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt56uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt56uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt64uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt64uAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt8sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt8sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt16sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt16sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt24sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt24sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt24sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt32sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt32sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt40sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt40sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt40sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt48sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt48sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt48sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt56sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt56sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt56sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readInt64sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeInt64sAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnum8Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnum8Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEnum16Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnum16Attribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readFloatSingleAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+    );
+
+    private native void writeFloatSingleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Float value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFloatSingleAttribute(long chipClusterPtr,
+        FloatAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readFloatDoubleAttribute(long chipClusterPtr,
+        DoubleAttributeCallback callback
+    );
+
+    private native void writeFloatDoubleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Double value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFloatDoubleAttribute(long chipClusterPtr,
+        DoubleAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readOctetStringAttribute(long chipClusterPtr,
+        OctetStringAttributeCallback callback
+    );
+
+    private native void writeOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeOctetStringAttribute(long chipClusterPtr,
+        OctetStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readListInt8uAttribute(long chipClusterPtr,
+        ListInt8uAttributeCallback callback
+    );
+
+    private native void writeListInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<Object> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListInt8uAttribute(long chipClusterPtr,
+        ListInt8uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readListOctetStringAttribute(long chipClusterPtr,
+        ListOctetStringAttributeCallback callback
+    );
+
+    private native void writeListOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<byte[]> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListOctetStringAttribute(long chipClusterPtr,
+        ListOctetStringAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readListStructOctetStringAttribute(long chipClusterPtr,
+        ListStructOctetStringAttributeCallback callback
+    );
+
+    private native void writeListStructOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListStructOctetStringAttribute(long chipClusterPtr,
+        ListStructOctetStringAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readLongOctetStringAttribute(long chipClusterPtr,
+        OctetStringAttributeCallback callback
+    );
+
+    private native void writeLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLongOctetStringAttribute(long chipClusterPtr,
+        OctetStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readCharStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeCharStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readLongCharStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+    );
+
+    private native void writeLongCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeLongCharStringAttribute(long chipClusterPtr,
+        CharStringAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEpochUsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeEpochUsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEpochUsAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readEpochSAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+
+    private native void writeEpochSAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEpochSAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readVendorIdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeVendorIdAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeVendorIdAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readListNullablesAndOptionalsStructAttribute(long chipClusterPtr,
+        ListNullablesAndOptionalsStructAttributeCallback callback
+    );
+
+    private native void writeListNullablesAndOptionalsStructAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListNullablesAndOptionalsStructAttribute(long chipClusterPtr,
+        ListNullablesAndOptionalsStructAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEnumAttrAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeEnumAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeEnumAttrAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRangeRestrictedInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRangeRestrictedInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRangeRestrictedInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRangeRestrictedInt8sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRangeRestrictedInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRangeRestrictedInt8sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRangeRestrictedInt16uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRangeRestrictedInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRangeRestrictedInt16uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readRangeRestrictedInt16sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeRangeRestrictedInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeRangeRestrictedInt16sAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readListLongOctetStringAttribute(long chipClusterPtr,
+        ListLongOctetStringAttributeCallback callback
+    );
+
+    private native void writeListLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<byte[]> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListLongOctetStringAttribute(long chipClusterPtr,
+        ListLongOctetStringAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readListFabricScopedAttribute(long chipClusterPtr,
+        ListFabricScopedAttributeCallback callback
+      , boolean isFabricFiltered
+    );
+
+    private native void writeListFabricScopedAttribute(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped> value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeListFabricScopedAttribute(long chipClusterPtr,
+        ListFabricScopedAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readTimedWriteBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeTimedWriteBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTimedWriteBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneralErrorBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeGeneralErrorBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeGeneralErrorBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterErrorBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeClusterErrorBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeClusterErrorBooleanAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readUnsupportedAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeUnsupportedAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUnsupportedAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readNullableBooleanAttribute(long chipClusterPtr,
+        NullableBooleanAttributeCallback callback
+    );
+
+    private native void writeNullableBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableBooleanAttribute(long chipClusterPtr,
+        NullableBooleanAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableBitmap8Attribute(long chipClusterPtr,
+        NullableBitmap8AttributeCallback callback
+    );
+
+    private native void writeNullableBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableBitmap8Attribute(long chipClusterPtr,
+        NullableBitmap8AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableBitmap16Attribute(long chipClusterPtr,
+        NullableBitmap16AttributeCallback callback
+    );
+
+    private native void writeNullableBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableBitmap16Attribute(long chipClusterPtr,
+        NullableBitmap16AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableBitmap32Attribute(long chipClusterPtr,
+        NullableBitmap32AttributeCallback callback
+    );
+
+    private native void writeNullableBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableBitmap32Attribute(long chipClusterPtr,
+        NullableBitmap32AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableBitmap64Attribute(long chipClusterPtr,
+        NullableBitmap64AttributeCallback callback
+    );
+
+    private native void writeNullableBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableBitmap64Attribute(long chipClusterPtr,
+        NullableBitmap64AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt8uAttribute(long chipClusterPtr,
+        NullableInt8uAttributeCallback callback
+    );
+
+    private native void writeNullableInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt8uAttribute(long chipClusterPtr,
+        NullableInt8uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt16uAttribute(long chipClusterPtr,
+        NullableInt16uAttributeCallback callback
+    );
+
+    private native void writeNullableInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt16uAttribute(long chipClusterPtr,
+        NullableInt16uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt24uAttribute(long chipClusterPtr,
+        NullableInt24uAttributeCallback callback
+    );
+
+    private native void writeNullableInt24uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt24uAttribute(long chipClusterPtr,
+        NullableInt24uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt32uAttribute(long chipClusterPtr,
+        NullableInt32uAttributeCallback callback
+    );
+
+    private native void writeNullableInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt32uAttribute(long chipClusterPtr,
+        NullableInt32uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt40uAttribute(long chipClusterPtr,
+        NullableInt40uAttributeCallback callback
+    );
+
+    private native void writeNullableInt40uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt40uAttribute(long chipClusterPtr,
+        NullableInt40uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt48uAttribute(long chipClusterPtr,
+        NullableInt48uAttributeCallback callback
+    );
+
+    private native void writeNullableInt48uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt48uAttribute(long chipClusterPtr,
+        NullableInt48uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt56uAttribute(long chipClusterPtr,
+        NullableInt56uAttributeCallback callback
+    );
+
+    private native void writeNullableInt56uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt56uAttribute(long chipClusterPtr,
+        NullableInt56uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt64uAttribute(long chipClusterPtr,
+        NullableInt64uAttributeCallback callback
+    );
+
+    private native void writeNullableInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt64uAttribute(long chipClusterPtr,
+        NullableInt64uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt8sAttribute(long chipClusterPtr,
+        NullableInt8sAttributeCallback callback
+    );
+
+    private native void writeNullableInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt8sAttribute(long chipClusterPtr,
+        NullableInt8sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt16sAttribute(long chipClusterPtr,
+        NullableInt16sAttributeCallback callback
+    );
+
+    private native void writeNullableInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt16sAttribute(long chipClusterPtr,
+        NullableInt16sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt24sAttribute(long chipClusterPtr,
+        NullableInt24sAttributeCallback callback
+    );
+
+    private native void writeNullableInt24sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt24sAttribute(long chipClusterPtr,
+        NullableInt24sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt32sAttribute(long chipClusterPtr,
+        NullableInt32sAttributeCallback callback
+    );
+
+    private native void writeNullableInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt32sAttribute(long chipClusterPtr,
+        NullableInt32sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt40sAttribute(long chipClusterPtr,
+        NullableInt40sAttributeCallback callback
+    );
+
+    private native void writeNullableInt40sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt40sAttribute(long chipClusterPtr,
+        NullableInt40sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt48sAttribute(long chipClusterPtr,
+        NullableInt48sAttributeCallback callback
+    );
+
+    private native void writeNullableInt48sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt48sAttribute(long chipClusterPtr,
+        NullableInt48sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt56sAttribute(long chipClusterPtr,
+        NullableInt56sAttributeCallback callback
+    );
+
+    private native void writeNullableInt56sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt56sAttribute(long chipClusterPtr,
+        NullableInt56sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableInt64sAttribute(long chipClusterPtr,
+        NullableInt64sAttributeCallback callback
+    );
+
+    private native void writeNullableInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableInt64sAttribute(long chipClusterPtr,
+        NullableInt64sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableEnum8Attribute(long chipClusterPtr,
+        NullableEnum8AttributeCallback callback
+    );
+
+    private native void writeNullableEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableEnum8Attribute(long chipClusterPtr,
+        NullableEnum8AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableEnum16Attribute(long chipClusterPtr,
+        NullableEnum16AttributeCallback callback
+    );
+
+    private native void writeNullableEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableEnum16Attribute(long chipClusterPtr,
+        NullableEnum16AttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableFloatSingleAttribute(long chipClusterPtr,
+        NullableFloatSingleAttributeCallback callback
+    );
+
+    private native void writeNullableFloatSingleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Float value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableFloatSingleAttribute(long chipClusterPtr,
+        NullableFloatSingleAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableFloatDoubleAttribute(long chipClusterPtr,
+        NullableFloatDoubleAttributeCallback callback
+    );
+
+    private native void writeNullableFloatDoubleAttribute(long chipClusterPtr, DefaultClusterCallback callback, Double value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableFloatDoubleAttribute(long chipClusterPtr,
+        NullableFloatDoubleAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableOctetStringAttribute(long chipClusterPtr,
+        NullableOctetStringAttributeCallback callback
+    );
+
+    private native void writeNullableOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableOctetStringAttribute(long chipClusterPtr,
+        NullableOctetStringAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableCharStringAttribute(long chipClusterPtr,
+        NullableCharStringAttributeCallback callback
+    );
+
+    private native void writeNullableCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableCharStringAttribute(long chipClusterPtr,
+        NullableCharStringAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableEnumAttrAttribute(long chipClusterPtr,
+        NullableEnumAttrAttributeCallback callback
+    );
+
+    private native void writeNullableEnumAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableEnumAttrAttribute(long chipClusterPtr,
+        NullableEnumAttrAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableRangeRestrictedInt8uAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt8uAttributeCallback callback
+    );
+
+    private native void writeNullableRangeRestrictedInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableRangeRestrictedInt8uAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt8uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableRangeRestrictedInt8sAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt8sAttributeCallback callback
+    );
+
+    private native void writeNullableRangeRestrictedInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableRangeRestrictedInt8sAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt8sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableRangeRestrictedInt16uAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt16uAttributeCallback callback
+    );
+
+    private native void writeNullableRangeRestrictedInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableRangeRestrictedInt16uAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt16uAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readNullableRangeRestrictedInt16sAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt16sAttributeCallback callback
+    );
+
+    private native void writeNullableRangeRestrictedInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNullableRangeRestrictedInt16sAttribute(long chipClusterPtr,
+        NullableRangeRestrictedInt16sAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readWriteOnlyInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+
+    private native void writeWriteOnlyInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeWriteOnlyInt8uAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class FaultInjectionCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0xFFF1FC06L;
+
+    public FaultInjectionCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void failAtFault(DefaultClusterCallback callback
+      , Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex) {
+      failAtFault(chipClusterPtr, callback, type, id, numCallsToSkip, numCallsToFail, takeMutex, null);
+    }
+
+    public void failAtFault(DefaultClusterCallback callback
+      , Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex
+      , int timedInvokeTimeoutMs) {
+      failAtFault(chipClusterPtr, callback, type, id, numCallsToSkip, numCallsToFail, takeMutex, timedInvokeTimeoutMs);
+    }
+
+    public void failRandomlyAtFault(DefaultClusterCallback callback
+      , Integer type, Long id, Integer percentage) {
+      failRandomlyAtFault(chipClusterPtr, callback, type, id, percentage, null);
+    }
+
+    public void failRandomlyAtFault(DefaultClusterCallback callback
+      , Integer type, Long id, Integer percentage
+      , int timedInvokeTimeoutMs) {
+      failRandomlyAtFault(chipClusterPtr, callback, type, id, percentage, timedInvokeTimeoutMs);
+    }
+    private native void failAtFault(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer type, Long id, Long numCallsToSkip, Long numCallsToFail, Boolean takeMutex
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void failRandomlyAtFault(long chipClusterPtr, DefaultClusterCallback Callback
+      , Integer type, Long id, Integer percentage
+      , @Nullable Integer timedInvokeTimeoutMs);
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+
+  public static class SampleMeiCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 0xFFF1FC20L;
+
+    public SampleMeiCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void ping(DefaultClusterCallback callback
+      ) {
+      ping(chipClusterPtr, callback, null);
+    }
+
+    public void ping(DefaultClusterCallback callback
+      
+      , int timedInvokeTimeoutMs) {
+      ping(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void addArguments(AddArgumentsResponseCallback callback
+      , Integer arg1, Integer arg2) {
+      addArguments(chipClusterPtr, callback, arg1, arg2, null);
+    }
+
+    public void addArguments(AddArgumentsResponseCallback callback
+      , Integer arg1, Integer arg2
+      , int timedInvokeTimeoutMs) {
+      addArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
+    }
+    private native void ping(long chipClusterPtr, DefaultClusterCallback Callback
+      
+      , @Nullable Integer timedInvokeTimeoutMs);
+    private native void addArguments(long chipClusterPtr, AddArgumentsResponseCallback Callback
+      , Integer arg1, Integer arg2
+      , @Nullable Integer timedInvokeTimeoutMs);
+    public interface AddArgumentsResponseCallback {
+      void onSuccess(Integer returnValue);
+
+      void onError(Exception error);
+    }
+
+
+      public interface GeneratedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AcceptedCommandListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface EventListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+      public interface AttributeListAttributeCallback {
+        void onSuccess( List<Long> valueList);
+        void onError(Exception ex);
+        default void onSubscriptionEstablished(long subscriptionId) {}
+      }
+
+    public void readFlipFlopAttribute(
+      BooleanAttributeCallback callback
+    ) {
+      readFlipFlopAttribute(chipClusterPtr, callback);
+    }
+    public void writeFlipFlopAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeFlipFlopAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeFlipFlopAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeFlipFlopAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+    public void subscribeFlipFlopAttribute(
+        BooleanAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFlipFlopAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(
+      GeneratedCommandListAttributeCallback callback
+    ) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(
+      AcceptedCommandListAttributeCallback callback
+    ) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEventListAttribute(
+      EventListAttributeCallback callback
+    ) {
+      readEventListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeEventListAttribute(
+        EventListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(
+      AttributeListAttributeCallback callback
+    ) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback
+      ,
+      int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback
+,
+      int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readFlipFlopAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+    );
+
+    private native void writeFlipFlopAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFlipFlopAttribute(long chipClusterPtr,
+        BooleanAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+    );
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+    );
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+    );
+    private native void subscribeEventListAttribute(long chipClusterPtr,
+        EventListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+    );
+    private native void subscribeAttributeListAttribute(long chipClusterPtr,
+        AttributeListAttributeCallback callback
+      , int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+    );
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr,
+        LongAttributeCallback callback
+, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+    );
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr,
+        IntegerAttributeCallback callback
+, int minInterval, int maxInterval);
+  }
+}
+
diff --git a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
index 12277183e52b6d..c82dd13f0e452f 100644
--- a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
+++ b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
@@ -117,6 +117,13 @@ void pychip_CommissionableNodeController_PrintDiscoveredCommissioners(
             ChipLogProgress(Discovery, "\tMrp Interval active\tNot present");
         }
         ChipLogProgress(Discovery, "\tSupports TCP\t\t%d", dnsSdInfo->resolutionData.supportsTcp);
+
+        if (dnsSdInfo->resolutionData.isICDOperatingAsLIT.HasValue())
+        {
+            ChipLogProgress(Discovery, "\tICD is operating as a\t%s",
+                            dnsSdInfo->resolutionData.isICDOperatingAsLIT.Value() ? "LIT" : "SIT");
+        }
+
         for (unsigned j = 0; j < dnsSdInfo->resolutionData.numIPs; ++j)
         {
             char buf[chip::Inet::IPAddress::kMaxStringLength];
diff --git a/src/controller/python/ChipDeviceController-Discovery.cpp b/src/controller/python/ChipDeviceController-Discovery.cpp
index eda6bf0b46308a..a9fc93b2fbc40b 100644
--- a/src/controller/python/ChipDeviceController-Discovery.cpp
+++ b/src/controller/python/ChipDeviceController-Discovery.cpp
@@ -128,6 +128,10 @@ void pychip_DeviceController_IterateDiscoveredCommissionableNodes(Controller::De
         {
             jsonVal["mrpRetryIntervalActive"] = dnsSdInfo->resolutionData.GetMrpRetryIntervalActive().Value().count();
         }
+        if (dnsSdInfo->resolutionData.GetMrpRetryActiveThreshold().HasValue())
+        {
+            jsonVal["mrpRetryActiveThreshold"] = dnsSdInfo->resolutionData.GetMrpRetryActiveThreshold().Value().count();
+        }
         jsonVal["supportsTcp"] = dnsSdInfo->resolutionData.supportsTcp;
         {
             Json::Value addresses;
@@ -139,6 +143,10 @@ void pychip_DeviceController_IterateDiscoveredCommissionableNodes(Controller::De
             }
             jsonVal["addresses"] = addresses;
         }
+        if (dnsSdInfo->resolutionData.isICDOperatingAsLIT.HasValue())
+        {
+            jsonVal["isICDOperatingAsLIT"] = dnsSdInfo->resolutionData.isICDOperatingAsLIT.Value();
+        }
         if (dnsSdInfo->commissionData.rotatingIdLen > 0)
         {
             jsonVal["rotatingId"] = rotatingId;
@@ -196,6 +204,11 @@ void pychip_DeviceController_PrintDiscoveredDevices(Controller::DeviceCommission
             ChipLogProgress(Discovery, "\tMrp Interval active\tNot present");
         }
         ChipLogProgress(Discovery, "\tSupports TCP\t\t%d", dnsSdInfo->resolutionData.supportsTcp);
+        if (dnsSdInfo->resolutionData.isICDOperatingAsLIT.HasValue())
+        {
+            ChipLogProgress(Discovery, "\tICD is operating as a\t%s",
+                            dnsSdInfo->resolutionData.isICDOperatingAsLIT.Value() ? "LIT" : "SIT");
+        }
         for (unsigned j = 0; j < dnsSdInfo->resolutionData.numIPs; ++j)
         {
             char buf[Inet::IPAddress::kMaxStringLength];
diff --git a/src/controller/python/ChipDeviceController-ScriptBinding.cpp b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
index a7732a48361db0..2d6857d17a4fe6 100644
--- a/src/controller/python/ChipDeviceController-ScriptBinding.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
@@ -100,6 +100,7 @@ chip::Platform::ScopedMemoryBuffer<uint8_t> sThreadBuf;
 chip::Platform::ScopedMemoryBuffer<char> sDefaultNTPBuf;
 app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type sDSTBuf;
 app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type sTimeZoneBuf;
+chip::Platform::ScopedMemoryBuffer<char> sTimeZoneNameBuf;
 chip::Controller::CommissioningParameters sCommissioningParameters;
 
 } // namespace
@@ -140,7 +141,7 @@ PyChipError pychip_DeviceController_UnpairDevice(chip::Controller::DeviceCommiss
                                                  DeviceUnpairingCompleteFunct callback);
 PyChipError pychip_DeviceController_SetThreadOperationalDataset(const char * threadOperationalDataset, uint32_t size);
 PyChipError pychip_DeviceController_SetWiFiCredentials(const char * ssid, const char * credentials);
-PyChipError pychip_DeviceController_SetTimeZone(int32_t offset, uint64_t validAt);
+PyChipError pychip_DeviceController_SetTimeZone(int32_t offset, uint64_t validAt, const char * name);
 PyChipError pychip_DeviceController_SetDSTOffset(int32_t offset, uint64_t validStarting, uint64_t validUntil);
 PyChipError pychip_DeviceController_SetDefaultNtp(const char * defaultNTP);
 PyChipError pychip_DeviceController_SetTrustedTimeSource(chip::NodeId nodeId, chip::EndpointId endpoint);
@@ -509,10 +510,22 @@ PyChipError pychip_DeviceController_SetWiFiCredentials(const char * ssid, const
     return ToPyChipError(CHIP_NO_ERROR);
 }
 
-PyChipError pychip_DeviceController_SetTimeZone(int32_t offset, uint64_t validAt)
+PyChipError pychip_DeviceController_SetTimeZone(int32_t offset, uint64_t validAt, const char * name)
 {
     sTimeZoneBuf.offset  = offset;
     sTimeZoneBuf.validAt = validAt;
+    if (strcmp(name, "") == 0)
+    {
+        sTimeZoneNameBuf.Free();
+        sTimeZoneBuf.name = NullOptional;
+    }
+    else
+    {
+        size_t len = strlen(name);
+        ReturnErrorCodeIf(!sTimeZoneNameBuf.Alloc(len), ToPyChipError(CHIP_ERROR_NO_MEMORY));
+        memcpy(sTimeZoneNameBuf.Get(), name, len);
+        sTimeZoneBuf.name.SetValue(CharSpan(sTimeZoneNameBuf.Get(), len));
+    }
     app::DataModel::List<app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type> list(&sTimeZoneBuf, 1);
     sCommissioningParameters.SetTimeZone(list);
     return ToPyChipError(CHIP_NO_ERROR);
diff --git a/src/controller/python/chip/ChipDeviceCtrl.py b/src/controller/python/chip/ChipDeviceCtrl.py
index 22ae11cda65a78..4db95205179a46 100644
--- a/src/controller/python/chip/ChipDeviceCtrl.py
+++ b/src/controller/python/chip/ChipDeviceCtrl.py
@@ -251,6 +251,7 @@ def __init__(self, name: str = ''):
         self.devCtrl = devCtrl
         self.name = name
         self.fabricCheckNodeId = -1
+        self._isActive = False
 
         self._Cluster = ChipClusters(builtins.chipStack)
         self._Cluster.InitLib(self._dmLib)
@@ -375,16 +376,18 @@ def Shutdown(self):
         ''' Shuts down this controller and reclaims any used resources, including the bound
             C++ constructor instance in the SDK.
         '''
-        if (self._isActive):
-            if self.devCtrl is not None:
-                self._ChipStack.Call(
-                    lambda: self._dmLib.pychip_DeviceController_DeleteDeviceController(
-                        self.devCtrl)
-                ).raise_on_error()
-                self.devCtrl = None
+        if not self._isActive:
+            return
 
-            ChipDeviceController.activeList.remove(self)
-            self._isActive = False
+        if self.devCtrl is not None:
+            self._ChipStack.Call(
+                lambda: self._dmLib.pychip_DeviceController_DeleteDeviceController(
+                    self.devCtrl)
+            ).raise_on_error()
+            self.devCtrl = None
+
+        ChipDeviceController.activeList.remove(self)
+        self._isActive = False
 
     def ShutdownAll():
         ''' Shut down all active controllers and reclaim any used resources.
@@ -684,6 +687,19 @@ def DiscoverAllCommissioning(self):
 
     def OpenCommissioningWindow(self, nodeid: int, timeout: int, iteration: int,
                                 discriminator: int, option: int) -> CommissioningParameters:
+        ''' Opens a commissioning window on the device with the given nodeid.
+            nodeid:        Node id of the device
+            timeout:       Command timeout
+            iteration:     The PAKE iteration count associated with the PAKE Passcode ID and ephemeral
+                           PAKE passcode verifier to be used for this commissioning. Valid range: 1000 - 100000
+                           Ignored if option == 0
+            discriminator: The long discriminator for the DNS-SD advertisement. Valid range: 0-4095
+                           Ignored if option == 0
+            option:        0 = kOriginalSetupCode
+                           1 = kTokenWithRandomPIN
+
+            Returns CommissioningParameters
+        '''
         self.CheckIsActive()
         self._ChipStack.CallAsync(
             lambda: self._dmLib.pychip_DeviceController_OpenCommissioningWindow(
@@ -825,6 +841,11 @@ async def SendCommand(self, nodeid: int, endpoint: int, payload: ClusterObjects.
         timedWriteTimeoutMs: Timeout for a timed invoke request. Omit or set to 'None' to indicate a non-timed request.
         interactionTimeoutMs: Overall timeout for the interaction. Omit or set to 'None' to have the SDK automatically compute the
                               right timeout value based on transport characteristics as well as the responsiveness of the target.
+
+        Returns:
+            - command respone. The type of the response is defined by the command.
+        Raises:
+            - InteractionModelError on error
         '''
         self.CheckIsActive()
 
@@ -845,6 +866,10 @@ def SendGroupCommand(self, groupid: int, payload: ClusterObjects.ClusterCommand,
         '''
         Send a group cluster-object encapsulated command to a group_id and get returned a future
         that can be awaited upon to get confirmation command was sent.
+        Returns:
+            - None: responses are not sent to group commands
+        Raises:
+            - InteractionModelError on error
         '''
         self.CheckIsActive()
 
@@ -870,6 +895,9 @@ async def WriteAttribute(self, nodeid: int,
         E.g
             (1, Clusters.UnitTesting.Attributes.XYZAttribute('hello')) -- Write 'hello'
             to the XYZ attribute on the test cluster to endpoint 1
+
+        Returns:
+            - [PyChipError] (list - one for each pth)
         '''
         self.CheckIsActive()
 
@@ -1091,6 +1119,13 @@ async def Read(self, nodeid: int, attributes: typing.List[typing.Union[
 
         reportInterval: A tuple of two int-s for (MinIntervalFloor, MaxIntervalCeiling). Used by establishing subscriptions.
             When not provided, a read request will be sent.
+
+        Returns:
+            - AsyncReadTransaction.ReadResponse. Please see ReadAttribute and ReadEvent for examples of how to access data.
+
+        Raises:
+            - InteractionModelError (chip.interaction_model) on error
+
         '''
         self.CheckIsActive()
 
@@ -1153,6 +1188,26 @@ async def ReadAttribute(self, nodeid: int, attributes: typing.List[typing.Union[
 
         reportInterval: A tuple of two int-s for (MinIntervalFloor, MaxIntervalCeiling). Used by establishing subscriptions.
             When not provided, a read request will be sent.
+
+        Returns:
+            - subscription request: ClusterAttribute.SubscriptionTransaction
+                                    To get notified on attribute change use SetAttributeUpdateCallback on the returned
+                                    SubscriptionTransaction. This is used to set a callback function, which is a callable of
+                                    type Callable[[TypedAttributePath, SubscriptionTransaction], None]
+                                    Get the attribute value from the change path using GetAttribute on the SubscriptionTransasction
+                                    You can await changes in the main loop using a trigger mechanism from the callback.
+                                    ex. queue.SimpleQueue
+
+            - read request: AsyncReadTransation.ReadResponse.attributes.
+                            This is of type AttributeCache.attributeCache (Attribute.py),
+                            which is a dict mapping endpoints to a list of Cluster (ClusterObjects.py) classes
+                            (dict[int, List[Cluster]])
+                            Access as ret[endpoint_id][<Cluster class>][<Attribute class>]
+                            Ex. To access the OnTime attribute from the OnOff cluster on EP 1
+                            ret[1][Clusters.OnOff][Clusters.OnOff.Attributes.OnTime]
+
+        Raises:
+            - InteractionModelError (chip.interaction_model) on error
         '''
         res = await self.Read(nodeid,
                               attributes=attributes,
@@ -1209,6 +1264,19 @@ async def ReadEvent(self, nodeid: int, events: typing.List[typing.Union[
         eventNumberFilter: Optional minimum event number filter.
         reportInterval: A tuple of two int-s for (MinIntervalFloor, MaxIntervalCeiling). Used by establishing subscriptions.
             When not provided, a read request will be sent.
+
+        Returns:
+            - subscription request: ClusterAttribute.SubscriptionTransaction
+                                    To get notified on event subscriptions, use the SetEventUpdateCallback function on the
+                                    returned  SubscriptionTransaction. This is a callable of type
+                                    Callable[[EventReadResult, SubscriptionTransaction], None]
+                                    You can await events using a trigger mechanism in the callback. ex. queue.SimpleQueue
+
+            - read request: AsyncReadTransation.ReadResponse.events.
+                            This is a List[ClusterEvent].
+
+        Raises:
+            - InteractionModelError (chip.interaction_model) on error
         '''
         res = await self.Read(nodeid=nodeid, events=events, eventNumberFilter=eventNumberFilter,
                               fabricFiltered=fabricFiltered, reportInterval=reportInterval, keepSubscriptions=keepSubscriptions,
@@ -1219,6 +1287,9 @@ async def ReadEvent(self, nodeid: int, events: typing.List[typing.Union[
             return res.events
 
     def ZCLSend(self, cluster, command, nodeid, endpoint, groupid, args, blocking=False):
+        ''' Wrapper over SendCommand that catches the exceptions
+            Returns a tuple of (errorCode, CommandResponse)
+        '''
         self.CheckIsActive()
 
         req = None
@@ -1235,6 +1306,9 @@ def ZCLSend(self, cluster, command, nodeid, endpoint, groupid, args, blocking=Fa
             return (int(ex.status), None)
 
     def ZCLReadAttribute(self, cluster, attribute, nodeid, endpoint, groupid, blocking=True):
+        ''' Wrapper over ReadAttribute for a single attribute
+            Returns an AttributeReadResult
+        '''
         self.CheckIsActive()
 
         clusterType = getattr(GeneratedObjects, cluster)
@@ -1253,6 +1327,9 @@ def ZCLReadAttribute(self, cluster, attribute, nodeid, endpoint, groupid, blocki
                                       status=0, value=result[endpoint][clusterType][attributeType], dataVersion=result[endpoint][clusterType][ClusterAttribute.DataVersion])
 
     def ZCLWriteAttribute(self, cluster: str, attribute: str, nodeid, endpoint, groupid, value, dataVersion=0, blocking=True):
+        ''' Wrapper over WriteAttribute for a single attribute
+            return PyChipError
+        '''
         req = None
         try:
             req = eval(
@@ -1263,6 +1340,9 @@ def ZCLWriteAttribute(self, cluster: str, attribute: str, nodeid, endpoint, grou
         return asyncio.run(self.WriteAttribute(nodeid, [(endpoint, req, dataVersion)]))
 
     def ZCLSubscribeAttribute(self, cluster, attribute, nodeid, endpoint, minInterval, maxInterval, blocking=True):
+        ''' Wrapper over ReadAttribute for a single attribute
+            Returns a SubscriptionTransaction. See ReadAttribute for more information.
+        '''
         self.CheckIsActive()
 
         req = None
@@ -1341,10 +1421,10 @@ def _InitLib(self):
                 c_char_p, c_char_p]
             self._dmLib.pychip_DeviceController_SetWiFiCredentials.restype = PyChipError
 
-            # Currently only supports 1 list item, no name
+            # Currently only supports 1 list item
             self._dmLib.pychip_DeviceController_SetTimeZone.restype = PyChipError
             self._dmLib.pychip_DeviceController_SetTimeZone.argtypes = [
-                c_int32, c_uint64]
+                c_int32, c_uint64, c_char_p]
 
             # Currently only supports 1 list item
             self._dmLib.pychip_DeviceController_SetDSTOffset.restype = PyChipError
@@ -1627,12 +1707,13 @@ def CommissionThread(self, discriminator, setupPinCode, nodeId, threadOperationa
         return self.ConnectBLE(discriminator, setupPinCode, nodeId)
 
     def CommissionWiFi(self, discriminator, setupPinCode, nodeId, ssid: str, credentials: str) -> PyChipError:
-        ''' Commissions a WiFi device over BLE
+        ''' Commissions a Wi-Fi device over BLE.
         '''
         self.SetWiFiCredentials(ssid, credentials)
         return self.ConnectBLE(discriminator, setupPinCode, nodeId)
 
     def SetWiFiCredentials(self, ssid: str, credentials: str):
+        ''' Set the Wi-Fi credentials to set during commissioning.'''
         self.CheckIsActive()
 
         self._ChipStack.Call(
@@ -1641,6 +1722,7 @@ def SetWiFiCredentials(self, ssid: str, credentials: str):
         ).raise_on_error()
 
     def SetThreadOperationalDataset(self, threadOperationalDataset):
+        ''' Set the Thread operational dataset to set during commissioning.'''
         self.CheckIsActive()
 
         self._ChipStack.Call(
@@ -1649,42 +1731,49 @@ def SetThreadOperationalDataset(self, threadOperationalDataset):
         ).raise_on_error()
 
     def ResetCommissioningParameters(self):
+        ''' Sets the commissioning parameters back to the default values.'''
         self.CheckIsActive()
         self._ChipStack.Call(
             lambda: self._dmLib.pychip_DeviceController_ResetCommissioningParameters()
         ).raise_on_error()
 
-    def SetTimeZone(self, offset: int, validAt: int):
+    def SetTimeZone(self, offset: int, validAt: int, name: str = ""):
+        ''' Set the time zone to set during commissioning. Currently only one time zone entry is supported'''
         self.CheckIsActive()
         self._ChipStack.Call(
-            lambda: self._dmLib.pychip_DeviceController_SetTimeZone(offset, validAt)
+            lambda: self._dmLib.pychip_DeviceController_SetTimeZone(offset, validAt, name.encode("utf-8"))
         ).raise_on_error()
 
     def SetDSTOffset(self, offset: int, validStarting: int, validUntil: int):
+        ''' Set the DST offset to set during commissioning. Currently only one DST entry is supported'''
         self.CheckIsActive()
         self._ChipStack.Call(
             lambda: self._dmLib.pychip_DeviceController_SetDSTOffset(offset, validStarting, validUntil)
         ).raise_on_error()
 
     def SetDefaultNTP(self, defaultNTP: str):
+        ''' Set the DefaultNTP to set during commissioning'''
         self.CheckIsActive()
         self._ChipStack.Call(
             lambda: self._dmLib.pychip_DeviceController_SetDefaultNtp(defaultNTP.encode("utf-8"))
         ).raise_on_error()
 
     def SetTrustedTimeSource(self, nodeId: int, endpoint: int):
+        ''' Set the trusetd time source nodeId to set during commissioning. This must be a node on the commissioner fabric.'''
         self.CheckIsActive()
         self._ChipStack.Call(
             lambda: self._dmLib.pychip_DeviceController_SetTrustedTimeSource(nodeId, endpoint)
         ).raise_on_error()
 
     def SetCheckMatchingFabric(self, check: bool):
+        ''' Instructs the auto-commissioner to perform a matching fabric check before commissioning.'''
         self.CheckIsActive()
         self._ChipStack.Call(
             lambda: self._dmLib.pychip_DeviceController_SetCheckMatchingFabric(check)
         ).raise_on_error()
 
     def GetFabricCheckResult(self) -> int:
+        ''' Returns the fabric check result if SetCheckMatchingFabric was used.'''
         return self.fabricCheckNodeId
 
     def CommissionOnNetwork(self, nodeId: int, setupPinCode: int,
@@ -1727,6 +1816,9 @@ def CommissionOnNetwork(self, nodeId: int, setupPinCode: int,
         return self._ChipStack.commissioningEventRes
 
     def CommissionWithCode(self, setupPayload: str, nodeid: int) -> PyChipError:
+        ''' Commission with the given nodeid from the setupPayload.
+            setupPayload may be a QR or manual code.
+        '''
         self.CheckIsActive()
 
         setupPayload = setupPayload.encode() + b'\0'
diff --git a/src/controller/python/chip/ble/LinuxImpl.cpp b/src/controller/python/chip/ble/LinuxImpl.cpp
index c33dddd1325dcc..6218d9c66d4c83 100644
--- a/src/controller/python/chip/ble/LinuxImpl.cpp
+++ b/src/controller/python/chip/ble/LinuxImpl.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 
 #include <lib/support/CHIPMem.h>
 #include <platform/CHIPDeviceLayer.h>
@@ -76,7 +93,8 @@ class ScannerDelegateImpl : public ChipDeviceScannerDelegate
         mScanCallback(scanCallback), mCompleteCallback(completeCallback), mErrorCallback(errorCallback)
     {}
 
-    void SetScanner(std::unique_ptr<ChipDeviceScanner> scanner) { mScanner = std::move(scanner); }
+    CHIP_ERROR ScannerInit(BluezAdapter1 * adapter) { return mScanner.Init(adapter, this); }
+    CHIP_ERROR ScannerStartScan(chip::System::Clock::Timeout timeout) { return mScanner.StartScan(timeout); }
 
     void OnDeviceScanned(BluezDevice1 & device, const chip::Ble::ChipBLEDeviceIdentificationInfo & info) override
     {
@@ -106,7 +124,7 @@ class ScannerDelegateImpl : public ChipDeviceScannerDelegate
     }
 
 private:
-    std::unique_ptr<ChipDeviceScanner> mScanner;
+    ChipDeviceScanner mScanner;
     PyObject * const mContext;
     const DeviceScannedCallback mScanCallback;
     const ScanCompleteCallback mCompleteCallback;
@@ -123,23 +141,13 @@ extern "C" void * pychip_ble_start_scanning(PyObject * context, void * adapter,
     std::unique_ptr<ScannerDelegateImpl> delegate =
         std::make_unique<ScannerDelegateImpl>(context, scanCallback, completeCallback, errorCallback);
 
-    std::unique_ptr<ChipDeviceScanner> scanner = ChipDeviceScanner::Create(static_cast<BluezAdapter1 *>(adapter), delegate.get());
+    CHIP_ERROR err = delegate->ScannerInit(static_cast<BluezAdapter1 *>(adapter));
+    VerifyOrReturnError(err == CHIP_NO_ERROR, nullptr);
 
-    if (!scanner)
-    {
-        return nullptr;
-    }
-
-    CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::PlatformMgr().LockChipStack();
-    err = scanner->StartScan(chip::System::Clock::Milliseconds32(timeoutMs));
+    err = delegate->ScannerStartScan(chip::System::Clock::Milliseconds32(timeoutMs));
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-    if (err != CHIP_NO_ERROR)
-    {
-        return nullptr;
-    }
-
-    delegate->SetScanner(std::move(scanner));
+    VerifyOrReturnError(err == CHIP_NO_ERROR, nullptr);
 
     return delegate.release();
 }
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index efa9adc53cfdab..d3414d28c842e8 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -332,9 +332,9 @@ class ChipClusters:
                 "reportable": True,
             },
             0x00000007: {
-                "attributeName": "RemainingCapacity",
+                "attributeName": "FabricSceneInfo",
                 "attributeId": 0x00000007,
-                "type": "int",
+                "type": "",
                 "reportable": True,
             },
             0x0000FFF8: {
@@ -1423,6 +1423,18 @@ class ChipClusters:
                 "type": "",
                 "reportable": True,
             },
+            0x00000015: {
+                "attributeName": "SpecificationVersion",
+                "attributeId": 0x00000015,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000016: {
+                "attributeName": "MaxPathsPerInvoke",
+                "attributeId": 0x00000016,
+                "type": "int",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -2190,6 +2202,9 @@ class ChipClusters:
                     "ssid": "bytes",
                     "credentials": "bytes",
                     "breadcrumb": "int",
+                    "networkIdentity": "bytes",
+                    "clientIdentifier": "bytes",
+                    "possessionNonce": "bytes",
                 },
             },
             0x00000003: {
@@ -2225,6 +2240,14 @@ class ChipClusters:
                     "breadcrumb": "int",
                 },
             },
+            0x00000009: {
+                "commandId": 0x00000009,
+                "commandName": "QueryIdentity",
+                "args": {
+                    "keyIdentifier": "bytes",
+                    "possessionNonce": "bytes",
+                },
+            },
         },
         "attributes": {
             0x00000000: {
@@ -2397,6 +2420,12 @@ class ChipClusters:
                     "eventTrigger": "int",
                 },
             },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "TimeSnapshot",
+                "args": {
+                },
+            },
         },
         "attributes": {
             0x00000000: {
@@ -2453,12 +2482,6 @@ class ChipClusters:
                 "type": "bool",
                 "reportable": True,
             },
-            0x00000009: {
-                "attributeName": "AverageWearCount",
-                "attributeId": 0x00000009,
-                "type": "int",
-                "reportable": True,
-            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -4316,56 +4339,56 @@ class ChipClusters:
             },
         },
     }
-    _MODE_SELECT_CLUSTER_INFO = {
-        "clusterName": "ModeSelect",
-        "clusterId": 0x00000050,
+    _TIMER_CLUSTER_INFO = {
+        "clusterName": "Timer",
+        "clusterId": 0x00000047,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "ChangeToMode",
+                "commandName": "SetTimer",
                 "args": {
-                    "newMode": "int",
+                    "newTime": "int",
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "ResetTimer",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "AddTime",
+                "args": {
+                    "additionalTime": "int",
+                },
+            },
+            0x00000003: {
+                "commandId": 0x00000003,
+                "commandName": "ReduceTime",
+                "args": {
+                    "timeReduction": "int",
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "Description",
+                "attributeName": "SetTime",
                 "attributeId": 0x00000000,
-                "type": "str",
+                "type": "int",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "StandardNamespace",
+                "attributeName": "TimeRemaining",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "SupportedModes",
+                "attributeName": "TimerState",
                 "attributeId": 0x00000002,
-                "type": "",
-                "reportable": True,
-            },
-            0x00000003: {
-                "attributeName": "CurrentMode",
-                "attributeId": 0x00000003,
-                "type": "int",
-                "reportable": True,
-            },
-            0x00000004: {
-                "attributeName": "StartUpMode",
-                "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
-            },
-            0x00000005: {
-                "attributeName": "OnMode",
-                "attributeId": 0x00000005,
-                "type": "int",
-                "reportable": True,
-                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -4405,44 +4428,71 @@ class ChipClusters:
             },
         },
     }
-    _LAUNDRY_WASHER_MODE_CLUSTER_INFO = {
-        "clusterName": "LaundryWasherMode",
-        "clusterId": 0x00000051,
+    _OVEN_CAVITY_OPERATIONAL_STATE_CLUSTER_INFO = {
+        "clusterName": "OvenCavityOperationalState",
+        "clusterId": 0x00000048,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "ChangeToMode",
+                "commandName": "Pause",
+                "args": {
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "Stop",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "Start",
+                "args": {
+                },
+            },
+            0x00000003: {
+                "commandId": 0x00000003,
+                "commandName": "Resume",
                 "args": {
-                    "newMode": "int",
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "SupportedModes",
+                "attributeName": "PhaseList",
                 "attributeId": 0x00000000,
-                "type": "",
+                "type": "str",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "CurrentMode",
+                "attributeName": "CurrentPhase",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "StartUpMode",
+                "attributeName": "CountdownTime",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x00000003: {
-                "attributeName": "OnMode",
+                "attributeName": "OperationalStateList",
                 "attributeId": 0x00000003,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "OperationalState",
+                "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
+            },
+            0x00000005: {
+                "attributeName": "OperationalError",
+                "attributeId": 0x00000005,
+                "type": "",
+                "reportable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -4482,9 +4532,9 @@ class ChipClusters:
             },
         },
     }
-    _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO = {
-        "clusterName": "RefrigeratorAndTemperatureControlledCabinetMode",
-        "clusterId": 0x00000052,
+    _OVEN_MODE_CLUSTER_INFO = {
+        "clusterName": "OvenMode",
+        "clusterId": 0x00000049,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
@@ -4559,38 +4609,25 @@ class ChipClusters:
             },
         },
     }
-    _LAUNDRY_WASHER_CONTROLS_CLUSTER_INFO = {
-        "clusterName": "LaundryWasherControls",
-        "clusterId": 0x00000053,
+    _LAUNDRY_DRYER_CONTROLS_CLUSTER_INFO = {
+        "clusterName": "LaundryDryerControls",
+        "clusterId": 0x0000004A,
         "commands": {
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "SpinSpeeds",
+                "attributeName": "SupportedDrynessLevels",
                 "attributeId": 0x00000000,
-                "type": "str",
+                "type": "int",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "SpinSpeedCurrent",
+                "attributeName": "SelectedDrynessLevel",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
                 "writable": True,
             },
-            0x00000002: {
-                "attributeName": "NumberOfRinses",
-                "attributeId": 0x00000002,
-                "type": "int",
-                "reportable": True,
-                "writable": True,
-            },
-            0x00000003: {
-                "attributeName": "SupportedRinses",
-                "attributeId": 0x00000003,
-                "type": "int",
-                "reportable": True,
-            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -4629,9 +4666,9 @@ class ChipClusters:
             },
         },
     }
-    _RVC_RUN_MODE_CLUSTER_INFO = {
-        "clusterName": "RvcRunMode",
-        "clusterId": 0x00000054,
+    _MODE_SELECT_CLUSTER_INFO = {
+        "clusterName": "ModeSelect",
+        "clusterId": 0x00000050,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
@@ -4643,22 +4680,41 @@ class ChipClusters:
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "SupportedModes",
+                "attributeName": "Description",
                 "attributeId": 0x00000000,
-                "type": "",
+                "type": "str",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "CurrentMode",
+                "attributeName": "StandardNamespace",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
+            0x00000002: {
+                "attributeName": "SupportedModes",
+                "attributeId": 0x00000002,
+                "type": "",
+                "reportable": True,
+            },
             0x00000003: {
-                "attributeName": "OnMode",
+                "attributeName": "CurrentMode",
                 "attributeId": 0x00000003,
                 "type": "int",
                 "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "StartUpMode",
+                "attributeId": 0x00000004,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000005: {
+                "attributeName": "OnMode",
+                "attributeId": 0x00000005,
+                "type": "int",
+                "reportable": True,
                 "writable": True,
             },
             0x0000FFF8: {
@@ -4699,9 +4755,9 @@ class ChipClusters:
             },
         },
     }
-    _RVC_CLEAN_MODE_CLUSTER_INFO = {
-        "clusterName": "RvcCleanMode",
-        "clusterId": 0x00000055,
+    _LAUNDRY_WASHER_MODE_CLUSTER_INFO = {
+        "clusterName": "LaundryWasherMode",
+        "clusterId": 0x00000051,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
@@ -4724,6 +4780,13 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
+            0x00000002: {
+                "attributeName": "StartUpMode",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
             0x00000003: {
                 "attributeName": "OnMode",
                 "attributeId": 0x00000003,
@@ -4769,55 +4832,44 @@ class ChipClusters:
             },
         },
     }
-    _TEMPERATURE_CONTROL_CLUSTER_INFO = {
-        "clusterName": "TemperatureControl",
-        "clusterId": 0x00000056,
+    _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO = {
+        "clusterName": "RefrigeratorAndTemperatureControlledCabinetMode",
+        "clusterId": 0x00000052,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "SetTemperature",
+                "commandName": "ChangeToMode",
                 "args": {
-                    "targetTemperature": "int",
-                    "targetTemperatureLevel": "int",
+                    "newMode": "int",
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "TemperatureSetpoint",
+                "attributeName": "SupportedModes",
                 "attributeId": 0x00000000,
-                "type": "int",
+                "type": "",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "MinTemperature",
+                "attributeName": "CurrentMode",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "MaxTemperature",
+                "attributeName": "StartUpMode",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000003: {
-                "attributeName": "Step",
+                "attributeName": "OnMode",
                 "attributeId": 0x00000003,
                 "type": "int",
                 "reportable": True,
-            },
-            0x00000004: {
-                "attributeName": "SelectedTemperatureLevel",
-                "attributeId": 0x00000004,
-                "type": "int",
-                "reportable": True,
-            },
-            0x00000005: {
-                "attributeName": "SupportedTemperatureLevels",
-                "attributeId": 0x00000005,
-                "type": "str",
-                "reportable": True,
+                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -4857,26 +4909,34 @@ class ChipClusters:
             },
         },
     }
-    _REFRIGERATOR_ALARM_CLUSTER_INFO = {
-        "clusterName": "RefrigeratorAlarm",
-        "clusterId": 0x00000057,
+    _LAUNDRY_WASHER_CONTROLS_CLUSTER_INFO = {
+        "clusterName": "LaundryWasherControls",
+        "clusterId": 0x00000053,
         "commands": {
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "Mask",
+                "attributeName": "SpinSpeeds",
                 "attributeId": 0x00000000,
+                "type": "str",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "SpinSpeedCurrent",
+                "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000002: {
-                "attributeName": "State",
+                "attributeName": "NumberOfRinses",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000003: {
-                "attributeName": "Supported",
+                "attributeName": "SupportedRinses",
                 "attributeId": 0x00000003,
                 "type": "int",
                 "reportable": True,
@@ -4919,9 +4979,9 @@ class ChipClusters:
             },
         },
     }
-    _DISHWASHER_MODE_CLUSTER_INFO = {
-        "clusterName": "DishwasherMode",
-        "clusterId": 0x00000059,
+    _RVC_RUN_MODE_CLUSTER_INFO = {
+        "clusterName": "RvcRunMode",
+        "clusterId": 0x00000054,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
@@ -4944,19 +5004,820 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
-            0x00000002: {
-                "attributeName": "StartUpMode",
-                "attributeId": 0x00000002,
+            0x00000003: {
+                "attributeName": "OnMode",
+                "attributeId": 0x00000003,
                 "type": "int",
                 "reportable": True,
                 "writable": True,
             },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _RVC_CLEAN_MODE_CLUSTER_INFO = {
+        "clusterName": "RvcCleanMode",
+        "clusterId": 0x00000055,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "ChangeToMode",
+                "args": {
+                    "newMode": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "SupportedModes",
+                "attributeId": 0x00000000,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "CurrentMode",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "OnMode",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _TEMPERATURE_CONTROL_CLUSTER_INFO = {
+        "clusterName": "TemperatureControl",
+        "clusterId": 0x00000056,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "SetTemperature",
+                "args": {
+                    "targetTemperature": "int",
+                    "targetTemperatureLevel": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "TemperatureSetpoint",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "MinTemperature",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "MaxTemperature",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "Step",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "SelectedTemperatureLevel",
+                "attributeId": 0x00000004,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000005: {
+                "attributeName": "SupportedTemperatureLevels",
+                "attributeId": 0x00000005,
+                "type": "str",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _REFRIGERATOR_ALARM_CLUSTER_INFO = {
+        "clusterName": "RefrigeratorAlarm",
+        "clusterId": 0x00000057,
+        "commands": {
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "Mask",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "State",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "Supported",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _DISHWASHER_MODE_CLUSTER_INFO = {
+        "clusterName": "DishwasherMode",
+        "clusterId": 0x00000059,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "ChangeToMode",
+                "args": {
+                    "newMode": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "SupportedModes",
+                "attributeId": 0x00000000,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "CurrentMode",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "StartUpMode",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000003: {
+                "attributeName": "OnMode",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _AIR_QUALITY_CLUSTER_INFO = {
+        "clusterName": "AirQuality",
+        "clusterId": 0x0000005B,
+        "commands": {
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "AirQuality",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _SMOKE_CO_ALARM_CLUSTER_INFO = {
+        "clusterName": "SmokeCoAlarm",
+        "clusterId": 0x0000005C,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "SelfTestRequest",
+                "args": {
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "ExpressedState",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "SmokeState",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "COState",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "BatteryAlert",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "DeviceMuted",
+                "attributeId": 0x00000004,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000005: {
+                "attributeName": "TestInProgress",
+                "attributeId": 0x00000005,
+                "type": "bool",
+                "reportable": True,
+            },
+            0x00000006: {
+                "attributeName": "HardwareFaultAlert",
+                "attributeId": 0x00000006,
+                "type": "bool",
+                "reportable": True,
+            },
+            0x00000007: {
+                "attributeName": "EndOfServiceAlert",
+                "attributeId": 0x00000007,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000008: {
+                "attributeName": "InterconnectSmokeAlarm",
+                "attributeId": 0x00000008,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000009: {
+                "attributeName": "InterconnectCOAlarm",
+                "attributeId": 0x00000009,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000000A: {
+                "attributeName": "ContaminationState",
+                "attributeId": 0x0000000A,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000000B: {
+                "attributeName": "SmokeSensitivityLevel",
+                "attributeId": 0x0000000B,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x0000000C: {
+                "attributeName": "ExpiryDate",
+                "attributeId": 0x0000000C,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _DISHWASHER_ALARM_CLUSTER_INFO = {
+        "clusterName": "DishwasherAlarm",
+        "clusterId": 0x0000005D,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "Reset",
+                "args": {
+                    "alarms": "int",
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "ModifyEnabledAlarms",
+                "args": {
+                    "mask": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "Mask",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "Latch",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "State",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "Supported",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _MICROWAVE_OVEN_MODE_CLUSTER_INFO = {
+        "clusterName": "MicrowaveOvenMode",
+        "clusterId": 0x0000005E,
+        "commands": {
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "SupportedModes",
+                "attributeId": 0x00000000,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "CurrentMode",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _MICROWAVE_OVEN_CONTROL_CLUSTER_INFO = {
+        "clusterName": "MicrowaveOvenControl",
+        "clusterId": 0x0000005F,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "SetCookingParameters",
+                "args": {
+                    "cookMode": "int",
+                    "cookTime": "int",
+                    "powerSetting": "int",
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "AddMoreTime",
+                "args": {
+                    "timeToAdd": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000001: {
+                "attributeName": "CookTime",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "PowerSetting",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "MinPower",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "MaxPower",
+                "attributeId": 0x00000004,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000005: {
+                "attributeName": "PowerStep",
+                "attributeId": 0x00000005,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
+                "type": "int",
+                "reportable": True,
+            },
+        },
+    }
+    _OPERATIONAL_STATE_CLUSTER_INFO = {
+        "clusterName": "OperationalState",
+        "clusterId": 0x00000060,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "Pause",
+                "args": {
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "Stop",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "Start",
+                "args": {
+                },
+            },
             0x00000003: {
-                "attributeName": "OnMode",
+                "commandId": 0x00000003,
+                "commandName": "Resume",
+                "args": {
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "PhaseList",
+                "attributeId": 0x00000000,
+                "type": "str",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "CurrentPhase",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "CountdownTime",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "OperationalStateList",
                 "attributeId": 0x00000003,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "OperationalState",
+                "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
+            },
+            0x00000005: {
+                "attributeName": "OperationalError",
+                "attributeId": 0x00000005,
+                "type": "",
+                "reportable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -4996,18 +5857,72 @@ class ChipClusters:
             },
         },
     }
-    _AIR_QUALITY_CLUSTER_INFO = {
-        "clusterName": "AirQuality",
-        "clusterId": 0x0000005B,
+    _RVC_OPERATIONAL_STATE_CLUSTER_INFO = {
+        "clusterName": "RvcOperationalState",
+        "clusterId": 0x00000061,
         "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "Pause",
+                "args": {
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "Stop",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "Start",
+                "args": {
+                },
+            },
+            0x00000003: {
+                "commandId": 0x00000003,
+                "commandName": "Resume",
+                "args": {
+                },
+            },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "AirQuality",
+                "attributeName": "PhaseList",
                 "attributeId": 0x00000000,
+                "type": "str",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "CurrentPhase",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "CountdownTime",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "OperationalStateList",
+                "attributeId": 0x00000003,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "OperationalState",
+                "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
             },
+            0x00000005: {
+                "attributeName": "OperationalError",
+                "attributeId": 0x00000005,
+                "type": "",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -5046,96 +5961,141 @@ class ChipClusters:
             },
         },
     }
-    _SMOKE_CO_ALARM_CLUSTER_INFO = {
-        "clusterName": "SmokeCoAlarm",
-        "clusterId": 0x0000005C,
+    _HEPA_FILTER_MONITORING_CLUSTER_INFO = {
+        "clusterName": "HepaFilterMonitoring",
+        "clusterId": 0x00000071,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "SelfTestRequest",
+                "commandName": "ResetCondition",
                 "args": {
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "ExpressedState",
+                "attributeName": "Condition",
                 "attributeId": 0x00000000,
                 "type": "int",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "SmokeState",
+                "attributeName": "DegradationDirection",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "COState",
+                "attributeName": "ChangeIndication",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
             },
             0x00000003: {
-                "attributeName": "BatteryAlert",
+                "attributeName": "InPlaceIndicator",
                 "attributeId": 0x00000003,
-                "type": "int",
+                "type": "bool",
                 "reportable": True,
             },
             0x00000004: {
-                "attributeName": "DeviceMuted",
+                "attributeName": "LastChangedTime",
                 "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000005: {
-                "attributeName": "TestInProgress",
+                "attributeName": "ReplacementProductList",
                 "attributeId": 0x00000005,
-                "type": "bool",
+                "type": "",
                 "reportable": True,
             },
-            0x00000006: {
-                "attributeName": "HardwareFaultAlert",
-                "attributeId": 0x00000006,
-                "type": "bool",
+            0x0000FFF8: {
+                "attributeName": "GeneratedCommandList",
+                "attributeId": 0x0000FFF8,
+                "type": "int",
                 "reportable": True,
             },
-            0x00000007: {
-                "attributeName": "EndOfServiceAlert",
-                "attributeId": 0x00000007,
+            0x0000FFF9: {
+                "attributeName": "AcceptedCommandList",
+                "attributeId": 0x0000FFF9,
                 "type": "int",
                 "reportable": True,
             },
-            0x00000008: {
-                "attributeName": "InterconnectSmokeAlarm",
-                "attributeId": 0x00000008,
+            0x0000FFFA: {
+                "attributeName": "EventList",
+                "attributeId": 0x0000FFFA,
                 "type": "int",
                 "reportable": True,
             },
-            0x00000009: {
-                "attributeName": "InterconnectCOAlarm",
-                "attributeId": 0x00000009,
+            0x0000FFFB: {
+                "attributeName": "AttributeList",
+                "attributeId": 0x0000FFFB,
                 "type": "int",
                 "reportable": True,
             },
-            0x0000000A: {
-                "attributeName": "ContaminationState",
-                "attributeId": 0x0000000A,
+            0x0000FFFC: {
+                "attributeName": "FeatureMap",
+                "attributeId": 0x0000FFFC,
                 "type": "int",
                 "reportable": True,
             },
-            0x0000000B: {
-                "attributeName": "SmokeSensitivityLevel",
-                "attributeId": 0x0000000B,
+            0x0000FFFD: {
+                "attributeName": "ClusterRevision",
+                "attributeId": 0x0000FFFD,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
-            0x0000000C: {
-                "attributeName": "ExpiryDate",
-                "attributeId": 0x0000000C,
+        },
+    }
+    _ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_INFO = {
+        "clusterName": "ActivatedCarbonFilterMonitoring",
+        "clusterId": 0x00000072,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "ResetCondition",
+                "args": {
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "Condition",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "DegradationDirection",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "ChangeIndication",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "InPlaceIndicator",
+                "attributeId": 0x00000003,
+                "type": "bool",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "LastChangedTime",
+                "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
+            },
+            0x00000005: {
+                "attributeName": "ReplacementProductList",
+                "attributeId": 0x00000005,
+                "type": "",
+                "reportable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -5175,49 +6135,44 @@ class ChipClusters:
             },
         },
     }
-    _DISHWASHER_ALARM_CLUSTER_INFO = {
-        "clusterName": "DishwasherAlarm",
-        "clusterId": 0x0000005D,
+    _BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_INFO = {
+        "clusterName": "BooleanSensorConfiguration",
+        "clusterId": 0x00000080,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "Reset",
-                "args": {
-                    "alarms": "int",
-                },
-            },
-            0x00000001: {
-                "commandId": 0x00000001,
-                "commandName": "ModifyEnabledAlarms",
+                "commandName": "SuppressRequest",
                 "args": {
-                    "mask": "int",
+                    "alarmsToSuppress": "int",
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "Mask",
+                "attributeName": "SensitivityLevel",
                 "attributeId": 0x00000000,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000001: {
-                "attributeName": "Latch",
+                "attributeName": "AlarmsActive",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "State",
+                "attributeName": "AlarmsSuppressed",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
             },
             0x00000003: {
-                "attributeName": "Supported",
+                "attributeName": "AlarmsEnabled",
                 "attributeId": 0x00000003,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -5256,71 +6211,95 @@ class ChipClusters:
                 "reportable": True,
             },
         },
-    }
-    _OPERATIONAL_STATE_CLUSTER_INFO = {
-        "clusterName": "OperationalState",
-        "clusterId": 0x00000060,
+    }
+    _VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_INFO = {
+        "clusterName": "ValveConfigurationAndControl",
+        "clusterId": 0x00000081,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "Pause",
+                "commandName": "Open",
                 "args": {
+                    "openDuration": "int",
                 },
             },
             0x00000001: {
                 "commandId": 0x00000001,
-                "commandName": "Stop",
+                "commandName": "Close",
                 "args": {
                 },
             },
             0x00000002: {
                 "commandId": 0x00000002,
-                "commandName": "Start",
-                "args": {
-                },
-            },
-            0x00000003: {
-                "commandId": 0x00000003,
-                "commandName": "Resume",
+                "commandName": "SetLevel",
                 "args": {
+                    "level": "int",
+                    "openDuration": "int",
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "PhaseList",
+                "attributeName": "OpenDuration",
                 "attributeId": 0x00000000,
-                "type": "str",
+                "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000001: {
-                "attributeName": "CurrentPhase",
+                "attributeName": "AutoCloseTime",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "CountdownTime",
+                "attributeName": "RemainingDuration",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
             },
             0x00000003: {
-                "attributeName": "OperationalStateList",
+                "attributeName": "CurrentState",
                 "attributeId": 0x00000003,
-                "type": "",
+                "type": "int",
                 "reportable": True,
             },
             0x00000004: {
-                "attributeName": "OperationalState",
+                "attributeName": "TargetState",
                 "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
             },
             0x00000005: {
-                "attributeName": "OperationalError",
+                "attributeName": "StartUpState",
                 "attributeId": 0x00000005,
-                "type": "",
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000006: {
+                "attributeName": "CurrentLevel",
+                "attributeId": 0x00000006,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000007: {
+                "attributeName": "TargetLevel",
+                "attributeId": 0x00000007,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000008: {
+                "attributeName": "OpenLevel",
+                "attributeId": 0x00000008,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000009: {
+                "attributeName": "ValveFault",
+                "attributeId": 0x00000009,
+                "type": "int",
                 "reportable": True,
             },
             0x0000FFF8: {
@@ -5361,71 +6340,96 @@ class ChipClusters:
             },
         },
     }
-    _RVC_OPERATIONAL_STATE_CLUSTER_INFO = {
-        "clusterName": "RvcOperationalState",
-        "clusterId": 0x00000061,
+    _DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_INFO = {
+        "clusterName": "DemandResponseLoadControl",
+        "clusterId": 0x00000096,
         "commands": {
             0x00000000: {
                 "commandId": 0x00000000,
-                "commandName": "Pause",
+                "commandName": "RegisterLoadControlProgramRequest",
                 "args": {
+                    "loadControlProgram": "LoadControlProgramStruct",
                 },
             },
             0x00000001: {
                 "commandId": 0x00000001,
-                "commandName": "Stop",
+                "commandName": "UnregisterLoadControlProgramRequest",
                 "args": {
+                    "loadControlProgramID": "bytes",
                 },
             },
             0x00000002: {
                 "commandId": 0x00000002,
-                "commandName": "Start",
+                "commandName": "AddLoadControlEventRequest",
                 "args": {
+                    "event": "LoadControlEventStruct",
                 },
             },
             0x00000003: {
                 "commandId": 0x00000003,
-                "commandName": "Resume",
+                "commandName": "RemoveLoadControlEventRequest",
+                "args": {
+                    "eventID": "bytes",
+                    "cancelControl": "int",
+                },
+            },
+            0x00000004: {
+                "commandId": 0x00000004,
+                "commandName": "ClearLoadControlEventsRequest",
                 "args": {
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "PhaseList",
+                "attributeName": "LoadControlPrograms",
                 "attributeId": 0x00000000,
-                "type": "str",
+                "type": "",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "CurrentPhase",
+                "attributeName": "NumberOfLoadControlPrograms",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "CountdownTime",
+                "attributeName": "Events",
                 "attributeId": 0x00000002,
-                "type": "int",
+                "type": "",
                 "reportable": True,
             },
             0x00000003: {
-                "attributeName": "OperationalStateList",
+                "attributeName": "ActiveEvents",
                 "attributeId": 0x00000003,
                 "type": "",
                 "reportable": True,
             },
             0x00000004: {
-                "attributeName": "OperationalState",
+                "attributeName": "NumberOfEventsPerProgram",
                 "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
             },
             0x00000005: {
-                "attributeName": "OperationalError",
+                "attributeName": "NumberOfTransitions",
                 "attributeId": 0x00000005,
-                "type": "",
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000006: {
+                "attributeName": "DefaultRandomStart",
+                "attributeId": 0x00000006,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000007: {
+                "attributeName": "DefaultRandomDuration",
+                "attributeId": 0x00000007,
+                "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -5465,140 +6469,213 @@ class ChipClusters:
             },
         },
     }
-    _HEPA_FILTER_MONITORING_CLUSTER_INFO = {
-        "clusterName": "HepaFilterMonitoring",
-        "clusterId": 0x00000071,
+    _ENERGY_EVSE_CLUSTER_INFO = {
+        "clusterName": "EnergyEvse",
+        "clusterId": 0x00000099,
         "commands": {
-            0x00000000: {
-                "commandId": 0x00000000,
-                "commandName": "ResetCondition",
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "Disable",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "EnableCharging",
+                "args": {
+                    "chargingEnabledUntil": "int",
+                    "minimumChargeCurrent": "int",
+                    "maximumChargeCurrent": "int",
+                },
+            },
+            0x00000003: {
+                "commandId": 0x00000003,
+                "commandName": "EnableDischarging",
+                "args": {
+                    "dischargingEnabledUntil": "int",
+                    "maximumDischargeCurrent": "int",
+                },
+            },
+            0x00000004: {
+                "commandId": 0x00000004,
+                "commandName": "StartDiagnostics",
+                "args": {
+                },
+            },
+            0x00000005: {
+                "commandId": 0x00000005,
+                "commandName": "SetTargets",
+                "args": {
+                    "dayOfWeekforSequence": "int",
+                    "chargingTargets": "ChargingTargetStruct",
+                },
+            },
+            0x00000006: {
+                "commandId": 0x00000006,
+                "commandName": "GetTargets",
+                "args": {
+                    "daysToReturn": "int",
+                },
+            },
+            0x00000007: {
+                "commandId": 0x00000007,
+                "commandName": "ClearTargets",
                 "args": {
                 },
             },
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "Condition",
+                "attributeName": "State",
                 "attributeId": 0x00000000,
                 "type": "int",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "DegradationDirection",
+                "attributeName": "SupplyState",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
             },
             0x00000002: {
-                "attributeName": "ChangeIndication",
+                "attributeName": "FaultState",
                 "attributeId": 0x00000002,
                 "type": "int",
                 "reportable": True,
             },
             0x00000003: {
-                "attributeName": "InPlaceIndicator",
+                "attributeName": "ChargingEnabledUntil",
                 "attributeId": 0x00000003,
-                "type": "bool",
+                "type": "int",
                 "reportable": True,
             },
             0x00000004: {
-                "attributeName": "LastChangedTime",
+                "attributeName": "DischargingEnabledUntil",
                 "attributeId": 0x00000004,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x00000005: {
-                "attributeName": "ReplacementProductList",
+                "attributeName": "CircuitCapacity",
                 "attributeId": 0x00000005,
-                "type": "",
+                "type": "int",
                 "reportable": True,
             },
-            0x0000FFF8: {
-                "attributeName": "GeneratedCommandList",
-                "attributeId": 0x0000FFF8,
+            0x00000006: {
+                "attributeName": "MinimumChargeCurrent",
+                "attributeId": 0x00000006,
                 "type": "int",
                 "reportable": True,
             },
-            0x0000FFF9: {
-                "attributeName": "AcceptedCommandList",
-                "attributeId": 0x0000FFF9,
+            0x00000007: {
+                "attributeName": "MaximumChargeCurrent",
+                "attributeId": 0x00000007,
                 "type": "int",
                 "reportable": True,
             },
-            0x0000FFFA: {
-                "attributeName": "EventList",
-                "attributeId": 0x0000FFFA,
+            0x00000008: {
+                "attributeName": "MaximumDischargeCurrent",
+                "attributeId": 0x00000008,
                 "type": "int",
                 "reportable": True,
             },
-            0x0000FFFB: {
-                "attributeName": "AttributeList",
-                "attributeId": 0x0000FFFB,
+            0x00000009: {
+                "attributeName": "UserMaximumChargeCurrent",
+                "attributeId": 0x00000009,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
-            0x0000FFFC: {
-                "attributeName": "FeatureMap",
-                "attributeId": 0x0000FFFC,
+            0x0000000A: {
+                "attributeName": "RandomizationDelayWindow",
+                "attributeId": 0x0000000A,
                 "type": "int",
                 "reportable": True,
+                "writable": True,
             },
-            0x0000FFFD: {
-                "attributeName": "ClusterRevision",
-                "attributeId": 0x0000FFFD,
+            0x00000021: {
+                "attributeName": "NumberOfWeeklyTargets",
+                "attributeId": 0x00000021,
                 "type": "int",
                 "reportable": True,
             },
-        },
-    }
-    _ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_INFO = {
-        "clusterName": "ActivatedCarbonFilterMonitoring",
-        "clusterId": 0x00000072,
-        "commands": {
-            0x00000000: {
-                "commandId": 0x00000000,
-                "commandName": "ResetCondition",
-                "args": {
-                },
+            0x00000022: {
+                "attributeName": "NumberOfDailyTargets",
+                "attributeId": 0x00000022,
+                "type": "int",
+                "reportable": True,
             },
-        },
-        "attributes": {
-            0x00000000: {
-                "attributeName": "Condition",
-                "attributeId": 0x00000000,
+            0x00000023: {
+                "attributeName": "NextChargeStartTime",
+                "attributeId": 0x00000023,
                 "type": "int",
                 "reportable": True,
             },
-            0x00000001: {
-                "attributeName": "DegradationDirection",
-                "attributeId": 0x00000001,
+            0x00000024: {
+                "attributeName": "NextChargeTargetTime",
+                "attributeId": 0x00000024,
                 "type": "int",
                 "reportable": True,
             },
-            0x00000002: {
-                "attributeName": "ChangeIndication",
-                "attributeId": 0x00000002,
+            0x00000025: {
+                "attributeName": "NextChargeRequiredEnergy",
+                "attributeId": 0x00000025,
                 "type": "int",
                 "reportable": True,
             },
-            0x00000003: {
-                "attributeName": "InPlaceIndicator",
-                "attributeId": 0x00000003,
-                "type": "bool",
+            0x00000026: {
+                "attributeName": "NextChargeTargetSoC",
+                "attributeId": 0x00000026,
+                "type": "int",
                 "reportable": True,
             },
-            0x00000004: {
-                "attributeName": "LastChangedTime",
-                "attributeId": 0x00000004,
+            0x00000027: {
+                "attributeName": "ApproximateEVEfficiency",
+                "attributeId": 0x00000027,
                 "type": "int",
                 "reportable": True,
                 "writable": True,
             },
-            0x00000005: {
-                "attributeName": "ReplacementProductList",
-                "attributeId": 0x00000005,
-                "type": "",
+            0x00000030: {
+                "attributeName": "StateOfCharge",
+                "attributeId": 0x00000030,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000031: {
+                "attributeName": "BatteryCapacity",
+                "attributeId": 0x00000031,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000032: {
+                "attributeName": "VehicleID",
+                "attributeId": 0x00000032,
+                "type": "str",
+                "reportable": True,
+            },
+            0x00000040: {
+                "attributeName": "SessionID",
+                "attributeId": 0x00000040,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000041: {
+                "attributeName": "SessionDuration",
+                "attributeId": 0x00000041,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000042: {
+                "attributeName": "SessionEnergyCharged",
+                "attributeId": 0x00000042,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000043: {
+                "attributeName": "SessionEnergyDischarged",
+                "attributeId": 0x00000043,
+                "type": "int",
                 "reportable": True,
             },
             0x0000FFF8: {
@@ -7034,7 +8111,6 @@ class ChipClusters:
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x00000002: {
                 "attributeName": "PercentSetting",
@@ -9529,6 +10605,12 @@ class ChipClusters:
                 "type": "str",
                 "reportable": True,
             },
+            0x00000001: {
+                "attributeName": "LinkLocalAddress",
+                "attributeId": 0x00000001,
+                "type": "bytes",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -10089,7 +11171,6 @@ class ChipClusters:
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -10239,7 +11320,6 @@ class ChipClusters:
                 "attributeId": 0x00000001,
                 "type": "",
                 "reportable": True,
-                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -12230,6 +13310,10 @@ class ChipClusters:
         0x00000044: _PROXY_VALID_CLUSTER_INFO,
         0x00000045: _BOOLEAN_STATE_CLUSTER_INFO,
         0x00000046: _ICD_MANAGEMENT_CLUSTER_INFO,
+        0x00000047: _TIMER_CLUSTER_INFO,
+        0x00000048: _OVEN_CAVITY_OPERATIONAL_STATE_CLUSTER_INFO,
+        0x00000049: _OVEN_MODE_CLUSTER_INFO,
+        0x0000004A: _LAUNDRY_DRYER_CONTROLS_CLUSTER_INFO,
         0x00000050: _MODE_SELECT_CLUSTER_INFO,
         0x00000051: _LAUNDRY_WASHER_MODE_CLUSTER_INFO,
         0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO,
@@ -12242,10 +13326,16 @@ class ChipClusters:
         0x0000005B: _AIR_QUALITY_CLUSTER_INFO,
         0x0000005C: _SMOKE_CO_ALARM_CLUSTER_INFO,
         0x0000005D: _DISHWASHER_ALARM_CLUSTER_INFO,
+        0x0000005E: _MICROWAVE_OVEN_MODE_CLUSTER_INFO,
+        0x0000005F: _MICROWAVE_OVEN_CONTROL_CLUSTER_INFO,
         0x00000060: _OPERATIONAL_STATE_CLUSTER_INFO,
         0x00000061: _RVC_OPERATIONAL_STATE_CLUSTER_INFO,
         0x00000071: _HEPA_FILTER_MONITORING_CLUSTER_INFO,
         0x00000072: _ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_INFO,
+        0x00000080: _BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_INFO,
+        0x00000081: _VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
+        0x00000096: _DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_INFO,
+        0x00000099: _ENERGY_EVSE_CLUSTER_INFO,
         0x00000101: _DOOR_LOCK_CLUSTER_INFO,
         0x00000102: _WINDOW_COVERING_CLUSTER_INFO,
         0x00000103: _BARRIER_CONTROL_CLUSTER_INFO,
@@ -12331,6 +13421,10 @@ class ChipClusters:
         "ProxyValid": _PROXY_VALID_CLUSTER_INFO,
         "BooleanState": _BOOLEAN_STATE_CLUSTER_INFO,
         "IcdManagement": _ICD_MANAGEMENT_CLUSTER_INFO,
+        "Timer": _TIMER_CLUSTER_INFO,
+        "OvenCavityOperationalState": _OVEN_CAVITY_OPERATIONAL_STATE_CLUSTER_INFO,
+        "OvenMode": _OVEN_MODE_CLUSTER_INFO,
+        "LaundryDryerControls": _LAUNDRY_DRYER_CONTROLS_CLUSTER_INFO,
         "ModeSelect": _MODE_SELECT_CLUSTER_INFO,
         "LaundryWasherMode": _LAUNDRY_WASHER_MODE_CLUSTER_INFO,
         "RefrigeratorAndTemperatureControlledCabinetMode": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO,
@@ -12343,10 +13437,16 @@ class ChipClusters:
         "AirQuality": _AIR_QUALITY_CLUSTER_INFO,
         "SmokeCoAlarm": _SMOKE_CO_ALARM_CLUSTER_INFO,
         "DishwasherAlarm": _DISHWASHER_ALARM_CLUSTER_INFO,
+        "MicrowaveOvenMode": _MICROWAVE_OVEN_MODE_CLUSTER_INFO,
+        "MicrowaveOvenControl": _MICROWAVE_OVEN_CONTROL_CLUSTER_INFO,
         "OperationalState": _OPERATIONAL_STATE_CLUSTER_INFO,
         "RvcOperationalState": _RVC_OPERATIONAL_STATE_CLUSTER_INFO,
         "HepaFilterMonitoring": _HEPA_FILTER_MONITORING_CLUSTER_INFO,
         "ActivatedCarbonFilterMonitoring": _ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_INFO,
+        "BooleanSensorConfiguration": _BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_INFO,
+        "ValveConfigurationAndControl": _VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
+        "DemandResponseLoadControl": _DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_INFO,
+        "EnergyEvse": _ENERGY_EVSE_CLUSTER_INFO,
         "DoorLock": _DOOR_LOCK_CLUSTER_INFO,
         "WindowCovering": _WINDOW_COVERING_CLUSTER_INFO,
         "BarrierControl": _BARRIER_CONTROL_CLUSTER_INFO,
diff --git a/src/controller/python/chip/clusters/ClusterObjects.py b/src/controller/python/chip/clusters/ClusterObjects.py
index 7496099a301e91..0aef317257014f 100644
--- a/src/controller/python/chip/clusters/ClusterObjects.py
+++ b/src/controller/python/chip/clusters/ClusterObjects.py
@@ -207,7 +207,33 @@ def descriptor(cls):
         raise NotImplementedError()
 
 
+# The below dictionaries will be filled dynamically
+# and are used for quick lookup/mapping from cluster/attribute id to the correct class
+ALL_CLUSTERS = {}
+ALL_ATTRIBUTES = {}
+# These need to be separate because there can be overlap in command ids for commands and responses.
+ALL_ACCEPTED_COMMANDS = {}
+ALL_GENERATED_COMMANDS = {}
+
+
 class ClusterCommand(ClusterObject):
+    def __init_subclass__(cls, *args, **kwargs) -> None:
+        """Register a subclass."""
+        super().__init_subclass__(*args, **kwargs)
+        try:
+            if cls.is_client:
+                if cls.cluster_id not in ALL_ACCEPTED_COMMANDS:
+                    ALL_ACCEPTED_COMMANDS[cls.cluster_id] = {}
+                ALL_ACCEPTED_COMMANDS[cls.cluster_id][cls.command_id] = cls
+            else:
+                if cls.cluster_id not in ALL_GENERATED_COMMANDS:
+                    ALL_GENERATED_COMMANDS[cls.cluster_id] = {}
+                ALL_GENERATED_COMMANDS[cls.cluster_id][cls.command_id] = cls
+        except NotImplementedError:
+            # handle case where the ClusterAttribute class is not (fully) subclassed
+            # and accessing the id property throws a NotImplementedError.
+            pass
+
     @ChipUtility.classproperty
     def cluster_id(self) -> int:
         raise NotImplementedError()
@@ -221,12 +247,6 @@ def must_use_timed_invoke(cls) -> bool:
         return False
 
 
-# The below dictionaries will be filled dynamically
-# and are used for quick lookup/mapping from cluster/attribute id to the correct class
-ALL_CLUSTERS = {}
-ALL_ATTRIBUTES = {}
-
-
 class Cluster(ClusterObject):
     '''
     When send read requests with returnClusterObject=True, we will set the data_version property of the object.
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 4c2040ab846a39..cfe1bbb4714149 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -590,14 +590,14 @@ class Scenes(Cluster):
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="sceneCount", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="currentScene", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="currentGroup", Tag=0x00000002, Type=uint),
-                ClusterObjectFieldDescriptor(Label="sceneValid", Tag=0x00000003, Type=bool),
+                ClusterObjectFieldDescriptor(Label="sceneCount", Tag=0x00000000, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="currentScene", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="currentGroup", Tag=0x00000002, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="sceneValid", Tag=0x00000003, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="nameSupport", Tag=0x00000004, Type=uint),
                 ClusterObjectFieldDescriptor(Label="lastConfiguredBy", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="sceneTableSize", Tag=0x00000006, Type=uint),
-                ClusterObjectFieldDescriptor(Label="remainingCapacity", Tag=0x00000007, Type=uint),
+                ClusterObjectFieldDescriptor(Label="fabricSceneInfo", Tag=0x00000007, Type=typing.List[Scenes.Structs.SceneInfoStruct]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -606,14 +606,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    sceneCount: 'uint' = None
-    currentScene: 'uint' = None
-    currentGroup: 'uint' = None
-    sceneValid: 'bool' = None
+    sceneCount: 'typing.Optional[uint]' = None
+    currentScene: 'typing.Optional[uint]' = None
+    currentGroup: 'typing.Optional[uint]' = None
+    sceneValid: 'typing.Optional[bool]' = None
     nameSupport: 'uint' = None
     lastConfiguredBy: 'typing.Union[None, Nullable, uint]' = None
     sceneTableSize: 'uint' = None
-    remainingCapacity: 'uint' = None
+    fabricSceneInfo: 'typing.List[Scenes.Structs.SceneInfoStruct]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -622,14 +622,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Bitmaps:
+        class CopyModeBitmap(IntFlag):
+            kCopyAllScenes = 0x1
+
         class Feature(IntFlag):
             kSceneNames = 0x1
             kExplicit = 0x2
             kTableSize = 0x4
             kFabricScenes = 0x8
 
-        class ScenesCopyMode(IntFlag):
-            kCopyAllScenes = 0x1
+        class NameSupportBitmap(IntFlag):
+            kSceneNames = 0x80
 
     class Structs:
         @dataclass
@@ -658,6 +661,27 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             clusterID: 'uint' = 0
             attributeValueList: 'typing.List[Scenes.Structs.AttributeValuePair]' = field(default_factory=lambda: [])
 
+        @dataclass
+        class SceneInfoStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sceneCount", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="currentScene", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="currentGroup", Tag=2, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="sceneValid", Tag=3, Type=bool),
+                        ClusterObjectFieldDescriptor(Label="remainingCapacity", Tag=4, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
+                    ])
+
+            sceneCount: 'uint' = 0
+            currentScene: 'uint' = 0
+            currentGroup: 'uint' = 0
+            sceneValid: 'bool' = False
+            remainingCapacity: 'uint' = 0
+            fabricIndex: 'uint' = 0
+
     class Commands:
         @dataclass
         class AddScene(ClusterCommand):
@@ -1060,9 +1084,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class CurrentScene(ClusterAttributeDescriptor):
@@ -1076,9 +1100,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class CurrentGroup(ClusterAttributeDescriptor):
@@ -1092,9 +1116,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class SceneValid(ClusterAttributeDescriptor):
@@ -1108,9 +1132,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
 
-            value: 'bool' = False
+            value: 'typing.Optional[bool]' = None
 
         @dataclass
         class NameSupport(ClusterAttributeDescriptor):
@@ -1161,7 +1185,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class RemainingCapacity(ClusterAttributeDescriptor):
+        class FabricSceneInfo(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000005
@@ -1172,9 +1196,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.List[Scenes.Structs.SceneInfoStruct])
 
-            value: 'uint' = 0
+            value: 'typing.List[Scenes.Structs.SceneInfoStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -1348,6 +1372,7 @@ class Bitmaps:
         class Feature(IntFlag):
             kLighting = 0x1
             kDeadFrontBehavior = 0x2
+            kOffOnly = 0x4
 
         class OnOffControlBitmap(IntFlag):
             kAcceptOnlyWhenOn = 0x1
@@ -1830,7 +1855,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class MoveMode(MatterIntEnum):
+        class MoveModeEnum(MatterIntEnum):
             kUp = 0x00
             kDown = 0x01
             # All received enum values that are not listed above will be mapped
@@ -1839,7 +1864,7 @@ class MoveMode(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 2,
 
-        class StepMode(MatterIntEnum):
+        class StepModeEnum(MatterIntEnum):
             kUp = 0x00
             kDown = 0x01
             # All received enum values that are not listed above will be mapped
@@ -1854,7 +1879,7 @@ class Feature(IntFlag):
             kLighting = 0x2
             kFrequency = 0x4
 
-        class LevelControlOptions(IntFlag):
+        class OptionsBitmap(IntFlag):
             kExecuteIfOff = 0x1
             kCoupleColorTempToLevel = 0x2
 
@@ -1892,13 +1917,13 @@ class Move(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode),
+                        ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveModeEnum),
                         ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=typing.Union[Nullable, uint]),
                         ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
                         ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
                     ])
 
-            moveMode: 'LevelControl.Enums.MoveMode' = 0
+            moveMode: 'LevelControl.Enums.MoveModeEnum' = 0
             rate: 'typing.Union[Nullable, uint]' = NullValue
             optionsMask: 'uint' = 0
             optionsOverride: 'uint' = 0
@@ -1914,14 +1939,14 @@ class Step(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode),
+                        ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepModeEnum),
                         ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint),
                         ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=typing.Union[Nullable, uint]),
                         ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint),
                         ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint),
                     ])
 
-            stepMode: 'LevelControl.Enums.StepMode' = 0
+            stepMode: 'LevelControl.Enums.StepModeEnum' = 0
             stepSize: 'uint' = 0
             transitionTime: 'typing.Union[Nullable, uint]' = NullValue
             optionsMask: 'uint' = 0
@@ -1978,13 +2003,13 @@ class MoveWithOnOff(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode),
+                        ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveModeEnum),
                         ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=typing.Union[Nullable, uint]),
                         ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
                         ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
                     ])
 
-            moveMode: 'LevelControl.Enums.MoveMode' = 0
+            moveMode: 'LevelControl.Enums.MoveModeEnum' = 0
             rate: 'typing.Union[Nullable, uint]' = NullValue
             optionsMask: 'uint' = 0
             optionsOverride: 'uint' = 0
@@ -2000,14 +2025,14 @@ class StepWithOnOff(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode),
+                        ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepModeEnum),
                         ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint),
                         ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=typing.Union[Nullable, uint]),
                         ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint),
                         ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint),
                     ])
 
-            stepMode: 'LevelControl.Enums.StepMode' = 0
+            stepMode: 'LevelControl.Enums.StepModeEnum' = 0
             stepSize: 'uint' = 0
             transitionTime: 'typing.Union[Nullable, uint]' = NullValue
             optionsMask: 'uint' = 0
@@ -4104,6 +4129,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="uniqueID", Tag=0x00000012, Type=typing.Optional[str]),
                 ClusterObjectFieldDescriptor(Label="capabilityMinima", Tag=0x00000013, Type=BasicInformation.Structs.CapabilityMinimaStruct),
                 ClusterObjectFieldDescriptor(Label="productAppearance", Tag=0x00000014, Type=typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]),
+                ClusterObjectFieldDescriptor(Label="specificationVersion", Tag=0x00000015, Type=uint),
+                ClusterObjectFieldDescriptor(Label="maxPathsPerInvoke", Tag=0x00000016, Type=uint),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -4133,6 +4160,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     uniqueID: 'typing.Optional[str]' = None
     capabilityMinima: 'BasicInformation.Structs.CapabilityMinimaStruct' = None
     productAppearance: 'typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]' = None
+    specificationVersion: 'uint' = None
+    maxPathsPerInvoke: 'uint' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -4560,6 +4589,38 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]' = None
 
+        @dataclass
+        class SpecificationVersion(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000028
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000015
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class MaxPathsPerInvoke(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000028
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000016
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -7468,6 +7529,7 @@ class Feature(IntFlag):
             kWiFiNetworkInterface = 0x1
             kThreadNetworkInterface = 0x2
             kEthernetNetworkInterface = 0x4
+            kPerDeviceCredentials = 0x8
 
         class ThreadCapabilitiesBitmap(IntFlag):
             kIsBorderRouterCapable = 0x1
@@ -7482,6 +7544,7 @@ class WiFiSecurityBitmap(IntFlag):
             kWpaPersonal = 0x4
             kWpa2Personal = 0x8
             kWpa3Personal = 0x10
+            kWpa3MatterPdc = 0x20
 
     class Structs:
         @dataclass
@@ -7492,10 +7555,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="networkID", Tag=0, Type=bytes),
                         ClusterObjectFieldDescriptor(Label="connected", Tag=1, Type=bool),
+                        ClusterObjectFieldDescriptor(Label="networkIdentifier", Tag=2, Type=typing.Union[None, Nullable, bytes]),
+                        ClusterObjectFieldDescriptor(Label="clientIdentifier", Tag=3, Type=typing.Union[None, Nullable, bytes]),
                     ])
 
             networkID: 'bytes' = b""
             connected: 'bool' = False
+            networkIdentifier: 'typing.Union[None, Nullable, bytes]' = None
+            clientIdentifier: 'typing.Union[None, Nullable, bytes]' = None
 
         @dataclass
         class ThreadInterfaceScanResultStruct(ClusterObject):
@@ -7598,11 +7665,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(Label="ssid", Tag=0, Type=bytes),
                         ClusterObjectFieldDescriptor(Label="credentials", Tag=1, Type=bytes),
                         ClusterObjectFieldDescriptor(Label="breadcrumb", Tag=2, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="networkIdentity", Tag=3, Type=typing.Optional[bytes]),
+                        ClusterObjectFieldDescriptor(Label="clientIdentifier", Tag=4, Type=typing.Optional[bytes]),
+                        ClusterObjectFieldDescriptor(Label="possessionNonce", Tag=5, Type=typing.Optional[bytes]),
                     ])
 
             ssid: 'bytes' = b""
             credentials: 'bytes' = b""
             breadcrumb: 'typing.Optional[uint]' = None
+            networkIdentity: 'typing.Optional[bytes]' = None
+            clientIdentifier: 'typing.Optional[bytes]' = None
+            possessionNonce: 'typing.Optional[bytes]' = None
 
         @dataclass
         class AddOrUpdateThreadNetwork(ClusterCommand):
@@ -7654,11 +7727,15 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatusEnum),
                         ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=typing.Optional[str]),
                         ClusterObjectFieldDescriptor(Label="networkIndex", Tag=2, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="clientIdentity", Tag=3, Type=typing.Optional[bytes]),
+                        ClusterObjectFieldDescriptor(Label="possessionSignature", Tag=4, Type=typing.Optional[bytes]),
                     ])
 
             networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatusEnum' = 0
             debugText: 'typing.Optional[str]' = None
             networkIndex: 'typing.Optional[uint]' = None
+            clientIdentity: 'typing.Optional[bytes]' = None
+            possessionSignature: 'typing.Optional[bytes]' = None
 
         @dataclass
         class ConnectNetwork(ClusterCommand):
@@ -7718,6 +7795,42 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             networkIndex: 'uint' = 0
             breadcrumb: 'typing.Optional[uint]' = None
 
+        @dataclass
+        class QueryIdentity(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000031
+            command_id: typing.ClassVar[int] = 0x00000009
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'QueryIdentityResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="keyIdentifier", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="possessionNonce", Tag=1, Type=typing.Optional[bytes]),
+                    ])
+
+            keyIdentifier: 'bytes' = b""
+            possessionNonce: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class QueryIdentityResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000031
+            command_id: typing.ClassVar[int] = 0x0000000A
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="identity", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="possessionSignature", Tag=1, Type=typing.Optional[bytes]),
+                    ])
+
+            identity: 'bytes' = b""
+            possessionSignature: 'typing.Optional[bytes]' = None
+
     class Attributes:
         @dataclass
         class MaxNetworks(ClusterAttributeDescriptor):
@@ -8205,7 +8318,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]),
                 ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]),
                 ClusterObjectFieldDescriptor(Label="testEventTriggersEnabled", Tag=0x00000008, Type=bool),
-                ClusterObjectFieldDescriptor(Label="averageWearCount", Tag=0x00000009, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -8223,7 +8335,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     activeRadioFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]' = None
     activeNetworkFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]' = None
     testEventTriggersEnabled: 'bool' = None
-    averageWearCount: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -8346,6 +8457,37 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             enableKey: 'bytes' = b""
             eventTrigger: 'uint' = 0
 
+        @dataclass
+        class TimeSnapshot(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000033
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'TimeSnapshotResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class TimeSnapshotResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000033
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="systemTimeUs", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="UTCTimeUs", Tag=1, Type=typing.Union[Nullable, uint]),
+                    ])
+
+            systemTimeUs: 'uint' = 0
+            UTCTimeUs: 'typing.Union[Nullable, uint]' = NullValue
+
     class Attributes:
         @dataclass
         class NetworkInterfaces(ClusterAttributeDescriptor):
@@ -8491,22 +8633,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'bool' = False
 
-        @dataclass
-        class AverageWearCount(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000033
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000009
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -10862,11 +10988,11 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="associationFailure", Tag=0, Type=WiFiNetworkDiagnostics.Enums.AssociationFailureCauseEnum),
+                        ClusterObjectFieldDescriptor(Label="associationFailureCause", Tag=0, Type=WiFiNetworkDiagnostics.Enums.AssociationFailureCauseEnum),
                         ClusterObjectFieldDescriptor(Label="status", Tag=1, Type=uint),
                     ])
 
-            associationFailure: 'WiFiNetworkDiagnostics.Enums.AssociationFailureCauseEnum' = 0
+            associationFailureCause: 'WiFiNetworkDiagnostics.Enums.AssociationFailureCauseEnum' = 0
             status: 'uint' = 0
 
         @dataclass
@@ -14833,14 +14959,30 @@ class StayActiveRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x00000046
             command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'StayActiveResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class StayActiveResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000046
+            command_id: typing.ClassVar[int] = 0x00000004
+            is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="promisedActiveDuration", Tag=0, Type=uint),
                     ])
 
+            promisedActiveDuration: 'uint' = 0
+
     class Attributes:
         @dataclass
         class IdleModeDuration(ClusterAttributeDescriptor):
@@ -15068,19 +15210,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class ModeSelect(Cluster):
-    id: typing.ClassVar[int] = 0x00000050
+class Timer(Cluster):
+    id: typing.ClassVar[int] = 0x00000047
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str),
-                ClusterObjectFieldDescriptor(Label="standardNamespace", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[ModeSelect.Structs.ModeOptionStruct]),
-                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint),
-                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="setTime", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="timeRemaining", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="timerState", Tag=0x00000002, Type=Timer.Enums.TimerStatusEnum),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -15089,12 +15228,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    description: 'str' = None
-    standardNamespace: 'typing.Union[Nullable, uint]' = None
-    supportedModes: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = None
-    currentMode: 'uint' = None
-    startUpMode: 'typing.Union[None, Nullable, uint]' = None
-    onMode: 'typing.Union[None, Nullable, uint]' = None
+    setTime: 'uint' = None
+    timeRemaining: 'uint' = None
+    timerState: 'Timer.Enums.TimerStatusEnum' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -15102,44 +15238,56 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class TimerStatusEnum(MatterIntEnum):
+            kRunning = 0x00
+            kPaused = 0x01
+            kExpired = 0x02
+            kReady = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
     class Bitmaps:
         class Feature(IntFlag):
-            kOnOff = 0x1
+            kReset = 0x1
 
-    class Structs:
+    class Commands:
         @dataclass
-        class SemanticTagStruct(ClusterObject):
+        class SetTimer(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000047
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="newTime", Tag=0, Type=uint),
                     ])
 
-            mfgCode: 'uint' = 0
-            value: 'uint' = 0
+            newTime: 'uint' = 0
 
         @dataclass
-        class ModeOptionStruct(ClusterObject):
+        class ResetTimer(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000047
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
-                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTagStruct]),
                     ])
 
-            label: 'str' = ""
-            mode: 'uint' = 0
-            semanticTags: 'typing.List[ModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: [])
-
-    class Commands:
         @dataclass
-        class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000050
-            command_id: typing.ClassVar[int] = 0x00000000
+        class AddTime(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000047
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15147,69 +15295,37 @@ class ChangeToMode(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="additionalTime", Tag=0, Type=uint),
                     ])
 
-            newMode: 'uint' = 0
-
-    class Attributes:
-        @dataclass
-        class Description(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000050
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
-
-            value: 'str' = ""
+            additionalTime: 'uint' = 0
 
         @dataclass
-        class StandardNamespace(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000050
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
-
-            value: 'typing.Union[Nullable, uint]' = NullValue
-
-        @dataclass
-        class SupportedModes(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000050
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
+        class ReduceTime(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000047
+            command_id: typing.ClassVar[int] = 0x00000003
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[ModeSelect.Structs.ModeOptionStruct])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="timeReduction", Tag=0, Type=uint),
+                    ])
 
-            value: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            timeReduction: 'uint' = 0
 
+    class Attributes:
         @dataclass
-        class CurrentMode(ClusterAttributeDescriptor):
+        class SetTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -15218,42 +15334,42 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
+        class TimeRemaining(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class OnMode(ClusterAttributeDescriptor):
+        class TimerState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=Timer.Enums.TimerStatusEnum)
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'Timer.Enums.TimerStatusEnum' = 0
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15269,7 +15385,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15285,7 +15401,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15301,7 +15417,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15317,7 +15433,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15333,7 +15449,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000050
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15347,17 +15463,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class LaundryWasherMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000051
+class OvenCavityOperationalState(Cluster):
+    id: typing.ClassVar[int] = 0x00000048
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct]),
-                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="phaseList", Tag=0x00000000, Type=typing.Union[Nullable, typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="currentPhase", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="countdownTime", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="operationalStateList", Tag=0x00000003, Type=typing.List[OvenCavityOperationalState.Structs.OperationalStateStruct]),
+                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=OvenCavityOperationalState.Enums.OperationalStateEnum),
+                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=OvenCavityOperationalState.Structs.ErrorStateStruct),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -15366,10 +15484,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = None
-    currentMode: 'uint' = None
-    startUpMode: 'typing.Union[None, Nullable, uint]' = None
-    onMode: 'typing.Union[None, Nullable, uint]' = None
+    phaseList: 'typing.Union[Nullable, typing.List[str]]' = None
+    currentPhase: 'typing.Union[Nullable, uint]' = None
+    countdownTime: 'typing.Union[None, Nullable, uint]' = None
+    operationalStateList: 'typing.List[OvenCavityOperationalState.Structs.OperationalStateStruct]' = None
+    operationalState: 'OvenCavityOperationalState.Enums.OperationalStateEnum' = None
+    operationalError: 'OvenCavityOperationalState.Structs.ErrorStateStruct' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -15378,71 +15498,114 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ModeTag(MatterIntEnum):
-            kNormal = 0x4000
-            kDelicate = 0x4001
-            kHeavy = 0x4002
-            kWhites = 0x4003
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
+        class ErrorStateEnum(MatterIntEnum):
+            kNoError = 0x00
+            kUnableToStartOrResume = 0x01
+            kUnableToCompleteOperation = 0x02
+            kCommandInvalidInState = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
 
-    class Bitmaps:
-        class Feature(IntFlag):
-            kOnOff = 0x1
+        class OperationalStateEnum(MatterIntEnum):
+            kStopped = 0x00
+            kRunning = 0x01
+            kPaused = 0x02
+            kError = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
 
     class Structs:
         @dataclass
-        class ModeTagStruct(ClusterObject):
+        class ErrorStateStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
-                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="errorStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="errorStateLabel", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="errorStateDetails", Tag=2, Type=typing.Optional[str]),
                     ])
 
-            mfgCode: 'typing.Optional[uint]' = None
-            value: 'uint' = 0
+            errorStateID: 'uint' = 0
+            errorStateLabel: 'typing.Optional[str]' = None
+            errorStateDetails: 'typing.Optional[str]' = None
 
         @dataclass
-        class ModeOptionStruct(ClusterObject):
+        class OperationalStateStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
-                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[LaundryWasherMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="operationalStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="operationalStateLabel", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            label: 'str' = ""
-            mode: 'uint' = 0
-            modeTags: 'typing.List[LaundryWasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            operationalStateID: 'uint' = 0
+            operationalStateLabel: 'typing.Optional[str]' = None
 
     class Commands:
         @dataclass
-        class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000051
+        class Pause(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000048
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
                     ])
 
-            newMode: 'uint' = 0
-
         @dataclass
-        class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000051
+        class Stop(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000048
             command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Start(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000048
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Resume(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000048
+            command_id: typing.ClassVar[int] = 0x00000003
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class OperationalCommandResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000048
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -15450,19 +15613,17 @@ class ChangeToModeResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=OvenCavityOperationalState.Structs.ErrorStateStruct),
                     ])
 
-            status: 'uint' = 0
-            statusText: 'typing.Optional[str]' = None
+            commandResponseState: 'OvenCavityOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OvenCavityOperationalState.Structs.ErrorStateStruct())
 
     class Attributes:
         @dataclass
-        class SupportedModes(ClusterAttributeDescriptor):
+        class PhaseList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15470,15 +15631,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
 
-            value: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
 
         @dataclass
-        class CurrentMode(ClusterAttributeDescriptor):
+        class CurrentPhase(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15486,15 +15647,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
+        class CountdownTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15507,10 +15668,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class OnMode(ClusterAttributeDescriptor):
+        class OperationalStateList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15518,15 +15679,47 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[OvenCavityOperationalState.Structs.OperationalStateStruct])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.List[OvenCavityOperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class OperationalState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000048
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=OvenCavityOperationalState.Enums.OperationalStateEnum)
+
+            value: 'OvenCavityOperationalState.Enums.OperationalStateEnum' = 0
+
+        @dataclass
+        class OperationalError(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000048
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=OvenCavityOperationalState.Structs.ErrorStateStruct)
+
+            value: 'OvenCavityOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OvenCavityOperationalState.Structs.ErrorStateStruct())
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15542,7 +15735,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15558,7 +15751,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15574,7 +15767,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15590,7 +15783,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15606,7 +15799,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000048
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15618,16 +15811,59 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+    class Events:
+        @dataclass
+        class OperationalError(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000048
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=OvenCavityOperationalState.Structs.ErrorStateStruct),
+                    ])
+
+            errorState: 'OvenCavityOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OvenCavityOperationalState.Structs.ErrorStateStruct())
+
+        @dataclass
+        class OperationCompletion(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000048
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="completionErrorCode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="totalOperationalTime", Tag=1, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="pausedTime", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                    ])
+
+            completionErrorCode: 'uint' = 0
+            totalOperationalTime: 'typing.Union[None, Nullable, uint]' = None
+            pausedTime: 'typing.Union[None, Nullable, uint]' = None
+
 
 @dataclass
-class RefrigeratorAndTemperatureControlledCabinetMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000052
+class OvenMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000049
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[OvenMode.Structs.ModeOptionStruct]),
                 ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
                 ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
@@ -15639,7 +15875,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = None
+    supportedModes: 'typing.List[OvenMode.Structs.ModeOptionStruct]' = None
     currentMode: 'uint' = None
     startUpMode: 'typing.Union[None, Nullable, uint]' = None
     onMode: 'typing.Union[None, Nullable, uint]' = None
@@ -15652,13 +15888,20 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Enums:
         class ModeTag(MatterIntEnum):
-            kRapidCool = 0x4000
-            kRapidFreeze = 0x4001
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
+            kBake = 0x4000
+            kConvection = 0x4001
+            kGrill = 0x4002
+            kRoast = 0x4003
+            kClean = 0x4004
+            kConvectionBake = 0x4005
+            kConvectionRoast = 0x4006
+            kWarming = 0x4007
+            kProofing = 0x4008
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 0,
 
     class Bitmaps:
         class Feature(IntFlag):
@@ -15686,17 +15929,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
                         ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[OvenMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            modeTags: 'typing.List[OvenMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000052
+            cluster_id: typing.ClassVar[int] = 0x00000049
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -15712,7 +15955,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000052
+            cluster_id: typing.ClassVar[int] = 0x00000049
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -15733,7 +15976,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15741,15 +15984,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[OvenMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[OvenMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15765,7 +16008,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class StartUpMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15781,7 +16024,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15797,7 +16040,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15813,7 +16056,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15829,7 +16072,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15845,7 +16088,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15861,7 +16104,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15877,7 +16120,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15891,17 +16134,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class LaundryWasherControls(Cluster):
-    id: typing.ClassVar[int] = 0x00000053
+class LaundryDryerControls(Cluster):
+    id: typing.ClassVar[int] = 0x0000004A
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="spinSpeeds", Tag=0x00000000, Type=typing.Optional[typing.List[str]]),
-                ClusterObjectFieldDescriptor(Label="spinSpeedCurrent", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="numberOfRinses", Tag=0x00000002, Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]),
-                ClusterObjectFieldDescriptor(Label="supportedRinses", Tag=0x00000003, Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]),
+                ClusterObjectFieldDescriptor(Label="supportedDrynessLevels", Tag=0x00000000, Type=typing.List[LaundryDryerControls.Enums.DrynessLevelEnum]),
+                ClusterObjectFieldDescriptor(Label="selectedDrynessLevel", Tag=0x00000001, Type=typing.Union[Nullable, LaundryDryerControls.Enums.DrynessLevelEnum]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -15910,10 +16151,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    spinSpeeds: 'typing.Optional[typing.List[str]]' = None
-    spinSpeedCurrent: 'typing.Union[None, Nullable, uint]' = None
-    numberOfRinses: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
-    supportedRinses: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
+    supportedDrynessLevels: 'typing.List[LaundryDryerControls.Enums.DrynessLevelEnum]' = None
+    selectedDrynessLevel: 'typing.Union[Nullable, LaundryDryerControls.Enums.DrynessLevelEnum]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -15922,8 +16161,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class NumberOfRinsesEnum(MatterIntEnum):
-            kNone = 0x00
+        class DrynessLevelEnum(MatterIntEnum):
+            kLow = 0x00
             kNormal = 0x01
             kExtra = 0x02
             kMax = 0x03
@@ -15933,17 +16172,12 @@ class NumberOfRinsesEnum(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 4,
 
-    class Bitmaps:
-        class Feature(IntFlag):
-            kSpin = 0x1
-            kRinse = 0x2
-
     class Attributes:
         @dataclass
-        class SpinSpeeds(ClusterAttributeDescriptor):
+        class SupportedDrynessLevels(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15951,15 +16185,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.List[LaundryDryerControls.Enums.DrynessLevelEnum])
 
-            value: 'typing.Optional[typing.List[str]]' = None
+            value: 'typing.List[LaundryDryerControls.Enums.DrynessLevelEnum]' = field(default_factory=lambda: [])
 
         @dataclass
-        class SpinSpeedCurrent(ClusterAttributeDescriptor):
+        class SelectedDrynessLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15967,47 +16201,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
-
-            value: 'typing.Union[None, Nullable, uint]' = None
-
-        @dataclass
-        class NumberOfRinses(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000053
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum])
-
-            value: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
-
-        @dataclass
-        class SupportedRinses(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000053
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000003
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, LaundryDryerControls.Enums.DrynessLevelEnum])
 
-            value: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
+            value: 'typing.Union[Nullable, LaundryDryerControls.Enums.DrynessLevelEnum]' = NullValue
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16023,7 +16225,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16039,7 +16241,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16055,7 +16257,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16071,7 +16273,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16087,7 +16289,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x0000004A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16101,16 +16303,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RvcRunMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000054
+class ModeSelect(Cluster):
+    id: typing.ClassVar[int] = 0x00000050
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcRunMode.Structs.ModeOptionStruct]),
-                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str),
+                ClusterObjectFieldDescriptor(Label="standardNamespace", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[ModeSelect.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -16119,8 +16324,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = None
+    description: 'str' = None
+    standardNamespace: 'typing.Union[Nullable, uint]' = None
+    supportedModes: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = None
     currentMode: 'uint' = None
+    startUpMode: 'typing.Union[None, Nullable, uint]' = None
     onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -16129,47 +16337,22 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class ModeTag(MatterIntEnum):
-            kIdle = 0x4000
-            kCleaning = 0x4001
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
-
-        class StatusCode(MatterIntEnum):
-            kStuck = 0x41
-            kDustBinMissing = 0x42
-            kDustBinFull = 0x43
-            kWaterTankEmpty = 0x44
-            kWaterTankMissing = 0x45
-            kWaterTankLidOpen = 0x46
-            kMopCleaningPadMissing = 0x47
-            kBatteryLow = 0x48
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
-
     class Bitmaps:
         class Feature(IntFlag):
             kOnOff = 0x1
 
     class Structs:
         @dataclass
-        class ModeTagStruct(ClusterObject):
+        class SemanticTagStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=uint),
                         ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
                     ])
 
-            mfgCode: 'typing.Optional[uint]' = None
+            mfgCode: 'uint' = 0
             value: 'uint' = 0
 
         @dataclass
@@ -16180,20 +16363,20 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
                         ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcRunMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[RvcRunMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            semanticTags: 'typing.List[ModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000054
+            cluster_id: typing.ClassVar[int] = 0x00000050
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
@@ -16204,50 +16387,64 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
             newMode: 'uint' = 0
 
+    class Attributes:
         @dataclass
-        class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000054
-            command_id: typing.ClassVar[int] = 0x00000001
-            is_client: typing.ClassVar[bool] = False
-            response_type: typing.ClassVar[str] = None
+        class Description(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000050
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
-            status: 'uint' = 0
-            statusText: 'typing.Optional[str]' = None
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=str)
+
+            value: 'str' = ""
+
+        @dataclass
+        class StandardNamespace(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000050
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
-    class Attributes:
         @dataclass
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[ModeSelect.Structs.ModeOptionStruct])
 
-            value: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -16255,15 +16452,31 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+        @dataclass
+        class StartUpMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000050
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
         @dataclass
         class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000005
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -16275,7 +16488,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16291,7 +16504,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16307,7 +16520,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16323,7 +16536,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16339,7 +16552,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16355,7 +16568,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16369,15 +16582,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RvcCleanMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000055
+class LaundryWasherMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000051
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct]),
                 ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -16387,8 +16601,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = None
+    supportedModes: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = None
     currentMode: 'uint' = None
+    startUpMode: 'typing.Union[None, Nullable, uint]' = None
     onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -16399,17 +16614,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Enums:
         class ModeTag(MatterIntEnum):
-            kDeepClean = 0x4000
-            kVacuum = 0x4001
-            kMop = 0x4002
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
-
-        class StatusCode(MatterIntEnum):
-            kCleaningInProgress = 0x40
+            kNormal = 0x4000
+            kDelicate = 0x4001
+            kHeavy = 0x4002
+            kWhites = 0x4003
             # kUnknownEnumValue intentionally not defined. This enum never goes
             # through DataModel::Decode, likely because it is a part of a derived
             # cluster. As a result having kUnknownEnumValue in this enum is error
@@ -16442,17 +16650,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
                         ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcCleanMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[LaundryWasherMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[RvcCleanMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            modeTags: 'typing.List[LaundryWasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000055
+            cluster_id: typing.ClassVar[int] = 0x00000051
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -16468,7 +16676,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000055
+            cluster_id: typing.ClassVar[int] = 0x00000051
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -16489,7 +16697,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16497,15 +16705,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16517,11 +16725,27 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+        @dataclass
+        class StartUpMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000051
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
         @dataclass
         class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16537,7 +16761,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16553,7 +16777,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16569,7 +16793,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16585,7 +16809,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16601,7 +16825,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16617,7 +16841,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16631,19 +16855,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class TemperatureControl(Cluster):
-    id: typing.ClassVar[int] = 0x00000056
+class RefrigeratorAndTemperatureControlledCabinetMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000052
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="temperatureSetpoint", Tag=0x00000000, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="minTemperature", Tag=0x00000001, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="maxTemperature", Tag=0x00000002, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="step", Tag=0x00000003, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="selectedTemperatureLevel", Tag=0x00000004, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="supportedTemperatureLevels", Tag=0x00000005, Type=typing.Optional[typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -16652,12 +16874,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    temperatureSetpoint: 'typing.Optional[int]' = None
-    minTemperature: 'typing.Optional[int]' = None
-    maxTemperature: 'typing.Optional[int]' = None
-    step: 'typing.Optional[int]' = None
-    selectedTemperatureLevel: 'typing.Optional[uint]' = None
-    supportedTemperatureLevels: 'typing.Optional[typing.List[str]]' = None
+    supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = None
+    currentMode: 'uint' = None
+    startUpMode: 'typing.Union[None, Nullable, uint]' = None
+    onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -16665,133 +16885,154 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class ModeTag(MatterIntEnum):
+            kRapidCool = 0x4000
+            kRapidFreeze = 0x4001
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
     class Bitmaps:
         class Feature(IntFlag):
-            kTemperatureNumber = 0x1
-            kTemperatureLevel = 0x2
-            kTemperatureStep = 0x4
+            kOnOff = 0x1
 
-    class Commands:
+    class Structs:
         @dataclass
-        class SetTemperature(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000056
-            command_id: typing.ClassVar[int] = 0x00000000
-            is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = None
-
+        class ModeTagStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="targetTemperature", Tag=0, Type=typing.Optional[int]),
-                        ClusterObjectFieldDescriptor(Label="targetTemperatureLevel", Tag=1, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
                     ])
 
-            targetTemperature: 'typing.Optional[int]' = None
-            targetTemperatureLevel: 'typing.Optional[uint]' = None
+            mfgCode: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
-    class Attributes:
         @dataclass
-        class TemperatureSetpoint(ClusterAttributeDescriptor):
+        class ModeOptionStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000056
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
+                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
+            label: 'str' = ""
+            mode: 'uint' = 0
+            modeTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+
+    class Commands:
+        @dataclass
+        class ChangeToMode(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000052
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            newMode: 'uint' = 0
 
         @dataclass
-        class MinTemperature(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000056
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
+        class ChangeToModeResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000052
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            status: 'uint' = 0
+            statusText: 'typing.Optional[str]' = None
 
+    class Attributes:
         @dataclass
-        class MaxTemperature(ClusterAttributeDescriptor):
+        class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class Step(ClusterAttributeDescriptor):
+        class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class SelectedTemperatureLevel(ClusterAttributeDescriptor):
+        class StartUpMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class SupportedTemperatureLevels(ClusterAttributeDescriptor):
+        class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[typing.List[str]]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16807,7 +17048,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16823,7 +17064,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16839,7 +17080,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16855,7 +17096,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16871,7 +17112,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16885,16 +17126,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RefrigeratorAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x00000057
+class LaundryWasherControls(Cluster):
+    id: typing.ClassVar[int] = 0x00000053
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="mask", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="state", Tag=0x00000002, Type=uint),
-                ClusterObjectFieldDescriptor(Label="supported", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="spinSpeeds", Tag=0x00000000, Type=typing.Optional[typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="spinSpeedCurrent", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="numberOfRinses", Tag=0x00000002, Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]),
+                ClusterObjectFieldDescriptor(Label="supportedRinses", Tag=0x00000003, Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -16903,9 +17145,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    mask: 'uint' = None
-    state: 'uint' = None
-    supported: 'uint' = None
+    spinSpeeds: 'typing.Optional[typing.List[str]]' = None
+    spinSpeedCurrent: 'typing.Union[None, Nullable, uint]' = None
+    numberOfRinses: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
+    supportedRinses: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -16913,16 +17156,29 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class NumberOfRinsesEnum(MatterIntEnum):
+            kNone = 0x00
+            kNormal = 0x01
+            kExtra = 0x02
+            kMax = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
     class Bitmaps:
-        class AlarmMap(IntFlag):
-            kDoorOpen = 0x1
+        class Feature(IntFlag):
+            kSpin = 0x1
+            kRinse = 0x2
 
     class Attributes:
         @dataclass
-        class Mask(ClusterAttributeDescriptor):
+        class SpinSpeeds(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16930,31 +17186,47 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[typing.List[str]]' = None
 
         @dataclass
-        class State(ClusterAttributeDescriptor):
+        class SpinSpeedCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class Supported(ClusterAttributeDescriptor):
+        class NumberOfRinses(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum])
+
+            value: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
+
+        @dataclass
+        class SupportedRinses(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16962,15 +17234,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16986,7 +17258,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17002,7 +17274,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17018,7 +17290,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17034,7 +17306,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17050,7 +17322,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17062,44 +17334,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-    class Events:
-        @dataclass
-        class Notify(ClusterEvent):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000057
-
-            @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="active", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="inactive", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="state", Tag=2, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="mask", Tag=3, Type=uint),
-                    ])
-
-            active: 'uint' = 0
-            inactive: 'uint' = 0
-            state: 'uint' = 0
-            mask: 'uint' = 0
-
 
 @dataclass
-class DishwasherMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000059
+class RvcRunMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000054
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[DishwasherMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcRunMode.Structs.ModeOptionStruct]),
                 ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -17109,9 +17354,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = None
+    supportedModes: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = None
     currentMode: 'uint' = None
-    startUpMode: 'typing.Union[None, Nullable, uint]' = None
     onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -17122,9 +17366,23 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Enums:
         class ModeTag(MatterIntEnum):
-            kNormal = 0x4000
-            kHeavy = 0x4001
-            kLight = 0x4002
+            kIdle = 0x4000
+            kCleaning = 0x4001
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
+        class StatusCode(MatterIntEnum):
+            kStuck = 0x41
+            kDustBinMissing = 0x42
+            kDustBinFull = 0x43
+            kWaterTankEmpty = 0x44
+            kWaterTankMissing = 0x45
+            kWaterTankLidOpen = 0x46
+            kMopCleaningPadMissing = 0x47
+            kBatteryLow = 0x48
             # kUnknownEnumValue intentionally not defined. This enum never goes
             # through DataModel::Decode, likely because it is a part of a derived
             # cluster. As a result having kUnknownEnumValue in this enum is error
@@ -17157,17 +17415,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
                         ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[DishwasherMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcRunMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[DishwasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            modeTags: 'typing.List[RvcRunMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000059
+            cluster_id: typing.ClassVar[int] = 0x00000054
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -17183,7 +17441,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000059
+            cluster_id: typing.ClassVar[int] = 0x00000054
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -17204,7 +17462,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17212,15 +17470,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[DishwasherMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17232,27 +17490,11 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-        @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000059
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
-
-            value: 'typing.Union[None, Nullable, uint]' = None
-
         @dataclass
         class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17268,7 +17510,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17284,7 +17526,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17300,7 +17542,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17316,7 +17558,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17332,7 +17574,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17348,7 +17590,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17362,14 +17604,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class AirQuality(Cluster):
-    id: typing.ClassVar[int] = 0x0000005B
+class RvcCleanMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000055
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="airQuality", Tag=0x00000000, Type=AirQuality.Enums.AirQualityEnum),
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -17378,7 +17622,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    airQuality: 'AirQuality.Enums.AirQualityEnum' = None
+    supportedModes: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = None
+    currentMode: 'uint' = None
+    onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -17387,33 +17633,98 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class AirQualityEnum(MatterIntEnum):
-            kUnknown = 0x00
-            kGood = 0x01
-            kFair = 0x02
-            kModerate = 0x03
-            kPoor = 0x04
-            kVeryPoor = 0x05
-            kExtremelyPoor = 0x06
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 7,
+        class ModeTag(MatterIntEnum):
+            kDeepClean = 0x4000
+            kVacuum = 0x4001
+            kMop = 0x4002
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
+        class StatusCode(MatterIntEnum):
+            kCleaningInProgress = 0x40
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
 
     class Bitmaps:
         class Feature(IntFlag):
-            kFair = 0x1
-            kModerate = 0x2
-            kVeryPoor = 0x4
-            kExtremelyPoor = 0x8
+            kOnOff = 0x1
+
+    class Structs:
+        @dataclass
+        class ModeTagStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                    ])
+
+            mfgCode: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
+
+        @dataclass
+        class ModeOptionStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
+                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcCleanMode.Structs.ModeTagStruct]),
+                    ])
+
+            label: 'str' = ""
+            mode: 'uint' = 0
+            modeTags: 'typing.List[RvcCleanMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+
+    class Commands:
+        @dataclass
+        class ChangeToMode(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000055
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                    ])
+
+            newMode: 'uint' = 0
+
+        @dataclass
+        class ChangeToModeResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000055
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
+                    ])
+
+            status: 'uint' = 0
+            statusText: 'typing.Optional[str]' = None
 
     class Attributes:
         @dataclass
-        class AirQuality(ClusterAttributeDescriptor):
+        class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17421,15 +17732,47 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=AirQuality.Enums.AirQualityEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct])
 
-            value: 'AirQuality.Enums.AirQualityEnum' = 0
+            value: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class CurrentMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000055
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class OnMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000055
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17445,7 +17788,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17461,7 +17804,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17477,7 +17820,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17493,7 +17836,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17509,7 +17852,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17523,26 +17866,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class SmokeCoAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x0000005C
+class TemperatureControl(Cluster):
+    id: typing.ClassVar[int] = 0x00000056
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="expressedState", Tag=0x00000000, Type=SmokeCoAlarm.Enums.ExpressedStateEnum),
-                ClusterObjectFieldDescriptor(Label="smokeState", Tag=0x00000001, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
-                ClusterObjectFieldDescriptor(Label="COState", Tag=0x00000002, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
-                ClusterObjectFieldDescriptor(Label="batteryAlert", Tag=0x00000003, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                ClusterObjectFieldDescriptor(Label="deviceMuted", Tag=0x00000004, Type=typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]),
-                ClusterObjectFieldDescriptor(Label="testInProgress", Tag=0x00000005, Type=bool),
-                ClusterObjectFieldDescriptor(Label="hardwareFaultAlert", Tag=0x00000006, Type=bool),
-                ClusterObjectFieldDescriptor(Label="endOfServiceAlert", Tag=0x00000007, Type=SmokeCoAlarm.Enums.EndOfServiceEnum),
-                ClusterObjectFieldDescriptor(Label="interconnectSmokeAlarm", Tag=0x00000008, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
-                ClusterObjectFieldDescriptor(Label="interconnectCOAlarm", Tag=0x00000009, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
-                ClusterObjectFieldDescriptor(Label="contaminationState", Tag=0x0000000A, Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]),
-                ClusterObjectFieldDescriptor(Label="smokeSensitivityLevel", Tag=0x0000000B, Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]),
-                ClusterObjectFieldDescriptor(Label="expiryDate", Tag=0x0000000C, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="temperatureSetpoint", Tag=0x00000000, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="minTemperature", Tag=0x00000001, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="maxTemperature", Tag=0x00000002, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="step", Tag=0x00000003, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="selectedTemperatureLevel", Tag=0x00000004, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="supportedTemperatureLevels", Tag=0x00000005, Type=typing.Optional[typing.List[str]]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -17551,19 +17887,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    expressedState: 'SmokeCoAlarm.Enums.ExpressedStateEnum' = None
-    smokeState: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
-    COState: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
-    batteryAlert: 'SmokeCoAlarm.Enums.AlarmStateEnum' = None
-    deviceMuted: 'typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]' = None
-    testInProgress: 'bool' = None
-    hardwareFaultAlert: 'bool' = None
-    endOfServiceAlert: 'SmokeCoAlarm.Enums.EndOfServiceEnum' = None
-    interconnectSmokeAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
-    interconnectCOAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
-    contaminationState: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None
-    smokeSensitivityLevel: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None
-    expiryDate: 'typing.Optional[uint]' = None
+    temperatureSetpoint: 'typing.Optional[int]' = None
+    minTemperature: 'typing.Optional[int]' = None
+    maxTemperature: 'typing.Optional[int]' = None
+    step: 'typing.Optional[int]' = None
+    selectedTemperatureLevel: 'typing.Optional[uint]' = None
+    supportedTemperatureLevels: 'typing.Optional[typing.List[str]]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -17571,81 +17900,16 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class AlarmStateEnum(MatterIntEnum):
-            kNormal = 0x00
-            kWarning = 0x01
-            kCritical = 0x02
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 3,
-
-        class ContaminationStateEnum(MatterIntEnum):
-            kNormal = 0x00
-            kLow = 0x01
-            kWarning = 0x02
-            kCritical = 0x03
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 4,
-
-        class EndOfServiceEnum(MatterIntEnum):
-            kNormal = 0x00
-            kExpired = 0x01
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 2,
-
-        class ExpressedStateEnum(MatterIntEnum):
-            kNormal = 0x00
-            kSmokeAlarm = 0x01
-            kCOAlarm = 0x02
-            kBatteryAlert = 0x03
-            kTesting = 0x04
-            kHardwareFault = 0x05
-            kEndOfService = 0x06
-            kInterconnectSmoke = 0x07
-            kInterconnectCO = 0x08
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 9,
-
-        class MuteStateEnum(MatterIntEnum):
-            kNotMuted = 0x00
-            kMuted = 0x01
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 2,
-
-        class SensitivityEnum(MatterIntEnum):
-            kHigh = 0x00
-            kStandard = 0x01
-            kLow = 0x02
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 3,
-
     class Bitmaps:
         class Feature(IntFlag):
-            kSmokeAlarm = 0x1
-            kCoAlarm = 0x2
+            kTemperatureNumber = 0x1
+            kTemperatureLevel = 0x2
+            kTemperatureStep = 0x4
 
     class Commands:
         @dataclass
-        class SelfTestRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0000005C
+        class SetTemperature(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000056
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
@@ -17654,14 +17918,19 @@ class SelfTestRequest(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="targetTemperature", Tag=0, Type=typing.Optional[int]),
+                        ClusterObjectFieldDescriptor(Label="targetTemperatureLevel", Tag=1, Type=typing.Optional[uint]),
                     ])
 
+            targetTemperature: 'typing.Optional[int]' = None
+            targetTemperatureLevel: 'typing.Optional[uint]' = None
+
     class Attributes:
         @dataclass
-        class ExpressedState(ClusterAttributeDescriptor):
+        class TemperatureSetpoint(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17669,15 +17938,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.ExpressedStateEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'SmokeCoAlarm.Enums.ExpressedStateEnum' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class SmokeState(ClusterAttributeDescriptor):
+        class MinTemperature(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17685,15 +17954,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class COState(ClusterAttributeDescriptor):
+        class MaxTemperature(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17701,15 +17970,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class BatteryAlert(ClusterAttributeDescriptor):
+        class Step(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17717,15 +17986,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.AlarmStateEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class DeviceMuted(ClusterAttributeDescriptor):
+        class SelectedTemperatureLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17733,15 +18002,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class TestInProgress(ClusterAttributeDescriptor):
+        class SupportedTemperatureLevels(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17749,127 +18018,3081 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
 
-            value: 'bool' = False
+            value: 'typing.Optional[typing.List[str]]' = None
 
         @dataclass
-        class HardwareFaultAlert(ClusterAttributeDescriptor):
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000006
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'bool' = False
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class EndOfServiceAlert(ClusterAttributeDescriptor):
+        class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000007
+                return 0x0000FFF9
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.EndOfServiceEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'SmokeCoAlarm.Enums.EndOfServiceEnum' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InterconnectSmokeAlarm(ClusterAttributeDescriptor):
+        class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000008
+                return 0x0000FFFA
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InterconnectCOAlarm(ClusterAttributeDescriptor):
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000009
+                return 0x0000FFFB
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000056
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000056
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+@dataclass
+class RefrigeratorAlarm(Cluster):
+    id: typing.ClassVar[int] = 0x00000057
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="mask", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="state", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="supported", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    mask: 'uint' = None
+    state: 'uint' = None
+    supported: 'uint' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Bitmaps:
+        class AlarmMap(IntFlag):
+            kDoorOpen = 0x1
+
+    class Attributes:
+        @dataclass
+        class Mask(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class State(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class Supported(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+    class Events:
+        @dataclass
+        class Notify(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000057
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="active", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="inactive", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=2, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="mask", Tag=3, Type=uint),
+                    ])
+
+            active: 'uint' = 0
+            inactive: 'uint' = 0
+            state: 'uint' = 0
+            mask: 'uint' = 0
+
+
+@dataclass
+class DishwasherMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000059
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[DishwasherMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    supportedModes: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = None
+    currentMode: 'uint' = None
+    startUpMode: 'typing.Union[None, Nullable, uint]' = None
+    onMode: 'typing.Union[None, Nullable, uint]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ModeTag(MatterIntEnum):
+            kNormal = 0x4000
+            kHeavy = 0x4001
+            kLight = 0x4002
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kOnOff = 0x1
+
+    class Structs:
+        @dataclass
+        class ModeTagStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                    ])
+
+            mfgCode: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
+
+        @dataclass
+        class ModeOptionStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
+                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[DishwasherMode.Structs.ModeTagStruct]),
+                    ])
+
+            label: 'str' = ""
+            mode: 'uint' = 0
+            modeTags: 'typing.List[DishwasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+
+    class Commands:
+        @dataclass
+        class ChangeToMode(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000059
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                    ])
+
+            newMode: 'uint' = 0
+
+        @dataclass
+        class ChangeToModeResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000059
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
+                    ])
+
+            status: 'uint' = 0
+            statusText: 'typing.Optional[str]' = None
+
+    class Attributes:
+        @dataclass
+        class SupportedModes(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[DishwasherMode.Structs.ModeOptionStruct])
+
+            value: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class CurrentMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class StartUpMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class OnMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000059
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+@dataclass
+class AirQuality(Cluster):
+    id: typing.ClassVar[int] = 0x0000005B
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="airQuality", Tag=0x00000000, Type=AirQuality.Enums.AirQualityEnum),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    airQuality: 'AirQuality.Enums.AirQualityEnum' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class AirQualityEnum(MatterIntEnum):
+            kUnknown = 0x00
+            kGood = 0x01
+            kFair = 0x02
+            kModerate = 0x03
+            kPoor = 0x04
+            kVeryPoor = 0x05
+            kExtremelyPoor = 0x06
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 7,
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kFair = 0x1
+            kModerate = 0x2
+            kVeryPoor = 0x4
+            kExtremelyPoor = 0x8
+
+    class Attributes:
+        @dataclass
+        class AirQuality(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=AirQuality.Enums.AirQualityEnum)
+
+            value: 'AirQuality.Enums.AirQualityEnum' = 0
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005B
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+@dataclass
+class SmokeCoAlarm(Cluster):
+    id: typing.ClassVar[int] = 0x0000005C
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="expressedState", Tag=0x00000000, Type=SmokeCoAlarm.Enums.ExpressedStateEnum),
+                ClusterObjectFieldDescriptor(Label="smokeState", Tag=0x00000001, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
+                ClusterObjectFieldDescriptor(Label="COState", Tag=0x00000002, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
+                ClusterObjectFieldDescriptor(Label="batteryAlert", Tag=0x00000003, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                ClusterObjectFieldDescriptor(Label="deviceMuted", Tag=0x00000004, Type=typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]),
+                ClusterObjectFieldDescriptor(Label="testInProgress", Tag=0x00000005, Type=bool),
+                ClusterObjectFieldDescriptor(Label="hardwareFaultAlert", Tag=0x00000006, Type=bool),
+                ClusterObjectFieldDescriptor(Label="endOfServiceAlert", Tag=0x00000007, Type=SmokeCoAlarm.Enums.EndOfServiceEnum),
+                ClusterObjectFieldDescriptor(Label="interconnectSmokeAlarm", Tag=0x00000008, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
+                ClusterObjectFieldDescriptor(Label="interconnectCOAlarm", Tag=0x00000009, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]),
+                ClusterObjectFieldDescriptor(Label="contaminationState", Tag=0x0000000A, Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]),
+                ClusterObjectFieldDescriptor(Label="smokeSensitivityLevel", Tag=0x0000000B, Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]),
+                ClusterObjectFieldDescriptor(Label="expiryDate", Tag=0x0000000C, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    expressedState: 'SmokeCoAlarm.Enums.ExpressedStateEnum' = None
+    smokeState: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+    COState: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+    batteryAlert: 'SmokeCoAlarm.Enums.AlarmStateEnum' = None
+    deviceMuted: 'typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]' = None
+    testInProgress: 'bool' = None
+    hardwareFaultAlert: 'bool' = None
+    endOfServiceAlert: 'SmokeCoAlarm.Enums.EndOfServiceEnum' = None
+    interconnectSmokeAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+    interconnectCOAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+    contaminationState: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None
+    smokeSensitivityLevel: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None
+    expiryDate: 'typing.Optional[uint]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class AlarmStateEnum(MatterIntEnum):
+            kNormal = 0x00
+            kWarning = 0x01
+            kCritical = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
+        class ContaminationStateEnum(MatterIntEnum):
+            kNormal = 0x00
+            kLow = 0x01
+            kWarning = 0x02
+            kCritical = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
+        class EndOfServiceEnum(MatterIntEnum):
+            kNormal = 0x00
+            kExpired = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class ExpressedStateEnum(MatterIntEnum):
+            kNormal = 0x00
+            kSmokeAlarm = 0x01
+            kCOAlarm = 0x02
+            kBatteryAlert = 0x03
+            kTesting = 0x04
+            kHardwareFault = 0x05
+            kEndOfService = 0x06
+            kInterconnectSmoke = 0x07
+            kInterconnectCO = 0x08
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 9,
+
+        class MuteStateEnum(MatterIntEnum):
+            kNotMuted = 0x00
+            kMuted = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class SensitivityEnum(MatterIntEnum):
+            kHigh = 0x00
+            kStandard = 0x01
+            kLow = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kSmokeAlarm = 0x1
+            kCoAlarm = 0x2
+
+    class Commands:
+        @dataclass
+        class SelfTestRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0000005C
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+    class Attributes:
+        @dataclass
+        class ExpressedState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.ExpressedStateEnum)
+
+            value: 'SmokeCoAlarm.Enums.ExpressedStateEnum' = 0
+
+        @dataclass
+        class SmokeState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+
+        @dataclass
+        class COState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+
+        @dataclass
+        class BatteryAlert(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.AlarmStateEnum)
+
+            value: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class DeviceMuted(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]' = None
+
+        @dataclass
+        class TestInProgress(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=bool)
+
+            value: 'bool' = False
+
+        @dataclass
+        class HardwareFaultAlert(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=bool)
+
+            value: 'bool' = False
+
+        @dataclass
+        class EndOfServiceAlert(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.EndOfServiceEnum)
+
+            value: 'SmokeCoAlarm.Enums.EndOfServiceEnum' = 0
+
+        @dataclass
+        class InterconnectSmokeAlarm(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+
+        @dataclass
+        class InterconnectCOAlarm(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000009
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
 
         @dataclass
         class ContaminationState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000A
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None
+
+        @dataclass
+        class SmokeSensitivityLevel(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000B
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum])
+
+            value: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None
+
+        @dataclass
+        class ExpiryDate(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000C
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+    class Events:
+        @dataclass
+        class SmokeAlarm(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                    ])
+
+            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class COAlarm(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                    ])
+
+            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class LowBattery(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                    ])
+
+            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class HardwareFault(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class EndOfService(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class SelfTestComplete(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class AlarmMuted(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class MuteEnded(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class InterconnectSmokeAlarm(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                    ])
+
+            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class InterconnectCOAlarm(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000009
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                    ])
+
+            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+
+        @dataclass
+        class AllClear(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x0000000A
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+
+@dataclass
+class DishwasherAlarm(Cluster):
+    id: typing.ClassVar[int] = 0x0000005D
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="mask", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="latch", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="state", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="supported", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    mask: 'uint' = None
+    latch: 'typing.Optional[uint]' = None
+    state: 'uint' = None
+    supported: 'uint' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Bitmaps:
+        class AlarmMap(IntFlag):
+            kInflowError = 0x1
+            kDrainError = 0x2
+            kDoorError = 0x4
+            kTempTooLow = 0x8
+            kTempTooHigh = 0x10
+            kWaterLevelError = 0x20
+
+        class Feature(IntFlag):
+            kReset = 0x1
+
+    class Commands:
+        @dataclass
+        class Reset(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0000005D
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="alarms", Tag=0, Type=uint),
+                    ])
+
+            alarms: 'uint' = 0
+
+        @dataclass
+        class ModifyEnabledAlarms(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0000005D
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="mask", Tag=0, Type=uint),
+                    ])
+
+            mask: 'uint' = 0
+
+    class Attributes:
+        @dataclass
+        class Mask(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class Latch(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class State(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class Supported(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+    class Events:
+        @dataclass
+        class Notify(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005D
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="active", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="inactive", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=2, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="mask", Tag=3, Type=uint),
+                    ])
+
+            active: 'uint' = 0
+            inactive: 'uint' = 0
+            state: 'uint' = 0
+            mask: 'uint' = 0
+
+
+@dataclass
+class MicrowaveOvenMode(Cluster):
+    id: typing.ClassVar[int] = 0x0000005E
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct]),
+                ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    supportedModes: 'typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct]' = None
+    currentMode: 'uint' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ModeTag(MatterIntEnum):
+            kNormal = 0x4000
+            kDefrost = 0x4001
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 0,
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kOnOff = 0x1
+
+    class Structs:
+        @dataclass
+        class ModeTagStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                    ])
+
+            mfgCode: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
+
+        @dataclass
+        class ModeOptionStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str),
+                        ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[MicrowaveOvenMode.Structs.ModeTagStruct]),
+                    ])
+
+            label: 'str' = ""
+            mode: 'uint' = 0
+            modeTags: 'typing.List[MicrowaveOvenMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+
+    class Attributes:
+        @dataclass
+        class SupportedModes(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct])
+
+            value: 'typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class CurrentMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005E
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+@dataclass
+class MicrowaveOvenControl(Cluster):
+    id: typing.ClassVar[int] = 0x0000005F
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="cookTime", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="powerSetting", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="minPower", Tag=0x00000003, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="maxPower", Tag=0x00000004, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerStep", Tag=0x00000005, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    cookTime: 'uint' = None
+    powerSetting: 'uint' = None
+    minPower: 'typing.Optional[uint]' = None
+    maxPower: 'typing.Optional[uint]' = None
+    powerStep: 'typing.Optional[uint]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Commands:
+        @dataclass
+        class SetCookingParameters(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0000005F
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="cookMode", Tag=0, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="cookTime", Tag=1, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="powerSetting", Tag=2, Type=typing.Optional[uint]),
+                    ])
+
+            cookMode: 'typing.Optional[uint]' = None
+            cookTime: 'typing.Optional[uint]' = None
+            powerSetting: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class AddMoreTime(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0000005F
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="timeToAdd", Tag=0, Type=uint),
+                    ])
+
+            timeToAdd: 'uint' = 0
+
+    class Attributes:
+        @dataclass
+        class CookTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class PowerSetting(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class MinPower(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class MaxPower(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class PowerStep(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+@dataclass
+class OperationalState(Cluster):
+    id: typing.ClassVar[int] = 0x00000060
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="phaseList", Tag=0x00000000, Type=typing.Union[Nullable, typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="currentPhase", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="countdownTime", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="operationalStateList", Tag=0x00000003, Type=typing.List[OperationalState.Structs.OperationalStateStruct]),
+                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=OperationalState.Enums.OperationalStateEnum),
+                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=OperationalState.Structs.ErrorStateStruct),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    phaseList: 'typing.Union[Nullable, typing.List[str]]' = None
+    currentPhase: 'typing.Union[Nullable, uint]' = None
+    countdownTime: 'typing.Union[None, Nullable, uint]' = None
+    operationalStateList: 'typing.List[OperationalState.Structs.OperationalStateStruct]' = None
+    operationalState: 'OperationalState.Enums.OperationalStateEnum' = None
+    operationalError: 'OperationalState.Structs.ErrorStateStruct' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ErrorStateEnum(MatterIntEnum):
+            kNoError = 0x00
+            kUnableToStartOrResume = 0x01
+            kUnableToCompleteOperation = 0x02
+            kCommandInvalidInState = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
+        class OperationalStateEnum(MatterIntEnum):
+            kStopped = 0x00
+            kRunning = 0x01
+            kPaused = 0x02
+            kError = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
+    class Structs:
+        @dataclass
+        class ErrorStateStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="errorStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="errorStateLabel", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="errorStateDetails", Tag=2, Type=typing.Optional[str]),
+                    ])
+
+            errorStateID: 'uint' = 0
+            errorStateLabel: 'typing.Optional[str]' = None
+            errorStateDetails: 'typing.Optional[str]' = None
+
+        @dataclass
+        class OperationalStateStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="operationalStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="operationalStateLabel", Tag=1, Type=typing.Optional[str]),
+                    ])
+
+            operationalStateID: 'uint' = 0
+            operationalStateLabel: 'typing.Optional[str]' = None
+
+    class Commands:
+        @dataclass
+        class Pause(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000060
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Stop(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000060
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Start(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000060
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Resume(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000060
+            command_id: typing.ClassVar[int] = 0x00000003
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class OperationalCommandResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000060
+            command_id: typing.ClassVar[int] = 0x00000004
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
+                    ])
+
+            commandResponseState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+
+    class Attributes:
+        @dataclass
+        class PhaseList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
+
+            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+
+        @dataclass
+        class CurrentPhase(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+
+            value: 'typing.Union[Nullable, uint]' = NullValue
+
+        @dataclass
+        class CountdownTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class OperationalStateList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[OperationalState.Structs.OperationalStateStruct])
+
+            value: 'typing.List[OperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class OperationalState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=OperationalState.Enums.OperationalStateEnum)
+
+            value: 'OperationalState.Enums.OperationalStateEnum' = 0
+
+        @dataclass
+        class OperationalError(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=OperationalState.Structs.ErrorStateStruct)
+
+            value: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+    class Events:
+        @dataclass
+        class OperationalError(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
+                    ])
+
+            errorState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+
+        @dataclass
+        class OperationCompletion(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000060
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="completionErrorCode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="totalOperationalTime", Tag=1, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="pausedTime", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                    ])
+
+            completionErrorCode: 'uint' = 0
+            totalOperationalTime: 'typing.Union[None, Nullable, uint]' = None
+            pausedTime: 'typing.Union[None, Nullable, uint]' = None
+
+
+@dataclass
+class RvcOperationalState(Cluster):
+    id: typing.ClassVar[int] = 0x00000061
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="phaseList", Tag=0x00000000, Type=typing.Union[Nullable, typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="currentPhase", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="countdownTime", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="operationalStateList", Tag=0x00000003, Type=typing.List[RvcOperationalState.Structs.OperationalStateStruct]),
+                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=uint),
+                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=RvcOperationalState.Structs.ErrorStateStruct),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    phaseList: 'typing.Union[Nullable, typing.List[str]]' = None
+    currentPhase: 'typing.Union[Nullable, uint]' = None
+    countdownTime: 'typing.Union[None, Nullable, uint]' = None
+    operationalStateList: 'typing.List[RvcOperationalState.Structs.OperationalStateStruct]' = None
+    operationalState: 'uint' = None
+    operationalError: 'RvcOperationalState.Structs.ErrorStateStruct' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ErrorStateEnum(MatterIntEnum):
+            kFailedToFindChargingDock = 0x40
+            kStuck = 0x41
+            kDustBinMissing = 0x42
+            kDustBinFull = 0x43
+            kWaterTankEmpty = 0x44
+            kWaterTankMissing = 0x45
+            kWaterTankLidOpen = 0x46
+            kMopCleaningPadMissing = 0x47
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
+        class OperationalStateEnum(MatterIntEnum):
+            kSeekingCharger = 0x40
+            kCharging = 0x41
+            kDocked = 0x42
+            # kUnknownEnumValue intentionally not defined. This enum never goes
+            # through DataModel::Decode, likely because it is a part of a derived
+            # cluster. As a result having kUnknownEnumValue in this enum is error
+            # prone, and was removed. See
+            # src/app/common/templates/config-data.yaml.
+
+    class Structs:
+        @dataclass
+        class ErrorStateStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="errorStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="errorStateLabel", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="errorStateDetails", Tag=2, Type=typing.Optional[str]),
+                    ])
+
+            errorStateID: 'uint' = 0
+            errorStateLabel: 'typing.Optional[str]' = None
+            errorStateDetails: 'typing.Optional[str]' = None
+
+        @dataclass
+        class OperationalStateStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="operationalStateID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="operationalStateLabel", Tag=1, Type=typing.Optional[str]),
+                    ])
+
+            operationalStateID: 'uint' = 0
+            operationalStateLabel: 'typing.Optional[str]' = None
+
+    class Commands:
+        @dataclass
+        class Pause(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000061
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Stop(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000061
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Start(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000061
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class Resume(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000061
+            command_id: typing.ClassVar[int] = 0x00000003
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+        @dataclass
+        class OperationalCommandResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000061
+            command_id: typing.ClassVar[int] = 0x00000004
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
+                    ])
+
+            commandResponseState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+
+    class Attributes:
+        @dataclass
+        class PhaseList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
+
+            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+
+        @dataclass
+        class CurrentPhase(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+
+            value: 'typing.Union[Nullable, uint]' = NullValue
+
+        @dataclass
+        class CountdownTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class OperationalStateList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[RvcOperationalState.Structs.OperationalStateStruct])
+
+            value: 'typing.List[RvcOperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class OperationalState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class OperationalError(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=RvcOperationalState.Structs.ErrorStateStruct)
+
+            value: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class EventList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+    class Events:
+        @dataclass
+        class OperationalError(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
+                    ])
+
+            errorState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+
+        @dataclass
+        class OperationCompletion(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000061
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="completionErrorCode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="totalOperationalTime", Tag=1, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="pausedTime", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                    ])
+
+            completionErrorCode: 'uint' = 0
+            totalOperationalTime: 'typing.Union[None, Nullable, uint]' = None
+            pausedTime: 'typing.Union[None, Nullable, uint]' = None
+
+
+@dataclass
+class HepaFilterMonitoring(Cluster):
+    id: typing.ClassVar[int] = 0x00000071
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="condition", Tag=0x00000000, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="degradationDirection", Tag=0x00000001, Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]),
+                ClusterObjectFieldDescriptor(Label="changeIndication", Tag=0x00000002, Type=HepaFilterMonitoring.Enums.ChangeIndicationEnum),
+                ClusterObjectFieldDescriptor(Label="inPlaceIndicator", Tag=0x00000003, Type=typing.Optional[bool]),
+                ClusterObjectFieldDescriptor(Label="lastChangedTime", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="replacementProductList", Tag=0x00000005, Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    condition: 'typing.Optional[uint]' = None
+    degradationDirection: 'typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+    changeIndication: 'HepaFilterMonitoring.Enums.ChangeIndicationEnum' = None
+    inPlaceIndicator: 'typing.Optional[bool]' = None
+    lastChangedTime: 'typing.Union[None, Nullable, uint]' = None
+    replacementProductList: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ChangeIndicationEnum(MatterIntEnum):
+            kOk = 0x00
+            kWarning = 0x01
+            kCritical = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
+        class DegradationDirectionEnum(MatterIntEnum):
+            kUp = 0x00
+            kDown = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class ProductIdentifierTypeEnum(MatterIntEnum):
+            kUpc = 0x00
+            kGtin8 = 0x01
+            kEan = 0x02
+            kGtin14 = 0x03
+            kOem = 0x04
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 5,
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kCondition = 0x1
+            kWarning = 0x2
+            kReplacementProductList = 0x4
+
+    class Structs:
+        @dataclass
+        class ReplacementProductStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="productIdentifierType", Tag=0, Type=HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum),
+                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
+                    ])
+
+            productIdentifierType: 'HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
+            productIdentifierValue: 'str' = ""
+
+    class Commands:
+        @dataclass
+        class ResetCondition(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000071
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+    class Attributes:
+        @dataclass
+        class Condition(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class DegradationDirection(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum])
+
+            value: 'typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+
+        @dataclass
+        class ChangeIndication(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=HepaFilterMonitoring.Enums.ChangeIndicationEnum)
+
+            value: 'HepaFilterMonitoring.Enums.ChangeIndicationEnum' = 0
+
+        @dataclass
+        class InPlaceIndicator(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000A
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None
+            value: 'typing.Optional[bool]' = None
 
         @dataclass
-        class SmokeSensitivityLevel(ClusterAttributeDescriptor):
+        class LastChangedTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000B
+                return 0x00000004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class ExpiryDate(ClusterAttributeDescriptor):
+        class ReplacementProductList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000C
+                return 0x00000005
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17885,7 +21108,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17901,7 +21124,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17917,7 +21140,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17933,7 +21156,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17949,7 +21172,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17961,211 +21184,314 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-    class Events:
+
+@dataclass
+class ActivatedCarbonFilterMonitoring(Cluster):
+    id: typing.ClassVar[int] = 0x00000072
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields=[
+                ClusterObjectFieldDescriptor(Label="condition", Tag=0x00000000, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="degradationDirection", Tag=0x00000001, Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]),
+                ClusterObjectFieldDescriptor(Label="changeIndication", Tag=0x00000002, Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum),
+                ClusterObjectFieldDescriptor(Label="inPlaceIndicator", Tag=0x00000003, Type=typing.Optional[bool]),
+                ClusterObjectFieldDescriptor(Label="lastChangedTime", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="replacementProductList", Tag=0x00000005, Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]),
+                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    condition: 'typing.Optional[uint]' = None
+    degradationDirection: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+    changeIndication: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = None
+    inPlaceIndicator: 'typing.Optional[bool]' = None
+    lastChangedTime: 'typing.Union[None, Nullable, uint]' = None
+    replacementProductList: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    eventList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ChangeIndicationEnum(MatterIntEnum):
+            kOk = 0x00
+            kWarning = 0x01
+            kCritical = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
+        class DegradationDirectionEnum(MatterIntEnum):
+            kUp = 0x00
+            kDown = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class ProductIdentifierTypeEnum(MatterIntEnum):
+            kUpc = 0x00
+            kGtin8 = 0x01
+            kEan = 0x02
+            kGtin14 = 0x03
+            kOem = 0x04
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 5,
+
+    class Bitmaps:
+        class Feature(IntFlag):
+            kCondition = 0x1
+            kWarning = 0x2
+            kReplacementProductList = 0x4
+
+    class Structs:
         @dataclass
-        class SmokeAlarm(ClusterEvent):
+        class ReplacementProductStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0000005C
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="productIdentifierType", Tag=0, Type=ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum),
+                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
+                    ])
 
-            @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000000
+            productIdentifierType: 'ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
+            productIdentifierValue: 'str' = ""
+
+    class Commands:
+        @dataclass
+        class ResetCondition(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000072
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
                     ])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+    class Attributes:
+        @dataclass
+        class Condition(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000072
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class COAlarm(ClusterEvent):
+        class DegradationDirection(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            def attribute_id(cls) -> int:
                 return 0x00000001
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
 
         @dataclass
-        class LowBattery(ClusterEvent):
+        class ChangeIndication(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            def attribute_id(cls) -> int:
                 return 0x00000002
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum)
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = 0
 
         @dataclass
-        class HardwareFault(ClusterEvent):
+        class InPlaceIndicator(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            def attribute_id(cls) -> int:
                 return 0x00000003
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+
+            value: 'typing.Optional[bool]' = None
 
         @dataclass
-        class EndOfService(ClusterEvent):
+        class LastChangedTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            def attribute_id(cls) -> int:
                 return 0x00000004
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class SelfTestComplete(ClusterEvent):
+        class ReplacementProductList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            def attribute_id(cls) -> int:
                 return 0x00000005
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]])
+
+            value: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
 
         @dataclass
-        class AlarmMuted(ClusterEvent):
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000006
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class MuteEnded(ClusterEvent):
+        class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000007
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InterconnectSmokeAlarm(ClusterEvent):
+        class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000008
+            def attribute_id(cls) -> int:
+                return 0x0000FFFA
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InterconnectCOAlarm(ClusterEvent):
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000009
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AllClear(ClusterEvent):
+        class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000072
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x0000000A
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000072
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
 
 
 @dataclass
-class DishwasherAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x0000005D
+class BooleanSensorConfiguration(Cluster):
+    id: typing.ClassVar[int] = 0x00000080
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="mask", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="latch", Tag=0x00000001, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="state", Tag=0x00000002, Type=uint),
-                ClusterObjectFieldDescriptor(Label="supported", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="sensitivityLevel", Tag=0x00000000, Type=typing.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum]),
+                ClusterObjectFieldDescriptor(Label="alarmsActive", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="alarmsSuppressed", Tag=0x00000002, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="alarmsEnabled", Tag=0x00000003, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -18174,10 +21500,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    mask: 'uint' = None
-    latch: 'typing.Optional[uint]' = None
-    state: 'uint' = None
-    supported: 'uint' = None
+    sensitivityLevel: 'typing.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum]' = None
+    alarmsActive: 'typing.Optional[uint]' = None
+    alarmsSuppressed: 'typing.Optional[uint]' = None
+    alarmsEnabled: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -18185,22 +21511,32 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class SensitivityEnum(MatterIntEnum):
+            kHigh = 0x00
+            kStandard = 0x01
+            kLow = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
     class Bitmaps:
-        class AlarmMap(IntFlag):
-            kInflowError = 0x1
-            kDrainError = 0x2
-            kDoorError = 0x4
-            kTempTooLow = 0x8
-            kTempTooHigh = 0x10
-            kWaterLevelError = 0x20
+        class AlarmModeBitmap(IntFlag):
+            kVisual = 0x1
+            kAudible = 0x2
 
         class Feature(IntFlag):
-            kReset = 0x1
+            kVisual = 0x1
+            kAudible = 0x2
+            kAlarmSuppress = 0x4
+            kSensitivityLevel = 0x8
 
     class Commands:
         @dataclass
-        class Reset(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0000005D
+        class SuppressRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000080
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
@@ -18209,33 +21545,17 @@ class Reset(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarms", Tag=0, Type=uint),
-                    ])
-
-            alarms: 'uint' = 0
-
-        @dataclass
-        class ModifyEnabledAlarms(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0000005D
-            command_id: typing.ClassVar[int] = 0x00000001
-            is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = None
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="mask", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="alarmsToSuppress", Tag=0, Type=uint),
                     ])
 
-            mask: 'uint' = 0
+            alarmsToSuppress: 'uint' = 0
 
     class Attributes:
         @dataclass
-        class Mask(ClusterAttributeDescriptor):
+        class SensitivityLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18243,15 +21563,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum]' = None
 
         @dataclass
-        class Latch(ClusterAttributeDescriptor):
+        class AlarmsActive(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18264,10 +21584,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class State(ClusterAttributeDescriptor):
+        class AlarmsSuppressed(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18275,15 +21595,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Supported(ClusterAttributeDescriptor):
+        class AlarmsEnabled(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18291,15 +21611,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18315,7 +21635,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18331,7 +21651,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18347,7 +21667,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18363,7 +21683,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18379,7 +21699,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18393,10 +21713,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class Notify(ClusterEvent):
+        class AlarmsStateChanged(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000080
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -18406,32 +21726,48 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="active", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="inactive", Tag=1, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="state", Tag=2, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="mask", Tag=3, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="alarmsActive", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="alarmsSuppressed", Tag=1, Type=typing.Optional[uint]),
                     ])
 
-            active: 'uint' = 0
-            inactive: 'uint' = 0
-            state: 'uint' = 0
-            mask: 'uint' = 0
+            alarmsActive: 'uint' = 0
+            alarmsSuppressed: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class SensorFault(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000080
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
 
 
 @dataclass
-class OperationalState(Cluster):
-    id: typing.ClassVar[int] = 0x00000060
+class ValveConfigurationAndControl(Cluster):
+    id: typing.ClassVar[int] = 0x00000081
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="phaseList", Tag=0x00000000, Type=typing.Union[Nullable, typing.List[str]]),
-                ClusterObjectFieldDescriptor(Label="currentPhase", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="countdownTime", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="operationalStateList", Tag=0x00000003, Type=typing.List[OperationalState.Structs.OperationalStateStruct]),
-                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=OperationalState.Enums.OperationalStateEnum),
-                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=OperationalState.Structs.ErrorStateStruct),
+                ClusterObjectFieldDescriptor(Label="openDuration", Tag=0x00000000, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="autoCloseTime", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="remainingDuration", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="currentState", Tag=0x00000003, Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]),
+                ClusterObjectFieldDescriptor(Label="targetState", Tag=0x00000004, Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]),
+                ClusterObjectFieldDescriptor(Label="startUpState", Tag=0x00000005, Type=typing.Optional[ValveConfigurationAndControl.Enums.ValveStateEnum]),
+                ClusterObjectFieldDescriptor(Label="currentLevel", Tag=0x00000006, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="targetLevel", Tag=0x00000007, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="openLevel", Tag=0x00000008, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="valveFault", Tag=0x00000009, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -18440,12 +21776,16 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    phaseList: 'typing.Union[Nullable, typing.List[str]]' = None
-    currentPhase: 'typing.Union[Nullable, uint]' = None
-    countdownTime: 'typing.Union[None, Nullable, uint]' = None
-    operationalStateList: 'typing.List[OperationalState.Structs.OperationalStateStruct]' = None
-    operationalState: 'OperationalState.Enums.OperationalStateEnum' = None
-    operationalError: 'OperationalState.Structs.ErrorStateStruct' = None
+    openDuration: 'typing.Union[Nullable, uint]' = None
+    autoCloseTime: 'typing.Union[None, Nullable, uint]' = None
+    remainingDuration: 'typing.Union[None, Nullable, uint]' = None
+    currentState: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = None
+    targetState: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = None
+    startUpState: 'typing.Optional[ValveConfigurationAndControl.Enums.ValveStateEnum]' = None
+    currentLevel: 'typing.Union[None, Nullable, uint]' = None
+    targetLevel: 'typing.Union[None, Nullable, uint]' = None
+    openLevel: 'typing.Union[None, Nullable, uint]' = None
+    valveFault: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -18454,103 +21794,48 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ErrorStateEnum(MatterIntEnum):
-            kNoError = 0x00
-            kUnableToStartOrResume = 0x01
-            kUnableToCompleteOperation = 0x02
-            kCommandInvalidInState = 0x03
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 4,
-
-        class OperationalStateEnum(MatterIntEnum):
-            kStopped = 0x00
-            kRunning = 0x01
-            kPaused = 0x02
-            kError = 0x03
+        class ValveStateEnum(MatterIntEnum):
+            kOpen = 0x00
+            kClosed = 0x01
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 4,
-
-    class Structs:
-        @dataclass
-        class ErrorStateStruct(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorStateID", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="errorStateLabel", Tag=1, Type=typing.Optional[str]),
-                        ClusterObjectFieldDescriptor(Label="errorStateDetails", Tag=2, Type=typing.Optional[str]),
-                    ])
-
-            errorStateID: 'uint' = 0
-            errorStateLabel: 'typing.Optional[str]' = None
-            errorStateDetails: 'typing.Optional[str]' = None
-
-        @dataclass
-        class OperationalStateStruct(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="operationalStateID", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="operationalStateLabel", Tag=1, Type=typing.Optional[str]),
-                    ])
-
-            operationalStateID: 'uint' = 0
-            operationalStateLabel: 'typing.Optional[str]' = None
-
-    class Commands:
-        @dataclass
-        class Pause(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
-            command_id: typing.ClassVar[int] = 0x00000000
-            is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
-
-        @dataclass
-        class Stop(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
-            command_id: typing.ClassVar[int] = 0x00000001
-            is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            kUnknownEnumValue = 2,
 
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+    class Bitmaps:
+        class Feature(IntFlag):
+            kTimeSync = 0x1
+            kLevel = 0x2
 
+        class ValveFaultBitmap(IntFlag):
+            kGeneralFault = 0x1
+            kBlocked = 0x2
+            kLeaking = 0x4
+
+    class Commands:
         @dataclass
-        class Start(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
-            command_id: typing.ClassVar[int] = 0x00000002
+        class Open(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000081
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="openDuration", Tag=0, Type=typing.Optional[uint]),
                     ])
 
+            openDuration: 'typing.Optional[uint]' = None
+
         @dataclass
-        class Resume(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
-            command_id: typing.ClassVar[int] = 0x00000003
+        class Close(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000081
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
@@ -18559,27 +21844,29 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
         @dataclass
-        class OperationalCommandResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
-            command_id: typing.ClassVar[int] = 0x00000004
-            is_client: typing.ClassVar[bool] = False
+        class SetLevel(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000081
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
+                        ClusterObjectFieldDescriptor(Label="level", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="openDuration", Tag=1, Type=typing.Optional[uint]),
                     ])
 
-            commandResponseState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            level: 'uint' = 0
+            openDuration: 'typing.Optional[uint]' = None
 
     class Attributes:
         @dataclass
-        class PhaseList(ClusterAttributeDescriptor):
+        class OpenDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18587,15 +21874,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class CurrentPhase(ClusterAttributeDescriptor):
+        class AutoCloseTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18603,15 +21890,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class CountdownTime(ClusterAttributeDescriptor):
+        class RemainingDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18624,10 +21911,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class OperationalStateList(ClusterAttributeDescriptor):
+        class CurrentState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18635,15 +21922,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[OperationalState.Structs.OperationalStateStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum])
 
-            value: 'typing.List[OperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+            value: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = NullValue
 
         @dataclass
-        class OperationalState(ClusterAttributeDescriptor):
+        class TargetState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18651,15 +21938,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=OperationalState.Enums.OperationalStateEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum])
 
-            value: 'OperationalState.Enums.OperationalStateEnum' = 0
+            value: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = NullValue
 
         @dataclass
-        class OperationalError(ClusterAttributeDescriptor):
+        class StartUpState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18667,15 +21954,79 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=OperationalState.Structs.ErrorStateStruct)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[ValveConfigurationAndControl.Enums.ValveStateEnum])
 
-            value: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            value: 'typing.Optional[ValveConfigurationAndControl.Enums.ValveStateEnum]' = None
+
+        @dataclass
+        class CurrentLevel(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class TargetLevel(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class OpenLevel(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
+
+        @dataclass
+        class ValveFault(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000009
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18691,7 +22042,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18707,7 +22058,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18723,7 +22074,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18739,7 +22090,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18755,7 +22106,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18769,10 +22120,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class OperationalError(ClusterEvent):
+        class ValveStateChanged(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -18782,16 +22133,16 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
+                        ClusterObjectFieldDescriptor(Label="valveState", Tag=0, Type=ValveConfigurationAndControl.Enums.ValveStateEnum),
                     ])
 
-            errorState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            valveState: 'ValveConfigurationAndControl.Enums.ValveStateEnum' = 0
 
         @dataclass
-        class OperationCompletion(ClusterEvent):
+        class ValveFault(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000081
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -18801,30 +22152,28 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="completionErrorCode", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="totalOperationalTime", Tag=1, Type=typing.Union[None, Nullable, uint]),
-                        ClusterObjectFieldDescriptor(Label="pausedTime", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="valveFault", Tag=0, Type=uint),
                     ])
 
-            completionErrorCode: 'uint' = 0
-            totalOperationalTime: 'typing.Union[None, Nullable, uint]' = None
-            pausedTime: 'typing.Union[None, Nullable, uint]' = None
+            valveFault: 'uint' = 0
 
 
 @dataclass
-class RvcOperationalState(Cluster):
-    id: typing.ClassVar[int] = 0x00000061
+class DemandResponseLoadControl(Cluster):
+    id: typing.ClassVar[int] = 0x00000096
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="phaseList", Tag=0x00000000, Type=typing.Union[Nullable, typing.List[str]]),
-                ClusterObjectFieldDescriptor(Label="currentPhase", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="countdownTime", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="operationalStateList", Tag=0x00000003, Type=typing.List[RvcOperationalState.Structs.OperationalStateStruct]),
-                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=uint),
-                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=RvcOperationalState.Structs.ErrorStateStruct),
+                ClusterObjectFieldDescriptor(Label="loadControlPrograms", Tag=0x00000000, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]),
+                ClusterObjectFieldDescriptor(Label="numberOfLoadControlPrograms", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="events", Tag=0x00000002, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]),
+                ClusterObjectFieldDescriptor(Label="activeEvents", Tag=0x00000003, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]),
+                ClusterObjectFieldDescriptor(Label="numberOfEventsPerProgram", Tag=0x00000004, Type=uint),
+                ClusterObjectFieldDescriptor(Label="numberOfTransitions", Tag=0x00000005, Type=uint),
+                ClusterObjectFieldDescriptor(Label="defaultRandomStart", Tag=0x00000006, Type=uint),
+                ClusterObjectFieldDescriptor(Label="defaultRandomDuration", Tag=0x00000007, Type=uint),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -18833,12 +22182,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    phaseList: 'typing.Union[Nullable, typing.List[str]]' = None
-    currentPhase: 'typing.Union[Nullable, uint]' = None
-    countdownTime: 'typing.Union[None, Nullable, uint]' = None
-    operationalStateList: 'typing.List[RvcOperationalState.Structs.OperationalStateStruct]' = None
-    operationalState: 'uint' = None
-    operationalError: 'RvcOperationalState.Structs.ErrorStateStruct' = None
+    loadControlPrograms: 'typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]' = None
+    numberOfLoadControlPrograms: 'uint' = None
+    events: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = None
+    activeEvents: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = None
+    numberOfEventsPerProgram: 'uint' = None
+    numberOfTransitions: 'uint' = None
+    defaultRandomStart: 'uint' = None
+    defaultRandomDuration: 'uint' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -18847,135 +22198,316 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ErrorStateEnum(MatterIntEnum):
-            kFailedToFindChargingDock = 0x40
-            kStuck = 0x41
-            kDustBinMissing = 0x42
-            kDustBinFull = 0x43
-            kWaterTankEmpty = 0x44
-            kWaterTankMissing = 0x45
-            kWaterTankLidOpen = 0x46
-            kMopCleaningPadMissing = 0x47
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
+        class CriticalityLevelEnum(MatterIntEnum):
+            kUnknown = 0x00
+            kGreen = 0x01
+            kLevel1 = 0x02
+            kLevel2 = 0x03
+            kLevel3 = 0x04
+            kLevel4 = 0x05
+            kLevel5 = 0x06
+            kEmergency = 0x07
+            kPlannedOutage = 0x08
+            kServiceDisconnect = 0x09
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 10,
 
-        class OperationalStateEnum(MatterIntEnum):
-            kSeekingCharger = 0x40
-            kCharging = 0x41
-            kDocked = 0x42
-            # kUnknownEnumValue intentionally not defined. This enum never goes
-            # through DataModel::Decode, likely because it is a part of a derived
-            # cluster. As a result having kUnknownEnumValue in this enum is error
-            # prone, and was removed. See
-            # src/app/common/templates/config-data.yaml.
+        class HeatingSourceEnum(MatterIntEnum):
+            kAny = 0x00
+            kElectric = 0x01
+            kNonElectric = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
+        class LoadControlEventChangeSourceEnum(MatterIntEnum):
+            kAutomatic = 0x00
+            kUserAction = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class LoadControlEventStatusEnum(MatterIntEnum):
+            kUnknown = 0x00
+            kReceived = 0x01
+            kInProgress = 0x02
+            kCompleted = 0x03
+            kOptedOut = 0x04
+            kOptedIn = 0x05
+            kCanceled = 0x06
+            kSuperseded = 0x07
+            kPartialOptedOut = 0x08
+            kPartialOptedIn = 0x09
+            kNoParticipation = 0x0A
+            kUnavailable = 0x0B
+            kFailed = 0x0C
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 13,
+
+    class Bitmaps:
+        class CancelControlBitmap(IntFlag):
+            kRandomEnd = 0x1
+
+        class DeviceClassBitmap(IntFlag):
+            kHvac = 0x1
+            kStripHeater = 0x2
+            kWaterHeater = 0x4
+            kPoolPump = 0x8
+            kSmartAppliance = 0x10
+            kIrrigationPump = 0x20
+            kCommercialLoad = 0x40
+            kResidentialLoad = 0x80
+            kExteriorLighting = 0x100
+            kInteriorLighting = 0x200
+            kEv = 0x400
+            kGenerationSystem = 0x800
+            kSmartInverter = 0x1000
+            kEvse = 0x2000
+            kResu = 0x4000
+            kEms = 0x8000
+            kSem = 0x10000
+
+        class EventControlBitmap(IntFlag):
+            kRandomStart = 0x1
+
+        class EventTransitionControlBitmap(IntFlag):
+            kRandomDuration = 0x1
+            kIgnoreOptOut = 0x2
+
+        class Feature(IntFlag):
+            kEnrollmentGroups = 0x1
+            kTemperatureOffset = 0x2
+            kTemperatureSetpoint = 0x4
+            kLoadAdjustment = 0x8
+            kDutyCycle = 0x10
+            kPowerSavings = 0x20
+            kHeatingSource = 0x40
 
     class Structs:
         @dataclass
-        class ErrorStateStruct(ClusterObject):
+        class HeatingSourceControlStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorStateID", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="errorStateLabel", Tag=1, Type=typing.Optional[str]),
-                        ClusterObjectFieldDescriptor(Label="errorStateDetails", Tag=2, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="heatingSource", Tag=0, Type=DemandResponseLoadControl.Enums.HeatingSourceEnum),
                     ])
 
-            errorStateID: 'uint' = 0
-            errorStateLabel: 'typing.Optional[str]' = None
-            errorStateDetails: 'typing.Optional[str]' = None
+            heatingSource: 'DemandResponseLoadControl.Enums.HeatingSourceEnum' = 0
 
         @dataclass
-        class OperationalStateStruct(ClusterObject):
+        class PowerSavingsControlStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="operationalStateID", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="operationalStateLabel", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="powerSavings", Tag=0, Type=uint),
                     ])
 
-            operationalStateID: 'uint' = 0
-            operationalStateLabel: 'typing.Optional[str]' = None
+            powerSavings: 'uint' = 0
+
+        @dataclass
+        class DutyCycleControlStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="dutyCycle", Tag=0, Type=uint),
+                    ])
+
+            dutyCycle: 'uint' = 0
+
+        @dataclass
+        class AverageLoadControlStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadAdjustment", Tag=0, Type=int),
+                    ])
+
+            loadAdjustment: 'int' = 0
+
+        @dataclass
+        class TemperatureControlStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="coolingTempOffset", Tag=0, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="heatingtTempOffset", Tag=1, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="coolingTempSetpoint", Tag=2, Type=typing.Union[None, Nullable, int]),
+                        ClusterObjectFieldDescriptor(Label="heatingTempSetpoint", Tag=3, Type=typing.Union[None, Nullable, int]),
+                    ])
+
+            coolingTempOffset: 'typing.Union[None, Nullable, uint]' = None
+            heatingtTempOffset: 'typing.Union[None, Nullable, uint]' = None
+            coolingTempSetpoint: 'typing.Union[None, Nullable, int]' = None
+            heatingTempSetpoint: 'typing.Union[None, Nullable, int]' = None
+
+        @dataclass
+        class LoadControlEventTransitionStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="duration", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="control", Tag=1, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="temperatureControl", Tag=2, Type=typing.Optional[DemandResponseLoadControl.Structs.TemperatureControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="averageLoadControl", Tag=3, Type=typing.Optional[DemandResponseLoadControl.Structs.AverageLoadControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="dutyCycleControl", Tag=4, Type=typing.Optional[DemandResponseLoadControl.Structs.DutyCycleControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="powerSavingsControl", Tag=5, Type=typing.Optional[DemandResponseLoadControl.Structs.PowerSavingsControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="heatingSourceControl", Tag=6, Type=typing.Optional[DemandResponseLoadControl.Structs.HeatingSourceControlStruct]),
+                    ])
+
+            duration: 'uint' = 0
+            control: 'uint' = 0
+            temperatureControl: 'typing.Optional[DemandResponseLoadControl.Structs.TemperatureControlStruct]' = None
+            averageLoadControl: 'typing.Optional[DemandResponseLoadControl.Structs.AverageLoadControlStruct]' = None
+            dutyCycleControl: 'typing.Optional[DemandResponseLoadControl.Structs.DutyCycleControlStruct]' = None
+            powerSavingsControl: 'typing.Optional[DemandResponseLoadControl.Structs.PowerSavingsControlStruct]' = None
+            heatingSourceControl: 'typing.Optional[DemandResponseLoadControl.Structs.HeatingSourceControlStruct]' = None
+
+        @dataclass
+        class LoadControlEventStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="eventID", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="programID", Tag=1, Type=typing.Union[Nullable, bytes]),
+                        ClusterObjectFieldDescriptor(Label="control", Tag=2, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="deviceClass", Tag=3, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="enrollmentGroup", Tag=4, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="criticality", Tag=5, Type=DemandResponseLoadControl.Enums.CriticalityLevelEnum),
+                        ClusterObjectFieldDescriptor(Label="startTime", Tag=6, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="transitions", Tag=7, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventTransitionStruct]),
+                    ])
+
+            eventID: 'bytes' = b""
+            programID: 'typing.Union[Nullable, bytes]' = NullValue
+            control: 'uint' = 0
+            deviceClass: 'uint' = 0
+            enrollmentGroup: 'typing.Optional[uint]' = None
+            criticality: 'DemandResponseLoadControl.Enums.CriticalityLevelEnum' = 0
+            startTime: 'typing.Union[Nullable, uint]' = NullValue
+            transitions: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventTransitionStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class LoadControlProgramStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="programID", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
+                        ClusterObjectFieldDescriptor(Label="enrollmentGroup", Tag=2, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="randomStartMinutes", Tag=3, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="randomDurationMinutes", Tag=4, Type=typing.Union[Nullable, uint]),
+                    ])
+
+            programID: 'bytes' = b""
+            name: 'str' = ""
+            enrollmentGroup: 'typing.Union[Nullable, uint]' = NullValue
+            randomStartMinutes: 'typing.Union[Nullable, uint]' = NullValue
+            randomDurationMinutes: 'typing.Union[Nullable, uint]' = NullValue
 
     class Commands:
         @dataclass
-        class Pause(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        class RegisterLoadControlProgramRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadControlProgram", Tag=0, Type=DemandResponseLoadControl.Structs.LoadControlProgramStruct),
                     ])
 
+            loadControlProgram: 'DemandResponseLoadControl.Structs.LoadControlProgramStruct' = field(default_factory=lambda: DemandResponseLoadControl.Structs.LoadControlProgramStruct())
+
         @dataclass
-        class Stop(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        class UnregisterLoadControlProgramRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadControlProgramID", Tag=0, Type=bytes),
                     ])
 
+            loadControlProgramID: 'bytes' = b""
+
         @dataclass
-        class Start(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        class AddLoadControlEventRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
             command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="event", Tag=0, Type=DemandResponseLoadControl.Structs.LoadControlEventStruct),
                     ])
 
+            event: 'DemandResponseLoadControl.Structs.LoadControlEventStruct' = field(default_factory=lambda: DemandResponseLoadControl.Structs.LoadControlEventStruct())
+
         @dataclass
-        class Resume(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        class RemoveLoadControlEventRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
             command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="eventID", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="cancelControl", Tag=1, Type=uint),
                     ])
 
+            eventID: 'bytes' = b""
+            cancelControl: 'uint' = 0
+
         @dataclass
-        class OperationalCommandResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        class ClearLoadControlEventsRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
             command_id: typing.ClassVar[int] = 0x00000004
-            is_client: typing.ClassVar[bool] = False
+            is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
                     ])
 
-            commandResponseState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
-
     class Attributes:
         @dataclass
-        class PhaseList(ClusterAttributeDescriptor):
+        class LoadControlPrograms(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18983,15 +22515,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct])
 
-            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class CurrentPhase(ClusterAttributeDescriptor):
+        class NumberOfLoadControlPrograms(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18999,15 +22531,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'uint' = 0
 
         @dataclass
-        class CountdownTime(ClusterAttributeDescriptor):
+        class Events(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19015,15 +22547,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class OperationalStateList(ClusterAttributeDescriptor):
+        class ActiveEvents(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19031,15 +22563,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RvcOperationalState.Structs.OperationalStateStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct])
 
-            value: 'typing.List[RvcOperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class OperationalState(ClusterAttributeDescriptor):
+        class NumberOfEventsPerProgram(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19052,10 +22584,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class OperationalError(ClusterAttributeDescriptor):
+        class NumberOfTransitions(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19063,15 +22595,47 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=RvcOperationalState.Structs.ErrorStateStruct)
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+            value: 'uint' = 0
+
+        @dataclass
+        class DefaultRandomStart(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000096
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class DefaultRandomDuration(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000096
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19087,7 +22651,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19103,7 +22667,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19119,7 +22683,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19135,7 +22699,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19151,7 +22715,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19165,10 +22729,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class OperationalError(ClusterEvent):
+        class LoadControlEventStatusChange(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000096
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -19178,49 +22742,63 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
-                    ])
-
-            errorState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
-
-        @dataclass
-        class OperationCompletion(ClusterEvent):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000061
-
-            @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000001
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="completionErrorCode", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="totalOperationalTime", Tag=1, Type=typing.Union[None, Nullable, uint]),
-                        ClusterObjectFieldDescriptor(Label="pausedTime", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="eventID", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="transitionIndex", Tag=1, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=2, Type=DemandResponseLoadControl.Enums.LoadControlEventStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="criticality", Tag=3, Type=DemandResponseLoadControl.Enums.CriticalityLevelEnum),
+                        ClusterObjectFieldDescriptor(Label="control", Tag=4, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="temperatureControl", Tag=5, Type=typing.Union[None, Nullable, DemandResponseLoadControl.Structs.TemperatureControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="averageLoadControl", Tag=6, Type=typing.Union[None, Nullable, DemandResponseLoadControl.Structs.AverageLoadControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="dutyCycleControl", Tag=7, Type=typing.Union[None, Nullable, DemandResponseLoadControl.Structs.DutyCycleControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="powerSavingsControl", Tag=8, Type=typing.Union[None, Nullable, DemandResponseLoadControl.Structs.PowerSavingsControlStruct]),
+                        ClusterObjectFieldDescriptor(Label="heatingSourceControl", Tag=9, Type=typing.Union[None, Nullable, DemandResponseLoadControl.Structs.HeatingSourceControlStruct]),
                     ])
 
-            completionErrorCode: 'uint' = 0
-            totalOperationalTime: 'typing.Union[None, Nullable, uint]' = None
-            pausedTime: 'typing.Union[None, Nullable, uint]' = None
+            eventID: 'bytes' = b""
+            transitionIndex: 'typing.Union[Nullable, uint]' = NullValue
+            status: 'DemandResponseLoadControl.Enums.LoadControlEventStatusEnum' = 0
+            criticality: 'DemandResponseLoadControl.Enums.CriticalityLevelEnum' = 0
+            control: 'uint' = 0
+            temperatureControl: 'typing.Union[None, Nullable, DemandResponseLoadControl.Structs.TemperatureControlStruct]' = None
+            averageLoadControl: 'typing.Union[None, Nullable, DemandResponseLoadControl.Structs.AverageLoadControlStruct]' = None
+            dutyCycleControl: 'typing.Union[None, Nullable, DemandResponseLoadControl.Structs.DutyCycleControlStruct]' = None
+            powerSavingsControl: 'typing.Union[None, Nullable, DemandResponseLoadControl.Structs.PowerSavingsControlStruct]' = None
+            heatingSourceControl: 'typing.Union[None, Nullable, DemandResponseLoadControl.Structs.HeatingSourceControlStruct]' = None
 
 
 @dataclass
-class HepaFilterMonitoring(Cluster):
-    id: typing.ClassVar[int] = 0x00000071
+class EnergyEvse(Cluster):
+    id: typing.ClassVar[int] = 0x00000099
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="condition", Tag=0x00000000, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="degradationDirection", Tag=0x00000001, Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]),
-                ClusterObjectFieldDescriptor(Label="changeIndication", Tag=0x00000002, Type=HepaFilterMonitoring.Enums.ChangeIndicationEnum),
-                ClusterObjectFieldDescriptor(Label="inPlaceIndicator", Tag=0x00000003, Type=typing.Optional[bool]),
-                ClusterObjectFieldDescriptor(Label="lastChangedTime", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="replacementProductList", Tag=0x00000005, Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]),
+                ClusterObjectFieldDescriptor(Label="state", Tag=0x00000000, Type=typing.Union[Nullable, EnergyEvse.Enums.StateEnum]),
+                ClusterObjectFieldDescriptor(Label="supplyState", Tag=0x00000001, Type=EnergyEvse.Enums.SupplyStateEnum),
+                ClusterObjectFieldDescriptor(Label="faultState", Tag=0x00000002, Type=EnergyEvse.Enums.FaultStateEnum),
+                ClusterObjectFieldDescriptor(Label="chargingEnabledUntil", Tag=0x00000003, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="dischargingEnabledUntil", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="circuitCapacity", Tag=0x00000005, Type=int),
+                ClusterObjectFieldDescriptor(Label="minimumChargeCurrent", Tag=0x00000006, Type=int),
+                ClusterObjectFieldDescriptor(Label="maximumChargeCurrent", Tag=0x00000007, Type=int),
+                ClusterObjectFieldDescriptor(Label="maximumDischargeCurrent", Tag=0x00000008, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="userMaximumChargeCurrent", Tag=0x00000009, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="randomizationDelayWindow", Tag=0x0000000A, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="numberOfWeeklyTargets", Tag=0x00000021, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="numberOfDailyTargets", Tag=0x00000022, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="nextChargeStartTime", Tag=0x00000023, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nextChargeTargetTime", Tag=0x00000024, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nextChargeRequiredEnergy", Tag=0x00000025, Type=typing.Union[None, Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nextChargeTargetSoC", Tag=0x00000026, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="approximateEVEfficiency", Tag=0x00000027, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="stateOfCharge", Tag=0x00000030, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="batteryCapacity", Tag=0x00000031, Type=typing.Union[None, Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="vehicleID", Tag=0x00000032, Type=typing.Union[None, Nullable, str]),
+                ClusterObjectFieldDescriptor(Label="sessionID", Tag=0x00000040, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="sessionDuration", Tag=0x00000041, Type=uint),
+                ClusterObjectFieldDescriptor(Label="sessionEnergyCharged", Tag=0x00000042, Type=int),
+                ClusterObjectFieldDescriptor(Label="sessionEnergyDischarged", Tag=0x00000043, Type=typing.Optional[int]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -19229,12 +22807,31 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    condition: 'typing.Optional[uint]' = None
-    degradationDirection: 'typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]' = None
-    changeIndication: 'HepaFilterMonitoring.Enums.ChangeIndicationEnum' = None
-    inPlaceIndicator: 'typing.Optional[bool]' = None
-    lastChangedTime: 'typing.Union[None, Nullable, uint]' = None
-    replacementProductList: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+    state: 'typing.Union[Nullable, EnergyEvse.Enums.StateEnum]' = None
+    supplyState: 'EnergyEvse.Enums.SupplyStateEnum' = None
+    faultState: 'EnergyEvse.Enums.FaultStateEnum' = None
+    chargingEnabledUntil: 'typing.Union[Nullable, uint]' = None
+    dischargingEnabledUntil: 'typing.Union[None, Nullable, uint]' = None
+    circuitCapacity: 'int' = None
+    minimumChargeCurrent: 'int' = None
+    maximumChargeCurrent: 'int' = None
+    maximumDischargeCurrent: 'typing.Optional[int]' = None
+    userMaximumChargeCurrent: 'typing.Optional[int]' = None
+    randomizationDelayWindow: 'typing.Optional[uint]' = None
+    numberOfWeeklyTargets: 'typing.Optional[uint]' = None
+    numberOfDailyTargets: 'typing.Optional[uint]' = None
+    nextChargeStartTime: 'typing.Union[None, Nullable, uint]' = None
+    nextChargeTargetTime: 'typing.Union[None, Nullable, uint]' = None
+    nextChargeRequiredEnergy: 'typing.Union[None, Nullable, int]' = None
+    nextChargeTargetSoC: 'typing.Union[None, Nullable, uint]' = None
+    approximateEVEfficiency: 'typing.Union[None, Nullable, uint]' = None
+    stateOfCharge: 'typing.Union[None, Nullable, uint]' = None
+    batteryCapacity: 'typing.Union[None, Nullable, int]' = None
+    vehicleID: 'typing.Union[None, Nullable, str]' = None
+    sessionID: 'typing.Union[Nullable, uint]' = None
+    sessionDuration: 'uint' = None
+    sessionEnergyCharged: 'int' = None
+    sessionEnergyDischarged: 'typing.Optional[int]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -19243,31 +22840,60 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ChangeIndicationEnum(MatterIntEnum):
-            kOk = 0x00
-            kWarning = 0x01
-            kCritical = 0x02
+        class EnergyTransferStoppedReasonEnum(MatterIntEnum):
+            kEVStopped = 0x00
+            kEVSEStopped = 0x01
+            kOther = 0x02
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 3,
 
-        class DegradationDirectionEnum(MatterIntEnum):
-            kUp = 0x00
-            kDown = 0x01
+        class FaultStateEnum(MatterIntEnum):
+            kNoError = 0x00
+            kMeterFailure = 0x01
+            kOverVoltage = 0x02
+            kUnderVoltage = 0x03
+            kOverCurrent = 0x04
+            kContactWetFailure = 0x05
+            kContactDryFailure = 0x06
+            kGroundFault = 0x07
+            kPowerLoss = 0x08
+            kPowerQuality = 0x09
+            kPilotShortCircuit = 0x0A
+            kEmergencyStop = 0x0B
+            kEVDisconnected = 0x0C
+            kWrongPowerSupply = 0x0D
+            kLiveNeutralSwap = 0x0E
+            kOverTemperature = 0x0F
+            kOther = 0xFF
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 2,
+            kUnknownEnumValue = 16,
+
+        class StateEnum(MatterIntEnum):
+            kNotPluggedIn = 0x00
+            kPluggedInNoDemand = 0x01
+            kPluggedInDemand = 0x02
+            kPluggedInCharging = 0x03
+            kPluggedInDischarging = 0x04
+            kSessionEnding = 0x05
+            kFault = 0x06
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 7,
 
-        class ProductIdentifierTypeEnum(MatterIntEnum):
-            kUpc = 0x00
-            kGtin8 = 0x01
-            kEan = 0x02
-            kGtin14 = 0x03
-            kOem = 0x04
+        class SupplyStateEnum(MatterIntEnum):
+            kDisabled = 0x00
+            kChargingEnabled = 0x01
+            kDischargingEnabled = 0x02
+            kDisabledError = 0x03
+            kDisabledDiagnostics = 0x04
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
@@ -19276,29 +22902,182 @@ class ProductIdentifierTypeEnum(MatterIntEnum):
 
     class Bitmaps:
         class Feature(IntFlag):
-            kCondition = 0x1
-            kWarning = 0x2
-            kReplacementProductList = 0x4
+            kChargingPreferences = 0x1
+            kSoCReporting = 0x2
+            kPlugAndCharge = 0x4
+            kRfid = 0x8
+            kV2x = 0x10
+
+        class TargetDayOfWeekBitmap(IntFlag):
+            kSunday = 0x1
+            kMonday = 0x2
+            kTuesday = 0x4
+            kWednesday = 0x8
+            kThursday = 0x10
+            kFriday = 0x20
+            kSaturday = 0x40
+
+    class Structs:
+        @dataclass
+        class ChargingTargetStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="targetTime", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="targetSoC", Tag=1, Type=typing.Optional[uint]),
+                        ClusterObjectFieldDescriptor(Label="addedEnergy", Tag=2, Type=typing.Optional[int]),
+                    ])
+
+            targetTime: 'uint' = 0
+            targetSoC: 'typing.Optional[uint]' = None
+            addedEnergy: 'typing.Optional[int]' = None
+
+    class Commands:
+        @dataclass
+        class GetTargetsResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000000
+            is_client: typing.ClassVar[bool] = False
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="dayOfWeekforSequence", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="chargingTargets", Tag=1, Type=typing.List[EnergyEvse.Structs.ChargingTargetStruct]),
+                    ])
+
+            dayOfWeekforSequence: 'uint' = 0
+            chargingTargets: 'typing.List[EnergyEvse.Structs.ChargingTargetStruct]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class Disable(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000001
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+        @dataclass
+        class EnableCharging(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000002
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="chargingEnabledUntil", Tag=0, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="minimumChargeCurrent", Tag=1, Type=int),
+                        ClusterObjectFieldDescriptor(Label="maximumChargeCurrent", Tag=2, Type=int),
+                    ])
+
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+            chargingEnabledUntil: 'typing.Union[Nullable, uint]' = NullValue
+            minimumChargeCurrent: 'int' = 0
+            maximumChargeCurrent: 'int' = 0
+
+        @dataclass
+        class EnableDischarging(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000003
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="dischargingEnabledUntil", Tag=0, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="maximumDischargeCurrent", Tag=1, Type=int),
+                    ])
+
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+            dischargingEnabledUntil: 'typing.Union[Nullable, uint]' = NullValue
+            maximumDischargeCurrent: 'int' = 0
+
+        @dataclass
+        class StartDiagnostics(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000004
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
+
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+        @dataclass
+        class SetTargets(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000005
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="dayOfWeekforSequence", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="chargingTargets", Tag=1, Type=typing.List[EnergyEvse.Structs.ChargingTargetStruct]),
+                    ])
+
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+            dayOfWeekforSequence: 'uint' = 0
+            chargingTargets: 'typing.List[EnergyEvse.Structs.ChargingTargetStruct]' = field(default_factory=lambda: [])
 
-    class Structs:
         @dataclass
-        class ReplacementProductStruct(ClusterObject):
+        class GetTargets(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000006
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = 'GetTargetsResponse'
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="productIdentifierType", Tag=0, Type=HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum),
-                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
+                        ClusterObjectFieldDescriptor(Label="daysToReturn", Tag=0, Type=uint),
                     ])
 
-            productIdentifierType: 'HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
-            productIdentifierValue: 'str' = ""
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
+            daysToReturn: 'uint' = 0
 
-    class Commands:
         @dataclass
-        class ResetCondition(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000071
-            command_id: typing.ClassVar[int] = 0x00000000
+        class ClearTargets(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000099
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -19308,12 +23087,16 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                     ])
 
+            @ChipUtility.classproperty
+            def must_use_timed_invoke(cls) -> bool:
+                return True
+
     class Attributes:
         @dataclass
-        class Condition(ClusterAttributeDescriptor):
+        class State(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19321,15 +23104,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, EnergyEvse.Enums.StateEnum])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, EnergyEvse.Enums.StateEnum]' = NullValue
 
         @dataclass
-        class DegradationDirection(ClusterAttributeDescriptor):
+        class SupplyState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19337,15 +23120,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum])
+                return ClusterObjectFieldDescriptor(Type=EnergyEvse.Enums.SupplyStateEnum)
 
-            value: 'typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+            value: 'EnergyEvse.Enums.SupplyStateEnum' = 0
 
         @dataclass
-        class ChangeIndication(ClusterAttributeDescriptor):
+        class FaultState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19353,15 +23136,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=HepaFilterMonitoring.Enums.ChangeIndicationEnum)
+                return ClusterObjectFieldDescriptor(Type=EnergyEvse.Enums.FaultStateEnum)
 
-            value: 'HepaFilterMonitoring.Enums.ChangeIndicationEnum' = 0
+            value: 'EnergyEvse.Enums.FaultStateEnum' = 0
 
         @dataclass
-        class InPlaceIndicator(ClusterAttributeDescriptor):
+        class ChargingEnabledUntil(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19369,15 +23152,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[bool]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class LastChangedTime(ClusterAttributeDescriptor):
+        class DischargingEnabledUntil(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19390,10 +23173,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class ReplacementProductList(ClusterAttributeDescriptor):
+        class CircuitCapacity(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19401,310 +23184,319 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+            value: 'int' = 0
 
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class MinimumChargeCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000006
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'int' = 0
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class MaximumChargeCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x00000007
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'int' = 0
 
         @dataclass
-        class EventList(ClusterAttributeDescriptor):
+        class MaximumDischargeCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFA
+                return 0x00000008
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class UserMaximumChargeCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000009
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class RandomizationDelayWindow(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x0000000A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class NumberOfWeeklyTargets(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000021
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
+        @dataclass
+        class NumberOfDailyTargets(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
 
-@dataclass
-class ActivatedCarbonFilterMonitoring(Cluster):
-    id: typing.ClassVar[int] = 0x00000072
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000022
 
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields=[
-                ClusterObjectFieldDescriptor(Label="condition", Tag=0x00000000, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="degradationDirection", Tag=0x00000001, Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]),
-                ClusterObjectFieldDescriptor(Label="changeIndication", Tag=0x00000002, Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum),
-                ClusterObjectFieldDescriptor(Label="inPlaceIndicator", Tag=0x00000003, Type=typing.Optional[bool]),
-                ClusterObjectFieldDescriptor(Label="lastChangedTime", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="replacementProductList", Tag=0x00000005, Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]),
-                ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-    condition: 'typing.Optional[uint]' = None
-    degradationDirection: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
-    changeIndication: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = None
-    inPlaceIndicator: 'typing.Optional[bool]' = None
-    lastChangedTime: 'typing.Union[None, Nullable, uint]' = None
-    replacementProductList: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    eventList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
+            value: 'typing.Optional[uint]' = None
 
-    class Enums:
-        class ChangeIndicationEnum(MatterIntEnum):
-            kOk = 0x00
-            kWarning = 0x01
-            kCritical = 0x02
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 3,
+        @dataclass
+        class NextChargeStartTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
 
-        class DegradationDirectionEnum(MatterIntEnum):
-            kUp = 0x00
-            kDown = 0x01
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 2,
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000023
 
-        class ProductIdentifierTypeEnum(MatterIntEnum):
-            kUpc = 0x00
-            kGtin8 = 0x01
-            kEan = 0x02
-            kGtin14 = 0x03
-            kOem = 0x04
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 5,
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-    class Bitmaps:
-        class Feature(IntFlag):
-            kCondition = 0x1
-            kWarning = 0x2
-            kReplacementProductList = 0x4
+            value: 'typing.Union[None, Nullable, uint]' = None
 
-    class Structs:
         @dataclass
-        class ReplacementProductStruct(ClusterObject):
+        class NextChargeTargetTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="productIdentifierType", Tag=0, Type=ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum),
-                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
-                    ])
+            def cluster_id(cls) -> int:
+                return 0x00000099
 
-            productIdentifierType: 'ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
-            productIdentifierValue: 'str' = ""
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000024
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
 
-    class Commands:
         @dataclass
-        class ResetCondition(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000072
-            command_id: typing.ClassVar[int] = 0x00000000
-            is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = None
+        class NextChargeRequiredEnergy(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000025
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, int])
+
+            value: 'typing.Union[None, Nullable, int]' = None
 
-    class Attributes:
         @dataclass
-        class Condition(ClusterAttributeDescriptor):
+        class NextChargeTargetSoC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000026
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class DegradationDirection(ClusterAttributeDescriptor):
+        class ApproximateEVEfficiency(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000027
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class ChangeIndication(ClusterAttributeDescriptor):
+        class StateOfCharge(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000030
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = 0
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class InPlaceIndicator(ClusterAttributeDescriptor):
+        class BatteryCapacity(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000031
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, int])
 
-            value: 'typing.Optional[bool]' = None
+            value: 'typing.Union[None, Nullable, int]' = None
 
         @dataclass
-        class LastChangedTime(ClusterAttributeDescriptor):
+        class VehicleID(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000032
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, str])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.Union[None, Nullable, str]' = None
 
         @dataclass
-        class ReplacementProductList(ClusterAttributeDescriptor):
+        class SessionID(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000040
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
+
+        @dataclass
+        class SessionDuration(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000041
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class SessionEnergyCharged(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000042
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=int)
+
+            value: 'int' = 0
+
+        @dataclass
+        class SessionEnergyDischarged(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000043
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+
+            value: 'typing.Optional[int]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19720,7 +23512,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19736,7 +23528,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19752,7 +23544,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19768,7 +23560,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19784,7 +23576,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000099
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19796,6 +23588,145 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+    class Events:
+        @dataclass
+        class EVConnected(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sessionID", Tag=0, Type=uint),
+                    ])
+
+            sessionID: 'uint' = 0
+
+        @dataclass
+        class EVNotDetected(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sessionID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=1, Type=EnergyEvse.Enums.StateEnum),
+                        ClusterObjectFieldDescriptor(Label="sessionDuration", Tag=2, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="sessionEnergyCharged", Tag=3, Type=int),
+                        ClusterObjectFieldDescriptor(Label="sessionEnergyDischarged", Tag=4, Type=typing.Optional[int]),
+                    ])
+
+            sessionID: 'uint' = 0
+            state: 'EnergyEvse.Enums.StateEnum' = 0
+            sessionDuration: 'uint' = 0
+            sessionEnergyCharged: 'int' = 0
+            sessionEnergyDischarged: 'typing.Optional[int]' = None
+
+        @dataclass
+        class EnergyTransferStarted(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sessionID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=1, Type=EnergyEvse.Enums.StateEnum),
+                        ClusterObjectFieldDescriptor(Label="maximumCurrent", Tag=2, Type=int),
+                    ])
+
+            sessionID: 'uint' = 0
+            state: 'EnergyEvse.Enums.StateEnum' = 0
+            maximumCurrent: 'int' = 0
+
+        @dataclass
+        class EnergyTransferStopped(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sessionID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=1, Type=EnergyEvse.Enums.StateEnum),
+                        ClusterObjectFieldDescriptor(Label="reason", Tag=2, Type=EnergyEvse.Enums.EnergyTransferStoppedReasonEnum),
+                        ClusterObjectFieldDescriptor(Label="energyTransferred", Tag=4, Type=int),
+                    ])
+
+            sessionID: 'uint' = 0
+            state: 'EnergyEvse.Enums.StateEnum' = 0
+            reason: 'EnergyEvse.Enums.EnergyTransferStoppedReasonEnum' = 0
+            energyTransferred: 'int' = 0
+
+        @dataclass
+        class Fault(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="sessionID", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="state", Tag=1, Type=EnergyEvse.Enums.StateEnum),
+                        ClusterObjectFieldDescriptor(Label="faultStatePreviousState", Tag=2, Type=EnergyEvse.Enums.FaultStateEnum),
+                        ClusterObjectFieldDescriptor(Label="faultStateCurrentState", Tag=4, Type=EnergyEvse.Enums.FaultStateEnum),
+                    ])
+
+            sessionID: 'uint' = 0
+            state: 'EnergyEvse.Enums.StateEnum' = 0
+            faultStatePreviousState: 'EnergyEvse.Enums.FaultStateEnum' = 0
+            faultStateCurrentState: 'EnergyEvse.Enums.FaultStateEnum' = 0
+
+        @dataclass
+        class Rfid(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000099
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="uid", Tag=0, Type=bytes),
+                    ])
+
+            uid: 'bytes' = b""
+
 
 @dataclass
 class DoorLock(Cluster):
@@ -24833,8 +28764,8 @@ class FanModeSequenceEnum(MatterIntEnum):
             kOffLowHigh = 0x01
             kOffLowMedHighAuto = 0x02
             kOffLowHighAuto = 0x03
-            kOffOnAuto = 0x04
-            kOffOn = 0x05
+            kOffHighAuto = 0x04
+            kOffHigh = 0x05
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
@@ -25187,9 +29118,9 @@ class ThermostatUserInterfaceConfiguration(Cluster):
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="temperatureDisplayMode", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="keypadLockout", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="scheduleProgrammingVisibility", Tag=0x00000002, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="temperatureDisplayMode", Tag=0x00000000, Type=ThermostatUserInterfaceConfiguration.Enums.TemperatureDisplayModeEnum),
+                ClusterObjectFieldDescriptor(Label="keypadLockout", Tag=0x00000001, Type=ThermostatUserInterfaceConfiguration.Enums.KeypadLockoutEnum),
+                ClusterObjectFieldDescriptor(Label="scheduleProgrammingVisibility", Tag=0x00000002, Type=typing.Optional[ThermostatUserInterfaceConfiguration.Enums.ScheduleProgrammingVisibilityEnum]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -25198,9 +29129,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    temperatureDisplayMode: 'uint' = None
-    keypadLockout: 'uint' = None
-    scheduleProgrammingVisibility: 'typing.Optional[uint]' = None
+    temperatureDisplayMode: 'ThermostatUserInterfaceConfiguration.Enums.TemperatureDisplayModeEnum' = None
+    keypadLockout: 'ThermostatUserInterfaceConfiguration.Enums.KeypadLockoutEnum' = None
+    scheduleProgrammingVisibility: 'typing.Optional[ThermostatUserInterfaceConfiguration.Enums.ScheduleProgrammingVisibilityEnum]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -25208,6 +29139,38 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class KeypadLockoutEnum(MatterIntEnum):
+            kNoLockout = 0x00
+            kLockout1 = 0x01
+            kLockout2 = 0x02
+            kLockout3 = 0x03
+            kLockout4 = 0x04
+            kLockout5 = 0x05
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 6,
+
+        class ScheduleProgrammingVisibilityEnum(MatterIntEnum):
+            kScheduleProgrammingPermitted = 0x00
+            kScheduleProgrammingDenied = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
+        class TemperatureDisplayModeEnum(MatterIntEnum):
+            kCelsius = 0x00
+            kFahrenheit = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 2,
+
     class Attributes:
         @dataclass
         class TemperatureDisplayMode(ClusterAttributeDescriptor):
@@ -25221,9 +29184,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=ThermostatUserInterfaceConfiguration.Enums.TemperatureDisplayModeEnum)
 
-            value: 'uint' = 0
+            value: 'ThermostatUserInterfaceConfiguration.Enums.TemperatureDisplayModeEnum' = 0
 
         @dataclass
         class KeypadLockout(ClusterAttributeDescriptor):
@@ -25237,9 +29200,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=ThermostatUserInterfaceConfiguration.Enums.KeypadLockoutEnum)
 
-            value: 'uint' = 0
+            value: 'ThermostatUserInterfaceConfiguration.Enums.KeypadLockoutEnum' = 0
 
         @dataclass
         class ScheduleProgrammingVisibility(ClusterAttributeDescriptor):
@@ -25253,9 +29216,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[ThermostatUserInterfaceConfiguration.Enums.ScheduleProgrammingVisibilityEnum])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Optional[ThermostatUserInterfaceConfiguration.Enums.ScheduleProgrammingVisibilityEnum]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -32455,6 +36418,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
                 ClusterObjectFieldDescriptor(Label="MACAddress", Tag=0x00000000, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="linkLocalAddress", Tag=0x00000001, Type=typing.Optional[bytes]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -32464,6 +36428,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             ])
 
     MACAddress: 'typing.Optional[str]' = None
+    linkLocalAddress: 'typing.Optional[bytes]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -32488,6 +36453,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[str]' = None
 
+        @dataclass
+        class LinkLocalAddress(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000503
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -32615,23 +36596,23 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ChannelStatusEnum(MatterIntEnum):
-            kSuccess = 0x00
-            kMultipleMatches = 0x01
-            kNoMatches = 0x02
+        class LineupInfoTypeEnum(MatterIntEnum):
+            kMso = 0x00
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 3,
+            kUnknownEnumValue = 1,
 
-        class LineupInfoTypeEnum(MatterIntEnum):
-            kMso = 0x00
+        class StatusEnum(MatterIntEnum):
+            kSuccess = 0x00
+            kMultipleMatches = 0x01
+            kNoMatches = 0x02
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 1,
+            kUnknownEnumValue = 3,
 
     class Bitmaps:
         class Feature(IntFlag):
@@ -32703,11 +36684,11 @@ class ChangeChannelResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=Channel.Enums.ChannelStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=Channel.Enums.StatusEnum),
                         ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'Channel.Enums.ChannelStatusEnum' = 0
+            status: 'Channel.Enums.StatusEnum' = 0
             data: 'typing.Optional[str]' = None
 
         @dataclass
@@ -32918,7 +36899,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class TargetNavigatorStatusEnum(MatterIntEnum):
+        class StatusEnum(MatterIntEnum):
             kSuccess = 0x00
             kTargetNotFound = 0x01
             kNotAllowed = 0x02
@@ -32972,11 +36953,11 @@ class NavigateTargetResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.TargetNavigatorStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.StatusEnum),
                         ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'TargetNavigator.Enums.TargetNavigatorStatusEnum' = 0
+            status: 'TargetNavigator.Enums.StatusEnum' = 0
             data: 'typing.Optional[str]' = None
 
     class Attributes:
@@ -33147,7 +37128,18 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class MediaPlaybackStatusEnum(MatterIntEnum):
+        class PlaybackStateEnum(MatterIntEnum):
+            kPlaying = 0x00
+            kPaused = 0x01
+            kNotPlaying = 0x02
+            kBuffering = 0x03
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 4,
+
+        class StatusEnum(MatterIntEnum):
             kSuccess = 0x00
             kInvalidStateForCommand = 0x01
             kNotAllowed = 0x02
@@ -33160,17 +37152,6 @@ class MediaPlaybackStatusEnum(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 6,
 
-        class PlaybackStateEnum(MatterIntEnum):
-            kPlaying = 0x00
-            kPaused = 0x01
-            kNotPlaying = 0x02
-            kBuffering = 0x03
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 4,
-
     class Bitmaps:
         class Feature(IntFlag):
             kAdvancedSeek = 0x1
@@ -33338,11 +37319,11 @@ class PlaybackResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=MediaPlayback.Enums.StatusEnum),
                         ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'MediaPlayback.Enums.MediaPlaybackStatusEnum' = 0
+            status: 'MediaPlayback.Enums.StatusEnum' = 0
             data: 'typing.Optional[str]' = None
 
         @dataclass
@@ -33990,7 +37971,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class CecKeyCode(MatterIntEnum):
+        class CECKeyCodeEnum(MatterIntEnum):
             kSelect = 0x00
             kUp = 0x01
             kDown = 0x02
@@ -34083,7 +38064,7 @@ class CecKeyCode(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 14,
 
-        class KeypadInputStatusEnum(MatterIntEnum):
+        class StatusEnum(MatterIntEnum):
             kSuccess = 0x00
             kUnsupportedKey = 0x01
             kInvalidKeyInCurrentState = 0x02
@@ -34111,10 +38092,10 @@ class SendKey(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.CecKeyCode),
+                        ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.CECKeyCodeEnum),
                     ])
 
-            keyCode: 'KeypadInput.Enums.CecKeyCode' = 0
+            keyCode: 'KeypadInput.Enums.CECKeyCodeEnum' = 0
 
         @dataclass
         class SendKeyResponse(ClusterCommand):
@@ -34127,10 +38108,10 @@ class SendKeyResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.KeypadInputStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.StatusEnum),
                     ])
 
-            status: 'KeypadInput.Enums.KeypadInputStatusEnum' = 0
+            status: 'KeypadInput.Enums.StatusEnum' = 0
 
     class Attributes:
         @dataclass
@@ -34258,16 +38239,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ContentLaunchStatusEnum(MatterIntEnum):
-            kSuccess = 0x00
-            kUrlNotAvailable = 0x01
-            kAuthFailed = 0x02
-            # All received enum values that are not listed above will be mapped
-            # to kUnknownEnumValue. This is a helper enum value that should only
-            # be used by code to process how it handles receiving and unknown
-            # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 3,
-
         class MetricTypeEnum(MatterIntEnum):
             kPixels = 0x00
             kPercentage = 0x01
@@ -34298,12 +38269,22 @@ class ParameterEnum(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 14,
 
+        class StatusEnum(MatterIntEnum):
+            kSuccess = 0x00
+            kURLNotAvailable = 0x01
+            kAuthFailed = 0x02
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving and unknown
+            # enum value. This specific should never be transmitted.
+            kUnknownEnumValue = 3,
+
     class Bitmaps:
         class Feature(IntFlag):
             kContentSearch = 0x1
             kURLPlayback = 0x2
 
-        class SupportedStreamingProtocol(IntFlag):
+        class SupportedProtocolsBitmap(IntFlag):
             kDash = 0x1
             kHls = 0x2
 
@@ -34450,11 +38431,11 @@ class LauncherResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ContentLauncher.Enums.ContentLaunchStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ContentLauncher.Enums.StatusEnum),
                         ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'ContentLauncher.Enums.ContentLaunchStatusEnum' = 0
+            status: 'ContentLauncher.Enums.StatusEnum' = 0
             data: 'typing.Optional[str]' = None
 
     class Attributes:
@@ -34841,7 +38822,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ApplicationLauncherStatusEnum(MatterIntEnum):
+        class StatusEnum(MatterIntEnum):
             kSuccess = 0x00
             kAppNotAvailable = 0x01
             kSystemBusy = 0x02
@@ -34944,11 +38925,11 @@ class LauncherResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatusEnum),
+                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.StatusEnum),
                         ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[bytes]),
                     ])
 
-            status: 'ApplicationLauncher.Enums.ApplicationLauncherStatusEnum' = 0
+            status: 'ApplicationLauncher.Enums.StatusEnum' = 0
             data: 'typing.Optional[bytes]' = None
 
     class Attributes:
diff --git a/src/controller/python/chip/clusters/__init__.py b/src/controller/python/chip/clusters/__init__.py
index 0cbe22842924ca..6e846c68f5cb08 100644
--- a/src/controller/python/chip/clusters/__init__.py
+++ b/src/controller/python/chip/clusters/__init__.py
@@ -27,10 +27,10 @@
                       ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation,
                       BinaryInputBasic, Binding, BooleanState, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement,
                       CarbonMonoxideConcentrationMeasurement, Channel, ColorControl, ContentLauncher, Descriptor, DiagnosticLogs,
-                      DishwasherAlarm, DishwasherMode, DoorLock, ElectricalMeasurement, EthernetNetworkDiagnostics, FanControl,
-                      FaultInjection, FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement, GeneralCommissioning,
-                      GeneralDiagnostics, GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify,
-                      IlluminanceMeasurement, KeypadInput, LaundryWasherControls, LaundryWasherMode, LevelControl,
+                      DishwasherAlarm, DishwasherMode, DoorLock, ElectricalMeasurement, EnergyEvse, EthernetNetworkDiagnostics,
+                      FanControl, FaultInjection, FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement,
+                      GeneralCommissioning, GeneralDiagnostics, GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement,
+                      Identify, IlluminanceMeasurement, KeypadInput, LaundryWasherControls, LaundryWasherMode, LevelControl,
                       LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, ModeSelect, NetworkCommissioning,
                       NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, OnOffSwitchConfiguration,
                       OperationalCredentials, OperationalState, OtaSoftwareUpdateProvider, OtaSoftwareUpdateRequestor,
@@ -49,7 +49,7 @@
            BinaryInputBasic, Binding, BooleanState, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement,
            CarbonMonoxideConcentrationMeasurement, Channel,
            ColorControl, ContentLauncher, Descriptor, DiagnosticLogs, DishwasherAlarm, DishwasherMode,
-           DoorLock, ElectricalMeasurement, EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement,
+           DoorLock, ElectricalMeasurement,  EnergyEvse, EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement,
            FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, GroupKeyManagement, Groups,
            HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, KeypadInput,
            LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, ModeSelect,
diff --git a/src/controller/python/chip/discovery/__init__.py b/src/controller/python/chip/discovery/__init__.py
index bfc79577b75169..ce27037dfbe499 100644
--- a/src/controller/python/chip/discovery/__init__.py
+++ b/src/controller/python/chip/discovery/__init__.py
@@ -85,7 +85,9 @@ class CommissionableNode():
     pairingHint: int = None
     mrpRetryIntervalIdle: int = None
     mrpRetryIntervalActive: int = None
+    mrpRetryActiveThreshold: int = None
     supportsTcp: bool = None
+    isICDOperatingAsLIT: bool = None
     addresses: List[str] = None
     rotatingId: Optional[str] = None
 
diff --git a/src/controller/python/chip/native/ChipMainLoopWork_WorkSchedule.cpp b/src/controller/python/chip/native/ChipMainLoopWork_WorkSchedule.cpp
index fec65a150c9396..7abf1d9f81a92c 100644
--- a/src/controller/python/chip/native/ChipMainLoopWork_WorkSchedule.cpp
+++ b/src/controller/python/chip/native/ChipMainLoopWork_WorkSchedule.cpp
@@ -17,8 +17,9 @@
  */
 #include "ChipMainLoopWork.h"
 
+#include <condition_variable>
+#include <mutex>
 #include <platform/CHIPDeviceLayer.h>
-#include <semaphore.h>
 
 namespace chip {
 namespace MainLoopWork {
@@ -27,12 +28,21 @@ namespace {
 struct WorkData
 {
     std::function<void()> callback;
-    sem_t done;
+    std::mutex mux;
+    std::condition_variable cond;
+    bool done = false;
 
-    WorkData() { sem_init(&done, 0 /* shared */, 0); }
-    ~WorkData() { sem_destroy(&done); }
-    void Post() { sem_post(&done); }
-    void Wait() { sem_wait(&done); }
+    void Post()
+    {
+        std::unique_lock lock(mux);
+        done = true;
+        cond.notify_all();
+    }
+    void Wait()
+    {
+        std::unique_lock lock(mux);
+        cond.wait(lock, [&] { return done; });
+    }
 };
 
 void PerformWork(intptr_t arg)
diff --git a/src/controller/python/chip/yaml/runner.py b/src/controller/python/chip/yaml/runner.py
index b6be43fcc46083..fb7a71bd457715 100644
--- a/src/controller/python/chip/yaml/runner.py
+++ b/src/controller/python/chip/yaml/runner.py
@@ -911,7 +911,9 @@ def decode(self, result: _ActionResult):
                 'pairingHint': response.pairingHint,
                 'mrpRetryIntervalIdle': response.mrpRetryIntervalIdle,
                 'mrpRetryIntervalActive': response.mrpRetryIntervalActive,
+                'mrpRetryActiveThreshold': response.mrpRetryActiveThreshold,
                 'supportsTcp': response.supportsTcp,
+                'isICDOperatingAsLIT': response.isICDOperatingAsLIT,
                 'addresses': response.addresses,
                 'rotatingId': response.rotatingId,
 
diff --git a/src/controller/tests/TestCommissionableNodeController.cpp b/src/controller/tests/TestCommissionableNodeController.cpp
index d50a267172ec19..c2aafe500c293d 100644
--- a/src/controller/tests/TestCommissionableNodeController.cpp
+++ b/src/controller/tests/TestCommissionableNodeController.cpp
@@ -36,15 +36,14 @@ class MockResolver : public Resolver
     bool IsInitialized() override { return true; }
     void Shutdown() override {}
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {}
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override {}
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override { return ResolveNodeIdStatus; }
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override {}
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override { return DiscoverCommissionersStatus; }
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext &) override { return DiscoverCommissionersStatus; }
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext &) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
-    CHIP_ERROR StopDiscovery() override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StopDiscovery(DiscoveryContext &) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp
index 6d8f121637196c..ae8ecfb6086a70 100644
--- a/src/controller/tests/data_model/TestRead.cpp
+++ b/src/controller/tests/data_model/TestRead.cpp
@@ -270,13 +270,17 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     static void TestReadHandler_OneSubscribeMultipleReads(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_TwoSubscribesMultipleReads(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_MultipleSubscriptionsWithDataVersionFilter(nlTestSuite * apSuite, void * apContext);
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
     static void TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_SubscriptionReportingIntervalsTest2(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_SubscriptionReportingIntervalsTest3(nlTestSuite * apSuite, void * apContext);
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     static void TestReadHandler_SubscriptionReportingIntervalsTest4(nlTestSuite * apSuite, void * apContext);
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
     static void TestReadHandler_SubscriptionReportingIntervalsTest5(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_SubscriptionReportingIntervalsTest6(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_SubscriptionReportingIntervalsTest7(nlTestSuite * apSuite, void * apContext);
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     static void TestReadHandler_SubscriptionReportingIntervalsTest8(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_SubscriptionReportingIntervalsTest9(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandlerResourceExhaustion_MultipleReads(nlTestSuite * apSuite, void * apContext);
@@ -1719,12 +1723,18 @@ void TestReadInteraction::TestResubscribeAttributeTimeout(nlTestSuite * apSuite,
         NL_TEST_ASSERT(apSuite, callback.mOnError == 0);
         NL_TEST_ASSERT(apSuite, callback.mOnResubscriptionsAttempted == 0);
 
+        chip::app::ReadHandler * readHandler = app::InteractionModelEngine::GetInstance()->ActiveHandlerAt(0);
+
+        uint16_t minInterval;
+        uint16_t maxInterval;
+        readHandler->GetReportingIntervals(minInterval, maxInterval);
+
         //
         // Disable packet transmission, and drive IO till we have reported a re-subscription attempt.
         //
         //
         ctx.GetLoopback().mNumMessagesToDrop = chip::Test::LoopbackTransport::kUnlimitedMessageCount;
-        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxIntervalCeilingSeconds)),
+        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxInterval)),
                                         [&]() { return callback.mOnResubscriptionsAttempted > 0; });
 
         NL_TEST_ASSERT(apSuite, callback.mOnResubscriptionsAttempted == 1);
@@ -1801,12 +1811,18 @@ void TestReadInteraction::TestSubscribeAttributeTimeout(nlTestSuite * apSuite, v
         //
         ctx.GetLoopback().mNumMessagesToDrop = chip::Test::LoopbackTransport::kUnlimitedMessageCount;
 
+        chip::app::ReadHandler * readHandler = app::InteractionModelEngine::GetInstance()->ActiveHandlerAt(0);
+
+        uint16_t minInterval;
+        uint16_t maxInterval;
+        readHandler->GetReportingIntervals(minInterval, maxInterval);
+
         //
         // Drive IO until we get an error on the subscription, which should be caused
         // by the liveness timer firing once we hit our max-interval plus
         // retransmit timeouts.
         //
-        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxIntervalCeilingSeconds)),
+        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxInterval)),
                                         [&]() { return callback.mOnError >= 1; });
 
         NL_TEST_ASSERT(apSuite, callback.mOnError == 1);
@@ -1954,6 +1970,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite *
     gTestReadInteraction.mEmitSubscriptionError = false;
 }
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
+
 // Subscriber sends the request with particular max-interval value:
 // Max interval equal to client-requested min-interval.
 void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext)
@@ -2181,6 +2199,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3(nl
     gTestReadInteraction.mAlterSubscriptionIntervals = false;
 }
 
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 // Subscriber sends the request with particular max-interval value:
 // Max interval greater than client-requested min-interval but lower than 60m:
 // server adjustment to a value greater than client-requested, but greater than 60 (not allowed).
@@ -2247,6 +2267,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4(nl
     gTestReadInteraction.mAlterSubscriptionIntervals = false;
 }
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
+
 // Subscriber sends the request with particular max-interval value:
 // Max interval greater than client-requested min-interval but greater than 60m:
 // With no server adjustment.
@@ -2474,6 +2496,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7(nl
     gTestReadInteraction.mAlterSubscriptionIntervals = false;
 }
 
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 // Subscriber sends the request with particular max-interval value:
 // Max interval greater than client-requested min-interval but greater than 60m:
 // With server adjustment to a value larger than 60m, but larger than max interval. Disallowed
@@ -4680,13 +4704,22 @@ const nlTest sTests[] =
     NL_TEST_DEF("TestReadHandler_TwoSubscribesMultipleReads", TestReadInteraction::TestReadHandler_TwoSubscribesMultipleReads),
     NL_TEST_DEF("TestReadHandlerResourceExhaustion_MultipleReads", TestReadInteraction::TestReadHandlerResourceExhaustion_MultipleReads),
     NL_TEST_DEF("TestReadAttributeTimeout", TestReadInteraction::TestReadAttributeTimeout),
-    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest1", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1),
+/*
+    Disabling SubscriptionReportingIntervals tests for ICD run.
+    These tests test the non-ICD behavior and cannot take into account that an ICD will always
+    change the max interval of a subscription.
+*/
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest1", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1), // no good
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest2", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest2),
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest3", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3),
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest4", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4),
+#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest5", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest5),
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest6", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest6),
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest7", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7),
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest8", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest8),
     NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest9", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest9),
         NL_TEST_DEF("TestReadSubscribeAttributeResponseWithVersionOnlyCache", TestReadInteraction::TestReadSubscribeAttributeResponseWithVersionOnlyCache),
diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp
index 425d30a2d9a396..159526e296f738 100644
--- a/src/credentials/CHIPCert.cpp
+++ b/src/credentials/CHIPCert.cpp
@@ -31,7 +31,7 @@
 
 #include <stddef.h>
 
-#include <credentials/CHIPCert.h>
+#include <credentials/CHIPCert_Internal.h>
 #include <credentials/CHIPCertificateSet.h>
 #include <lib/asn1/ASN1.h>
 #include <lib/asn1/ASN1Macros.h>
@@ -468,6 +468,7 @@ ChipCertificateData::~ChipCertificateData() {}
 
 void ChipCertificateData::Clear()
 {
+    mSerialNumber = ByteSpan();
     mSubjectDN.Clear();
     mIssuerDN.Clear();
     mSubjectKeyId      = CertificateKeyId();
@@ -612,6 +613,13 @@ CHIP_ERROR ChipDN::GetCertType(CertType & certType) const
     bool catsPresent     = false;
     uint8_t rdnCount     = RDNCount();
 
+    if (rdnCount == 1 && rdn[0].mAttrOID == kOID_AttributeType_CommonName && !rdn[0].mAttrIsPrintableString &&
+        rdn[0].mString.data_equal(kNetworkIdentityCN))
+    {
+        certType = CertType::kNetworkIdentity;
+        return CHIP_NO_ERROR;
+    }
+
     certType = CertType::kNotSpecified;
 
     for (uint8_t i = 0; i < rdnCount; i++)
@@ -672,6 +680,7 @@ CHIP_ERROR ChipDN::GetCertType(CertType & certType) const
 CHIP_ERROR ChipDN::GetCertChipId(uint64_t & chipId) const
 {
     uint8_t rdnCount = RDNCount();
+    bool foundId     = false;
 
     chipId = 0;
 
@@ -683,15 +692,17 @@ CHIP_ERROR ChipDN::GetCertChipId(uint64_t & chipId) const
         case kOID_AttributeType_MatterICACId:
         case kOID_AttributeType_MatterNodeId:
         case kOID_AttributeType_MatterFirmwareSigningId:
-            VerifyOrReturnError(chipId == 0, CHIP_ERROR_WRONG_CERT_DN);
+            VerifyOrReturnError(!foundId, CHIP_ERROR_WRONG_CERT_DN);
 
-            chipId = rdn[i].mChipVal;
+            chipId  = rdn[i].mChipVal;
+            foundId = true;
             break;
         default:
             break;
         }
     }
 
+    VerifyOrReturnError(foundId, CHIP_ERROR_WRONG_CERT_DN);
     return CHIP_NO_ERROR;
 }
 
@@ -1084,12 +1095,19 @@ DLL_EXPORT CHIP_ERROR ChipEpochToASN1Time(uint32_t epochTime, chip::ASN1::ASN1Un
     return CHIP_NO_ERROR;
 }
 
+static CHIP_ERROR ValidateCertificateType(const ChipCertificateData & certData, CertType expectedType)
+{
+    CertType certType;
+    ReturnErrorOnFailure(certData.mSubjectDN.GetCertType(certType));
+    VerifyOrReturnError(certType == expectedType, CHIP_ERROR_WRONG_CERT_TYPE);
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR ValidateChipRCAC(const ByteSpan & rcac)
 {
     ChipCertificateSet certSet;
     ChipCertificateData certData;
     ValidationContext validContext;
-    CertType certType;
 
     // Note that this function doesn't check RCAC NotBefore / NotAfter time validity.
     // It is assumed that RCAC should be valid at the time of installation by definition.
@@ -1098,8 +1116,7 @@ CHIP_ERROR ValidateChipRCAC(const ByteSpan & rcac)
 
     ReturnErrorOnFailure(certSet.LoadCert(rcac, CertDecodeFlags::kGenerateTBSHash));
 
-    ReturnErrorOnFailure(certData.mSubjectDN.GetCertType(certType));
-    VerifyOrReturnError(certType == CertType::kRoot, CHIP_ERROR_WRONG_CERT_TYPE);
+    ReturnErrorOnFailure(ValidateCertificateType(certData, CertType::kRoot));
 
     VerifyOrReturnError(certData.mSubjectDN.IsEqual(certData.mIssuerDN), CHIP_ERROR_WRONG_CERT_TYPE);
 
@@ -1304,78 +1321,48 @@ CHIP_ERROR ExtractCATsFromOpCert(const ChipCertificateData & opcert, CATValues &
 
 CHIP_ERROR ExtractFabricIdFromCert(const ByteSpan & opcert, FabricId * fabricId)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-    ReturnErrorOnFailure(certSet.LoadCert(opcert, BitFlags<CertDecodeFlags>()));
+    ReturnErrorOnFailure(DecodeChipCert(opcert, certData));
     return ExtractFabricIdFromCert(certData, fabricId);
 }
 
 CHIP_ERROR ExtractNodeIdFabricIdFromOpCert(const ByteSpan & opcert, NodeId * nodeId, FabricId * fabricId)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-
-    ReturnErrorOnFailure(certSet.LoadCert(opcert, BitFlags<CertDecodeFlags>()));
-
+    ReturnErrorOnFailure(DecodeChipCert(opcert, certData));
     return ExtractNodeIdFabricIdFromOpCert(certData, nodeId, fabricId);
 }
 
 CHIP_ERROR ExtractPublicKeyFromChipCert(const ByteSpan & chipCert, P256PublicKeySpan & publicKey)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-
-    ReturnErrorOnFailure(certSet.LoadCert(chipCert, BitFlags<CertDecodeFlags>()));
-
+    ReturnErrorOnFailure(DecodeChipCert(chipCert, certData));
     publicKey = certData.mPublicKey;
-
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ExtractNotBeforeFromChipCert(const ByteSpan & chipCert, chip::System::Clock::Seconds32 & notBeforeChipEpochTime)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-
-    ReturnErrorOnFailure(certSet.LoadCert(chipCert, BitFlags<CertDecodeFlags>()));
-
+    ReturnErrorOnFailure(DecodeChipCert(chipCert, certData));
     notBeforeChipEpochTime = chip::System::Clock::Seconds32(certData.mNotBeforeTime);
-
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ExtractSKIDFromChipCert(const ByteSpan & chipCert, CertificateKeyId & skid)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-
-    ReturnErrorOnFailure(certSet.LoadCert(chipCert, BitFlags<CertDecodeFlags>()));
-
+    ReturnErrorOnFailure(DecodeChipCert(chipCert, certData));
+    VerifyOrReturnError(certData.mCertFlags.Has(CertFlags::kExtPresent_AuthKeyId), CHIP_ERROR_NOT_FOUND);
     skid = certData.mSubjectKeyId;
-
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ExtractSubjectDNFromChipCert(const ByteSpan & chipCert, ChipDN & dn)
 {
-    ChipCertificateSet certSet;
     ChipCertificateData certData;
-
-    ReturnErrorOnFailure(certSet.Init(&certData, 1));
-
-    ReturnErrorOnFailure(certSet.LoadCert(chipCert, BitFlags<CertDecodeFlags>()));
-
+    ReturnErrorOnFailure(DecodeChipCert(chipCert, certData));
     dn = certData.mSubjectDN;
-
     return CHIP_NO_ERROR;
 }
 
@@ -1446,5 +1433,116 @@ CHIP_ERROR CertificateValidityPolicy::ApplyDefaultPolicy(const ChipCertificateDa
     }
 }
 
+void InitNetworkIdentitySubject(ChipDN & name)
+{
+    name.Clear();
+    CHIP_ERROR err = name.AddAttribute_CommonName(kNetworkIdentityCN, /* not printable */ false);
+    VerifyOrDie(err == CHIP_NO_ERROR); // AddAttribute can't fail in this case
+}
+
+static CHIP_ERROR CalculateKeyIdentifierSha256(const P256PublicKeySpan & publicKey, MutableCertificateKeyId outKeyId)
+{
+    uint8_t hash[kSHA256_Hash_Length];
+    static_assert(outKeyId.size() <= sizeof(hash)); // truncating 32 bytes down to 20
+    ReturnErrorOnFailure(Hash_SHA256(publicKey.data(), publicKey.size(), hash));
+    memcpy(outKeyId.data(), hash, outKeyId.size());
+    return CHIP_NO_ERROR;
+}
+
+static CHIP_ERROR ValidateChipNetworkIdentity(const ChipCertificateData & certData)
+{
+    ReturnErrorOnFailure(ValidateCertificateType(certData, CertType::kNetworkIdentity));
+
+    VerifyOrReturnError(certData.mSerialNumber.data_equal(kNetworkIdentitySerialNumberBytes), CHIP_ERROR_WRONG_CERT_TYPE);
+    VerifyOrReturnError(certData.mNotBeforeTime == kNetworkIdentityNotBeforeTime, CHIP_ERROR_WRONG_CERT_TYPE);
+    VerifyOrReturnError(certData.mNotAfterTime == kNetworkIdentityNotAfterTime, CHIP_ERROR_WRONG_CERT_TYPE);
+    VerifyOrReturnError(certData.mIssuerDN.IsEqual(certData.mSubjectDN), CHIP_ERROR_WRONG_CERT_TYPE);
+
+    VerifyOrReturnError(certData.mCertFlags.Has(CertFlags::kExtPresent_BasicConstraints) &&
+                            !certData.mCertFlags.Has(CertFlags::kIsCA),
+                        CHIP_ERROR_WRONG_CERT_TYPE);
+    VerifyOrReturnError(certData.mCertFlags.Has(CertFlags::kExtPresent_KeyUsage) &&
+                            certData.mKeyUsageFlags == kNetworkIdentityKeyUsage,
+                        CHIP_ERROR_WRONG_CERT_TYPE);
+    VerifyOrReturnError(certData.mCertFlags.Has(CertFlags::kExtPresent_ExtendedKeyUsage) &&
+                            certData.mKeyPurposeFlags == kNetworkIdentityKeyPurpose,
+                        CHIP_ERROR_WRONG_CERT_TYPE);
+
+    ReturnErrorOnFailure(VerifyCertSignature(certData, certData));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ValidateChipNetworkIdentity(const ByteSpan & cert)
+{
+    ChipCertificateData certData;
+    ReturnErrorOnFailure(DecodeChipCert(cert, certData, CertDecodeFlags::kGenerateTBSHash));
+    ReturnErrorOnFailure(ValidateChipNetworkIdentity(certData));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ValidateChipNetworkIdentity(const ByteSpan & cert, MutableCertificateKeyId outKeyId)
+{
+    ChipCertificateData certData;
+    ReturnErrorOnFailure(DecodeChipCert(cert, certData, CertDecodeFlags::kGenerateTBSHash));
+    ReturnErrorOnFailure(ValidateChipNetworkIdentity(certData));
+    ReturnErrorOnFailure(CalculateKeyIdentifierSha256(certData.mPublicKey, outKeyId));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ExtractIdentifierFromChipNetworkIdentity(const ByteSpan & cert, MutableCertificateKeyId outKeyId)
+{
+    ChipCertificateData certData;
+    ReturnErrorOnFailure(DecodeChipCert(cert, certData));
+    ReturnErrorOnFailure(ValidateCertificateType(certData, CertType::kNetworkIdentity));
+    ReturnErrorOnFailure(CalculateKeyIdentifierSha256(certData.mPublicKey, outKeyId));
+    return CHIP_NO_ERROR;
+}
+
+static CHIP_ERROR GenerateNetworkIdentitySignature(const P256Keypair & keypair, P256ECDSASignature & signature)
+{
+    // Create a buffer and writer to capture the TBS (to-be-signed) portion of the certificate.
+    chip::Platform::ScopedMemoryBuffer<uint8_t> asn1TBSBuf;
+    VerifyOrReturnError(asn1TBSBuf.Alloc(kNetworkIdentityTBSLength), CHIP_ERROR_NO_MEMORY);
+
+    ASN1Writer writer;
+    writer.Init(asn1TBSBuf.Get(), kNetworkIdentityTBSLength);
+
+    // Generate the TBSCertificate and sign it
+    ReturnErrorOnFailure(EncodeNetworkIdentityTBSCert(keypair.Pubkey(), writer));
+    ReturnErrorOnFailure(keypair.ECDSA_sign_msg(asn1TBSBuf.Get(), writer.GetLengthWritten(), signature));
+
+    return CHIP_NO_ERROR;
+}
+
+static CHIP_ERROR EncodeCompactIdentityCert(TLVWriter & writer, Tag tag, const P256PublicKeySpan & publicKey,
+                                            const P256ECDSASignatureSpan & signature)
+{
+    TLVType containerType;
+    ReturnErrorOnFailure(writer.StartContainer(tag, kTLVType_Structure, containerType));
+    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_EllipticCurvePublicKey), publicKey));
+    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_ECDSASignature), signature));
+    ReturnErrorOnFailure(writer.EndContainer(containerType));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR NewChipNetworkIdentity(const Crypto::P256Keypair & keypair, MutableByteSpan & outCompactCert)
+{
+    VerifyOrReturnError(!outCompactCert.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(CanCastTo<uint32_t>(outCompactCert.size()), CHIP_ERROR_INVALID_ARGUMENT);
+
+    Crypto::P256ECDSASignature signature;
+    ReturnErrorOnFailure(GenerateNetworkIdentitySignature(keypair, signature));
+
+    TLVWriter writer;
+    writer.Init(outCompactCert);
+
+    P256PublicKeySpan publicKeySpan(keypair.Pubkey().ConstBytes());
+    P256ECDSASignatureSpan signatureSpan(signature.ConstBytes());
+    ReturnErrorOnFailure(EncodeCompactIdentityCert(writer, AnonymousTag(), publicKeySpan, signatureSpan));
+
+    outCompactCert.reduce_size(writer.GetLengthWritten());
+    return CHIP_NO_ERROR;
+}
+
 } // namespace Credentials
 } // namespace chip
diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h
index 69041f018d773d..f59c6c36a59a27 100644
--- a/src/credentials/CHIPCert.h
+++ b/src/credentials/CHIPCert.h
@@ -49,12 +49,12 @@ static constexpr uint32_t kChip32bitAttrUTF8Length             = 8;
 static constexpr uint32_t kChip64bitAttrUTF8Length             = 16;
 static constexpr uint16_t kX509NoWellDefinedExpirationDateYear = 9999;
 
-// As per specifications (6.3.5. Node Operational Credentials Certificates)
+// As per specifications (6.4.5. Node Operational Credentials Certificates)
 static constexpr uint32_t kMaxCHIPCertLength = 400;
 static constexpr uint32_t kMaxDERCertLength  = 600;
 
-// The decode buffer is used to reconstruct TBS section of X.509 certificate, which doesn't include signature.
-static constexpr uint32_t kMaxCHIPCertDecodeBufLength = kMaxDERCertLength - Crypto::kMax_ECDSA_Signature_Length_Der;
+// As per spec section 11.24 (Wi-Fi Authentication with Per-Device Credentials)
+inline constexpr uint32_t kMaxCHIPCompactNetworkIdentityLength = 137;
 
 /** Data Element Tags for the CHIP Certificate
  */
@@ -112,6 +112,7 @@ enum class CertType : uint8_t
                                   firmware image signing is manufacturer-specific. The CHIP
                                   certificate format supports encoding of firmware signing
                                   certificates if chosen by the manufacturer to use them. */
+    kNetworkIdentity = 0x05, /**< A CHIP Network (Client) Identity. */
 };
 
 /** X.509 Certificate Key Purpose Flags
@@ -394,6 +395,16 @@ class ChipDN
  */
 using CertificateKeyId = FixedByteSpan<kKeyIdentifierLength>;
 
+/**
+ *  @brief  A mutable `CertificateKeyId`.
+ */
+using MutableCertificateKeyId = FixedSpan<uint8_t, kKeyIdentifierLength>;
+
+/**
+ *  @brief  A storage type for `CertificateKeyId` and `MutableCertificateKeyId`.
+ */
+using CertificateKeyIdStorage = std::array<uint8_t, kKeyIdentifierLength>;
+
 /**
  *  @brief  A data structure for holding a P256 ECDSA signature, without the ownership of it.
  */
@@ -428,7 +439,7 @@ struct ChipCertificateData
     void Clear();
     bool IsEqual(const ChipCertificateData & other) const;
 
-    ByteSpan mCertificate;                      /**< Original raw buffer data. */
+    ByteSpan mSerialNumber;                     /**< Certificate Serial Number. */
     ChipDN mSubjectDN;                          /**< Certificate Subject DN. */
     ChipDN mIssuerDN;                           /**< Certificate Issuer DN. */
     CertificateKeyId mSubjectKeyId;             /**< Certificate Subject public key identifier. */
@@ -529,6 +540,31 @@ CHIP_ERROR VerifyCertSignature(const ChipCertificateData & cert, const ChipCerti
  */
 CHIP_ERROR ValidateChipRCAC(const ByteSpan & rcac);
 
+/**
+ * Validates a Network (Client) Identity in TLV-encoded form.
+ * Accepts either a full certificate or the compact-pdc-identity format.
+ *
+ * This function parses the certificate, ensures the rigid fields have the values mandated by the
+ * specification, and validates the certificate signature.
+ *
+ * @param cert The network identity certificate to validate.
+ *
+ * @return CHIP_NO_ERROR on success, CHIP_ERROR_WRONG_CERT_TYPE if the certificate does
+ *         not conform to the requirements for a Network Identity, CHIP_ERROR_INVALID_SIGNATURE
+ *         if the certificate has an invalid signature, or another CHIP_ERROR.
+ *
+ * @see section 11.24 (Wi-Fi Authentication with Per-Device Credentials) of the Matter spec
+ */
+CHIP_ERROR ValidateChipNetworkIdentity(const ByteSpan & cert);
+
+/**
+ * Convenience variant of `ValidateChipNetworkIdentity` that, upon successful validation, also
+ * calculates the key identifier for the Network (Client) Identity.
+ * @see ValidateChipNetworkIdentity
+ * @see ExtractIdentifierFromChipNetworkIdentity
+ */
+CHIP_ERROR ValidateChipNetworkIdentity(const ByteSpan & cert, MutableCertificateKeyId outKeyId);
+
 struct FutureExtension
 {
     ByteSpan OID;
@@ -554,7 +590,7 @@ struct X509CertRequestParams
  *
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
-CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParams, Crypto::P256Keypair & issuerKeypair,
+CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256Keypair & issuerKeypair,
                            MutableByteSpan & x509Cert);
 
 /**
@@ -568,7 +604,7 @@ CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParams, Crypto::
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
 CHIP_ERROR NewICAX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256PublicKey & subjectPubkey,
-                          Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert);
+                          const Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert);
 
 /**
  * @brief Generate a new X.509 DER encoded Node operational certificate
@@ -581,7 +617,18 @@ CHIP_ERROR NewICAX509Cert(const X509CertRequestParams & requestParams, const Cry
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
 CHIP_ERROR NewNodeOperationalX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256PublicKey & subjectPubkey,
-                                      Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert);
+                                      const Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert);
+
+/**
+ * @brief Generates a Network (Client) Identity certificate in TLV-encoded form.
+ *
+ * @param keypair The key pair underlying the identity.
+ * @param outCompactCert Buffer to store the signed certificate in compact-pdc-identity TLV format.
+ *                       Must be at least `kMaxCHIPCompactNetworkIdentityLength` bytes long.
+ *
+ * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
+ **/
+CHIP_ERROR NewChipNetworkIdentity(const Crypto::P256Keypair & keypair, MutableByteSpan & outCompactCert);
 
 /**
  * @brief
@@ -812,5 +859,14 @@ CHIP_ERROR ExtractSubjectDNFromChipCert(const ByteSpan & chipCert, ChipDN & dn);
  */
 CHIP_ERROR ExtractSubjectDNFromX509Cert(const ByteSpan & x509Cert, ChipDN & dn);
 
+/**
+ * Extracts the key identifier from a Network (Client) Identity in TLV-encoded form.
+ * Does NOT perform full validation of the identity certificate.
+ *
+ * @return CHIP_NO_ERROR on success, CHIP_ERROR_WRONG_CERT_TYPE if the certificate is
+ *         not a Network (Client) Identity, or another CHIP_ERROR if parsing fails.
+ */
+CHIP_ERROR ExtractIdentifierFromChipNetworkIdentity(const ByteSpan & cert, MutableCertificateKeyId outKeyId);
+
 } // namespace Credentials
 } // namespace chip
diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp
index 228aaf276796bf..3793062231ce7f 100644
--- a/src/credentials/CHIPCertToX509.cpp
+++ b/src/credentials/CHIPCertToX509.cpp
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 #include <stddef.h>
 
-#include <credentials/CHIPCert.h>
+#include <credentials/CHIPCert_Internal.h>
 #include <lib/asn1/ASN1.h>
 #include <lib/asn1/ASN1Macros.h>
 #include <lib/core/CHIPCore.h>
@@ -152,9 +152,7 @@ static CHIP_ERROR DecodeConvertAuthorityKeyIdentifierExtension(TLVReader & reade
     {
         // keyIdentifier [0] IMPLICIT KeyIdentifier
         // KeyIdentifier ::= OCTET STRING
-        VerifyOrReturnError(reader.GetType() == kTLVType_ByteString, CHIP_ERROR_WRONG_TLV_TYPE);
-        VerifyOrReturnError(reader.GetTag() == ContextTag(kTag_AuthorityKeyIdentifier), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-
+        ReturnErrorOnFailure(reader.Expect(kTLVType_ByteString, ContextTag(kTag_AuthorityKeyIdentifier)));
         ReturnErrorOnFailure(reader.Get(certData.mAuthKeyId));
 
         static_assert(CertificateKeyId().size() <= UINT16_MAX, "Authority key id size doesn't fit in a uint16_t");
@@ -177,9 +175,7 @@ static CHIP_ERROR DecodeConvertSubjectKeyIdentifierExtension(TLVReader & reader,
 
     // SubjectKeyIdentifier ::= KeyIdentifier
     // KeyIdentifier ::= OCTET STRING
-    VerifyOrReturnError(reader.GetType() == kTLVType_ByteString, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == ContextTag(kTag_SubjectKeyIdentifier), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-
+    ReturnErrorOnFailure(reader.Expect(kTLVType_ByteString, ContextTag(kTag_SubjectKeyIdentifier)));
     ReturnErrorOnFailure(reader.Get(certData.mSubjectKeyId));
 
     static_assert(CertificateKeyId().size() <= UINT16_MAX, "Subject key id size doesn't fit in a uint16_t");
@@ -198,8 +194,7 @@ static CHIP_ERROR DecodeConvertKeyUsageExtension(TLVReader & reader, ASN1Writer
     certData.mCertFlags.Set(CertFlags::kExtPresent_KeyUsage);
 
     // KeyUsage ::= BIT STRING
-    VerifyOrReturnError(reader.GetTag() == ContextTag(kTag_KeyUsage), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-
+    ReturnErrorOnFailure(reader.Expect(ContextTag(kTag_KeyUsage)));
     ReturnErrorOnFailure(reader.Get(keyUsageBits));
 
     {
@@ -229,9 +224,7 @@ static CHIP_ERROR DecodeConvertBasicConstraintsExtension(TLVReader & reader, ASN
     // BasicConstraints ::= SEQUENCE
     ASN1_START_SEQUENCE
     {
-        VerifyOrReturnError(reader.GetTag() == ContextTag(kTag_BasicConstraints), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-        VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-
+        ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, ContextTag(kTag_BasicConstraints)));
         ReturnErrorOnFailure(reader.EnterContainer(outerContainer));
 
         // cA BOOLEAN DEFAULT FALSE
@@ -282,9 +275,7 @@ static CHIP_ERROR DecodeConvertExtendedKeyUsageExtension(TLVReader & reader, ASN
     // ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
     ASN1_START_SEQUENCE
     {
-        VerifyOrReturnError(reader.GetTag() == ContextTag(kTag_ExtendedKeyUsage), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-        VerifyOrReturnError(reader.GetType() == kTLVType_Array, CHIP_ERROR_WRONG_TLV_TYPE);
-
+        ReturnErrorOnFailure(reader.Expect(kTLVType_Array, ContextTag(kTag_ExtendedKeyUsage)));
         ReturnErrorOnFailure(reader.EnterContainer(outerContainer));
 
         while ((err = reader.Next(AnonymousTag())) == CHIP_NO_ERROR)
@@ -312,9 +303,7 @@ static CHIP_ERROR DecodeConvertFutureExtension(TLVReader & tlvReader, ASN1Writer
     ByteSpan extensionSequence;
     ASN1Reader reader;
 
-    VerifyOrReturnError(tlvReader.GetTag() == ContextTag(kTag_FutureExtension), CHIP_ERROR_INVALID_TLV_TAG);
-    VerifyOrReturnError(tlvReader.GetType() == kTLVType_ByteString, CHIP_ERROR_WRONG_TLV_TYPE);
-
+    ReturnErrorOnFailure(tlvReader.Expect(kTLVType_ByteString, ContextTag(kTag_FutureExtension)));
     ReturnErrorOnFailure(tlvReader.Get(extensionSequence));
 
     reader.Init(extensionSequence);
@@ -493,6 +482,8 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w
  * @param certData  Structure containing data extracted from the TBS portion of the
  *                  CHIP certificate.
  *
+ * Note: The reader must be positioned on the SerialNumber element.
+ *
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
 static CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData)
@@ -511,11 +502,12 @@ static CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer,
         }
         ASN1_END_CONSTRUCTED;
 
-        ReturnErrorOnFailure(reader.Next(kTLVType_ByteString, ContextTag(kTag_SerialNumber)));
-
         // serialNumber CertificateSerialNumber
         // CertificateSerialNumber ::= INTEGER
-        ReturnErrorOnFailure(writer.PutValue(kASN1TagClass_Universal, kASN1UniversalTag_Integer, false, reader));
+        ReturnErrorOnFailure(reader.Expect(kTLVType_ByteString, ContextTag(kTag_SerialNumber)));
+        ReturnErrorOnFailure(reader.Get(certData.mSerialNumber));
+        ReturnErrorOnFailure(writer.PutValue(kASN1TagClass_Universal, kASN1UniversalTag_Integer, false,
+                                             certData.mSerialNumber.data(), static_cast<uint16_t>(certData.mSerialNumber.size())));
 
         // signature AlgorithmIdentifier
         // AlgorithmIdentifier ::= SEQUENCE
@@ -553,6 +545,41 @@ static CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer,
     return err;
 }
 
+/**
+ * Variant of DecodeConvertTBSCert that handles reading a compact-pdc-identity
+ * where only the subject public key is actually encoded. All other values are
+ * populated / written as the well-known values mandated by the specification.
+ *
+ * Note: The reader must be positioned on the EllipticCurvePublicKey element.
+ */
+static CHIP_ERROR DecodeConvertTBSCertCompactIdentity(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData)
+{
+    // Decode the public key, everything else is rigid
+    ReturnErrorOnFailure(reader.Expect(kTLVType_ByteString, ContextTag(kTag_EllipticCurvePublicKey)));
+    ReturnErrorOnFailure(reader.Get(certData.mPublicKey));
+
+    // Populate rigid ChipCertificateData fields
+    certData.mSerialNumber = kNetworkIdentitySerialNumberBytes;
+    certData.mSigAlgoOID   = kOID_SigAlgo_ECDSAWithSHA256;
+    InitNetworkIdentitySubject(certData.mIssuerDN);
+    certData.mNotBeforeTime = kNetworkIdentityNotBeforeTime;
+    certData.mNotAfterTime  = kNetworkIdentityNotAfterTime;
+    InitNetworkIdentitySubject(certData.mSubjectDN);
+    certData.mPubKeyAlgoOID  = kOID_PubKeyAlgo_ECPublicKey;
+    certData.mPubKeyCurveOID = kOID_EllipticCurve_prime256v1;
+    certData.mCertFlags.Set(CertFlags::kExtPresent_BasicConstraints);
+    certData.mCertFlags.Set(CertFlags::kExtPresent_KeyUsage);
+    certData.mKeyUsageFlags = kNetworkIdentityKeyUsage;
+    certData.mCertFlags.Set(CertFlags::kExtPresent_ExtendedKeyUsage);
+    certData.mKeyPurposeFlags = kNetworkIdentityKeyPurpose;
+
+    if (!writer.IsNullWriter())
+    {
+        ReturnErrorOnFailure(EncodeNetworkIdentityTBSCert(certData.mPublicKey, writer));
+    }
+    return CHIP_NO_ERROR;
+}
+
 /**
  * Decode a CHIP TLV certificate and convert it to X.509 DER form.
  *
@@ -573,16 +600,24 @@ static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, ASN
     {
         ReturnErrorOnFailure(reader.Next());
     }
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == AnonymousTag(), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
-
+    ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, AnonymousTag()));
     ReturnErrorOnFailure(reader.EnterContainer(containerType));
 
     // Certificate ::= SEQUENCE
     ASN1_START_SEQUENCE
     {
         // tbsCertificate TBSCertificate,
-        ReturnErrorOnFailure(DecodeConvertTBSCert(reader, tbsWriter, certData));
+        reader.Next();
+        if (reader.GetTag() == ContextTag(kTag_EllipticCurvePublicKey))
+        {
+            // If the struct starts with the ec-pub-key we're dealing with a
+            // Network (Client) Identity in compact-pdc-identity format.
+            DecodeConvertTBSCertCompactIdentity(reader, tbsWriter, certData);
+        }
+        else
+        {
+            ReturnErrorOnFailure(DecodeConvertTBSCert(reader, tbsWriter, certData));
+        }
 
         // signatureAlgorithm   AlgorithmIdentifier
         // AlgorithmIdentifier ::= SEQUENCE
@@ -652,7 +687,7 @@ CHIP_ERROR DecodeChipCert(TLVReader & reader, ChipCertificateData & certData, Bi
 
         // Hash the encoded TBS certificate. Only SHA256 is supported.
         VerifyOrReturnError(certData.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
-        chip::Crypto::Hash_SHA256(asn1TBSBuf.Get(), tbsWriter.GetLengthWritten(), certData.mTBSHash);
+        ReturnErrorOnFailure(Hash_SHA256(asn1TBSBuf.Get(), tbsWriter.GetLengthWritten(), certData.mTBSHash));
         certData.mCertFlags.Set(CertFlags::kTBSHashPresent);
     }
     else
diff --git a/src/credentials/CHIPCert_Internal.h b/src/credentials/CHIPCert_Internal.h
new file mode 100644
index 00000000000000..0e1ef5bf3a910a
--- /dev/null
+++ b/src/credentials/CHIPCert_Internal.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <credentials/CHIPCert.h>
+
+namespace chip {
+namespace Credentials {
+
+// The decode buffer is used to reconstruct TBS section of X.509 certificate, which doesn't include signature.
+inline constexpr size_t kMaxCHIPCertDecodeBufLength = kMaxDERCertLength - Crypto::kMax_ECDSA_Signature_Length_Der;
+
+// The TBSCerticate of a Network (Client) Identity has a fixed (smaller) size.
+inline constexpr size_t kNetworkIdentityTBSLength = 244;
+
+// Constants for Network (Client) Identities as per section 11.24 (Wi-Fi
+// Authentication with Per-Device Credentials) of the Matter spec.
+inline constexpr CharSpan kNetworkIdentityCN                = "*"_span;
+inline constexpr uint8_t kNetworkIdentitySerialNumber       = 1;
+inline constexpr ByteSpan kNetworkIdentitySerialNumberBytes = ByteSpan((uint8_t[1]){ kNetworkIdentitySerialNumber });
+
+inline constexpr uint32_t kNetworkIdentityNotBeforeTime = 1;
+inline constexpr uint32_t kNetworkIdentityNotAfterTime  = kNullCertTime;
+
+inline constexpr auto kNetworkIdentityKeyUsage = BitFlags<KeyUsageFlags>(KeyUsageFlags::kDigitalSignature);
+inline constexpr auto kNetworkIdentityKeyPurpose =
+    BitFlags<KeyPurposeFlags>(KeyPurposeFlags::kClientAuth, KeyPurposeFlags::kServerAuth);
+
+// Initializes a ChipDN as CN=kNetworkIdentityCN
+void InitNetworkIdentitySubject(ChipDN & name);
+
+// Emits a X.509 TBSCertificate for a Network (Client) Identity based on the specified key.
+CHIP_ERROR EncodeNetworkIdentityTBSCert(const Crypto::P256PublicKey & pubkey, ASN1::ASN1Writer & writer);
+
+} // namespace Credentials
+} // namespace chip
diff --git a/src/credentials/CertificationDeclaration.cpp b/src/credentials/CertificationDeclaration.cpp
index 08149bf6c44d26..42bd9656b30750 100644
--- a/src/credentials/CertificationDeclaration.cpp
+++ b/src/credentials/CertificationDeclaration.cpp
@@ -336,15 +336,10 @@ CHIP_ERROR CertificationElementsDecoder::FindAndEnterArray(const ByteSpan & enco
     ReturnErrorOnFailure(mReader.EnterContainer(outerContainerType1));
 
     // position to arrayTag Array
-    CHIP_ERROR error = CHIP_NO_ERROR;
     do
     {
-        error = mReader.Next(kTLVType_Array, arrayTag);
-        // Return error code unless one of three things happened:
-        // 1. We found the right thing (CHIP_NO_ERROR returned).
-        // 2. The next tag is not the one we are looking for (CHIP_ERROR_UNEXPECTED_TLV_ELEMENT).
-        VerifyOrReturnError(error == CHIP_NO_ERROR || error == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT, error);
-    } while (error != CHIP_NO_ERROR);
+        ReturnErrorOnFailure(mReader.Next());
+    } while (mReader.Expect(kTLVType_Array, arrayTag) != CHIP_NO_ERROR);
 
     ReturnErrorOnFailure(mReader.EnterContainer(outerContainerType2));
 
diff --git a/src/credentials/FabricTable.cpp b/src/credentials/FabricTable.cpp
index 474d67959db1f2..0091fdec291c30 100644
--- a/src/credentials/FabricTable.cpp
+++ b/src/credentials/FabricTable.cpp
@@ -782,7 +782,7 @@ FabricTable::AddOrUpdateInner(FabricIndex fabricIndex, bool isAddition, Crypto::
     FabricInfo::InitParams newFabricInfo;
     FabricInfo * fabricEntry    = nullptr;
     FabricId fabricIdToValidate = kUndefinedFabricId;
-    CharSpan fabricLabel("");
+    CharSpan fabricLabel;
 
     if (isAddition)
     {
diff --git a/src/credentials/GenerateChipX509Cert.cpp b/src/credentials/GenerateChipX509Cert.cpp
index 86c7decf50e863..0dccaaa3a49fa6 100644
--- a/src/credentials/GenerateChipX509Cert.cpp
+++ b/src/credentials/GenerateChipX509Cert.cpp
@@ -27,10 +27,11 @@
 #endif
 
 #include <algorithm>
+#include <initializer_list>
 #include <inttypes.h>
 #include <stddef.h>
 
-#include <credentials/CHIPCert.h>
+#include <credentials/CHIPCert_Internal.h>
 #include <lib/asn1/ASN1.h>
 #include <lib/asn1/ASN1Macros.h>
 #include <lib/core/CHIPCore.h>
@@ -81,9 +82,7 @@ CHIP_ERROR EncodeAuthorityKeyIdentifierExtension(const Crypto::P256PublicKey & p
 
     ASN1_START_SEQUENCE
     {
-        OID extensionOID = GetOID(kOIDCategory_Extension, static_cast<uint8_t>(kTag_AuthorityKeyIdentifier));
-
-        ASN1_ENCODE_OBJECT_ID(extensionOID);
+        ASN1_ENCODE_OBJECT_ID(kOID_Extension_AuthorityKeyIdentifier);
 
         ASN1_START_OCTET_STRING_ENCAPSULATED
         {
@@ -111,9 +110,7 @@ CHIP_ERROR EncodeSubjectKeyIdentifierExtension(const Crypto::P256PublicKey & pub
 
     ASN1_START_SEQUENCE
     {
-        OID extensionOID = GetOID(kOIDCategory_Extension, static_cast<uint8_t>(kTag_SubjectKeyIdentifier));
-
-        ASN1_ENCODE_OBJECT_ID(extensionOID);
+        ASN1_ENCODE_OBJECT_ID(kOID_Extension_SubjectKeyIdentifier);
 
         ASN1_START_OCTET_STRING_ENCAPSULATED
         {
@@ -130,21 +127,46 @@ CHIP_ERROR EncodeSubjectKeyIdentifierExtension(const Crypto::P256PublicKey & pub
     return err;
 }
 
-CHIP_ERROR EncodeKeyUsageExtension(uint16_t keyUsageBits, ASN1Writer & writer)
+CHIP_ERROR EncodeExtKeyUsageExtension(std::initializer_list<OID> keyPurposeOIDs, ASN1Writer & writer)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-
     ASN1_START_SEQUENCE
     {
-        OID extensionOID = GetOID(kOIDCategory_Extension, static_cast<uint8_t>(kTag_KeyUsage));
+        ASN1_ENCODE_OBJECT_ID(kOID_Extension_ExtendedKeyUsage);
 
-        ASN1_ENCODE_OBJECT_ID(extensionOID);
+        // ExtKeyUsage extension MUST be marked as critical.
+        ASN1_ENCODE_BOOLEAN(true);
+        ASN1_START_OCTET_STRING_ENCAPSULATED
+        {
+            ASN1_START_SEQUENCE
+            {
+                for (auto && oid : keyPurposeOIDs)
+                {
+                    ASN1_ENCODE_OBJECT_ID(oid);
+                }
+            }
+            ASN1_END_SEQUENCE;
+        }
+        ASN1_END_ENCAPSULATED;
+    }
+    ASN1_END_SEQUENCE;
+
+exit:
+    return err;
+}
+
+CHIP_ERROR EncodeKeyUsageExtension(BitFlags<KeyUsageFlags> keyUsageFlags, ASN1Writer & writer)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ASN1_START_SEQUENCE
+    {
+        ASN1_ENCODE_OBJECT_ID(kOID_Extension_KeyUsage);
 
         // KeyUsage extension MUST be marked as critical.
         ASN1_ENCODE_BOOLEAN(true);
         ASN1_START_OCTET_STRING_ENCAPSULATED
         {
-            ASN1_ENCODE_BIT_STRING(keyUsageBits);
+            ASN1_ENCODE_BIT_STRING(keyUsageFlags.Raw());
         }
         ASN1_END_ENCAPSULATED;
     }
@@ -157,12 +179,9 @@ CHIP_ERROR EncodeKeyUsageExtension(uint16_t keyUsageBits, ASN1Writer & writer)
 CHIP_ERROR EncodeIsCAExtension(IsCACert isCA, ASN1Writer & writer)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-
     ASN1_START_SEQUENCE
     {
-        OID extensionOID = GetOID(kOIDCategory_Extension, static_cast<uint8_t>(kTag_BasicConstraints));
-
-        ASN1_ENCODE_OBJECT_ID(extensionOID);
+        ASN1_ENCODE_OBJECT_ID(kOID_Extension_BasicConstraints);
 
         // BasicConstraints extension MUST be marked as critical.
         ASN1_ENCODE_BOOLEAN(true);
@@ -191,46 +210,17 @@ CHIP_ERROR EncodeIsCAExtension(IsCACert isCA, ASN1Writer & writer)
 CHIP_ERROR EncodeCASpecificExtensions(ASN1Writer & writer)
 {
     ReturnErrorOnFailure(EncodeIsCAExtension(kCACert, writer));
-
-    uint16_t keyUsageBits = static_cast<uint16_t>(KeyUsageFlags::kKeyCertSign) | static_cast<uint16_t>(KeyUsageFlags::kCRLSign);
-
-    ReturnErrorOnFailure(EncodeKeyUsageExtension(keyUsageBits, writer));
-
+    ReturnErrorOnFailure(
+        EncodeKeyUsageExtension(BitFlags<KeyUsageFlags>(KeyUsageFlags::kKeyCertSign, KeyUsageFlags::kCRLSign), writer));
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR EncodeNOCSpecificExtensions(ASN1Writer & writer)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    uint16_t keyUsageBits = static_cast<uint16_t>(KeyUsageFlags::kDigitalSignature);
-
     ReturnErrorOnFailure(EncodeIsCAExtension(kNotCACert, writer));
-    ReturnErrorOnFailure(EncodeKeyUsageExtension(keyUsageBits, writer));
-
-    ASN1_START_SEQUENCE
-    {
-        OID extensionOID = GetOID(kOIDCategory_Extension, static_cast<uint8_t>(kTag_ExtendedKeyUsage));
-
-        ASN1_ENCODE_OBJECT_ID(extensionOID);
-
-        // ExtKeyUsage extension MUST be marked as critical.
-        ASN1_ENCODE_BOOLEAN(true);
-        ASN1_START_OCTET_STRING_ENCAPSULATED
-        {
-            ASN1_START_SEQUENCE
-            {
-                ASN1_ENCODE_OBJECT_ID(kOID_KeyPurpose_ClientAuth);
-                ASN1_ENCODE_OBJECT_ID(kOID_KeyPurpose_ServerAuth);
-            }
-            ASN1_END_SEQUENCE;
-        }
-        ASN1_END_ENCAPSULATED;
-    }
-    ASN1_END_SEQUENCE;
-
-exit:
-    return err;
+    ReturnErrorOnFailure(EncodeKeyUsageExtension(KeyUsageFlags::kDigitalSignature, writer));
+    ReturnErrorOnFailure(EncodeExtKeyUsageExtension({ kOID_KeyPurpose_ClientAuth, kOID_KeyPurpose_ServerAuth }, writer));
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR EncodeFutureExtension(const Optional<FutureExtension> & futureExt, ASN1Writer & writer)
@@ -323,8 +313,6 @@ CHIP_ERROR EncodeChipECDSASignature(Crypto::P256ECDSASignature & signature, ASN1
     return err;
 }
 
-} // namespace
-
 CHIP_ERROR EncodeTBSCert(const X509CertRequestParams & requestParams, const Crypto::P256PublicKey & subjectPubkey,
                          const Crypto::P256PublicKey & issuerPubkey, ASN1Writer & writer)
 {
@@ -377,8 +365,63 @@ CHIP_ERROR EncodeTBSCert(const X509CertRequestParams & requestParams, const Cryp
     return err;
 }
 
+} // namespace
+
+CHIP_ERROR EncodeNetworkIdentityTBSCert(const P256PublicKey & pubkey, ASN1Writer & writer)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ChipDN issuerAndSubject;
+    InitNetworkIdentitySubject(issuerAndSubject);
+
+    ASN1_START_SEQUENCE
+    {
+        // version [0] EXPLICIT Version DEFAULT v1
+        ASN1_START_CONSTRUCTED(kASN1TagClass_ContextSpecific, 0)
+        {
+            ASN1_ENCODE_INTEGER(2); // Version ::= INTEGER { v1(0), v2(1), v3(2) }
+        }
+        ASN1_END_CONSTRUCTED;
+
+        ReturnErrorOnFailure(writer.PutInteger(kNetworkIdentitySerialNumber));
+
+        ASN1_START_SEQUENCE
+        {
+            ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256);
+        }
+        ASN1_END_SEQUENCE;
+
+        // issuer Name
+        ReturnErrorOnFailure(issuerAndSubject.EncodeToASN1(writer));
+
+        // validity Validity,
+        ReturnErrorOnFailure(EncodeValidity(kNetworkIdentityNotBeforeTime, kNetworkIdentityNotAfterTime, writer));
+
+        // subject Name
+        ReturnErrorOnFailure(issuerAndSubject.EncodeToASN1(writer));
+
+        ReturnErrorOnFailure(EncodeSubjectPublicKeyInfo(pubkey, writer));
+
+        // certificate extensions
+        ASN1_START_CONSTRUCTED(kASN1TagClass_ContextSpecific, 3)
+        {
+            ASN1_START_SEQUENCE
+            {
+                EncodeIsCAExtension(kNotCACert, writer);
+                EncodeKeyUsageExtension(KeyUsageFlags::kDigitalSignature, writer);
+                EncodeExtKeyUsageExtension({ kOID_KeyPurpose_ClientAuth, kOID_KeyPurpose_ServerAuth }, writer);
+            }
+            ASN1_END_SEQUENCE;
+        }
+        ASN1_END_CONSTRUCTED;
+    }
+    ASN1_END_SEQUENCE;
+
+exit:
+    return err;
+}
+
 CHIP_ERROR NewChipX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256PublicKey & subjectPubkey,
-                           Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert)
+                           const Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     ASN1Writer writer;
@@ -411,7 +454,7 @@ CHIP_ERROR NewChipX509Cert(const X509CertRequestParams & requestParams, const Cr
     return err;
 }
 
-DLL_EXPORT CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParams, Crypto::P256Keypair & issuerKeypair,
+DLL_EXPORT CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256Keypair & issuerKeypair,
                                       MutableByteSpan & x509Cert)
 {
     CertType certType;
@@ -424,7 +467,7 @@ DLL_EXPORT CHIP_ERROR NewRootX509Cert(const X509CertRequestParams & requestParam
 }
 
 DLL_EXPORT CHIP_ERROR NewICAX509Cert(const X509CertRequestParams & requestParams, const Crypto::P256PublicKey & subjectPubkey,
-                                     Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert)
+                                     const Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert)
 {
     CertType certType;
 
@@ -438,8 +481,8 @@ DLL_EXPORT CHIP_ERROR NewICAX509Cert(const X509CertRequestParams & requestParams
 }
 
 DLL_EXPORT CHIP_ERROR NewNodeOperationalX509Cert(const X509CertRequestParams & requestParams,
-                                                 const Crypto::P256PublicKey & subjectPubkey, Crypto::P256Keypair & issuerKeypair,
-                                                 MutableByteSpan & x509Cert)
+                                                 const Crypto::P256PublicKey & subjectPubkey,
+                                                 const Crypto::P256Keypair & issuerKeypair, MutableByteSpan & x509Cert)
 {
     CertType certType;
 
diff --git a/src/credentials/tests/CHIPCert_test_vectors.cpp b/src/credentials/tests/CHIPCert_test_vectors.cpp
index eb84e7d3dabb11..90de7a9a8c722f 100644
--- a/src/credentials/tests/CHIPCert_test_vectors.cpp
+++ b/src/credentials/tests/CHIPCert_test_vectors.cpp
@@ -50,6 +50,7 @@ extern const TestCert gTestCerts[] = {
     TestCert::kNode02_06,
     TestCert::kNode02_07,
     TestCert::kNode02_08,
+    TestCert::kPDCID01,
 };
 // clang-format on
 
@@ -87,6 +88,7 @@ CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFl
     SELECT_CERT(Node02_06);
     SELECT_CERT(Node02_07);
     SELECT_CERT(Node02_08);
+    SELECT_CERT(PDCID01);
 
 #undef SELECT_CERT
 
@@ -123,6 +125,7 @@ const char * GetTestCertName(TestCert certType)
     NAME_CERT(Node02_06);
     NAME_CERT(Node02_07);
     NAME_CERT(Node02_08);
+    NAME_CERT(PDCID01);
 
 #undef NAME_CERT
 
@@ -160,6 +163,7 @@ CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey)
     SELECT_PUBKEY(Node02_06);
     SELECT_PUBKEY(Node02_07);
     SELECT_PUBKEY(Node02_08);
+    SELECT_PUBKEY(PDCID01);
 
 #undef SELECT_PUBKEY
 
@@ -200,6 +204,7 @@ CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid)
     SELECT_SKID(Node02_06);
     SELECT_SKID(Node02_07);
     SELECT_SKID(Node02_08);
+    SELECT_SKID(PDCID01);
 
 #undef SELECT_SKID
 
@@ -240,6 +245,7 @@ CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid)
     SELECT_AKID(Node02_06);
     SELECT_AKID(Node02_07);
     SELECT_AKID(Node02_08);
+    SELECT_AKID(PDCID01);
 
 #undef SELECT_AKID
 
@@ -249,6 +255,14 @@ CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid)
     return err;
 }
 
+CHIP_ERROR DecodeTestCert(ChipCertificateData & certData, TestCert certType)
+{
+    ByteSpan cert;
+    ReturnErrorOnFailure(GetTestCert(certType, {}, cert));
+    ReturnErrorOnFailure(DecodeChipCert(cert, certData));
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                         BitFlags<CertDecodeFlags> decodeFlags)
 {
@@ -2450,5 +2464,118 @@ extern constexpr ByteSpan sTestCert_Node02_08_AuthorityKeyId((const uint8_t[]){
     0xE1, 0xE7, 0x6E, 0x67, 0x77, 0x85, 0x1D, 0xD7, 0x74, 0x16, 0xBD, 0xDD, 0x35, 0xEC, 0x3C, 0x13, 0x7C, 0x47, 0x29, 0xDC,
 });
 
+/**************  Test PDCID01 Certificate  **************
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: ecdsa-with-SHA256
+        Issuer: CN=*
+        Validity
+            Not Before: Jan  1 00:00:01 2000 GMT
+            Not After : Dec 31 23:59:59 9999 GMT
+        Subject: CN=*
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (256 bit)
+                pub:
+                    04:39:cc:d4:ac:7e:59:68:bd:f1:b0:80:11:1d:92:
+                    53:64:94:fc:51:62:4c:70:aa:6d:73:08:da:ed:f3:
+                    a1:5e:38:69:17:7b:1b:f3:d0:90:47:eb:f0:6b:e8:
+                    dd:17:be:23:f2:fb:3d:63:90:c6:cf:82:80:2f:62:
+                    d0:53:62:c0:08
+                ASN1 OID: prime256v1
+                NIST CURVE: P-256
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:FALSE
+            X509v3 Key Usage: critical
+                Digital Signature
+            X509v3 Extended Key Usage: critical
+                TLS Web Client Authentication, TLS Web Server Authentication
+    Signature Algorithm: ecdsa-with-SHA256
+         30:45:02:21:00:e9:43:b6:16:f3:1a:f3:81:52:e7:37:41:f7:
+         47:28:db:7d:56:87:b5:94:c0:2e:0f:5f:ee:3a:60:bf:36:44:
+         a9:02:20:1c:85:2c:fd:6b:15:d8:f8:fe:19:93:4d:af:2f:91:
+         93:fd:2c:bc:4e:23:50:0a:31:7d:a4:a0:79:b2:db:69:42
+
+-----BEGIN CERTIFICATE-----
+MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMAwxCjAIBgNVBAMMASowIBcNMDAw
+MTAxMDAwMDAxWhgPOTk5OTEyMzEyMzU5NTlaMAwxCjAIBgNVBAMMASowWTATBgcq
+hkjOPQIBBggqhkjOPQMBBwNCAAQ5zNSsfllovfGwgBEdklNklPxRYkxwqm1zCNrt
+86FeOGkXexvz0JBH6/Br6N0XviPy+z1jkMbPgoAvYtBTYsAIo0IwQDAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwCgYIKoZIzj0EAwIDSAAwRQIhAOlDthbzGvOBUuc3QfdHKNt9Voe1
+lMAuD1/uOmC/NkSpAiAchSz9axXY+P4Zk02vL5GT/Sy8TiNQCjF9pKB5sttpQg==
+-----END CERTIFICATE-----
+
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAgMqGL8i1LKFupDgkl42mQgn1XS3oMd7nCENcUEwV6roAoGCCqGSM49
+AwEHoUQDQgAEOczUrH5ZaL3xsIARHZJTZJT8UWJMcKptcwja7fOhXjhpF3sb89CQ
+R+vwa+jdF74j8vs9Y5DGz4KAL2LQU2LACA==
+-----END EC PRIVATE KEY-----
+*/
+
+extern constexpr ByteSpan sTestCert_PDCID01_Chip((const uint8_t[]){
+    0x15, 0x30, 0x01, 0x01, 0x01, 0x24, 0x02, 0x01, 0x37, 0x03, 0x2c, 0x01, 0x01, 0x2a, 0x18, 0x24, 0x04, 0x01, 0x24, 0x05, 0x00,
+    0x37, 0x06, 0x2c, 0x01, 0x01, 0x2a, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x39, 0xcc, 0xd4, 0xac,
+    0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0, 0x80, 0x11, 0x1d, 0x92, 0x53, 0x64, 0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73,
+    0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e, 0x38, 0x69, 0x17, 0x7b, 0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17,
+    0xbe, 0x23, 0xf2, 0xfb, 0x3d, 0x63, 0x90, 0xc6, 0xcf, 0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0x37, 0x0a, 0x35,
+    0x01, 0x28, 0x01, 0x18, 0x24, 0x02, 0x01, 0x36, 0x03, 0x04, 0x02, 0x04, 0x01, 0x18, 0x18, 0x30, 0x0b, 0x40, 0xe9, 0x43, 0xb6,
+    0x16, 0xf3, 0x1a, 0xf3, 0x81, 0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f,
+    0x5f, 0xee, 0x3a, 0x60, 0xbf, 0x36, 0x44, 0xa9, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf,
+    0x2f, 0x91, 0x93, 0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42, 0x18,
+});
+
+extern constexpr ByteSpan sTestCert_PDCID01_ChipCompact((const uint8_t[]){
+    0x15, 0x30, 0x09, 0x41, 0x04, 0x39, 0xcc, 0xd4, 0xac, 0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0, 0x80, 0x11, 0x1d, 0x92, 0x53,
+    0x64, 0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73, 0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e, 0x38, 0x69, 0x17, 0x7b,
+    0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17, 0xbe, 0x23, 0xf2, 0xfb, 0x3d, 0x63, 0x90, 0xc6, 0xcf,
+    0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0x30, 0x0b, 0x40, 0xe9, 0x43, 0xb6, 0x16, 0xf3, 0x1a, 0xf3, 0x81,
+    0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f, 0x5f, 0xee, 0x3a, 0x60,
+    0xbf, 0x36, 0x44, 0xa9, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf, 0x2f, 0x91, 0x93,
+    0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42, 0x18,
+});
+
+extern constexpr ByteSpan sTestCert_PDCID01_DER((const uint8_t[]){
+    0x30, 0x82, 0x01, 0x4a, 0x30, 0x81, 0xf1, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x0c, 0x31, 0x0a, 0x30, 0x08, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x01, 0x2a, 0x30,
+    0x20, 0x17, 0x0d, 0x30, 0x30, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x31, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39,
+    0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x0c, 0x31, 0x0a, 0x30, 0x08, 0x06, 0x03, 0x55,
+    0x04, 0x03, 0x0c, 0x01, 0x2a, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
+    0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x39, 0xcc, 0xd4, 0xac, 0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0,
+    0x80, 0x11, 0x1d, 0x92, 0x53, 0x64, 0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73, 0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e,
+    0x38, 0x69, 0x17, 0x7b, 0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17, 0xbe, 0x23, 0xf2, 0xfb, 0x3d, 0x63,
+    0x90, 0xc6, 0xcf, 0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0xa3, 0x42, 0x30, 0x40, 0x30, 0x0c, 0x06, 0x03, 0x55,
+    0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04,
+    0x03, 0x02, 0x07, 0x80, 0x30, 0x20, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x01, 0x01, 0xff, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
+    0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x30, 0x0a, 0x06, 0x08,
+    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xe9, 0x43, 0xb6, 0x16, 0xf3,
+    0x1a, 0xf3, 0x81, 0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f, 0x5f, 0xee,
+    0x3a, 0x60, 0xbf, 0x36, 0x44, 0xa9, 0x02, 0x20, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf,
+    0x2f, 0x91, 0x93, 0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42,
+});
+
+extern constexpr ByteSpan sTestCert_PDCID01_PublicKey((const uint8_t[]){
+    0x04, 0x39, 0xcc, 0xd4, 0xac, 0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0, 0x80, 0x11, 0x1d, 0x92, 0x53, 0x64,
+    0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73, 0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e, 0x38, 0x69,
+    0x17, 0x7b, 0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17, 0xbe, 0x23, 0xf2, 0xfb,
+    0x3d, 0x63, 0x90, 0xc6, 0xcf, 0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08,
+});
+
+extern constexpr ByteSpan sTestCert_PDCID01_PrivateKey((const uint8_t[]){
+    0x08, 0x0c, 0xa8, 0x62, 0xfc, 0x8b, 0x52, 0xca, 0x16, 0xea, 0x43, 0x82, 0x49, 0x78, 0xda, 0x64,
+    0x20, 0x9f, 0x55, 0xd2, 0xde, 0x83, 0x1d, 0xee, 0x70, 0x84, 0x35, 0xc5, 0x04, 0xc1, 0x5e, 0xab,
+});
+
+extern constexpr ByteSpan sTestCert_PDCID01_SubjectKeyId{};
+
+extern constexpr ByteSpan sTestCert_PDCID01_AuthorityKeyId{};
+
+extern constexpr ByteSpan sTestCert_PDCID01_KeyId((const uint8_t[]){
+    0x3a, 0x0e, 0x71, 0xe2, 0x09, 0x9a, 0x49, 0xda, 0xc9, 0x74, 0xfe, 0xd0, 0x5e, 0xa5, 0x3e, 0xba, 0xce, 0x29, 0x33, 0x90,
+});
+
 } // namespace TestCerts
 } // namespace chip
diff --git a/src/credentials/tests/CHIPCert_test_vectors.h b/src/credentials/tests/CHIPCert_test_vectors.h
index 521426ee3e5084..98f600a9384611 100644
--- a/src/credentials/tests/CHIPCert_test_vectors.h
+++ b/src/credentials/tests/CHIPCert_test_vectors.h
@@ -55,6 +55,7 @@ enum TestCert
     kNode02_07 = 15,
     kNode02_08 = 16,
     kRoot03    = 17,
+    kPDCID01   = 18,
 };
 
 // Special flags to alter how certificates are fetched/loaded.
@@ -73,6 +74,8 @@ extern const char * GetTestCertName(TestCert certType);
 extern CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey);
 extern CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid);
 extern CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid);
+
+extern CHIP_ERROR DecodeTestCert(ChipCertificateData & certData, TestCert certType);
 extern CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                                BitFlags<CertDecodeFlags> decodeFlags);
 
@@ -202,5 +205,14 @@ extern const ByteSpan sTestCert_Node02_08_PrivateKey;
 extern const ByteSpan sTestCert_Node02_08_SubjectKeyId;
 extern const ByteSpan sTestCert_Node02_08_AuthorityKeyId;
 
+extern const ByteSpan sTestCert_PDCID01_Chip;
+extern const ByteSpan sTestCert_PDCID01_ChipCompact;
+extern const ByteSpan sTestCert_PDCID01_DER;
+extern const ByteSpan sTestCert_PDCID01_PublicKey;
+extern const ByteSpan sTestCert_PDCID01_PrivateKey;
+extern const ByteSpan sTestCert_PDCID01_SubjectKeyId;   // empty
+extern const ByteSpan sTestCert_PDCID01_AuthorityKeyId; // empty
+extern const ByteSpan sTestCert_PDCID01_KeyId;
+
 } // namespace TestCerts
 } // namespace chip
diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp
index ff79157815a79e..2179561367b9cc 100644
--- a/src/credentials/tests/TestChipCert.cpp
+++ b/src/credentials/tests/TestChipCert.cpp
@@ -52,55 +52,55 @@ enum
     kStandardCertsCount = 3,
 };
 
-static const BitFlags<CertDecodeFlags> sNullDecodeFlag;
-static const BitFlags<CertDecodeFlags> sGenTBSHashFlag(CertDecodeFlags::kGenerateTBSHash);
-static const BitFlags<CertDecodeFlags> sTrustAnchorFlag(CertDecodeFlags::kIsTrustAnchor);
-
-static const BitFlags<TestCertLoadFlags> sNullLoadFlag;
-static const BitFlags<TestCertLoadFlags> sDerFormFlag(TestCertLoadFlags::kDERForm);
-static const BitFlags<TestCertLoadFlags> sSupIsCAFlag(TestCertLoadFlags::kSuppressIsCA);
-static const BitFlags<TestCertLoadFlags> sSupKeyUsageFlag(TestCertLoadFlags::kSuppressKeyUsage);
-static const BitFlags<TestCertLoadFlags> sSupKeyCertSignFlag(TestCertLoadFlags::kSuppressKeyCertSign);
-static const BitFlags<TestCertLoadFlags> sPathLenZeroFlag(TestCertLoadFlags::kSetPathLenConstZero);
-
-static const BitFlags<KeyPurposeFlags> sNullKPFlag;
-static const BitFlags<KeyPurposeFlags> sSA(KeyPurposeFlags::kServerAuth);
-static const BitFlags<KeyPurposeFlags> sCA(KeyPurposeFlags::kClientAuth);
-static const BitFlags<KeyPurposeFlags> sCS(KeyPurposeFlags::kCodeSigning);
-static const BitFlags<KeyPurposeFlags> sEP(KeyPurposeFlags::kEmailProtection);
-static const BitFlags<KeyPurposeFlags> sTS(KeyPurposeFlags::kTimeStamping);
-static const BitFlags<KeyPurposeFlags> sOS(KeyPurposeFlags::kOCSPSigning);
-static const BitFlags<KeyPurposeFlags> sSAandCA(sSA, sCA);
-static const BitFlags<KeyPurposeFlags> sSAandCS(sSA, sCS);
-static const BitFlags<KeyPurposeFlags> sSAandEP(sSA, sEP);
-static const BitFlags<KeyPurposeFlags> sSAandTS(sSA, sTS);
-
-static const BitFlags<KeyUsageFlags> sNullKUFlag;
-static const BitFlags<KeyUsageFlags> sDS(KeyUsageFlags::kDigitalSignature);
-static const BitFlags<KeyUsageFlags> sNR(KeyUsageFlags::kNonRepudiation);
-static const BitFlags<KeyUsageFlags> sKE(KeyUsageFlags::kKeyEncipherment);
-static const BitFlags<KeyUsageFlags> sDE(KeyUsageFlags::kDataEncipherment);
-static const BitFlags<KeyUsageFlags> sKA(KeyUsageFlags::kKeyAgreement);
-static const BitFlags<KeyUsageFlags> sKC(KeyUsageFlags::kKeyCertSign);
-static const BitFlags<KeyUsageFlags> sCR(KeyUsageFlags::kCRLSign);
-static const BitFlags<KeyUsageFlags> sEO(KeyUsageFlags::kEncipherOnly);
-static const BitFlags<KeyUsageFlags> sDO(KeyUsageFlags::kDecipherOnly);
-static const BitFlags<KeyUsageFlags> sDSandNR(sDS, sNR);
-static const BitFlags<KeyUsageFlags> sDSandKE(sDS, sKE);
-static const BitFlags<KeyUsageFlags> sDSandDE(sDS, sDE);
-static const BitFlags<KeyUsageFlags> sDSandKA(sDS, sKA);
-static const BitFlags<KeyUsageFlags> sDSandKC(sDS, sKC);
-static const BitFlags<KeyUsageFlags> sDSandCR(sDS, sCR);
-static const BitFlags<KeyUsageFlags> sDSandEO(sDS, sEO);
-static const BitFlags<KeyUsageFlags> sDSandDO(sDS, sDO);
-static const BitFlags<KeyUsageFlags> sKCandDS(sKC, sDS);
-static const BitFlags<KeyUsageFlags> sKCandNR(sKC, sNR);
-static const BitFlags<KeyUsageFlags> sKCandKE(sKC, sKE);
-static const BitFlags<KeyUsageFlags> sKCandDE(sKC, sDE);
-static const BitFlags<KeyUsageFlags> sKCandKA(sKC, sKA);
-static const BitFlags<KeyUsageFlags> sKCandCR(sKC, sCR);
-static const BitFlags<KeyUsageFlags> sKCandEO(sKC, sEO);
-static const BitFlags<KeyUsageFlags> sKCandDO(sKC, sDO);
+static constexpr BitFlags<CertDecodeFlags> sNullDecodeFlag;
+static constexpr BitFlags<CertDecodeFlags> sGenTBSHashFlag(CertDecodeFlags::kGenerateTBSHash);
+static constexpr BitFlags<CertDecodeFlags> sTrustAnchorFlag(CertDecodeFlags::kIsTrustAnchor);
+
+static constexpr BitFlags<TestCertLoadFlags> sNullLoadFlag;
+static constexpr BitFlags<TestCertLoadFlags> sDerFormFlag(TestCertLoadFlags::kDERForm);
+static constexpr BitFlags<TestCertLoadFlags> sSupIsCAFlag(TestCertLoadFlags::kSuppressIsCA);
+static constexpr BitFlags<TestCertLoadFlags> sSupKeyUsageFlag(TestCertLoadFlags::kSuppressKeyUsage);
+static constexpr BitFlags<TestCertLoadFlags> sSupKeyCertSignFlag(TestCertLoadFlags::kSuppressKeyCertSign);
+static constexpr BitFlags<TestCertLoadFlags> sPathLenZeroFlag(TestCertLoadFlags::kSetPathLenConstZero);
+
+static constexpr BitFlags<KeyPurposeFlags> sNullKPFlag;
+static constexpr BitFlags<KeyPurposeFlags> sSA(KeyPurposeFlags::kServerAuth);
+static constexpr BitFlags<KeyPurposeFlags> sCA(KeyPurposeFlags::kClientAuth);
+static constexpr BitFlags<KeyPurposeFlags> sCS(KeyPurposeFlags::kCodeSigning);
+static constexpr BitFlags<KeyPurposeFlags> sEP(KeyPurposeFlags::kEmailProtection);
+static constexpr BitFlags<KeyPurposeFlags> sTS(KeyPurposeFlags::kTimeStamping);
+// static constexpr BitFlags<KeyPurposeFlags> sOS(KeyPurposeFlags::kOCSPSigning); // unused
+static constexpr BitFlags<KeyPurposeFlags> sSAandCA(sSA, sCA);
+static constexpr BitFlags<KeyPurposeFlags> sSAandCS(sSA, sCS);
+static constexpr BitFlags<KeyPurposeFlags> sSAandEP(sSA, sEP);
+static constexpr BitFlags<KeyPurposeFlags> sSAandTS(sSA, sTS);
+
+static constexpr BitFlags<KeyUsageFlags> sNullKUFlag;
+static constexpr BitFlags<KeyUsageFlags> sDS(KeyUsageFlags::kDigitalSignature);
+static constexpr BitFlags<KeyUsageFlags> sNR(KeyUsageFlags::kNonRepudiation);
+static constexpr BitFlags<KeyUsageFlags> sKE(KeyUsageFlags::kKeyEncipherment);
+static constexpr BitFlags<KeyUsageFlags> sDE(KeyUsageFlags::kDataEncipherment);
+static constexpr BitFlags<KeyUsageFlags> sKA(KeyUsageFlags::kKeyAgreement);
+static constexpr BitFlags<KeyUsageFlags> sKC(KeyUsageFlags::kKeyCertSign);
+static constexpr BitFlags<KeyUsageFlags> sCR(KeyUsageFlags::kCRLSign);
+static constexpr BitFlags<KeyUsageFlags> sEO(KeyUsageFlags::kEncipherOnly);
+static constexpr BitFlags<KeyUsageFlags> sDO(KeyUsageFlags::kDecipherOnly);
+static constexpr BitFlags<KeyUsageFlags> sDSandNR(sDS, sNR);
+static constexpr BitFlags<KeyUsageFlags> sDSandKE(sDS, sKE);
+static constexpr BitFlags<KeyUsageFlags> sDSandDE(sDS, sDE);
+static constexpr BitFlags<KeyUsageFlags> sDSandKA(sDS, sKA);
+static constexpr BitFlags<KeyUsageFlags> sDSandKC(sDS, sKC);
+static constexpr BitFlags<KeyUsageFlags> sDSandCR(sDS, sCR);
+static constexpr BitFlags<KeyUsageFlags> sDSandEO(sDS, sEO);
+static constexpr BitFlags<KeyUsageFlags> sDSandDO(sDS, sDO);
+static constexpr BitFlags<KeyUsageFlags> sKCandDS(sKC, sDS);
+static constexpr BitFlags<KeyUsageFlags> sKCandNR(sKC, sNR);
+static constexpr BitFlags<KeyUsageFlags> sKCandKE(sKC, sKE);
+static constexpr BitFlags<KeyUsageFlags> sKCandDE(sKC, sDE);
+static constexpr BitFlags<KeyUsageFlags> sKCandKA(sKC, sKA);
+static constexpr BitFlags<KeyUsageFlags> sKCandCR(sKC, sCR);
+static constexpr BitFlags<KeyUsageFlags> sKCandEO(sKC, sEO);
+static constexpr BitFlags<KeyUsageFlags> sKCandDO(sKC, sDO);
 
 constexpr uint8_t sOID_Extension_SubjectAltName[] = { 0x55, 0x1d, 0x11 };
 constexpr char kExtension_SubjectAltName[]        = "test@example.com";
@@ -1187,7 +1187,7 @@ static void TestChipCert_CertUsage(nlTestSuite * inSuite, void * inContext)
 static void TestChipCert_CertType(nlTestSuite * inSuite, void * inContext)
 {
     CHIP_ERROR err;
-    ChipCertificateSet certSet;
+    ChipCertificateData certData;
 
     struct TestCase
     {
@@ -1209,31 +1209,27 @@ static void TestChipCert_CertType(nlTestSuite * inSuite, void * inContext)
         {  TestCert::kNode01_02,       CertType::kNode            },
         {  TestCert::kNode02_01,       CertType::kNode            },
         {  TestCert::kNode02_02,       CertType::kNode            },
+        {  TestCert::kPDCID01,         CertType::kNetworkIdentity },
     };
     // clang-format on
     for (const auto & testCase : sTestCases)
     {
         CertType certType;
 
-        err = certSet.Init(1);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-
-        err = LoadTestCert(certSet, testCase.Cert, sNullLoadFlag, sNullDecodeFlag);
+        err = DecodeTestCert(certData, testCase.Cert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-        err = certSet.GetCertSet()->mSubjectDN.GetCertType(certType);
+        err = certData.mSubjectDN.GetCertType(certType);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
         NL_TEST_ASSERT(inSuite, certType == testCase.ExpectedCertType);
-        certSet.Release();
     }
 }
 
 static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)
 {
     CHIP_ERROR err;
-    ChipCertificateSet certSet;
-    ChipCertificateData certData[1];
+    ChipCertificateData certData;
 
     struct TestCase
     {
@@ -1255,23 +1251,26 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)
         {  TestCert::kNode01_02,       0xDEDEDEDE00010002 },
         {  TestCert::kNode02_01,       0xDEDEDEDE00020001 },
         {  TestCert::kNode02_02,       0xDEDEDEDE00020002 },
+        {  TestCert::kPDCID01,         0 },
     };
     // clang-format on
     for (const auto & testCase : sTestCases)
     {
         uint64_t chipId;
 
-        err = certSet.Init(certData, 1);
+        err = DecodeTestCert(certData, testCase.Cert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-        err = LoadTestCert(certSet, testCase.Cert, sNullLoadFlag, sNullDecodeFlag);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-
-        err = certSet.GetCertSet()->mSubjectDN.GetCertChipId(chipId);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-
-        NL_TEST_ASSERT(inSuite, chipId == testCase.ExpectedCertId);
-        certSet.Release();
+        err = certData.mSubjectDN.GetCertChipId(chipId);
+        if (testCase.ExpectedCertId != 0)
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, chipId == testCase.ExpectedCertId);
+        }
+        else
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_WRONG_CERT_DN);
+        }
     }
 }
 
@@ -2052,6 +2051,7 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi
         {  TestCert::kICA02,     expectedSubjectDN_ICA02     },
         {  TestCert::kNode01_01, expectedSubjectDN_Node01_01 },
         {  TestCert::kNode02_03, expectedSubjectDN_Node02_03 },
+        {  TestCert::kPDCID01,   {}                          },
     };
     // clang-format on
 
@@ -2065,7 +2065,11 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi
         ChipDN subjectDN;
         err = ExtractSubjectDNFromChipCert(cert, subjectDN);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-        NL_TEST_ASSERT(inSuite, subjectDN.IsEqual(testCase.ExpectedSubjectDN));
+
+        if (!testCase.ExpectedSubjectDN.IsEmpty())
+        {
+            NL_TEST_ASSERT(inSuite, subjectDN.IsEqual(testCase.ExpectedSubjectDN));
+        }
     }
 
     // Test extraction from the X509 ByteSpan form.
@@ -2078,7 +2082,11 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi
         ChipDN subjectDN;
         err = ExtractSubjectDNFromX509Cert(cert, subjectDN);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-        NL_TEST_ASSERT(inSuite, subjectDN.IsEqual(testCase.ExpectedSubjectDN));
+
+        if (!testCase.ExpectedSubjectDN.IsEmpty())
+        {
+            NL_TEST_ASSERT(inSuite, subjectDN.IsEqual(testCase.ExpectedSubjectDN));
+        }
     }
 }
 
@@ -2110,6 +2118,7 @@ static void TestChipCert_ExtractPublicKeyAndSKID(nlTestSuite * inSuite, void * i
         {  TestCert::kNode02_06, sTestCert_Node02_06_PublicKey, sTestCert_Node02_06_SubjectKeyId },
         {  TestCert::kNode02_07, sTestCert_Node02_07_PublicKey, sTestCert_Node02_07_SubjectKeyId },
         {  TestCert::kNode02_08, sTestCert_Node02_08_PublicKey, sTestCert_Node02_08_SubjectKeyId },
+        {  TestCert::kPDCID01,   sTestCert_PDCID01_PublicKey,   ByteSpan() },
     };
     // clang-format on
 
@@ -2126,11 +2135,62 @@ static void TestChipCert_ExtractPublicKeyAndSKID(nlTestSuite * inSuite, void * i
 
         CertificateKeyId skid;
         err = ExtractSKIDFromChipCert(cert, skid);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-        NL_TEST_ASSERT(inSuite, skid.data_equal(testCase.ExpectedSKID));
+        if (!testCase.ExpectedSKID.empty())
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, skid.data_equal(testCase.ExpectedSKID));
+        }
+        else
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_NOT_FOUND);
+        }
     }
 }
 
+static void TestChipCert_PDCIdentityValidation(nlTestSuite * inSuite, void * inContext)
+{
+    CertificateKeyIdStorage keyId;
+
+    // Test with both the full and compact TLV representations
+    for (auto && cert : { sTestCert_PDCID01_Chip, sTestCert_PDCID01_ChipCompact })
+    {
+        // Validate only
+        NL_TEST_ASSERT(inSuite, ValidateChipNetworkIdentity(cert) == CHIP_NO_ERROR);
+
+        // Validate and calculate identifier
+        keyId.fill(0xaa);
+        NL_TEST_ASSERT(inSuite, ValidateChipNetworkIdentity(cert, keyId) == CHIP_NO_ERROR);
+        NL_TEST_ASSERT(inSuite, CertificateKeyId(keyId).data_equal(sTestCert_PDCID01_KeyId));
+
+        // Extract identifier only
+        keyId.fill(0xaa);
+        NL_TEST_ASSERT(inSuite, ExtractIdentifierFromChipNetworkIdentity(cert, keyId) == CHIP_NO_ERROR);
+        NL_TEST_ASSERT(inSuite, CertificateKeyId(keyId).data_equal(sTestCert_PDCID01_KeyId));
+    }
+}
+
+static void TestChipCert_PDCIdentityGeneration(nlTestSuite * inSuite, void * inContext)
+{
+    // Generate a new keypair
+    P256Keypair keypair;
+    NL_TEST_ASSERT(inSuite, keypair.Initialize(ECPKeyTarget::ECDSA) == CHIP_NO_ERROR);
+
+    // Generate an identity certificate based on the keypair
+    uint8_t buffer[kMaxCHIPCompactNetworkIdentityLength];
+    MutableByteSpan cert(buffer);
+    NL_TEST_ASSERT(inSuite, NewChipNetworkIdentity(keypair, cert) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, ValidateChipNetworkIdentity(cert) == CHIP_NO_ERROR);
+
+    // It should round-trip to X.509 DER and back, and remain valid.
+    uint8_t derBuffer[kMaxDERCertLength];
+    MutableByteSpan derCert(derBuffer);
+    NL_TEST_ASSERT(inSuite, ConvertChipCertToX509Cert(cert, derCert) == CHIP_NO_ERROR);
+    uint8_t tlvBuffer[kMaxCHIPCertLength];
+    MutableByteSpan tlvCert(tlvBuffer); // won't be compact after round-tripping
+    NL_TEST_ASSERT(inSuite, ConvertX509CertToChipCert(derCert, tlvCert) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, ValidateChipNetworkIdentity(tlvCert) == CHIP_NO_ERROR);
+}
+
 /**
  *  Set up the test suite.
  */
@@ -2189,6 +2249,8 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test extracting and validating CASE Authenticated Tags from NOC", TestChipCert_ExtractAndValidateCATsFromOpCert),
     NL_TEST_DEF("Test extracting Subject DN from chip certificate", TestChipCert_ExtractSubjectDNFromChipCert),
     NL_TEST_DEF("Test extracting PublicKey and SKID from chip certificate", TestChipCert_ExtractPublicKeyAndSKID),
+    NL_TEST_DEF("Test PDC Identity Validation", TestChipCert_PDCIdentityValidation),
+    NL_TEST_DEF("Test PDC Identity Generation", TestChipCert_PDCIdentityGeneration),
     NL_TEST_SENTINEL()
 };
 // clang-format on
diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp
index 2226b399e75bce..8dd65192441aea 100644
--- a/src/credentials/tests/TestFabricTable.cpp
+++ b/src/credentials/tests/TestFabricTable.cpp
@@ -943,7 +943,7 @@ void TestBasicAddNocUpdateNocFlow(nlTestSuite * inSuite, void * inContext)
     // Sequence 4: Rename fabric index 2, applies immediately when nothing pending
     {
         NL_TEST_ASSERT_EQUALS(inSuite, fabricTable.FabricCount(), 2);
-        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(2, CharSpan("roboto")));
+        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(2, "roboto"_span));
         NL_TEST_ASSERT_EQUALS(inSuite, fabricTable.FabricCount(), 2);
 
         NL_TEST_ASSERT_EQUALS(inSuite, storage.GetNumKeys(), numStorageAfterUpdate); // Number of keys unchanged
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index a79961dbe07c99..38343a60d52e5c 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -2201,8 +2201,15 @@ static void TestSKID_x509Extraction(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
         err = ExtractSKIDFromX509Cert(cert, skidOut);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-        NL_TEST_ASSERT(inSuite, skidSpan.data_equal(skidOut));
+        if (!skidSpan.empty())
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, skidSpan.data_equal(skidOut));
+        }
+        else
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_NOT_FOUND);
+        }
     }
 }
 
@@ -2228,8 +2235,15 @@ static void TestAKID_x509Extraction(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
         err = ExtractAKIDFromX509Cert(cert, akidOut);
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-        NL_TEST_ASSERT(inSuite, akidSpan.data_equal(akidOut));
+        if (!akidSpan.empty())
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, akidSpan.data_equal(akidOut));
+        }
+        else
+        {
+            NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_NOT_FOUND);
+        }
     }
 }
 
diff --git a/src/darwin/Framework/CHIP/MTRCluster.h b/src/darwin/Framework/CHIP/MTRCluster.h
index d8d0b5dbf26923..f4a6887b476aa4 100644
--- a/src/darwin/Framework/CHIP/MTRCluster.h
+++ b/src/darwin/Framework/CHIP/MTRCluster.h
@@ -29,6 +29,7 @@ typedef void (^MTRStatusCompletion)(NSError * _Nullable error);
 typedef void (^MTRSubscriptionEstablishedHandler)(void);
 
 @class MTRBaseDevice;
+@class MTRDevice;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -46,6 +47,24 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSNumber * endpointID NS_REFINED_FOR_SWIFT MTR_NEWLY_AVAILABLE;
 @end
 
+/**
+ * Base for all MTRBaseCluster* types.
+ */
+MTR_NEWLY_AVAILABLE
+@interface MTRGenericBaseCluster : MTRCluster
+@end
+
+/**
+ * Base for all MTRCluster* types.
+ */
+MTR_NEWLY_AVAILABLE
+@interface MTRGenericCluster : MTRCluster
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, strong, readonly) MTRDevice * device;
+@end
+
 /**
  * MTRWriteParams
  *    This is used to control the behavior of cluster writes.
diff --git a/src/darwin/Framework/CHIP/MTRCluster.mm b/src/darwin/Framework/CHIP/MTRCluster.mm
index 55c36ec04dbd72..27324cde294b85 100644
--- a/src/darwin/Framework/CHIP/MTRCluster.mm
+++ b/src/darwin/Framework/CHIP/MTRCluster.mm
@@ -36,6 +36,30 @@ - (instancetype)initWithEndpointID:(NSNumber *)endpointID queue:(dispatch_queue_
 
 @end
 
+@implementation MTRGenericBaseCluster
+
+- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+{
+    if (self = [super initWithEndpointID:endpointID queue:queue]) {
+        _device = device;
+    }
+    return self;
+}
+
+@end
+
+@implementation MTRGenericCluster
+
+- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+{
+    if (self = [super initWithEndpointID:endpointID queue:queue]) {
+        _device = device;
+    }
+    return self;
+}
+
+@end
+
 @implementation MTRWriteParams
 - (instancetype)init
 {
diff --git a/src/darwin/Framework/CHIP/MTRCluster_Internal.h b/src/darwin/Framework/CHIP/MTRCluster_Internal.h
index fa9ad17586027f..937c110a4ea171 100644
--- a/src/darwin/Framework/CHIP/MTRCluster_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRCluster_Internal.h
@@ -17,11 +17,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MTRBaseDevice.h"
-#import "MTRBaseDevice_Internal.h"
-#import "MTRCluster.h"
+#import <Matter/MTRBaseDevice.h>
+#import <Matter/MTRCluster.h>
+#import <Matter/MTRDevice.h>
 
-#import "zap-generated/MTRBaseClusters.h"
+#import "MTRBaseDevice_Internal.h"
 
 #include <app/ReadPrepareParams.h>
 #include <lib/core/DataModelTypes.h>
@@ -35,6 +35,20 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithEndpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue;
 @end
 
+@interface MTRGenericBaseCluster ()
+- (instancetype)initWithDevice:(MTRBaseDevice *)device
+                    endpointID:(NSNumber *)endpointID
+                         queue:(dispatch_queue_t)queue;
+
+@property (nonatomic, strong, readonly) MTRBaseDevice * device;
+@end
+
+@interface MTRGenericCluster ()
+- (instancetype)initWithDevice:(MTRDevice *)device
+                    endpointID:(NSNumber *)endpointID
+                         queue:(dispatch_queue_t)queue;
+@end
+
 @interface MTRReadParams ()
 /**
  * Copy state from this MTRReadParams to the ReadPreparaParams.
diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
index 00ff4b99310f87..97d918297327d5 100644
--- a/src/darwin/Framework/CHIP/MTRDefines.h
+++ b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -67,11 +67,11 @@
 #if MTR_ENABLE_PROVISIONAL
 #define MTR_PROVISIONALLY_AVAILABLE MTR_NEWLY_AVAILABLE
 #else
-#define MTR_PROVISIONALLY_AVAILABLE API_UNAVAILABLE(ios, macos, tvos, watchos) MTR_HIDDEN
+#define MTR_PROVISIONALLY_AVAILABLE NS_UNAVAILABLE MTR_HIDDEN
 #endif
 
 #ifndef MTR_PER_CONTROLLER_STORAGE_ENABLED
-#define MTR_PER_CONTROLLER_STORAGE_ENABLED 0
+#define MTR_PER_CONTROLLER_STORAGE_ENABLED 1
 #endif
 
 #pragma mark - Types
diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h
index f8da13aac1c181..52399e7fd9f078 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.h
+++ b/src/darwin/Framework/CHIP/MTRDevice.h
@@ -96,11 +96,15 @@ typedef NS_ENUM(NSUInteger, MTRDeviceState) {
 - (void)setDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue;
 
 /**
- * Read attribute in a designated attribute path
+ * Read attribute in a designated attribute path.  If there is no value available
+ * for the attribute, whether because the device does not implement it or
+ * because the subscription priming read has not yet gotten to this attribute,
+ * nil will be returned.
  *
- * TODO: Need to document that this returns "the system's best guess" of attribute values.
+ * TODO: Need to fully document that this returns "the system's best guess" of attribute values.
  *
- * @return a data-value dictionary of the attribute as described in MTRDeviceResponseHandler
+ * @return a data-value dictionary of the attribute as described in MTRDeviceResponseHandler,
+ *         or nil if there is no value.
  */
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeWithEndpointID:(NSNumber *)endpointID
                                                               clusterID:(NSNumber *)clusterID
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 0bcac1e96bd618..8806d95b0001c4 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -910,9 +910,8 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
     // 1. The attribute is not in the specification (so we don't know whether hasChangesOmittedQuality can be trusted).
     // 2. Subscription not in a state we can expect reports
     // 3. There is subscription but attribute has Changes Omitted quality
-    // 4. Cache has no entry
     // TODO: add option for BaseSubscriptionCallback to report during priming, to reduce when case 4 is hit
-    if (!attributeIsSpecified || ![self _subscriptionAbleToReport] || hasChangesOmittedQuality || !attributeValueToReturn) {
+    if (!attributeIsSpecified || ![self _subscriptionAbleToReport] || hasChangesOmittedQuality) {
         // Read requests container will be a mutable array of items, each being an array containing:
         //   [attribute request path, params]
         // Batching handler should only coalesce when params are equal.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h
index cef43549da5eb0..24bae8325b5212 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h
@@ -16,7 +16,7 @@
  */
 
 #include <lib/core/NodeId.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #include <Matter/MTRDeviceAttestationDelegate.h>
 #include <credentials/attestation_verifier/DeviceAttestationDelegate.h>
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.h b/src/darwin/Framework/CHIP/MTRDeviceController.h
index d4e79f594181a3..e830f024d8d155 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.h
@@ -24,7 +24,7 @@
 @class MTRBaseDevice;
 
 #if MTR_PER_CONTROLLER_STORAGE_ENABLED
-@class MTRDeviceControllerParameters;
+@class MTRDeviceControllerAbstractParameters;
 #endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 NS_ASSUME_NONNULL_BEGIN
@@ -58,7 +58,7 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
  * Once this returns non-nil, it's the caller's resposibility to call shutdown
  * on the controller to avoid leaking it.
  */
-- (nullable instancetype)initWithParameters:(MTRDeviceControllerParameters *)parameters
+- (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters
                                       error:(NSError * __autoreleasing *)error MTR_NEWLY_AVAILABLE;
 #endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index d4c5903c93077d..04f92e8e3bdf1a 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -51,7 +51,7 @@
 #import "MTRDeviceAttestationDelegateBridge.h"
 #import "MTRDeviceConnectionBridge.h"
 
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/data-model/List.h>
@@ -127,8 +127,17 @@ @interface MTRDeviceController () {
 
 @implementation MTRDeviceController
 
-- (nullable instancetype)initWithParameters:(MTRDeviceControllerParameters *)parameters error:(NSError * __autoreleasing *)error
+- (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters error:(NSError * __autoreleasing *)error
 {
+    if (![parameters isKindOfClass:MTRDeviceControllerParameters.class]) {
+        MTR_LOG_ERROR("Unsupported type of MTRDeviceControllerAbstractParameters: %@", parameters);
+
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_ARGUMENT];
+        }
+        return nil;
+    }
+
     __auto_type * factory = [MTRDeviceControllerFactory sharedInstance];
     if (!factory.isRunning) {
         auto * params = [[MTRDeviceControllerFactoryParams alloc] initWithoutStorage];
@@ -138,7 +147,9 @@ - (nullable instancetype)initWithParameters:(MTRDeviceControllerParameters *)par
         }
     }
 
-    return [factory initializeController:self withParameters:parameters error:error];
+    auto * parametersForFactory = static_cast<MTRDeviceControllerParameters *>(parameters);
+
+    return [factory initializeController:self withParameters:parametersForFactory error:error];
 }
 
 - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h
index d13331f46bd2ac..d5b131d21ae8d9 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h
@@ -19,7 +19,7 @@
 
 #include <controller/CHIPDeviceController.h>
 #include <controller/CommissioningDelegate.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
index bcbea7902b6083..b9c72d5598f92b 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
@@ -28,14 +28,29 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ * Parameters that can be used to initialize an MTRDeviceController.  Specific
+ * interfaces inheriting from this one should be used to actually do the
+ * initialization.
+ */
 #if !MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_HIDDEN
 #endif
 MTR_NEWLY_AVAILABLE
-@interface MTRDeviceControllerParameters : NSObject
-
+@interface MTRDeviceControllerAbstractParameters : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
+@end
+
+/**
+ * Parameters that can be used to initialize an MTRDeviceController which
+ * has a node identity.
+ */
+#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
+MTR_HIDDEN
+#endif
+MTR_NEWLY_AVAILABLE
+@interface MTRDeviceControllerParameters : MTRDeviceControllerAbstractParameters
 
 /**
  * The Product Attestation Authority certificates that are trusted to sign
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
index 8ad185198b5330..74a9681ca3e619 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
@@ -251,6 +251,13 @@ - (instancetype)initWithOperationalKeypair:(id<MTRKeypair>)operationalKeypair
 
 @end
 
+@implementation MTRDeviceControllerAbstractParameters
+- (instancetype)_initInternal
+{
+    return [super init];
+}
+@end
+
 @implementation MTRDeviceControllerParameters
 - (instancetype)initWithStorageDelegate:(id<MTRDeviceControllerStorageDelegate>)storageDelegate
                    storageDelegateQueue:(dispatch_queue_t)storageDelegateQueue
@@ -262,7 +269,7 @@ - (instancetype)initWithStorageDelegate:(id<MTRDeviceControllerStorageDelegate>)
                 intermediateCertificate:(MTRCertificateDERBytes _Nullable)intermediateCertificate
                         rootCertificate:(MTRCertificateDERBytes)rootCertificate
 {
-    if (!(self = [super init])) {
+    if (!(self = [super _initInternal])) {
         return nil;
     }
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
index 2850fc78258486..71e6a74f5688f3 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
@@ -52,6 +52,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithParams:(MTRDeviceControllerStartupParams *)params;
 @end
 
+@interface MTRDeviceControllerAbstractParameters ()
+// Allow init from our subclasses.
+- (instancetype)_initInternal;
+@end
+
 @interface MTRDeviceControllerParameters ()
 
 - (instancetype)initWithStorageDelegate:(id<MTRDeviceControllerStorageDelegate>)storageDelegate
diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
index 71ee2e6c198f50..888e3ddba38bfc 100644
--- a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
+++ b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
@@ -273,8 +273,7 @@
         ReturnErrorOnFailure(reader.Next());
     }
 
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_WRONG_TLV_TYPE);
-    VerifyOrReturnError(reader.GetTag() == AnonymousTag(), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(reader.Expect(kTLVType_Structure, AnonymousTag()));
 
     TLVType containerType;
     ReturnErrorOnFailure(reader.EnterContainer(containerType));
diff --git a/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt
index 2b70a99a06701d..cac0769e095c0d 100644
--- a/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt
@@ -24,9 +24,6 @@ static id _Nullable DecodeGlobalAttributeValue(AttributeId aAttributeId, TLV::TL
         {{#zcl_attributes_server removeKeys='isOptional'}}
         {{#unless clusterRef}}
         {{#if (isSupported "" globalAttribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        {{#if (isProvisional "" globalAttribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        #if MTR_ENABLE_PROVISIONAL
-        {{/if}}
         case Attributes::{{asUpperCamelCase name}}::Id: {
             using TypeInfo = Attributes::{{asUpperCamelCase name}}::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -39,9 +36,6 @@ static id _Nullable DecodeGlobalAttributeValue(AttributeId aAttributeId, TLV::TL
             {{>decode_value target="value" source="cppValue" cluster="" errorCode="*aError = err; return nil;" depth=0}}
             return value;
         }
-        {{#if (isProvisional "" globalAttribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        #endif // MTR_ENABLE_PROVISIONAL
-        {{/if}}
         {{/if}}
         {{/unless}}
         {{/zcl_attributes_server}}
@@ -63,9 +57,6 @@ static id _Nullable DecodeAttributeValueFor{{asUpperCamelCase name preserveAcron
         {{#zcl_attributes_server removeKeys='isOptional'}}
         {{#if clusterRef}}
         {{#if (isSupported (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        {{#if (isProvisional (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        #if MTR_ENABLE_PROVISIONAL
-        {{/if}}
         case Attributes::{{asUpperCamelCase name}}::Id: {
             using TypeInfo = Attributes::{{asUpperCamelCase name}}::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -78,9 +69,6 @@ static id _Nullable DecodeAttributeValueFor{{asUpperCamelCase name preserveAcron
             {{>decode_value target="value" source="cppValue" cluster=parent.name errorCode="*aError = err; return nil;" depth=0}}
             return value;
         }
-        {{#if (isProvisional (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
-        #endif // MTR_ENABLE_PROVISIONAL
-        {{/if}}
         {{/if}}
         {{/if}}
         {{/zcl_attributes_server}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
index fa249b734ee90a..fb303d5589d2be 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
@@ -49,18 +49,6 @@ public:
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @implementation MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}}
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
 {{! Takes two arguments: cluster name and command name, plus the ambient state where the command is "this" }}
@@ -151,7 +139,8 @@ MTR{{cluster}}Cluster{{command}}Params
                                         completion:completion];
 }
 
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name}})value completion:(MTRStatusCompletion)completion
 {
   [self write{{>attribute}}WithValue:({{asObjectiveCType type parent.name}})value params:nil completion:completion];
@@ -292,7 +281,8 @@ reportHandler:(void (^)({{asObjectiveCClass type parent.name}} * _Nullable value
         completionHandler(static_cast<{{asObjectiveCClass type parent.name compatRemapClusterName=true}} *>(value), error);
       }];
 }
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name compatRemapClusterName=true}})value completionHandler:(MTRStatusCompletion)completionHandler
 {
   [self writeAttribute{{asUpperCamelCase name preserveAcronyms=true}}WithValue:value params:nil completion:completionHandler];
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
index 71a37db8356c94..edd4f05e4a27b4 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -17,15 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  * {{description}}
  */
 {{availability (asUpperCamelCase name preserveAcronyms=true)}}
-@interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
+@interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRGenericBaseCluster
 
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
@@ -65,7 +57,8 @@ NS_ASSUME_NONNULL_BEGIN
   Completion:
 {{~/if_is_fabric_scoped_struct~}}
 (void (^)({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error))completion {{availability (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name}})value completion:(MTRStatusCompletion)completion {{availability (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name}})value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion {{availability (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
 {{/if}}
@@ -80,6 +73,18 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
+@end
+
+@interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
+
 @end
 {{/if}}
 
@@ -238,7 +243,8 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm
   CompletionHandler:
 {{~/if_is_fabric_scoped_struct~}}
 (void (^)({{asObjectiveCClass type parent.name compatRemapClusterName=true}} * _Nullable value, NSError * _Nullable error))completionHandler {{availability (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name) deprecatedRelease="First major API revamp" fabricScopedDeprecationMessage=(concat "Please use readAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithParams:completion:") nonFabricScopedDeprecationMessage=(concat "Please use readAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithCompletion:") type=type}};
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name compatRemapClusterName=true}})value completionHandler:(MTRStatusCompletion)completionHandler {{availability (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name) deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use writeAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithValue:completion:")}};
 - (void)write{{>attribute}}WithValue:({{asObjectiveCType type parent.name compatRemapClusterName=true}})value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler {{availability (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name) deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use writeAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithValue:params:completion:")}};
 {{/if}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt
index 9d40126f3a857d..c5790da1795a81 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt
@@ -5,12 +5,5 @@
 #import "MTRBaseClusters.h"
 #import "MTRBaseDevice.h"
 
-{{#zcl_clusters}}
-
-{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
-@interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-{{/if}}
-
-{{/zcl_clusters}}
+// Nothing here for now, but leaving this file in place in case we need to add
+// something.
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
index 617beb92815d92..9cefaa1a510b13 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
@@ -1,12 +1,11 @@
 {{> header excludeZapComment=true}}
 
 #import <Foundation/Foundation.h>
-#import <Matter/MTRError.h>
 
 #import "MTRClusterConstants.h"
-#import "MTRClusters_Internal.h"
 #import "MTRDevice_Internal.h"
 #import "MTRCluster_Internal.h"
+#import "MTRClusters_Internal.h"
 #import "MTRStructsObjc.h"
 #import "MTRCommandPayloadsObjc.h"
 #import "MTRLogging_Internal.h"
@@ -31,18 +30,6 @@ using chip::System::Clock::Seconds16;
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @implementation MTRCluster{{asUpperCamelCase name preserveAcronyms=true}}
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 {{#zcl_commands}}
 {{! Takes two arguments: cluster name and command name, plus the ambient state where the command is "this" }}
 {{#*inline "commandImpl"}}
@@ -123,7 +110,8 @@ MTR{{cluster}}Cluster{{command}}Params
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDType{{>cluster}}ID) attributeID:@(MTRAttributeIDTypeCluster{{>cluster}}{{>attribute}}ID) params:params];
 }
 
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 {{#*inline "callbackName"}}DefaultSuccess{{/inline}}
 - (void)write{{>attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
@@ -207,7 +195,8 @@ MTR{{cluster}}Cluster{{command}}Params
 {
   return [self readAttribute{{asUpperCamelCase name preserveAcronyms=true}}WithParams:params];
 }
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)writeAttribute{{attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
   [self writeAttribute{{asUpperCamelCase name preserveAcronyms=true}}WithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs];
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt
deleted file mode 100644
index 2fc3162fd99acf..00000000000000
--- a/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt
+++ /dev/null
@@ -1,15 +0,0 @@
-{{> header excludeZapComment=true}}
-
-private let clusterQueue = DispatchQueue(label: "MTRCluster completion dispatch")
-
-{{#zcl_clusters}}
-{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
-{{swiftAvailability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="Future"}}
-extension MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-{{/if}}
-{{/zcl_clusters}}
\ No newline at end of file
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
index 84e27d675ee59a..c089804986d154 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
@@ -17,27 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  *    {{description}}
  */
 {{availability (asUpperCamelCase name preserveAcronyms=true)}}
-@interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRCluster
-
-/**
-{{#zcl_commands}}
-{{#first}}
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
-{{/first}}
-{{else}}
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
-{{/zcl_commands}}
- */
-- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
-
-/**
- * The device this cluster object is associated with.
- */
-@property (nonatomic, readonly) MTRDevice * device {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="Future"}};
+@interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRGenericCluster
 
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
@@ -71,7 +51,8 @@ NS_ASSUME_NONNULL_BEGIN
 {{availability (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true)}}
 {{/inline}}
 - (NSDictionary<NSString *, id> * _Nullable)read{{>attribute}}WithParams:(MTRReadParams * _Nullable)params {{> availability}};
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)write{{>attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs {{> availability}};
 - (void)write{{>attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params {{> availability}};
 {{/if}}
@@ -83,6 +64,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} (Availability)
+
+/**
+{{#zcl_commands}}
+{{#first}}
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+{{/first}}
+{{else}}
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
+{{/zcl_commands}}
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
+
+@end
+
 {{/if}}
 {{/zcl_clusters}}
 
@@ -130,7 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
 {{~#*inline "attributeDecls"}}
 {{#unless (isStrEqual attribute (asUpperCamelCase name preserveAcronyms=true))}}
 - (NSDictionary<NSString *, id> *)readAttribute{{attribute}}WithParams:(MTRReadParams * _Nullable)params {{availability cluster attribute=attribute deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use readAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithParams on MTRCluster" (asUpperCamelCase parent.name preserveAcronyms=true))}};
-{{#if isWritableAttribute}}
+{{#if (or isWritableAttribute
+      (isInConfigList (concat (asUpperCamelCase parent.name) "::" label) "DarwinForceWritable"))}}
 - (void)writeAttribute{{attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs {{availability cluster attribute=attribute deprecationMessage=(concat "Please use writeAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithValue on MTRCluster" (asUpperCamelCase parent.name preserveAcronyms=true))}};
 - (void)writeAttribute{{attribute}}WithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params {{availability cluster attribute=attribute deprecationMessage=(concat "Please use writeAttribute" (asUpperCamelCase name preserveAcronyms=true) "WithValue on MTRCluster" (asUpperCamelCase parent.name preserveAcronyms=true))}};
 {{/if}}
diff --git a/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt
index 506750566352aa..470221c850066e 100644
--- a/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt
@@ -27,9 +27,6 @@ static id _Nullable DecodeEventPayloadFor{{asUpperCamelCase name preserveAcronym
     switch (aEventId) {
         {{#zcl_events}}
         {{#if (isSupported (asUpperCamelCase ../name preserveAcronyms=true) event=(asUpperCamelCase name preserveAcronyms=true))}}
-        {{#if (isProvisional (asUpperCamelCase ../name preserveAcronyms=true) event=(asUpperCamelCase name preserveAcronyms=true))}}
-        #if MTR_ENABLE_PROVISIONAL
-        {{/if}}
         case Events::{{asUpperCamelCase name}}::Id: {
             Events::{{asUpperCamelCase name}}::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
@@ -52,9 +49,6 @@ static id _Nullable DecodeEventPayloadFor{{asUpperCamelCase name preserveAcronym
 
             return value;
         }
-        {{#if (isProvisional (asUpperCamelCase ../name preserveAcronyms=true) event=(asUpperCamelCase name preserveAcronyms=true))}}
-        #endif // MTR_ENABLE_PROVISIONAL
-        {{/if}}
         {{/if}}
         {{/zcl_events}}
         default: {
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 50dd02c4952444..4b18aeb95d1d9a 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3074,8 +3074,12 @@
               - EffectIdentifierEnum
               - StartUpOnOffEnum
           LevelControl:
-              - MoveMode
-              - StepMode
+              # MoveModeEnum and StepModeEnum were originally named MoveMode and
+              # StepMode, but we generate the same API for the names
+              # with/without "Enum" at the end, and with/without the cluster
+              # name at the beginning, so the name can just change here.
+              - MoveModeEnum
+              - StepModeEnum
           AccessControl:
               - AuthMode
               - ChangeTypeEnum
@@ -3239,18 +3243,30 @@
               # end, so the name can just change here.
               - LightSensorTypeEnum
           Channel:
-              - ChannelStatusEnum
+              # StatusEnum was originally named ChannelStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              - StatusEnum
               - LineupInfoTypeEnum
           TargetNavigator:
-              - TargetNavigatorStatusEnum
+              # StatusEnum was originally named TargetNavigatorStatusEnum, but
+              # we generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              - StatusEnum
           MediaPlayback:
-              - MediaPlaybackStatusEnum
+              # StatusEnum was originally named MediaPlaybackStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              - StatusEnum
               - PlaybackStateEnum
           MediaInput:
               - InputTypeEnum
           KeypadInput:
               - CecKeyCode
-              - KeypadInputStatusEnum
+              # StatusEnum was originally named KeypadInputStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              - StatusEnum
           ContentLauncher:
               - ContentLaunchStatusEnum
               - MetricTypeEnum
@@ -3258,7 +3274,10 @@
           AudioOutput:
               - OutputTypeEnum
           ApplicationLauncher:
-              - ApplicationLauncherStatusEnum
+              # StatusEnum was originally named ApplicationLauncherStatusEnum, but we
+              # generate the same API for the names with/without the cluster name at the
+              # beginning, so the name can just change here.
+              - StatusEnum
           ApplicationBasic:
               - ApplicationStatusEnum
           TestCluster:
@@ -3311,10 +3330,14 @@
                   - On
                   - TogglePreviousOnOff
           LevelControl:
-              MoveMode:
+              # MoveModeEnum and StepModeEnum were originally named MoveMode and
+              # StepMode, but we generate the same API for the names
+              # with/without "Enum" at the end, and with/without the cluster
+              # name at the beginning, so the name can just change here.
+              MoveModeEnum:
                   - Up
                   - Down
-              StepMode:
+              StepModeEnum:
                   - Up
                   - Down
           AccessControl:
@@ -3976,19 +3999,28 @@
                   - Photodiode
                   - CMOS
           Channel:
-              ChannelStatusEnum:
+              # StatusEnum was originally named ChannelStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              StatusEnum:
                   - Success
                   - MultipleMatches
                   - NoMatches
               LineupInfoTypeEnum:
                   - Mso
           TargetNavigator:
-              TargetNavigatorStatusEnum:
+              # StatusEnum was originally named TargetNavigatorStatusEnum, but
+              # we generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              StatusEnum:
                   - Success
                   - TargetNotFound
                   - NotAllowed
           MediaPlayback:
-              MediaPlaybackStatusEnum:
+              # StatusEnum was originally named MediaPlaybackStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              StatusEnum:
                   - Success
                   - InvalidStateForCommand
                   - NotAllowed
@@ -4102,7 +4134,10 @@
                   - F4Yellow
                   - F5
                   - Data
-              KeypadInputStatusEnum:
+              # StatusEnum was originally named KeypadInputStatusEnum, but we
+              # generate the same API for the names with/without the cluster
+              # name at the beginning, so the name can just change here.
+              StatusEnum:
                   - Success
                   - UnsupportedKey
                   - InvalidKeyInCurrentState
@@ -4137,7 +4172,10 @@
                   - Internal
                   - Other
           ApplicationLauncher:
-              ApplicationLauncherStatusEnum:
+              # StatusEnum was originally named ApplicationLauncherStatusEnum, but we
+              # generate the same API for the names with/without the cluster name at the
+              # beginning, so the name can just change here.
+              StatusEnum:
                   - Success
                   - AppNotAvailable
                   - SystemBusy
@@ -7426,7 +7464,6 @@
           Scenes:
               # New scenes bits not stable yet.
               - SceneTableSize
-              - RemainingCapacity
           FanControl:
               # New Fan Control bits not stable yet.
               - AirflowDirection
@@ -7699,6 +7736,7 @@
           GeneralDiagnostics:
               # Not in the spec yet.
               - AverageWearCount
+              # New things, not quite finalized.
   renames:
       enums:
           OTASoftwareUpdateProvider:
@@ -7729,14 +7767,183 @@
 - release: "Future"
   versions: "future"
   introduced:
+      event fields:
+          WiFiNetworkDiagnostics:
+              AssociationFailure:
+                  - associationFailureCause
+      enums:
+          ContentLauncher:
+              - StatusEnum
+          KeypadInput:
+              - CECKeyCodeEnum
+          ThermostatUserInterfaceConfiguration:
+              - KeypadLockoutEnum
+              - ScheduleProgrammingVisibilityEnum
+              - TemperatureDisplayModeEnum
+      enum values:
+          ContentLauncher:
+              StatusEnum:
+                  - Success
+                  - URLNotAvailable
+                  - AuthFailed
+          FanControl:
+              FanModeSequenceEnum:
+                  - OffHighAuto
+                  - OffHigh
+          KeypadInput:
+              CECKeyCodeEnum:
+                  - Select
+                  - Up
+                  - Down
+                  - Left
+                  - Right
+                  - RightUp
+                  - RightDown
+                  - LeftUp
+                  - LeftDown
+                  - RootMenu
+                  - SetupMenu
+                  - ContentsMenu
+                  - FavoriteMenu
+                  - Exit
+                  - MediaTopMenu
+                  - MediaContextSensitiveMenu
+                  - NumberEntryMode
+                  - Number11
+                  - Number12
+                  - Number0OrNumber10
+                  - Numbers1
+                  - Numbers2
+                  - Numbers3
+                  - Numbers4
+                  - Numbers5
+                  - Numbers6
+                  - Numbers7
+                  - Numbers8
+                  - Numbers9
+                  - Dot
+                  - Enter
+                  - Clear
+                  - NextFavorite
+                  - ChannelUp
+                  - ChannelDown
+                  - PreviousChannel
+                  - SoundSelect
+                  - InputSelect
+                  - DisplayInformation
+                  - Help
+                  - PageUp
+                  - PageDown
+                  - Power
+                  - VolumeUp
+                  - VolumeDown
+                  - Mute
+                  - Play
+                  - Stop
+                  - Pause
+                  - Record
+                  - Rewind
+                  - FastForward
+                  - Eject
+                  - Forward
+                  - Backward
+                  - StopRecord
+                  - PauseRecord
+                  - Reserved
+                  - Angle
+                  - SubPicture
+                  - VideoOnDemand
+                  - ElectronicProgramGuide
+                  - TimerProgramming
+                  - InitialConfiguration
+                  - SelectBroadcastType
+                  - SelectSoundPresentation
+                  - PlayFunction
+                  - PausePlayFunction
+                  - RecordFunction
+                  - PauseRecordFunction
+                  - StopFunction
+                  - MuteFunction
+                  - RestoreVolumeFunction
+                  - TuneFunction
+                  - SelectMediaFunction
+                  - SelectAvInputFunction
+                  - SelectAudioInputFunction
+                  - PowerToggleFunction
+                  - PowerOffFunction
+                  - PowerOnFunction
+                  - F1Blue
+                  - F2Red
+                  - F3Green
+                  - F4Yellow
+                  - F5
+                  - Data
+          ThermostatUserInterfaceConfiguration:
+              KeypadLockoutEnum:
+                  - NoLockout
+                  - Lockout1
+                  - Lockout2
+                  - Lockout3
+                  - Lockout4
+                  - Lockout5
+              ScheduleProgrammingVisibilityEnum:
+                  - ScheduleProgrammingPermitted
+                  - ScheduleProgrammingDenied
+              TemperatureDisplayModeEnum:
+                  - Celsius
+                  - Fahrenheit
+      bitmaps:
+          Scenes:
+              - CopyModeBitmap
+          AdministratorCommissioning:
+              - Feature
+          ContentLauncher:
+              - SupportedProtocolsBitmap
+          LevelControl:
+              - OptionsBitmap
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
                   - SupplyFault
+          Scenes:
+              CopyModeBitmap:
+                  - CopyAllScenes
           SoftwareDiagnostics:
               Feature:
                   - Watermarks
+          AdministratorCommissioning:
+              Feature:
+                  - Basic
+          ContentLauncher:
+              SupportedProtocolsBitmap:
+                  - DASH
+                  - HLS
+          LevelControl:
+              OptionsBitmap:
+                  - ExecuteIfOff
+                  - CoupleColorTempToLevel
   deprecated:
+      event fields:
+          WiFiNetworkDiagnostics:
+              AssociationFailure:
+                  - associationFailure
+      enums:
+          ContentLauncher:
+              - ContentLaunchStatusEnum
+          KeypadInput:
+              - CecKeyCode
+      enum values:
+          FanControl:
+              FanModeSequenceEnum:
+                  - OffOnAuto
+                  - OffOn
+      bitmaps:
+          Scenes:
+              - ScenesCopyMode
+          ContentLauncher:
+              - SupportedStreamingProtocol
+          LevelControl:
+              - LevelControlOptions
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7744,7 +7951,121 @@
           SoftwareDiagnostics:
               Feature:
                   - WaterMarks
+  provisional:
+      clusters:
+          # Targeting Spring 2024 Matter release
+          - MicrowaveOvenControl
+          - MicrowaveOvenMode
+          - DemandResponseLoadControl
+          - BooleanSensorConfiguration
+          - ValveConfigurationAndControl
+          - Timer
+          - OvenMode
+          - LaundryDryerControls
+      attributes:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              - SupportedWiFiBands
+              - SupportedThreadFeatures
+              - ThreadVersion
+          WakeOnLAN:
+              # Targeting Spring 2024 Matter release
+              - LinkLocalAddress
+          BasicInformation:
+              # Targeting Spring 2024 Matter release
+              - SpecificationVersion
+              - MaxPathsPerInvoke
+          Scenes:
+              # Targeting Spring 2024 Matter release
+              - FabricSceneInfo
+      commands:
+          GeneralDiagnostics:
+              # Targeting Spring 2024 Matter release
+              - TimeSnapshot
+              - TimeSnapshotResponse
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              - QueryIdentity
+              - QueryIdentityResponse
+      command fields:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              AddOrUpdateWiFiNetwork:
+                  - networkIdentity
+                  - clientIdentifier
+                  - possessionNonce
+              NetworkConfigResponse:
+                  - clientIdentity
+                  - possessionSignature
+              QueryIdentity:
+                  - keyIdentifier
+                  - possessionNonce
+              QueryIdentityResponse:
+                  - identity
+                  - possessionSignature
+      structs:
+          Scenes:
+              # Targeting Spring 2024 Matter release
+              - SceneInfoStruct
+      struct fields:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              NetworkInfoStruct:
+                  - networkIdentifier
+                  - clientIdentifier
+      bitmaps:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              - ThreadCapabilitiesBitmap
+          Scenes:
+              # Targeting Spring 2024 Matter release
+              - NameSupportBitmap
+      bitmap values:
+          OnOff:
+              Feature:
+                  # Targeting Spring 2024 Matter release
+                  - OffOnly
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              Feature:
+                  - PerDeviceCredentials
+              WiFiSecurityBitmap:
+                  - WPA3MatterPDC
   renames:
+      event fields:
+          WiFiNetworkDiagnostics:
+              AssociationFailure:
+                  associationFailureCause: associationFailure
+      enums:
+          ContentLauncher:
+              StatusEnum: ContentLaunchStatusEnum
+          KeypadInput:
+              CECKeyCodeEnum: CecKeyCode
+      enum values:
+          ContentLauncher:
+              # The URLNotAvailable value got renamed at the same time
+              # as the enum.  Record the rename here so that the old
+              # value name is generated for the old enum name.
+              ContentLaunchStatusEnum:
+                  URLNotAvailable: UrlNotAvailable
+          FanControl:
+              FanModeSequenceEnum:
+                  OffHighAuto: OffOnAuto
+                  OffHigh: OffOn
+              # FanModeSequenceType is the old name of
+              # FanModeSequenceEnum; we need this rename annotation
+              # here so we don't lose the old values under that old
+              # name.
+              FanModeSequenceType:
+                  OffHighAuto: OffOnAuto
+                  OffHigh: OffOn
+      bitmaps:
+          Scenes:
+              CopyModeBitmap: ScenesCopyMode
+          ContentLauncher:
+              SupportedProtocolsBitmap: SupportedStreamingProtocol
+          LevelControl:
+              OptionsBitmap: LevelControlOptions
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7752,3 +8073,10 @@
           SoftwareDiagnostics:
               Feature:
                   Watermarks: WaterMarks
+  removed:
+      enum values:
+          ContentLauncher:
+              # The URLNotAvailable value got renamed at the same time
+              # as the enum.  The old enum name never had the new value name.
+              ContentLaunchStatusEnum:
+                  - URLNotAvailable
diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json
index d04cf45ba83c2d..83b001285cfcf2 100644
--- a/src/darwin/Framework/CHIP/templates/templates.json
+++ b/src/darwin/Framework/CHIP/templates/templates.json
@@ -11,7 +11,8 @@
         "darwin/Framework/CHIP/templates/helper.js"
     ],
     "resources": {
-        "availability-data": "availability.yaml"
+        "availability-data": "availability.yaml",
+        "config-data": "../../../../app/common/templates/config-data.yaml"
     },
     "override": "../../../../../src/app/zap-templates/common/override.js",
     "partials": [
@@ -79,11 +80,6 @@
             "name": "Objc ZCL synchronous API",
             "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm"
         },
-        {
-            "path": "MTRClusters-swift.zapt",
-            "name": "Swift ZCL synchronous API Header extensions",
-            "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift"
-        },
         {
             "path": "MTRStructsObjc.zapt",
             "name": "Objc reflections of MTR spec structs header",
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index 6400bbbdf26e85..7378b67bb696d8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
@@ -111,7 +111,7 @@ static BOOL AttributeIsSpecifiedInScenesCluster(AttributeId aAttributeId)
     case Attributes::SceneTableSize::Id: {
         return YES;
     }
-    case Attributes::RemainingCapacity::Id: {
+    case Attributes::FabricSceneInfo::Id: {
         return YES;
     }
     case Attributes::GeneratedCommandList::Id: {
@@ -579,6 +579,12 @@ static BOOL AttributeIsSpecifiedInBasicInformationCluster(AttributeId aAttribute
     case Attributes::ProductAppearance::Id: {
         return YES;
     }
+    case Attributes::SpecificationVersion::Id: {
+        return YES;
+    }
+    case Attributes::MaxPathsPerInvoke::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -1080,9 +1086,6 @@ static BOOL AttributeIsSpecifiedInGeneralDiagnosticsCluster(AttributeId aAttribu
     case Attributes::TestEventTriggersEnabled::Id: {
         return YES;
     }
-    case Attributes::AverageWearCount::Id: {
-        return YES;
-    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -1919,6 +1922,159 @@ static BOOL AttributeIsSpecifiedInICDManagementCluster(AttributeId aAttributeId)
     }
     }
 }
+static BOOL AttributeIsSpecifiedInTimerCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Timer;
+    switch (aAttributeId) {
+    case Attributes::SetTime::Id: {
+        return YES;
+    }
+    case Attributes::TimeRemaining::Id: {
+        return YES;
+    }
+    case Attributes::TimerState::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInOvenCavityOperationalStateCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OvenCavityOperationalState;
+    switch (aAttributeId) {
+    case Attributes::PhaseList::Id: {
+        return YES;
+    }
+    case Attributes::CurrentPhase::Id: {
+        return YES;
+    }
+    case Attributes::CountdownTime::Id: {
+        return YES;
+    }
+    case Attributes::OperationalStateList::Id: {
+        return YES;
+    }
+    case Attributes::OperationalState::Id: {
+        return YES;
+    }
+    case Attributes::OperationalError::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInOvenModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OvenMode;
+    switch (aAttributeId) {
+    case Attributes::SupportedModes::Id: {
+        return YES;
+    }
+    case Attributes::CurrentMode::Id: {
+        return YES;
+    }
+    case Attributes::StartUpMode::Id: {
+        return YES;
+    }
+    case Attributes::OnMode::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInLaundryDryerControlsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LaundryDryerControls;
+    switch (aAttributeId) {
+    case Attributes::SupportedDrynessLevels::Id: {
+        return YES;
+    }
+    case Attributes::SelectedDrynessLevel::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL AttributeIsSpecifiedInModeSelectCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::ModeSelect;
@@ -2408,6 +2564,81 @@ static BOOL AttributeIsSpecifiedInDishwasherAlarmCluster(AttributeId aAttributeI
     }
     }
 }
+static BOOL AttributeIsSpecifiedInMicrowaveOvenModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MicrowaveOvenMode;
+    switch (aAttributeId) {
+    case Attributes::SupportedModes::Id: {
+        return YES;
+    }
+    case Attributes::CurrentMode::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInMicrowaveOvenControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MicrowaveOvenControl;
+    switch (aAttributeId) {
+    case Attributes::CookTime::Id: {
+        return YES;
+    }
+    case Attributes::PowerSetting::Id: {
+        return YES;
+    }
+    case Attributes::MinPower::Id: {
+        return YES;
+    }
+    case Attributes::MaxPower::Id: {
+        return YES;
+    }
+    case Attributes::PowerStep::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL AttributeIsSpecifiedInOperationalStateCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::OperationalState;
@@ -2588,6 +2819,255 @@ static BOOL AttributeIsSpecifiedInActivatedCarbonFilterMonitoringCluster(Attribu
     }
     }
 }
+static BOOL AttributeIsSpecifiedInBooleanSensorConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BooleanSensorConfiguration;
+    switch (aAttributeId) {
+    case Attributes::SensitivityLevel::Id: {
+        return YES;
+    }
+    case Attributes::AlarmsActive::Id: {
+        return YES;
+    }
+    case Attributes::AlarmsSuppressed::Id: {
+        return YES;
+    }
+    case Attributes::AlarmsEnabled::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInValveConfigurationAndControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ValveConfigurationAndControl;
+    switch (aAttributeId) {
+    case Attributes::OpenDuration::Id: {
+        return YES;
+    }
+    case Attributes::AutoCloseTime::Id: {
+        return YES;
+    }
+    case Attributes::RemainingDuration::Id: {
+        return YES;
+    }
+    case Attributes::CurrentState::Id: {
+        return YES;
+    }
+    case Attributes::TargetState::Id: {
+        return YES;
+    }
+    case Attributes::StartUpState::Id: {
+        return YES;
+    }
+    case Attributes::CurrentLevel::Id: {
+        return YES;
+    }
+    case Attributes::TargetLevel::Id: {
+        return YES;
+    }
+    case Attributes::OpenLevel::Id: {
+        return YES;
+    }
+    case Attributes::ValveFault::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInDemandResponseLoadControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DemandResponseLoadControl;
+    switch (aAttributeId) {
+    case Attributes::LoadControlPrograms::Id: {
+        return YES;
+    }
+    case Attributes::NumberOfLoadControlPrograms::Id: {
+        return YES;
+    }
+    case Attributes::Events::Id: {
+        return YES;
+    }
+    case Attributes::ActiveEvents::Id: {
+        return YES;
+    }
+    case Attributes::NumberOfEventsPerProgram::Id: {
+        return YES;
+    }
+    case Attributes::NumberOfTransitions::Id: {
+        return YES;
+    }
+    case Attributes::DefaultRandomStart::Id: {
+        return YES;
+    }
+    case Attributes::DefaultRandomDuration::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL AttributeIsSpecifiedInEnergyEVSECluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::EnergyEvse;
+    switch (aAttributeId) {
+    case Attributes::State::Id: {
+        return YES;
+    }
+    case Attributes::SupplyState::Id: {
+        return YES;
+    }
+    case Attributes::FaultState::Id: {
+        return YES;
+    }
+    case Attributes::ChargingEnabledUntil::Id: {
+        return YES;
+    }
+    case Attributes::DischargingEnabledUntil::Id: {
+        return YES;
+    }
+    case Attributes::CircuitCapacity::Id: {
+        return YES;
+    }
+    case Attributes::MinimumChargeCurrent::Id: {
+        return YES;
+    }
+    case Attributes::MaximumChargeCurrent::Id: {
+        return YES;
+    }
+    case Attributes::MaximumDischargeCurrent::Id: {
+        return YES;
+    }
+    case Attributes::UserMaximumChargeCurrent::Id: {
+        return YES;
+    }
+    case Attributes::RandomizationDelayWindow::Id: {
+        return YES;
+    }
+    case Attributes::NumberOfWeeklyTargets::Id: {
+        return YES;
+    }
+    case Attributes::NumberOfDailyTargets::Id: {
+        return YES;
+    }
+    case Attributes::NextChargeStartTime::Id: {
+        return YES;
+    }
+    case Attributes::NextChargeTargetTime::Id: {
+        return YES;
+    }
+    case Attributes::NextChargeRequiredEnergy::Id: {
+        return YES;
+    }
+    case Attributes::NextChargeTargetSoC::Id: {
+        return YES;
+    }
+    case Attributes::ApproximateEVEfficiency::Id: {
+        return YES;
+    }
+    case Attributes::StateOfCharge::Id: {
+        return YES;
+    }
+    case Attributes::BatteryCapacity::Id: {
+        return YES;
+    }
+    case Attributes::VehicleID::Id: {
+        return YES;
+    }
+    case Attributes::SessionID::Id: {
+        return YES;
+    }
+    case Attributes::SessionDuration::Id: {
+        return YES;
+    }
+    case Attributes::SessionEnergyCharged::Id: {
+        return YES;
+    }
+    case Attributes::SessionEnergyDischarged::Id: {
+        return YES;
+    }
+    case Attributes::GeneratedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::AcceptedCommandList::Id: {
+        return YES;
+    }
+    case Attributes::EventList::Id: {
+        return YES;
+    }
+    case Attributes::AttributeList::Id: {
+        return YES;
+    }
+    case Attributes::FeatureMap::Id: {
+        return YES;
+    }
+    case Attributes::ClusterRevision::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL AttributeIsSpecifiedInDoorLockCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::DoorLock;
@@ -4377,6 +4857,9 @@ static BOOL AttributeIsSpecifiedInWakeOnLANCluster(AttributeId aAttributeId)
     case Attributes::MACAddress::Id: {
         return YES;
     }
+    case Attributes::LinkLocalAddress::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -5613,6 +6096,18 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId)
     case Clusters::IcdManagement::Id: {
         return AttributeIsSpecifiedInICDManagementCluster(aAttributeId);
     }
+    case Clusters::Timer::Id: {
+        return AttributeIsSpecifiedInTimerCluster(aAttributeId);
+    }
+    case Clusters::OvenCavityOperationalState::Id: {
+        return AttributeIsSpecifiedInOvenCavityOperationalStateCluster(aAttributeId);
+    }
+    case Clusters::OvenMode::Id: {
+        return AttributeIsSpecifiedInOvenModeCluster(aAttributeId);
+    }
+    case Clusters::LaundryDryerControls::Id: {
+        return AttributeIsSpecifiedInLaundryDryerControlsCluster(aAttributeId);
+    }
     case Clusters::ModeSelect::Id: {
         return AttributeIsSpecifiedInModeSelectCluster(aAttributeId);
     }
@@ -5649,6 +6144,12 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId)
     case Clusters::DishwasherAlarm::Id: {
         return AttributeIsSpecifiedInDishwasherAlarmCluster(aAttributeId);
     }
+    case Clusters::MicrowaveOvenMode::Id: {
+        return AttributeIsSpecifiedInMicrowaveOvenModeCluster(aAttributeId);
+    }
+    case Clusters::MicrowaveOvenControl::Id: {
+        return AttributeIsSpecifiedInMicrowaveOvenControlCluster(aAttributeId);
+    }
     case Clusters::OperationalState::Id: {
         return AttributeIsSpecifiedInOperationalStateCluster(aAttributeId);
     }
@@ -5661,6 +6162,18 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId)
     case Clusters::ActivatedCarbonFilterMonitoring::Id: {
         return AttributeIsSpecifiedInActivatedCarbonFilterMonitoringCluster(aAttributeId);
     }
+    case Clusters::BooleanSensorConfiguration::Id: {
+        return AttributeIsSpecifiedInBooleanSensorConfigurationCluster(aAttributeId);
+    }
+    case Clusters::ValveConfigurationAndControl::Id: {
+        return AttributeIsSpecifiedInValveConfigurationAndControlCluster(aAttributeId);
+    }
+    case Clusters::DemandResponseLoadControl::Id: {
+        return AttributeIsSpecifiedInDemandResponseLoadControlCluster(aAttributeId);
+    }
+    case Clusters::EnergyEvse::Id: {
+        return AttributeIsSpecifiedInEnergyEVSECluster(aAttributeId);
+    }
     case Clusters::DoorLock::Id: {
         return AttributeIsSpecifiedInDoorLockCluster(aAttributeId);
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 5ce56aaa434625..99132952193def 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -88,7 +88,6 @@ static id _Nullable DecodeGlobalAttributeValue(AttributeId aAttributeId, TLV::TL
         }
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::EventList::Id: {
         using TypeInfo = Attributes::EventList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -115,7 +114,6 @@ static id _Nullable DecodeGlobalAttributeValue(AttributeId aAttributeId, TLV::TL
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     case Attributes::AttributeList::Id: {
         using TypeInfo = Attributes::AttributeList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -286,7 +284,7 @@ static id _Nullable DecodeAttributeValueForScenesCluster(AttributeId aAttributeI
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
         return value;
     }
     case Attributes::LastConfiguredBy::Id: {
@@ -304,7 +302,6 @@ static id _Nullable DecodeAttributeValueForScenesCluster(AttributeId aAttributeI
         }
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SceneTableSize::Id: {
         using TypeInfo = Attributes::SceneTableSize::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -316,20 +313,38 @@ static id _Nullable DecodeAttributeValueForScenesCluster(AttributeId aAttributeI
         value = [NSNumber numberWithUnsignedShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::RemainingCapacity::Id: {
-        using TypeInfo = Attributes::RemainingCapacity::TypeInfo;
+    case Attributes::FabricSceneInfo::Id: {
+        using TypeInfo = Attributes::FabricSceneInfo::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRScenesClusterSceneInfoStruct * newElement_0;
+                newElement_0 = [MTRScenesClusterSceneInfoStruct new];
+                newElement_0.sceneCount = [NSNumber numberWithUnsignedChar:entry_0.sceneCount];
+                newElement_0.currentScene = [NSNumber numberWithUnsignedChar:entry_0.currentScene];
+                newElement_0.currentGroup = [NSNumber numberWithUnsignedShort:entry_0.currentGroup];
+                newElement_0.sceneValid = [NSNumber numberWithBool:entry_0.sceneValid];
+                newElement_0.remainingCapacity = [NSNumber numberWithUnsignedChar:entry_0.remainingCapacity];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -881,7 +896,6 @@ static id _Nullable DecodeAttributeValueForDescriptorCluster(AttributeId aAttrib
         }
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TagList::Id: {
         using TypeInfo = Attributes::TagList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -929,7 +943,6 @@ static id _Nullable DecodeAttributeValueForDescriptorCluster(AttributeId aAttrib
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1572,6 +1585,28 @@ static id _Nullable DecodeAttributeValueForBasicInformationCluster(AttributeId a
         }
         return value;
     }
+    case Attributes::SpecificationVersion::Id: {
+        using TypeInfo = Attributes::SpecificationVersion::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue];
+        return value;
+    }
+    case Attributes::MaxPathsPerInvoke::Id: {
+        using TypeInfo = Attributes::MaxPathsPerInvoke::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedShort:cppValue];
+        return value;
+    }
     default: {
         break;
     }
@@ -1830,7 +1865,7 @@ static id _Nullable DecodeAttributeValueForPowerSourceConfigurationCluster(Attri
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
                 NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -2292,7 +2327,6 @@ static id _Nullable DecodeAttributeValueForPowerSourceCluster(AttributeId aAttri
         }
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::EndpointList::Id: {
         using TypeInfo = Attributes::EndpointList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -2319,7 +2353,6 @@ static id _Nullable DecodeAttributeValueForPowerSourceCluster(AttributeId aAttri
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2429,6 +2462,24 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
                 newElement_0 = [MTRNetworkCommissioningClusterNetworkInfoStruct new];
                 newElement_0.networkID = AsData(entry_0.networkID);
                 newElement_0.connected = [NSNumber numberWithBool:entry_0.connected];
+                if (entry_0.networkIdentifier.HasValue()) {
+                    if (entry_0.networkIdentifier.Value().IsNull()) {
+                        newElement_0.networkIdentifier = nil;
+                    } else {
+                        newElement_0.networkIdentifier = AsData(entry_0.networkIdentifier.Value().Value());
+                    }
+                } else {
+                    newElement_0.networkIdentifier = nil;
+                }
+                if (entry_0.clientIdentifier.HasValue()) {
+                    if (entry_0.clientIdentifier.Value().IsNull()) {
+                        newElement_0.clientIdentifier = nil;
+                    } else {
+                        newElement_0.clientIdentifier = AsData(entry_0.clientIdentifier.Value().Value());
+                    }
+                } else {
+                    newElement_0.clientIdentifier = nil;
+                }
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -2800,19 +2851,6 @@ static id _Nullable DecodeAttributeValueForGeneralDiagnosticsCluster(AttributeId
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::AverageWearCount::Id: {
-        using TypeInfo = Attributes::AverageWearCount::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue];
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -3138,7 +3176,7 @@ static id _Nullable DecodeAttributeValueForThreadNetworkDiagnosticsCluster(Attri
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
         }
         return value;
     }
@@ -3153,7 +3191,7 @@ static id _Nullable DecodeAttributeValueForThreadNetworkDiagnosticsCluster(Attri
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
         }
         return value;
     }
@@ -3168,7 +3206,7 @@ static id _Nullable DecodeAttributeValueForThreadNetworkDiagnosticsCluster(Attri
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
         }
         return value;
     }
@@ -4121,7 +4159,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
 {
     using namespace Clusters::TimeSynchronization;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::UTCTime::Id: {
         using TypeInfo = Attributes::UTCTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4137,8 +4174,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Granularity::Id: {
         using TypeInfo = Attributes::Granularity::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4150,8 +4185,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TimeSource::Id: {
         using TypeInfo = Attributes::TimeSource::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4163,8 +4196,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TrustedTimeSource::Id: {
         using TypeInfo = Attributes::TrustedTimeSource::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4183,8 +4214,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::DefaultNTP::Id: {
         using TypeInfo = Attributes::DefaultNTP::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4205,8 +4234,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TimeZone::Id: {
         using TypeInfo = Attributes::TimeZone::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4245,8 +4272,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::DSTOffset::Id: {
         using TypeInfo = Attributes::DSTOffset::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4280,8 +4305,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LocalTime::Id: {
         using TypeInfo = Attributes::LocalTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4297,8 +4320,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TimeZoneDatabase::Id: {
         using TypeInfo = Attributes::TimeZoneDatabase::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4310,8 +4331,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::NTPServerAvailable::Id: {
         using TypeInfo = Attributes::NTPServerAvailable::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4323,8 +4342,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TimeZoneListMaxSize::Id: {
         using TypeInfo = Attributes::TimeZoneListMaxSize::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4336,8 +4353,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::DSTOffsetListMaxSize::Id: {
         using TypeInfo = Attributes::DSTOffsetListMaxSize::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4349,8 +4364,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportsDNSResolve::Id: {
         using TypeInfo = Attributes::SupportsDNSResolve::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -4362,7 +4375,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5103,7 +5115,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
 {
     using namespace Clusters::IcdManagement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::IdleModeDuration::Id: {
         using TypeInfo = Attributes::IdleModeDuration::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5115,8 +5126,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ActiveModeDuration::Id: {
         using TypeInfo = Attributes::ActiveModeDuration::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5128,8 +5137,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ActiveModeThreshold::Id: {
         using TypeInfo = Attributes::ActiveModeThreshold::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5141,8 +5148,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::RegisteredClients::Id: {
         using TypeInfo = Attributes::RegisteredClients::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5172,8 +5177,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ICDCounter::Id: {
         using TypeInfo = Attributes::ICDCounter::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5185,8 +5188,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ClientsSupportedPerFabric::Id: {
         using TypeInfo = Attributes::ClientsSupportedPerFabric::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5198,8 +5199,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::UserActiveModeTriggerHint::Id: {
         using TypeInfo = Attributes::UserActiveModeTriggerHint::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5211,8 +5210,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::UserActiveModeTriggerInstruction::Id: {
         using TypeInfo = Attributes::UserActiveModeTriggerInstruction::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5229,7 +5226,6 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5238,28 +5234,92 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForTimerCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::ModeSelect;
+    using namespace Clusters::Timer;
     switch (aAttributeId) {
-    case Attributes::Description::Id: {
-        using TypeInfo = Attributes::Description::TypeInfo;
+    case Attributes::SetTime::Id: {
+        using TypeInfo = Attributes::SetTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSString * _Nonnull value;
-        value = AsString(cppValue);
-        if (value == nil) {
-            CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-            *aError = err;
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue];
+        return value;
+    }
+    case Attributes::TimeRemaining::Id: {
+        using TypeInfo = Attributes::TimeRemaining::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue];
+        return value;
+    }
+    case Attributes::TimerState::Id: {
+        using TypeInfo = Attributes::TimerState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-    case Attributes::StandardNamespace::Id: {
-        using TypeInfo = Attributes::StandardNamespace::TypeInfo;
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForOvenCavityOperationalStateCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::OvenCavityOperationalState;
+    switch (aAttributeId) {
+    case Attributes::PhaseList::Id: {
+        using TypeInfo = Attributes::PhaseList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                auto iter_1 = cppValue.Value().begin();
+                while (iter_1.Next()) {
+                    auto & entry_1 = iter_1.GetValue();
+                    NSString * newElement_1;
+                    newElement_1 = AsString(entry_1);
+                    if (newElement_1 == nil) {
+                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                        *aError = err;
+                        return nil;
+                    }
+                    [array_1 addObject:newElement_1];
+                }
+                CHIP_ERROR err = iter_1.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_1;
+            }
+        }
+        return value;
+    }
+    case Attributes::CurrentPhase::Id: {
+        using TypeInfo = Attributes::CurrentPhase::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5269,12 +5329,27 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttrib
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
         }
         return value;
     }
-    case Attributes::SupportedModes::Id: {
-        using TypeInfo = Attributes::SupportedModes::TypeInfo;
+    case Attributes::CountdownTime::Id: {
+        using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::OperationalStateList::Id: {
+        using TypeInfo = Attributes::OperationalStateList::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5286,32 +5361,18 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttrib
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRModeSelectClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRModeSelectClusterModeOptionStruct new];
-                newElement_0.label = AsString(entry_0.label);
-                if (newElement_0.label == nil) {
-                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                    *aError = err;
-                    return nil;
-                }
-                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    auto iter_2 = entry_0.semanticTags.begin();
-                    while (iter_2.Next()) {
-                        auto & entry_2 = iter_2.GetValue();
-                        MTRModeSelectClusterSemanticTagStruct * newElement_2;
-                        newElement_2 = [MTRModeSelectClusterSemanticTagStruct new];
-                        newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)];
-                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
-                        [array_2 addObject:newElement_2];
-                    }
-                    CHIP_ERROR err = iter_2.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
+                MTROvenCavityOperationalStateClusterOperationalStateStruct * newElement_0;
+                newElement_0 = [MTROvenCavityOperationalStateClusterOperationalStateStruct new];
+                newElement_0.operationalStateID = [NSNumber numberWithUnsignedChar:entry_0.operationalStateID];
+                if (entry_0.operationalStateLabel.HasValue()) {
+                    newElement_0.operationalStateLabel = AsString(entry_0.operationalStateLabel.Value());
+                    if (newElement_0.operationalStateLabel == nil) {
+                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
                         *aError = err;
                         return nil;
                     }
-                    newElement_0.semanticTags = array_2;
+                } else {
+                    newElement_0.operationalStateLabel = nil;
                 }
                 [array_0 addObject:newElement_0];
             }
@@ -5324,44 +5385,46 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttrib
         }
         return value;
     }
-    case Attributes::CurrentMode::Id: {
-        using TypeInfo = Attributes::CurrentMode::TypeInfo;
+    case Attributes::OperationalState::Id: {
+        using TypeInfo = Attributes::OperationalState::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-    case Attributes::StartUpMode::Id: {
-        using TypeInfo = Attributes::StartUpMode::TypeInfo;
+    case Attributes::OperationalError::Id: {
+        using TypeInfo = Attributes::OperationalError::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
+        MTROvenCavityOperationalStateClusterErrorStateStruct * _Nonnull value;
+        value = [MTROvenCavityOperationalStateClusterErrorStateStruct new];
+        value.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorStateID];
+        if (cppValue.errorStateLabel.HasValue()) {
+            value.errorStateLabel = AsString(cppValue.errorStateLabel.Value());
+            if (value.errorStateLabel == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
-        return value;
-    }
-    case Attributes::OnMode::Id: {
-        using TypeInfo = Attributes::OnMode::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
+            value.errorStateLabel = nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
+        if (cppValue.errorStateDetails.HasValue()) {
+            value.errorStateDetails = AsString(cppValue.errorStateDetails.Value());
+            if (value.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            value.errorStateDetails = nil;
         }
         return value;
     }
@@ -5373,11 +5436,10 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttrib
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForOvenModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::LaundryWasherMode;
+    using namespace Clusters::OvenMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5391,8 +5453,8 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRLaundryWasherModeClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRLaundryWasherModeClusterModeOptionStruct new];
+                MTROvenModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTROvenModeClusterModeOptionStruct new];
                 newElement_0.label = AsString(entry_0.label);
                 if (newElement_0.label == nil) {
                     CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
@@ -5405,8 +5467,8 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
                     auto iter_2 = entry_0.modeTags.begin();
                     while (iter_2.Next()) {
                         auto & entry_2 = iter_2.GetValue();
-                        MTRLaundryWasherModeClusterModeTagStruct * newElement_2;
-                        newElement_2 = [MTRLaundryWasherModeClusterModeTagStruct new];
+                        MTROvenModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTROvenModeClusterModeTagStruct new];
                         if (entry_2.mfgCode.HasValue()) {
                             newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
                         } else {
@@ -5433,8 +5495,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5446,8 +5506,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::StartUpMode::Id: {
         using TypeInfo = Attributes::StartUpMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5463,8 +5521,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5480,7 +5536,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5489,13 +5544,12 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForLaundryDryerControlsCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
+    using namespace Clusters::LaundryDryerControls;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SupportedModes::Id: {
-        using TypeInfo = Attributes::SupportedModes::TypeInfo;
+    case Attributes::SupportedDrynessLevels::Id: {
+        using TypeInfo = Attributes::SupportedDrynessLevels::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5507,37 +5561,8 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct new];
-                newElement_0.label = AsString(entry_0.label);
-                if (newElement_0.label == nil) {
-                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                    *aError = err;
-                    return nil;
-                }
-                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    auto iter_2 = entry_0.modeTags.begin();
-                    while (iter_2.Next()) {
-                        auto & entry_2 = iter_2.GetValue();
-                        MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct * newElement_2;
-                        newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct new];
-                        if (entry_2.mfgCode.HasValue()) {
-                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
-                        } else {
-                            newElement_2.mfgCode = nil;
-                        }
-                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
-                        [array_2 addObject:newElement_2];
-                    }
-                    CHIP_ERROR err = iter_2.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    newElement_0.modeTags = array_2;
-                }
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -5549,40 +5574,51 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::CurrentMode::Id: {
-        using TypeInfo = Attributes::CurrentMode::TypeInfo;
+    case Attributes::SelectedDrynessLevel::Id: {
+        using TypeInfo = Attributes::SelectedDrynessLevel::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::StartUpMode::Id: {
-        using TypeInfo = Attributes::StartUpMode::TypeInfo;
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForModeSelectCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::ModeSelect;
+    switch (aAttributeId) {
+    case Attributes::Description::Id: {
+        using TypeInfo = Attributes::Description::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        NSString * _Nonnull value;
+        value = AsString(cppValue);
+        if (value == nil) {
+            CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+            *aError = err;
+            return nil;
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OnMode::Id: {
-        using TypeInfo = Attributes::OnMode::TypeInfo;
+    case Attributes::StandardNamespace::Id: {
+        using TypeInfo = Attributes::StandardNamespace::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5592,26 +5628,12 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-    default: {
-        break;
-    }
-    }
-
-    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-    return nil;
-}
-static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
-{
-    using namespace Clusters::LaundryWasherControls;
-    switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SpinSpeeds::Id: {
-        using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
+    case Attributes::SupportedModes::Id: {
+        using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5623,13 +5645,33 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                NSString * newElement_0;
-                newElement_0 = AsString(entry_0);
-                if (newElement_0 == nil) {
+                MTRModeSelectClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRModeSelectClusterModeOptionStruct new];
+                newElement_0.label = AsString(entry_0.label);
+                if (newElement_0.label == nil) {
                     CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
                     *aError = err;
                     return nil;
                 }
+                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.semanticTags.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRModeSelectClusterSemanticTagStruct * newElement_2;
+                        newElement_2 = [MTRModeSelectClusterSemanticTagStruct new];
+                        newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)];
+                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    newElement_0.semanticTags = array_2;
+                }
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -5641,65 +5683,47 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SpinSpeedCurrent::Id: {
-        using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
+    case Attributes::CurrentMode::Id: {
+        using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::NumberOfRinses::Id: {
-        using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
+    case Attributes::StartUpMode::Id: {
+        using TypeInfo = Attributes::StartUpMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SupportedRinses::Id: {
-        using TypeInfo = Attributes::SupportedRinses::TypeInfo;
+    case Attributes::OnMode::Id: {
+        using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = cppValue.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                *aError = err;
-                return nil;
-            }
-            value = array_0;
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5708,11 +5732,10 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::RvcRunMode;
+    using namespace Clusters::LaundryWasherMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5726,8 +5749,8 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRRVCRunModeClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRRVCRunModeClusterModeOptionStruct new];
+                MTRLaundryWasherModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRLaundryWasherModeClusterModeOptionStruct new];
                 newElement_0.label = AsString(entry_0.label);
                 if (newElement_0.label == nil) {
                     CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
@@ -5740,8 +5763,8 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
                     auto iter_2 = entry_0.modeTags.begin();
                     while (iter_2.Next()) {
                         auto & entry_2 = iter_2.GetValue();
-                        MTRRVCRunModeClusterModeTagStruct * newElement_2;
-                        newElement_2 = [MTRRVCRunModeClusterModeTagStruct new];
+                        MTRLaundryWasherModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRLaundryWasherModeClusterModeTagStruct new];
                         if (entry_2.mfgCode.HasValue()) {
                             newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
                         } else {
@@ -5768,8 +5791,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5781,8 +5802,21 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
+    case Attributes::StartUpMode::Id: {
+        using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5798,7 +5832,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5807,11 +5840,10 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::RvcCleanMode;
+    using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5825,8 +5857,8 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRRVCCleanModeClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRRVCCleanModeClusterModeOptionStruct new];
+                MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct new];
                 newElement_0.label = AsString(entry_0.label);
                 if (newElement_0.label == nil) {
                     CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
@@ -5839,8 +5871,8 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
                     auto iter_2 = entry_0.modeTags.begin();
                     while (iter_2.Next()) {
                         auto & entry_2 = iter_2.GetValue();
-                        MTRRVCCleanModeClusterModeTagStruct * newElement_2;
-                        newElement_2 = [MTRRVCCleanModeClusterModeTagStruct new];
+                        MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct new];
                         if (entry_2.mfgCode.HasValue()) {
                             newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
                         } else {
@@ -5867,8 +5899,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5880,8 +5910,21 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
+    case Attributes::StartUpMode::Id: {
+        using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5897,7 +5940,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5906,78 +5948,69 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::TemperatureControl;
+    using namespace Clusters::LaundryWasherControls;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::TemperatureSetpoint::Id: {
-        using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
+    case Attributes::SpinSpeeds::Id: {
+        using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithShort:cppValue];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                NSString * newElement_0;
+                newElement_0 = AsString(entry_0);
+                if (newElement_0 == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::MinTemperature::Id: {
-        using TypeInfo = Attributes::MinTemperature::TypeInfo;
+    case Attributes::SpinSpeedCurrent::Id: {
+        using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithShort:cppValue];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::MaxTemperature::Id: {
-        using TypeInfo = Attributes::MaxTemperature::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithShort:cppValue];
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::Step::Id: {
-        using TypeInfo = Attributes::Step::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithShort:cppValue];
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SelectedTemperatureLevel::Id: {
-        using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
+    case Attributes::NumberOfRinses::Id: {
+        using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SupportedTemperatureLevels::Id: {
-        using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
+    case Attributes::SupportedRinses::Id: {
+        using TypeInfo = Attributes::SupportedRinses::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5989,13 +6022,8 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                NSString * newElement_0;
-                newElement_0 = AsString(entry_0);
-                if (newElement_0 == nil) {
-                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                    *aError = err;
-                    return nil;
-                }
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -6007,7 +6035,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6016,49 +6043,91 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::RefrigeratorAlarm;
+    using namespace Clusters::RvcRunMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::Mask::Id: {
-        using TypeInfo = Attributes::Mask::TypeInfo;
+    case Attributes::SupportedModes::Id: {
+        using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRRVCRunModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRRVCRunModeClusterModeOptionStruct new];
+                newElement_0.label = AsString(entry_0.label);
+                if (newElement_0.label == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.modeTags.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRRVCRunModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRRVCRunModeClusterModeTagStruct new];
+                        if (entry_2.mfgCode.HasValue()) {
+                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
+                        } else {
+                            newElement_2.mfgCode = nil;
+                        }
+                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    newElement_0.modeTags = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::State::Id: {
-        using TypeInfo = Attributes::State::TypeInfo;
+    case Attributes::CurrentMode::Id: {
+        using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::Supported::Id: {
-        using TypeInfo = Attributes::Supported::TypeInfo;
+    case Attributes::OnMode::Id: {
+        using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6067,11 +6136,10 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::DishwasherMode;
+    using namespace Clusters::RvcCleanMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6085,8 +6153,8 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTRDishwasherModeClusterModeOptionStruct * newElement_0;
-                newElement_0 = [MTRDishwasherModeClusterModeOptionStruct new];
+                MTRRVCCleanModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRRVCCleanModeClusterModeOptionStruct new];
                 newElement_0.label = AsString(entry_0.label);
                 if (newElement_0.label == nil) {
                     CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
@@ -6099,8 +6167,8 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
                     auto iter_2 = entry_0.modeTags.begin();
                     while (iter_2.Next()) {
                         auto & entry_2 = iter_2.GetValue();
-                        MTRDishwasherModeClusterModeTagStruct * newElement_2;
-                        newElement_2 = [MTRDishwasherModeClusterModeTagStruct new];
+                        MTRRVCCleanModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRRVCCleanModeClusterModeTagStruct new];
                         if (entry_2.mfgCode.HasValue()) {
                             newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
                         } else {
@@ -6127,8 +6195,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6140,25 +6206,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::StartUpMode::Id: {
-        using TypeInfo = Attributes::StartUpMode::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6174,7 +6221,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6183,157 +6229,387 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForAirQualityCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::AirQuality;
+    using namespace Clusters::TemperatureControl;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::AirQuality::Id: {
-        using TypeInfo = Attributes::AirQuality::TypeInfo;
+    case Attributes::TemperatureSetpoint::Id: {
+        using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-    default: {
-        break;
-    }
-    }
-
-    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-    return nil;
-}
-static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
-{
-    using namespace Clusters::SmokeCoAlarm;
-    switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ExpressedState::Id: {
-        using TypeInfo = Attributes::ExpressedState::TypeInfo;
+    case Attributes::MinTemperature::Id: {
+        using TypeInfo = Attributes::MinTemperature::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::SmokeState::Id: {
-        using TypeInfo = Attributes::SmokeState::TypeInfo;
+    case Attributes::MaxTemperature::Id: {
+        using TypeInfo = Attributes::MaxTemperature::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::COState::Id: {
-        using TypeInfo = Attributes::COState::TypeInfo;
+    case Attributes::Step::Id: {
+        using TypeInfo = Attributes::Step::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::BatteryAlert::Id: {
-        using TypeInfo = Attributes::BatteryAlert::TypeInfo;
+    case Attributes::SelectedTemperatureLevel::Id: {
+        using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::DeviceMuted::Id: {
-        using TypeInfo = Attributes::DeviceMuted::TypeInfo;
+    case Attributes::SupportedTemperatureLevels::Id: {
+        using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::TestInProgress::Id: {
-        using TypeInfo = Attributes::TestInProgress::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                NSString * newElement_0;
+                newElement_0 = AsString(entry_0);
+                if (newElement_0 == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::HardwareFaultAlert::Id: {
-        using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::RefrigeratorAlarm;
+    switch (aAttributeId) {
+    case Attributes::Mask::Id: {
+        using TypeInfo = Attributes::Mask::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithBool:cppValue];
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::EndOfServiceAlert::Id: {
-        using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
+    case Attributes::State::Id: {
+        using TypeInfo = Attributes::State::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::InterconnectSmokeAlarm::Id: {
-        using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
+    case Attributes::Supported::Id: {
+        using TypeInfo = Attributes::Supported::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::InterconnectCOAlarm::Id: {
-        using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::DishwasherMode;
+    switch (aAttributeId) {
+    case Attributes::SupportedModes::Id: {
+        using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRDishwasherModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRDishwasherModeClusterModeOptionStruct new];
+                newElement_0.label = AsString(entry_0.label);
+                if (newElement_0.label == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.modeTags.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRDishwasherModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRDishwasherModeClusterModeTagStruct new];
+                        if (entry_2.mfgCode.HasValue()) {
+                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
+                        } else {
+                            newElement_2.mfgCode = nil;
+                        }
+                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    newElement_0.modeTags = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    case Attributes::CurrentMode::Id: {
+        using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::StartUpMode::Id: {
+        using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::OnMode::Id: {
+        using TypeInfo = Attributes::OnMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForAirQualityCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::AirQuality;
+    switch (aAttributeId) {
+    case Attributes::AirQuality::Id: {
+        using TypeInfo = Attributes::AirQuality::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::SmokeCoAlarm;
+    switch (aAttributeId) {
+    case Attributes::ExpressedState::Id: {
+        using TypeInfo = Attributes::ExpressedState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::SmokeState::Id: {
+        using TypeInfo = Attributes::SmokeState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::COState::Id: {
+        using TypeInfo = Attributes::COState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::BatteryAlert::Id: {
+        using TypeInfo = Attributes::BatteryAlert::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::DeviceMuted::Id: {
+        using TypeInfo = Attributes::DeviceMuted::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::TestInProgress::Id: {
+        using TypeInfo = Attributes::TestInProgress::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithBool:cppValue];
+        return value;
+    }
+    case Attributes::HardwareFaultAlert::Id: {
+        using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithBool:cppValue];
+        return value;
+    }
+    case Attributes::EndOfServiceAlert::Id: {
+        using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::InterconnectSmokeAlarm::Id: {
+        using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::InterconnectCOAlarm::Id: {
+        using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
@@ -6341,8 +6617,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ContaminationState::Id: {
         using TypeInfo = Attributes::ContaminationState::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6354,8 +6628,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SmokeSensitivityLevel::Id: {
         using TypeInfo = Attributes::SmokeSensitivityLevel::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6367,8 +6639,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ExpiryDate::Id: {
         using TypeInfo = Attributes::ExpiryDate::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6380,7 +6650,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6393,7 +6662,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
 {
     using namespace Clusters::DishwasherAlarm;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Mask::Id: {
         using TypeInfo = Attributes::Mask::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6405,8 +6673,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Latch::Id: {
         using TypeInfo = Attributes::Latch::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6418,8 +6684,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::State::Id: {
         using TypeInfo = Attributes::State::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6431,8 +6695,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Supported::Id: {
         using TypeInfo = Attributes::Supported::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6444,7 +6706,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6453,22 +6714,166 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForMicrowaveOvenModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::OperationalState;
+    using namespace Clusters::MicrowaveOvenMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::PhaseList::Id: {
-        using TypeInfo = Attributes::PhaseList::TypeInfo;
+    case Attributes::SupportedModes::Id: {
+        using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRMicrowaveOvenModeClusterModeOptionStruct * newElement_0;
+                newElement_0 = [MTRMicrowaveOvenModeClusterModeOptionStruct new];
+                newElement_0.label = AsString(entry_0.label);
+                if (newElement_0.label == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.modeTags.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRMicrowaveOvenModeClusterModeTagStruct * newElement_2;
+                        newElement_2 = [MTRMicrowaveOvenModeClusterModeTagStruct new];
+                        if (entry_2.mfgCode.HasValue()) {
+                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
+                        } else {
+                            newElement_2.mfgCode = nil;
+                        }
+                        newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    newElement_0.modeTags = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    case Attributes::CurrentMode::Id: {
+        using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::MicrowaveOvenControl;
+    switch (aAttributeId) {
+    case Attributes::CookTime::Id: {
+        using TypeInfo = Attributes::CookTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue];
+        return value;
+    }
+    case Attributes::PowerSetting::Id: {
+        using TypeInfo = Attributes::PowerSetting::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::MinPower::Id: {
+        using TypeInfo = Attributes::MinPower::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::MaxPower::Id: {
+        using TypeInfo = Attributes::MaxPower::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::PowerStep::Id: {
+        using TypeInfo = Attributes::PowerStep::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::OperationalState;
+    switch (aAttributeId) {
+    case Attributes::PhaseList::Id: {
+        using TypeInfo = Attributes::PhaseList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
             { // Scope for our temporary variables
                 auto * array_1 = [NSMutableArray new];
                 auto iter_1 = cppValue.Value().begin();
@@ -6488,49 +6893,897 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
                     *aError = err;
                     return nil;
                 }
-                value = array_1;
+                value = array_1;
+            }
+        }
+        return value;
+    }
+    case Attributes::CurrentPhase::Id: {
+        using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::CountdownTime::Id: {
+        using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::OperationalStateList::Id: {
+        using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTROperationalStateClusterOperationalStateStruct * newElement_0;
+                newElement_0 = [MTROperationalStateClusterOperationalStateStruct new];
+                newElement_0.operationalStateID = [NSNumber numberWithUnsignedChar:entry_0.operationalStateID];
+                if (entry_0.operationalStateLabel.HasValue()) {
+                    newElement_0.operationalStateLabel = AsString(entry_0.operationalStateLabel.Value());
+                    if (newElement_0.operationalStateLabel == nil) {
+                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                        *aError = err;
+                        return nil;
+                    }
+                } else {
+                    newElement_0.operationalStateLabel = nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    case Attributes::OperationalState::Id: {
+        using TypeInfo = Attributes::OperationalState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::OperationalError::Id: {
+        using TypeInfo = Attributes::OperationalError::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        MTROperationalStateClusterErrorStateStruct * _Nonnull value;
+        value = [MTROperationalStateClusterErrorStateStruct new];
+        value.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorStateID];
+        if (cppValue.errorStateLabel.HasValue()) {
+            value.errorStateLabel = AsString(cppValue.errorStateLabel.Value());
+            if (value.errorStateLabel == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
+        } else {
+            value.errorStateLabel = nil;
+        }
+        if (cppValue.errorStateDetails.HasValue()) {
+            value.errorStateDetails = AsString(cppValue.errorStateDetails.Value());
+            if (value.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
+        } else {
+            value.errorStateDetails = nil;
+        }
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::RvcOperationalState;
+    switch (aAttributeId) {
+    case Attributes::PhaseList::Id: {
+        using TypeInfo = Attributes::PhaseList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                auto iter_1 = cppValue.Value().begin();
+                while (iter_1.Next()) {
+                    auto & entry_1 = iter_1.GetValue();
+                    NSString * newElement_1;
+                    newElement_1 = AsString(entry_1);
+                    if (newElement_1 == nil) {
+                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                        *aError = err;
+                        return nil;
+                    }
+                    [array_1 addObject:newElement_1];
+                }
+                CHIP_ERROR err = iter_1.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_1;
+            }
+        }
+        return value;
+    }
+    case Attributes::CurrentPhase::Id: {
+        using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::CountdownTime::Id: {
+        using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::OperationalStateList::Id: {
+        using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRRVCOperationalStateClusterOperationalStateStruct * newElement_0;
+                newElement_0 = [MTRRVCOperationalStateClusterOperationalStateStruct new];
+                newElement_0.operationalStateID = [NSNumber numberWithUnsignedChar:entry_0.operationalStateID];
+                if (entry_0.operationalStateLabel.HasValue()) {
+                    newElement_0.operationalStateLabel = AsString(entry_0.operationalStateLabel.Value());
+                    if (newElement_0.operationalStateLabel == nil) {
+                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                        *aError = err;
+                        return nil;
+                    }
+                } else {
+                    newElement_0.operationalStateLabel = nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    case Attributes::OperationalState::Id: {
+        using TypeInfo = Attributes::OperationalState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::OperationalError::Id: {
+        using TypeInfo = Attributes::OperationalError::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        MTRRVCOperationalStateClusterErrorStateStruct * _Nonnull value;
+        value = [MTRRVCOperationalStateClusterErrorStateStruct new];
+        value.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorStateID];
+        if (cppValue.errorStateLabel.HasValue()) {
+            value.errorStateLabel = AsString(cppValue.errorStateLabel.Value());
+            if (value.errorStateLabel == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
+        } else {
+            value.errorStateLabel = nil;
+        }
+        if (cppValue.errorStateDetails.HasValue()) {
+            value.errorStateDetails = AsString(cppValue.errorStateDetails.Value());
+            if (value.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                *aError = err;
+                return nil;
+            }
+        } else {
+            value.errorStateDetails = nil;
+        }
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::HepaFilterMonitoring;
+    switch (aAttributeId) {
+    case Attributes::Condition::Id: {
+        using TypeInfo = Attributes::Condition::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::DegradationDirection::Id: {
+        using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::ChangeIndication::Id: {
+        using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::InPlaceIndicator::Id: {
+        using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithBool:cppValue];
+        return value;
+    }
+    case Attributes::LastChangedTime::Id: {
+        using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::ReplacementProductList::Id: {
+        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRHEPAFilterMonitoringClusterReplacementProductStruct * newElement_0;
+                newElement_0 = [MTRHEPAFilterMonitoringClusterReplacementProductStruct new];
+                newElement_0.productIdentifierType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.productIdentifierType)];
+                newElement_0.productIdentifierValue = AsString(entry_0.productIdentifierValue);
+                if (newElement_0.productIdentifierValue == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForActivatedCarbonFilterMonitoringCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::ActivatedCarbonFilterMonitoring;
+    switch (aAttributeId) {
+    case Attributes::Condition::Id: {
+        using TypeInfo = Attributes::Condition::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::DegradationDirection::Id: {
+        using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::ChangeIndication::Id: {
+        using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::InPlaceIndicator::Id: {
+        using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithBool:cppValue];
+        return value;
+    }
+    case Attributes::LastChangedTime::Id: {
+        using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::ReplacementProductList::Id: {
+        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRActivatedCarbonFilterMonitoringClusterReplacementProductStruct * newElement_0;
+                newElement_0 = [MTRActivatedCarbonFilterMonitoringClusterReplacementProductStruct new];
+                newElement_0.productIdentifierType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.productIdentifierType)];
+                newElement_0.productIdentifierValue = AsString(entry_0.productIdentifierValue);
+                if (newElement_0.productIdentifierValue == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForBooleanSensorConfigurationCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::BooleanSensorConfiguration;
+    switch (aAttributeId) {
+    case Attributes::SensitivityLevel::Id: {
+        using TypeInfo = Attributes::SensitivityLevel::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::AlarmsActive::Id: {
+        using TypeInfo = Attributes::AlarmsActive::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+        return value;
+    }
+    case Attributes::AlarmsSuppressed::Id: {
+        using TypeInfo = Attributes::AlarmsSuppressed::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+        return value;
+    }
+    case Attributes::AlarmsEnabled::Id: {
+        using TypeInfo = Attributes::AlarmsEnabled::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForValveConfigurationAndControlCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::ValveConfigurationAndControl;
+    switch (aAttributeId) {
+    case Attributes::OpenDuration::Id: {
+        using TypeInfo = Attributes::OpenDuration::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::AutoCloseTime::Id: {
+        using TypeInfo = Attributes::AutoCloseTime::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::RemainingDuration::Id: {
+        using TypeInfo = Attributes::RemainingDuration::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::CurrentState::Id: {
+        using TypeInfo = Attributes::CurrentState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+        }
+        return value;
+    }
+    case Attributes::TargetState::Id: {
+        using TypeInfo = Attributes::TargetState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+        }
+        return value;
+    }
+    case Attributes::StartUpState::Id: {
+        using TypeInfo = Attributes::StartUpState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::CurrentLevel::Id: {
+        using TypeInfo = Attributes::CurrentLevel::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::TargetLevel::Id: {
+        using TypeInfo = Attributes::TargetLevel::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::OpenLevel::Id: {
+        using TypeInfo = Attributes::OpenLevel::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::ValveFault::Id: {
+        using TypeInfo = Attributes::ValveFault::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForDemandResponseLoadControlCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::DemandResponseLoadControl;
+    switch (aAttributeId) {
+    case Attributes::LoadControlPrograms::Id: {
+        using TypeInfo = Attributes::LoadControlPrograms::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRDemandResponseLoadControlClusterLoadControlProgramStruct * newElement_0;
+                newElement_0 = [MTRDemandResponseLoadControlClusterLoadControlProgramStruct new];
+                newElement_0.programID = AsData(entry_0.programID);
+                newElement_0.name = AsString(entry_0.name);
+                if (newElement_0.name == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+                if (entry_0.enrollmentGroup.IsNull()) {
+                    newElement_0.enrollmentGroup = nil;
+                } else {
+                    newElement_0.enrollmentGroup = [NSNumber numberWithUnsignedChar:entry_0.enrollmentGroup.Value()];
+                }
+                if (entry_0.randomStartMinutes.IsNull()) {
+                    newElement_0.randomStartMinutes = nil;
+                } else {
+                    newElement_0.randomStartMinutes = [NSNumber numberWithUnsignedChar:entry_0.randomStartMinutes.Value()];
+                }
+                if (entry_0.randomDurationMinutes.IsNull()) {
+                    newElement_0.randomDurationMinutes = nil;
+                } else {
+                    newElement_0.randomDurationMinutes = [NSNumber numberWithUnsignedChar:entry_0.randomDurationMinutes.Value()];
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
             }
+            value = array_0;
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::CurrentPhase::Id: {
-        using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+    case Attributes::NumberOfLoadControlPrograms::Id: {
+        using TypeInfo = Attributes::NumberOfLoadControlPrograms::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::CountdownTime::Id: {
-        using TypeInfo = Attributes::CountdownTime::TypeInfo;
+    case Attributes::Events::Id: {
+        using TypeInfo = Attributes::Events::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRDemandResponseLoadControlClusterLoadControlEventStruct * newElement_0;
+                newElement_0 = [MTRDemandResponseLoadControlClusterLoadControlEventStruct new];
+                newElement_0.eventID = AsData(entry_0.eventID);
+                if (entry_0.programID.IsNull()) {
+                    newElement_0.programID = nil;
+                } else {
+                    newElement_0.programID = AsData(entry_0.programID.Value());
+                }
+                newElement_0.control = [NSNumber numberWithUnsignedShort:entry_0.control.Raw()];
+                newElement_0.deviceClass = [NSNumber numberWithUnsignedInt:entry_0.deviceClass.Raw()];
+                if (entry_0.enrollmentGroup.HasValue()) {
+                    newElement_0.enrollmentGroup = [NSNumber numberWithUnsignedChar:entry_0.enrollmentGroup.Value()];
+                } else {
+                    newElement_0.enrollmentGroup = nil;
+                }
+                newElement_0.criticality = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.criticality)];
+                if (entry_0.startTime.IsNull()) {
+                    newElement_0.startTime = nil;
+                } else {
+                    newElement_0.startTime = [NSNumber numberWithUnsignedInt:entry_0.startTime.Value()];
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.transitions.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct * newElement_2;
+                        newElement_2 = [MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct new];
+                        newElement_2.duration = [NSNumber numberWithUnsignedShort:entry_2.duration];
+                        newElement_2.control = [NSNumber numberWithUnsignedShort:entry_2.control.Raw()];
+                        if (entry_2.temperatureControl.HasValue()) {
+                            newElement_2.temperatureControl = [MTRDemandResponseLoadControlClusterTemperatureControlStruct new];
+                            if (entry_2.temperatureControl.Value().coolingTempOffset.HasValue()) {
+                                if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull()) {
+                                    newElement_2.temperatureControl.coolingTempOffset = nil;
+                                } else {
+                                    newElement_2.temperatureControl.coolingTempOffset = [NSNumber numberWithUnsignedShort:entry_2.temperatureControl.Value().coolingTempOffset.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.coolingTempOffset = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().heatingtTempOffset.HasValue()) {
+                                if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull()) {
+                                    newElement_2.temperatureControl.heatingtTempOffset = nil;
+                                } else {
+                                    newElement_2.temperatureControl.heatingtTempOffset = [NSNumber numberWithUnsignedShort:entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.heatingtTempOffset = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue()) {
+                                if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull()) {
+                                    newElement_2.temperatureControl.coolingTempSetpoint = nil;
+                                } else {
+                                    newElement_2.temperatureControl.coolingTempSetpoint = [NSNumber numberWithShort:entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.coolingTempSetpoint = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue()) {
+                                if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull()) {
+                                    newElement_2.temperatureControl.heatingTempSetpoint = nil;
+                                } else {
+                                    newElement_2.temperatureControl.heatingTempSetpoint = [NSNumber numberWithShort:entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.heatingTempSetpoint = nil;
+                            }
+                        } else {
+                            newElement_2.temperatureControl = nil;
+                        }
+                        if (entry_2.averageLoadControl.HasValue()) {
+                            newElement_2.averageLoadControl = [MTRDemandResponseLoadControlClusterAverageLoadControlStruct new];
+                            newElement_2.averageLoadControl.loadAdjustment = [NSNumber numberWithChar:entry_2.averageLoadControl.Value().loadAdjustment];
+                        } else {
+                            newElement_2.averageLoadControl = nil;
+                        }
+                        if (entry_2.dutyCycleControl.HasValue()) {
+                            newElement_2.dutyCycleControl = [MTRDemandResponseLoadControlClusterDutyCycleControlStruct new];
+                            newElement_2.dutyCycleControl.dutyCycle = [NSNumber numberWithUnsignedChar:entry_2.dutyCycleControl.Value().dutyCycle];
+                        } else {
+                            newElement_2.dutyCycleControl = nil;
+                        }
+                        if (entry_2.powerSavingsControl.HasValue()) {
+                            newElement_2.powerSavingsControl = [MTRDemandResponseLoadControlClusterPowerSavingsControlStruct new];
+                            newElement_2.powerSavingsControl.powerSavings = [NSNumber numberWithUnsignedChar:entry_2.powerSavingsControl.Value().powerSavings];
+                        } else {
+                            newElement_2.powerSavingsControl = nil;
+                        }
+                        if (entry_2.heatingSourceControl.HasValue()) {
+                            newElement_2.heatingSourceControl = [MTRDemandResponseLoadControlClusterHeatingSourceControlStruct new];
+                            newElement_2.heatingSourceControl.heatingSource = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.heatingSourceControl.Value().heatingSource)];
+                        } else {
+                            newElement_2.heatingSourceControl = nil;
+                        }
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    newElement_0.transitions = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalStateList::Id: {
-        using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+    case Attributes::ActiveEvents::Id: {
+        using TypeInfo = Attributes::ActiveEvents::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -6542,18 +7795,109 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
             auto iter_0 = cppValue.begin();
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
-                MTROperationalStateClusterOperationalStateStruct * newElement_0;
-                newElement_0 = [MTROperationalStateClusterOperationalStateStruct new];
-                newElement_0.operationalStateID = [NSNumber numberWithUnsignedChar:entry_0.operationalStateID];
-                if (entry_0.operationalStateLabel.HasValue()) {
-                    newElement_0.operationalStateLabel = AsString(entry_0.operationalStateLabel.Value());
-                    if (newElement_0.operationalStateLabel == nil) {
-                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                MTRDemandResponseLoadControlClusterLoadControlEventStruct * newElement_0;
+                newElement_0 = [MTRDemandResponseLoadControlClusterLoadControlEventStruct new];
+                newElement_0.eventID = AsData(entry_0.eventID);
+                if (entry_0.programID.IsNull()) {
+                    newElement_0.programID = nil;
+                } else {
+                    newElement_0.programID = AsData(entry_0.programID.Value());
+                }
+                newElement_0.control = [NSNumber numberWithUnsignedShort:entry_0.control.Raw()];
+                newElement_0.deviceClass = [NSNumber numberWithUnsignedInt:entry_0.deviceClass.Raw()];
+                if (entry_0.enrollmentGroup.HasValue()) {
+                    newElement_0.enrollmentGroup = [NSNumber numberWithUnsignedChar:entry_0.enrollmentGroup.Value()];
+                } else {
+                    newElement_0.enrollmentGroup = nil;
+                }
+                newElement_0.criticality = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.criticality)];
+                if (entry_0.startTime.IsNull()) {
+                    newElement_0.startTime = nil;
+                } else {
+                    newElement_0.startTime = [NSNumber numberWithUnsignedInt:entry_0.startTime.Value()];
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    auto iter_2 = entry_0.transitions.begin();
+                    while (iter_2.Next()) {
+                        auto & entry_2 = iter_2.GetValue();
+                        MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct * newElement_2;
+                        newElement_2 = [MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct new];
+                        newElement_2.duration = [NSNumber numberWithUnsignedShort:entry_2.duration];
+                        newElement_2.control = [NSNumber numberWithUnsignedShort:entry_2.control.Raw()];
+                        if (entry_2.temperatureControl.HasValue()) {
+                            newElement_2.temperatureControl = [MTRDemandResponseLoadControlClusterTemperatureControlStruct new];
+                            if (entry_2.temperatureControl.Value().coolingTempOffset.HasValue()) {
+                                if (entry_2.temperatureControl.Value().coolingTempOffset.Value().IsNull()) {
+                                    newElement_2.temperatureControl.coolingTempOffset = nil;
+                                } else {
+                                    newElement_2.temperatureControl.coolingTempOffset = [NSNumber numberWithUnsignedShort:entry_2.temperatureControl.Value().coolingTempOffset.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.coolingTempOffset = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().heatingtTempOffset.HasValue()) {
+                                if (entry_2.temperatureControl.Value().heatingtTempOffset.Value().IsNull()) {
+                                    newElement_2.temperatureControl.heatingtTempOffset = nil;
+                                } else {
+                                    newElement_2.temperatureControl.heatingtTempOffset = [NSNumber numberWithUnsignedShort:entry_2.temperatureControl.Value().heatingtTempOffset.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.heatingtTempOffset = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().coolingTempSetpoint.HasValue()) {
+                                if (entry_2.temperatureControl.Value().coolingTempSetpoint.Value().IsNull()) {
+                                    newElement_2.temperatureControl.coolingTempSetpoint = nil;
+                                } else {
+                                    newElement_2.temperatureControl.coolingTempSetpoint = [NSNumber numberWithShort:entry_2.temperatureControl.Value().coolingTempSetpoint.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.coolingTempSetpoint = nil;
+                            }
+                            if (entry_2.temperatureControl.Value().heatingTempSetpoint.HasValue()) {
+                                if (entry_2.temperatureControl.Value().heatingTempSetpoint.Value().IsNull()) {
+                                    newElement_2.temperatureControl.heatingTempSetpoint = nil;
+                                } else {
+                                    newElement_2.temperatureControl.heatingTempSetpoint = [NSNumber numberWithShort:entry_2.temperatureControl.Value().heatingTempSetpoint.Value().Value()];
+                                }
+                            } else {
+                                newElement_2.temperatureControl.heatingTempSetpoint = nil;
+                            }
+                        } else {
+                            newElement_2.temperatureControl = nil;
+                        }
+                        if (entry_2.averageLoadControl.HasValue()) {
+                            newElement_2.averageLoadControl = [MTRDemandResponseLoadControlClusterAverageLoadControlStruct new];
+                            newElement_2.averageLoadControl.loadAdjustment = [NSNumber numberWithChar:entry_2.averageLoadControl.Value().loadAdjustment];
+                        } else {
+                            newElement_2.averageLoadControl = nil;
+                        }
+                        if (entry_2.dutyCycleControl.HasValue()) {
+                            newElement_2.dutyCycleControl = [MTRDemandResponseLoadControlClusterDutyCycleControlStruct new];
+                            newElement_2.dutyCycleControl.dutyCycle = [NSNumber numberWithUnsignedChar:entry_2.dutyCycleControl.Value().dutyCycle];
+                        } else {
+                            newElement_2.dutyCycleControl = nil;
+                        }
+                        if (entry_2.powerSavingsControl.HasValue()) {
+                            newElement_2.powerSavingsControl = [MTRDemandResponseLoadControlClusterPowerSavingsControlStruct new];
+                            newElement_2.powerSavingsControl.powerSavings = [NSNumber numberWithUnsignedChar:entry_2.powerSavingsControl.Value().powerSavings];
+                        } else {
+                            newElement_2.powerSavingsControl = nil;
+                        }
+                        if (entry_2.heatingSourceControl.HasValue()) {
+                            newElement_2.heatingSourceControl = [MTRDemandResponseLoadControlClusterHeatingSourceControlStruct new];
+                            newElement_2.heatingSourceControl.heatingSource = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.heatingSourceControl.Value().heatingSource)];
+                        } else {
+                            newElement_2.heatingSourceControl = nil;
+                        }
+                        [array_2 addObject:newElement_2];
+                    }
+                    CHIP_ERROR err = iter_2.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
                         *aError = err;
                         return nil;
                     }
-                } else {
-                    newElement_0.operationalStateLabel = nil;
+                    newElement_0.transitions = array_2;
                 }
                 [array_0 addObject:newElement_0];
             }
@@ -6566,54 +7910,50 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalState::Id: {
-        using TypeInfo = Attributes::OperationalState::TypeInfo;
+    case Attributes::NumberOfEventsPerProgram::Id: {
+        using TypeInfo = Attributes::NumberOfEventsPerProgram::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalError::Id: {
-        using TypeInfo = Attributes::OperationalError::TypeInfo;
+    case Attributes::NumberOfTransitions::Id: {
+        using TypeInfo = Attributes::NumberOfTransitions::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        MTROperationalStateClusterErrorStateStruct * _Nonnull value;
-        value = [MTROperationalStateClusterErrorStateStruct new];
-        value.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorStateID];
-        if (cppValue.errorStateLabel.HasValue()) {
-            value.errorStateLabel = AsString(cppValue.errorStateLabel.Value());
-            if (value.errorStateLabel == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                *aError = err;
-                return nil;
-            }
-        } else {
-            value.errorStateLabel = nil;
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::DefaultRandomStart::Id: {
+        using TypeInfo = Attributes::DefaultRandomStart::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
         }
-        if (cppValue.errorStateDetails.HasValue()) {
-            value.errorStateDetails = AsString(cppValue.errorStateDetails.Value());
-            if (value.errorStateDetails == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                *aError = err;
-                return nil;
-            }
-        } else {
-            value.errorStateDetails = nil;
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
+        return value;
+    }
+    case Attributes::DefaultRandomDuration::Id: {
+        using TypeInfo = Attributes::DefaultRandomDuration::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
         }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6622,67 +7962,49 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
     *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
     return nil;
 }
-static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+static id _Nullable DecodeAttributeValueForEnergyEVSECluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
-    using namespace Clusters::RvcOperationalState;
+    using namespace Clusters::EnergyEvse;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::PhaseList::Id: {
-        using TypeInfo = Attributes::PhaseList::TypeInfo;
+    case Attributes::State::Id: {
+        using TypeInfo = Attributes::State::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nullable value;
+        NSNumber * _Nullable value;
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            { // Scope for our temporary variables
-                auto * array_1 = [NSMutableArray new];
-                auto iter_1 = cppValue.Value().begin();
-                while (iter_1.Next()) {
-                    auto & entry_1 = iter_1.GetValue();
-                    NSString * newElement_1;
-                    newElement_1 = AsString(entry_1);
-                    if (newElement_1 == nil) {
-                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                        *aError = err;
-                        return nil;
-                    }
-                    [array_1 addObject:newElement_1];
-                }
-                CHIP_ERROR err = iter_1.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_1;
-            }
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::CurrentPhase::Id: {
-        using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+    case Attributes::SupplyState::Id: {
+        using TypeInfo = Attributes::SupplyState::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        return value;
+    }
+    case Attributes::FaultState::Id: {
+        using TypeInfo = Attributes::FaultState::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
         }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::CountdownTime::Id: {
-        using TypeInfo = Attributes::CountdownTime::TypeInfo;
+    case Attributes::ChargingEnabledUntil::Id: {
+        using TypeInfo = Attributes::ChargingEnabledUntil::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -6696,160 +8018,111 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalStateList::Id: {
-        using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+    case Attributes::DischargingEnabledUntil::Id: {
+        using TypeInfo = Attributes::DischargingEnabledUntil::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = cppValue.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                MTRRVCOperationalStateClusterOperationalStateStruct * newElement_0;
-                newElement_0 = [MTRRVCOperationalStateClusterOperationalStateStruct new];
-                newElement_0.operationalStateID = [NSNumber numberWithUnsignedChar:entry_0.operationalStateID];
-                if (entry_0.operationalStateLabel.HasValue()) {
-                    newElement_0.operationalStateLabel = AsString(entry_0.operationalStateLabel.Value());
-                    if (newElement_0.operationalStateLabel == nil) {
-                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                        *aError = err;
-                        return nil;
-                    }
-                } else {
-                    newElement_0.operationalStateLabel = nil;
-                }
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                *aError = err;
-                return nil;
-            }
-            value = array_0;
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::CircuitCapacity::Id: {
+        using TypeInfo = Attributes::CircuitCapacity::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
         }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithLongLong:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalState::Id: {
-        using TypeInfo = Attributes::OperationalState::TypeInfo;
+    case Attributes::MinimumChargeCurrent::Id: {
+        using TypeInfo = Attributes::MinimumChargeCurrent::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithLongLong:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::OperationalError::Id: {
-        using TypeInfo = Attributes::OperationalError::TypeInfo;
+    case Attributes::MaximumChargeCurrent::Id: {
+        using TypeInfo = Attributes::MaximumChargeCurrent::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        MTRRVCOperationalStateClusterErrorStateStruct * _Nonnull value;
-        value = [MTRRVCOperationalStateClusterErrorStateStruct new];
-        value.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorStateID];
-        if (cppValue.errorStateLabel.HasValue()) {
-            value.errorStateLabel = AsString(cppValue.errorStateLabel.Value());
-            if (value.errorStateLabel == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                *aError = err;
-                return nil;
-            }
-        } else {
-            value.errorStateLabel = nil;
-        }
-        if (cppValue.errorStateDetails.HasValue()) {
-            value.errorStateDetails = AsString(cppValue.errorStateDetails.Value());
-            if (value.errorStateDetails == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                *aError = err;
-                return nil;
-            }
-        } else {
-            value.errorStateDetails = nil;
-        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithLongLong:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-    default: {
-        break;
-    }
+    case Attributes::MaximumDischargeCurrent::Id: {
+        using TypeInfo = Attributes::MaximumDischargeCurrent::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithLongLong:cppValue];
+        return value;
     }
-
-    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-    return nil;
-}
-static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
-{
-    using namespace Clusters::HepaFilterMonitoring;
-    switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::Condition::Id: {
-        using TypeInfo = Attributes::Condition::TypeInfo;
+    case Attributes::UserMaximumChargeCurrent::Id: {
+        using TypeInfo = Attributes::UserMaximumChargeCurrent::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithLongLong:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::DegradationDirection::Id: {
-        using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+    case Attributes::RandomizationDelayWindow::Id: {
+        using TypeInfo = Attributes::RandomizationDelayWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ChangeIndication::Id: {
-        using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+    case Attributes::NumberOfWeeklyTargets::Id: {
+        using TypeInfo = Attributes::NumberOfWeeklyTargets::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::InPlaceIndicator::Id: {
-        using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+    case Attributes::NumberOfDailyTargets::Id: {
+        using TypeInfo = Attributes::NumberOfDailyTargets::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithBool:cppValue];
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::LastChangedTime::Id: {
-        using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+    case Attributes::NextChargeStartTime::Id: {
+        using TypeInfo = Attributes::NextChargeStartTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -6863,109 +8136,83 @@ static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(Attribute
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ReplacementProductList::Id: {
-        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+    case Attributes::NextChargeTargetTime::Id: {
+        using TypeInfo = Attributes::NextChargeTargetTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = cppValue.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                MTRHEPAFilterMonitoringClusterReplacementProductStruct * newElement_0;
-                newElement_0 = [MTRHEPAFilterMonitoringClusterReplacementProductStruct new];
-                newElement_0.productIdentifierType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.productIdentifierType)];
-                newElement_0.productIdentifierValue = AsString(entry_0.productIdentifierValue);
-                if (newElement_0.productIdentifierValue == nil) {
-                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                    *aError = err;
-                    return nil;
-                }
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                *aError = err;
-                return nil;
-            }
-            value = array_0;
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-    default: {
-        break;
-    }
-    }
-
-    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-    return nil;
-}
-static id _Nullable DecodeAttributeValueForActivatedCarbonFilterMonitoringCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
-{
-    using namespace Clusters::ActivatedCarbonFilterMonitoring;
-    switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::Condition::Id: {
-        using TypeInfo = Attributes::Condition::TypeInfo;
+    case Attributes::NextChargeRequiredEnergy::Id: {
+        using TypeInfo = Attributes::NextChargeRequiredEnergy::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithLongLong:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::DegradationDirection::Id: {
-        using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+    case Attributes::NextChargeTargetSoC::Id: {
+        using TypeInfo = Attributes::NextChargeTargetSoC::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ChangeIndication::Id: {
-        using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+    case Attributes::ApproximateEVEfficiency::Id: {
+        using TypeInfo = Attributes::ApproximateEVEfficiency::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::InPlaceIndicator::Id: {
-        using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+    case Attributes::StateOfCharge::Id: {
+        using TypeInfo = Attributes::StateOfCharge::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithBool:cppValue];
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+        }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::LastChangedTime::Id: {
-        using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+    case Attributes::BatteryCapacity::Id: {
+        using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -6975,46 +8222,78 @@ static id _Nullable DecodeAttributeValueForActivatedCarbonFilterMonitoringCluste
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            value = [NSNumber numberWithLongLong:cppValue.Value()];
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ReplacementProductList::Id: {
-        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+    case Attributes::VehicleID::Id: {
+        using TypeInfo = Attributes::VehicleID::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = cppValue.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                MTRActivatedCarbonFilterMonitoringClusterReplacementProductStruct * newElement_0;
-                newElement_0 = [MTRActivatedCarbonFilterMonitoringClusterReplacementProductStruct new];
-                newElement_0.productIdentifierType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.productIdentifierType)];
-                newElement_0.productIdentifierValue = AsString(entry_0.productIdentifierValue);
-                if (newElement_0.productIdentifierValue == nil) {
-                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                    *aError = err;
-                    return nil;
-                }
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
+        NSString * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = AsString(cppValue.Value());
+            if (value == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
                 *aError = err;
                 return nil;
             }
-            value = array_0;
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
+    case Attributes::SessionID::Id: {
+        using TypeInfo = Attributes::SessionID::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nullable value;
+        if (cppValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+        }
+        return value;
+    }
+    case Attributes::SessionDuration::Id: {
+        using TypeInfo = Attributes::SessionDuration::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue];
+        return value;
+    }
+    case Attributes::SessionEnergyCharged::Id: {
+        using TypeInfo = Attributes::SessionEnergyCharged::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithLongLong:cppValue];
+        return value;
+    }
+    case Attributes::SessionEnergyDischarged::Id: {
+        using TypeInfo = Attributes::SessionEnergyDischarged::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithLongLong:cppValue];
+        return value;
+    }
     default: {
         break;
     }
@@ -8917,7 +10196,6 @@ static id _Nullable DecodeAttributeValueForFanControlCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AirflowDirection::Id: {
         using TypeInfo = Attributes::AirflowDirection::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -8929,7 +10207,6 @@ static id _Nullable DecodeAttributeValueForFanControlCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -8950,7 +10227,7 @@ static id _Nullable DecodeAttributeValueForThermostatUserInterfaceConfigurationC
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
     case Attributes::KeypadLockout::Id: {
@@ -8961,7 +10238,7 @@ static id _Nullable DecodeAttributeValueForThermostatUserInterfaceConfigurationC
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
     case Attributes::ScheduleProgrammingVisibility::Id: {
@@ -8972,7 +10249,7 @@ static id _Nullable DecodeAttributeValueForThermostatUserInterfaceConfigurationC
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
     default: {
@@ -10382,7 +11659,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
 {
     using namespace Clusters::CarbonMonoxideConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10398,8 +11674,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10415,8 +11689,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10432,8 +11704,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10449,8 +11719,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10462,8 +11730,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10479,8 +11745,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10492,8 +11756,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10505,8 +11767,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10518,8 +11778,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10531,8 +11789,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10544,7 +11800,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -10557,7 +11812,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
 {
     using namespace Clusters::CarbonDioxideConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10573,8 +11827,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10590,8 +11842,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10607,8 +11857,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10624,8 +11872,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10637,8 +11883,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10654,8 +11898,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10667,8 +11909,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10680,8 +11920,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10693,8 +11931,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10706,8 +11942,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10719,7 +11953,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -10732,7 +11965,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
 {
     using namespace Clusters::NitrogenDioxideConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10748,8 +11980,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10765,8 +11995,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10782,8 +12010,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10799,8 +12025,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10812,8 +12036,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10829,8 +12051,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10842,8 +12062,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10855,8 +12073,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10868,8 +12084,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10881,8 +12095,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10894,7 +12106,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -10907,7 +12118,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
 {
     using namespace Clusters::OzoneConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10923,8 +12133,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10940,8 +12148,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10957,8 +12163,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10974,8 +12178,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -10987,8 +12189,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11004,8 +12204,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11017,8 +12215,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11030,8 +12226,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11043,8 +12237,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11056,8 +12248,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11069,7 +12259,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11082,7 +12271,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
 {
     using namespace Clusters::Pm25ConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11098,8 +12286,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11115,8 +12301,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11132,8 +12316,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11149,8 +12331,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11162,8 +12342,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11179,8 +12357,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11192,8 +12368,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11205,8 +12379,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11218,8 +12390,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11231,8 +12401,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11244,7 +12412,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11257,7 +12424,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
 {
     using namespace Clusters::FormaldehydeConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11273,8 +12439,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11290,8 +12454,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11307,8 +12469,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11324,8 +12484,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11337,8 +12495,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11354,8 +12510,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11367,8 +12521,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11380,8 +12532,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11393,8 +12543,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11406,8 +12554,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11419,7 +12565,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11432,7 +12577,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
 {
     using namespace Clusters::Pm1ConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11448,8 +12592,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11465,8 +12607,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11482,8 +12622,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11499,8 +12637,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11512,8 +12648,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11529,8 +12663,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11542,8 +12674,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11555,8 +12685,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11568,8 +12696,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11581,8 +12707,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11594,7 +12718,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11607,7 +12730,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
 {
     using namespace Clusters::Pm10ConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11623,8 +12745,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11640,8 +12760,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11657,8 +12775,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11674,8 +12790,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11687,8 +12801,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11704,8 +12816,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11717,8 +12827,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11730,8 +12838,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11743,8 +12849,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11756,8 +12860,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11769,7 +12871,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11782,7 +12883,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
 {
     using namespace Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11798,8 +12898,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11815,8 +12913,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11832,8 +12928,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11849,8 +12943,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11862,8 +12954,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11879,8 +12969,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11892,8 +12980,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11905,8 +12991,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11918,8 +13002,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11931,8 +13013,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11944,7 +13024,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11957,7 +13036,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
 {
     using namespace Clusters::RadonConcentrationMeasurement;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasuredValue::Id: {
         using TypeInfo = Attributes::MeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11973,8 +13051,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinMeasuredValue::Id: {
         using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -11990,8 +13066,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxMeasuredValue::Id: {
         using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12007,8 +13081,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValue::Id: {
         using TypeInfo = Attributes::PeakMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12024,8 +13096,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PeakMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::PeakMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12037,8 +13107,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValue::Id: {
         using TypeInfo = Attributes::AverageMeasuredValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12054,8 +13122,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AverageMeasuredValueWindow::Id: {
         using TypeInfo = Attributes::AverageMeasuredValueWindow::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12067,8 +13133,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Uncertainty::Id: {
         using TypeInfo = Attributes::Uncertainty::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12080,8 +13144,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithFloat:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementUnit::Id: {
         using TypeInfo = Attributes::MeasurementUnit::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12093,8 +13155,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MeasurementMedium::Id: {
         using TypeInfo = Attributes::MeasurementMedium::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12106,8 +13166,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::LevelValue::Id: {
         using TypeInfo = Attributes::LevelValue::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -12119,7 +13177,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -12148,6 +13205,17 @@ static id _Nullable DecodeAttributeValueForWakeOnLANCluster(AttributeId aAttribu
         }
         return value;
     }
+    case Attributes::LinkLocalAddress::Id: {
+        using TypeInfo = Attributes::LinkLocalAddress::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSData * _Nonnull value;
+        value = AsData(cppValue);
+        return value;
+    }
     default: {
         break;
     }
@@ -12616,7 +13684,7 @@ static id _Nullable DecodeAttributeValueForContentLauncherCluster(AttributeId aA
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue];
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
     default: {
@@ -15734,7 +16802,6 @@ static id _Nullable DecodeAttributeValueForSampleMEICluster(AttributeId aAttribu
 {
     using namespace Clusters::SampleMei;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::FlipFlop::Id: {
         using TypeInfo = Attributes::FlipFlop::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -15746,7 +16813,6 @@ static id _Nullable DecodeAttributeValueForSampleMEICluster(AttributeId aAttribu
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -15877,6 +16943,18 @@ id _Nullable MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::T
     case Clusters::IcdManagement::Id: {
         return DecodeAttributeValueForICDManagementCluster(aPath.mAttributeId, aReader, aError);
     }
+    case Clusters::Timer::Id: {
+        return DecodeAttributeValueForTimerCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::OvenCavityOperationalState::Id: {
+        return DecodeAttributeValueForOvenCavityOperationalStateCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::OvenMode::Id: {
+        return DecodeAttributeValueForOvenModeCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::LaundryDryerControls::Id: {
+        return DecodeAttributeValueForLaundryDryerControlsCluster(aPath.mAttributeId, aReader, aError);
+    }
     case Clusters::ModeSelect::Id: {
         return DecodeAttributeValueForModeSelectCluster(aPath.mAttributeId, aReader, aError);
     }
@@ -15913,6 +16991,12 @@ id _Nullable MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::T
     case Clusters::DishwasherAlarm::Id: {
         return DecodeAttributeValueForDishwasherAlarmCluster(aPath.mAttributeId, aReader, aError);
     }
+    case Clusters::MicrowaveOvenMode::Id: {
+        return DecodeAttributeValueForMicrowaveOvenModeCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::MicrowaveOvenControl::Id: {
+        return DecodeAttributeValueForMicrowaveOvenControlCluster(aPath.mAttributeId, aReader, aError);
+    }
     case Clusters::OperationalState::Id: {
         return DecodeAttributeValueForOperationalStateCluster(aPath.mAttributeId, aReader, aError);
     }
@@ -15925,6 +17009,18 @@ id _Nullable MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::T
     case Clusters::ActivatedCarbonFilterMonitoring::Id: {
         return DecodeAttributeValueForActivatedCarbonFilterMonitoringCluster(aPath.mAttributeId, aReader, aError);
     }
+    case Clusters::BooleanSensorConfiguration::Id: {
+        return DecodeAttributeValueForBooleanSensorConfigurationCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::ValveConfigurationAndControl::Id: {
+        return DecodeAttributeValueForValveConfigurationAndControlCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::DemandResponseLoadControl::Id: {
+        return DecodeAttributeValueForDemandResponseLoadControlCluster(aPath.mAttributeId, aReader, aError);
+    }
+    case Clusters::EnergyEvse::Id: {
+        return DecodeAttributeValueForEnergyEVSECluster(aPath.mAttributeId, aReader, aError);
+    }
     case Clusters::DoorLock::Id: {
         return DecodeAttributeValueForDoorLockCluster(aPath.mAttributeId, aReader, aError);
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 7a6c820b64fc67..eadaa480abf11a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -28,15 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Attributes and commands for putting a device into Identification mode (e.g. flashing a light).
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterIdentify : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterIdentify : MTRGenericBaseCluster
 
 /**
  * Command Identify
@@ -106,13 +98,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Groups
- *
- * Attributes and commands for group configuration and manipulation.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterGroups : MTRCluster
+@interface MTRBaseClusterIdentify (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -120,7 +106,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Groups
+ *
+ * Attributes and commands for group configuration and manipulation.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterGroups : MTRGenericBaseCluster
 
 /**
  * Command AddGroup
@@ -208,13 +204,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Scenes
- *
- * Attributes and commands for scene configuration and manipulation.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterScenes : MTRCluster
+@interface MTRBaseClusterGroups (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -222,7 +212,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Scenes
+ *
+ * Attributes and commands for scene configuration and manipulation.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterScenes : MTRGenericBaseCluster
 
 /**
  * Command AddScene
@@ -327,11 +327,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeSceneTableSizeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeRemainingCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeRemainingCapacityWithParams:(MTRSubscribeParams *)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeRemainingCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeFabricSceneInfoWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFabricSceneInfoWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFabricSceneInfoWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -374,13 +374,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster On/Off
- *
- * Attributes and commands for switching devices between 'On' and 'Off' states.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterOnOff : MTRCluster
+@interface MTRBaseClusterScenes (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -388,7 +382,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster On/Off
+ *
+ * Attributes and commands for switching devices between 'On' and 'Off' states.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterOnOff : MTRGenericBaseCluster
 
 /**
  * Command Off
@@ -512,13 +516,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster On/off Switch Configuration
- *
- * Attributes and commands for configuring On/Off switching devices.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterOnOffSwitchConfiguration : MTRCluster
+@interface MTRBaseClusterOnOff (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -526,7 +524,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster On/off Switch Configuration
+ *
+ * Attributes and commands for configuring On/Off switching devices.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterOnOffSwitchConfiguration : MTRGenericBaseCluster
 
 - (void)readAttributeSwitchTypeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeSwitchTypeWithParams:(MTRSubscribeParams *)params
@@ -583,13 +591,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Level Control
- *
- * Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.'
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterLevelControl : MTRCluster
+@interface MTRBaseClusterOnOffSwitchConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -597,7 +599,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Level Control
+ *
+ * Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.'
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterLevelControl : MTRGenericBaseCluster
 
 /**
  * Command MoveToLevel
@@ -794,13 +806,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Binary Input (Basic)
- *
- * An interface for reading the value of a binary measurement and accessing various characteristics of that measurement.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterBinaryInputBasic : MTRCluster
+@interface MTRBaseClusterLevelControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -808,7 +814,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Binary Input (Basic)
+ *
+ * An interface for reading the value of a binary measurement and accessing various characteristics of that measurement.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterBinaryInputBasic : MTRGenericBaseCluster
 
 - (void)readAttributeActiveTextWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -917,13 +933,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pulse Width Modulation
- *
- * Cluster to control pulse width modulation
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterPulseWidthModulation : MTRCluster
+@interface MTRBaseClusterBinaryInputBasic (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -931,7 +941,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Pulse Width Modulation
+ *
+ * Cluster to control pulse width modulation
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterPulseWidthModulation : MTRGenericBaseCluster
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -974,13 +994,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Descriptor
- *
- * The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterDescriptor : MTRCluster
+@interface MTRBaseClusterPulseWidthModulation (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -988,7 +1002,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Descriptor
+ *
+ * The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterDescriptor : MTRGenericBaseCluster
 
 - (void)readAttributeDeviceTypeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeDeviceTypeListWithParams:(MTRSubscribeParams *)params
@@ -1061,13 +1085,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Binding
- *
- * The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterBinding : MTRCluster
+@interface MTRBaseClusterDescriptor (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -1075,7 +1093,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Binding
+ *
+ * The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterBinding : MTRGenericBaseCluster
 
 - (void)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1126,6 +1154,18 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
+@interface MTRBaseClusterBinding (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
 /**
  * Cluster Access Control
  *
@@ -1135,15 +1175,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
       cluster instances.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterAccessControl : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterAccessControl : MTRGenericBaseCluster
 
 - (void)readAttributeACLWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeACLWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1220,13 +1252,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Actions
- *
- * This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterActions : MTRCluster
+@interface MTRBaseClusterAccessControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -1234,7 +1260,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Actions
+ *
+ * This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterActions : MTRGenericBaseCluster
 
 /**
  * Command InstantAction
@@ -1368,6 +1404,18 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
+@interface MTRBaseClusterActions (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
 /**
  * Cluster Basic Information
  *
@@ -1376,15 +1424,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
       which apply to the whole Node. Also allows setting user device information such as location.
  */
 MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterBasicInformation : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterBasicInformation : MTRGenericBaseCluster
 
 - (void)readAttributeDataModelRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeDataModelRevisionWithParams:(MTRSubscribeParams *)params
@@ -1518,6 +1558,18 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                                         reportHandler:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 + (void)readAttributeProductAppearanceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
+- (void)readAttributeSpecificationVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSpecificationVersionWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSpecificationVersionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaxPathsPerInvokeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaxPathsPerInvokeWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaxPathsPerInvokeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -1559,13 +1611,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster OTA Software Update Provider
- *
- * Provides an interface for providing OTA software updates
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterOTASoftwareUpdateProvider : MTRCluster
+@interface MTRBaseClusterBasicInformation (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -1573,7 +1619,17 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster OTA Software Update Provider
+ *
+ * Provides an interface for providing OTA software updates
+ */
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRBaseClusterOTASoftwareUpdateProvider : MTRGenericBaseCluster
 
 /**
  * Command QueryImage
@@ -1635,13 +1691,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster OTA Software Update Requestor
- *
- * Provides an interface for downloading and applying OTA software updates
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterOTASoftwareUpdateRequestor : MTRCluster
+@interface MTRBaseClusterOTASoftwareUpdateProvider (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -1649,7 +1699,17 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster OTA Software Update Requestor
+ *
+ * Provides an interface for downloading and applying OTA software updates
+ */
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRBaseClusterOTASoftwareUpdateRequestor : MTRGenericBaseCluster
 
 /**
  * Command AnnounceOTAProvider
@@ -1725,6 +1785,18 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
+@interface MTRBaseClusterOTASoftwareUpdateRequestor (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
 /**
  * Cluster Localization Configuration
  *
@@ -1734,15 +1806,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
       they can be configured to use a user’s preferred language, units, etc
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterLocalizationConfiguration : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterLocalizationConfiguration : MTRGenericBaseCluster
 
 - (void)readAttributeActiveLocaleWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1799,24 +1863,28 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Time Format Localization
- *
- * Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
-      or audibly convey time information need a mechanism by which they can be configured to use a
-      user’s preferred format.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterTimeFormatLocalization : MTRCluster
-
+@interface MTRBaseClusterLocalizationConfiguration (Availability)
+
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
  * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Time Format Localization
+ *
+ * Nodes should be expected to be deployed to any and all regions of the world. These global regions
+      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
+      or audibly convey time information need a mechanism by which they can be configured to use a
+      user’s preferred format.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterTimeFormatLocalization : MTRGenericBaseCluster
 
 - (void)readAttributeHourFormatWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1881,6 +1949,18 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
+@interface MTRBaseClusterTimeFormatLocalization (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
 /**
  * Cluster Unit Localization
  *
@@ -1890,15 +1970,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
       mechanism by which they can be configured to use a user’s preferred unit.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterUnitLocalization : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterUnitLocalization : MTRGenericBaseCluster
 
 - (void)readAttributeTemperatureUnitWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1949,13 +2021,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Power Source Configuration
- *
- * This cluster is used to describe the configuration and capabilities of a Device's power system.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterPowerSourceConfiguration : MTRCluster
+@interface MTRBaseClusterUnitLocalization (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -1963,7 +2029,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Power Source Configuration
+ *
+ * This cluster is used to describe the configuration and capabilities of a Device's power system.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterPowerSourceConfiguration : MTRGenericBaseCluster
 
 - (void)readAttributeSourcesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeSourcesWithParams:(MTRSubscribeParams *)params
@@ -2012,13 +2088,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Power Source
- *
- * This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterPowerSource : MTRCluster
+@interface MTRBaseClusterPowerSourceConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2026,7 +2096,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Power Source
+ *
+ * This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterPowerSource : MTRGenericBaseCluster
 
 - (void)readAttributeStatusWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeStatusWithParams:(MTRSubscribeParams *)params
@@ -2261,13 +2341,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster General Commissioning
- *
- * This cluster is used to manage global aspects of the Commissioning flow.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterGeneralCommissioning : MTRCluster
+@interface MTRBaseClusterPowerSource (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2275,7 +2349,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster General Commissioning
+ *
+ * This cluster is used to manage global aspects of the Commissioning flow.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterGeneralCommissioning : MTRGenericBaseCluster
 
 /**
  * Command ArmFailSafe
@@ -2371,13 +2455,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Network Commissioning
- *
- * Functionality to configure, enable, disable network credentials and access on a Matter device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterNetworkCommissioning : MTRCluster
+@interface MTRBaseClusterGeneralCommissioning (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2385,7 +2463,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Network Commissioning
+ *
+ * Functionality to configure, enable, disable network credentials and access on a Matter device.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterNetworkCommissioning : MTRGenericBaseCluster
 
 /**
  * Command ScanNetworks
@@ -2423,6 +2511,12 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Modify the order in which networks will be presented in the Networks attribute.
  */
 - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkParams *)params completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+/**
+ * Command QueryIdentity
+ *
+ * Retrieve details about and optionally proof of possession of a network client identity.
+ */
+- (void)queryIdentityWithParams:(MTRNetworkCommissioningClusterQueryIdentityParams *)params completion:(void (^)(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeMaxNetworksWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMaxNetworksWithParams:(MTRSubscribeParams *)params
@@ -2533,13 +2627,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Diagnostic Logs
- *
- * The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterDiagnosticLogs : MTRCluster
+@interface MTRBaseClusterNetworkCommissioning (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2547,7 +2635,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Diagnostic Logs
+ *
+ * The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterDiagnosticLogs : MTRGenericBaseCluster
 
 /**
  * Command RetrieveLogsRequest
@@ -2597,13 +2695,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster General Diagnostics
- *
- * The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterGeneralDiagnostics : MTRCluster
+@interface MTRBaseClusterDiagnosticLogs (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2611,7 +2703,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster General Diagnostics
+ *
+ * The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterGeneralDiagnostics : MTRGenericBaseCluster
 
 /**
  * Command TestEventTrigger
@@ -2619,6 +2721,14 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Provide a means for certification tests to trigger some test-plan-specific events
  */
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+/**
+ * Command TimeSnapshot
+ *
+ * Take a snapshot of system time and epoch time.
+ */
+- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)timeSnapshotWithCompletion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeNetworkInterfacesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeNetworkInterfacesWithParams:(MTRSubscribeParams *)params
@@ -2674,12 +2784,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 + (void)readAttributeTestEventTriggersEnabledWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeAverageWearCountWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeAverageWearCountWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAverageWearCountWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -2721,13 +2825,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Software Diagnostics
- *
- * The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterSoftwareDiagnostics : MTRCluster
+@interface MTRBaseClusterGeneralDiagnostics (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2735,7 +2833,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Software Diagnostics
+ *
+ * The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterSoftwareDiagnostics : MTRGenericBaseCluster
 
 /**
  * Command ResetWatermarks
@@ -2811,13 +2919,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thread Network Diagnostics
- *
- * The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterThreadNetworkDiagnostics : MTRCluster
+@interface MTRBaseClusterSoftwareDiagnostics (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -2825,7 +2927,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Thread Network Diagnostics
+ *
+ * The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterThreadNetworkDiagnostics : MTRGenericBaseCluster
 
 /**
  * Command ResetCounts
@@ -3255,13 +3367,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster WiFi Network Diagnostics
- *
- * The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterWiFiNetworkDiagnostics : MTRCluster
+@interface MTRBaseClusterThreadNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -3269,7 +3375,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster WiFi Network Diagnostics
+ *
+ * The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterWiFiNetworkDiagnostics : MTRGenericBaseCluster
 
 /**
  * Command ResetCounts
@@ -3399,13 +3515,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Ethernet Network Diagnostics
- *
- * The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterEthernetNetworkDiagnostics : MTRCluster
+@interface MTRBaseClusterWiFiNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -3413,7 +3523,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Ethernet Network Diagnostics
+ *
+ * The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterEthernetNetworkDiagnostics : MTRGenericBaseCluster
 
 /**
  * Command ResetCounts
@@ -3519,13 +3639,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Time Synchronization
- *
- * Accurate time is required for a number of reasons, including scheduling, display and validating security materials.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterTimeSynchronization : MTRCluster
+@interface MTRBaseClusterEthernetNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -3533,7 +3647,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Time Synchronization
+ *
+ * Accurate time is required for a number of reasons, including scheduling, display and validating security materials.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterTimeSynchronization : MTRGenericBaseCluster
 
 /**
  * Command SetUTCTime
@@ -3685,6 +3809,18 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+@interface MTRBaseClusterTimeSynchronization (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
 /**
  * Cluster Bridged Device Basic Information
  *
@@ -3694,15 +3830,7 @@ MTR_PROVISIONALLY_AVAILABLE
           such as the vendor name, the model name, or user-assigned name.
  */
 MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterBridgedDeviceBasicInformation : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterBridgedDeviceBasicInformation : MTRGenericBaseCluster
 
 - (void)readAttributeVendorNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeVendorNameWithParams:(MTRSubscribeParams *)params
@@ -3843,6 +3971,18 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
+@interface MTRBaseClusterBridgedDeviceBasicInformation (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
 /**
  * Cluster Switch
  *
@@ -3851,15 +3991,7 @@ Two types of switch devices are supported: latching switch (e.g. rocker switch)
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterSwitch : MTRCluster
-
-/**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+@interface MTRBaseClusterSwitch : MTRGenericBaseCluster
 
 - (void)readAttributeNumberOfPositionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeNumberOfPositionsWithParams:(MTRSubscribeParams *)params
@@ -3920,13 +4052,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Administrator Commissioning
- *
- * Commands to trigger a Node to allow a new Administrator to commission it.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterAdministratorCommissioning : MTRCluster
+@interface MTRBaseClusterSwitch (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -3934,7 +4060,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Administrator Commissioning
+ *
+ * Commands to trigger a Node to allow a new Administrator to commission it.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterAdministratorCommissioning : MTRGenericBaseCluster
 
 /**
  * Command OpenCommissioningWindow
@@ -4016,13 +4152,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Operational Credentials
- *
- * This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterOperationalCredentials : MTRCluster
+@interface MTRBaseClusterAdministratorCommissioning (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4030,7 +4160,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Operational Credentials
+ *
+ * This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterOperationalCredentials : MTRGenericBaseCluster
 
 /**
  * Command AttestationRequest
@@ -4158,13 +4298,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Group Key Management
- *
- * The Group Key Management Cluster is the mechanism by which group keys are managed.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterGroupKeyManagement : MTRCluster
+@interface MTRBaseClusterOperationalCredentials (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4172,7 +4306,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Group Key Management
+ *
+ * The Group Key Management Cluster is the mechanism by which group keys are managed.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterGroupKeyManagement : MTRGenericBaseCluster
 
 /**
  * Command KeySetWrite
@@ -4268,14 +4412,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Fixed Label
- *
- * The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
-labels.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterFixedLabel : MTRCluster
+@interface MTRBaseClusterGroupKeyManagement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4283,7 +4420,18 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Fixed Label
+ *
+ * The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
+labels.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterFixedLabel : MTRGenericBaseCluster
 
 - (void)readAttributeLabelListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeLabelListWithParams:(MTRSubscribeParams *)params
@@ -4332,13 +4480,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster User Label
- *
- * The User Label Cluster provides a feature to tag an endpoint with zero or more labels.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterUserLabel : MTRCluster
+@interface MTRBaseClusterFixedLabel (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4346,7 +4488,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster User Label
+ *
+ * The User Label Cluster provides a feature to tag an endpoint with zero or more labels.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterUserLabel : MTRGenericBaseCluster
 
 - (void)readAttributeLabelListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4397,13 +4549,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Boolean State
- *
- * This cluster provides an interface to a boolean state called StateValue.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterBooleanState : MTRCluster
+@interface MTRBaseClusterUserLabel (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4411,7 +4557,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Boolean State
+ *
+ * This cluster provides an interface to a boolean state called StateValue.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterBooleanState : MTRGenericBaseCluster
 
 - (void)readAttributeStateValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeStateValueWithParams:(MTRSubscribeParams *)params
@@ -4460,13 +4616,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster ICD Management
- *
- * Allows servers to ensure that listed clients are notified when a server is available for communication.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterICDManagement : MTRCluster
+@interface MTRBaseClusterBooleanState (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4474,7 +4624,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster ICD Management
+ *
+ * Allows servers to ensure that listed clients are notified when a server is available for communication.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterICDManagement : MTRGenericBaseCluster
 
 /**
  * Command RegisterClient
@@ -4493,8 +4653,8 @@ MTR_PROVISIONALLY_AVAILABLE
  *
  * Request the end device to stay in Active Mode for an additional ActiveModeThreshold
  */
-- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)stayActiveRequestWithCompletion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stayActiveRequestWithCompletion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeIdleModeDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
@@ -4586,13 +4746,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Mode Select
- *
- * Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterModeSelect : MTRCluster
+@interface MTRBaseClusterICDManagement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4600,147 +4754,62 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-/**
- * Command ChangeToMode
- *
- * On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response.
- */
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams *)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
 
 @end
 
 /**
- * Cluster Laundry Washer Mode
+ * Cluster Timer
  *
- * Attributes and commands for selecting a mode from a list of supported options.
+ * This cluster supports creating a simple timer functionality.
  */
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterLaundryWasherMode : MTRCluster
+@interface MTRBaseClusterTimer : MTRGenericBaseCluster
 
 /**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
+ * Command SetTimer
+ *
+ * This command is used to set the timer.
  */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
-
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 /**
- * Command ChangeToMode
+ * Command ResetTimer
  *
- * This command is used to change device modes.
-        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ * This command is used to reset the timer to the original value.
  */
-- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetTimerWithParams:(MTRTimerClusterResetTimerParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetTimerWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command AddTime
+ *
+ * This command is used to add time to the existing timer.
+ */
+- (void)addTimeWithParams:(MTRTimerClusterAddTimeParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ReduceTime
+ *
+ * This command is used to reduce time on the existing timer.
+ */
+- (void)reduceTimeWithParams:(MTRTimerClusterReduceTimeParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeSetTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSetTimeWithParams:(MTRSubscribeParams *)params
+                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSetTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeTimeRemainingWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTimeRemainingWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTimeRemainingWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeTimerStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTimerStateWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTimerStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -4783,13 +4852,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Refrigerator And Temperature Controlled Cabinet Mode
- *
- * Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode : MTRCluster
+@interface MTRBaseClusterTimer (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4797,128 +4860,86 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command ChangeToMode
+ * Cluster Oven Cavity Operational State
  *
- * This command is used to change device modes.
-        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ * This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven.
  */
-- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterOvenCavityOperationalState : MTRGenericBaseCluster
 
 /**
- * Cluster Laundry Washer Controls
+ * Command Pause
  *
- * This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine.
+ * Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.
  */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterLaundryWasherControls : MTRCluster
-
+- (void)pauseWithParams:(MTROvenCavityOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)pauseWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
 /**
- * For all instance methods (reads, writes, commands) that take a completion,
- * the completion will be called on the provided queue.
+ * Command Stop
+ *
+ * Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
  */
-- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithParams:(MTROvenCavityOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Start
+ *
+ * Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.
+ */
+- (void)startWithParams:(MTROvenCavityOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Resume
+ *
+ * Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).
+ */
+- (void)resumeWithParams:(MTROvenCavityOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resumeWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeSpinSpeedsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSpinSpeedsWithParams:(MTRSubscribeParams *)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSpinSpeedsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeSpinSpeedCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSpinSpeedCurrentWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams *)params
                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSpinSpeedCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeNumberOfRinsesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeNumberOfRinsesWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeNumberOfRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeSupportedRinsesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedRinsesWithParams:(MTRSubscribeParams *)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -4961,13 +4982,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster RVC Run Mode
- *
- * Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRVCRunMode : MTRCluster
+@interface MTRBaseClusterOvenCavityOperationalState (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -4975,7 +4990,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Oven Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterOvenMode : MTRGenericBaseCluster
 
 /**
  * Command ChangeToMode
@@ -4983,7 +5008,7 @@ MTR_PROVISIONALLY_AVAILABLE
  * This command is used to change device modes.
         On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
  */
-- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTROvenModeClusterChangeToModeParams *)params completion:(void (^)(MTROvenModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
@@ -4997,6 +5022,14 @@ MTR_PROVISIONALLY_AVAILABLE
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -5046,13 +5079,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster RVC Clean Mode
- *
- * Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRVCCleanMode : MTRCluster
+@interface MTRBaseClusterOvenMode (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5060,35 +5087,32 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command ChangeToMode
+ * Cluster Laundry Dryer Controls
  *
- * This command is used to change device modes.
-        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ * This cluster supports remotely monitoring and controling the different typs of
+            functionality available to a drying device, such as a laundry dryer.
  */
-- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterLaundryDryerControls : MTRGenericBaseCluster
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeSupportedDrynessLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedDrynessLevelsWithParams:(MTRSubscribeParams *)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedDrynessLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeSelectedDrynessLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSelectedDrynessLevelWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSelectedDrynessLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5131,13 +5155,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Temperature Control
- *
- * Attributes and commands for configuring the temperature control, and reporting temperature.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterTemperatureControl : MTRCluster
+@interface MTRBaseClusterLaundryDryerControls (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5145,62 +5163,76 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command SetTemperature
+ * Cluster Mode Select
  *
- * Set Temperature
+ * Attributes and commands for selecting a mode from a list of supported options.
  */
-- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterModeSelect : MTRGenericBaseCluster
 
-- (void)readAttributeTemperatureSetpointWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeTemperatureSetpointWithParams:(MTRSubscribeParams *)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeTemperatureSetpointWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ChangeToMode
+ *
+ * On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response.
+ */
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeMinTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeMinTemperatureWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeMinTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeMaxTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeMaxTemperatureWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeMaxTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStepWithParams:(MTRSubscribeParams *)params
-                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeSelectedTemperatureLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSelectedTemperatureLevelWithParams:(MTRSubscribeParams *)params
-                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSelectedTemperatureLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeSupportedTemperatureLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedTemperatureLevelsWithParams:(MTRSubscribeParams *)params
-                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedTemperatureLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
@@ -5208,36 +5240,30 @@ MTR_PROVISIONALLY_AVAILABLE
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
-/**
- * Cluster Refrigerator Alarm
- *
- * Attributes and commands for configuring the Refrigerator alarm.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRefrigeratorAlarm : MTRCluster
+@interface MTRBaseClusterModeSelect (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5245,25 +5271,53 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams *)params
-                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+@end
 
-- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams *)params
-                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Cluster Laundry Washer Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterLaundryWasherMode : MTRGenericBaseCluster
 
-- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ChangeToMode
+ *
+ * This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ */
+- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5306,13 +5360,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Dishwasher Mode
- *
- * Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterDishwasherMode : MTRCluster
+@interface MTRBaseClusterLaundryWasherMode (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5320,7 +5368,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Refrigerator And Temperature Controlled Cabinet Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode : MTRGenericBaseCluster
 
 /**
  * Command ChangeToMode
@@ -5328,7 +5386,7 @@ MTR_PROVISIONALLY_AVAILABLE
  * This command is used to change device modes.
         On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
  */
-- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
@@ -5399,13 +5457,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Air Quality
- *
- * Attributes for reporting air quality classification
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterAirQuality : MTRCluster
+@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5413,13 +5465,45 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeAirQualityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeAirQualityWithParams:(MTRSubscribeParams *)params
+@end
+
+/**
+ * Cluster Laundry Washer Controls
+ *
+ * This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterLaundryWasherControls : MTRGenericBaseCluster
+
+- (void)readAttributeSpinSpeedsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSpinSpeedsWithParams:(MTRSubscribeParams *)params
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeAirQualityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSpinSpeedsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSpinSpeedCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSpinSpeedCurrentWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSpinSpeedCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeNumberOfRinsesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfRinsesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedRinsesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedRinsesWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5462,13 +5546,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Smoke CO Alarm
- *
- * This cluster provides an interface for observing and managing the state of smoke and CO alarms.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterSmokeCOAlarm : MTRCluster
+@interface MTRBaseClusterLaundryWasherControls (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5476,96 +5554,134 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command SelfTestRequest
+ * Cluster RVC Run Mode
  *
- * This command SHALL initiate a device self-test.
+ * Attributes and commands for selecting a mode from a list of supported options.
  */
-- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)selfTestRequestWithCompletion:(MTRStatusCompletion)completion
-    MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeExpressedStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeExpressedStateWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeExpressedStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeSmokeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSmokeStateWithParams:(MTRSubscribeParams *)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSmokeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRVCRunMode : MTRGenericBaseCluster
 
-- (void)readAttributeCOStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCOStateWithParams:(MTRSubscribeParams *)params
-                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCOStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ChangeToMode
+ *
+ * This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ */
+- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeBatteryAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeBatteryAlertWithParams:(MTRSubscribeParams *)params
-                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeBatteryAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeDeviceMutedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeDeviceMutedWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeDeviceMutedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeTestInProgressWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeTestInProgressWithParams:(MTRSubscribeParams *)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeTestInProgressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeHardwareFaultAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeHardwareFaultAlertWithParams:(MTRSubscribeParams *)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeHardwareFaultAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeEndOfServiceAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeEndOfServiceAlertWithParams:(MTRSubscribeParams *)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeEndOfServiceAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeInterconnectSmokeAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeInterconnectSmokeAlarmWithParams:(MTRSubscribeParams *)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeInterconnectSmokeAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributeInterconnectCOAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeInterconnectCOAlarmWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeInterconnectCOAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeContaminationStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeContaminationStateWithParams:(MTRSubscribeParams *)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeContaminationStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeSmokeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeSmokeSensitivityLevelWithParams:(MTRSubscribeParams *)params
-                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeSmokeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeExpiryDateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeExpiryDateWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterRVCRunMode (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster RVC Clean Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRVCCleanMode : MTRGenericBaseCluster
+
+/**
+ * Command ChangeToMode
+ *
+ * This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
+ */
+- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5608,13 +5724,111 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+@interface MTRBaseClusterRVCCleanMode (Availability)
+
 /**
- * Cluster Dishwasher Alarm
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Temperature Control
  *
- * Attributes and commands for configuring the Dishwasher alarm.
+ * Attributes and commands for configuring the temperature control, and reporting temperature.
  */
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterDishwasherAlarm : MTRCluster
+@interface MTRBaseClusterTemperatureControl : MTRGenericBaseCluster
+
+/**
+ * Command SetTemperature
+ *
+ * Set Temperature
+ */
+- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeTemperatureSetpointWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTemperatureSetpointWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTemperatureSetpointWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMinTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMinTemperatureWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMinTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaxTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaxTemperatureWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaxTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStepWithParams:(MTRSubscribeParams *)params
+                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSelectedTemperatureLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSelectedTemperatureLevelWithParams:(MTRSubscribeParams *)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSelectedTemperatureLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedTemperatureLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedTemperatureLevelsWithParams:(MTRSubscribeParams *)params
+                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedTemperatureLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterTemperatureControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5622,20 +5836,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command Reset
- *
- * Reset alarm
- */
-- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-/**
- * Command ModifyEnabledAlarms
+ * Cluster Refrigerator Alarm
  *
- * Modify enabled alarms
+ * Attributes and commands for configuring the Refrigerator alarm.
  */
-- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRefrigeratorAlarm : MTRGenericBaseCluster
 
 - (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams *)params
@@ -5643,12 +5854,6 @@ MTR_PROVISIONALLY_AVAILABLE
                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeLatchWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeLatchWithParams:(MTRSubscribeParams *)params
-                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeLatchWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
 - (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeStateWithParams:(MTRSubscribeParams *)params
                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -5702,13 +5907,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Operational State
- *
- * This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterOperationalState : MTRCluster
+@interface MTRBaseClusterRefrigeratorAlarm (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5716,76 +5915,1117 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command Pause
- *
- * Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.
- */
-- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)pauseWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
-/**
- * Command Stop
+ * Cluster Dishwasher Mode
  *
- * Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
+ * Attributes and commands for selecting a mode from a list of supported options.
  */
-- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)stopWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterDishwasherMode : MTRGenericBaseCluster
+
 /**
- * Command Start
+ * Command ChangeToMode
  *
- * Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.
+ * This command is used to change device modes.
+        On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
  */
-- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)startWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterDishwasherMode (Availability)
+
 /**
- * Command Resume
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Air Quality
  *
- * Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).
+ * Attributes for reporting air quality classification
  */
-- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resumeWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterAirQuality : MTRGenericBaseCluster
 
-- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeAirQualityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAirQualityWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAirQualityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterAirQuality (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Smoke CO Alarm
+ *
+ * This cluster provides an interface for observing and managing the state of smoke and CO alarms.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterSmokeCOAlarm : MTRGenericBaseCluster
+
+/**
+ * Command SelfTestRequest
+ *
+ * This command SHALL initiate a device self-test.
+ */
+- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)selfTestRequestWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeExpressedStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeExpressedStateWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeExpressedStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSmokeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSmokeStateWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSmokeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCOStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCOStateWithParams:(MTRSubscribeParams *)params
+                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCOStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeBatteryAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeBatteryAlertWithParams:(MTRSubscribeParams *)params
                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeBatteryAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams *)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeDeviceMutedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDeviceMutedWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDeviceMutedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeTestInProgressWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTestInProgressWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTestInProgressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeHardwareFaultAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeHardwareFaultAlertWithParams:(MTRSubscribeParams *)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeHardwareFaultAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEndOfServiceAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEndOfServiceAlertWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEndOfServiceAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeInterconnectSmokeAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeInterconnectSmokeAlarmWithParams:(MTRSubscribeParams *)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeInterconnectSmokeAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeInterconnectCOAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeInterconnectCOAlarmWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeInterconnectCOAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeContaminationStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeContaminationStateWithParams:(MTRSubscribeParams *)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeContaminationStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSmokeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSmokeSensitivityLevelWithParams:(MTRSubscribeParams *)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSmokeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeExpiryDateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeExpiryDateWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterSmokeCOAlarm (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Dishwasher Alarm
+ *
+ * Attributes and commands for configuring the Dishwasher alarm.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterDishwasherAlarm : MTRGenericBaseCluster
+
+/**
+ * Command Reset
+ *
+ * Reset alarm
+ */
+- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ModifyEnabledAlarms
+ *
+ * Modify enabled alarms
+ */
+- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams *)params
+                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeLatchWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeLatchWithParams:(MTRSubscribeParams *)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeLatchWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams *)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterDishwasherAlarm (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Microwave Oven Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterMicrowaveOvenMode : MTRGenericBaseCluster
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterMicrowaveOvenMode (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Microwave Oven Control
+ *
+ * Attributes and commands for configuring the microwave oven control, and reporting cooking stats.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterMicrowaveOvenControl : MTRGenericBaseCluster
+
+/**
+ * Command SetCookingParameters
+ *
+ * Set Cooking Parameters
+ */
+- (void)setCookingParametersWithParams:(MTRMicrowaveOvenControlClusterSetCookingParametersParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command AddMoreTime
+ *
+ * Add More Cooking Time
+ */
+- (void)addMoreTimeWithParams:(MTRMicrowaveOvenControlClusterAddMoreTimeParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCookTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCookTimeWithParams:(MTRSubscribeParams *)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCookTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributePowerSettingWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributePowerSettingWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributePowerSettingWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMinPowerWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMinPowerWithParams:(MTRSubscribeParams *)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMinPowerWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaxPowerWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaxPowerWithParams:(MTRSubscribeParams *)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaxPowerWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributePowerStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributePowerStepWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributePowerStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterMicrowaveOvenControl (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Operational State
+ *
+ * This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterOperationalState : MTRGenericBaseCluster
+
+/**
+ * Command Pause
+ *
+ * Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.
+ */
+- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)pauseWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Stop
+ *
+ * Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
+ */
+- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Start
+ *
+ * Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.
+ */
+- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Resume
+ *
+ * Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).
+ */
+- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resumeWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterOperationalState (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster RVC Operational State
+ *
+ * This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRVCOperationalState : MTRGenericBaseCluster
+
+/**
+ * Command Pause
+ *
+ * Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.
+ */
+- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)pauseWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Stop
+ *
+ * Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
+ */
+- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Start
+ *
+ * Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.
+ */
+- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Resume
+ *
+ * Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).
+ */
+- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resumeWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterRVCOperationalState (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster HEPA Filter Monitoring
+ *
+ * Attributes and commands for monitoring HEPA filters in a device
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterHEPAFilterMonitoring : MTRGenericBaseCluster
+
+/**
+ * Command ResetCondition
+ *
+ * Reset the condition of the replaceable to the non degraded state
+ */
+- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterHEPAFilterMonitoring (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Activated Carbon Filter Monitoring
+ *
+ * Attributes and commands for monitoring activated carbon filters in a device
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterActivatedCarbonFilterMonitoring : MTRGenericBaseCluster
+
+/**
+ * Command ResetCondition
+ *
+ * Reset the condition of the replaceable to the non degraded state
+ */
+- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRBaseClusterActivatedCarbonFilterMonitoring (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Boolean Sensor Configuration
+ *
+ * This cluster is used to configure a boolean sensor.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterBooleanSensorConfiguration : MTRGenericBaseCluster
+
+/**
+ * Command SuppressRequest
+ *
+ * This command is used to suppress the specified alarm.
+ */
+- (void)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSensitivityLevelWithParams:(MTRSubscribeParams *)params
                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeAlarmsActiveWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAlarmsActiveWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAlarmsActiveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAlarmsSuppressedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAlarmsSuppressedWithParams:(MTRSubscribeParams *)params
                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAlarmsSuppressedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeAlarmsEnabledWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAlarmsEnabledWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAlarmsEnabledWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5828,13 +7068,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster RVC Operational State
- *
- * This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRVCOperationalState : MTRCluster
+@interface MTRBaseClusterBooleanSensorConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5842,76 +7076,104 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command Pause
+ * Cluster Valve Configuration and Control
  *
- * Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.
+ * This cluster is used to configure a valve.
  */
-- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)pauseWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterValveConfigurationAndControl : MTRGenericBaseCluster
+
 /**
- * Command Stop
+ * Command Open
  *
- * Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
+ * This command is used to set the valve to its fully open position.
  */
-- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)stopWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 /**
- * Command Start
+ * Command Close
  *
- * Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started.
+ * This command is used to set the valve to its fully closed position.
  */
-- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)startWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)closeWithCompletion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 /**
- * Command Resume
+ * Command SetLevel
  *
- * Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).
+ * This command is used to set the valve to a specific level.
  */
-- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resumeWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-    MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeOpenDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenDurationWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenDurationWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOpenDurationWithParams:(MTRSubscribeParams *)params
                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOpenDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeAutoCloseTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAutoCloseTimeWithParams:(MTRSubscribeParams *)params
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeAutoCloseTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams *)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeRemainingDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeRemainingDurationWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeRemainingDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeCurrentStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentStateWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeTargetStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTargetStateWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTargetStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStartUpStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStartUpStateWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStartUpStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCurrentLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCurrentLevelWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCurrentLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeTargetLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeTargetLevelWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeTargetLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeOpenLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenLevelWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenLevelWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeOpenLevelWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeOpenLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeValveFaultWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeValveFaultWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeValveFaultWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -5954,13 +7216,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster HEPA Filter Monitoring
- *
- * Attributes and commands for monitoring HEPA filters in a device
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterHEPAFilterMonitoring : MTRCluster
+@interface MTRBaseClusterValveConfigurationAndControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -5968,54 +7224,102 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command ResetCondition
+ * Cluster Demand Response Load Control
  *
- * Reset the condition of the replaceable to the non degraded state
+ * This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control.
  */
-- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterDemandResponseLoadControl : MTRGenericBaseCluster
+
+/**
+ * Command RegisterLoadControlProgramRequest
+ *
+ * Upon receipt, this SHALL insert a new LoadControlProgramStruct into LoadControlPrograms, or if the ProgramID matches an existing LoadControlProgramStruct, then the provider SHALL be updated with the provided values.
+ */
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command UnregisterLoadControlProgramRequest
+ *
+ * Upon receipt, this SHALL remove a the LoadControlProgramStruct from LoadControlPrograms with the matching ProgramID.
+ */
+- (void)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command AddLoadControlEventRequest
+ *
+ * On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event.
+ */
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command RemoveLoadControlEventRequest
+ *
+ * Upon receipt, this SHALL remove the LoadControlEventStruct with the matching EventID from LoadEventPrograms.
+ */
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ClearLoadControlEventsRequest
+ *
+ * Upon receipt, this SHALL clear all the load control events.
+ */
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearLoadControlEventsRequestWithCompletion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeLoadControlProgramsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeLoadControlProgramsWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeLoadControlProgramsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams *)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeNumberOfLoadControlProgramsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfLoadControlProgramsWithParams:(MTRSubscribeParams *)params
+                                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfLoadControlProgramsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeEventsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeEventsWithParams:(MTRSubscribeParams *)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeEventsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeActiveEventsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeActiveEventsWithParams:(MTRSubscribeParams *)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeActiveEventsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams *)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeNumberOfEventsPerProgramWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfEventsPerProgramWithParams:(MTRSubscribeParams *)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfEventsPerProgramWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeNumberOfTransitionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfTransitionsWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfTransitionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeDefaultRandomStartWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDefaultRandomStartWithParams:(MTRSubscribeParams *)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDefaultRandomStartWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeDefaultRandomDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDefaultRandomDurationWithParams:(MTRSubscribeParams *)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDefaultRandomDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -6058,13 +7362,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Activated Carbon Filter Monitoring
- *
- * Attributes and commands for monitoring activated carbon filters in a device
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterActivatedCarbonFilterMonitoring : MTRCluster
+@interface MTRBaseClusterDemandResponseLoadControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6072,54 +7370,222 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * Command ResetCondition
+ * Cluster Energy EVSE
  *
- * Reset the condition of the replaceable to the non degraded state
+ * Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management.
  */
-- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterEnergyEVSE : MTRGenericBaseCluster
+
+/**
+ * Command Disable
+ *
+ * Allows a client to disable the EVSE from charging and discharging.
+ */
+- (void)disableWithParams:(MTREnergyEVSEClusterDisableParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)disableWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command EnableCharging
+ *
+ * Allows a client to enable the EVSE to charge an EV.
+ */
+- (void)enableChargingWithParams:(MTREnergyEVSEClusterEnableChargingParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command EnableDischarging
+ *
+ * Allows a client to enable the EVSE to discharge an EV.
+ */
+- (void)enableDischargingWithParams:(MTREnergyEVSEClusterEnableDischargingParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command StartDiagnostics
+ *
+ * Allows a client to put the EVSE into a self-diagnostics mode.
+ */
+- (void)startDiagnosticsWithParams:(MTREnergyEVSEClusterStartDiagnosticsParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startDiagnosticsWithCompletion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command SetTargets
+ *
+ * Allows a client to set the user specified charging targets.
+ */
+- (void)setTargetsWithParams:(MTREnergyEVSEClusterSetTargetsParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command GetTargets
+ *
+ * Allows a client to retrieve the user specified charging targets.
+ */
+- (void)getTargetsWithParams:(MTREnergyEVSEClusterGetTargetsParams *)params completion:(void (^)(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ClearTargets
+ *
+ * Allows a client to clear all stored charging targets.
+ */
+- (void)clearTargetsWithParams:(MTREnergyEVSEClusterClearTargetsParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearTargetsWithCompletion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams *)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams *)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupplyStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupplyStateWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupplyStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeFaultStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeFaultStateWithParams:(MTRSubscribeParams *)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeFaultStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeChargingEnabledUntilWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeChargingEnabledUntilWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeChargingEnabledUntilWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeDischargingEnabledUntilWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDischargingEnabledUntilWithParams:(MTRSubscribeParams *)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDischargingEnabledUntilWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeCircuitCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeCircuitCapacityWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeCircuitCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMinimumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMinimumChargeCurrentWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMinimumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaximumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaximumChargeCurrentWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaximumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeMaximumDischargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeMaximumDischargeCurrentWithParams:(MTRSubscribeParams *)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeMaximumDischargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeUserMaximumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeUserMaximumChargeCurrentWithParams:(MTRSubscribeParams *)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeUserMaximumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeRandomizationDelayWindowWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeRandomizationDelayWindowWithParams:(MTRSubscribeParams *)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeRandomizationDelayWindowWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeNumberOfWeeklyTargetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfWeeklyTargetsWithParams:(MTRSubscribeParams *)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfWeeklyTargetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeNumberOfDailyTargetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfDailyTargetsWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfDailyTargetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeNextChargeStartTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNextChargeStartTimeWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNextChargeStartTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeNextChargeTargetTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNextChargeTargetTimeWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNextChargeTargetTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeNextChargeRequiredEnergyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNextChargeRequiredEnergyWithParams:(MTRSubscribeParams *)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNextChargeRequiredEnergyWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams *)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeNextChargeTargetSoCWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNextChargeTargetSoCWithParams:(MTRSubscribeParams *)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNextChargeTargetSoCWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeApproximateEVEfficiencyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeApproximateEVEfficiencyWithParams:(MTRSubscribeParams *)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeApproximateEVEfficiencyWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeStateOfChargeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeStateOfChargeWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeStateOfChargeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeBatteryCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeBatteryCapacityWithParams:(MTRSubscribeParams *)params
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeBatteryCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeVehicleIDWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeVehicleIDWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeVehicleIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSessionIDWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSessionIDWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSessionIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSessionDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSessionDurationWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSessionDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSessionEnergyChargedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSessionEnergyChargedWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSessionEnergyChargedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSessionEnergyDischargedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSessionEnergyDischargedWithParams:(MTRSubscribeParams *)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSessionEnergyDischargedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
@@ -6162,13 +7628,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Door Lock
- *
- * An interface to a generic way to secure a door
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterDoorLock : MTRCluster
+@interface MTRBaseClusterEnergyEVSE (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6176,7 +7636,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Door Lock
+ *
+ * An interface to a generic way to secure a door
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterDoorLock : MTRGenericBaseCluster
 
 /**
  * Command LockDoor
@@ -6586,13 +8056,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Window Covering
- *
- * Provides an interface for controlling and adjusting automatic window coverings.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterWindowCovering : MTRCluster
+@interface MTRBaseClusterDoorLock (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6600,7 +8064,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Window Covering
+ *
+ * Provides an interface for controlling and adjusting automatic window coverings.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterWindowCovering : MTRGenericBaseCluster
 
 /**
  * Command UpOrOpen
@@ -6826,13 +8300,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Barrier Control
- *
- * This cluster provides control of a barrier (garage door).
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterBarrierControl : MTRCluster
+@interface MTRBaseClusterWindowCovering (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6840,7 +8308,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Barrier Control
+ *
+ * This cluster provides control of a barrier (garage door).
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterBarrierControl : MTRGenericBaseCluster
 
 /**
  * Command BarrierControlGoToPercent
@@ -6970,13 +8448,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pump Configuration and Control
- *
- * An interface for configuring and controlling pumps.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterPumpConfigurationAndControl : MTRCluster
+@interface MTRBaseClusterBarrierControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6984,7 +8456,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Pump Configuration and Control
+ *
+ * An interface for configuring and controlling pumps.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterPumpConfigurationAndControl : MTRGenericBaseCluster
 
 - (void)readAttributeMaxPressureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMaxPressureWithParams:(MTRSubscribeParams *)params
@@ -7173,13 +8655,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thermostat
- *
- * An interface for configuring and controlling the functionality of a thermostat.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterThermostat : MTRCluster
+@interface MTRBaseClusterPumpConfigurationAndControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -7187,7 +8663,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Thermostat
+ *
+ * An interface for configuring and controlling the functionality of a thermostat.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterThermostat : MTRGenericBaseCluster
 
 /**
  * Command SetpointRaiseLower
@@ -7605,13 +9091,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Fan Control
- *
- * An interface for controlling a fan in a heating/cooling system.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterFanControl : MTRCluster
+@interface MTRBaseClusterThermostat (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -7619,7 +9099,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Fan Control
+ *
+ * An interface for controlling a fan in a heating/cooling system.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterFanControl : MTRGenericBaseCluster
 
 /**
  * Command Step
@@ -7755,13 +9245,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thermostat User Interface Configuration
- *
- * An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterThermostatUserInterfaceConfiguration : MTRCluster
+@interface MTRBaseClusterFanControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -7769,7 +9253,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Thermostat User Interface Configuration
+ *
+ * An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterThermostatUserInterfaceConfiguration : MTRGenericBaseCluster
 
 - (void)readAttributeTemperatureDisplayModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -7836,13 +9330,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Color Control
- *
- * Attributes and commands for controlling the color properties of a color-capable light.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterColorControl : MTRCluster
+@interface MTRBaseClusterThermostatUserInterfaceConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -7850,7 +9338,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Color Control
+ *
+ * Attributes and commands for controlling the color properties of a color-capable light.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterColorControl : MTRGenericBaseCluster
 
 /**
  * Command MoveToHue
@@ -8346,13 +9844,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Ballast Configuration
- *
- * Attributes and commands for configuring a lighting ballast.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterBallastConfiguration : MTRCluster
+@interface MTRBaseClusterColorControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8360,7 +9852,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Ballast Configuration
+ *
+ * Attributes and commands for configuring a lighting ballast.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterBallastConfiguration : MTRGenericBaseCluster
 
 - (void)readAttributePhysicalMinLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributePhysicalMinLevelWithParams:(MTRSubscribeParams *)params
@@ -8507,13 +10009,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Illuminance Measurement
- *
- * Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterIlluminanceMeasurement : MTRCluster
+@interface MTRBaseClusterBallastConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8521,7 +10017,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Illuminance Measurement
+ *
+ * Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterIlluminanceMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -8594,13 +10100,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Temperature Measurement
- *
- * Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterTemperatureMeasurement : MTRCluster
+@interface MTRBaseClusterIlluminanceMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8608,7 +10108,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Temperature Measurement
+ *
+ * Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterTemperatureMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -8675,13 +10185,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pressure Measurement
- *
- * Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterPressureMeasurement : MTRCluster
+@interface MTRBaseClusterTemperatureMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8689,7 +10193,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Pressure Measurement
+ *
+ * Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterPressureMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -8786,13 +10300,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Flow Measurement
- *
- * Attributes and commands for configuring the measurement of flow, and reporting flow measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterFlowMeasurement : MTRCluster
+@interface MTRBaseClusterPressureMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8800,7 +10308,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Flow Measurement
+ *
+ * Attributes and commands for configuring the measurement of flow, and reporting flow measurements.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterFlowMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -8867,13 +10385,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Relative Humidity Measurement
- *
- * Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterRelativeHumidityMeasurement : MTRCluster
+@interface MTRBaseClusterFlowMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8881,7 +10393,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Relative Humidity Measurement
+ *
+ * Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterRelativeHumidityMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -8948,13 +10470,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Occupancy Sensing
- *
- * Attributes and commands for configuring occupancy sensing, and reporting occupancy status.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterOccupancySensing : MTRCluster
+@interface MTRBaseClusterRelativeHumidityMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -8962,7 +10478,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Occupancy Sensing
+ *
+ * Attributes and commands for configuring occupancy sensing, and reporting occupancy status.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterOccupancySensing : MTRGenericBaseCluster
 
 - (void)readAttributeOccupancyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeOccupancyWithParams:(MTRSubscribeParams *)params
@@ -9095,13 +10621,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Carbon Monoxide Concentration Measurement
- *
- * Attributes for reporting carbon monoxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterCarbonMonoxideConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterOccupancySensing (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9109,7 +10629,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Carbon Monoxide Concentration Measurement
+ *
+ * Attributes for reporting carbon monoxide concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterCarbonMonoxideConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9218,13 +10748,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Carbon Dioxide Concentration Measurement
- *
- * Attributes for reporting carbon dioxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterCarbonDioxideConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterCarbonMonoxideConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9232,7 +10756,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Carbon Dioxide Concentration Measurement
+ *
+ * Attributes for reporting carbon dioxide concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterCarbonDioxideConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9341,13 +10875,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Nitrogen Dioxide Concentration Measurement
- *
- * Attributes for reporting nitrogen dioxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterNitrogenDioxideConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterCarbonDioxideConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9355,7 +10883,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Nitrogen Dioxide Concentration Measurement
+ *
+ * Attributes for reporting nitrogen dioxide concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterNitrogenDioxideConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9464,13 +11002,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Ozone Concentration Measurement
- *
- * Attributes for reporting ozone concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterOzoneConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterNitrogenDioxideConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9478,7 +11010,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Ozone Concentration Measurement
+ *
+ * Attributes for reporting ozone concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterOzoneConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9587,13 +11129,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM2.5 Concentration Measurement
- *
- * Attributes for reporting PM2.5 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterPM25ConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterOzoneConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9601,7 +11137,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster PM2.5 Concentration Measurement
+ *
+ * Attributes for reporting PM2.5 concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterPM25ConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9710,13 +11256,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Formaldehyde Concentration Measurement
- *
- * Attributes for reporting formaldehyde concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterFormaldehydeConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterPM25ConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9724,7 +11264,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Formaldehyde Concentration Measurement
+ *
+ * Attributes for reporting formaldehyde concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterFormaldehydeConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9833,13 +11383,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM1 Concentration Measurement
- *
- * Attributes for reporting PM1 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterPM1ConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterFormaldehydeConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9847,7 +11391,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster PM1 Concentration Measurement
+ *
+ * Attributes for reporting PM1 concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterPM1ConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -9956,13 +11510,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM10 Concentration Measurement
- *
- * Attributes for reporting PM10 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterPM10ConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterPM1ConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -9970,7 +11518,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster PM10 Concentration Measurement
+ *
+ * Attributes for reporting PM10 concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterPM10ConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -10079,13 +11637,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Total Volatile Organic Compounds Concentration Measurement
- *
- * Attributes for reporting total volatile organic compounds concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterTotalVolatileOrganicCompoundsConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterPM10ConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10093,7 +11645,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Total Volatile Organic Compounds Concentration Measurement
+ *
+ * Attributes for reporting total volatile organic compounds concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterTotalVolatileOrganicCompoundsConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -10202,13 +11764,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Radon Concentration Measurement
- *
- * Attributes for reporting radon concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterRadonConcentrationMeasurement : MTRCluster
+@interface MTRBaseClusterTotalVolatileOrganicCompoundsConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10216,7 +11772,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Radon Concentration Measurement
+ *
+ * Attributes for reporting radon concentration measurements
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterRadonConcentrationMeasurement : MTRGenericBaseCluster
 
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeMeasuredValueWithParams:(MTRSubscribeParams *)params
@@ -10325,13 +11891,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Wake on LAN
- *
- * This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol.
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterWakeOnLAN : MTRCluster
+@interface MTRBaseClusterRadonConcentrationMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10339,7 +11899,17 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Wake on LAN
+ *
+ * This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol.
+ */
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRBaseClusterWakeOnLAN : MTRGenericBaseCluster
 
 - (void)readAttributeMACAddressWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeMACAddressWithParams:(MTRSubscribeParams *)params
@@ -10347,6 +11917,12 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                                  reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 + (void)readAttributeMACAddressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+- (void)readAttributeLinkLocalAddressWithCompletion:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeLinkLocalAddressWithParams:(MTRSubscribeParams *)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeLinkLocalAddressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -10388,13 +11964,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Channel
- *
- * This cluster provides an interface for controlling the current Channel on a device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterChannel : MTRCluster
+@interface MTRBaseClusterWakeOnLAN (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10402,7 +11972,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Channel
+ *
+ * This cluster provides an interface for controlling the current Channel on a device.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterChannel : MTRGenericBaseCluster
 
 /**
  * Command ChangeChannel
@@ -10482,13 +12062,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Target Navigator
- *
- * This cluster provides an interface for UX navigation within a set of targets on a device or endpoint.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterTargetNavigator : MTRCluster
+@interface MTRBaseClusterChannel (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10496,7 +12070,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Target Navigator
+ *
+ * This cluster provides an interface for UX navigation within a set of targets on a device or endpoint.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterTargetNavigator : MTRGenericBaseCluster
 
 /**
  * Command NavigateTarget
@@ -10558,13 +12142,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Media Playback
- *
- * This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterMediaPlayback : MTRCluster
+@interface MTRBaseClusterTargetNavigator (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10572,7 +12150,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Media Playback
+ *
+ * This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterMediaPlayback : MTRGenericBaseCluster
 
 /**
  * Command Play
@@ -10740,13 +12328,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Media Input
- *
- * This cluster provides an interface for controlling the Input Selector on a media device such as a TV.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterMediaInput : MTRCluster
+@interface MTRBaseClusterMediaPlayback (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10754,7 +12336,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Media Input
+ *
+ * This cluster provides an interface for controlling the Input Selector on a media device such as a TV.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterMediaInput : MTRGenericBaseCluster
 
 /**
  * Command SelectInput
@@ -10838,13 +12430,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Low Power
- *
- * This cluster provides an interface for managing low power mode on a device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterLowPower : MTRCluster
+@interface MTRBaseClusterMediaInput (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10852,7 +12438,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Low Power
+ *
+ * This cluster provides an interface for managing low power mode on a device.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterLowPower : MTRGenericBaseCluster
 
 /**
  * Command Sleep
@@ -10904,13 +12500,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Keypad Input
- *
- * This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterKeypadInput : MTRCluster
+@interface MTRBaseClusterLowPower (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10918,7 +12508,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Keypad Input
+ *
+ * This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterKeypadInput : MTRGenericBaseCluster
 
 /**
  * Command SendKey
@@ -10968,13 +12568,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Content Launcher
- *
- * This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterContentLauncher : MTRCluster
+@interface MTRBaseClusterKeypadInput (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10982,7 +12576,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Content Launcher
+ *
+ * This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterContentLauncher : MTRGenericBaseCluster
 
 /**
  * Command LaunchContent
@@ -11052,13 +12656,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Audio Output
- *
- * This cluster provides an interface for controlling the Output on a media device such as a TV.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterAudioOutput : MTRCluster
+@interface MTRBaseClusterContentLauncher (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -11066,7 +12664,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Audio Output
+ *
+ * This cluster provides an interface for controlling the Output on a media device such as a TV.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterAudioOutput : MTRGenericBaseCluster
 
 /**
  * Command SelectOutput
@@ -11134,13 +12742,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Application Launcher
- *
- * This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterApplicationLauncher : MTRCluster
+@interface MTRBaseClusterAudioOutput (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -11148,7 +12750,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Application Launcher
+ *
+ * This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterApplicationLauncher : MTRGenericBaseCluster
 
 /**
  * Command LaunchApp
@@ -11224,13 +12836,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Application Basic
- *
- * This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterApplicationBasic : MTRCluster
+@interface MTRBaseClusterApplicationLauncher (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -11238,7 +12844,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Application Basic
+ *
+ * This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterApplicationBasic : MTRGenericBaseCluster
 
 - (void)readAttributeVendorNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeVendorNameWithParams:(MTRSubscribeParams *)params
@@ -11329,13 +12945,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Account Login
- *
- * This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterAccountLogin : MTRCluster
+@interface MTRBaseClusterApplicationBasic (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -11343,7 +12953,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Account Login
+ *
+ * This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client.
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterAccountLogin : MTRGenericBaseCluster
 
 /**
  * Command GetSetupPIN
@@ -11407,13 +13027,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Electrical Measurement
- *
- * Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRBaseClusterElectricalMeasurement : MTRCluster
+@interface MTRBaseClusterAccountLogin (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -11421,7 +13035,17 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Electrical Measurement
+ *
+ * Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..
+ */
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRBaseClusterElectricalMeasurement : MTRGenericBaseCluster
 
 /**
  * Command GetProfileInfoCommand
@@ -12263,13 +13887,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Unit Testing
- *
- * The Test Cluster is meant to validate the generated code
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRBaseClusterUnitTesting : MTRCluster
+@interface MTRBaseClusterElectricalMeasurement (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -12277,7 +13895,17 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Unit Testing
+ *
+ * The Test Cluster is meant to validate the generated code
+ */
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRBaseClusterUnitTesting : MTRGenericBaseCluster
 
 /**
  * Command Test
@@ -13140,13 +14768,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Sample MEI
- *
- * The Sample MEI cluster showcases a cluster manufacturer extensions
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterSampleMEI : MTRCluster
+@interface MTRBaseClusterUnitTesting (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -13154,7 +14776,17 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
+
+/**
+ * Cluster Sample MEI
+ *
+ * The Sample MEI cluster showcases a cluster manufacturer extensions
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterSampleMEI : MTRGenericBaseCluster
 
 /**
  * Command Ping
@@ -13220,6 +14852,18 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+@interface MTRBaseClusterSampleMEI (Availability)
+
+/**
+ * For all instance methods (reads, writes, commands) that take a completion,
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
 MTR_DEPRECATED("Please use MTRBaseClusterBasicInformation", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
 @interface MTRBaseClusterBasic : MTRBaseClusterBasicInformation
 @end
@@ -13280,6 +14924,17 @@ typedef NS_OPTIONS(uint8_t, MTRGroupsNameSupportBitmap) {
     MTRGroupsNameSupportBitmapGroupNames MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x80,
 } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
+typedef NS_OPTIONS(uint8_t, MTRScenesCopyModeBitmap) {
+    MTRScenesCopyModeBitmapCopyAllScenes MTR_NEWLY_AVAILABLE = 0x1,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) {
+    MTRScenesCopyModeCopyAllScenes MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRScenesCopyModeBitmapCopyAllScenes")
+    = 0x1,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use MTRScenesCopyModeBitmap");
+
 typedef NS_OPTIONS(uint32_t, MTRScenesFeature) {
     MTRScenesFeatureSceneNames MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x1,
     MTRScenesFeatureExplicit MTR_PROVISIONALLY_AVAILABLE = 0x2,
@@ -13287,9 +14942,9 @@ typedef NS_OPTIONS(uint32_t, MTRScenesFeature) {
     MTRScenesFeatureFabricScenes MTR_PROVISIONALLY_AVAILABLE = 0x8,
 } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
-typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) {
-    MTRScenesCopyModeCopyAllScenes MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+typedef NS_OPTIONS(uint8_t, MTRScenesNameSupportBitmap) {
+    MTRScenesNameSupportBitmapSceneNames MTR_PROVISIONALLY_AVAILABLE = 0x80,
+} MTR_PROVISIONALLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTROnOffDelayedAllOffEffectVariant) {
     MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
@@ -13320,6 +14975,7 @@ typedef NS_OPTIONS(uint32_t, MTROnOffFeature) {
     MTROnOffFeatureLighting MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTROnOffFeatureDeadFrontBehavior MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x2,
     MTROnOffFeatureDeadFront MTR_DEPRECATED("Please use MTROnOffFeatureDeadFrontBehavior", ios(17.1, 17.2), macos(14.1, 14.2), watchos(10.1, 10.2), tvos(17.1, 17.2)) = 0x2,
+    MTROnOffFeatureOffOnly MTR_PROVISIONALLY_AVAILABLE = 0x4,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint8_t, MTROnOffControlBitmap) {
@@ -13346,10 +15002,20 @@ typedef NS_OPTIONS(uint32_t, MTRLevelControlFeature) {
     MTRLevelControlFeatureFrequency MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_OPTIONS(uint8_t, MTRLevelControlOptionsBitmap) {
+    MTRLevelControlOptionsBitmapExecuteIfOff MTR_NEWLY_AVAILABLE = 0x1,
+    MTRLevelControlOptionsBitmapCoupleColorTempToLevel MTR_NEWLY_AVAILABLE = 0x2,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_OPTIONS(uint8_t, MTRLevelControlOptions) {
-    MTRLevelControlOptionsExecuteIfOff MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x1,
-    MTRLevelControlOptionsCoupleColorTempToLevel MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x2,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+    MTRLevelControlOptionsExecuteIfOff MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+        MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmapExecuteIfOff")
+    = 0x1,
+    MTRLevelControlOptionsCoupleColorTempToLevel MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+        MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmapCoupleColorTempToLevel")
+    = 0x2,
+} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+    MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmap");
 
 typedef NS_OPTIONS(uint32_t, MTRDescriptorFeature) {
     MTRDescriptorFeatureTagList MTR_PROVISIONALLY_AVAILABLE = 0x1,
@@ -13825,6 +15491,7 @@ typedef NS_OPTIONS(uint32_t, MTRNetworkCommissioningFeature) {
     MTRNetworkCommissioningFeatureWiFiNetworkInterface MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTRNetworkCommissioningFeatureThreadNetworkInterface MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
     MTRNetworkCommissioningFeatureEthernetNetworkInterface MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
+    MTRNetworkCommissioningFeaturePerDeviceCredentials MTR_PROVISIONALLY_AVAILABLE = 0x8,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint16_t, MTRNetworkCommissioningThreadCapabilitiesBitmap) {
@@ -13841,6 +15508,7 @@ typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurityBitmap) {
     MTRNetworkCommissioningWiFiSecurityBitmapWPAPersonal MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x4,
     MTRNetworkCommissioningWiFiSecurityBitmapWPA2Personal MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x8,
     MTRNetworkCommissioningWiFiSecurityBitmapWPA3Personal MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x10,
+    MTRNetworkCommissioningWiFiSecurityBitmapWPA3MatterPDC MTR_PROVISIONALLY_AVAILABLE = 0x20,
 } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
 typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurity) {
@@ -14222,8 +15890,8 @@ typedef NS_ENUM(uint8_t, MTRAdministratorCommissioningStatusCode) {
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTRAdministratorCommissioningFeature) {
-    MTRAdministratorCommissioningFeatureBasic MTR_PROVISIONALLY_AVAILABLE = 0x1,
-} MTR_PROVISIONALLY_AVAILABLE;
+    MTRAdministratorCommissioningFeatureBasic MTR_NEWLY_AVAILABLE = 0x1,
+} MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTROperationalCredentialsCertificateChainType) {
     MTROperationalCredentialsCertificateChainTypeDACCertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01,
@@ -14291,6 +15959,54 @@ typedef NS_OPTIONS(uint32_t, MTRICDManagementUserActiveModeTriggerBitmap) {
     MTRICDManagementUserActiveModeTriggerBitmapAppDefinedButton MTR_PROVISIONALLY_AVAILABLE = 0x10000,
 } MTR_PROVISIONALLY_AVAILABLE;
 
+typedef NS_ENUM(uint8_t, MTRTimerStatus) {
+    MTRTimerStatusRunning MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRTimerStatusPaused MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRTimerStatusExpired MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTRTimerStatusReady MTR_PROVISIONALLY_AVAILABLE = 0x03,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRTimerFeature) {
+    MTRTimerFeatureReset MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTROvenCavityOperationalStateErrorState) {
+    MTROvenCavityOperationalStateErrorStateNoError MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTROvenCavityOperationalStateErrorStateUnableToStartOrResume MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTROvenCavityOperationalStateErrorStateUnableToCompleteOperation MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTROvenCavityOperationalStateErrorStateCommandInvalidInState MTR_PROVISIONALLY_AVAILABLE = 0x03,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTROvenCavityOperationalStateOperationalState) {
+    MTROvenCavityOperationalStateOperationalStateStopped MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTROvenCavityOperationalStateOperationalStateRunning MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTROvenCavityOperationalStateOperationalStatePaused MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTROvenCavityOperationalStateOperationalStateError MTR_PROVISIONALLY_AVAILABLE = 0x03,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint16_t, MTROvenModeModeTag) {
+    MTROvenModeModeTagBake MTR_PROVISIONALLY_AVAILABLE = 0x4000,
+    MTROvenModeModeTagConvection MTR_PROVISIONALLY_AVAILABLE = 0x4001,
+    MTROvenModeModeTagGrill MTR_PROVISIONALLY_AVAILABLE = 0x4002,
+    MTROvenModeModeTagRoast MTR_PROVISIONALLY_AVAILABLE = 0x4003,
+    MTROvenModeModeTagClean MTR_PROVISIONALLY_AVAILABLE = 0x4004,
+    MTROvenModeModeTagConvectionBake MTR_PROVISIONALLY_AVAILABLE = 0x4005,
+    MTROvenModeModeTagConvectionRoast MTR_PROVISIONALLY_AVAILABLE = 0x4006,
+    MTROvenModeModeTagWarming MTR_PROVISIONALLY_AVAILABLE = 0x4007,
+    MTROvenModeModeTagProofing MTR_PROVISIONALLY_AVAILABLE = 0x4008,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTROvenModeFeature) {
+    MTROvenModeFeatureOnOff MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRLaundryDryerControlsDrynessLevel) {
+    MTRLaundryDryerControlsDrynessLevelLow MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRLaundryDryerControlsDrynessLevelNormal MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRLaundryDryerControlsDrynessLevelExtra MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTRLaundryDryerControlsDrynessLevelMax MTR_PROVISIONALLY_AVAILABLE = 0x03,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_OPTIONS(uint32_t, MTRModeSelectFeature) {
     MTRModeSelectFeatureOnOff MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x1,
     MTRModeSelectFeatureDEPONOFF MTR_DEPRECATED("Please use MTRModeSelectFeatureOnOff", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x1,
@@ -14458,6 +16174,15 @@ typedef NS_OPTIONS(uint32_t, MTRDishwasherAlarmFeature) {
     MTRDishwasherAlarmFeatureReset MTR_PROVISIONALLY_AVAILABLE = 0x1,
 } MTR_PROVISIONALLY_AVAILABLE;
 
+typedef NS_ENUM(uint16_t, MTRMicrowaveOvenModeModeTag) {
+    MTRMicrowaveOvenModeModeTagNormal MTR_PROVISIONALLY_AVAILABLE = 0x4000,
+    MTRMicrowaveOvenModeModeTagDefrost MTR_PROVISIONALLY_AVAILABLE = 0x4001,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRMicrowaveOvenModeFeature) {
+    MTRMicrowaveOvenModeFeatureOnOff MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTROperationalStateErrorState) {
     MTROperationalStateErrorStateNoError MTR_PROVISIONALLY_AVAILABLE = 0x00,
     MTROperationalStateErrorStateUnableToStartOrResume MTR_PROVISIONALLY_AVAILABLE = 0x01,
@@ -14539,6 +16264,185 @@ typedef NS_OPTIONS(uint32_t, MTRActivatedCarbonFilterMonitoringFeature) {
     MTRActivatedCarbonFilterMonitoringFeatureReplacementProductList MTR_PROVISIONALLY_AVAILABLE = 0x4,
 } MTR_PROVISIONALLY_AVAILABLE;
 
+typedef NS_ENUM(uint8_t, MTRBooleanSensorConfigurationSensitivity) {
+    MTRBooleanSensorConfigurationSensitivityHigh MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRBooleanSensorConfigurationSensitivityStandard MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRBooleanSensorConfigurationSensitivityLow MTR_PROVISIONALLY_AVAILABLE = 0x02,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint8_t, MTRBooleanSensorConfigurationAlarmModeBitmap) {
+    MTRBooleanSensorConfigurationAlarmModeBitmapVisual MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRBooleanSensorConfigurationAlarmModeBitmapAudible MTR_PROVISIONALLY_AVAILABLE = 0x2,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRBooleanSensorConfigurationFeature) {
+    MTRBooleanSensorConfigurationFeatureVisual MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRBooleanSensorConfigurationFeatureAudible MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRBooleanSensorConfigurationFeatureAlarmSuppress MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTRBooleanSensorConfigurationFeatureSensitivityLevel MTR_PROVISIONALLY_AVAILABLE = 0x8,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRValveConfigurationAndControlValveState) {
+    MTRValveConfigurationAndControlValveStateOpen MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRValveConfigurationAndControlValveStateClosed MTR_PROVISIONALLY_AVAILABLE = 0x01,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRValveConfigurationAndControlFeature) {
+    MTRValveConfigurationAndControlFeatureTimeSync MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRValveConfigurationAndControlFeatureLevel MTR_PROVISIONALLY_AVAILABLE = 0x2,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint16_t, MTRValveConfigurationAndControlValveFaultBitmap) {
+    MTRValveConfigurationAndControlValveFaultBitmapGeneralFault MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRValveConfigurationAndControlValveFaultBitmapBlocked MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRValveConfigurationAndControlValveFaultBitmapLeaking MTR_PROVISIONALLY_AVAILABLE = 0x4,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDemandResponseLoadControlCriticalityLevel) {
+    MTRDemandResponseLoadControlCriticalityLevelUnknown MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDemandResponseLoadControlCriticalityLevelGreen MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRDemandResponseLoadControlCriticalityLevelLevel1 MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTRDemandResponseLoadControlCriticalityLevelLevel2 MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTRDemandResponseLoadControlCriticalityLevelLevel3 MTR_PROVISIONALLY_AVAILABLE = 0x04,
+    MTRDemandResponseLoadControlCriticalityLevelLevel4 MTR_PROVISIONALLY_AVAILABLE = 0x05,
+    MTRDemandResponseLoadControlCriticalityLevelLevel5 MTR_PROVISIONALLY_AVAILABLE = 0x06,
+    MTRDemandResponseLoadControlCriticalityLevelEmergency MTR_PROVISIONALLY_AVAILABLE = 0x07,
+    MTRDemandResponseLoadControlCriticalityLevelPlannedOutage MTR_PROVISIONALLY_AVAILABLE = 0x08,
+    MTRDemandResponseLoadControlCriticalityLevelServiceDisconnect MTR_PROVISIONALLY_AVAILABLE = 0x09,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDemandResponseLoadControlHeatingSource) {
+    MTRDemandResponseLoadControlHeatingSourceAny MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDemandResponseLoadControlHeatingSourceElectric MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRDemandResponseLoadControlHeatingSourceNonElectric MTR_PROVISIONALLY_AVAILABLE = 0x02,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDemandResponseLoadControlLoadControlEventChangeSource) {
+    MTRDemandResponseLoadControlLoadControlEventChangeSourceAutomatic MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDemandResponseLoadControlLoadControlEventChangeSourceUserAction MTR_PROVISIONALLY_AVAILABLE = 0x01,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDemandResponseLoadControlLoadControlEventStatus) {
+    MTRDemandResponseLoadControlLoadControlEventStatusUnknown MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDemandResponseLoadControlLoadControlEventStatusReceived MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRDemandResponseLoadControlLoadControlEventStatusInProgress MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTRDemandResponseLoadControlLoadControlEventStatusCompleted MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTRDemandResponseLoadControlLoadControlEventStatusOptedOut MTR_PROVISIONALLY_AVAILABLE = 0x04,
+    MTRDemandResponseLoadControlLoadControlEventStatusOptedIn MTR_PROVISIONALLY_AVAILABLE = 0x05,
+    MTRDemandResponseLoadControlLoadControlEventStatusCanceled MTR_PROVISIONALLY_AVAILABLE = 0x06,
+    MTRDemandResponseLoadControlLoadControlEventStatusSuperseded MTR_PROVISIONALLY_AVAILABLE = 0x07,
+    MTRDemandResponseLoadControlLoadControlEventStatusPartialOptedOut MTR_PROVISIONALLY_AVAILABLE = 0x08,
+    MTRDemandResponseLoadControlLoadControlEventStatusPartialOptedIn MTR_PROVISIONALLY_AVAILABLE = 0x09,
+    MTRDemandResponseLoadControlLoadControlEventStatusNoParticipation MTR_PROVISIONALLY_AVAILABLE = 0x0A,
+    MTRDemandResponseLoadControlLoadControlEventStatusUnavailable MTR_PROVISIONALLY_AVAILABLE = 0x0B,
+    MTRDemandResponseLoadControlLoadControlEventStatusFailed MTR_PROVISIONALLY_AVAILABLE = 0x0C,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint16_t, MTRDemandResponseLoadControlCancelControlBitmap) {
+    MTRDemandResponseLoadControlCancelControlBitmapRandomEnd MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRDemandResponseLoadControlDeviceClassBitmap) {
+    MTRDemandResponseLoadControlDeviceClassBitmapHVAC MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRDemandResponseLoadControlDeviceClassBitmapStripHeater MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRDemandResponseLoadControlDeviceClassBitmapWaterHeater MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTRDemandResponseLoadControlDeviceClassBitmapPoolPump MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTRDemandResponseLoadControlDeviceClassBitmapSmartAppliance MTR_PROVISIONALLY_AVAILABLE = 0x10,
+    MTRDemandResponseLoadControlDeviceClassBitmapIrrigationPump MTR_PROVISIONALLY_AVAILABLE = 0x20,
+    MTRDemandResponseLoadControlDeviceClassBitmapCommercialLoad MTR_PROVISIONALLY_AVAILABLE = 0x40,
+    MTRDemandResponseLoadControlDeviceClassBitmapResidentialLoad MTR_PROVISIONALLY_AVAILABLE = 0x80,
+    MTRDemandResponseLoadControlDeviceClassBitmapExteriorLighting MTR_PROVISIONALLY_AVAILABLE = 0x100,
+    MTRDemandResponseLoadControlDeviceClassBitmapInteriorLighting MTR_PROVISIONALLY_AVAILABLE = 0x200,
+    MTRDemandResponseLoadControlDeviceClassBitmapEV MTR_PROVISIONALLY_AVAILABLE = 0x400,
+    MTRDemandResponseLoadControlDeviceClassBitmapGenerationSystem MTR_PROVISIONALLY_AVAILABLE = 0x800,
+    MTRDemandResponseLoadControlDeviceClassBitmapSmartInverter MTR_PROVISIONALLY_AVAILABLE = 0x1000,
+    MTRDemandResponseLoadControlDeviceClassBitmapEVSE MTR_PROVISIONALLY_AVAILABLE = 0x2000,
+    MTRDemandResponseLoadControlDeviceClassBitmapRESU MTR_PROVISIONALLY_AVAILABLE = 0x4000,
+    MTRDemandResponseLoadControlDeviceClassBitmapEMS MTR_PROVISIONALLY_AVAILABLE = 0x8000,
+    MTRDemandResponseLoadControlDeviceClassBitmapSEM MTR_PROVISIONALLY_AVAILABLE = 0x10000,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint16_t, MTRDemandResponseLoadControlEventControlBitmap) {
+    MTRDemandResponseLoadControlEventControlBitmapRandomStart MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint16_t, MTRDemandResponseLoadControlEventTransitionControlBitmap) {
+    MTRDemandResponseLoadControlEventTransitionControlBitmapRandomDuration MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRDemandResponseLoadControlEventTransitionControlBitmapIgnoreOptOut MTR_PROVISIONALLY_AVAILABLE = 0x2,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRDemandResponseLoadControlFeature) {
+    MTRDemandResponseLoadControlFeatureEnrollmentGroups MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRDemandResponseLoadControlFeatureTemperatureOffset MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRDemandResponseLoadControlFeatureTemperatureSetpoint MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTRDemandResponseLoadControlFeatureLoadAdjustment MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTRDemandResponseLoadControlFeatureDutyCycle MTR_PROVISIONALLY_AVAILABLE = 0x10,
+    MTRDemandResponseLoadControlFeaturePowerSavings MTR_PROVISIONALLY_AVAILABLE = 0x20,
+    MTRDemandResponseLoadControlFeatureHeatingSource MTR_PROVISIONALLY_AVAILABLE = 0x40,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTREnergyEVSEEnergyTransferStoppedReason) {
+    MTREnergyEVSEEnergyTransferStoppedReasonEVStopped MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTREnergyEVSEEnergyTransferStoppedReasonEVSEStopped MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTREnergyEVSEEnergyTransferStoppedReasonOther MTR_PROVISIONALLY_AVAILABLE = 0x02,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTREnergyEVSEFaultState) {
+    MTREnergyEVSEFaultStateNoError MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTREnergyEVSEFaultStateMeterFailure MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTREnergyEVSEFaultStateOverVoltage MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTREnergyEVSEFaultStateUnderVoltage MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTREnergyEVSEFaultStateOverCurrent MTR_PROVISIONALLY_AVAILABLE = 0x04,
+    MTREnergyEVSEFaultStateContactWetFailure MTR_PROVISIONALLY_AVAILABLE = 0x05,
+    MTREnergyEVSEFaultStateContactDryFailure MTR_PROVISIONALLY_AVAILABLE = 0x06,
+    MTREnergyEVSEFaultStateGroundFault MTR_PROVISIONALLY_AVAILABLE = 0x07,
+    MTREnergyEVSEFaultStatePowerLoss MTR_PROVISIONALLY_AVAILABLE = 0x08,
+    MTREnergyEVSEFaultStatePowerQuality MTR_PROVISIONALLY_AVAILABLE = 0x09,
+    MTREnergyEVSEFaultStatePilotShortCircuit MTR_PROVISIONALLY_AVAILABLE = 0x0A,
+    MTREnergyEVSEFaultStateEmergencyStop MTR_PROVISIONALLY_AVAILABLE = 0x0B,
+    MTREnergyEVSEFaultStateEVDisconnected MTR_PROVISIONALLY_AVAILABLE = 0x0C,
+    MTREnergyEVSEFaultStateWrongPowerSupply MTR_PROVISIONALLY_AVAILABLE = 0x0D,
+    MTREnergyEVSEFaultStateLiveNeutralSwap MTR_PROVISIONALLY_AVAILABLE = 0x0E,
+    MTREnergyEVSEFaultStateOverTemperature MTR_PROVISIONALLY_AVAILABLE = 0x0F,
+    MTREnergyEVSEFaultStateOther MTR_PROVISIONALLY_AVAILABLE = 0xFF,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTREnergyEVSEState) {
+    MTREnergyEVSEStateNotPluggedIn MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTREnergyEVSEStatePluggedInNoDemand MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTREnergyEVSEStatePluggedInDemand MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTREnergyEVSEStatePluggedInCharging MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTREnergyEVSEStatePluggedInDischarging MTR_PROVISIONALLY_AVAILABLE = 0x04,
+    MTREnergyEVSEStateSessionEnding MTR_PROVISIONALLY_AVAILABLE = 0x05,
+    MTREnergyEVSEStateFault MTR_PROVISIONALLY_AVAILABLE = 0x06,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTREnergyEVSESupplyState) {
+    MTREnergyEVSESupplyStateDisabled MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTREnergyEVSESupplyStateChargingEnabled MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTREnergyEVSESupplyStateDischargingEnabled MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTREnergyEVSESupplyStateDisabledError MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTREnergyEVSESupplyStateDisabledDiagnostics MTR_PROVISIONALLY_AVAILABLE = 0x04,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTREnergyEVSEFeature) {
+    MTREnergyEVSEFeatureChargingPreferences MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTREnergyEVSEFeatureSoCReporting MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTREnergyEVSEFeaturePlugAndCharge MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTREnergyEVSEFeatureRFID MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTREnergyEVSEFeatureV2X MTR_PROVISIONALLY_AVAILABLE = 0x10,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint8_t, MTREnergyEVSETargetDayOfWeekBitmap) {
+    MTREnergyEVSETargetDayOfWeekBitmapSunday MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTREnergyEVSETargetDayOfWeekBitmapMonday MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTREnergyEVSETargetDayOfWeekBitmapTuesday MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTREnergyEVSETargetDayOfWeekBitmapWednesday MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTREnergyEVSETargetDayOfWeekBitmapThursday MTR_PROVISIONALLY_AVAILABLE = 0x10,
+    MTREnergyEVSETargetDayOfWeekBitmapFriday MTR_PROVISIONALLY_AVAILABLE = 0x20,
+    MTREnergyEVSETargetDayOfWeekBitmapSaturday MTR_PROVISIONALLY_AVAILABLE = 0x40,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRDoorLockAlarmCode) {
     MTRDoorLockAlarmCodeLockJammed MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00,
     MTRDoorLockAlarmCodeLockFactoryReset MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01,
@@ -15263,8 +17167,14 @@ typedef NS_ENUM(uint8_t, MTRFanControlFanModeSequence) {
     MTRFanControlFanModeSequenceOffLowHigh MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x01,
     MTRFanControlFanModeSequenceOffLowMedHighAuto MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x02,
     MTRFanControlFanModeSequenceOffLowHighAuto MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x03,
-    MTRFanControlFanModeSequenceOffOnAuto MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x04,
-    MTRFanControlFanModeSequenceOffOn MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x05,
+    MTRFanControlFanModeSequenceOffHighAuto MTR_NEWLY_AVAILABLE = 0x04,
+    MTRFanControlFanModeSequenceOffOnAuto MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0))
+        MTR_NEWLY_DEPRECATED("Please use MTRFanControlFanModeSequenceOffHighAuto")
+    = 0x04,
+    MTRFanControlFanModeSequenceOffHigh MTR_NEWLY_AVAILABLE = 0x05,
+    MTRFanControlFanModeSequenceOffOn MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0))
+        MTR_NEWLY_DEPRECATED("Please use MTRFanControlFanModeSequenceOffHigh")
+    = 0x05,
 } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
 typedef NS_ENUM(uint8_t, MTRFanControlFanModeSequenceType) {
@@ -15272,8 +17182,8 @@ typedef NS_ENUM(uint8_t, MTRFanControlFanModeSequenceType) {
     MTRFanControlFanModeSequenceTypeOffLowHigh MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffLowHigh", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x01,
     MTRFanControlFanModeSequenceTypeOffLowMedHighAuto MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffLowMedHighAuto", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x02,
     MTRFanControlFanModeSequenceTypeOffLowHighAuto MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffLowHighAuto", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x03,
-    MTRFanControlFanModeSequenceTypeOffOnAuto MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffOnAuto", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x04,
-    MTRFanControlFanModeSequenceTypeOffOn MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffOn", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x05,
+    MTRFanControlFanModeSequenceTypeOffOnAuto MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffHighAuto", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x04,
+    MTRFanControlFanModeSequenceTypeOffOn MTR_DEPRECATED("Please use MTRFanControlFanModeSequenceOffHigh", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x05,
 } MTR_DEPRECATED("Please use MTRFanControlFanModeSequence", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0));
 
 typedef NS_ENUM(uint8_t, MTRFanControlStepDirection) {
@@ -15312,6 +17222,25 @@ typedef NS_OPTIONS(uint8_t, MTRFanControlWindSupportMask) {
     MTRFanControlWindSupportMaskNaturalWind MTR_DEPRECATED("Please use MTRFanControlWindBitmapNaturalWind", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x2,
 } MTR_DEPRECATED("Please use MTRFanControlWindBitmap", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0));
 
+typedef NS_ENUM(uint8_t, MTRThermostatUserInterfaceConfigurationKeypadLockout) {
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutNoLockout MTR_NEWLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout1 MTR_NEWLY_AVAILABLE = 0x01,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout2 MTR_NEWLY_AVAILABLE = 0x02,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout3 MTR_NEWLY_AVAILABLE = 0x03,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout4 MTR_NEWLY_AVAILABLE = 0x04,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout5 MTR_NEWLY_AVAILABLE = 0x05,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibility) {
+    MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityScheduleProgrammingPermitted MTR_NEWLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityScheduleProgrammingDenied MTR_NEWLY_AVAILABLE = 0x01,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRThermostatUserInterfaceConfigurationTemperatureDisplayMode) {
+    MTRThermostatUserInterfaceConfigurationTemperatureDisplayModeCelsius MTR_NEWLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationTemperatureDisplayModeFahrenheit MTR_NEWLY_AVAILABLE = 0x01,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRColorControlColorLoopAction) {
     MTRColorControlColorLoopActionDeactivate MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRColorControlColorLoopActionActivateFromColorLoopStartEnhancedHue MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
@@ -15761,17 +17690,17 @@ typedef NS_OPTIONS(uint32_t, MTRRadonConcentrationMeasurementFeature) {
     MTRRadonConcentrationMeasurementFeatureAverageMeasurement MTR_PROVISIONALLY_AVAILABLE = 0x20,
 } MTR_PROVISIONALLY_AVAILABLE;
 
+typedef NS_ENUM(uint8_t, MTRChannelLineupInfoType) {
+    MTRChannelLineupInfoTypeMSO MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00,
+    MTRChannelLineupInfoTypeMso MTR_DEPRECATED("Please use MTRChannelLineupInfoTypeMSO", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
 typedef NS_ENUM(uint8_t, MTRChannelStatus) {
     MTRChannelStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRChannelStatusMultipleMatches MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
     MTRChannelStatusNoMatches MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_ENUM(uint8_t, MTRChannelLineupInfoType) {
-    MTRChannelLineupInfoTypeMSO MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00,
-    MTRChannelLineupInfoTypeMso MTR_DEPRECATED("Please use MTRChannelLineupInfoTypeMSO", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_OPTIONS(uint32_t, MTRChannelFeature) {
     MTRChannelFeatureChannelList MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTRChannelFeatureLineupInfo MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
@@ -15783,6 +17712,13 @@ typedef NS_ENUM(uint8_t, MTRTargetNavigatorStatus) {
     MTRTargetNavigatorStatusNotAllowed MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRMediaPlaybackPlaybackState) {
+    MTRMediaPlaybackPlaybackStatePlaying MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
+    MTRMediaPlaybackPlaybackStatePaused MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
+    MTRMediaPlaybackPlaybackStateNotPlaying MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
+    MTRMediaPlaybackPlaybackStateBuffering MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
 typedef NS_ENUM(uint8_t, MTRMediaPlaybackStatus) {
     MTRMediaPlaybackStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRMediaPlaybackStatusInvalidStateForCommand MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
@@ -15792,13 +17728,6 @@ typedef NS_ENUM(uint8_t, MTRMediaPlaybackStatus) {
     MTRMediaPlaybackStatusSeekOutOfRange MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_ENUM(uint8_t, MTRMediaPlaybackPlaybackState) {
-    MTRMediaPlaybackPlaybackStatePlaying MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRMediaPlaybackPlaybackStatePaused MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRMediaPlaybackPlaybackStateNotPlaying MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRMediaPlaybackPlaybackStateBuffering MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_OPTIONS(uint32_t, MTRMediaPlaybackFeature) {
     MTRMediaPlaybackFeatureAdvancedSeek MTR_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) = 0x1,
     MTRMediaPlaybackFeatureVariableSpeed MTR_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) = 0x2,
@@ -15826,94 +17755,356 @@ typedef NS_OPTIONS(uint32_t, MTRMediaInputFeature) {
     MTRMediaInputFeatureNameUpdates MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRKeypadInputCECKeyCode) {
+    MTRKeypadInputCECKeyCodeSelect MTR_NEWLY_AVAILABLE = 0x00,
+    MTRKeypadInputCECKeyCodeUp MTR_NEWLY_AVAILABLE = 0x01,
+    MTRKeypadInputCECKeyCodeDown MTR_NEWLY_AVAILABLE = 0x02,
+    MTRKeypadInputCECKeyCodeLeft MTR_NEWLY_AVAILABLE = 0x03,
+    MTRKeypadInputCECKeyCodeRight MTR_NEWLY_AVAILABLE = 0x04,
+    MTRKeypadInputCECKeyCodeRightUp MTR_NEWLY_AVAILABLE = 0x05,
+    MTRKeypadInputCECKeyCodeRightDown MTR_NEWLY_AVAILABLE = 0x06,
+    MTRKeypadInputCECKeyCodeLeftUp MTR_NEWLY_AVAILABLE = 0x07,
+    MTRKeypadInputCECKeyCodeLeftDown MTR_NEWLY_AVAILABLE = 0x08,
+    MTRKeypadInputCECKeyCodeRootMenu MTR_NEWLY_AVAILABLE = 0x09,
+    MTRKeypadInputCECKeyCodeSetupMenu MTR_NEWLY_AVAILABLE = 0x0A,
+    MTRKeypadInputCECKeyCodeContentsMenu MTR_NEWLY_AVAILABLE = 0x0B,
+    MTRKeypadInputCECKeyCodeFavoriteMenu MTR_NEWLY_AVAILABLE = 0x0C,
+    MTRKeypadInputCECKeyCodeExit MTR_NEWLY_AVAILABLE = 0x0D,
+    MTRKeypadInputCECKeyCodeMediaTopMenu MTR_NEWLY_AVAILABLE = 0x10,
+    MTRKeypadInputCECKeyCodeMediaContextSensitiveMenu MTR_NEWLY_AVAILABLE = 0x11,
+    MTRKeypadInputCECKeyCodeNumberEntryMode MTR_NEWLY_AVAILABLE = 0x1D,
+    MTRKeypadInputCECKeyCodeNumber11 MTR_NEWLY_AVAILABLE = 0x1E,
+    MTRKeypadInputCECKeyCodeNumber12 MTR_NEWLY_AVAILABLE = 0x1F,
+    MTRKeypadInputCECKeyCodeNumber0OrNumber10 MTR_NEWLY_AVAILABLE = 0x20,
+    MTRKeypadInputCECKeyCodeNumbers1 MTR_NEWLY_AVAILABLE = 0x21,
+    MTRKeypadInputCECKeyCodeNumbers2 MTR_NEWLY_AVAILABLE = 0x22,
+    MTRKeypadInputCECKeyCodeNumbers3 MTR_NEWLY_AVAILABLE = 0x23,
+    MTRKeypadInputCECKeyCodeNumbers4 MTR_NEWLY_AVAILABLE = 0x24,
+    MTRKeypadInputCECKeyCodeNumbers5 MTR_NEWLY_AVAILABLE = 0x25,
+    MTRKeypadInputCECKeyCodeNumbers6 MTR_NEWLY_AVAILABLE = 0x26,
+    MTRKeypadInputCECKeyCodeNumbers7 MTR_NEWLY_AVAILABLE = 0x27,
+    MTRKeypadInputCECKeyCodeNumbers8 MTR_NEWLY_AVAILABLE = 0x28,
+    MTRKeypadInputCECKeyCodeNumbers9 MTR_NEWLY_AVAILABLE = 0x29,
+    MTRKeypadInputCECKeyCodeDot MTR_NEWLY_AVAILABLE = 0x2A,
+    MTRKeypadInputCECKeyCodeEnter MTR_NEWLY_AVAILABLE = 0x2B,
+    MTRKeypadInputCECKeyCodeClear MTR_NEWLY_AVAILABLE = 0x2C,
+    MTRKeypadInputCECKeyCodeNextFavorite MTR_NEWLY_AVAILABLE = 0x2F,
+    MTRKeypadInputCECKeyCodeChannelUp MTR_NEWLY_AVAILABLE = 0x30,
+    MTRKeypadInputCECKeyCodeChannelDown MTR_NEWLY_AVAILABLE = 0x31,
+    MTRKeypadInputCECKeyCodePreviousChannel MTR_NEWLY_AVAILABLE = 0x32,
+    MTRKeypadInputCECKeyCodeSoundSelect MTR_NEWLY_AVAILABLE = 0x33,
+    MTRKeypadInputCECKeyCodeInputSelect MTR_NEWLY_AVAILABLE = 0x34,
+    MTRKeypadInputCECKeyCodeDisplayInformation MTR_NEWLY_AVAILABLE = 0x35,
+    MTRKeypadInputCECKeyCodeHelp MTR_NEWLY_AVAILABLE = 0x36,
+    MTRKeypadInputCECKeyCodePageUp MTR_NEWLY_AVAILABLE = 0x37,
+    MTRKeypadInputCECKeyCodePageDown MTR_NEWLY_AVAILABLE = 0x38,
+    MTRKeypadInputCECKeyCodePower MTR_NEWLY_AVAILABLE = 0x40,
+    MTRKeypadInputCECKeyCodeVolumeUp MTR_NEWLY_AVAILABLE = 0x41,
+    MTRKeypadInputCECKeyCodeVolumeDown MTR_NEWLY_AVAILABLE = 0x42,
+    MTRKeypadInputCECKeyCodeMute MTR_NEWLY_AVAILABLE = 0x43,
+    MTRKeypadInputCECKeyCodePlay MTR_NEWLY_AVAILABLE = 0x44,
+    MTRKeypadInputCECKeyCodeStop MTR_NEWLY_AVAILABLE = 0x45,
+    MTRKeypadInputCECKeyCodePause MTR_NEWLY_AVAILABLE = 0x46,
+    MTRKeypadInputCECKeyCodeRecord MTR_NEWLY_AVAILABLE = 0x47,
+    MTRKeypadInputCECKeyCodeRewind MTR_NEWLY_AVAILABLE = 0x48,
+    MTRKeypadInputCECKeyCodeFastForward MTR_NEWLY_AVAILABLE = 0x49,
+    MTRKeypadInputCECKeyCodeEject MTR_NEWLY_AVAILABLE = 0x4A,
+    MTRKeypadInputCECKeyCodeForward MTR_NEWLY_AVAILABLE = 0x4B,
+    MTRKeypadInputCECKeyCodeBackward MTR_NEWLY_AVAILABLE = 0x4C,
+    MTRKeypadInputCECKeyCodeStopRecord MTR_NEWLY_AVAILABLE = 0x4D,
+    MTRKeypadInputCECKeyCodePauseRecord MTR_NEWLY_AVAILABLE = 0x4E,
+    MTRKeypadInputCECKeyCodeReserved MTR_NEWLY_AVAILABLE = 0x4F,
+    MTRKeypadInputCECKeyCodeAngle MTR_NEWLY_AVAILABLE = 0x50,
+    MTRKeypadInputCECKeyCodeSubPicture MTR_NEWLY_AVAILABLE = 0x51,
+    MTRKeypadInputCECKeyCodeVideoOnDemand MTR_NEWLY_AVAILABLE = 0x52,
+    MTRKeypadInputCECKeyCodeElectronicProgramGuide MTR_NEWLY_AVAILABLE = 0x53,
+    MTRKeypadInputCECKeyCodeTimerProgramming MTR_NEWLY_AVAILABLE = 0x54,
+    MTRKeypadInputCECKeyCodeInitialConfiguration MTR_NEWLY_AVAILABLE = 0x55,
+    MTRKeypadInputCECKeyCodeSelectBroadcastType MTR_NEWLY_AVAILABLE = 0x56,
+    MTRKeypadInputCECKeyCodeSelectSoundPresentation MTR_NEWLY_AVAILABLE = 0x57,
+    MTRKeypadInputCECKeyCodePlayFunction MTR_NEWLY_AVAILABLE = 0x60,
+    MTRKeypadInputCECKeyCodePausePlayFunction MTR_NEWLY_AVAILABLE = 0x61,
+    MTRKeypadInputCECKeyCodeRecordFunction MTR_NEWLY_AVAILABLE = 0x62,
+    MTRKeypadInputCECKeyCodePauseRecordFunction MTR_NEWLY_AVAILABLE = 0x63,
+    MTRKeypadInputCECKeyCodeStopFunction MTR_NEWLY_AVAILABLE = 0x64,
+    MTRKeypadInputCECKeyCodeMuteFunction MTR_NEWLY_AVAILABLE = 0x65,
+    MTRKeypadInputCECKeyCodeRestoreVolumeFunction MTR_NEWLY_AVAILABLE = 0x66,
+    MTRKeypadInputCECKeyCodeTuneFunction MTR_NEWLY_AVAILABLE = 0x67,
+    MTRKeypadInputCECKeyCodeSelectMediaFunction MTR_NEWLY_AVAILABLE = 0x68,
+    MTRKeypadInputCECKeyCodeSelectAvInputFunction MTR_NEWLY_AVAILABLE = 0x69,
+    MTRKeypadInputCECKeyCodeSelectAudioInputFunction MTR_NEWLY_AVAILABLE = 0x6A,
+    MTRKeypadInputCECKeyCodePowerToggleFunction MTR_NEWLY_AVAILABLE = 0x6B,
+    MTRKeypadInputCECKeyCodePowerOffFunction MTR_NEWLY_AVAILABLE = 0x6C,
+    MTRKeypadInputCECKeyCodePowerOnFunction MTR_NEWLY_AVAILABLE = 0x6D,
+    MTRKeypadInputCECKeyCodeF1Blue MTR_NEWLY_AVAILABLE = 0x71,
+    MTRKeypadInputCECKeyCodeF2Red MTR_NEWLY_AVAILABLE = 0x72,
+    MTRKeypadInputCECKeyCodeF3Green MTR_NEWLY_AVAILABLE = 0x73,
+    MTRKeypadInputCECKeyCodeF4Yellow MTR_NEWLY_AVAILABLE = 0x74,
+    MTRKeypadInputCECKeyCodeF5 MTR_NEWLY_AVAILABLE = 0x75,
+    MTRKeypadInputCECKeyCodeData MTR_NEWLY_AVAILABLE = 0x76,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRKeypadInputCecKeyCode) {
-    MTRKeypadInputCecKeyCodeSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRKeypadInputCecKeyCodeUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRKeypadInputCecKeyCodeDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRKeypadInputCecKeyCodeLeft MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRKeypadInputCecKeyCodeRight MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRKeypadInputCecKeyCodeRightUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRKeypadInputCecKeyCodeRightDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRKeypadInputCecKeyCodeLeftUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRKeypadInputCecKeyCodeLeftDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-    MTRKeypadInputCecKeyCodeRootMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09,
-    MTRKeypadInputCecKeyCodeSetupMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A,
-    MTRKeypadInputCecKeyCodeContentsMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B,
-    MTRKeypadInputCecKeyCodeFavoriteMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0C,
-    MTRKeypadInputCecKeyCodeExit MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0D,
-    MTRKeypadInputCecKeyCodeMediaTopMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10,
-    MTRKeypadInputCecKeyCodeMediaContextSensitiveMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x11,
-    MTRKeypadInputCecKeyCodeNumberEntryMode MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1D,
-    MTRKeypadInputCecKeyCodeNumber11 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1E,
-    MTRKeypadInputCecKeyCodeNumber12 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1F,
-    MTRKeypadInputCecKeyCodeNumber0OrNumber10 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20,
-    MTRKeypadInputCecKeyCodeNumbers1 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x21,
-    MTRKeypadInputCecKeyCodeNumbers2 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x22,
-    MTRKeypadInputCecKeyCodeNumbers3 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x23,
-    MTRKeypadInputCecKeyCodeNumbers4 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x24,
-    MTRKeypadInputCecKeyCodeNumbers5 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x25,
-    MTRKeypadInputCecKeyCodeNumbers6 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x26,
-    MTRKeypadInputCecKeyCodeNumbers7 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x27,
-    MTRKeypadInputCecKeyCodeNumbers8 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x28,
-    MTRKeypadInputCecKeyCodeNumbers9 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x29,
-    MTRKeypadInputCecKeyCodeDot MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2A,
-    MTRKeypadInputCecKeyCodeEnter MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2B,
-    MTRKeypadInputCecKeyCodeClear MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2C,
-    MTRKeypadInputCecKeyCodeNextFavorite MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2F,
-    MTRKeypadInputCecKeyCodeChannelUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x30,
-    MTRKeypadInputCecKeyCodeChannelDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x31,
-    MTRKeypadInputCecKeyCodePreviousChannel MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x32,
-    MTRKeypadInputCecKeyCodeSoundSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x33,
-    MTRKeypadInputCecKeyCodeInputSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x34,
-    MTRKeypadInputCecKeyCodeDisplayInformation MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x35,
-    MTRKeypadInputCecKeyCodeHelp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x36,
-    MTRKeypadInputCecKeyCodePageUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x37,
-    MTRKeypadInputCecKeyCodePageDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x38,
-    MTRKeypadInputCecKeyCodePower MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40,
-    MTRKeypadInputCecKeyCodeVolumeUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x41,
-    MTRKeypadInputCecKeyCodeVolumeDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x42,
-    MTRKeypadInputCecKeyCodeMute MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x43,
-    MTRKeypadInputCecKeyCodePlay MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x44,
-    MTRKeypadInputCecKeyCodeStop MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x45,
-    MTRKeypadInputCecKeyCodePause MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x46,
-    MTRKeypadInputCecKeyCodeRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x47,
-    MTRKeypadInputCecKeyCodeRewind MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x48,
-    MTRKeypadInputCecKeyCodeFastForward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x49,
-    MTRKeypadInputCecKeyCodeEject MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4A,
-    MTRKeypadInputCecKeyCodeForward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4B,
-    MTRKeypadInputCecKeyCodeBackward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4C,
-    MTRKeypadInputCecKeyCodeStopRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4D,
-    MTRKeypadInputCecKeyCodePauseRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4E,
-    MTRKeypadInputCecKeyCodeReserved MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4F,
-    MTRKeypadInputCecKeyCodeAngle MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x50,
-    MTRKeypadInputCecKeyCodeSubPicture MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x51,
-    MTRKeypadInputCecKeyCodeVideoOnDemand MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x52,
-    MTRKeypadInputCecKeyCodeElectronicProgramGuide MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x53,
-    MTRKeypadInputCecKeyCodeTimerProgramming MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x54,
-    MTRKeypadInputCecKeyCodeInitialConfiguration MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x55,
-    MTRKeypadInputCecKeyCodeSelectBroadcastType MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x56,
-    MTRKeypadInputCecKeyCodeSelectSoundPresentation MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x57,
-    MTRKeypadInputCecKeyCodePlayFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x60,
-    MTRKeypadInputCecKeyCodePausePlayFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x61,
-    MTRKeypadInputCecKeyCodeRecordFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x62,
-    MTRKeypadInputCecKeyCodePauseRecordFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x63,
-    MTRKeypadInputCecKeyCodeStopFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x64,
-    MTRKeypadInputCecKeyCodeMuteFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x65,
-    MTRKeypadInputCecKeyCodeRestoreVolumeFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x66,
-    MTRKeypadInputCecKeyCodeTuneFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x67,
-    MTRKeypadInputCecKeyCodeSelectMediaFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x68,
-    MTRKeypadInputCecKeyCodeSelectAvInputFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x69,
-    MTRKeypadInputCecKeyCodeSelectAudioInputFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x6A,
-    MTRKeypadInputCecKeyCodePowerToggleFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x6B,
-    MTRKeypadInputCecKeyCodePowerOffFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x6C,
-    MTRKeypadInputCecKeyCodePowerOnFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x6D,
-    MTRKeypadInputCecKeyCodeF1Blue MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x71,
-    MTRKeypadInputCecKeyCodeF2Red MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x72,
-    MTRKeypadInputCecKeyCodeF3Green MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x73,
-    MTRKeypadInputCecKeyCodeF4Yellow MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x74,
-    MTRKeypadInputCecKeyCodeF5 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x75,
-    MTRKeypadInputCecKeyCodeData MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x76,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRKeypadInputCecKeyCodeSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelect")
+    = 0x00,
+    MTRKeypadInputCecKeyCodeUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeUp")
+    = 0x01,
+    MTRKeypadInputCecKeyCodeDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeDown")
+    = 0x02,
+    MTRKeypadInputCecKeyCodeLeft MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeLeft")
+    = 0x03,
+    MTRKeypadInputCecKeyCodeRight MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRight")
+    = 0x04,
+    MTRKeypadInputCecKeyCodeRightUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRightUp")
+    = 0x05,
+    MTRKeypadInputCecKeyCodeRightDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRightDown")
+    = 0x06,
+    MTRKeypadInputCecKeyCodeLeftUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeLeftUp")
+    = 0x07,
+    MTRKeypadInputCecKeyCodeLeftDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeLeftDown")
+    = 0x08,
+    MTRKeypadInputCecKeyCodeRootMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRootMenu")
+    = 0x09,
+    MTRKeypadInputCecKeyCodeSetupMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSetupMenu")
+    = 0x0A,
+    MTRKeypadInputCecKeyCodeContentsMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeContentsMenu")
+    = 0x0B,
+    MTRKeypadInputCecKeyCodeFavoriteMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeFavoriteMenu")
+    = 0x0C,
+    MTRKeypadInputCecKeyCodeExit MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeExit")
+    = 0x0D,
+    MTRKeypadInputCecKeyCodeMediaTopMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeMediaTopMenu")
+    = 0x10,
+    MTRKeypadInputCecKeyCodeMediaContextSensitiveMenu MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeMediaContextSensitiveMenu")
+    = 0x11,
+    MTRKeypadInputCecKeyCodeNumberEntryMode MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumberEntryMode")
+    = 0x1D,
+    MTRKeypadInputCecKeyCodeNumber11 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumber11")
+    = 0x1E,
+    MTRKeypadInputCecKeyCodeNumber12 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumber12")
+    = 0x1F,
+    MTRKeypadInputCecKeyCodeNumber0OrNumber10 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumber0OrNumber10")
+    = 0x20,
+    MTRKeypadInputCecKeyCodeNumbers1 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers1")
+    = 0x21,
+    MTRKeypadInputCecKeyCodeNumbers2 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers2")
+    = 0x22,
+    MTRKeypadInputCecKeyCodeNumbers3 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers3")
+    = 0x23,
+    MTRKeypadInputCecKeyCodeNumbers4 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers4")
+    = 0x24,
+    MTRKeypadInputCecKeyCodeNumbers5 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers5")
+    = 0x25,
+    MTRKeypadInputCecKeyCodeNumbers6 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers6")
+    = 0x26,
+    MTRKeypadInputCecKeyCodeNumbers7 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers7")
+    = 0x27,
+    MTRKeypadInputCecKeyCodeNumbers8 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers8")
+    = 0x28,
+    MTRKeypadInputCecKeyCodeNumbers9 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNumbers9")
+    = 0x29,
+    MTRKeypadInputCecKeyCodeDot MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeDot")
+    = 0x2A,
+    MTRKeypadInputCecKeyCodeEnter MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeEnter")
+    = 0x2B,
+    MTRKeypadInputCecKeyCodeClear MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeClear")
+    = 0x2C,
+    MTRKeypadInputCecKeyCodeNextFavorite MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeNextFavorite")
+    = 0x2F,
+    MTRKeypadInputCecKeyCodeChannelUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeChannelUp")
+    = 0x30,
+    MTRKeypadInputCecKeyCodeChannelDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeChannelDown")
+    = 0x31,
+    MTRKeypadInputCecKeyCodePreviousChannel MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePreviousChannel")
+    = 0x32,
+    MTRKeypadInputCecKeyCodeSoundSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSoundSelect")
+    = 0x33,
+    MTRKeypadInputCecKeyCodeInputSelect MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeInputSelect")
+    = 0x34,
+    MTRKeypadInputCecKeyCodeDisplayInformation MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeDisplayInformation")
+    = 0x35,
+    MTRKeypadInputCecKeyCodeHelp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeHelp")
+    = 0x36,
+    MTRKeypadInputCecKeyCodePageUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePageUp")
+    = 0x37,
+    MTRKeypadInputCecKeyCodePageDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePageDown")
+    = 0x38,
+    MTRKeypadInputCecKeyCodePower MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePower")
+    = 0x40,
+    MTRKeypadInputCecKeyCodeVolumeUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeVolumeUp")
+    = 0x41,
+    MTRKeypadInputCecKeyCodeVolumeDown MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeVolumeDown")
+    = 0x42,
+    MTRKeypadInputCecKeyCodeMute MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeMute")
+    = 0x43,
+    MTRKeypadInputCecKeyCodePlay MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePlay")
+    = 0x44,
+    MTRKeypadInputCecKeyCodeStop MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeStop")
+    = 0x45,
+    MTRKeypadInputCecKeyCodePause MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePause")
+    = 0x46,
+    MTRKeypadInputCecKeyCodeRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRecord")
+    = 0x47,
+    MTRKeypadInputCecKeyCodeRewind MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRewind")
+    = 0x48,
+    MTRKeypadInputCecKeyCodeFastForward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeFastForward")
+    = 0x49,
+    MTRKeypadInputCecKeyCodeEject MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeEject")
+    = 0x4A,
+    MTRKeypadInputCecKeyCodeForward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeForward")
+    = 0x4B,
+    MTRKeypadInputCecKeyCodeBackward MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeBackward")
+    = 0x4C,
+    MTRKeypadInputCecKeyCodeStopRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeStopRecord")
+    = 0x4D,
+    MTRKeypadInputCecKeyCodePauseRecord MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePauseRecord")
+    = 0x4E,
+    MTRKeypadInputCecKeyCodeReserved MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeReserved")
+    = 0x4F,
+    MTRKeypadInputCecKeyCodeAngle MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeAngle")
+    = 0x50,
+    MTRKeypadInputCecKeyCodeSubPicture MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSubPicture")
+    = 0x51,
+    MTRKeypadInputCecKeyCodeVideoOnDemand MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeVideoOnDemand")
+    = 0x52,
+    MTRKeypadInputCecKeyCodeElectronicProgramGuide MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeElectronicProgramGuide")
+    = 0x53,
+    MTRKeypadInputCecKeyCodeTimerProgramming MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeTimerProgramming")
+    = 0x54,
+    MTRKeypadInputCecKeyCodeInitialConfiguration MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeInitialConfiguration")
+    = 0x55,
+    MTRKeypadInputCecKeyCodeSelectBroadcastType MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelectBroadcastType")
+    = 0x56,
+    MTRKeypadInputCecKeyCodeSelectSoundPresentation MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelectSoundPresentation")
+    = 0x57,
+    MTRKeypadInputCecKeyCodePlayFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePlayFunction")
+    = 0x60,
+    MTRKeypadInputCecKeyCodePausePlayFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePausePlayFunction")
+    = 0x61,
+    MTRKeypadInputCecKeyCodeRecordFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRecordFunction")
+    = 0x62,
+    MTRKeypadInputCecKeyCodePauseRecordFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePauseRecordFunction")
+    = 0x63,
+    MTRKeypadInputCecKeyCodeStopFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeStopFunction")
+    = 0x64,
+    MTRKeypadInputCecKeyCodeMuteFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeMuteFunction")
+    = 0x65,
+    MTRKeypadInputCecKeyCodeRestoreVolumeFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeRestoreVolumeFunction")
+    = 0x66,
+    MTRKeypadInputCecKeyCodeTuneFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeTuneFunction")
+    = 0x67,
+    MTRKeypadInputCecKeyCodeSelectMediaFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelectMediaFunction")
+    = 0x68,
+    MTRKeypadInputCecKeyCodeSelectAvInputFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelectAvInputFunction")
+    = 0x69,
+    MTRKeypadInputCecKeyCodeSelectAudioInputFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeSelectAudioInputFunction")
+    = 0x6A,
+    MTRKeypadInputCecKeyCodePowerToggleFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePowerToggleFunction")
+    = 0x6B,
+    MTRKeypadInputCecKeyCodePowerOffFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePowerOffFunction")
+    = 0x6C,
+    MTRKeypadInputCecKeyCodePowerOnFunction MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodePowerOnFunction")
+    = 0x6D,
+    MTRKeypadInputCecKeyCodeF1Blue MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeF1Blue")
+    = 0x71,
+    MTRKeypadInputCecKeyCodeF2Red MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeF2Red")
+    = 0x72,
+    MTRKeypadInputCecKeyCodeF3Green MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeF3Green")
+    = 0x73,
+    MTRKeypadInputCecKeyCodeF4Yellow MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeF4Yellow")
+    = 0x74,
+    MTRKeypadInputCecKeyCodeF5 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeF5")
+    = 0x75,
+    MTRKeypadInputCecKeyCodeData MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCodeData")
+    = 0x76,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use MTRKeypadInputCECKeyCode");
 
 typedef NS_ENUM(uint8_t, MTRKeypadInputStatus) {
     MTRKeypadInputStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
@@ -15927,12 +18118,6 @@ typedef NS_OPTIONS(uint32_t, MTRKeypadInputFeature) {
     MTRKeypadInputFeatureNumberKeys MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_ENUM(uint8_t, MTRContentLauncherContentLaunchStatus) {
-    MTRContentLauncherContentLaunchStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRContentLauncherContentLaunchStatusUrlNotAvailable MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRContentLauncherContentLaunchStatusAuthFailed MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_ENUM(uint8_t, MTRContentLauncherMetricType) {
     MTRContentLauncherMetricTypePixels MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00,
     MTRContentLauncherMetricTypePIXELS MTR_DEPRECATED("Please use MTRContentLauncherMetricTypePixels", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -15957,15 +18142,44 @@ typedef NS_ENUM(uint8_t, MTRContentLauncherParameter) {
     MTRContentLauncherParameterVideo MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x0D,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRContentLauncherStatus) {
+    MTRContentLauncherStatusSuccess MTR_NEWLY_AVAILABLE = 0x00,
+    MTRContentLauncherStatusURLNotAvailable MTR_NEWLY_AVAILABLE = 0x01,
+    MTRContentLauncherStatusAuthFailed MTR_NEWLY_AVAILABLE = 0x02,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRContentLauncherContentLaunchStatus) {
+    MTRContentLauncherContentLaunchStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherStatusSuccess")
+    = 0x00,
+    MTRContentLauncherContentLaunchStatusUrlNotAvailable MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherStatusURLNotAvailable")
+    = 0x01,
+    MTRContentLauncherContentLaunchStatusAuthFailed MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherStatusAuthFailed")
+    = 0x02,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherStatus");
+
 typedef NS_OPTIONS(uint32_t, MTRContentLauncherFeature) {
     MTRContentLauncherFeatureContentSearch MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTRContentLauncherFeatureURLPlayback MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_OPTIONS(uint32_t, MTRContentLauncherSupportedProtocolsBitmap) {
+    MTRContentLauncherSupportedProtocolsBitmapDASH MTR_NEWLY_AVAILABLE = 0x1,
+    MTRContentLauncherSupportedProtocolsBitmapHLS MTR_NEWLY_AVAILABLE = 0x2,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_OPTIONS(uint32_t, MTRContentLauncherSupportedStreamingProtocol) {
-    MTRContentLauncherSupportedStreamingProtocolDASH MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
-    MTRContentLauncherSupportedStreamingProtocolHLS MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRContentLauncherSupportedStreamingProtocolDASH MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherSupportedProtocolsBitmapDASH")
+    = 0x1,
+    MTRContentLauncherSupportedStreamingProtocolHLS MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherSupportedProtocolsBitmapHLS")
+    = 0x2,
+} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherSupportedProtocolsBitmap");
 
 typedef NS_ENUM(uint8_t, MTRAudioOutputOutputType) {
     MTRAudioOutputOutputTypeHDMI MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index ec55b1beca255a..fc1620dca6a39a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -62,18 +62,6 @@ static void OnSuccessFn(void * context)
 // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects.
 @implementation MTRBaseClusterIdentify
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -718,18 +706,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterGroups
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params completion:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -1403,18 +1379,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterScenes
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params completion:(void (^)(MTRScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -1908,22 +1872,22 @@ + (void)readAttributeSceneTableSizeWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeRemainingCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeFabricSceneInfoWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = Scenes::Attributes::RemainingCapacity::TypeInfo;
+    using TypeInfo = Scenes::Attributes::FabricSceneInfo::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
+                                            params:params
                                              queue:self.callbackQueue
                                         completion:completion];
 }
 
-- (void)subscribeAttributeRemainingCapacityWithParams:(MTRSubscribeParams * _Nonnull)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFabricSceneInfoWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = Scenes::Attributes::RemainingCapacity::TypeInfo;
+    using TypeInfo = Scenes::Attributes::FabricSceneInfo::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -1933,9 +1897,9 @@ - (void)subscribeAttributeRemainingCapacityWithParams:(MTRSubscribeParams * _Non
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeRemainingCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeFabricSceneInfoWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = Scenes::Attributes::RemainingCapacity::TypeInfo;
+    using TypeInfo = Scenes::Attributes::FabricSceneInfo::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -2638,18 +2602,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOnOff
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)offWithCompletion:(MTRStatusCompletion)completion
 {
     [self offWithParams:nil completion:completion];
@@ -3732,18 +3684,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOnOffSwitchConfiguration
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeSwitchTypeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
@@ -4328,18 +4268,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterLevelControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -6280,18 +6208,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBinaryInputBasic
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeActiveTextWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
@@ -7553,18 +7469,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterPulseWidthModulation
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = PulseWidthModulation::Attributes::GeneratedCommandList::TypeInfo;
@@ -7785,18 +7689,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterDescriptor
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeDeviceTypeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Descriptor::Attributes::DeviceTypeList::TypeInfo;
@@ -8523,18 +8415,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBinding
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Binding::Attributes::Binding::TypeInfo;
@@ -9085,18 +8965,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterAccessControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeACLWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
@@ -10046,18 +9914,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterActions
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -11027,18 +10883,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBasicInformation
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)mfgSpecificPingWithCompletion:(MTRStatusCompletion)completion
 {
     [self mfgSpecificPingWithParams:nil completion:completion];
@@ -11908,6 +11752,78 @@ + (void)readAttributeProductAppearanceWithClusterStateCache:(MTRClusterStateCach
                                      completion:completion];
 }
 
+- (void)readAttributeSpecificationVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BasicInformation::Attributes::SpecificationVersion::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSpecificationVersionWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = BasicInformation::Attributes::SpecificationVersion::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSpecificationVersionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BasicInformation::Attributes::SpecificationVersion::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeMaxPathsPerInvokeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BasicInformation::Attributes::MaxPathsPerInvoke::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeMaxPathsPerInvokeWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = BasicInformation::Attributes::MaxPathsPerInvoke::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeMaxPathsPerInvokeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BasicInformation::Attributes::MaxPathsPerInvoke::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = BasicInformation::Attributes::GeneratedCommandList::TypeInfo;
@@ -13051,18 +12967,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOTASoftwareUpdateProvider
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParams *)params completion:(void (^)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -13567,18 +13471,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOTASoftwareUpdateRequestor
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -14362,18 +14254,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterLocalizationConfiguration
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeActiveLocaleWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
@@ -14958,18 +14838,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterTimeFormatLocalization
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeHourFormatWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
@@ -15661,18 +15529,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterUnitLocalization
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeTemperatureUnitWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
@@ -16186,18 +16042,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterPowerSourceConfiguration
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeSourcesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
@@ -16675,18 +16519,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterPowerSource
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeStatusWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
@@ -19330,18 +19162,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterGeneralCommissioning
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params completion:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -20245,18 +20065,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterNetworkCommissioning
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params completion:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -20401,6 +20209,30 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
+- (void)queryIdentityWithParams:(MTRNetworkCommissioningClusterQueryIdentityParams *)params completion:(void (^)(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRNetworkCommissioningClusterQueryIdentityParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = NetworkCommissioning::Commands::QueryIdentity::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRNetworkCommissioningClusterQueryIdentityResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
 
 - (void)readAttributeMaxNetworksWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
@@ -21569,18 +21401,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterDiagnosticLogs
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params completion:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -22021,18 +21841,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterGeneralDiagnostics
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -22057,6 +21865,34 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
+- (void)timeSnapshotWithCompletion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self timeSnapshotWithParams:nil completion:completion];
+}
+- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = GeneralDiagnostics::Commands::TimeSnapshot::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
 
 - (void)readAttributeNetworkInterfacesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
@@ -22382,42 +22218,6 @@ + (void)readAttributeTestEventTriggersEnabledWithClusterStateCache:(MTRClusterSt
                                      completion:completion];
 }
 
-- (void)readAttributeAverageWearCountWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = GeneralDiagnostics::Attributes::AverageWearCount::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeAverageWearCountWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = GeneralDiagnostics::Attributes::AverageWearCount::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeAverageWearCountWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = GeneralDiagnostics::Attributes::AverageWearCount::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
@@ -23145,18 +22945,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterSoftwareDiagnostics
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetWatermarksWithCompletion:(MTRStatusCompletion)completion
 {
     [self resetWatermarksWithParams:nil completion:completion];
@@ -23886,18 +23674,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterThreadNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithCompletion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil completion:completion];
@@ -28816,18 +28592,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterWiFiNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithCompletion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil completion:completion];
@@ -30196,18 +29960,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterEthernetNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithCompletion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil completion:completion];
@@ -31292,18 +31044,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterTimeSynchronization
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)setUTCTimeWithParams:(MTRTimeSynchronizationClusterSetUTCTimeParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -32113,18 +31853,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterBridgedDeviceBasicInformation
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeVendorNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorName::TypeInfo;
@@ -33671,18 +33399,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterSwitch
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeNumberOfPositionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
@@ -34302,18 +34018,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterAdministratorCommissioning
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -35039,18 +34743,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOperationalCredentials
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params completion:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -36138,18 +35830,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterGroupKeyManagement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -37027,18 +36707,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterFixedLabel
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeLabelListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
@@ -37516,18 +37184,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterUserLabel
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeLabelListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
@@ -38063,18 +37719,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBooleanState
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeStateValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
@@ -38552,18 +38196,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterICDManagement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)registerClientWithParams:(MTRICDManagementClusterRegisterClientParams *)params completion:(void (^)(MTRICDManagementClusterRegisterClientResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -38612,11 +38244,11 @@ - (void)unregisterClientWithParams:(MTRICDManagementClusterUnregisterClientParam
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)stayActiveRequestWithCompletion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithCompletion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     [self stayActiveRequestWithParams:nil completion:completion];
 }
-- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
         params = [[MTRICDManagementClusterStayActiveRequestParams
@@ -38624,7 +38256,7 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
+        completion(response, error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
@@ -38636,7 +38268,7 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
+                                     responseClass:MTRICDManagementClusterStayActiveResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
@@ -39147,24 +38779,88 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterModeSelect
+@implementation MTRBaseClusterTimer
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    if (params == nil) {
+        params = [[MTRTimerClusterSetTimerParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-        _device = device;
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::SetTimer::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)resetTimerWithCompletion:(MTRStatusCompletion)completion
+{
+    [self resetTimerWithParams:nil completion:completion];
+}
+- (void)resetTimerWithParams:(MTRTimerClusterResetTimerParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTimerClusterResetTimerParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::ResetTimer::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
+- (void)addTimeWithParams:(MTRTimerClusterAddTimeParams *)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTimerClusterAddTimeParams
+            alloc] init];
+    }
 
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::AddTime::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)reduceTimeWithParams:(MTRTimerClusterReduceTimeParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRModeSelectClusterChangeToModeParams
+        params = [[MTRTimerClusterReduceTimeParams
             alloc] init];
     }
 
@@ -39174,7 +38870,7 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = ModeSelect::Commands::ChangeToMode::Type;
+    using RequestType = Timer::Commands::ReduceTime::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -39186,9 +38882,9 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
                                         completion:responseHandler];
 }
 
-- (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSetTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    using TypeInfo = Timer::Attributes::SetTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39197,11 +38893,11 @@ - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSetTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    using TypeInfo = Timer::Attributes::SetTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39211,9 +38907,9 @@ - (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSetTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    using TypeInfo = Timer::Attributes::SetTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39222,9 +38918,9 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeTimeRemainingWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimeRemaining::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39233,11 +38929,11 @@ - (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nulla
                                         completion:completion];
 }
 
-- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams * _Nonnull)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTimeRemainingWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimeRemaining::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39247,9 +38943,9 @@ - (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams * _Non
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeTimeRemainingWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimeRemaining::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39258,9 +38954,9 @@ + (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCach
                                      completion:completion];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeTimerStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimerState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39269,11 +38965,11 @@ - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTimerStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimerState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39283,9 +38979,9 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeTimerStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = Timer::Attributes::TimerState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39294,9 +38990,9 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39305,11 +39001,11 @@ - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39319,9 +39015,9 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39330,9 +39026,9 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39341,44 +39037,11 @@ - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39388,9 +39051,9 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39399,9 +39062,9 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39410,44 +39073,47 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+    using TypeInfo = Timer::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
 
-        ListFreer listFreer;
-        using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
 
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39457,9 +39123,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    using TypeInfo = Timer::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39468,9 +39134,9 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
                                      completion:completion];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39479,11 +39145,11 @@ - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39493,9 +39159,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39504,9 +39170,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39515,11 +39181,11 @@ - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39529,9 +39195,9 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = Timer::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39540,9 +39206,126 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+@end
+
+@implementation MTRBaseClusterOvenCavityOperationalState
+
+- (void)pauseWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    [self pauseWithParams:nil completion:completion];
+}
+- (void)pauseWithParams:(MTROvenCavityOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterPauseParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)stopWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self stopWithParams:nil completion:completion];
+}
+- (void)stopWithParams:(MTROvenCavityOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterStopParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)startWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil completion:completion];
+}
+- (void)startWithParams:(MTROvenCavityOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterStartParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Start::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)resumeWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self resumeWithParams:nil completion:completion];
+}
+- (void)resumeWithParams:(MTROvenCavityOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterResumeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Resume::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenCavityOperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39551,11 +39334,11 @@ - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)params
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39565,9 +39348,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::PhaseList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39576,9 +39359,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39587,11 +39370,11 @@ - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39601,9 +39384,9 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CurrentPhase::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39612,9 +39395,9 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
                                      completion:completion];
 }
 
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CountdownTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39623,11 +39406,11 @@ - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CountdownTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39637,9 +39420,9 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::CountdownTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39648,9 +39431,9 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalStateList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -39659,11 +39442,11 @@ - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalStateList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -39673,9 +39456,9 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalStateList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -39684,468 +39467,5986 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
 
-@implementation MTRBaseClusterModeSelect (Deprecated)
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
 
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completionHandler:(MTRStatusCompletion)completionHandler
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self changeToModeWithParams:params completion:
-                                            completionHandler];
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeDescriptionWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalError::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(MTRSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeDescriptionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalError::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-+ (void)readAttributeDescriptionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeDescriptionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::OperationalError::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeStandardNamespaceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(MTRSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeStandardNamespaceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-+ (void)readAttributeStandardNamespaceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeStandardNamespaceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeSupportedModesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(MTRSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeSupportedModesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-+ (void)readAttributeSupportedModesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeSupportedModesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeCurrentModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(MTRSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeCurrentModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-+ (void)readAttributeCurrentModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeCurrentModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeStartUpModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeStartUpModeWithValue:value params:nil completion:completionHandler];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self writeAttributeStartUpModeWithValue:value params:params completion:completionHandler];
+    using TypeInfo = OvenCavityOperationalState::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
-- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(MTRSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeStartUpModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-+ (void)readAttributeStartUpModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self readAttributeStartUpModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
 
-- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeOnModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    using TypeInfo = OvenCavityOperationalState::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self writeAttributeOnModeWithValue:value params:nil completion:completionHandler];
+    using TypeInfo = OvenCavityOperationalState::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeOnModeWithValue:value params:params completion:completionHandler];
+    using TypeInfo = OvenCavityOperationalState::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(MTRSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
+    using TypeInfo = OvenCavityOperationalState::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterOvenMode
+
+- (void)changeToModeWithParams:(MTROvenModeClusterChangeToModeParams *)params completion:(void (^)(MTROvenModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenModeClusterChangeToModeParams
+            alloc] init];
     }
-    [self subscribeAttributeOnModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-+ (void)readAttributeOnModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeOnModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(MTRSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(MTRSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+    using TypeInfo = OvenMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
 {
-    [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
 }
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(MTRSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = OvenMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::StartUpMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = OvenMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OvenMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OvenMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterLaundryDryerControls
+
+- (void)readAttributeSupportedDrynessLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SupportedDrynessLevels::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedDrynessLevelsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SupportedDrynessLevels::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedDrynessLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SupportedDrynessLevels::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSelectedDrynessLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SelectedDrynessLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeSelectedDrynessLevelWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = LaundryDryerControls::Attributes::SelectedDrynessLevel::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                  nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeSelectedDrynessLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SelectedDrynessLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSelectedDrynessLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::SelectedDrynessLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryDryerControls::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryDryerControls::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterModeSelect
+
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRModeSelectClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ModeSelect::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterModeSelect (Deprecated)
+
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self changeToModeWithParams:params completion:
+                                            completionHandler];
+}
+
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeDescriptionWithCompletion:
+              ^(NSString * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSString *>(value), error);
+              }];
+}
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(MTRSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeDescriptionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                 // Cast is safe because subclass does not add any selectors.
+                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
+                                                                                                                             }];
+}
++ (void)readAttributeDescriptionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeDescriptionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                    // Cast is safe because subclass does not add any selectors.
+                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
+                                                                                                                                }];
+}
+
+- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeStandardNamespaceWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(MTRSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeStandardNamespaceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                       // Cast is safe because subclass does not add any selectors.
+                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                   }];
+}
++ (void)readAttributeStandardNamespaceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeStandardNamespaceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                          // Cast is safe because subclass does not add any selectors.
+                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                      }];
+}
+
+- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeSupportedModesWithCompletion:
+              ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSArray *>(value), error);
+              }];
+}
+- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(MTRSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeSupportedModesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                    // Cast is safe because subclass does not add any selectors.
+                                                                                                                                    reportHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                }];
+}
++ (void)readAttributeSupportedModesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeSupportedModesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                       // Cast is safe because subclass does not add any selectors.
+                                                                                                                                       completionHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                   }];
+}
+
+- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeCurrentModeWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(MTRSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeCurrentModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                 // Cast is safe because subclass does not add any selectors.
+                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                             }];
+}
++ (void)readAttributeCurrentModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeCurrentModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                    // Cast is safe because subclass does not add any selectors.
+                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                }];
+}
+
+- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeStartUpModeWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self writeAttributeStartUpModeWithValue:value params:nil completion:completionHandler];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self writeAttributeStartUpModeWithValue:value params:params completion:completionHandler];
+}
+- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(MTRSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeStartUpModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                 // Cast is safe because subclass does not add any selectors.
+                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                             }];
+}
++ (void)readAttributeStartUpModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeStartUpModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                    // Cast is safe because subclass does not add any selectors.
+                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                }];
+}
+
+- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeOnModeWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self writeAttributeOnModeWithValue:value params:nil completion:completionHandler];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self writeAttributeOnModeWithValue:value params:params completion:completionHandler];
+}
+- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(MTRSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeOnModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                            // Cast is safe because subclass does not add any selectors.
+                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                        }];
+}
++ (void)readAttributeOnModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeOnModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                               // Cast is safe because subclass does not add any selectors.
+                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                           }];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeGeneratedCommandListWithCompletion:
+              ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSArray *>(value), error);
+              }];
+}
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(MTRSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                          // Cast is safe because subclass does not add any selectors.
+                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                      }];
+}
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                             // Cast is safe because subclass does not add any selectors.
+                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                         }];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeAcceptedCommandListWithCompletion:
+              ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSArray *>(value), error);
+              }];
+}
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(MTRSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                         // Cast is safe because subclass does not add any selectors.
+                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                     }];
+}
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                            // Cast is safe because subclass does not add any selectors.
+                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                        }];
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeAttributeListWithCompletion:
+              ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSArray *>(value), error);
+              }];
+}
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(MTRSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
                                                                                                                                    // Cast is safe because subclass does not add any selectors.
                                                                                                                                    reportHandler(static_cast<NSArray *>(value), error);
                                                                                                                                }];
 }
-+ (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                      // Cast is safe because subclass does not add any selectors.
+                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
+                                                                                                                                  }];
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeFeatureMapWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(MTRSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                // Cast is safe because subclass does not add any selectors.
+                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                            }];
+}
++ (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                   // Cast is safe because subclass does not add any selectors.
+                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                               }];
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeClusterRevisionWithCompletion:
+              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                  // Cast is safe because subclass does not add any selectors.
+                  completionHandler(static_cast<NSNumber *>(value), error);
+              }];
+}
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(MTRSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
+    if (subscribeParams == nil) {
+        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
+    } else {
+        subscribeParams.minInterval = minInterval;
+        subscribeParams.maxInterval = maxInterval;
+    }
+    [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
+                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                     // Cast is safe because subclass does not add any selectors.
+                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                 }];
+}
++ (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
+                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                                                                                                                                        // Cast is safe because subclass does not add any selectors.
+                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
+                                                                                                                                    }];
+}
+
+- (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
+                               endpoint:(uint16_t)endpoint
+                                  queue:(dispatch_queue_t)queue
+{
+    return [self initWithDevice:device endpointID:@(endpoint) queue:queue];
+}
+
+@end
+
+@implementation MTRBaseClusterLaundryWasherMode
+
+- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRLaundryWasherModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = LaundryWasherMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRLaundryWasherModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode
+
+- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterLaundryWasherControls
+
+- (void)readAttributeSpinSpeedsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSpinSpeedsWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSpinSpeedsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSpinSpeedCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeSpinSpeedCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSpinSpeedCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeNumberOfRinsesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+        TypeInfo::Type cppValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeNumberOfRinsesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeNumberOfRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSupportedRinsesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedRinsesWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterRVCRunMode
+
+- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCRunModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcRunMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCRunModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterRVCCleanMode
+
+- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCCleanModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcCleanMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCCleanModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterTemperatureControl
+
+- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTemperatureControlClusterSetTemperatureParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = TemperatureControl::Commands::SetTemperature::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeTemperatureSetpointWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeTemperatureSetpointWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeTemperatureSetpointWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeMinTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeMinTemperatureWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeMinTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeMaxTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeMaxTemperatureWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeMaxTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeStepWithParams:(MTRSubscribeParams * _Nonnull)params
+                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSelectedTemperatureLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSelectedTemperatureLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSelectedTemperatureLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSupportedTemperatureLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedTemperatureLevelsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedTemperatureLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterRefrigeratorAlarm
+
+- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
+                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterDishwasherMode
+
+- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRDishwasherModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DishwasherMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRDishwasherModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterAirQuality
+
+- (void)readAttributeAirQualityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAirQualityWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAirQualityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(MTRSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
-    }
-    [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-+ (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation MTRBaseClusterSmokeCOAlarm
+
+- (void)selfTestRequestWithCompletion:(MTRStatusCompletion)completion
 {
-    [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+    [self selfTestRequestWithParams:nil completion:completion];
 }
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(MTRSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    MTRSubscribeParams * _Nullable subscribeParams = [params copy];
-    if (subscribeParams == nil) {
-        subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval];
-    } else {
-        subscribeParams.minInterval = minInterval;
-        subscribeParams.maxInterval = maxInterval;
+    if (params == nil) {
+        params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams
+            alloc] init];
     }
-    [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = SmokeCoAlarm::Commands::SelfTestRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-+ (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+
+- (void)readAttributeExpressedStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeExpressedStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeExpressedStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSmokeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSmokeStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSmokeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCOStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCOStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCOStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeBatteryAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeBatteryAlertWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeBatteryAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeDeviceMutedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeDeviceMutedWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeDeviceMutedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeTestInProgressWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeTestInProgressWithParams:(MTRSubscribeParams * _Nonnull)params
+                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeTestInProgressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeHardwareFaultAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeHardwareFaultAlertWithParams:(MTRSubscribeParams * _Nonnull)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeHardwareFaultAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
-                               endpoint:(uint16_t)endpoint
-                                  queue:(dispatch_queue_t)queue
+- (void)readAttributeEndOfServiceAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    return [self initWithDevice:device endpointID:@(endpoint) queue:queue];
+    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterLaundryWasherMode
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)subscribeAttributeEndOfServiceAlertWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
+    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
 
-- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
++ (void)readAttributeEndOfServiceAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    if (params == nil) {
-        params = [[MTRLaundryWasherModeClusterChangeToModeParams
-            alloc] init];
-    }
+    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
 
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
-    };
+- (void)readAttributeInterconnectSmokeAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
 
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+- (void)subscribeAttributeInterconnectSmokeAlarmWithParams:(MTRSubscribeParams * _Nonnull)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
 
-    using RequestType = LaundryWasherMode::Commands::ChangeToMode::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRLaundryWasherModeClusterChangeToModeResponseParams.class
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
++ (void)readAttributeInterconnectSmokeAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeInterconnectCOAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40154,11 +45455,11 @@ - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInterconnectCOAlarmWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40168,9 +45469,9 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeInterconnectCOAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40179,9 +45480,9 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeContaminationStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40190,11 +45491,11 @@ - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeContaminationStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40204,9 +45505,9 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeContaminationStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40215,9 +45516,9 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSmokeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40226,11 +45527,11 @@ - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+    [self writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
 }
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
@@ -40245,25 +45546,20 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(M
         }
 
         ListFreer listFreer;
-        using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+        using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
         TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSmokeSensitivityLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40273,9 +45569,9 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSmokeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40284,9 +45580,9 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeExpiryDateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40295,44 +45591,11 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeExpiryDateWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40342,9 +45605,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40355,7 +45618,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40368,7 +45631,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40380,7 +45643,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40391,7 +45654,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40404,7 +45667,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40416,7 +45679,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40427,7 +45690,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40440,7 +45703,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40452,7 +45715,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40463,7 +45726,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40476,7 +45739,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40488,7 +45751,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40499,7 +45762,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40512,7 +45775,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40524,7 +45787,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40535,7 +45798,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40548,7 +45811,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40560,7 +45823,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40571,48 +45834,60 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode
+@implementation MTRBaseClusterDishwasherAlarm
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRDishwasherAlarmClusterResetParams
+            alloc] init];
     }
-    return self;
-}
 
-- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DishwasherAlarm::Commands::Reset::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+        params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type;
+    using RequestType = DishwasherAlarm::Commands::ModifyEnabledAlarms::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40621,11 +45896,11 @@ - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
+                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40635,9 +45910,9 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40646,9 +45921,9 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeLatchWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40657,11 +45932,11 @@ - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLatchWithParams:(MTRSubscribeParams * _Nonnull)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40671,9 +45946,9 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeLatchWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40682,9 +45957,9 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40693,44 +45968,11 @@ - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40740,9 +45982,9 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40751,9 +45993,9 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40762,44 +46004,11 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40809,9 +46018,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40822,7 +46031,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40835,7 +46044,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40847,7 +46056,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40858,7 +46067,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40871,7 +46080,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40883,7 +46092,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40894,7 +46103,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40907,7 +46116,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40919,7 +46128,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -40930,7 +46139,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -40943,7 +46152,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -40955,79 +46164,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41036,25 +46173,9 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterLaundryWasherControls
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
-- (void)readAttributeSpinSpeedsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41063,11 +46184,11 @@ - (void)readAttributeSpinSpeedsWithCompletion:(void (^)(NSArray * _Nullable valu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSpinSpeedsWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41077,9 +46198,9 @@ - (void)subscribeAttributeSpinSpeedsWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSpinSpeedsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeeds::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41088,9 +46209,9 @@ + (void)readAttributeSpinSpeedsWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeSpinSpeedCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41099,44 +46220,11 @@ - (void)readAttributeSpinSpeedCurrentWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeSpinSpeedCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41146,9 +46234,9 @@ - (void)subscribeAttributeSpinSpeedCurrentWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSpinSpeedCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41157,9 +46245,13 @@ + (void)readAttributeSpinSpeedCurrentWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeNumberOfRinsesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+@end
+
+@implementation MTRBaseClusterMicrowaveOvenMode
+
+- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::SupportedModes::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41168,39 +46260,11 @@ - (void)readAttributeNumberOfRinsesWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
-}
-- (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
-        TypeInfo::Type cppValue;
-              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeNumberOfRinsesWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::SupportedModes::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41210,9 +46274,9 @@ - (void)subscribeAttributeNumberOfRinsesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeNumberOfRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::SupportedModes::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41221,9 +46285,9 @@ + (void)readAttributeNumberOfRinsesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeSupportedRinsesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::CurrentMode::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41232,11 +46296,11 @@ - (void)readAttributeSupportedRinsesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedRinsesWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::CurrentMode::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41246,9 +46310,9 @@ - (void)subscribeAttributeSupportedRinsesWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedRinsesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::SupportedRinses::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::CurrentMode::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41259,7 +46323,7 @@ + (void)readAttributeSupportedRinsesWithClusterStateCache:(MTRClusterStateCacheC
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41272,7 +46336,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41284,7 +46348,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41295,7 +46359,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41308,7 +46372,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41320,7 +46384,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41331,7 +46395,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41344,7 +46408,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41356,7 +46420,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41367,7 +46431,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41380,7 +46444,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41392,7 +46456,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41403,7 +46467,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41416,7 +46480,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41428,7 +46492,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41439,7 +46503,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41452,7 +46516,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41464,7 +46528,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = LaundryWasherControls::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenMode::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41475,48 +46539,60 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterRVCRunMode
+@implementation MTRBaseClusterMicrowaveOvenControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)setCookingParametersWithParams:(MTRMicrowaveOvenControlClusterSetCookingParametersParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRMicrowaveOvenControlClusterSetCookingParametersParams
+            alloc] init];
     }
-    return self;
-}
 
-- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = MicrowaveOvenControl::Commands::SetCookingParameters::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)addMoreTimeWithParams:(MTRMicrowaveOvenControlClusterAddMoreTimeParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCRunModeClusterChangeToModeParams
+        params = [[MTRMicrowaveOvenControlClusterAddMoreTimeParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcRunMode::Commands::ChangeToMode::Type;
+    using RequestType = MicrowaveOvenControl::Commands::AddMoreTime::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCRunModeClusterChangeToModeResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCookTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::CookTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41525,11 +46601,11 @@ - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCookTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::CookTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41539,9 +46615,9 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCookTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::CookTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41550,9 +46626,9 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributePowerSettingWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerSetting::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41561,11 +46637,11 @@ - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePowerSettingWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerSetting::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41575,9 +46651,9 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributePowerSettingWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerSetting::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41586,9 +46662,9 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeMinPowerWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::MinPower::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41597,44 +46673,83 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+- (void)subscribeAttributeMinPowerWithParams:(MTRSubscribeParams * _Nonnull)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+    using TypeInfo = MicrowaveOvenControl::Attributes::MinPower::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+
++ (void)readAttributeMinPowerWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
+    using TypeInfo = MicrowaveOvenControl::Attributes::MinPower::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
+- (void)readAttributeMaxPowerWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = MicrowaveOvenControl::Attributes::MaxPower::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
 
-        ListFreer listFreer;
-        using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
+- (void)subscribeAttributeMaxPowerWithParams:(MTRSubscribeParams * _Nonnull)params
+                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = MicrowaveOvenControl::Attributes::MaxPower::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
 
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
++ (void)readAttributeMaxPowerWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = MicrowaveOvenControl::Attributes::MaxPower::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributePowerStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerStep::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributePowerStepWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerStep::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41644,9 +46759,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributePowerStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::PowerStep::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41657,7 +46772,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41670,7 +46785,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41682,7 +46797,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41693,7 +46808,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41706,7 +46821,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41718,7 +46833,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41729,7 +46844,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41742,7 +46857,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41754,7 +46869,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41765,7 +46880,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41778,7 +46893,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41790,7 +46905,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41801,7 +46916,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41814,7 +46929,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41826,7 +46941,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41837,7 +46952,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41850,7 +46965,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41862,7 +46977,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcRunMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = MicrowaveOvenControl::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41873,24 +46988,100 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterRVCCleanMode
+@implementation MTRBaseClusterOperationalState
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)pauseWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    [self pauseWithParams:nil completion:completion];
+}
+- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterPauseParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-        _device = device;
+    using RequestType = OperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)stopWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self stopWithParams:nil completion:completion];
+}
+- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterStopParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
+- (void)startWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil completion:completion];
+}
+- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterStartParams
+            alloc] init];
+    }
 
-- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Start::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)resumeWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self resumeWithParams:nil completion:completion];
+}
+- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRRVCCleanModeClusterChangeToModeParams
+        params = [[MTROperationalStateClusterResumeParams
             alloc] init];
     }
 
@@ -41900,21 +47091,21 @@ - (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)param
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcCleanMode::Commands::ChangeToMode::Type;
+    using RequestType = OperationalState::Commands::Resume::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCCleanModeClusterChangeToModeResponseParams.class
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41923,11 +47114,11 @@ - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41937,9 +47128,9 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41948,9 +47139,9 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41959,11 +47150,11 @@ - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -41973,9 +47164,9 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -41984,9 +47175,9 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -41995,44 +47186,119 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
+    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
 
-        ListFreer listFreer;
-        using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
 
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42042,9 +47308,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42055,7 +47321,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42068,7 +47334,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42080,7 +47346,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42091,7 +47357,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42104,7 +47370,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42116,7 +47382,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42127,7 +47393,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42140,7 +47406,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42152,7 +47418,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42163,7 +47429,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42176,7 +47442,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42188,7 +47454,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42199,7 +47465,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42212,7 +47478,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42224,7 +47490,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42235,7 +47501,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42248,7 +47514,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42260,7 +47526,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcCleanMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42271,48 +47537,124 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterTemperatureControl
+@implementation MTRBaseClusterRVCOperationalState
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)pauseWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    [self pauseWithParams:nil completion:completion];
+}
+- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterPauseParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
 
-        _device = device;
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)stopWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self stopWithParams:nil completion:completion];
+}
+- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterStopParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)startWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil completion:completion];
 }
+- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterStartParams
+            alloc] init];
+    }
 
-- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params completion:(MTRStatusCompletion)completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Start::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)resumeWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self resumeWithParams:nil completion:completion];
+}
+- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRTemperatureControlClusterSetTemperatureParams
+        params = [[MTRRVCOperationalStateClusterResumeParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
+        completion(response, error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = TemperatureControl::Commands::SetTemperature::Type;
+    using RequestType = RvcOperationalState::Commands::Resume::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributeTemperatureSetpointWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42321,11 +47663,11 @@ - (void)readAttributeTemperatureSetpointWithCompletion:(void (^)(NSNumber * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeTemperatureSetpointWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42335,9 +47677,9 @@ - (void)subscribeAttributeTemperatureSetpointWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeTemperatureSetpointWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::TemperatureSetpoint::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42346,9 +47688,9 @@ + (void)readAttributeTemperatureSetpointWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeMinTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42357,11 +47699,11 @@ - (void)readAttributeMinTemperatureWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeMinTemperatureWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42371,9 +47713,9 @@ - (void)subscribeAttributeMinTemperatureWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeMinTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::MinTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42382,9 +47724,9 @@ + (void)readAttributeMinTemperatureWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeMaxTemperatureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42393,11 +47735,11 @@ - (void)readAttributeMaxTemperatureWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeMaxTemperatureWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42407,9 +47749,9 @@ - (void)subscribeAttributeMaxTemperatureWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeMaxTemperatureWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::MaxTemperature::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42418,9 +47760,9 @@ + (void)readAttributeMaxTemperatureWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeStepWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42429,11 +47771,11 @@ - (void)readAttributeStepWithCompletion:(void (^)(NSNumber * _Nullable value, NS
                                         completion:completion];
 }
 
-- (void)subscribeAttributeStepWithParams:(MTRSubscribeParams * _Nonnull)params
-                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42443,9 +47785,9 @@ - (void)subscribeAttributeStepWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStepWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::Step::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42454,9 +47796,9 @@ + (void)readAttributeStepWithClusterStateCache:(MTRClusterStateCacheContainer *)
                                      completion:completion];
 }
 
-- (void)readAttributeSelectedTemperatureLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42465,11 +47807,11 @@ - (void)readAttributeSelectedTemperatureLevelWithCompletion:(void (^)(NSNumber *
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSelectedTemperatureLevelWithParams:(MTRSubscribeParams * _Nonnull)params
-                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42479,9 +47821,9 @@ - (void)subscribeAttributeSelectedTemperatureLevelWithParams:(MTRSubscribeParams
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSelectedTemperatureLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::SelectedTemperatureLevel::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42490,9 +47832,9 @@ + (void)readAttributeSelectedTemperatureLevelWithClusterStateCache:(MTRClusterSt
                                      completion:completion];
 }
 
-- (void)readAttributeSupportedTemperatureLevelsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42501,11 +47843,11 @@ - (void)readAttributeSupportedTemperatureLevelsWithCompletion:(void (^)(NSArray
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedTemperatureLevelsWithParams:(MTRSubscribeParams * _Nonnull)params
-                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42515,9 +47857,9 @@ - (void)subscribeAttributeSupportedTemperatureLevelsWithParams:(MTRSubscribePara
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedTemperatureLevelsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::SupportedTemperatureLevels::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42528,7 +47870,7 @@ + (void)readAttributeSupportedTemperatureLevelsWithClusterStateCache:(MTRCluster
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42541,7 +47883,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42553,7 +47895,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42564,7 +47906,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42577,7 +47919,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42589,7 +47931,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42600,7 +47942,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42613,7 +47955,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42625,7 +47967,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::EventList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42636,7 +47978,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42649,7 +47991,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42661,7 +48003,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42672,7 +48014,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42685,7 +48027,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42697,7 +48039,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42708,7 +48050,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42721,7 +48063,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42733,7 +48075,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = TemperatureControl::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42744,23 +48086,40 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterRefrigeratorAlarm
+@implementation MTRBaseClusterHEPAFilterMonitoring
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    [self resetConditionWithParams:nil completion:completion];
+}
+- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRHEPAFilterMonitoringClusterResetConditionParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = HepaFilterMonitoring::Commands::ResetCondition::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42769,11 +48128,11 @@ - (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NS
                                         completion:completion];
 }
 
-- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
-                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42783,9 +48142,9 @@ - (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42794,9 +48153,9 @@ + (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)
                                      completion:completion];
 }
 
-- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42805,11 +48164,11 @@ - (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, N
                                         completion:completion];
 }
 
-- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42819,9 +48178,9 @@ - (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::State::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42830,9 +48189,150 @@ + (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *
                                      completion:completion];
 }
 
-- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedIntValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42841,11 +48341,11 @@ - (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable valu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42855,9 +48355,9 @@ - (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42868,7 +48368,7 @@ + (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42881,7 +48381,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42893,7 +48393,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42904,7 +48404,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42917,7 +48417,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42929,7 +48429,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42940,7 +48440,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42953,7 +48453,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -42965,7 +48465,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -42976,7 +48476,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -42989,7 +48489,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43001,7 +48501,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43012,7 +48512,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43025,7 +48525,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43037,7 +48537,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43048,7 +48548,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43061,7 +48561,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43073,7 +48573,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RefrigeratorAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43084,189 +48584,40 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterDishwasherMode
+@implementation MTRBaseClusterActivatedCarbonFilterMonitoring
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
+    [self resetConditionWithParams:nil completion:completion];
 }
-
-- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRDishwasherModeClusterChangeToModeParams
+        params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = DishwasherMode::Commands::ChangeToMode::Type;
+    using RequestType = ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRDishwasherModeClusterChangeToModeResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::SupportedModes::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::CurrentMode::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43275,44 +48626,11 @@ - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedCharValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
-                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43322,9 +48640,9 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43333,9 +48651,9 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer
                                      completion:completion];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43344,11 +48662,11 @@ - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _Nonnull)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43358,9 +48676,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43369,9 +48687,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43380,11 +48698,11 @@ - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43394,9 +48712,9 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43405,9 +48723,9 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43416,11 +48734,11 @@ - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43430,9 +48748,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43441,9 +48759,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43452,83 +48770,44 @@ - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = DishwasherMode::Attributes::AttributeList::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
+    [self writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
 }
-
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
 
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
 
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::FeatureMap::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
+        ListFreer listFreer;
+        using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedIntValue;
+  }
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnull)params
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43538,9 +48817,9 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherMode::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43549,25 +48828,9 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterAirQuality
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
-- (void)readAttributeAirQualityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43576,11 +48839,11 @@ - (void)readAttributeAirQualityWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAirQualityWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43590,9 +48853,9 @@ - (void)subscribeAttributeAirQualityWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAirQualityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AirQuality::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43603,7 +48866,7 @@ + (void)readAttributeAirQualityWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43616,7 +48879,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43628,7 +48891,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43639,7 +48902,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43652,7 +48915,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43664,7 +48927,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43675,7 +48938,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43688,7 +48951,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43700,7 +48963,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::EventList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43711,7 +48974,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43724,7 +48987,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43736,7 +48999,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43747,7 +49010,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43760,7 +49023,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43772,7 +49035,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43783,7 +49046,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43796,7 +49059,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43808,7 +49071,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AirQuality::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43819,28 +49082,12 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterSmokeCOAlarm
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRBaseClusterBooleanSensorConfiguration
 
-- (void)selfTestRequestWithCompletion:(MTRStatusCompletion)completion
-{
-    [self selfTestRequestWithParams:nil completion:completion];
-}
-- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams
+        params = [[MTRBooleanSensorConfigurationClusterSuppressRequestParams
             alloc] init];
     }
 
@@ -43850,7 +49097,7 @@ - (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams *
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = SmokeCoAlarm::Commands::SelfTestRequest::Type;
+    using RequestType = BooleanSensorConfiguration::Commands::SuppressRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -43862,9 +49109,9 @@ - (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams *
                                         completion:responseHandler];
 }
 
-- (void)readAttributeExpressedStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43873,11 +49120,39 @@ - (void)readAttributeExpressedStateWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeExpressedStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeSensitivityLevelWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
+        TypeInfo::Type cppValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeSensitivityLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43887,9 +49162,9 @@ - (void)subscribeAttributeExpressedStateWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeExpressedStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpressedState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43898,9 +49173,9 @@ + (void)readAttributeExpressedStateWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeSmokeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAlarmsActiveWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43909,11 +49184,11 @@ - (void)readAttributeSmokeStateWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSmokeStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAlarmsActiveWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43923,9 +49198,9 @@ - (void)subscribeAttributeSmokeStateWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSmokeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAlarmsActiveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43934,9 +49209,9 @@ + (void)readAttributeSmokeStateWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeCOStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAlarmsSuppressedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43945,11 +49220,11 @@ - (void)readAttributeCOStateWithCompletion:(void (^)(NSNumber * _Nullable value,
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCOStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAlarmsSuppressedWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43959,9 +49234,9 @@ - (void)subscribeAttributeCOStateWithParams:(MTRSubscribeParams * _Nonnull)param
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCOStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAlarmsSuppressedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::COState::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -43970,9 +49245,9 @@ + (void)readAttributeCOStateWithClusterStateCache:(MTRClusterStateCacheContainer
                                      completion:completion];
 }
 
-- (void)readAttributeBatteryAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAlarmsEnabledWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -43981,11 +49256,39 @@ - (void)readAttributeBatteryAlertWithCompletion:(void (^)(NSNumber * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeBatteryAlertWithParams:(MTRSubscribeParams * _Nonnull)params
-                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    [self writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeAlarmsEnabledWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -43995,9 +49298,9 @@ - (void)subscribeAttributeBatteryAlertWithParams:(MTRSubscribeParams * _Nonnull)
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeBatteryAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAlarmsEnabledWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::BatteryAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44006,9 +49309,9 @@ + (void)readAttributeBatteryAlertWithClusterStateCache:(MTRClusterStateCacheCont
                                      completion:completion];
 }
 
-- (void)readAttributeDeviceMutedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44017,11 +49320,11 @@ - (void)readAttributeDeviceMutedWithCompletion:(void (^)(NSNumber * _Nullable va
                                         completion:completion];
 }
 
-- (void)subscribeAttributeDeviceMutedWithParams:(MTRSubscribeParams * _Nonnull)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44031,9 +49334,9 @@ - (void)subscribeAttributeDeviceMutedWithParams:(MTRSubscribeParams * _Nonnull)p
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeDeviceMutedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::DeviceMuted::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44042,9 +49345,9 @@ + (void)readAttributeDeviceMutedWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeTestInProgressWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44053,11 +49356,11 @@ - (void)readAttributeTestInProgressWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeTestInProgressWithParams:(MTRSubscribeParams * _Nonnull)params
-                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44067,9 +49370,9 @@ - (void)subscribeAttributeTestInProgressWithParams:(MTRSubscribeParams * _Nonnul
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeTestInProgressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::TestInProgress::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44078,9 +49381,9 @@ + (void)readAttributeTestInProgressWithClusterStateCache:(MTRClusterStateCacheCo
                                      completion:completion];
 }
 
-- (void)readAttributeHardwareFaultAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44089,11 +49392,11 @@ - (void)readAttributeHardwareFaultAlertWithCompletion:(void (^)(NSNumber * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeHardwareFaultAlertWithParams:(MTRSubscribeParams * _Nonnull)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44103,9 +49406,9 @@ - (void)subscribeAttributeHardwareFaultAlertWithParams:(MTRSubscribeParams * _No
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeHardwareFaultAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::HardwareFaultAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44114,9 +49417,9 @@ + (void)readAttributeHardwareFaultAlertWithClusterStateCache:(MTRClusterStateCac
                                      completion:completion];
 }
 
-- (void)readAttributeEndOfServiceAlertWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44125,11 +49428,11 @@ - (void)readAttributeEndOfServiceAlertWithCompletion:(void (^)(NSNumber * _Nulla
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEndOfServiceAlertWithParams:(MTRSubscribeParams * _Nonnull)params
-                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44139,9 +49442,9 @@ - (void)subscribeAttributeEndOfServiceAlertWithParams:(MTRSubscribeParams * _Non
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEndOfServiceAlertWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EndOfServiceAlert::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44150,9 +49453,9 @@ + (void)readAttributeEndOfServiceAlertWithClusterStateCache:(MTRClusterStateCach
                                      completion:completion];
 }
 
-- (void)readAttributeInterconnectSmokeAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44161,11 +49464,11 @@ - (void)readAttributeInterconnectSmokeAlarmWithCompletion:(void (^)(NSNumber * _
                                         completion:completion];
 }
 
-- (void)subscribeAttributeInterconnectSmokeAlarmWithParams:(MTRSubscribeParams * _Nonnull)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44175,9 +49478,9 @@ - (void)subscribeAttributeInterconnectSmokeAlarmWithParams:(MTRSubscribeParams *
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeInterconnectSmokeAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44186,9 +49489,9 @@ + (void)readAttributeInterconnectSmokeAlarmWithClusterStateCache:(MTRClusterStat
                                      completion:completion];
 }
 
-- (void)readAttributeInterconnectCOAlarmWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44197,11 +49500,11 @@ - (void)readAttributeInterconnectCOAlarmWithCompletion:(void (^)(NSNumber * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeInterconnectCOAlarmWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44211,9 +49514,9 @@ - (void)subscribeAttributeInterconnectCOAlarmWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeInterconnectCOAlarmWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::InterconnectCOAlarm::TypeInfo;
+    using TypeInfo = BooleanSensorConfiguration::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44222,45 +49525,90 @@ + (void)readAttributeInterconnectCOAlarmWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeContaminationStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+@end
+
+@implementation MTRBaseClusterValveConfigurationAndControl
+
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterOpenParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ValveConfigurationAndControl::Commands::Open::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
                                              queue:self.callbackQueue
-                                        completion:completion];
+                                        completion:responseHandler];
 }
-
-- (void)subscribeAttributeContaminationStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)closeWithCompletion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
+    [self closeWithParams:nil completion:completion];
 }
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterCloseParams
+            alloc] init];
+    }
 
-+ (void)readAttributeContaminationStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ValveConfigurationAndControl::Commands::Close::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ContaminationState::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterSetLevelParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ValveConfigurationAndControl::Commands::SetLevel::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)readAttributeSmokeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOpenDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44269,11 +49617,11 @@ - (void)readAttributeSmokeSensitivityLevelWithCompletion:(void (^)(NSNumber * _N
                                         completion:completion];
 }
 
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+- (void)writeAttributeOpenDurationWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
 {
-    [self writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+    [self writeAttributeOpenDurationWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
 }
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)writeAttributeOpenDurationWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
@@ -44288,20 +49636,25 @@ - (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value
         }
 
         ListFreer listFreer;
-        using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+        using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
         TypeInfo::Type cppValue;
-              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedIntValue;
+  }
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeSmokeSensitivityLevelWithParams:(MTRSubscribeParams * _Nonnull)params
-                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOpenDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44311,9 +49664,9 @@ - (void)subscribeAttributeSmokeSensitivityLevelWithParams:(MTRSubscribeParams *
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSmokeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOpenDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44322,9 +49675,9 @@ + (void)readAttributeSmokeSensitivityLevelWithClusterStateCache:(MTRClusterState
                                      completion:completion];
 }
 
-- (void)readAttributeExpiryDateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeAutoCloseTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44333,11 +49686,11 @@ - (void)readAttributeExpiryDateWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeExpiryDateWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAutoCloseTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44347,9 +49700,9 @@ - (void)subscribeAttributeExpiryDateWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeAutoCloseTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ExpiryDate::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44358,9 +49711,9 @@ + (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeRemainingDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44369,11 +49722,11 @@ - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRemainingDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44383,9 +49736,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeRemainingDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44394,9 +49747,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44405,11 +49758,11 @@ - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44419,9 +49772,9 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44430,9 +49783,9 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeTargetStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44441,11 +49794,11 @@ - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTargetStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44455,9 +49808,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeTargetStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44466,9 +49819,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeStartUpStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44477,47 +49830,39 @@ - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
+    [self writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
 }
-
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::AttributeList::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
 
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
+        TypeInfo::Type cppValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStartUpStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44527,9 +49872,9 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeStartUpStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44538,9 +49883,9 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCurrentLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44549,11 +49894,11 @@ - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44563,9 +49908,9 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCurrentLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = SmokeCoAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44574,74 +49919,9 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterDishwasherAlarm
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
-- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion
-{
-    if (params == nil) {
-        params = [[MTRDishwasherAlarmClusterResetParams
-            alloc] init];
-    }
-
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
-
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
-    using RequestType = DishwasherAlarm::Commands::Reset::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
-}
-- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion
-{
-    if (params == nil) {
-        params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
-            alloc] init];
-    }
-
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
-
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
-    using RequestType = DishwasherAlarm::Commands::ModifyEnabledAlarms::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
-}
-
-- (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeTargetLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44650,11 +49930,11 @@ - (void)readAttributeMaskWithCompletion:(void (^)(NSNumber * _Nullable value, NS
                                         completion:completion];
 }
 
-- (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
-                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTargetLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44664,9 +49944,9 @@ - (void)subscribeAttributeMaskWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeTargetLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Mask::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44675,9 +49955,9 @@ + (void)readAttributeMaskWithClusterStateCache:(MTRClusterStateCacheContainer *)
                                      completion:completion];
 }
 
-- (void)readAttributeLatchWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeOpenLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44686,47 +49966,44 @@ - (void)readAttributeLatchWithCompletion:(void (^)(NSNumber * _Nullable value, N
                                         completion:completion];
 }
 
-- (void)subscribeAttributeLatchWithParams:(MTRSubscribeParams * _Nonnull)params
-                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeOpenLevelWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
+    [self writeAttributeOpenLevelWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
 }
-
-+ (void)readAttributeLatchWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)writeAttributeOpenLevelWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Latch::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
 
-- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOpenLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44736,9 +50013,9 @@ - (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeOpenLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::State::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44747,9 +50024,9 @@ + (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *
                                      completion:completion];
 }
 
-- (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeValveFaultWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44758,11 +50035,11 @@ - (void)readAttributeSupportedWithCompletion:(void (^)(NSNumber * _Nullable valu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeValveFaultWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44772,9 +50049,9 @@ - (void)subscribeAttributeSupportedWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeValveFaultWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::Supported::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44785,7 +50062,7 @@ + (void)readAttributeSupportedWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44798,7 +50075,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44810,7 +50087,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44821,7 +50098,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44834,7 +50111,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44846,7 +50123,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44857,7 +50134,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44870,7 +50147,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44882,7 +50159,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::EventList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44893,7 +50170,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44906,7 +50183,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44918,7 +50195,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44929,7 +50206,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44942,7 +50219,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44954,7 +50231,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -44965,7 +50242,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -44978,7 +50255,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -44990,7 +50267,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = DishwasherAlarm::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45001,136 +50278,136 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterOperationalState
+@implementation MTRBaseClusterDemandResponseLoadControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
+            alloc] init];
     }
-    return self;
-}
 
-- (void)pauseWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self pauseWithParams:nil completion:completion];
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterPauseParams
+        params = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Pause::Type;
+    using RequestType = DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)stopWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self stopWithParams:nil completion:completion];
-}
-- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterStopParams
+        params = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Stop::Type;
+    using RequestType = DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)startWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self startWithParams:nil completion:completion];
-}
-- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterStartParams
+        params = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Start::Type;
+    using RequestType = DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)resumeWithCompletion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)clearLoadControlEventsRequestWithCompletion:(MTRStatusCompletion)completion
 {
-    [self resumeWithParams:nil completion:completion];
+    [self clearLoadControlEventsRequestWithParams:nil completion:completion];
 }
-- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterResumeParams
+        params = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Resume::Type;
+    using RequestType = DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeLoadControlProgramsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45139,11 +50416,11 @@ - (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLoadControlProgramsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45153,9 +50430,9 @@ - (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeLoadControlProgramsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::PhaseList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45164,9 +50441,9 @@ + (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNumberOfLoadControlProgramsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45175,11 +50452,83 @@ - (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeNumberOfLoadControlProgramsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeNumberOfLoadControlProgramsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeEventsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::Events::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeEventsWithParams:(MTRSubscribeParams * _Nonnull)params
+                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::Events::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeEventsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::Events::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeActiveEventsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::ActiveEvents::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeActiveEventsWithParams:(MTRSubscribeParams * _Nonnull)params
                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::ActiveEvents::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45189,9 +50538,9 @@ - (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeActiveEventsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::CurrentPhase::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::ActiveEvents::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45200,9 +50549,9 @@ + (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheCont
                                      completion:completion];
 }
 
-- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNumberOfEventsPerProgramWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45211,11 +50560,11 @@ - (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable
                                         completion:completion];
 }
 
-- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfEventsPerProgramWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45225,9 +50574,9 @@ - (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNumberOfEventsPerProgramWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::CountdownTime::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45236,9 +50585,9 @@ + (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheCon
                                      completion:completion];
 }
 
-- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNumberOfTransitionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45247,11 +50596,11 @@ - (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfTransitionsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45261,9 +50610,9 @@ - (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNumberOfTransitionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalStateList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45272,9 +50621,9 @@ + (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeDefaultRandomStartWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45283,11 +50632,39 @@ - (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    [self writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeDefaultRandomStartWithParams:(MTRSubscribeParams * _Nonnull)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45297,9 +50674,9 @@ - (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeDefaultRandomStartWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalState::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45308,9 +50685,9 @@ + (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeDefaultRandomDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45319,11 +50696,39 @@ - (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTROperationalStat
                                         completion:completion];
 }
 
-- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
+    [self writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeDefaultRandomDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45333,9 +50738,9 @@ - (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeDefaultRandomDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::OperationalError::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45346,7 +50751,7 @@ + (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCache
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45359,7 +50764,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45371,7 +50776,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45382,7 +50787,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45395,7 +50800,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45407,7 +50812,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45418,7 +50823,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45431,7 +50836,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45443,7 +50848,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45454,7 +50859,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45467,7 +50872,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45479,7 +50884,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45490,7 +50895,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45503,7 +50908,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45515,7 +50920,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45526,7 +50931,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45539,7 +50944,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45551,7 +50956,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = OperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = DemandResponseLoadControl::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45562,352 +50967,213 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterRVCOperationalState
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRBaseClusterEnergyEVSE
 
-- (void)pauseWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)disableWithCompletion:(MTRStatusCompletion)completion
 {
-    [self pauseWithParams:nil completion:completion];
+    [self disableWithParams:nil completion:completion];
 }
-- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)disableWithParams:(MTREnergyEVSEClusterDisableParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterPauseParams
+        params = [[MTREnergyEVSEClusterDisableParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Pause::Type;
+    using RequestType = EnergyEvse::Commands::Disable::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)stopWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self stopWithParams:nil completion:completion];
-}
-- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)enableChargingWithParams:(MTREnergyEVSEClusterEnableChargingParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStopParams
+        params = [[MTREnergyEVSEClusterEnableChargingParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Stop::Type;
+    using RequestType = EnergyEvse::Commands::EnableCharging::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)startWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self startWithParams:nil completion:completion];
-}
-- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)enableDischargingWithParams:(MTREnergyEVSEClusterEnableDischargingParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStartParams
+        params = [[MTREnergyEVSEClusterEnableDischargingParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Start::Type;
+    using RequestType = EnergyEvse::Commands::EnableDischarging::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-- (void)resumeWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)startDiagnosticsWithCompletion:(MTRStatusCompletion)completion
 {
-    [self resumeWithParams:nil completion:completion];
+    [self startDiagnosticsWithParams:nil completion:completion];
 }
-- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)startDiagnosticsWithParams:(MTREnergyEVSEClusterStartDiagnosticsParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterResumeParams
+        params = [[MTREnergyEVSEClusterStartDiagnosticsParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Resume::Type;
+    using RequestType = EnergyEvse::Commands::StartDiagnostics::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
-
-- (void)readAttributePhaseListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributePhaseListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributePhaseListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::PhaseList::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeCurrentPhaseWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeCurrentPhaseWithParams:(MTRSubscribeParams * _Nonnull)params
-                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeCurrentPhaseWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::CurrentPhase::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeCountdownTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
-
-- (void)subscribeAttributeCountdownTimeWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeCountdownTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::CountdownTime::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
-
-- (void)readAttributeOperationalStateListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)setTargetsWithParams:(MTREnergyEVSEClusterSetTargetsParams *)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
-                                             queue:self.callbackQueue
-                                        completion:completion];
-}
+    if (params == nil) {
+        params = [[MTREnergyEVSEClusterSetTargetsParams
+            alloc] init];
+    }
 
-- (void)subscribeAttributeOperationalStateListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-+ (void)readAttributeOperationalStateListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::OperationalStateList::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-- (void)readAttributeOperationalStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
+    using RequestType = EnergyEvse::Commands::SetTargets::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
                                              queue:self.callbackQueue
-                                        completion:completion];
+                                        completion:responseHandler];
 }
-
-- (void)subscribeAttributeOperationalStateWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)getTargetsWithParams:(MTREnergyEVSEClusterGetTargetsParams *)params completion:(void (^)(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
-}
+    if (params == nil) {
+        params = [[MTREnergyEVSEClusterGetTargetsParams
+            alloc] init];
+    }
 
-+ (void)readAttributeOperationalStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::OperationalState::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
 
-- (void)readAttributeOperationalErrorWithCompletion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
-    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
-                                         clusterID:@(TypeInfo::GetClusterId())
-                                       attributeID:@(TypeInfo::GetAttributeId())
-                                            params:nil
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
+
+    using RequestType = EnergyEvse::Commands::GetTargets::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTREnergyEVSEClusterGetTargetsResponseParams.class
                                              queue:self.callbackQueue
-                                        completion:completion];
+                                        completion:responseHandler];
 }
-
-- (void)subscribeAttributeOperationalErrorWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)clearTargetsWithCompletion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
-    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
-                                                clusterID:@(TypeInfo::GetClusterId())
-                                              attributeID:@(TypeInfo::GetAttributeId())
-                                                   params:params
-                                                    queue:self.callbackQueue
-                                            reportHandler:reportHandler
-                                  subscriptionEstablished:subscriptionEstablished];
+    [self clearTargetsWithParams:nil completion:completion];
 }
-
-+ (void)readAttributeOperationalErrorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error))completion
+- (void)clearTargetsWithParams:(MTREnergyEVSEClusterClearTargetsParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::OperationalError::TypeInfo;
-    [clusterStateCacheContainer
-        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
-                                      clusterID:TypeInfo::GetClusterId()
-                                    attributeID:TypeInfo::GetAttributeId()
-                                          queue:queue
-                                     completion:completion];
+    if (params == nil) {
+        params = [[MTREnergyEVSEClusterClearTargetsParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
+
+    using RequestType = EnergyEvse::Commands::ClearTargets::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::State::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45916,11 +51182,11 @@ - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::State::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45930,9 +51196,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::State::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45941,9 +51207,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSupplyStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SupplyState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45952,11 +51218,11 @@ - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupplyStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SupplyState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -45966,9 +51232,9 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSupplyStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SupplyState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -45977,9 +51243,9 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeFaultStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FaultState::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -45988,11 +51254,11 @@ - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFaultStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FaultState::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46002,9 +51268,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeFaultStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FaultState::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46013,9 +51279,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeChargingEnabledUntilWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ChargingEnabledUntil::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46024,11 +51290,11 @@ - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChargingEnabledUntilWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ChargingEnabledUntil::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46038,9 +51304,9 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeChargingEnabledUntilWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ChargingEnabledUntil::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46049,9 +51315,9 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
                                      completion:completion];
 }
 
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeDischargingEnabledUntilWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::DischargingEnabledUntil::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46060,11 +51326,11 @@ - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDischargingEnabledUntilWithParams:(MTRSubscribeParams * _Nonnull)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::DischargingEnabledUntil::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46074,9 +51340,9 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeDischargingEnabledUntilWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::DischargingEnabledUntil::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46085,9 +51351,9 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeCircuitCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::CircuitCapacity::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46096,11 +51362,11 @@ - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeCircuitCapacityWithParams:(MTRSubscribeParams * _Nonnull)params
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::CircuitCapacity::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46110,9 +51376,9 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeCircuitCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = RvcOperationalState::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::CircuitCapacity::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46121,54 +51387,9 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterHEPAFilterMonitoring
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
-{
-    [self resetConditionWithParams:nil completion:completion];
-}
-- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    if (params == nil) {
-        params = [[MTRHEPAFilterMonitoringClusterResetConditionParams
-            alloc] init];
-    }
-
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
-
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
-    using RequestType = HepaFilterMonitoring::Commands::ResetCondition::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
-}
-
-- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeMinimumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MinimumChargeCurrent::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46177,11 +51398,11 @@ - (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable valu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinimumChargeCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MinimumChargeCurrent::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46191,9 +51412,9 @@ - (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeMinimumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MinimumChargeCurrent::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46202,9 +51423,9 @@ + (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeMaximumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumChargeCurrent::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46213,11 +51434,11 @@ - (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeMaximumChargeCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumChargeCurrent::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46227,9 +51448,9 @@ - (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeMaximumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumChargeCurrent::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46238,9 +51459,9 @@ + (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeMaximumDischargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumDischargeCurrent::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46249,11 +51470,11 @@ - (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaximumDischargeCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumDischargeCurrent::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46263,9 +51484,9 @@ - (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeMaximumDischargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::MaximumDischargeCurrent::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46274,9 +51495,9 @@ + (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeUserMaximumChargeCurrentWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::UserMaximumChargeCurrent::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46285,11 +51506,39 @@ - (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    [self writeAttributeUserMaximumChargeCurrentWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = EnergyEvse::Attributes::UserMaximumChargeCurrent::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.longLongValue;
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeUserMaximumChargeCurrentWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = EnergyEvse::Attributes::UserMaximumChargeCurrent::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46299,9 +51548,9 @@ - (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeUserMaximumChargeCurrentWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::UserMaximumChargeCurrent::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46310,9 +51559,9 @@ + (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeRandomizationDelayWindowWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::RandomizationDelayWindow::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46321,11 +51570,11 @@ - (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
 {
-    [self writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+    [self writeAttributeRandomizationDelayWindowWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
 }
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
@@ -46340,25 +51589,20 @@ - (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value param
         }
 
         ListFreer listFreer;
-        using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+        using TypeInfo = EnergyEvse::Attributes::RandomizationDelayWindow::TypeInfo;
         TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedIntValue;
-  }
+                cppValue = value.unsignedIntValue;
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRandomizationDelayWindowWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::RandomizationDelayWindow::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46368,9 +51612,9 @@ - (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeRandomizationDelayWindowWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::RandomizationDelayWindow::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46379,9 +51623,9 @@ + (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNumberOfWeeklyTargetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfWeeklyTargets::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46390,11 +51634,11 @@ - (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _N
                                         completion:completion];
 }
 
-- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfWeeklyTargetsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                            reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfWeeklyTargets::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46404,9 +51648,9 @@ - (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNumberOfWeeklyTargetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfWeeklyTargets::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46415,9 +51659,9 @@ + (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStat
                                      completion:completion];
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNumberOfDailyTargetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfDailyTargets::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46426,11 +51670,11 @@ - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nul
                                         completion:completion];
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeNumberOfDailyTargetsWithParams:(MTRSubscribeParams * _Nonnull)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfDailyTargets::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46440,9 +51684,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNumberOfDailyTargetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NumberOfDailyTargets::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46451,9 +51695,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNextChargeStartTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeStartTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46462,11 +51706,11 @@ - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeNextChargeStartTimeWithParams:(MTRSubscribeParams * _Nonnull)params
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeStartTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46476,9 +51720,9 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNextChargeStartTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeStartTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46487,9 +51731,9 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
                                      completion:completion];
 }
 
-- (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNextChargeTargetTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46498,11 +51742,11 @@ - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value
                                         completion:completion];
 }
 
-- (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNextChargeTargetTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetTime::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46512,9 +51756,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNextChargeTargetTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetTime::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46523,9 +51767,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNextChargeRequiredEnergyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeRequiredEnergy::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46534,11 +51778,11 @@ - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable v
                                         completion:completion];
 }
 
-- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
-                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNextChargeRequiredEnergyWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeRequiredEnergy::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46548,9 +51792,9 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNextChargeRequiredEnergyWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeRequiredEnergy::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46559,9 +51803,9 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
                                      completion:completion];
 }
 
-- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeNextChargeTargetSoCWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetSoC::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46570,11 +51814,11 @@ - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable val
                                         completion:completion];
 }
 
-- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params
-                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNextChargeTargetSoCWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetSoC::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46584,9 +51828,9 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeNextChargeTargetSoCWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::NextChargeTargetSoC::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46595,9 +51839,9 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
-- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeApproximateEVEfficiencyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ApproximateEVEfficiency::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46606,11 +51850,44 @@ - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    [self writeAttributeApproximateEVEfficiencyWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = EnergyEvse::Attributes::ApproximateEVEfficiency::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeApproximateEVEfficiencyWithParams:(MTRSubscribeParams * _Nonnull)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = EnergyEvse::Attributes::ApproximateEVEfficiency::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46620,9 +51897,9 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeApproximateEVEfficiencyWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = HepaFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ApproximateEVEfficiency::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46631,54 +51908,45 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-@end
-
-@implementation MTRBaseClusterActivatedCarbonFilterMonitoring
-
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)readAttributeStateOfChargeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
+    using TypeInfo = EnergyEvse::Attributes::StateOfCharge::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
 }
 
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+- (void)subscribeAttributeStateOfChargeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self resetConditionWithParams:nil completion:completion];
+    using TypeInfo = EnergyEvse::Attributes::StateOfCharge::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    if (params == nil) {
-        params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
-            alloc] init];
-    }
 
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
-
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
-    using RequestType = ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
++ (void)readAttributeStateOfChargeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = EnergyEvse::Attributes::StateOfCharge::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
 }
 
-- (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeBatteryCapacityWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::BatteryCapacity::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46687,11 +51955,11 @@ - (void)readAttributeConditionWithCompletion:(void (^)(NSNumber * _Nullable valu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)params
-                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryCapacityWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::BatteryCapacity::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46701,9 +51969,9 @@ - (void)subscribeAttributeConditionWithParams:(MTRSubscribeParams * _Nonnull)par
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeBatteryCapacityWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::Condition::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::BatteryCapacity::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46712,9 +51980,9 @@ + (void)readAttributeConditionWithClusterStateCache:(MTRClusterStateCacheContain
                                      completion:completion];
 }
 
-- (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeVehicleIDWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::VehicleID::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46723,11 +51991,11 @@ - (void)readAttributeDegradationDirectionWithCompletion:(void (^)(NSNumber * _Nu
                                         completion:completion];
 }
 
-- (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _Nonnull)params
-                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeVehicleIDWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::VehicleID::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46737,9 +52005,9 @@ - (void)subscribeAttributeDegradationDirectionWithParams:(MTRSubscribeParams * _
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeVehicleIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::VehicleID::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46748,9 +52016,9 @@ + (void)readAttributeDegradationDirectionWithClusterStateCache:(MTRClusterStateC
                                      completion:completion];
 }
 
-- (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSessionIDWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionID::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46759,11 +52027,11 @@ - (void)readAttributeChangeIndicationWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSessionIDWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionID::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46773,9 +52041,9 @@ - (void)subscribeAttributeChangeIndicationWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSessionIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionID::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46784,9 +52052,9 @@ + (void)readAttributeChangeIndicationWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSessionDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46795,11 +52063,11 @@ - (void)readAttributeInPlaceIndicatorWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonnull)params
-                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSessionDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46809,9 +52077,9 @@ - (void)subscribeAttributeInPlaceIndicatorWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSessionDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46820,9 +52088,9 @@ + (void)readAttributeInPlaceIndicatorWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSessionEnergyChargedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyCharged::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46831,44 +52099,11 @@ - (void)readAttributeLastChangedTimeWithCompletion:(void (^)(NSNumber * _Nullabl
                                         completion:completion];
 }
 
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
-{
-    [self writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
-}
-- (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
-    // Make a copy of params before we go async.
-    params = [params copy];
-    value = [value copy];
-
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-        chip::Optional<uint16_t> timedWriteTimeout;
-        if (params != nil) {
-          if (params.timedWriteTimeout != nil){
-            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-          }
-        }
-
-        ListFreer listFreer;
-        using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
-        TypeInfo::Type cppValue;
-          if (value == nil) {
-            cppValue.SetNull();
-          } else {
-            auto & nonNullValue_0 = cppValue.SetNonNull();
-                    nonNullValue_0 = value.unsignedIntValue;
-  }
-
-        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
-    std::move(*bridge).DispatchAction(self.device);
-}
-
-- (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnull)params
-                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSessionEnergyChargedWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyCharged::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46878,9 +52113,9 @@ - (void)subscribeAttributeLastChangedTimeWithParams:(MTRSubscribeParams * _Nonnu
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSessionEnergyChargedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyCharged::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46889,9 +52124,9 @@ + (void)readAttributeLastChangedTimeWithClusterStateCache:(MTRClusterStateCacheC
                                      completion:completion];
 }
 
-- (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeSessionEnergyDischargedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyDischarged::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46900,11 +52135,11 @@ - (void)readAttributeReplacementProductListWithCompletion:(void (^)(NSArray * _N
                                         completion:completion];
 }
 
-- (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams * _Nonnull)params
-                                   subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                             reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSessionEnergyDischargedWithParams:(MTRSubscribeParams * _Nonnull)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyDischarged::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46914,9 +52149,9 @@ - (void)subscribeAttributeReplacementProductListWithParams:(MTRSubscribeParams *
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeSessionEnergyDischargedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::SessionEnergyDischarged::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46927,7 +52162,7 @@ + (void)readAttributeReplacementProductListWithClusterStateCache:(MTRClusterStat
 
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46940,7 +52175,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                            reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::GeneratedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46952,7 +52187,7 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _
 
 + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46963,7 +52198,7 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC
 
 - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -46976,7 +52211,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                           reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AcceptedCommandList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -46988,7 +52223,7 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N
 
 + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AcceptedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -46999,7 +52234,7 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa
 
 - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::EventList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -47012,7 +52247,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                 reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::EventList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -47024,7 +52259,7 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par
 
 + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::EventList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::EventList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -47035,7 +52270,7 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain
 
 - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AttributeList::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -47048,7 +52283,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
                           subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AttributeList::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -47060,7 +52295,7 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull
 
 + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::AttributeList::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::AttributeList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -47071,7 +52306,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon
 
 - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FeatureMap::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -47084,7 +52319,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FeatureMap::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -47096,7 +52331,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa
 
 + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::FeatureMap::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -47107,7 +52342,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai
 
 - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ClusterRevision::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -47120,7 +52355,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ClusterRevision::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -47132,7 +52367,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu
 
 + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::TypeInfo;
+    using TypeInfo = EnergyEvse::Attributes::ClusterRevision::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -47145,18 +52380,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterDoorLock
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -51357,18 +56580,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterWindowCovering
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)upOrOpenWithCompletion:(MTRStatusCompletion)completion
 {
     [self upOrOpenWithParams:nil completion:completion];
@@ -53602,18 +58813,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBarrierControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierControlGoToPercentParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -55014,18 +60213,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterPumpConfigurationAndControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMaxPressureWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
@@ -57219,18 +62406,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterThermostat
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -62232,18 +67407,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterFanControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)stepWithParams:(MTRFanControlClusterStepParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -63746,18 +68909,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterThermostatUserInterfaceConfiguration
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeTemperatureDisplayModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
@@ -63790,7 +68941,7 @@ - (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
         ListFreer listFreer;
         using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
         TypeInfo::Type cppValue;
-                cppValue = value.unsignedCharValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
@@ -63854,7 +69005,7 @@ - (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value params:(
         ListFreer listFreer;
         using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
         TypeInfo::Type cppValue;
-                cppValue = value.unsignedCharValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
@@ -63918,7 +69069,7 @@ - (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnul
         ListFreer listFreer;
         using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
         TypeInfo::Type cppValue;
-                cppValue = value.unsignedCharValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
@@ -64485,18 +69636,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterColorControl
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -69636,18 +74775,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterBallastConfiguration
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributePhysicalMinLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = BallastConfiguration::Attributes::PhysicalMinLevel::TypeInfo;
@@ -71433,18 +76560,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterIlluminanceMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -72206,18 +77321,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterTemperatureMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -72908,18 +78011,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterPressureMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -73965,18 +79056,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterFlowMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -74667,18 +79746,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterRelativeHumidityMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -75369,18 +80436,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterOccupancySensing
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeOccupancyWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
@@ -76963,18 +82018,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterCarbonMonoxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = CarbonMonoxideConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -77591,18 +82634,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterCarbonDioxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = CarbonDioxideConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -78219,18 +83250,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterNitrogenDioxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = NitrogenDioxideConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -78847,18 +83866,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterOzoneConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = OzoneConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -79475,18 +84482,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterPM25ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Pm25ConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -80103,18 +85098,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterFormaldehydeConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = FormaldehydeConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -80731,18 +85714,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterPM1ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Pm1ConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -81359,18 +86330,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterPM10ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = Pm10ConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -81987,18 +86946,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterTotalVolatileOrganicCompoundsConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = TotalVolatileOrganicCompoundsConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -82615,18 +87562,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterRadonConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMeasuredValueWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = RadonConcentrationMeasurement::Attributes::MeasuredValue::TypeInfo;
@@ -83243,18 +88178,6 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @implementation MTRBaseClusterWakeOnLAN
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeMACAddressWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
@@ -83291,6 +88214,42 @@ + (void)readAttributeMACAddressWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
+- (void)readAttributeLinkLocalAddressWithCompletion:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = WakeOnLan::Attributes::LinkLocalAddress::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeLinkLocalAddressWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = WakeOnLan::Attributes::LinkLocalAddress::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeLinkLocalAddressWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = WakeOnLan::Attributes::LinkLocalAddress::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
@@ -83735,18 +88694,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterChannel
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params completion:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -84458,18 +89405,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterTargetNavigator
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params completion:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -85052,18 +89987,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterMediaPlayback
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)playWithCompletion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     [self playWithParams:nil completion:completion];
@@ -86385,18 +91308,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterMediaInput
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -87079,18 +91990,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterLowPower
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)sleepWithCompletion:(MTRStatusCompletion)completion
 {
     [self sleepWithParams:nil completion:completion];
@@ -87536,18 +92435,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterKeypadInput
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params completion:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -87988,18 +92875,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterContentLauncher
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -88117,7 +92992,7 @@ - (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)
         ListFreer listFreer;
         using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
         TypeInfo::Type cppValue;
-                cppValue = value.unsignedIntValue;
+                cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedIntValue);
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
@@ -88650,18 +93525,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterAudioOutput
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -89270,18 +94133,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterApplicationLauncher
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -89974,18 +94825,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterApplicationBasic
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)readAttributeVendorNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
@@ -90960,18 +95799,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterAccountLogin
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params completion:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -91487,18 +96314,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterElectricalMeasurement
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)getProfileInfoCommandWithCompletion:(MTRStatusCompletion)completion
 {
     [self getProfileInfoCommandWithParams:nil completion:completion];
@@ -101349,18 +106164,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterUnitTesting
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)testWithCompletion:(MTRStatusCompletion)completion
 {
     [self testWithParams:nil completion:completion];
@@ -111797,18 +116600,6 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
 
 @implementation MTRBaseClusterSampleMEI
 
-- (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)pingWithCompletion:(MTRStatusCompletion)completion
 {
     [self pingWithParams:nil completion:completion];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h
index 29f0d7e466b672..7528fbc95fdfd0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h
@@ -20,378 +20,5 @@
 #import "MTRBaseClusters.h"
 #import "MTRBaseDevice.h"
 
-@interface MTRBaseClusterIdentify ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterGroups ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterScenes ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOnOff ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOnOffSwitchConfiguration ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterLevelControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBinaryInputBasic ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPulseWidthModulation ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterDescriptor ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBinding ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterAccessControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterActions ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBasicInformation ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOTASoftwareUpdateProvider ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOTASoftwareUpdateRequestor ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterLocalizationConfiguration ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTimeFormatLocalization ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterUnitLocalization ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPowerSourceConfiguration ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPowerSource ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterGeneralCommissioning ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterNetworkCommissioning ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterDiagnosticLogs ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterGeneralDiagnostics ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterSoftwareDiagnostics ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterThreadNetworkDiagnostics ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterWiFiNetworkDiagnostics ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterEthernetNetworkDiagnostics ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTimeSynchronization ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBridgedDeviceBasicInformation ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterSwitch ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterAdministratorCommissioning ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOperationalCredentials ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterGroupKeyManagement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterFixedLabel ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterUserLabel ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBooleanState ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterICDManagement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterModeSelect ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterLaundryWasherMode ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterLaundryWasherControls ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRVCRunMode ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRVCCleanMode ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTemperatureControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRefrigeratorAlarm ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterDishwasherMode ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterAirQuality ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterSmokeCOAlarm ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterDishwasherAlarm ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOperationalState ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRVCOperationalState ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterHEPAFilterMonitoring ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterActivatedCarbonFilterMonitoring ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterDoorLock ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterWindowCovering ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBarrierControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPumpConfigurationAndControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterThermostat ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterFanControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterThermostatUserInterfaceConfiguration ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterColorControl ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterBallastConfiguration ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterIlluminanceMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTemperatureMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPressureMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterFlowMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRelativeHumidityMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOccupancySensing ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterCarbonMonoxideConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterCarbonDioxideConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterNitrogenDioxideConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterOzoneConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPM25ConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterFormaldehydeConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPM1ConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterPM10ConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTotalVolatileOrganicCompoundsConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterRadonConcentrationMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterWakeOnLAN ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterChannel ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterTargetNavigator ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterMediaPlayback ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterMediaInput ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterLowPower ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterKeypadInput ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterContentLauncher ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterAudioOutput ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterApplicationLauncher ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterApplicationBasic ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterAccountLogin ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterElectricalMeasurement ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterUnitTesting ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
-
-@interface MTRBaseClusterSampleMEI ()
-@property (nonatomic, strong, readonly) MTRBaseDevice * device;
-@end
+// Nothing here for now, but leaving this file in place in case we need to add
+// something.
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index c42739771e0925..4d211586fd4602 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -126,6 +126,10 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) {
     MTRClusterIDTypeUserLabelID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000041,
     MTRClusterIDTypeBooleanStateID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000045,
     MTRClusterIDTypeICDManagementID MTR_PROVISIONALLY_AVAILABLE = 0x00000046,
+    MTRClusterIDTypeTimerID MTR_PROVISIONALLY_AVAILABLE = 0x00000047,
+    MTRClusterIDTypeOvenCavityOperationalStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000048,
+    MTRClusterIDTypeOvenModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000049,
+    MTRClusterIDTypeLaundryDryerControlsID MTR_PROVISIONALLY_AVAILABLE = 0x0000004A,
     MTRClusterIDTypeModeSelectID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000050,
     MTRClusterIDTypeLaundryWasherModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000051,
     MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000052,
@@ -138,10 +142,16 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) {
     MTRClusterIDTypeAirQualityID MTR_PROVISIONALLY_AVAILABLE = 0x0000005B,
     MTRClusterIDTypeSmokeCOAlarmID MTR_PROVISIONALLY_AVAILABLE = 0x0000005C,
     MTRClusterIDTypeDishwasherAlarmID MTR_PROVISIONALLY_AVAILABLE = 0x0000005D,
+    MTRClusterIDTypeMicrowaveOvenModeID MTR_PROVISIONALLY_AVAILABLE = 0x0000005E,
+    MTRClusterIDTypeMicrowaveOvenControlID MTR_PROVISIONALLY_AVAILABLE = 0x0000005F,
     MTRClusterIDTypeOperationalStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000060,
     MTRClusterIDTypeRVCOperationalStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000061,
     MTRClusterIDTypeHEPAFilterMonitoringID MTR_PROVISIONALLY_AVAILABLE = 0x00000071,
     MTRClusterIDTypeActivatedCarbonFilterMonitoringID MTR_PROVISIONALLY_AVAILABLE = 0x00000072,
+    MTRClusterIDTypeBooleanSensorConfigurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000080,
+    MTRClusterIDTypeValveConfigurationAndControlID MTR_PROVISIONALLY_AVAILABLE = 0x00000081,
+    MTRClusterIDTypeDemandResponseLoadControlID MTR_PROVISIONALLY_AVAILABLE = 0x00000096,
+    MTRClusterIDTypeEnergyEVSEID MTR_PROVISIONALLY_AVAILABLE = 0x00000099,
     MTRClusterIDTypeDoorLockID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000101,
     MTRClusterIDTypeWindowCoveringID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000102,
     MTRClusterIDTypeBarrierControlID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000103,
@@ -317,7 +327,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterScenesAttributeNameSupportID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000004,
     MTRAttributeIDTypeClusterScenesAttributeLastConfiguredByID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000005,
     MTRAttributeIDTypeClusterScenesAttributeSceneTableSizeID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
-    MTRAttributeIDTypeClusterScenesAttributeRemainingCapacityID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterScenesAttributeFabricSceneInfoID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
     MTRAttributeIDTypeClusterScenesAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterScenesAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterScenesAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -825,6 +835,8 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterBasicInformationAttributeUniqueIDID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000012,
     MTRAttributeIDTypeClusterBasicInformationAttributeCapabilityMinimaID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000013,
     MTRAttributeIDTypeClusterBasicInformationAttributeProductAppearanceID MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x00000014,
+    MTRAttributeIDTypeClusterBasicInformationAttributeSpecificationVersionID MTR_PROVISIONALLY_AVAILABLE = 0x00000015,
+    MTRAttributeIDTypeClusterBasicInformationAttributeMaxPathsPerInvokeID MTR_PROVISIONALLY_AVAILABLE = 0x00000016,
     MTRAttributeIDTypeClusterBasicInformationAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterBasicInformationAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterBasicInformationAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -1360,7 +1372,6 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveRadioFaultsID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000006,
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveNetworkFaultsID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000007,
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeTestEventTriggersEnabledID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000008,
-    MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeAverageWearCountID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -2249,6 +2260,53 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterICDManagementAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
     MTRAttributeIDTypeClusterICDManagementAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
 
+    // Cluster Timer attributes
+    MTRAttributeIDTypeClusterTimerAttributeSetTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterTimerAttributeTimeRemainingID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterTimerAttributeTimerStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterTimerAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterTimerAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterTimerAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterTimerAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterTimerAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterTimerAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster OvenCavityOperationalState attributes
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributePhaseListID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeCurrentPhaseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeCountdownTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalStateListID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalErrorID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster OvenMode attributes
+    MTRAttributeIDTypeClusterOvenModeAttributeSupportedModesID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterOvenModeAttributeCurrentModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterOvenModeAttributeStartUpModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterOvenModeAttributeOnModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterOvenModeAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterOvenModeAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterOvenModeAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterOvenModeAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterOvenModeAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterOvenModeAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster LaundryDryerControls attributes
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeSupportedDrynessLevelsID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeSelectedDrynessLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterLaundryDryerControlsAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
     // Cluster ModeSelect deprecated attribute names
     MTRClusterModeSelectAttributeDescriptionID
         MTR_DEPRECATED("Please use MTRAttributeIDTypeClusterModeSelectAttributeDescriptionID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
@@ -2435,6 +2493,29 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterDishwasherAlarmAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
     MTRAttributeIDTypeClusterDishwasherAlarmAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
 
+    // Cluster MicrowaveOvenMode attributes
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeSupportedModesID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeCurrentModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster MicrowaveOvenControl attributes
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeCookTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributePowerSettingID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeMinPowerID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeMaxPowerID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributePowerStepID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
     // Cluster OperationalState attributes
     MTRAttributeIDTypeClusterOperationalStateAttributePhaseListID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTRAttributeIDTypeClusterOperationalStateAttributeCurrentPhaseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
@@ -2491,6 +2572,85 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
     MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
 
+    // Cluster BooleanSensorConfiguration attributes
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeSensitivityLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsActiveID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsSuppressedID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster ValveConfigurationAndControl attributes
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAutoCloseTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeRemainingDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeCurrentStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeTargetStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeStartUpStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeCurrentLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeTargetLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeValveFaultID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster DemandResponseLoadControl attributes
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransitionsID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
+    // Cluster EnergyEVSE attributes
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeSupplyStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeFaultStateID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeChargingEnabledUntilID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeDischargingEnabledUntilID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeCircuitCapacityID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeMinimumChargeCurrentID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeMaximumChargeCurrentID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeMaximumDischargeCurrentID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeUserMaximumChargeCurrentID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeRandomizationDelayWindowID MTR_PROVISIONALLY_AVAILABLE = 0x0000000A,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNumberOfWeeklyTargetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000021,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNumberOfDailyTargetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000022,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeStartTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000023,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeTargetTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000024,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeRequiredEnergyID MTR_PROVISIONALLY_AVAILABLE = 0x00000025,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeTargetSoCID MTR_PROVISIONALLY_AVAILABLE = 0x00000026,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeApproximateEVEfficiencyID MTR_PROVISIONALLY_AVAILABLE = 0x00000027,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeStateOfChargeID MTR_PROVISIONALLY_AVAILABLE = 0x00000030,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeBatteryCapacityID MTR_PROVISIONALLY_AVAILABLE = 0x00000031,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeVehicleIDID MTR_PROVISIONALLY_AVAILABLE = 0x00000032,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionIDID MTR_PROVISIONALLY_AVAILABLE = 0x00000040,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000041,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionEnergyChargedID MTR_PROVISIONALLY_AVAILABLE = 0x00000042,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionEnergyDischargedID MTR_PROVISIONALLY_AVAILABLE = 0x00000043,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID,
+    MTRAttributeIDTypeClusterEnergyEVSEAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
+
     // Cluster DoorLock deprecated attribute names
     MTRClusterDoorLockAttributeLockStateID
         MTR_DEPRECATED("Please use MTRAttributeIDTypeClusterDoorLockAttributeLockStateID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
@@ -4111,6 +4271,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
 
     // Cluster WakeOnLAN attributes
     MTRAttributeIDTypeClusterWakeOnLANAttributeMACAddressID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000,
+    MTRAttributeIDTypeClusterWakeOnLANAttributeLinkLocalAddressID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
     MTRAttributeIDTypeClusterWakeOnLANAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterWakeOnLANAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterWakeOnLANAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -5772,6 +5933,8 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
     MTRCommandIDTypeClusterNetworkCommissioningCommandConnectNetworkID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000006,
     MTRCommandIDTypeClusterNetworkCommissioningCommandConnectNetworkResponseID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000007,
     MTRCommandIDTypeClusterNetworkCommissioningCommandReorderNetworkID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000008,
+    MTRCommandIDTypeClusterNetworkCommissioningCommandQueryIdentityID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRCommandIDTypeClusterNetworkCommissioningCommandQueryIdentityResponseID MTR_PROVISIONALLY_AVAILABLE = 0x0000000A,
 
     // Cluster DiagnosticLogs deprecated command id names
     MTRClusterDiagnosticLogsCommandRetrieveLogsRequestID
@@ -5792,6 +5955,8 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
 
     // Cluster GeneralDiagnostics commands
     MTRCommandIDTypeClusterGeneralDiagnosticsCommandTestEventTriggerID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000,
+    MTRCommandIDTypeClusterGeneralDiagnosticsCommandTimeSnapshotID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterGeneralDiagnosticsCommandTimeSnapshotResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
 
     // Cluster SoftwareDiagnostics deprecated command id names
     MTRClusterSoftwareDiagnosticsCommandResetWatermarksID
@@ -5940,6 +6105,24 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
     MTRCommandIDTypeClusterICDManagementCommandRegisterClientResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
     MTRCommandIDTypeClusterICDManagementCommandUnregisterClientID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRCommandIDTypeClusterICDManagementCommandStayActiveRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRCommandIDTypeClusterICDManagementCommandStayActiveResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+
+    // Cluster Timer commands
+    MTRCommandIDTypeClusterTimerCommandSetTimerID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterTimerCommandResetTimerID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterTimerCommandAddTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterTimerCommandReduceTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+
+    // Cluster OvenCavityOperationalState commands
+    MTRCommandIDTypeClusterOvenCavityOperationalStateCommandPauseID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterOvenCavityOperationalStateCommandStopID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterOvenCavityOperationalStateCommandStartID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterOvenCavityOperationalStateCommandResumeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRCommandIDTypeClusterOvenCavityOperationalStateCommandOperationalCommandResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+
+    // Cluster OvenMode commands
+    MTRCommandIDTypeClusterOvenModeCommandChangeToModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterOvenModeCommandChangeToModeResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
 
     // Cluster ModeSelect deprecated command id names
     MTRClusterModeSelectCommandChangeToModeID
@@ -5979,6 +6162,10 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
     MTRCommandIDTypeClusterDishwasherAlarmCommandResetID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTRCommandIDTypeClusterDishwasherAlarmCommandModifyEnabledAlarmsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
 
+    // Cluster MicrowaveOvenControl commands
+    MTRCommandIDTypeClusterMicrowaveOvenControlCommandSetCookingParametersID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterMicrowaveOvenControlCommandAddMoreTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+
     // Cluster OperationalState commands
     MTRCommandIDTypeClusterOperationalStateCommandPauseID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTRCommandIDTypeClusterOperationalStateCommandStopID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
@@ -5999,6 +6186,31 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
     // Cluster ActivatedCarbonFilterMonitoring commands
     MTRCommandIDTypeClusterActivatedCarbonFilterMonitoringCommandResetConditionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
 
+    // Cluster BooleanSensorConfiguration commands
+    MTRCommandIDTypeClusterBooleanSensorConfigurationCommandSuppressRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+
+    // Cluster ValveConfigurationAndControl commands
+    MTRCommandIDTypeClusterValveConfigurationAndControlCommandOpenID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterValveConfigurationAndControlCommandCloseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterValveConfigurationAndControlCommandSetLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+
+    // Cluster DemandResponseLoadControl commands
+    MTRCommandIDTypeClusterDemandResponseLoadControlCommandRegisterLoadControlProgramRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterDemandResponseLoadControlCommandUnregisterLoadControlProgramRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterDemandResponseLoadControlCommandAddLoadControlEventRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterDemandResponseLoadControlCommandRemoveLoadControlEventRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRCommandIDTypeClusterDemandResponseLoadControlCommandClearLoadControlEventsRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+
+    // Cluster EnergyEVSE commands
+    MTRCommandIDTypeClusterEnergyEVSECommandGetTargetsResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterEnergyEVSECommandDisableID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterEnergyEVSECommandEnableChargingID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterEnergyEVSECommandEnableDischargingID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRCommandIDTypeClusterEnergyEVSECommandStartDiagnosticsID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRCommandIDTypeClusterEnergyEVSECommandSetTargetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRCommandIDTypeClusterEnergyEVSECommandGetTargetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRCommandIDTypeClusterEnergyEVSECommandClearTargetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+
     // Cluster DoorLock deprecated command id names
     MTRClusterDoorLockCommandLockDoorID
         MTR_DEPRECATED("Please use MTRCommandIDTypeClusterDoorLockCommandLockDoorID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
@@ -6808,6 +7020,10 @@ typedef NS_ENUM(uint32_t, MTREventIDType) {
     // Cluster BooleanState events
     MTREventIDTypeClusterBooleanStateEventStateChangeID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000,
 
+    // Cluster OvenCavityOperationalState events
+    MTREventIDTypeClusterOvenCavityOperationalStateEventOperationalErrorID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterOvenCavityOperationalStateEventOperationCompletionID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+
     // Cluster RefrigeratorAlarm events
     MTREventIDTypeClusterRefrigeratorAlarmEventNotifyID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
 
@@ -6835,6 +7051,25 @@ typedef NS_ENUM(uint32_t, MTREventIDType) {
     MTREventIDTypeClusterRVCOperationalStateEventOperationalErrorID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTREventIDTypeClusterRVCOperationalStateEventOperationCompletionID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
 
+    // Cluster BooleanSensorConfiguration events
+    MTREventIDTypeClusterBooleanSensorConfigurationEventAlarmsStateChangedID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterBooleanSensorConfigurationEventSensorFaultID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+
+    // Cluster ValveConfigurationAndControl events
+    MTREventIDTypeClusterValveConfigurationAndControlEventValveStateChangedID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterValveConfigurationAndControlEventValveFaultID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+
+    // Cluster DemandResponseLoadControl events
+    MTREventIDTypeClusterDemandResponseLoadControlEventLoadControlEventStatusChangeID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+
+    // Cluster EnergyEVSE events
+    MTREventIDTypeClusterEnergyEVSEEventEVConnectedID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterEnergyEVSEEventEVNotDetectedID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTREventIDTypeClusterEnergyEVSEEventEnergyTransferStartedID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTREventIDTypeClusterEnergyEVSEEventEnergyTransferStoppedID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTREventIDTypeClusterEnergyEVSEEventFaultID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTREventIDTypeClusterEnergyEVSEEventRFIDID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+
     // Cluster DoorLock deprecated event names
     MTRClusterDoorLockEventDoorLockAlarmID
         MTR_DEPRECATED("Please use MTREventIDTypeClusterDoorLockEventDoorLockAlarmID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index bbc0a86180ec83..709973eabfc567 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -28,20 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  *    Attributes and commands for putting a device into Identification mode (e.g. flashing a light).
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterIdentify : MTRCluster
-
-/**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
- */
-- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
-                              endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-/**
- * The device this cluster object is associated with.
- */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+@interface MTRClusterIdentify : MTRGenericCluster
 
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -69,12 +56,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Groups
- *    Attributes and commands for group configuration and manipulation.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterGroups : MTRCluster
+@interface MTRClusterIdentify (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -82,12 +64,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Groups
+ *    Attributes and commands for group configuration and manipulation.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterGroups : MTRGenericCluster
 
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -117,12 +103,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Scenes
- *    Attributes and commands for scene configuration and manipulation.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterScenes : MTRCluster
+@interface MTRClusterGroups (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -130,12 +111,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Scenes
+ *    Attributes and commands for scene configuration and manipulation.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterScenes : MTRGenericCluster
 
 - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -162,7 +147,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSceneTableSizeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeRemainingCapacityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFabricSceneInfoWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -181,12 +166,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster On/Off
- *    Attributes and commands for switching devices between 'On' and 'Off' states.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterOnOff : MTRCluster
+@interface MTRClusterScenes (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -194,12 +174,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster On/Off
+ *    Attributes and commands for switching devices between 'On' and 'Off' states.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterOnOff : MTRGenericCluster
 
 - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)offWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -249,25 +233,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster On/off Switch Configuration
- *    Attributes and commands for configuring On/Off switching devices.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterOnOffSwitchConfiguration : MTRCluster
+@interface MTRClusterOnOff (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster On/off Switch Configuration
+ *    Attributes and commands for configuring On/Off switching devices.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterOnOffSwitchConfiguration : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSwitchTypeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -292,25 +275,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Level Control
- *    Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.'
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterLevelControl : MTRCluster
+@interface MTRClusterOnOffSwitchConfiguration (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Level Control
+ *    Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.'
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterLevelControl : MTRGenericCluster
 
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -381,25 +363,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Binary Input (Basic)
- *    An interface for reading the value of a binary measurement and accessing various characteristics of that measurement.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterBinaryInputBasic : MTRCluster
+@interface MTRClusterLevelControl (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Binary Input (Basic)
+ *    An interface for reading the value of a binary measurement and accessing various characteristics of that measurement.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterBinaryInputBasic : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveTextWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveTextWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -448,12 +429,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pulse Width Modulation
- *    Cluster to control pulse width modulation
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterPulseWidthModulation : MTRCluster
+@interface MTRClusterBinaryInputBasic (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -461,12 +437,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Pulse Width Modulation
+ *    Cluster to control pulse width modulation
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterPulseWidthModulation : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -485,12 +465,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Descriptor
- *    The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterDescriptor : MTRCluster
+@interface MTRClusterPulseWidthModulation (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -498,12 +473,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Descriptor
+ *    The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterDescriptor : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceTypeListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -532,12 +511,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Binding
- *    The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterBinding : MTRCluster
+@interface MTRClusterDescriptor (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -545,12 +519,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Binding
+ *    The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterBinding : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeBindingWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -573,15 +551,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Access Control
- *    The Access Control Cluster exposes a data model view of a
-      Node's Access Control List (ACL), which codifies the rules used to manage
-      and enforce Access Control for the Node's endpoints and their associated
-      cluster instances.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterAccessControl : MTRCluster
+@interface MTRClusterBinding (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -589,12 +559,19 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Access Control
+ *    The Access Control Cluster exposes a data model view of a
+      Node's Access Control List (ACL), which codifies the rules used to manage
+      and enforce Access Control for the Node's endpoints and their associated
+      cluster instances.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterAccessControl : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeACLWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeACLWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -627,25 +604,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Actions
- *    This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterActions : MTRCluster
+@interface MTRClusterAccessControl (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Actions
+ *    This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterActions : MTRGenericCluster
 
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -683,14 +659,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Basic Information
- *    This cluster provides attributes and events for determining basic information about Nodes, which supports both
-      Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
-      which apply to the whole Node. Also allows setting user device information such as location.
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterBasicInformation : MTRCluster
+@interface MTRClusterActions (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -698,12 +667,18 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Basic Information
+ *    This cluster provides attributes and events for determining basic information about Nodes, which supports both
+      Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
+      which apply to the whole Node. Also allows setting user device information such as location.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterBasicInformation : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDataModelRevisionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -753,6 +728,10 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeProductAppearanceWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpecificationVersionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPathsPerInvokeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -770,12 +749,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster OTA Software Update Provider
- *    Provides an interface for providing OTA software updates
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterOTASoftwareUpdateProvider : MTRCluster
+@interface MTRClusterBasicInformation (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -783,12 +757,16 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster OTA Software Update Provider
+ *    Provides an interface for providing OTA software updates
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterOTASoftwareUpdateProvider : MTRGenericCluster
 
 - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)applyUpdateRequestWithParams:(MTROTASoftwareUpdateProviderClusterApplyUpdateRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -811,12 +789,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster OTA Software Update Requestor
- *    Provides an interface for downloading and applying OTA software updates
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterOTASoftwareUpdateRequestor : MTRCluster
+@interface MTRClusterOTASoftwareUpdateProvider (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -824,12 +797,16 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster OTA Software Update Requestor
+ *    Provides an interface for downloading and applying OTA software updates
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterOTASoftwareUpdateRequestor : MTRGenericCluster
 
 - (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -860,28 +837,27 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Localization Configuration
- *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing common languages, units of measurements, and numerical formatting
-      standards. As such, Nodes that visually or audibly convey information need a mechanism by which
-      they can be configured to use a user’s preferred language, units, etc
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterLocalizationConfiguration : MTRCluster
+@interface MTRClusterOTASoftwareUpdateRequestor (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Localization Configuration
+ *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
+      may have differing common languages, units of measurements, and numerical formatting
+      standards. As such, Nodes that visually or audibly convey information need a mechanism by which
+      they can be configured to use a user’s preferred language, units, etc
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterLocalizationConfiguration : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveLocaleWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveLocaleWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -906,15 +882,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Time Format Localization
- *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
-      or audibly convey time information need a mechanism by which they can be configured to use a
-      user’s preferred format.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterTimeFormatLocalization : MTRCluster
+@interface MTRClusterLocalizationConfiguration (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -922,12 +890,19 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Time Format Localization
+ *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
+      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
+      or audibly convey time information need a mechanism by which they can be configured to use a
+      user’s preferred format.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterTimeFormatLocalization : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeHourFormatWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeHourFormatWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -956,15 +931,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Unit Localization
- *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for the units in which values are conveyed in communication to a
-      user. As such, Nodes that visually or audibly convey measurable values to the user need a
-      mechanism by which they can be configured to use a user’s preferred unit.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterUnitLocalization : MTRCluster
+@interface MTRClusterTimeFormatLocalization (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -972,12 +939,19 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Unit Localization
+ *    Nodes should be expected to be deployed to any and all regions of the world. These global regions
+      may have differing preferences for the units in which values are conveyed in communication to a
+      user. As such, Nodes that visually or audibly convey measurable values to the user need a
+      mechanism by which they can be configured to use a user’s preferred unit.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterUnitLocalization : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureUnitWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureUnitWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1000,12 +974,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Power Source Configuration
- *    This cluster is used to describe the configuration and capabilities of a Device's power system.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterPowerSourceConfiguration : MTRCluster
+@interface MTRClusterUnitLocalization (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -1013,12 +982,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Power Source Configuration
+ *    This cluster is used to describe the configuration and capabilities of a Device's power system.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterPowerSourceConfiguration : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSourcesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -1039,12 +1012,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Power Source
- *    This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterPowerSource : MTRCluster
+@interface MTRClusterPowerSourceConfiguration (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -1052,12 +1020,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Power Source
+ *    This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterPowerSource : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStatusWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -1140,25 +1112,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster General Commissioning
- *    This cluster is used to manage global aspects of the Commissioning flow.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterGeneralCommissioning : MTRCluster
+@interface MTRClusterPowerSource (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster General Commissioning
+ *    This cluster is used to manage global aspects of the Commissioning flow.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterGeneralCommissioning : MTRGenericCluster
 
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulatoryConfigParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1195,12 +1166,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Network Commissioning
- *    Functionality to configure, enable, disable network credentials and access on a Matter device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterNetworkCommissioning : MTRCluster
+@interface MTRClusterGeneralCommissioning (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1208,12 +1174,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Network Commissioning
+ *    Functionality to configure, enable, disable network credentials and access on a Matter device.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterNetworkCommissioning : MTRGenericCluster
 
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1221,6 +1191,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)queryIdentityWithParams:(MTRNetworkCommissioningClusterQueryIdentityParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxNetworksWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -1263,12 +1234,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Diagnostic Logs
- *    The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterDiagnosticLogs : MTRCluster
+@interface MTRClusterNetworkCommissioning (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1276,12 +1242,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Diagnostic Logs
+ *    The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterDiagnosticLogs : MTRGenericCluster
 
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -1302,12 +1272,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster General Diagnostics
- *    The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterGeneralDiagnostics : MTRCluster
+@interface MTRClusterDiagnosticLogs (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1315,14 +1280,21 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster General Diagnostics
+ *    The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterGeneralDiagnostics : MTRGenericCluster
 
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)timeSnapshotWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNetworkInterfacesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -1342,8 +1314,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTestEventTriggersEnabledWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAverageWearCountWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1361,12 +1331,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Software Diagnostics
- *    The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterSoftwareDiagnostics : MTRCluster
+@interface MTRClusterGeneralDiagnostics (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1374,12 +1339,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Software Diagnostics
+ *    The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterSoftwareDiagnostics : MTRGenericCluster
 
 - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetWatermarksWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -1410,12 +1379,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thread Network Diagnostics
- *    The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterThreadNetworkDiagnostics : MTRCluster
+@interface MTRClusterSoftwareDiagnostics (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1423,12 +1387,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Thread Network Diagnostics
+ *    The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterThreadNetworkDiagnostics : MTRGenericCluster
 
 - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -1577,12 +1545,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster WiFi Network Diagnostics
- *    The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterWiFiNetworkDiagnostics : MTRCluster
+@interface MTRClusterThreadNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1590,12 +1553,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster WiFi Network Diagnostics
+ *    The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterWiFiNetworkDiagnostics : MTRGenericCluster
 
 - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -1644,12 +1611,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Ethernet Network Diagnostics
- *    The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterEthernetNetworkDiagnostics : MTRCluster
+@interface MTRClusterWiFiNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1657,12 +1619,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Ethernet Network Diagnostics
+ *    The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterEthernetNetworkDiagnostics : MTRGenericCluster
 
 - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -1703,12 +1669,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Time Synchronization
- *    Accurate time is required for a number of reasons, including scheduling, display and validating security materials.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterTimeSynchronization : MTRCluster
+@interface MTRClusterEthernetNetworkDiagnostics (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1716,12 +1677,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Time Synchronization
+ *    Accurate time is required for a number of reasons, including scheduling, display and validating security materials.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterTimeSynchronization : MTRGenericCluster
 
 - (void)setUTCTimeWithParams:(MTRTimeSynchronizationClusterSetUTCTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)setTrustedTimeSourceWithParams:(MTRTimeSynchronizationClusterSetTrustedTimeSourceParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -1772,28 +1737,27 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Bridged Device Basic Information
- *    This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on
-          the Endpoint where it is placed (and its Parts) is bridged from a non-CHIP technology; and provide a centralized
-          collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
-          such as the vendor name, the model name, or user-assigned name.
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterBridgedDeviceBasicInformation : MTRCluster
+@interface MTRClusterTimeSynchronization (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Bridged Device Basic Information
+ *    This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on
+          the Endpoint where it is placed (and its Parts) is bridged from a non-CHIP technology; and provide a centralized
+          collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
+          such as the vendor name, the model name, or user-assigned name.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterBridgedDeviceBasicInformation : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -1846,14 +1810,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Switch
- *    This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
-Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
-Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterSwitch : MTRCluster
+@interface MTRClusterBridgedDeviceBasicInformation (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -1861,12 +1818,18 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Switch
+ *    This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
+Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
+Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterSwitch : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfPositionsWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -1891,25 +1854,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Administrator Commissioning
- *    Commands to trigger a Node to allow a new Administrator to commission it.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterAdministratorCommissioning : MTRCluster
+@interface MTRClusterSwitch (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Administrator Commissioning
+ *    Commands to trigger a Node to allow a new Administrator to commission it.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterAdministratorCommissioning : MTRGenericCluster
 
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1940,12 +1902,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Operational Credentials
- *    This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterOperationalCredentials : MTRCluster
+@interface MTRClusterAdministratorCommissioning (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -1953,12 +1910,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Operational Credentials
+ *    This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterOperationalCredentials : MTRGenericCluster
 
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCertificateChainRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1998,12 +1959,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Group Key Management
- *    The Group Key Management Cluster is the mechanism by which group keys are managed.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterGroupKeyManagement : MTRCluster
+@interface MTRClusterOperationalCredentials (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2011,12 +1967,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Group Key Management
+ *    The Group Key Management Cluster is the mechanism by which group keys are managed.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterGroupKeyManagement : MTRGenericCluster
 
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -2052,26 +2012,25 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Fixed Label
- *    The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
-labels.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterFixedLabel : MTRCluster
+@interface MTRClusterGroupKeyManagement (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Fixed Label
+ *    The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
+labels.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterFixedLabel : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -2092,12 +2051,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster User Label
- *    The User Label Cluster provides a feature to tag an endpoint with zero or more labels.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterUserLabel : MTRCluster
+@interface MTRClusterFixedLabel (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -2105,12 +2059,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster User Label
+ *    The User Label Cluster provides a feature to tag an endpoint with zero or more labels.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterUserLabel : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeLabelListWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -2133,12 +2091,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Boolean State
- *    This cluster provides an interface to a boolean state called StateValue.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterBooleanState : MTRCluster
+@interface MTRClusterUserLabel (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -2146,12 +2099,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Boolean State
+ *    This cluster provides an interface to a boolean state called StateValue.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterBooleanState : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStateValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -2172,30 +2129,29 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster ICD Management
- *    Allows servers to ensure that listed clients are notified when a server is available for communication.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterICDManagement : MTRCluster
+@interface MTRClusterBooleanState (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster ICD Management
+ *    Allows servers to ensure that listed clients are notified when a server is available for communication.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterICDManagement : MTRGenericCluster
 
 - (void)registerClientWithParams:(MTRICDManagementClusterRegisterClientParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterRegisterClientResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)unregisterClientWithParams:(MTRICDManagementClusterUnregisterClientParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)stayActiveRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stayActiveRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeIdleModeDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2231,12 +2187,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Mode Select
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterModeSelect : MTRCluster
+@interface MTRClusterICDManagement (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2244,54 +2195,48 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Timer
+ *    This cluster supports creating a simple timer functionality.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
-
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterTimer : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetTimerWithParams:(MTRTimerClusterResetTimerParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetTimerWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)addTimeWithParams:(MTRTimerClusterAddTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)reduceTimeWithParams:(MTRTimerClusterReduceTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSetTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimeRemainingWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimerStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
-/**
- * Cluster Laundry Washer Mode
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterLaundryWasherMode : MTRCluster
+@interface MTRClusterTimer (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2299,26 +2244,41 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Oven Cavity Operational State
+ *    This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterOvenCavityOperationalState : MTRGenericCluster
 
-- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)pauseWithParams:(MTROvenCavityOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithParams:(MTROvenCavityOperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)startWithParams:(MTROvenCavityOperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)resumeWithParams:(MTROvenCavityOperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+    MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2337,12 +2297,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Refrigerator And Temperature Controlled Cabinet Mode
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetMode : MTRCluster
+@interface MTRClusterOvenCavityOperationalState (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2350,14 +2305,18 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Oven Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterOvenMode : MTRGenericCluster
 
-- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTROvenModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2388,37 +2347,31 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Laundry Washer Controls
- *    This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterLaundryWasherControls : MTRCluster
+@interface MTRClusterOvenMode (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Laundry Dryer Controls
+ *    This cluster supports remotely monitoring and controling the different typs of
+            functionality available to a drying device, such as a laundry dryer.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterLaundryDryerControls : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfRinsesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedDrynessLevelsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedRinsesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedDrynessLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2437,59 +2390,61 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster RVC Run Mode
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRVCRunMode : MTRCluster
+@interface MTRClusterLaundryDryerControls (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Mode Select
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterModeSelect : MTRGenericCluster
 
-- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
-/**
- * Cluster RVC Clean Mode
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRVCCleanMode : MTRCluster
+@interface MTRClusterModeSelect (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2497,19 +2452,27 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Laundry Washer Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterLaundryWasherMode : MTRGenericCluster
 
-- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2531,12 +2494,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Temperature Control
- *    Attributes and commands for configuring the temperature control, and reporting temperature.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterTemperatureControl : MTRCluster
+@interface MTRClusterLaundryWasherMode (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2544,26 +2502,30 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Refrigerator And Temperature Controlled Cabinet Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureSetpointWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetMode : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinTemperatureWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxTemperatureWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStepWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedTemperatureLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedTemperatureLevelsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2582,31 +2544,36 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Refrigerator Alarm
- *    Attributes and commands for configuring the Refrigerator alarm.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRefrigeratorAlarm : MTRCluster
+@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetMode (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Laundry Washer Controls
+ *    This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterLaundryWasherControls : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfRinsesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedRinsesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2625,36 +2592,31 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Dishwasher Mode
- *    Attributes and commands for selecting a mode from a list of supported options.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterDishwasherMode : MTRCluster
+@interface MTRClusterLaundryWasherControls (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster RVC Run Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRVCRunMode : MTRGenericCluster
 
-- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2676,27 +2638,34 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Air Quality
- *    Attributes for reporting air quality classification
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterAirQuality : MTRCluster
+@interface MTRClusterRVCRunMode (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster RVC Clean Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRVCCleanMode : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAirQualityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2715,12 +2684,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Smoke CO Alarm
- *    This cluster provides an interface for observing and managing the state of smoke and CO alarms.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterSmokeCOAlarm : MTRCluster
+@interface MTRClusterRVCCleanMode (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2728,44 +2692,30 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Temperature Control
+ *    Attributes and commands for configuring the temperature control, and reporting temperature.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)selfTestRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
-    MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpressedStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCOStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceMutedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeTestInProgressWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterTemperatureControl : MTRGenericCluster
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeHardwareFaultAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeEndOfServiceAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureSetpointWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectSmokeAlarmWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinTemperatureWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectCOAlarmWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxTemperatureWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeContaminationStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStepWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedTemperatureLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpiryDateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedTemperatureLevelsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2784,12 +2734,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Dishwasher Alarm
- *    Attributes and commands for configuring the Dishwasher alarm.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterDishwasherAlarm : MTRCluster
+@interface MTRClusterTemperatureControl (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2797,12 +2742,214 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Refrigerator Alarm
+ *    Attributes and commands for configuring the Refrigerator alarm.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRefrigeratorAlarm : MTRGenericCluster
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterRefrigeratorAlarm (Availability)
+
+/**
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Dishwasher Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterDishwasherMode : MTRGenericCluster
+
+- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterDishwasherMode (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Air Quality
+ *    Attributes for reporting air quality classification
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterAirQuality : MTRGenericCluster
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAirQualityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterAirQuality (Availability)
+
+/**
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Smoke CO Alarm
+ *    This cluster provides an interface for observing and managing the state of smoke and CO alarms.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterSmokeCOAlarm : MTRGenericCluster
+
+- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)selfTestRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpressedStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCOStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceMutedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTestInProgressWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeHardwareFaultAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEndOfServiceAlertWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectSmokeAlarmWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectCOAlarmWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeContaminationStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpiryDateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterSmokeCOAlarm (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Dishwasher Alarm
+ *    Attributes and commands for configuring the Dishwasher alarm.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterDishwasherAlarm : MTRGenericCluster
 
 - (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -2832,12 +2979,96 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+@interface MTRClusterDishwasherAlarm (Availability)
+
 /**
- * Cluster Operational State
- *    This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Microwave Oven Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterMicrowaveOvenMode : MTRGenericCluster
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterMicrowaveOvenMode (Availability)
+
+/**
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Microwave Oven Control
+ *    Attributes and commands for configuring the microwave oven control, and reporting cooking stats.
  */
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterOperationalState : MTRCluster
+@interface MTRClusterMicrowaveOvenControl : MTRGenericCluster
+
+- (void)setCookingParametersWithParams:(MTRMicrowaveOvenControlClusterSetCookingParametersParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)addMoreTimeWithParams:(MTRMicrowaveOvenControlClusterAddMoreTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCookTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePowerSettingWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinPowerWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPowerWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePowerStepWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterMicrowaveOvenControl (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2845,12 +3076,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Operational State
+ *    This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterOperationalState : MTRGenericCluster
 
 - (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
@@ -2894,12 +3129,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster RVC Operational State
- *    This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum.
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRVCOperationalState : MTRCluster
+@interface MTRClusterOperationalState (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2907,12 +3137,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster RVC Operational State
+ *    This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRVCOperationalState : MTRGenericCluster
 
 - (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
@@ -2927,17 +3161,243 @@ MTR_PROVISIONALLY_AVAILABLE
 - (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterRVCOperationalState (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster HEPA Filter Monitoring
+ *    Attributes and commands for monitoring HEPA filters in a device
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterHEPAFilterMonitoring : MTRGenericCluster
+
+- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterHEPAFilterMonitoring (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Activated Carbon Filter Monitoring
+ *    Attributes and commands for monitoring activated carbon filters in a device
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterActivatedCarbonFilterMonitoring : MTRGenericCluster
+
+- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterActivatedCarbonFilterMonitoring (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Boolean Sensor Configuration
+ *    This cluster is used to configure a boolean sensor.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterBooleanSensorConfiguration : MTRGenericCluster
+
+- (void)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsActiveWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsSuppressedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsEnabledWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeAlarmsEnabledWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeAlarmsEnabledWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+@interface MTRClusterBooleanSensorConfiguration (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
+/**
+ * Cluster Valve Configuration and Control
+ *    This cluster is used to configure a valve.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterValveConfigurationAndControl : MTRGenericCluster
+
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)closeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOpenDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAutoCloseTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeRemainingDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpStateWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeStartUpStateWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOpenLevelWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeOpenLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeValveFaultWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2956,12 +3416,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster HEPA Filter Monitoring
- *    Attributes and commands for monitoring HEPA filters in a device
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterHEPAFilterMonitoring : MTRCluster
+@interface MTRClusterValveConfigurationAndControl (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -2969,30 +3424,44 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Demand Response Load Control
+ *    This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
-
-- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterDemandResponseLoadControl : MTRGenericCluster
+
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearLoadControlEventsRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveEventsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfEventsPerProgramWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfTransitionsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultRandomStartWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomStartWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomStartWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultRandomDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -3011,12 +3480,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Activated Carbon Filter Monitoring
- *    Attributes and commands for monitoring activated carbon filters in a device
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterActivatedCarbonFilterMonitoring : MTRCluster
+@interface MTRClusterDemandResponseLoadControl (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -3024,30 +3488,86 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Energy EVSE
+ *    Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterEnergyEVSE : MTRGenericCluster
 
-- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)disableWithParams:(MTREnergyEVSEClusterDisableParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)disableWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)enableChargingWithParams:(MTREnergyEVSEClusterEnableChargingParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)enableDischargingWithParams:(MTREnergyEVSEClusterEnableDischargingParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startDiagnosticsWithParams:(MTREnergyEVSEClusterStartDiagnosticsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)startDiagnosticsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    MTR_PROVISIONALLY_AVAILABLE;
+- (void)setTargetsWithParams:(MTREnergyEVSEClusterSetTargetsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)getTargetsWithParams:(MTREnergyEVSEClusterGetTargetsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearTargetsWithParams:(MTREnergyEVSEClusterClearTargetsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)clearTargetsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupplyStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFaultStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChargingEnabledUntilWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDischargingEnabledUntilWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCircuitCapacityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinimumChargeCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaximumChargeCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaximumDischargeCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserMaximumChargeCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeRandomizationDelayWindowWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfWeeklyTargetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfDailyTargetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeStartTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeTargetTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeRequiredEnergyWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeTargetSoCWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeApproximateEVEfficiencyWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateOfChargeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryCapacityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeVehicleIDWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionIDWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionEnergyChargedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionEnergyDischargedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -3066,12 +3586,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Door Lock
- *    An interface to a generic way to secure a door
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterDoorLock : MTRCluster
+@interface MTRClusterEnergyEVSE (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -3079,12 +3594,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Door Lock
+ *    An interface to a generic way to secure a door
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterDoorLock : MTRGenericCluster
 
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3231,12 +3750,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Window Covering
- *    Provides an interface for controlling and adjusting automatic window coverings.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterWindowCovering : MTRCluster
+@interface MTRClusterDoorLock (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -3244,12 +3758,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Window Covering
+ *    Provides an interface for controlling and adjusting automatic window coverings.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterWindowCovering : MTRGenericCluster
 
 - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)upOrOpenWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -3328,12 +3846,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Barrier Control
- *    This cluster provides control of a barrier (garage door).
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterBarrierControl : MTRCluster
+@interface MTRClusterWindowCovering (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -3341,12 +3854,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Barrier Control
+ *    This cluster provides control of a barrier (garage door).
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterBarrierControl : MTRGenericCluster
 
 - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierControlGoToPercentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)barrierControlStopWithParams:(MTRBarrierControlClusterBarrierControlStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3402,25 +3919,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pump Configuration and Control
- *    An interface for configuring and controlling pumps.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterPumpConfigurationAndControl : MTRCluster
+@interface MTRClusterBarrierControl (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Pump Configuration and Control
+ *    An interface for configuring and controlling pumps.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterPumpConfigurationAndControl : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPressureWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -3493,25 +4009,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thermostat
- *    An interface for configuring and controlling the functionality of a thermostat.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterThermostat : MTRCluster
+@interface MTRClusterPumpConfigurationAndControl (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Thermostat
+ *    An interface for configuring and controlling the functionality of a thermostat.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterThermostat : MTRGenericCluster
 
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3689,12 +4204,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Fan Control
- *    An interface for controlling a fan in a heating/cooling system.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterFanControl : MTRCluster
+@interface MTRClusterThermostat (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -3702,12 +4212,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Fan Control
+ *    An interface for controlling a fan in a heating/cooling system.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterFanControl : MTRGenericCluster
 
 - (void)stepWithParams:(MTRFanControlClusterStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
@@ -3766,25 +4280,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Thermostat User Interface Configuration
- *    An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterThermostatUserInterfaceConfiguration : MTRCluster
+@interface MTRClusterFanControl (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Thermostat User Interface Configuration
+ *    An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterThermostatUserInterfaceConfiguration : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureDisplayModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureDisplayModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3815,25 +4328,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Color Control
- *    Attributes and commands for controlling the color properties of a color-capable light.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterColorControl : MTRCluster
+@interface MTRClusterThermostatUserInterfaceConfiguration (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Color Control
+ *    Attributes and commands for controlling the color properties of a color-capable light.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterColorControl : MTRGenericCluster
 
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4002,25 +4514,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Ballast Configuration
- *    Attributes and commands for configuring a lighting ballast.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterBallastConfiguration : MTRCluster
+@interface MTRClusterColorControl (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Ballast Configuration
+ *    Attributes and commands for configuring a lighting ballast.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterBallastConfiguration : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributePhysicalMinLevelWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4087,12 +4598,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Illuminance Measurement
- *    Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterIlluminanceMeasurement : MTRCluster
+@interface MTRClusterBallastConfiguration (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4100,12 +4606,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Illuminance Measurement
+ *    Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterIlluminanceMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4134,12 +4644,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Temperature Measurement
- *    Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterTemperatureMeasurement : MTRCluster
+@interface MTRClusterIlluminanceMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4147,12 +4652,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Temperature Measurement
+ *    Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterTemperatureMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4179,12 +4688,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Pressure Measurement
- *    Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterPressureMeasurement : MTRCluster
+@interface MTRClusterTemperatureMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4192,12 +4696,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Pressure Measurement
+ *    Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterPressureMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4234,12 +4742,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Flow Measurement
- *    Attributes and commands for configuring the measurement of flow, and reporting flow measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterFlowMeasurement : MTRCluster
+@interface MTRClusterPressureMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4247,12 +4750,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Flow Measurement
+ *    Attributes and commands for configuring the measurement of flow, and reporting flow measurements.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterFlowMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4279,12 +4786,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Relative Humidity Measurement
- *    Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterRelativeHumidityMeasurement : MTRCluster
+@interface MTRClusterFlowMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4292,12 +4794,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Relative Humidity Measurement
+ *    Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterRelativeHumidityMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4324,12 +4830,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Occupancy Sensing
- *    Attributes and commands for configuring occupancy sensing, and reporting occupancy status.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterOccupancySensing : MTRCluster
+@interface MTRClusterRelativeHumidityMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4337,12 +4838,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Occupancy Sensing
+ *    Attributes and commands for configuring occupancy sensing, and reporting occupancy status.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterOccupancySensing : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOccupancyWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4403,12 +4908,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Carbon Monoxide Concentration Measurement
- *    Attributes for reporting carbon monoxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterCarbonMonoxideConcentrationMeasurement : MTRCluster
+@interface MTRClusterOccupancySensing (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4416,12 +4916,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Carbon Monoxide Concentration Measurement
+ *    Attributes for reporting carbon monoxide concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterCarbonMonoxideConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4462,12 +4966,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Carbon Dioxide Concentration Measurement
- *    Attributes for reporting carbon dioxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterCarbonDioxideConcentrationMeasurement : MTRCluster
+@interface MTRClusterCarbonMonoxideConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4475,12 +4974,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Carbon Dioxide Concentration Measurement
+ *    Attributes for reporting carbon dioxide concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterCarbonDioxideConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4521,12 +5024,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Nitrogen Dioxide Concentration Measurement
- *    Attributes for reporting nitrogen dioxide concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterNitrogenDioxideConcentrationMeasurement : MTRCluster
+@interface MTRClusterCarbonDioxideConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4534,12 +5032,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Nitrogen Dioxide Concentration Measurement
+ *    Attributes for reporting nitrogen dioxide concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterNitrogenDioxideConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4580,12 +5082,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Ozone Concentration Measurement
- *    Attributes for reporting ozone concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterOzoneConcentrationMeasurement : MTRCluster
+@interface MTRClusterNitrogenDioxideConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4593,12 +5090,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Ozone Concentration Measurement
+ *    Attributes for reporting ozone concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterOzoneConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4639,12 +5140,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM2.5 Concentration Measurement
- *    Attributes for reporting PM2.5 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterPM25ConcentrationMeasurement : MTRCluster
+@interface MTRClusterOzoneConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4652,12 +5148,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster PM2.5 Concentration Measurement
+ *    Attributes for reporting PM2.5 concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterPM25ConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4698,12 +5198,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Formaldehyde Concentration Measurement
- *    Attributes for reporting formaldehyde concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterFormaldehydeConcentrationMeasurement : MTRCluster
+@interface MTRClusterPM25ConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4711,12 +5206,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Formaldehyde Concentration Measurement
+ *    Attributes for reporting formaldehyde concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterFormaldehydeConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4757,12 +5256,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM1 Concentration Measurement
- *    Attributes for reporting PM1 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterPM1ConcentrationMeasurement : MTRCluster
+@interface MTRClusterFormaldehydeConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4770,12 +5264,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster PM1 Concentration Measurement
+ *    Attributes for reporting PM1 concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterPM1ConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4816,12 +5314,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster PM10 Concentration Measurement
- *    Attributes for reporting PM10 concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterPM10ConcentrationMeasurement : MTRCluster
+@interface MTRClusterPM1ConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4829,12 +5322,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster PM10 Concentration Measurement
+ *    Attributes for reporting PM10 concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterPM10ConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4875,12 +5372,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Total Volatile Organic Compounds Concentration Measurement
- *    Attributes for reporting total volatile organic compounds concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement : MTRCluster
+@interface MTRClusterPM10ConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4888,12 +5380,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Total Volatile Organic Compounds Concentration Measurement
+ *    Attributes for reporting total volatile organic compounds concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4934,12 +5430,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Radon Concentration Measurement
- *    Attributes for reporting radon concentration measurements
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterRadonConcentrationMeasurement : MTRCluster
+@interface MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -4947,12 +5438,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Radon Concentration Measurement
+ *    Attributes for reporting radon concentration measurements
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterRadonConcentrationMeasurement : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -4993,12 +5488,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-/**
- * Cluster Wake on LAN
- *    This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol.
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterWakeOnLAN : MTRCluster
+@interface MTRClusterRadonConcentrationMeasurement (Availability)
 
 /**
  * The queue is currently unused, but may be used in the future for calling completions
@@ -5006,15 +5496,21 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Wake on LAN
+ *    This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterWakeOnLAN : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMACAddressWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLinkLocalAddressWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5032,25 +5528,24 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Channel
- *    This cluster provides an interface for controlling the current Channel on a device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterChannel : MTRCluster
+@interface MTRClusterWakeOnLAN (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Channel
+ *    This cluster provides an interface for controlling the current Channel on a device.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterChannel : MTRGenericCluster
 
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5079,12 +5574,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Target Navigator
- *    This cluster provides an interface for UX navigation within a set of targets on a device or endpoint.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterTargetNavigator : MTRCluster
+@interface MTRClusterChannel (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5092,12 +5582,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Target Navigator
+ *    This cluster provides an interface for UX navigation within a set of targets on a device or endpoint.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterTargetNavigator : MTRGenericCluster
 
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -5122,12 +5616,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Media Playback
- *    This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterMediaPlayback : MTRCluster
+@interface MTRClusterTargetNavigator (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5135,12 +5624,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Media Playback
+ *    This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterMediaPlayback : MTRGenericCluster
 
 - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)playWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion
@@ -5201,12 +5694,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Media Input
- *    This cluster provides an interface for controlling the Input Selector on a media device such as a TV.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterMediaInput : MTRCluster
+@interface MTRClusterMediaPlayback (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5214,12 +5702,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Media Input
+ *    This cluster provides an interface for controlling the Input Selector on a media device such as a TV.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterMediaInput : MTRGenericCluster
 
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5251,12 +5743,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Low Power
- *    This cluster provides an interface for managing low power mode on a device.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterLowPower : MTRCluster
+@interface MTRClusterMediaInput (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5264,12 +5751,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Low Power
+ *    This cluster provides an interface for managing low power mode on a device.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterLowPower : MTRGenericCluster
 
 - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)sleepWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -5292,12 +5783,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Keypad Input
- *    This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterKeypadInput : MTRCluster
+@interface MTRClusterLowPower (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5305,12 +5791,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Keypad Input
+ *    This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterKeypadInput : MTRGenericCluster
 
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -5331,12 +5821,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Content Launcher
- *    This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterContentLauncher : MTRCluster
+@interface MTRClusterKeypadInput (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5344,12 +5829,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Content Launcher
+ *    This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterContentLauncher : MTRGenericCluster
 
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5377,12 +5866,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Audio Output
- *    This cluster provides an interface for controlling the Output on a media device such as a TV.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterAudioOutput : MTRCluster
+@interface MTRClusterContentLauncher (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5390,12 +5874,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Audio Output
+ *    This cluster provides an interface for controlling the Output on a media device such as a TV.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterAudioOutput : MTRGenericCluster
 
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5421,12 +5909,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Application Launcher
- *    This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterApplicationLauncher : MTRCluster
+@interface MTRClusterAudioOutput (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5434,12 +5917,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Application Launcher
+ *    This cluster provides an interface for launching content on a media player device such as a TV or Speaker.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterApplicationLauncher : MTRGenericCluster
 
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5468,25 +5955,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Application Basic
- *    This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterApplicationBasic : MTRCluster
+@interface MTRClusterApplicationLauncher (Availability)
 
 /**
- * The queue is currently unused, but may be used in the future for calling completions
- * for command invocations if commands are added to this cluster.
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Application Basic
+ *    This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterApplicationBasic : MTRGenericCluster
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -5521,25 +6007,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Account Login
- *    This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client.
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterAccountLogin : MTRCluster
+@interface MTRClusterApplicationBasic (Availability)
 
 /**
- * For all instance methods that take a completion (i.e. command invocations),
- * the completion will be called on the provided queue.
+ * The queue is currently unused, but may be used in the future for calling completions
+ * for command invocations if commands are added to this cluster.
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Account Login
+ *    This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client.
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterAccountLogin : MTRGenericCluster
 
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5564,12 +6049,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Electrical Measurement
- *    Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..
- */
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRClusterElectricalMeasurement : MTRCluster
+@interface MTRClusterAccountLogin (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5577,12 +6057,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Electrical Measurement
+ *    Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRClusterElectricalMeasurement : MTRGenericCluster
 
 - (void)getProfileInfoCommandWithParams:(MTRElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)getProfileInfoCommandWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -5878,12 +6362,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @end
 
-/**
- * Cluster Unit Testing
- *    The Test Cluster is meant to validate the generated code
- */
-MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-@interface MTRClusterUnitTesting : MTRCluster
+@interface MTRClusterElectricalMeasurement (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -5891,12 +6370,16 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Unit Testing
+ *    The Test Cluster is meant to validate the generated code
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
+@interface MTRClusterUnitTesting : MTRGenericCluster
 
 - (void)testWithParams:(MTRUnitTestingClusterTestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)testWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -6276,12 +6759,7 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 @end
 
-/**
- * Cluster Sample MEI
- *    The Sample MEI cluster showcases a cluster manufacturer extensions
- */
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRClusterSampleMEI : MTRCluster
+@interface MTRClusterUnitTesting (Availability)
 
 /**
  * For all instance methods that take a completion (i.e. command invocations),
@@ -6289,12 +6767,16 @@ MTR_PROVISIONALLY_AVAILABLE
  */
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device
                               endpointID:(NSNumber *)endpointID
-                                   queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
+                                   queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
+
+@end
 
 /**
- * The device this cluster object is associated with.
+ * Cluster Sample MEI
+ *    The Sample MEI cluster showcases a cluster manufacturer extensions
  */
-@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterSampleMEI : MTRGenericCluster
 
 - (void)pingWithParams:(MTRSampleMEIClusterPingParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pingWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -6322,6 +6804,18 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+@interface MTRClusterSampleMEI (Availability)
+
+/**
+ * For all instance methods that take a completion (i.e. command invocations),
+ * the completion will be called on the provided queue.
+ */
+- (instancetype _Nullable)initWithDevice:(MTRDevice *)device
+                              endpointID:(NSNumber *)endpointID
+                                   queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE;
+
+@end
+
 MTR_DEPRECATED("Please use MTRClusterBasicInformation", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
 @interface MTRClusterBasic : MTRClusterBasicInformation
 @end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 9650aaf7d0e7a6..2d640145143c03 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -16,7 +16,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <Matter/MTRError.h>
 
 #import "MTRClusterConstants.h"
 #import "MTRCluster_Internal.h"
@@ -44,18 +43,6 @@
 // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects.
 @implementation MTRClusterIdentify
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -184,18 +171,6 @@ - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params
 
 @implementation MTRClusterGroups
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -456,18 +431,6 @@ - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingPa
 
 @implementation MTRClusterScenes
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -773,9 +736,9 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params expectedVa
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeScenesID) attributeID:@(MTRAttributeIDTypeClusterScenesAttributeSceneTableSizeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeRemainingCapacityWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFabricSceneInfoWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeScenesID) attributeID:@(MTRAttributeIDTypeClusterScenesAttributeRemainingCapacityID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeScenesID) attributeID:@(MTRAttributeIDTypeClusterScenesAttributeFabricSceneInfoID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
@@ -898,18 +861,6 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params expectedVa
 
 @implementation MTRClusterOnOff
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)offWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self offWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -1235,18 +1186,6 @@ - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params e
 
 @implementation MTRClusterOnOffSwitchConfiguration
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSwitchTypeWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOnOffSwitchConfigurationID) attributeID:@(MTRAttributeIDTypeClusterOnOffSwitchConfigurationAttributeSwitchTypeID) params:params];
@@ -1311,18 +1250,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterLevelControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -1801,18 +1728,6 @@ - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFre
 
 @implementation MTRClusterBinaryInputBasic
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveTextWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBinaryInputBasicID) attributeID:@(MTRAttributeIDTypeClusterBinaryInputBasicAttributeActiveTextID) params:params];
@@ -1967,18 +1882,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterPulseWidthModulation
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePulseWidthModulationID) attributeID:@(MTRAttributeIDTypeClusterPulseWidthModulationAttributeGeneratedCommandListID) params:params];
@@ -2013,18 +1916,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterDescriptor
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceTypeListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDescriptorID) attributeID:@(MTRAttributeIDTypeClusterDescriptorAttributeDeviceTypeListID) params:params];
@@ -2097,18 +1988,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterBinding
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBindingID) attributeID:@(MTRAttributeIDTypeClusterBindingAttributeBindingID) params:params];
@@ -2168,18 +2047,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterAccessControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeACLWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAccessControlID) attributeID:@(MTRAttributeIDTypeClusterAccessControlAttributeACLID) params:params];
@@ -2282,18 +2149,6 @@ - (void)writeAttributeAclWithValue:(NSDictionary<NSString *, id> *)dataValueDict
 
 @implementation MTRClusterActions
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -2736,18 +2591,6 @@ - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithD
 
 @implementation MTRClusterBasicInformation
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)mfgSpecificPingWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self mfgSpecificPingWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -2917,6 +2760,16 @@ - (void)writeAttributeLocalConfigDisabledWithValue:(NSDictionary<NSString *, id>
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBasicInformationID) attributeID:@(MTRAttributeIDTypeClusterBasicInformationAttributeProductAppearanceID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpecificationVersionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBasicInformationID) attributeID:@(MTRAttributeIDTypeClusterBasicInformationAttributeSpecificationVersionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPathsPerInvokeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBasicInformationID) attributeID:@(MTRAttributeIDTypeClusterBasicInformationAttributeMaxPathsPerInvokeID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBasicInformationID) attributeID:@(MTRAttributeIDTypeClusterBasicInformationAttributeGeneratedCommandListID) params:params];
@@ -2971,18 +2824,6 @@ - (void)mfgSpecificPingWithExpectedValues:(NSArray<NSDictionary<NSString *, id>
 
 @implementation MTRClusterOTASoftwareUpdateProvider
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -3130,18 +2971,6 @@ - (void)notifyUpdateAppliedWithParams:(MTROtaSoftwareUpdateProviderClusterNotify
 
 @implementation MTRClusterOTASoftwareUpdateRequestor
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -3262,18 +3091,6 @@ - (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary<NSString *, id>
 
 @implementation MTRClusterLocalizationConfiguration
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveLocaleWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLocalizationConfigurationID) attributeID:@(MTRAttributeIDTypeClusterLocalizationConfigurationAttributeActiveLocaleID) params:params];
@@ -3338,18 +3155,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterTimeFormatLocalization
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeHourFormatWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimeFormatLocalizationID) attributeID:@(MTRAttributeIDTypeClusterTimeFormatLocalizationAttributeHourFormatID) params:params];
@@ -3430,18 +3235,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterUnitLocalization
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureUnitWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeUnitLocalizationID) attributeID:@(MTRAttributeIDTypeClusterUnitLocalizationAttributeTemperatureUnitID) params:params];
@@ -3501,18 +3294,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterPowerSourceConfiguration
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSourcesWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePowerSourceConfigurationID) attributeID:@(MTRAttributeIDTypeClusterPowerSourceConfigurationAttributeSourcesID) params:params];
@@ -3561,18 +3342,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterPowerSource
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStatusWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePowerSourceID) attributeID:@(MTRAttributeIDTypeClusterPowerSourceAttributeStatusID) params:params];
@@ -3776,18 +3545,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterGeneralCommissioning
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -3980,18 +3737,6 @@ - (void)commissioningCompleteWithExpectedValues:(NSArray<NSDictionary<NSString *
 
 @implementation MTRClusterNetworkCommissioning
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -4154,6 +3899,33 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa
                                         completion:responseHandler];
 }
 
+- (void)queryIdentityWithParams:(MTRNetworkCommissioningClusterQueryIdentityParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRNetworkCommissioningClusterQueryIdentityParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = NetworkCommissioning::Commands::QueryIdentity::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRNetworkCommissioningClusterQueryIdentityResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxNetworksWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeMaxNetworksID) params:params];
@@ -4311,18 +4083,6 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa
 
 @implementation MTRClusterDiagnosticLogs
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -4401,18 +4161,6 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque
 
 @implementation MTRClusterGeneralDiagnostics
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -4440,6 +4188,37 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger
                                         completion:responseHandler];
 }
 
+- (void)timeSnapshotWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self timeSnapshotWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = GeneralDiagnostics::Commands::TimeSnapshot::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNetworkInterfacesWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeNetworkInterfacesID) params:params];
@@ -4485,11 +4264,6 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeTestEventTriggersEnabledID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAverageWearCountWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeAverageWearCountID) params:params];
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeGeneratedCommandListID) params:params];
@@ -4542,18 +4316,6 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger
 
 @implementation MTRClusterSoftwareDiagnostics
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetWatermarksWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self resetWatermarksWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -4657,18 +4419,6 @@ - (void)resetWatermarksWithExpectedValues:(NSArray<NSDictionary<NSString *, id>
 
 @implementation MTRClusterThreadNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -5075,18 +4825,6 @@ - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 
 @implementation MTRClusterWiFiNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -5243,18 +4981,6 @@ - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 
 @implementation MTRClusterEthernetNetworkDiagnostics
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self resetCountsWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -5383,18 +5109,6 @@ - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 
 @implementation MTRClusterTimeSynchronization
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)setUTCTimeWithParams:(MTRTimeSynchronizationClusterSetUTCTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -5629,18 +5343,6 @@ - (void)setDefaultNTPWithParams:(MTRTimeSynchronizationClusterSetDefaultNTPParam
 
 @implementation MTRClusterBridgedDeviceBasicInformation
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorNameID) params:params];
@@ -5777,18 +5479,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterSwitch
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfPositionsWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSwitchID) attributeID:@(MTRAttributeIDTypeClusterSwitchAttributeNumberOfPositionsID) params:params];
@@ -5847,18 +5537,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterAdministratorCommissioning
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -6030,18 +5708,6 @@ - (void)revokeCommissioningWithExpectedValues:(NSArray<NSDictionary<NSString *,
 
 @implementation MTRClusterOperationalCredentials
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -6392,18 +6058,6 @@ - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAdd
 
 @implementation MTRClusterGroupKeyManagement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -6616,18 +6270,6 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl
 
 @implementation MTRClusterFixedLabel
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeFixedLabelID) attributeID:@(MTRAttributeIDTypeClusterFixedLabelAttributeLabelListID) params:params];
@@ -6676,18 +6318,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterUserLabel
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeUserLabelID) attributeID:@(MTRAttributeIDTypeClusterUserLabelAttributeLabelListID) params:params];
@@ -6747,18 +6377,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterBooleanState
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStateValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanStateID) attributeID:@(MTRAttributeIDTypeClusterBooleanStateAttributeStateValueID) params:params];
@@ -6807,18 +6425,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterICDManagement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)registerClientWithParams:(MTRICDManagementClusterRegisterClientParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterRegisterClientResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -6873,11 +6479,11 @@ - (void)unregisterClientWithParams:(MTRICDManagementClusterUnregisterClientParam
                                         completion:responseHandler];
 }
 
-- (void)stayActiveRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     [self stayActiveRequestWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterStayActiveResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
         params = [[MTRICDManagementClusterStayActiveRequestParams
@@ -6885,7 +6491,7 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
+        completion(response, error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
@@ -6899,7 +6505,7 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
+                                     responseClass:MTRICDManagementClusterStayActiveResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
@@ -6976,24 +6582,43 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
 
 @end
 
-@implementation MTRClusterModeSelect
+@implementation MTRClusterTimer
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRTimerClusterSetTimerParams
+            alloc] init];
     }
-    return self;
-}
 
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::SetTimer::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)resetTimerWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    [self resetTimerWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)resetTimerWithParams:(MTRTimerClusterResetTimerParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRModeSelectClusterChangeToModeParams
+        params = [[MTRTimerClusterResetTimerParams
             alloc] init];
     }
 
@@ -7003,7 +6628,7 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = ModeSelect::Commands::ChangeToMode::Type;
+    using RequestType = Timer::Commands::ResetTimer::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7017,122 +6642,179 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params
+- (void)addTimeWithParams:(MTRTimerClusterAddTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeDescriptionID) params:params];
-}
+    if (params == nil) {
+        params = [[MTRTimerClusterAddTimeParams
+            alloc] init];
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStandardNamespaceID) params:params];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeSupportedModesID) params:params];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeCurrentModeID) params:params];
+    using RequestType = Timer::Commands::AddTime::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+- (void)reduceTimeWithParams:(MTRTimerClusterReduceTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStartUpModeID) params:params];
-}
+    if (params == nil) {
+        params = [[MTRTimerClusterReduceTimeParams
+            alloc] init];
+    }
 
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
-{
-    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::ReduceTime::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSetTimeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeSetTimeID) params:params];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimeRemainingWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeOnModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeTimeRemainingID) params:params];
 }
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimerStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeTimerStateID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterModeSelect (Deprecated)
+@implementation MTRClusterOvenCavityOperationalState
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue
+- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    return [self initWithDevice:device endpointID:@(endpoint) queue:queue];
+    [self pauseWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
+- (void)pauseWithParams:(MTROvenCavityOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterPauseParams
+            alloc] init];
+    }
 
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    [self changeToModeWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-@end
+- (void)stopWithParams:(MTROvenCavityOperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterStopParams
+            alloc] init];
+    }
 
-@implementation MTRClusterLaundryWasherMode
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-        _device = device;
-    }
-    return self;
+    using RequestType = OvenCavityOperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)startWithParams:(MTROvenCavityOperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRLaundryWasherModeClusterChangeToModeParams
+        params = [[MTROvenCavityOperationalStateClusterStartParams
             alloc] init];
     }
 
@@ -7142,7 +6824,7 @@ - (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = LaundryWasherMode::Commands::ChangeToMode::Type;
+    using RequestType = OvenCavityOperationalState::Commands::Start::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7151,103 +6833,110 @@ - (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRLaundryWasherModeClusterChangeToModeResponseParams.class
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
+- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeSupportedModesID) params:params];
+    [self resumeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
+- (void)resumeWithParams:(MTROvenCavityOperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeCurrentModeID) params:params];
+    if (params == nil) {
+        params = [[MTROvenCavityOperationalStateClusterResumeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OvenCavityOperationalState::Commands::Resume::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenCavityOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeStartUpModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributePhaseListID) params:params];
 }
 
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeCurrentPhaseID) params:params];
 }
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeCountdownTimeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalStateListID) params:params];
 }
 
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeOnModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalStateID) params:params];
 }
-- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeOperationalErrorID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenCavityOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOvenCavityOperationalStateAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterRefrigeratorAndTemperatureControlledCabinetMode
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterOvenMode
 
-- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)changeToModeWithParams:(MTROvenModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROvenModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+        params = [[MTROvenModeClusterChangeToModeParams
             alloc] init];
     }
 
@@ -7257,7 +6946,7 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetMo
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type;
+    using RequestType = OvenMode::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7266,24 +6955,24 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetMo
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams.class
+                                     responseClass:MTROvenModeClusterChangeToModeResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeSupportedModesID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeSupportedModesID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeCurrentModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeCurrentModeID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeStartUpModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeStartUpModeID) params:params];
 }
 
 - (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
@@ -7294,12 +6983,12 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataV
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeOnModeID) params:params];
 }
 
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
@@ -7310,157 +6999,112 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueD
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterLaundryWasherControls
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterLaundryDryerControls
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedsWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedDrynessLevelsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedsID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeSupportedDrynessLevelsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedCurrentWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedDrynessLevelWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedCurrentID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeSelectedDrynessLevelID) params:params];
 }
 
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    [self writeAttributeSpinSpeedCurrentWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    [self writeAttributeSelectedDrynessLevelWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
 }
-- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+- (void)writeAttributeSelectedDrynessLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedCurrentID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeSelectedDrynessLevelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfRinsesWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeNumberOfRinsesID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeGeneratedCommandListID) params:params];
 }
 
-- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeNumberOfRinsesWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
-}
-- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
-
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeNumberOfRinsesID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedRinsesWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSupportedRinsesID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeGeneratedCommandListID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryDryerControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryDryerControlsAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterRVCRunMode
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterModeSelect
 
-- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCRunModeClusterChangeToModeParams
+        params = [[MTRModeSelectClusterChangeToModeParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcRunMode::Commands::ChangeToMode::Type;
+    using RequestType = ModeSelect::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7469,24 +7113,50 @@ - (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCRunModeClusterChangeToModeResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeDescriptionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStandardNamespaceID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeSupportedModesID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeSupportedModesID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeCurrentModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeCurrentModeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStartUpModeID) params:params];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeOnModeID) params:params];
 }
 
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
@@ -7497,59 +7167,61 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueD
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeModeSelectID) attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterRVCCleanMode
+@implementation MTRClusterModeSelect (Deprecated)
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    return [self initWithDevice:device endpointID:@(endpoint) queue:queue];
+}
 
-        _device = device;
-    }
-    return self;
+- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
+{
+    [self changeToModeWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
+                                                                                                                                       completionHandler];
 }
+@end
 
-- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+@implementation MTRClusterLaundryWasherMode
+
+- (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRRVCCleanModeClusterChangeToModeParams
+        params = [[MTRLaundryWasherModeClusterChangeToModeParams
             alloc] init];
     }
 
@@ -7559,7 +7231,7 @@ - (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)param
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcCleanMode::Commands::ChangeToMode::Type;
+    using RequestType = LaundryWasherMode::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7568,24 +7240,40 @@ - (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)param
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCCleanModeClusterChangeToModeResponseParams.class
+                                     responseClass:MTRLaundryWasherModeClusterChangeToModeResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeSupportedModesID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeSupportedModesID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeCurrentModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeCurrentModeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeStartUpModeID) params:params];
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeOnModeID) params:params];
 }
 
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
@@ -7596,69 +7284,57 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueD
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherModeID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherModeAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterTemperatureControl
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterRefrigeratorAndTemperatureControlledCabinetMode
 
-- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRTemperatureControlClusterSetTemperatureParams
+        params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
+        completion(response, error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = TemperatureControl::Commands::SetTemperature::Type;
+    using RequestType = RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7667,152 +7343,167 @@ - (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperaturePara
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
+                                     responseClass:MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureSetpointWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeTemperatureSetpointID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeSupportedModesID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinTemperatureWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeMinTemperatureID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeCurrentModeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxTemperatureWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeMaxTemperatureID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeStartUpModeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStepWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeStepID) params:params];
+    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
 }
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedTemperatureLevelWithParams:(MTRReadParams * _Nullable)params
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeSelectedTemperatureLevelID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeOnModeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedTemperatureLevelsWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeSupportedTemperatureLevelsID) params:params];
+    [self writeAttributeOnModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterRefrigeratorAlarm
+@implementation MTRClusterLaundryWasherControls
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedsWithParams:(MTRReadParams * _Nullable)params
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedsID) params:params];
+}
 
-        _device = device;
-    }
-    return self;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedCurrentWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedCurrentID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeMaskID) params:params];
+    [self writeAttributeSpinSpeedCurrentWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
 }
+- (void)writeAttributeSpinSpeedCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSpinSpeedCurrentID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfRinsesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeNumberOfRinsesID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeSupportedID) params:params];
+    [self writeAttributeNumberOfRinsesWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeNumberOfRinsesWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeNumberOfRinsesID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedRinsesWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeSupportedRinsesID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeLaundryWasherControlsID) attributeID:@(MTRAttributeIDTypeClusterLaundryWasherControlsAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterDishwasherMode
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterRVCRunMode
 
-- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRDishwasherModeClusterChangeToModeParams
+        params = [[MTRRVCRunModeClusterChangeToModeParams
             alloc] init];
     }
 
@@ -7822,7 +7513,7 @@ - (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = DishwasherMode::Commands::ChangeToMode::Type;
+    using RequestType = RvcRunMode::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -7831,40 +7522,24 @@ - (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)par
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRDishwasherModeClusterChangeToModeResponseParams.class
+                                     responseClass:MTRRVCRunModeClusterChangeToModeResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeSupportedModesID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeSupportedModesID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeCurrentModeID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeStartUpModeID) params:params];
-}
-
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
-{
-    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
-
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeCurrentModeID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeOnModeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID) params:params];
 }
 
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
@@ -7875,114 +7550,134 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueD
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterAirQuality
+@implementation MTRClusterRVCCleanMode
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRRVCCleanModeClusterChangeToModeParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcCleanMode::Commands::ChangeToMode::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCCleanModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAirQualityWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAirQualityID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeSupportedModesID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeCurrentModeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID) params:params];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeOnModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterSmokeCOAlarm
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterTemperatureControl
 
-- (void)selfTestRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
-{
-    [self selfTestRequestWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
-}
-- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams
+        params = [[MTRTemperatureControlClusterSetTemperatureParams
             alloc] init];
     }
 
@@ -7992,7 +7687,7 @@ - (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams *
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = SmokeCoAlarm::Commands::SelfTestRequest::Type;
+    using RequestType = TemperatureControl::Commands::SetTemperature::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8006,142 +7701,133 @@ - (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams *
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpressedStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureSetpointWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpressedStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeTemperatureSetpointID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinTemperatureWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeMinTemperatureID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCOStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxTemperatureWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeCOStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeMaxTemperatureID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryAlertWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStepWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeBatteryAlertID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeStepID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceMutedWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSelectedTemperatureLevelWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeDeviceMutedID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeSelectedTemperatureLevelID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeTestInProgressWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedTemperatureLevelsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeTestInProgressID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeSupportedTemperatureLevelsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeHardwareFaultAlertWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeHardwareFaultAlertID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeGeneratedCommandListID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeEndOfServiceAlertWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeEndOfServiceAlertID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeAcceptedCommandListID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectSmokeAlarmWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeInterconnectSmokeAlarmID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeEventListID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectCOAlarmWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeInterconnectCOAlarmID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeAttributeListID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeContaminationStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeContaminationStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeFeatureMapID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeSensitivityLevelID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureControlID) attributeID:@(MTRAttributeIDTypeClusterTemperatureControlAttributeClusterRevisionID) params:params];
 }
 
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+@end
+
+@implementation MTRClusterRefrigeratorAlarm
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeSmokeSensitivityLevelWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeMaskID) params:params];
 }
-- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeSensitivityLevelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeStateID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpiryDateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpiryDateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeSupportedID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRefrigeratorAlarmID) attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAlarmAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterDishwasherAlarm
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterDishwasherMode
 
-- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
-        params = [[MTRDishwasherAlarmClusterResetParams
+        params = [[MTRDishwasherModeClusterChangeToModeParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
+        completion(response, error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = DishwasherAlarm::Commands::Reset::Type;
+    using RequestType = DishwasherMode::Commands::ChangeToMode::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8150,28 +7836,1137 @@ - (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params expectedV
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
+                                     responseClass:MTRDishwasherModeClusterChangeToModeResponseParams.class
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
 {
-    if (params == nil) {
-        params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
-            alloc] init];
-    }
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeSupportedModesID) params:params];
+}
 
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeCurrentModeID) params:params];
+}
 
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeStartUpModeID) params:params];
+}
 
-    using RequestType = DishwasherAlarm::Commands::ModifyEnabledAlarms::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeStartUpModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeOnModeID) params:params];
+}
+
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeOnModeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherModeID) attributeID:@(MTRAttributeIDTypeClusterDishwasherModeAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterAirQuality
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAirQualityWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAirQualityID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeAirQualityID) attributeID:@(MTRAttributeIDTypeClusterAirQualityAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterSmokeCOAlarm
+
+- (void)selfTestRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    [self selfTestRequestWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = SmokeCoAlarm::Commands::SelfTestRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpressedStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpressedStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCOStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeCOStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryAlertWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeBatteryAlertID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceMutedWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeDeviceMutedID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTestInProgressWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeTestInProgressID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeHardwareFaultAlertWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeHardwareFaultAlertID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEndOfServiceAlertWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeEndOfServiceAlertID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectSmokeAlarmWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeInterconnectSmokeAlarmID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInterconnectCOAlarmWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeInterconnectCOAlarmID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeContaminationStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeContaminationStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSmokeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeSensitivityLevelID) params:params];
+}
+
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeSmokeSensitivityLevelWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeSensitivityLevelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeExpiryDateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpiryDateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterDishwasherAlarm
+
+- (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRDishwasherAlarmClusterResetParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DishwasherAlarm::Commands::Reset::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DishwasherAlarm::Commands::ModifyEnabledAlarms::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeMaskID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLatchWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeLatchID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeSupportedID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterMicrowaveOvenMode
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeSupportedModesID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeCurrentModeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenModeID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenModeAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterMicrowaveOvenControl
+
+- (void)setCookingParametersWithParams:(MTRMicrowaveOvenControlClusterSetCookingParametersParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRMicrowaveOvenControlClusterSetCookingParametersParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = MicrowaveOvenControl::Commands::SetCookingParameters::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)addMoreTimeWithParams:(MTRMicrowaveOvenControlClusterAddMoreTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRMicrowaveOvenControlClusterAddMoreTimeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = MicrowaveOvenControl::Commands::AddMoreTime::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCookTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeCookTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePowerSettingWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributePowerSettingID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinPowerWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeMinPowerID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPowerWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeMaxPowerID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePowerStepWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributePowerStepID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeMicrowaveOvenControlID) attributeID:@(MTRAttributeIDTypeClusterMicrowaveOvenControlAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterOperationalState
+
+- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self pauseWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterPauseParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterStopParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterStartParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Start::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self resumeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTROperationalStateClusterResumeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = OperationalState::Commands::Resume::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributePhaseListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeCurrentPhaseID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeCountdownTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalStateListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalErrorID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterRVCOperationalState
+
+- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self pauseWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterPauseParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Pause::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterStopParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Stop::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterStartParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Start::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    [self resumeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+{
+    if (params == nil) {
+        params = [[MTRRVCOperationalStateClusterResumeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = RvcOperationalState::Commands::Resume::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributePhaseListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCurrentPhaseID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCountdownTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalErrorID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterHEPAFilterMonitoring
+
+- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    [self resetConditionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRHEPAFilterMonitoringClusterResetConditionParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = HepaFilterMonitoring::Commands::ResetCondition::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeConditionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeDegradationDirectionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeChangeIndicationID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeInPlaceIndicatorID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) params:params];
+}
+
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeLastChangedTimeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeReplacementProductListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterActivatedCarbonFilterMonitoring
+
+- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    [self resetConditionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeConditionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeDegradationDirectionID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeChangeIndicationID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeInPlaceIndicatorID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) params:params];
+}
+
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeLastChangedTimeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeReplacementProductListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterBooleanSensorConfiguration
+
+- (void)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRBooleanSensorConfigurationClusterSuppressRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = BooleanSensorConfiguration::Commands::SuppressRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
                                     commandPayload:params
                                     expectedValues:expectedValues
                              expectedValueInterval:expectedValueIntervalMs
@@ -8182,90 +8977,127 @@ - (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAla
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeMaskID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeSensitivityLevelID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLatchWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeLatchID) params:params];
+    [self writeAttributeSensitivityLevelWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeSensitivityLevelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsActiveWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsActiveID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsSuppressedWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeSupportedID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsSuppressedID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsEnabledWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsEnabledID) params:params];
+}
+
+- (void)writeAttributeAlarmsEnabledWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeAlarmsEnabledWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeAlarmsEnabledWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsEnabledID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDishwasherAlarmID) attributeID:@(MTRAttributeIDTypeClusterDishwasherAlarmAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterOperationalState
+@implementation MTRClusterValveConfigurationAndControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterOpenParams
+            alloc] init];
     }
-    return self;
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ValveConfigurationAndControl::Commands::Open::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)closeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self pauseWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self closeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-- (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterPauseParams
+        params = [[MTRValveConfigurationAndControlClusterCloseParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Pause::Type;
+    using RequestType = ValveConfigurationAndControl::Commands::Close::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8274,29 +9106,169 @@ - (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)param
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterSetLevelParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = ValveConfigurationAndControl::Commands::SetLevel::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-- (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOpenDurationWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenDurationID) params:params];
+}
+
+- (void)writeAttributeOpenDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeOpenDurationWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeOpenDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenDurationID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAutoCloseTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAutoCloseTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeRemainingDurationWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeRemainingDurationID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeCurrentStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeTargetStateID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpStateWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeStartUpStateID) params:params];
+}
+
+- (void)writeAttributeStartUpStateWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeStartUpStateWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeStartUpStateWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeStartUpStateID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentLevelWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeCurrentLevelID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetLevelWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeTargetLevelID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOpenLevelWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenLevelID) params:params];
+}
+
+- (void)writeAttributeOpenLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeOpenLevelWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeOpenLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenLevelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeValveFaultWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeValveFaultID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterDemandResponseLoadControl
+
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterStopParams
+        params = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Stop::Type;
+    using RequestType = DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8305,29 +9277,52 @@ - (void)stopWithParams:(MTROperationalStateClusterStopParams * _Nullable)params
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-- (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterStartParams
+        params = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Start::Type;
+    using RequestType = DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8336,29 +9331,56 @@ - (void)startWithParams:(MTROperationalStateClusterStartParams * _Nullable)param
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self resumeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
-- (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+
+- (void)clearLoadControlEventsRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    [self clearLoadControlEventsRequestWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+}
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTROperationalStateClusterResumeParams
+        params = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = OperationalState::Commands::Resume::Type;
+    using RequestType = DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8367,105 +9389,128 @@ - (void)resumeWithParams:(MTROperationalStateClusterResumeParams * _Nullable)par
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTROperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributePhaseListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeCurrentPhaseID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeCountdownTimeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveEventsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalStateListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfEventsPerProgramWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfTransitionsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeOperationalErrorID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransitionsID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultRandomStartWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID) params:params];
+}
+
+- (void)writeAttributeDefaultRandomStartWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeDefaultRandomStartWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeDefaultRandomStartWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultRandomDurationWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID) params:params];
+}
+
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeDefaultRandomDurationWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterOperationalStateAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterRVCOperationalState
-
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
+@implementation MTRClusterEnergyEVSE
 
-- (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)disableWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self pauseWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self disableWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-- (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)disableWithParams:(MTREnergyEVSEClusterDisableParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterPauseParams
+        params = [[MTREnergyEVSEClusterDisableParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Pause::Type;
+    using RequestType = EnergyEvse::Commands::Disable::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8474,29 +9519,28 @@ - (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)pa
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
-}
-- (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)enableChargingWithParams:(MTREnergyEVSEClusterEnableChargingParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStopParams
+        params = [[MTREnergyEVSEClusterEnableChargingParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Stop::Type;
+    using RequestType = EnergyEvse::Commands::EnableCharging::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8505,29 +9549,28 @@ - (void)stopWithParams:(MTRRVCOperationalStateClusterStopParams * _Nullable)para
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)startWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
-{
-    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
-}
-- (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)enableDischargingWithParams:(MTREnergyEVSEClusterEnableDischargingParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStartParams
+        params = [[MTREnergyEVSEClusterEnableDischargingParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Start::Type;
+    using RequestType = EnergyEvse::Commands::EnableDischarging::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8536,29 +9579,32 @@ - (void)startWithParams:(MTRRVCOperationalStateClusterStartParams * _Nullable)pa
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (void)resumeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)startDiagnosticsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self resumeWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self startDiagnosticsWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-- (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (void)startDiagnosticsWithParams:(MTREnergyEVSEClusterStartDiagnosticsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterResumeParams
+        params = [[MTREnergyEVSEClusterStartDiagnosticsParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = RvcOperationalState::Commands::Resume::Type;
+    using RequestType = EnergyEvse::Commands::StartDiagnostics::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8567,95 +9613,79 @@ - (void)resumeWithParams:(MTRRVCOperationalStateClusterResumeParams * _Nullable)
                              expectedValueInterval:expectedValueIntervalMs
                                 timedInvokeTimeout:timedInvokeTimeoutMs
                        serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:MTRRVCOperationalStateClusterOperationalCommandResponseParams.class
+                                     responseClass:nil
                                              queue:self.callbackQueue
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributePhaseListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributePhaseListID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCurrentPhaseID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCountdownTimeID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateListID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalErrorID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeGeneratedCommandListID) params:params];
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+- (void)setTargetsWithParams:(MTREnergyEVSEClusterSetTargetsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAcceptedCommandListID) params:params];
-}
+    if (params == nil) {
+        params = [[MTREnergyEVSEClusterSetTargetsParams
+            alloc] init];
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeEventListID) params:params];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAttributeListID) params:params];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeFeatureMapID) params:params];
+    using RequestType = EnergyEvse::Commands::SetTargets::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+- (void)getTargetsWithParams:(MTREnergyEVSEClusterGetTargetsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeClusterRevisionID) params:params];
-}
-
-@end
-
-@implementation MTRClusterHEPAFilterMonitoring
+    if (params == nil) {
+        params = [[MTREnergyEVSEClusterGetTargetsParams
+            alloc] init];
+    }
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(response, error);
+    };
 
-        _device = device;
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
-    return self;
+
+    using RequestType = EnergyEvse::Commands::GetTargets::Type;
+    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
+                                         clusterID:@(RequestType::GetClusterId())
+                                         commandID:@(RequestType::GetCommandId())
+                                    commandPayload:params
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTREnergyEVSEClusterGetTargetsResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
 }
 
-- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)clearTargetsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self resetConditionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self clearTargetsWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
 }
-- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)clearTargetsWithParams:(MTREnergyEVSEClusterClearTargetsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRHEPAFilterMonitoringClusterResetConditionParams
+        params = [[MTREnergyEVSEClusterClearTargetsParams
             alloc] init];
     }
 
@@ -8664,8 +9694,11 @@ - (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionPa
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    if (timedInvokeTimeoutMs == nil) {
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
 
-    using RequestType = HepaFilterMonitoring::Commands::ResetCondition::Type;
+    using RequestType = EnergyEvse::Commands::ClearTargets::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8679,211 +9712,198 @@ - (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionPa
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeConditionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeStateID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupplyStateWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeDegradationDirectionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeSupplyStateID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFaultStateWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeChangeIndicationID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeFaultStateID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeChargingEnabledUntilWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeInPlaceIndicatorID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeChargingEnabledUntilID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDischargingEnabledUntilWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeDischargingEnabledUntilID) params:params];
 }
 
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCircuitCapacityWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeLastChangedTimeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeCircuitCapacityID) params:params];
 }
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMinimumChargeCurrentWithParams:(MTRReadParams * _Nullable)params
 {
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeMinimumChargeCurrentID) params:params];
+}
 
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaximumChargeCurrentWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeMaximumChargeCurrentID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMaximumDischargeCurrentWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeReplacementProductListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeMaximumDischargeCurrentID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserMaximumChargeCurrentWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeUserMaximumChargeCurrentID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAcceptedCommandListID) params:params];
+    [self writeAttributeUserMaximumChargeCurrentWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeUserMaximumChargeCurrentWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeUserMaximumChargeCurrentID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeRandomizationDelayWindowWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeRandomizationDelayWindowID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAttributeListID) params:params];
+    [self writeAttributeRandomizationDelayWindowWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeRandomizationDelayWindowWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeRandomizationDelayWindowID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfWeeklyTargetsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNumberOfWeeklyTargetsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfDailyTargetsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNumberOfDailyTargetsID) params:params];
 }
 
-@end
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeStartTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeStartTimeID) params:params];
+}
 
-@implementation MTRClusterActivatedCarbonFilterMonitoring
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeTargetTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeTargetTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeRequiredEnergyWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeRequiredEnergyID) params:params];
+}
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNextChargeTargetSoCWithParams:(MTRReadParams * _Nullable)params
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeNextChargeTargetSoCID) params:params];
+}
 
-        _device = device;
-    }
-    return self;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeApproximateEVEfficiencyWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeApproximateEVEfficiencyID) params:params];
 }
 
-- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    [self resetConditionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self writeAttributeApproximateEVEfficiencyWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
 }
-- (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)writeAttributeApproximateEVEfficiencyWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
 {
-    if (params == nil) {
-        params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
-            alloc] init];
-    }
-
-    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(error);
-    };
-
-    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
 
-    using RequestType = ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type;
-    [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
-                                         clusterID:@(RequestType::GetClusterId())
-                                         commandID:@(RequestType::GetCommandId())
-                                    commandPayload:params
-                                    expectedValues:expectedValues
-                             expectedValueInterval:expectedValueIntervalMs
-                                timedInvokeTimeout:timedInvokeTimeoutMs
-                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
-                                     responseClass:nil
-                                             queue:self.callbackQueue
-                                        completion:responseHandler];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeApproximateEVEfficiencyID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStateOfChargeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeConditionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeStateOfChargeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeBatteryCapacityWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeDegradationDirectionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeBatteryCapacityID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeVehicleIDWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeChangeIndicationID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeVehicleIDID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionIDWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeInPlaceIndicatorID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionIDID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionDurationID) params:params];
 }
 
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionEnergyChargedWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeLastChangedTimeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
-}
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
-{
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
-
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionEnergyChargedID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSessionEnergyDischargedWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeReplacementProductListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeSessionEnergyDischargedID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeGeneratedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeGeneratedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAcceptedCommandListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeAcceptedCommandListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeEventListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeEventListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAttributeListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeAttributeListID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeFeatureMapID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeFeatureMapID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeEnergyEVSEID) attributeID:@(MTRAttributeIDTypeClusterEnergyEVSEAttributeClusterRevisionID) params:params];
 }
 
 @end
 
 @implementation MTRClusterDoorLock
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -9950,18 +10970,6 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par
 
 @implementation MTRClusterWindowCovering
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)upOrOpenWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self upOrOpenWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -10374,18 +11382,6 @@ - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentage
 
 @implementation MTRClusterBarrierControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierControlGoToPercentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -10617,18 +11613,6 @@ - (void)barrierControlStopWithExpectedValues:(NSArray<NSDictionary<NSString *, i
 
 @implementation MTRClusterPumpConfigurationAndControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPressureWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePumpConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterPumpConfigurationAndControlAttributeMaxPressureID) params:params];
@@ -10831,18 +11815,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterThermostat
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -11567,18 +12539,6 @@ - (void)clearWeeklyScheduleWithExpectedValues:(NSArray<NSDictionary<NSString *,
 
 @implementation MTRClusterFanControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)stepWithParams:(MTRFanControlClusterStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -11786,18 +12746,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterThermostatUserInterfaceConfiguration
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureDisplayModeWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeThermostatUserInterfaceConfigurationID) attributeID:@(MTRAttributeIDTypeClusterThermostatUserInterfaceConfigurationAttributeTemperatureDisplayModeID) params:params];
@@ -11889,18 +12837,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterColorControl
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -12955,18 +13891,6 @@ - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatu
 
 @implementation MTRClusterBallastConfiguration
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributePhysicalMinLevelWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBallastConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBallastConfigurationAttributePhysicalMinLevelID) params:params];
@@ -13202,18 +14126,6 @@ - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary<NSString *,
 
 @implementation MTRClusterIlluminanceMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeIlluminanceMeasurementID) attributeID:@(MTRAttributeIDTypeClusterIlluminanceMeasurementAttributeMeasuredValueID) params:params];
@@ -13282,18 +14194,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterTemperatureMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTemperatureMeasurementID) attributeID:@(MTRAttributeIDTypeClusterTemperatureMeasurementAttributeMeasuredValueID) params:params];
@@ -13357,18 +14257,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterPressureMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePressureMeasurementID) attributeID:@(MTRAttributeIDTypeClusterPressureMeasurementAttributeMeasuredValueID) params:params];
@@ -13457,18 +14345,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterFlowMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeFlowMeasurementID) attributeID:@(MTRAttributeIDTypeClusterFlowMeasurementAttributeMeasuredValueID) params:params];
@@ -13532,18 +14408,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterRelativeHumidityMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRelativeHumidityMeasurementID) attributeID:@(MTRAttributeIDTypeClusterRelativeHumidityMeasurementAttributeMeasuredValueID) params:params];
@@ -13607,18 +14471,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterOccupancySensing
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOccupancyWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOccupancySensingID) attributeID:@(MTRAttributeIDTypeClusterOccupancySensingAttributeOccupancyID) params:params];
@@ -13857,18 +14709,6 @@ - (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSDictionary<NS
 
 @implementation MTRClusterCarbonMonoxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeCarbonMonoxideConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterCarbonMonoxideConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -13958,18 +14798,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterCarbonDioxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeCarbonDioxideConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterCarbonDioxideConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14059,18 +14887,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterNitrogenDioxideConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNitrogenDioxideConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterNitrogenDioxideConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14160,18 +14976,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterOzoneConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOzoneConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterOzoneConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14261,18 +15065,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterPM25ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePM25ConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterPM25ConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14362,18 +15154,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterFormaldehydeConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeFormaldehydeConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterFormaldehydeConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14463,18 +15243,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterPM1ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePM1ConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterPM1ConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14564,18 +15332,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterPM10ConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypePM10ConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterPM10ConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14665,18 +15421,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTotalVolatileOrganicCompoundsConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14766,18 +15510,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterRadonConcentrationMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRadonConcentrationMeasurementID) attributeID:@(MTRAttributeIDTypeClusterRadonConcentrationMeasurementAttributeMeasuredValueID) params:params];
@@ -14867,21 +15599,14 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 
 @implementation MTRClusterWakeOnLAN
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeMACAddressWithParams:(MTRReadParams * _Nullable)params
 {
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeMACAddressID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeMACAddressWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLinkLocalAddressWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeMACAddressID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeLinkLocalAddressID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
@@ -14929,18 +15654,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterChannel
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -15098,18 +15811,6 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params expec
 
 @implementation MTRClusterTargetNavigator
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -15198,18 +15899,6 @@ - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams
 
 @implementation MTRClusterMediaPlayback
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)playWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     [self playWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -15737,18 +16426,6 @@ - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params expectedValue
 
 @implementation MTRClusterMediaInput
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -15946,18 +16623,6 @@ - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params ex
 
 @implementation MTRClusterLowPower
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)sleepWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self sleepWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -16041,18 +16706,6 @@ - (void)sleepWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Null
 
 @implementation MTRClusterKeypadInput
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -16131,18 +16784,6 @@ - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params expectedV
 
 @implementation MTRClusterContentLauncher
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -16277,18 +16918,6 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params e
 
 @implementation MTRClusterAudioOutput
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
@@ -16406,18 +17035,6 @@ - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params
 
 @implementation MTRClusterApplicationLauncher
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -16587,18 +17204,6 @@ - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams * _Nullabl
 
 @implementation MTRClusterApplicationBasic
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeApplicationBasicID) attributeID:@(MTRAttributeIDTypeClusterApplicationBasicAttributeVendorNameID) params:params];
@@ -16682,18 +17287,6 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 
 @implementation MTRClusterAccountLogin
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completion
 {
     if (params == nil) {
@@ -16853,18 +17446,6 @@ - (void)logoutWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nul
 
 @implementation MTRClusterElectricalMeasurement
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)getProfileInfoCommandWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self getProfileInfoCommandWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -17708,18 +18289,6 @@ - (void)getMeasurementProfileCommandWithParams:(MTRElectricalMeasurementClusterG
 
 @implementation MTRClusterUnitTesting
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)testWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self testWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
@@ -19878,18 +20447,6 @@ - (void)testEmitTestFabricScopedEventRequestWithParams:(MTRTestClusterClusterTes
 
 @implementation MTRClusterSampleMEI
 
-- (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue
-{
-    if (self = [super initWithEndpointID:endpointID queue:queue]) {
-        if (device == nil) {
-            return nil;
-        }
-
-        _device = device;
-    }
-    return self;
-}
-
 - (void)pingWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     [self pingWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift
deleted file mode 100644
index 22ff7e4fd07c90..00000000000000
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift
+++ /dev/null
@@ -1,678 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-private let clusterQueue = DispatchQueue(label: "MTRCluster completion dispatch")
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterIdentify {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterGroups {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterScenes {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOnOff {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOnOffSwitchConfiguration {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterLevelControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBinaryInputBasic {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterPulseWidthModulation {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterDescriptor {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBinding {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterAccessControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterActions {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBasicInformation {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOTASoftwareUpdateProvider {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOTASoftwareUpdateRequestor {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterLocalizationConfiguration {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterTimeFormatLocalization {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterUnitLocalization {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterPowerSourceConfiguration {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterPowerSource {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterGeneralCommissioning {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterNetworkCommissioning {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterDiagnosticLogs {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterGeneralDiagnostics {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterSoftwareDiagnostics {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterThreadNetworkDiagnostics {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterWiFiNetworkDiagnostics {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterEthernetNetworkDiagnostics {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterTimeSynchronization {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBridgedDeviceBasicInformation {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterSwitch {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterAdministratorCommissioning {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOperationalCredentials {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterGroupKeyManagement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterFixedLabel {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterUserLabel {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBooleanState {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterICDManagement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterModeSelect {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterLaundryWasherMode {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRefrigeratorAndTemperatureControlledCabinetMode {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterLaundryWasherControls {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRVCRunMode {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRVCCleanMode {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterTemperatureControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRefrigeratorAlarm {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterDishwasherMode {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterAirQuality {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterSmokeCOAlarm {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterDishwasherAlarm {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterOperationalState {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRVCOperationalState {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterHEPAFilterMonitoring {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterActivatedCarbonFilterMonitoring {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterDoorLock {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterWindowCovering {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBarrierControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterPumpConfigurationAndControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterThermostat {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterFanControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterThermostatUserInterfaceConfiguration {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterColorControl {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterBallastConfiguration {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterIlluminanceMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterTemperatureMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterPressureMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterFlowMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterRelativeHumidityMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterOccupancySensing {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterCarbonMonoxideConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterCarbonDioxideConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterNitrogenDioxideConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterOzoneConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterPM25ConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterFormaldehydeConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterPM1ConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterPM10ConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterRadonConcentrationMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterWakeOnLAN {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterChannel {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterTargetNavigator {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterMediaPlayback {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterMediaInput {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterLowPower {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterKeypadInput {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterContentLauncher {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterAudioOutput {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterApplicationLauncher {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterApplicationBasic {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterAccountLogin {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterElectricalMeasurement {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
-extension MTRClusterUnitTesting {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
-@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
-extension MTRClusterSampleMEI {
-    public convenience init(device : MTRDevice, endpointID: UInt) {
-        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
-    }
-}
-
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 3f1e00bc19794b..ceb44ac0de39f4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -2905,6 +2905,12 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSData * _Nonnull credentials MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 @property (nonatomic, copy) NSNumber * _Nullable breadcrumb MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
+@property (nonatomic, copy) NSData * _Nullable networkIdentity MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSData * _Nullable clientIdentifier MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSData * _Nullable possessionNonce MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3003,6 +3009,10 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSString * _Nullable debugText MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 @property (nonatomic, copy) NSNumber * _Nullable networkIndex MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+
+@property (nonatomic, copy) NSData * _Nullable clientIdentity MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSData * _Nullable possessionSignature MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3137,6 +3147,59 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRNetworkCommissioningClusterQueryIdentityParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSData * _Nonnull keyIdentifier MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSData * _Nullable possessionNonce MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRNetworkCommissioningClusterQueryIdentityResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSData * _Nonnull identity MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSData * _Nullable possessionSignature MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRNetworkCommissioningClusterQueryIdentityResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDiagnosticLogsClusterRetrieveLogsRequestParams : NSObject <NSCopying>
 
@@ -3250,6 +3313,55 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRGeneralDiagnosticsClusterTimeSnapshotParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull systemTimeUs MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nullable utcTimeUs MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams : NSObject <NSCopying>
 /**
@@ -4377,10 +4489,29 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
-MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRModeSelectClusterChangeToModeParams : NSObject <NSCopying>
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRICDManagementClusterStayActiveResponseParams : NSObject <NSCopying>
 
-@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull promisedActiveDuration MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRICDManagementClusterStayActiveResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRTimerClusterSetTimerParams : NSObject <NSCopying>
+
+@property (nonatomic, copy, getter=getNewTime) NSNumber * _Nonnull newTime MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4408,9 +4539,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRLaundryWasherModeClusterChangeToModeParams : NSObject <NSCopying>
-
-@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+@interface MTRTimerClusterResetTimerParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4438,30 +4567,39 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRLaundryWasherModeClusterChangeToModeResponseParams : NSObject <NSCopying>
-
-@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+@interface MTRTimerClusterAddTimeParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull additionalTime MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
 /**
- * Initialize an MTRLaundryWasherModeClusterChangeToModeResponseParams with a response-value dictionary
- * of the sort that MTRDeviceResponseHandler would receive.
+ * Controls how much time, in seconds, we will allow for the server to process the command.
  *
- * Will return nil and hand out an error if the response-value dictionary is not
- * a command data response or is not the right command response.
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
  *
- * Will return nil and hand out an error if the data response does not match the known
- * schema for this command.
+ * If nil, the framework will try to select an appropriate timeout value itself.
  */
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams : NSObject <NSCopying>
+@interface MTRTimerClusterReduceTimeParams : NSObject <NSCopying>
 
-@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull timeReduction MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4489,30 +4627,63 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+@interface MTROvenCavityOperationalStateClusterPauseParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
-@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
 
-@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterStopParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
 /**
- * Initialize an MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams with a response-value dictionary
- * of the sort that MTRDeviceResponseHandler would receive.
+ * Controls how much time, in seconds, we will allow for the server to process the command.
  *
- * Will return nil and hand out an error if the response-value dictionary is not
- * a command data response or is not the right command response.
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
  *
- * Will return nil and hand out an error if the data response does not match the known
- * schema for this command.
+ * If nil, the framework will try to select an appropriate timeout value itself.
  */
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCRunModeClusterChangeToModeParams : NSObject <NSCopying>
-
-@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+@interface MTROvenCavityOperationalStateClusterStartParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4540,14 +4711,40 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCRunModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+@interface MTROvenCavityOperationalStateClusterResumeParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
-@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
 
-@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterOperationalCommandResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTROvenCavityOperationalStateClusterErrorStateStruct * _Nonnull commandResponseState MTR_PROVISIONALLY_AVAILABLE;
 
 /**
- * Initialize an MTRRVCRunModeClusterChangeToModeResponseParams with a response-value dictionary
+ * Initialize an MTROvenCavityOperationalStateClusterOperationalCommandResponseParams with a response-value dictionary
  * of the sort that MTRDeviceResponseHandler would receive.
  *
  * Will return nil and hand out an error if the response-value dictionary is not
@@ -4561,7 +4758,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCCleanModeClusterChangeToModeParams : NSObject <NSCopying>
+@interface MTROvenModeClusterChangeToModeParams : NSObject <NSCopying>
 
 @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
 /**
@@ -4591,14 +4788,14 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCCleanModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+@interface MTROvenModeClusterChangeToModeResponseParams : NSObject <NSCopying>
 
 @property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
 
 @property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
 
 /**
- * Initialize an MTRRVCCleanModeClusterChangeToModeResponseParams with a response-value dictionary
+ * Initialize an MTROvenModeClusterChangeToModeResponseParams with a response-value dictionary
  * of the sort that MTRDeviceResponseHandler would receive.
  *
  * Will return nil and hand out an error if the response-value dictionary is not
@@ -4611,12 +4808,10 @@ MTR_PROVISIONALLY_AVAILABLE
                                          error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
 @end
 
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRTemperatureControlClusterSetTemperatureParams : NSObject <NSCopying>
-
-@property (nonatomic, copy) NSNumber * _Nullable targetTemperature MTR_PROVISIONALLY_AVAILABLE;
+MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+@interface MTRModeSelectClusterChangeToModeParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) NSNumber * _Nullable targetTemperatureLevel MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4644,7 +4839,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRDishwasherModeClusterChangeToModeParams : NSObject <NSCopying>
+@interface MTRLaundryWasherModeClusterChangeToModeParams : NSObject <NSCopying>
 
 @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
 /**
@@ -4674,14 +4869,250 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRDishwasherModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+@interface MTRLaundryWasherModeClusterChangeToModeResponseParams : NSObject <NSCopying>
 
 @property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
 
 @property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
 
 /**
- * Initialize an MTRDishwasherModeClusterChangeToModeResponseParams with a response-value dictionary
+ * Initialize an MTRLaundryWasherModeClusterChangeToModeResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCRunModeClusterChangeToModeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCRunModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRRVCRunModeClusterChangeToModeResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCCleanModeClusterChangeToModeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCCleanModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRRVCCleanModeClusterChangeToModeResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRTemperatureControlClusterSetTemperatureParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable targetTemperature MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nullable targetTemperatureLevel MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDishwasherModeClusterChangeToModeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDishwasherModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRDishwasherModeClusterChangeToModeResponseParams with a response-value dictionary
  * of the sort that MTRDeviceResponseHandler would receive.
  *
  * Will return nil and hand out an error if the response-value dictionary is not
@@ -4723,9 +5154,393 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRDishwasherAlarmClusterResetParams : NSObject <NSCopying>
+@interface MTRDishwasherAlarmClusterResetParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull alarms MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDishwasherAlarmClusterModifyEnabledAlarmsParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull mask MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRMicrowaveOvenControlClusterSetCookingParametersParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable cookMode MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nullable cookTime MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nullable powerSetting MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRMicrowaveOvenControlClusterAddMoreTimeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull timeToAdd MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROperationalStateClusterPauseParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROperationalStateClusterStopParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROperationalStateClusterStartParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROperationalStateClusterResumeParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROperationalStateClusterOperationalCommandResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTROperationalStateClusterErrorStateStruct * _Nonnull commandResponseState MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTROperationalStateClusterOperationalCommandResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCOperationalStateClusterPauseParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCOperationalStateClusterStopParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCOperationalStateClusterStartParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCOperationalStateClusterResumeParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
-@property (nonatomic, copy) NSNumber * _Nonnull alarms MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRRVCOperationalStateClusterOperationalCommandResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTRRVCOperationalStateClusterErrorStateStruct * _Nonnull commandResponseState MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTRRVCOperationalStateClusterOperationalCommandResponseParams with a response-value dictionary
+ * of the sort that MTRDeviceResponseHandler would receive.
+ *
+ * Will return nil and hand out an error if the response-value dictionary is not
+ * a command data response or is not the right command response.
+ *
+ * Will return nil and hand out an error if the data response does not match the known
+ * schema for this command.
+ */
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRHEPAFilterMonitoringClusterResetConditionParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4753,9 +5568,37 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRDishwasherAlarmClusterModifyEnabledAlarmsParams : NSObject <NSCopying>
+@interface MTRActivatedCarbonFilterMonitoringClusterResetConditionParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
-@property (nonatomic, copy) NSNumber * _Nonnull mask MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBooleanSensorConfigurationClusterSuppressRequestParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull alarmsToSuppress MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4783,7 +5626,9 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTROperationalStateClusterPauseParams : NSObject <NSCopying>
+@interface MTRValveConfigurationAndControlClusterOpenParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable openDuration MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4811,7 +5656,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTROperationalStateClusterStopParams : NSObject <NSCopying>
+@interface MTRValveConfigurationAndControlClusterCloseParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4839,7 +5684,11 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTROperationalStateClusterStartParams : NSObject <NSCopying>
+@interface MTRValveConfigurationAndControlClusterSetLevelParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull level MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nullable openDuration MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4867,7 +5716,9 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTROperationalStateClusterResumeParams : NSObject <NSCopying>
+@interface MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterLoadControlProgramStruct * _Nonnull loadControlProgram MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4895,12 +5746,134 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTROperationalStateClusterOperationalCommandResponseParams : NSObject <NSCopying>
+@interface MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) MTROperationalStateClusterErrorStateStruct * _Nonnull commandResponseState MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSData * _Nonnull loadControlProgramID MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 
 /**
- * Initialize an MTROperationalStateClusterOperationalCommandResponseParams with a response-value dictionary
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterLoadControlEventStruct * _Nonnull event MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSData * _Nonnull eventID MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nonnull cancelControl MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams : NSObject <NSCopying>
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterGetTargetsResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull dayOfWeekforSequence MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSArray * _Nonnull chargingTargets MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * Initialize an MTREnergyEVSEClusterGetTargetsResponseParams with a response-value dictionary
  * of the sort that MTRDeviceResponseHandler would receive.
  *
  * Will return nil and hand out an error if the response-value dictionary is not
@@ -4914,7 +5887,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCOperationalStateClusterPauseParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterDisableParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4942,7 +5915,13 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCOperationalStateClusterStopParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterEnableChargingParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable chargingEnabledUntil MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nonnull minimumChargeCurrent MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nonnull maximumChargeCurrent MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4970,7 +5949,11 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCOperationalStateClusterStartParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterEnableDischargingParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable dischargingEnabledUntil MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSNumber * _Nonnull maximumDischargeCurrent MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4998,7 +5981,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCOperationalStateClusterResumeParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterStartDiagnosticsParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5026,26 +6009,41 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRRVCOperationalStateClusterOperationalCommandResponseParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterSetTargetsParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) MTRRVCOperationalStateClusterErrorStateStruct * _Nonnull commandResponseState MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull dayOfWeekforSequence MTR_PROVISIONALLY_AVAILABLE;
 
+@property (nonatomic, copy) NSArray * _Nonnull chargingTargets MTR_PROVISIONALLY_AVAILABLE;
 /**
- * Initialize an MTRRVCOperationalStateClusterOperationalCommandResponseParams with a response-value dictionary
- * of the sort that MTRDeviceResponseHandler would receive.
+ * Controls whether the command is a timed command (using Timed Invoke).
  *
- * Will return nil and hand out an error if the response-value dictionary is not
- * a command data response or is not the right command response.
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
  *
- * Will return nil and hand out an error if the data response does not match the known
- * schema for this command.
  */
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
+
+/**
+ * Controls how much time, in seconds, we will allow for the server to process the command.
+ *
+ * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
+ *
+ * If nil, the framework will try to select an appropriate timeout value itself.
+ */
+@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRHEPAFilterMonitoringClusterResetConditionParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterGetTargetsParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull daysToReturn MTR_PROVISIONALLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5073,7 +6071,7 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRActivatedCarbonFilterMonitoringClusterResetConditionParams : NSObject <NSCopying>
+@interface MTREnergyEVSEClusterClearTargetsParams : NSObject <NSCopying>
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 6ffbc9daaa07ae..688d01e89da3c2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -7569,6 +7569,12 @@ - (instancetype)init
         _credentials = [NSData data];
 
         _breadcrumb = nil;
+
+        _networkIdentity = nil;
+
+        _clientIdentifier = nil;
+
+        _possessionNonce = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -7582,6 +7588,9 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
     other.ssid = self.ssid;
     other.credentials = self.credentials;
     other.breadcrumb = self.breadcrumb;
+    other.networkIdentity = self.networkIdentity;
+    other.clientIdentifier = self.clientIdentifier;
+    other.possessionNonce = self.possessionNonce;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -7590,7 +7599,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ssid:%@; credentials:%@; breadcrumb:%@; >", NSStringFromClass([self class]), [_ssid base64EncodedStringWithOptions:0], [_credentials base64EncodedStringWithOptions:0], _breadcrumb];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ssid:%@; credentials:%@; breadcrumb:%@; networkIdentity:%@; clientIdentifier:%@; possessionNonce:%@; >", NSStringFromClass([self class]), [_ssid base64EncodedStringWithOptions:0], [_credentials base64EncodedStringWithOptions:0], _breadcrumb, [_networkIdentity base64EncodedStringWithOptions:0], [_clientIdentifier base64EncodedStringWithOptions:0], [_possessionNonce base64EncodedStringWithOptions:0]];
     return descriptionString;
 }
 
@@ -7614,6 +7623,24 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
             definedValue_0 = self.breadcrumb.unsignedLongLongValue;
         }
     }
+    {
+        if (self.networkIdentity != nil) {
+            auto & definedValue_0 = encodableStruct.networkIdentity.Emplace();
+            definedValue_0 = AsByteSpan(self.networkIdentity);
+        }
+    }
+    {
+        if (self.clientIdentifier != nil) {
+            auto & definedValue_0 = encodableStruct.clientIdentifier.Emplace();
+            definedValue_0 = AsByteSpan(self.clientIdentifier);
+        }
+    }
+    {
+        if (self.possessionNonce != nil) {
+            auto & definedValue_0 = encodableStruct.possessionNonce.Emplace();
+            definedValue_0 = AsByteSpan(self.possessionNonce);
+        }
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -7839,6 +7866,10 @@ - (instancetype)init
         _debugText = nil;
 
         _networkIndex = nil;
+
+        _clientIdentity = nil;
+
+        _possessionSignature = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
@@ -7851,6 +7882,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
     other.networkingStatus = self.networkingStatus;
     other.debugText = self.debugText;
     other.networkIndex = self.networkIndex;
+    other.clientIdentity = self.clientIdentity;
+    other.possessionSignature = self.possessionSignature;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
 
     return other;
@@ -7858,7 +7891,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkingStatus:%@; debugText:%@; networkIndex:%@; >", NSStringFromClass([self class]), _networkingStatus, _debugText, _networkIndex];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkingStatus:%@; debugText:%@; networkIndex:%@; clientIdentity:%@; possessionSignature:%@; >", NSStringFromClass([self class]), _networkingStatus, _debugText, _networkIndex, [_clientIdentity base64EncodedStringWithOptions:0], [_possessionSignature base64EncodedStringWithOptions:0]];
     return descriptionString;
 }
 
@@ -7929,6 +7962,20 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::NetworkC
             self.networkIndex = nil;
         }
     }
+    {
+        if (decodableStruct.clientIdentity.HasValue()) {
+            self.clientIdentity = AsData(decodableStruct.clientIdentity.Value());
+        } else {
+            self.clientIdentity = nil;
+        }
+    }
+    {
+        if (decodableStruct.possessionSignature.HasValue()) {
+            self.possessionSignature = AsData(decodableStruct.possessionSignature.Value());
+        } else {
+            self.possessionSignature = nil;
+        }
+    }
     return CHIP_NO_ERROR;
 }
 
@@ -8221,6 +8268,183 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
+@implementation MTRNetworkCommissioningClusterQueryIdentityParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _keyIdentifier = [NSData data];
+
+        _possessionNonce = nil;
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRNetworkCommissioningClusterQueryIdentityParams alloc] init];
+
+    other.keyIdentifier = self.keyIdentifier;
+    other.possessionNonce = self.possessionNonce;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: keyIdentifier:%@; possessionNonce:%@; >", NSStringFromClass([self class]), [_keyIdentifier base64EncodedStringWithOptions:0], [_possessionNonce base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRNetworkCommissioningClusterQueryIdentityParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.keyIdentifier = AsByteSpan(self.keyIdentifier);
+    }
+    {
+        if (self.possessionNonce != nil) {
+            auto & definedValue_0 = encodableStruct.possessionNonce.Emplace();
+            definedValue_0 = AsByteSpan(self.possessionNonce);
+        }
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRNetworkCommissioningClusterQueryIdentityResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _identity = [NSData data];
+
+        _possessionSignature = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRNetworkCommissioningClusterQueryIdentityResponseParams alloc] init];
+
+    other.identity = self.identity;
+    other.possessionSignature = self.possessionSignature;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: identity:%@; possessionSignature:%@; >", NSStringFromClass([self class]), [_identity base64EncodedStringWithOptions:0], [_possessionSignature base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRNetworkCommissioningClusterQueryIdentityResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType &)decodableStruct
+{
+    {
+        self.identity = AsData(decodableStruct.identity);
+    }
+    {
+        if (decodableStruct.possessionSignature.HasValue()) {
+            self.possessionSignature = AsData(decodableStruct.possessionSignature.Value());
+        } else {
+            self.possessionSignature = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
 @implementation MTRDiagnosticLogsClusterRetrieveLogsRequestParams
 - (instancetype)init
 {
@@ -8529,7 +8753,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRSoftwareDiagnosticsClusterResetWatermarksParams
+@implementation MTRGeneralDiagnosticsClusterTimeSnapshotParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -8541,7 +8765,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRSoftwareDiagnosticsClusterResetWatermarksParams alloc] init];
+    auto other = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -8557,11 +8781,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRSoftwareDiagnosticsClusterResetWatermarksParams (InternalMethods)
+@implementation MTRGeneralDiagnosticsClusterTimeSnapshotParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::SoftwareDiagnostics::Commands::ResetWatermarks::Type encodableStruct;
+    chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -8602,80 +8826,242 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRThreadNetworkDiagnosticsClusterResetCountsParams
+@implementation MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-        _serverSideProcessingTimeout = nil;
+
+        _systemTimeUs = @(0);
+
+        _utcTimeUs = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRThreadNetworkDiagnosticsClusterResetCountsParams alloc] init];
+    auto other = [[MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams alloc] init];
 
-    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
-    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+    other.systemTimeUs = self.systemTimeUs;
+    other.utcTimeUs = self.utcTimeUs;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: systemTimeUs:%@; utcTimeUs:%@; >", NSStringFromClass([self class]), _systemTimeUs, _utcTimeUs];
     return descriptionString;
 }
 
-@end
-
-@implementation MTRThreadNetworkDiagnosticsClusterResetCountsParams (InternalMethods)
-
-- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
 {
-    chip::app::Clusters::ThreadNetworkDiagnostics::Commands::ResetCounts::Type encodableStruct;
-    ListFreer listFreer;
+    if (!(self = [super init])) {
+        return nil;
+    }
 
-    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    using DecodableType = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
     if (buffer.IsNull()) {
-        return CHIP_ERROR_NO_MEMORY;
+        return nil;
     }
 
-    chip::System::PacketBufferTLVWriter writer;
-    // Commands never need chained buffers, since they cannot be chunked.
-    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
-
-    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
 
-    ReturnErrorOnFailure(writer.Finalize(&buffer));
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
 
-    reader.Init(std::move(buffer));
-    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType &)decodableStruct
 {
-    chip::System::PacketBufferTLVReader reader;
-    CHIP_ERROR err = [self _encodeToTLVReader:reader];
-    if (err != CHIP_NO_ERROR) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:err];
-        }
-        return nil;
+    {
+        self.systemTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.systemTimeUs];
     }
-
-    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
-    if (decodedObj == nil) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+    {
+        if (decodableStruct.UTCTimeUs.IsNull()) {
+            self.utcTimeUs = nil;
+        } else {
+            self.utcTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.UTCTimeUs.Value()];
         }
     }
-    return decodedObj;
+    return CHIP_NO_ERROR;
 }
+
 @end
 
-@implementation MTRWiFiNetworkDiagnosticsClusterResetCountsParams
+@implementation MTRSoftwareDiagnosticsClusterResetWatermarksParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRSoftwareDiagnosticsClusterResetWatermarksParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRSoftwareDiagnosticsClusterResetWatermarksParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::SoftwareDiagnostics::Commands::ResetWatermarks::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRThreadNetworkDiagnosticsClusterResetCountsParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRThreadNetworkDiagnosticsClusterResetCountsParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRThreadNetworkDiagnosticsClusterResetCountsParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::ThreadNetworkDiagnostics::Commands::ResetCounts::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRWiFiNetworkDiagnosticsClusterResetCountsParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -11679,12 +12065,91 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRModeSelectClusterChangeToModeParams
+@implementation MTRICDManagementClusterStayActiveResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _newMode = @(0);
+        _promisedActiveDuration = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRICDManagementClusterStayActiveResponseParams alloc] init];
+
+    other.promisedActiveDuration = self.promisedActiveDuration;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: promisedActiveDuration:%@; >", NSStringFromClass([self class]), _promisedActiveDuration];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRICDManagementClusterStayActiveResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType &)decodableStruct
+{
+    {
+        self.promisedActiveDuration = [NSNumber numberWithUnsignedInt:decodableStruct.promisedActiveDuration];
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRTimerClusterSetTimerParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newTime = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -11693,9 +12158,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRModeSelectClusterChangeToModeParams alloc] init];
+    auto other = [[MTRTimerClusterSetTimerParams alloc] init];
 
-    other.newMode = self.newMode;
+    other.newTime = self.newTime;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -11704,20 +12169,20 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newTime:%@; >", NSStringFromClass([self class]), _newTime];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRModeSelectClusterChangeToModeParams (InternalMethods)
+@implementation MTRTimerClusterSetTimerParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::Timer::Commands::SetTimer::Type encodableStruct;
     ListFreer listFreer;
     {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
+        encodableStruct.newTime = self.newTime.unsignedIntValue;
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -11758,12 +12223,10 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRLaundryWasherModeClusterChangeToModeParams
+@implementation MTRTimerClusterResetTimerParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -11772,9 +12235,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRLaundryWasherModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRTimerClusterResetTimerParams alloc] init];
 
-    other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -11783,21 +12245,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRLaundryWasherModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRTimerClusterResetTimerParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::Timer::Commands::ResetTimer::Type encodableStruct;
     ListFreer listFreer;
-    {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
-    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -11837,42 +12296,2491 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRLaundryWasherModeClusterChangeToModeResponseParams
+@implementation MTRTimerClusterAddTimeParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
-
-        _statusText = nil;
+        _additionalTime = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRLaundryWasherModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRTimerClusterAddTimeParams alloc] init];
 
-    other.status = self.status;
-    other.statusText = self.statusText;
+    other.additionalTime = self.additionalTime;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: additionalTime:%@; >", NSStringFromClass([self class]), _additionalTime];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
-{
-    if (!(self = [super init])) {
-        return nil;
-    }
+@end
 
-    using DecodableType = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
+@implementation MTRTimerClusterAddTimeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::Timer::Commands::AddTime::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.additionalTime = self.additionalTime.unsignedIntValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRTimerClusterReduceTimeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _timeReduction = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRTimerClusterReduceTimeParams alloc] init];
+
+    other.timeReduction = self.timeReduction;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeReduction:%@; >", NSStringFromClass([self class]), _timeReduction];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRTimerClusterReduceTimeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::Timer::Commands::ReduceTime::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.timeReduction = self.timeReduction.unsignedIntValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenCavityOperationalStateClusterPauseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenCavityOperationalStateClusterPauseParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterPauseParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenCavityOperationalStateClusterStopParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenCavityOperationalStateClusterStopParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterStopParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenCavityOperationalStateClusterStartParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenCavityOperationalStateClusterStartParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterStartParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Start::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenCavityOperationalStateClusterResumeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenCavityOperationalStateClusterResumeParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterResumeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenCavityOperationalStateClusterOperationalCommandResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _commandResponseState = [MTROvenCavityOperationalStateClusterErrorStateStruct new];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenCavityOperationalStateClusterOperationalCommandResponseParams alloc] init];
+
+    other.commandResponseState = self.commandResponseState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
+{
+    {
+        self.commandResponseState = [MTROvenCavityOperationalStateClusterErrorStateStruct new];
+        self.commandResponseState.errorStateID = [NSNumber numberWithUnsignedChar:decodableStruct.commandResponseState.errorStateID];
+        if (decodableStruct.commandResponseState.errorStateLabel.HasValue()) {
+            self.commandResponseState.errorStateLabel = AsString(decodableStruct.commandResponseState.errorStateLabel.Value());
+            if (self.commandResponseState.errorStateLabel == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.commandResponseState.errorStateLabel = nil;
+        }
+        if (decodableStruct.commandResponseState.errorStateDetails.HasValue()) {
+            self.commandResponseState.errorStateDetails = AsString(decodableStruct.commandResponseState.errorStateDetails.Value());
+            if (self.commandResponseState.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.commandResponseState.errorStateDetails = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTROvenModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROvenModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROvenModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTROvenModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRModeSelectClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRModeSelectClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRModeSelectClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRLaundryWasherModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRLaundryWasherModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRLaundryWasherModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRLaundryWasherModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRLaundryWasherModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRLaundryWasherModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRRVCRunModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRRVCRunModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRRVCRunModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRVCRunModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRRVCRunModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRRVCCleanModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRVCCleanModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRRVCCleanModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRRVCCleanModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRVCCleanModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRRVCCleanModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRTemperatureControlClusterSetTemperatureParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _targetTemperature = nil;
+
+        _targetTemperatureLevel = nil;
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
+
+    other.targetTemperature = self.targetTemperature;
+    other.targetTemperatureLevel = self.targetTemperatureLevel;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: targetTemperature:%@; targetTemperatureLevel:%@; >", NSStringFromClass([self class]), _targetTemperature, _targetTemperatureLevel];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRTemperatureControlClusterSetTemperatureParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        if (self.targetTemperature != nil) {
+            auto & definedValue_0 = encodableStruct.targetTemperature.Emplace();
+            definedValue_0 = self.targetTemperature.shortValue;
+        }
+    }
+    {
+        if (self.targetTemperatureLevel != nil) {
+            auto & definedValue_0 = encodableStruct.targetTemperatureLevel.Emplace();
+            definedValue_0 = self.targetTemperatureLevel.unsignedCharValue;
+        }
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRDishwasherModeClusterChangeToModeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _newMode = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
+
+    other.newMode = self.newMode;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDishwasherModeClusterChangeToModeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRDishwasherModeClusterChangeToModeResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _status = @(0);
+
+        _statusText = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRDishwasherModeClusterChangeToModeResponseParams alloc] init];
+
+    other.status = self.status;
+    other.statusText = self.statusText;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType;
+    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
+                                                                           clusterID:DecodableType::GetClusterId()
+                                                                           commandID:DecodableType::GetCommandId()
+                                                                               error:error];
+    if (buffer.IsNull()) {
+        return nil;
+    }
+
+    chip::TLV::TLVReader reader;
+    reader.Init(buffer->Start(), buffer->DataLength());
+
+    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
+    if (err == CHIP_NO_ERROR) {
+        DecodableType decodedStruct;
+        err = chip::app::DataModel::Decode(reader, decodedStruct);
+        if (err == CHIP_NO_ERROR) {
+            err = [self _setFieldsFromDecodableStruct:decodedStruct];
+            if (err == CHIP_NO_ERROR) {
+                return self;
+            }
+        }
+    }
+
+    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
+    MTR_LOG_ERROR("%s", errorStr.UTF8String);
+    if (error != nil) {
+        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
+        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    }
+    return nil;
+}
+
+@end
+
+@implementation MTRDishwasherModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+{
+    {
+        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    }
+    {
+        if (decodableStruct.statusText.HasValue()) {
+            self.statusText = AsString(decodableStruct.statusText.Value());
+            if (self.statusText == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.statusText = nil;
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+@end
+
+@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRDishwasherAlarmClusterResetParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _alarms = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRDishwasherAlarmClusterResetParams alloc] init];
+
+    other.alarms = self.alarms;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarms:%@; >", NSStringFromClass([self class]), _alarms];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDishwasherAlarmClusterResetParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.alarms = static_cast<std::remove_reference_t<decltype(encodableStruct.alarms)>>(self.alarms.unsignedIntValue);
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _mask = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+
+    other.mask = self.mask;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: mask:%@; >", NSStringFromClass([self class]), _mask];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.mask = static_cast<std::remove_reference_t<decltype(encodableStruct.mask)>>(self.mask.unsignedIntValue);
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRMicrowaveOvenControlClusterSetCookingParametersParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _cookMode = nil;
+
+        _cookTime = nil;
+
+        _powerSetting = nil;
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRMicrowaveOvenControlClusterSetCookingParametersParams alloc] init];
+
+    other.cookMode = self.cookMode;
+    other.cookTime = self.cookTime;
+    other.powerSetting = self.powerSetting;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: cookMode:%@; cookTime:%@; powerSetting:%@; >", NSStringFromClass([self class]), _cookMode, _cookTime, _powerSetting];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRMicrowaveOvenControlClusterSetCookingParametersParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        if (self.cookMode != nil) {
+            auto & definedValue_0 = encodableStruct.cookMode.Emplace();
+            definedValue_0 = self.cookMode.unsignedCharValue;
+        }
+    }
+    {
+        if (self.cookTime != nil) {
+            auto & definedValue_0 = encodableStruct.cookTime.Emplace();
+            definedValue_0 = self.cookTime.unsignedIntValue;
+        }
+    }
+    {
+        if (self.powerSetting != nil) {
+            auto & definedValue_0 = encodableStruct.powerSetting.Emplace();
+            definedValue_0 = self.powerSetting.unsignedCharValue;
+        }
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRMicrowaveOvenControlClusterAddMoreTimeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _timeToAdd = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRMicrowaveOvenControlClusterAddMoreTimeParams alloc] init];
+
+    other.timeToAdd = self.timeToAdd;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeToAdd:%@; >", NSStringFromClass([self class]), _timeToAdd];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRMicrowaveOvenControlClusterAddMoreTimeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.timeToAdd = self.timeToAdd.unsignedIntValue;
+    }
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROperationalStateClusterPauseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROperationalStateClusterPauseParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterPauseParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OperationalState::Commands::Pause::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROperationalStateClusterStopParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROperationalStateClusterStopParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterStopParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OperationalState::Commands::Stop::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROperationalStateClusterStartParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROperationalStateClusterStartParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterStartParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OperationalState::Commands::Start::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROperationalStateClusterResumeParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROperationalStateClusterResumeParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterResumeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::OperationalState::Commands::Resume::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTROperationalStateClusterOperationalCommandResponseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _commandResponseState = [MTROperationalStateClusterErrorStateStruct new];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTROperationalStateClusterOperationalCommandResponseParams alloc] init];
+
+    other.commandResponseState = self.commandResponseState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
+    return descriptionString;
+}
+
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    using DecodableType = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -11907,22 +14815,30 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRLaundryWasherModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTROperationalStateClusterOperationalCommandResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
 {
     {
-        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
-    }
-    {
-        if (decodableStruct.statusText.HasValue()) {
-            self.statusText = AsString(decodableStruct.statusText.Value());
-            if (self.statusText == nil) {
+        self.commandResponseState = [MTROperationalStateClusterErrorStateStruct new];
+        self.commandResponseState.errorStateID = [NSNumber numberWithUnsignedChar:decodableStruct.commandResponseState.errorStateID];
+        if (decodableStruct.commandResponseState.errorStateLabel.HasValue()) {
+            self.commandResponseState.errorStateLabel = AsString(decodableStruct.commandResponseState.errorStateLabel.Value());
+            if (self.commandResponseState.errorStateLabel == nil) {
                 CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
                 return err;
             }
         } else {
-            self.statusText = nil;
+            self.commandResponseState.errorStateLabel = nil;
+        }
+        if (decodableStruct.commandResponseState.errorStateDetails.HasValue()) {
+            self.commandResponseState.errorStateDetails = AsString(decodableStruct.commandResponseState.errorStateDetails.Value());
+            if (self.commandResponseState.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.commandResponseState.errorStateDetails = nil;
         }
     }
     return CHIP_NO_ERROR;
@@ -11930,12 +14846,83 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::LaundryW
 
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+@implementation MTRRVCOperationalStateClusterPauseParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRRVCOperationalStateClusterPauseParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRRVCOperationalStateClusterPauseParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::RvcOperationalState::Commands::Pause::Type encodableStruct;
+    ListFreer listFreer;
+
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
+
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
+
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
+{
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
+    }
+    return decodedObj;
+}
+@end
+
+@implementation MTRRVCOperationalStateClusterStopParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -11944,9 +14931,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterStopParams alloc] init];
 
-    other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -11955,21 +14941,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterStopParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type encodableStruct;
     ListFreer listFreer;
-    {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
-    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -12009,105 +14992,83 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams
+@implementation MTRRVCOperationalStateClusterStartParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _status = @(0);
-
-        _statusText = nil;
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterStartParams alloc] init];
 
-    other.status = self.status;
-    other.statusText = self.statusText;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRRVCOperationalStateClusterStartParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
-    }
+    chip::app::Clusters::RvcOperationalState::Commands::Start::Type encodableStruct;
+    ListFreer listFreer;
 
-    using DecodableType = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
-    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
-                                                                           clusterID:DecodableType::GetClusterId()
-                                                                           commandID:DecodableType::GetCommandId()
-                                                                               error:error];
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
-        return nil;
+        return CHIP_ERROR_NO_MEMORY;
     }
 
-    chip::TLV::TLVReader reader;
-    reader.Init(buffer->Start(), buffer->DataLength());
-
-    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
-    if (err == CHIP_NO_ERROR) {
-        DecodableType decodedStruct;
-        err = chip::app::DataModel::Decode(reader, decodedStruct);
-        if (err == CHIP_NO_ERROR) {
-            err = [self _setFieldsFromDecodableStruct:decodedStruct];
-            if (err == CHIP_NO_ERROR) {
-                return self;
-            }
-        }
-    }
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
 
-    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
-    MTR_LOG_ERROR("%s", errorStr.UTF8String);
-    if (error != nil) {
-        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
-        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
-    }
-    return nil;
-}
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
 
-@end
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams (InternalMethods)
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
 {
-    {
-        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
     }
-    {
-        if (decodableStruct.statusText.HasValue()) {
-            self.statusText = AsString(decodableStruct.statusText.Value());
-            if (self.statusText == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
-            }
-        } else {
-            self.statusText = nil;
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
         }
     }
-    return CHIP_NO_ERROR;
+    return decodedObj;
 }
-
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeParams
+@implementation MTRRVCOperationalStateClusterResumeParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12116,9 +15077,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
 
-    other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12127,21 +15087,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterResumeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type encodableStruct;
     ListFreer listFreer;
-    {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
-    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -12181,31 +15138,28 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeResponseParams
+@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
-
-        _statusText = nil;
+        _commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCRunModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterOperationalCommandResponseParams alloc] init];
 
-    other.status = self.status;
-    other.statusText = self.statusText;
+    other.commandResponseState = self.commandResponseState;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
     return descriptionString;
 }
 
@@ -12216,7 +15170,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -12251,22 +15205,30 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
 {
     {
-        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
-    }
-    {
-        if (decodableStruct.statusText.HasValue()) {
-            self.statusText = AsString(decodableStruct.statusText.Value());
-            if (self.statusText == nil) {
+        self.commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
+        self.commandResponseState.errorStateID = [NSNumber numberWithUnsignedChar:decodableStruct.commandResponseState.errorStateID];
+        if (decodableStruct.commandResponseState.errorStateLabel.HasValue()) {
+            self.commandResponseState.errorStateLabel = AsString(decodableStruct.commandResponseState.errorStateLabel.Value());
+            if (self.commandResponseState.errorStateLabel == nil) {
                 CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
                 return err;
             }
         } else {
-            self.statusText = nil;
+            self.commandResponseState.errorStateLabel = nil;
+        }
+        if (decodableStruct.commandResponseState.errorStateDetails.HasValue()) {
+            self.commandResponseState.errorStateDetails = AsString(decodableStruct.commandResponseState.errorStateDetails.Value());
+            if (self.commandResponseState.errorStateDetails == nil) {
+                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                return err;
+            }
+        } else {
+            self.commandResponseState.errorStateDetails = nil;
         }
     }
     return CHIP_NO_ERROR;
@@ -12274,12 +15236,10 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcRunMo
 
 @end
 
-@implementation MTRRVCCleanModeClusterChangeToModeParams
+@implementation MTRHEPAFilterMonitoringClusterResetConditionParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12288,172 +15248,71 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCCleanModeClusterChangeToModeParams alloc] init];
-
-    other.newMode = self.newMode;
-    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
-    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
-
-    return other;
-}
-
-- (NSString *)description
-{
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
-    return descriptionString;
-}
-
-@end
-
-@implementation MTRRVCCleanModeClusterChangeToModeParams (InternalMethods)
-
-- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
-{
-    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type encodableStruct;
-    ListFreer listFreer;
-    {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
-    }
-
-    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
-    if (buffer.IsNull()) {
-        return CHIP_ERROR_NO_MEMORY;
-    }
-
-    chip::System::PacketBufferTLVWriter writer;
-    // Commands never need chained buffers, since they cannot be chunked.
-    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
-
-    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
-
-    ReturnErrorOnFailure(writer.Finalize(&buffer));
-
-    reader.Init(std::move(buffer));
-    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
-{
-    chip::System::PacketBufferTLVReader reader;
-    CHIP_ERROR err = [self _encodeToTLVReader:reader];
-    if (err != CHIP_NO_ERROR) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:err];
-        }
-        return nil;
-    }
-
-    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
-    if (decodedObj == nil) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
-        }
-    }
-    return decodedObj;
-}
-@end
-
-@implementation MTRRVCCleanModeClusterChangeToModeResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _status = @(0);
-
-        _statusText = nil;
-    }
-    return self;
-}
-
-- (id)copyWithZone:(NSZone * _Nullable)zone;
-{
-    auto other = [[MTRRVCCleanModeClusterChangeToModeResponseParams alloc] init];
-
-    other.status = self.status;
-    other.statusText = self.statusText;
+    auto other = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
+
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRHEPAFilterMonitoringClusterResetConditionParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
-    }
+    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
+    ListFreer listFreer;
 
-    using DecodableType = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
-    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
-                                                                           clusterID:DecodableType::GetClusterId()
-                                                                           commandID:DecodableType::GetCommandId()
-                                                                               error:error];
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
-        return nil;
+        return CHIP_ERROR_NO_MEMORY;
     }
 
-    chip::TLV::TLVReader reader;
-    reader.Init(buffer->Start(), buffer->DataLength());
-
-    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
-    if (err == CHIP_NO_ERROR) {
-        DecodableType decodedStruct;
-        err = chip::app::DataModel::Decode(reader, decodedStruct);
-        if (err == CHIP_NO_ERROR) {
-            err = [self _setFieldsFromDecodableStruct:decodedStruct];
-            if (err == CHIP_NO_ERROR) {
-                return self;
-            }
-        }
-    }
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
 
-    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
-    MTR_LOG_ERROR("%s", errorStr.UTF8String);
-    if (error != nil) {
-        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
-        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
-    }
-    return nil;
-}
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
 
-@end
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
 
-@implementation MTRRVCCleanModeClusterChangeToModeResponseParams (InternalMethods)
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
 {
-    {
-        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
     }
-    {
-        if (decodableStruct.statusText.HasValue()) {
-            self.statusText = AsString(decodableStruct.statusText.Value());
-            if (self.statusText == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
-            }
-        } else {
-            self.statusText = nil;
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
         }
     }
-    return CHIP_NO_ERROR;
+    return decodedObj;
 }
-
 @end
 
-@implementation MTRTemperatureControlClusterSetTemperatureParams
+@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _targetTemperature = nil;
-
-        _targetTemperatureLevel = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12462,10 +15321,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
+    auto other = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
 
-    other.targetTemperature = self.targetTemperature;
-    other.targetTemperatureLevel = self.targetTemperatureLevel;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12474,30 +15331,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: targetTemperature:%@; targetTemperatureLevel:%@; >", NSStringFromClass([self class]), _targetTemperature, _targetTemperatureLevel];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRTemperatureControlClusterSetTemperatureParams (InternalMethods)
+@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type encodableStruct;
+    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
     ListFreer listFreer;
-    {
-        if (self.targetTemperature != nil) {
-            auto & definedValue_0 = encodableStruct.targetTemperature.Emplace();
-            definedValue_0 = self.targetTemperature.shortValue;
-        }
-    }
-    {
-        if (self.targetTemperatureLevel != nil) {
-            auto & definedValue_0 = encodableStruct.targetTemperatureLevel.Emplace();
-            definedValue_0 = self.targetTemperatureLevel.unsignedCharValue;
-        }
-    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -12537,12 +15382,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeParams
+@implementation MTRBooleanSensorConfigurationClusterSuppressRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _newMode = @(0);
+        _alarmsToSuppress = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12551,9 +15396,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRBooleanSensorConfigurationClusterSuppressRequestParams alloc] init];
 
-    other.newMode = self.newMode;
+    other.alarmsToSuppress = self.alarmsToSuppress;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12562,20 +15407,20 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarmsToSuppress:%@; >", NSStringFromClass([self class]), _alarmsToSuppress];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRBooleanSensorConfigurationClusterSuppressRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Type encodableStruct;
     ListFreer listFreer;
     {
-        encodableStruct.newMode = self.newMode.unsignedCharValue;
+        encodableStruct.alarmsToSuppress = static_cast<std::remove_reference_t<decltype(encodableStruct.alarmsToSuppress)>>(self.alarmsToSuppress.unsignedCharValue);
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -12616,100 +15461,89 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeResponseParams
+@implementation MTRValveConfigurationAndControlClusterOpenParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
-
-        _statusText = nil;
+        _openDuration = nil;
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterOpenParams alloc] init];
 
-    other.status = self.status;
-    other.statusText = self.statusText;
+    other.openDuration = self.openDuration;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; statusText:%@; >", NSStringFromClass([self class]), _status, _statusText];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: openDuration:%@; >", NSStringFromClass([self class]), _openDuration];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRValveConfigurationAndControlClusterOpenParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        if (self.openDuration != nil) {
+            auto & definedValue_0 = encodableStruct.openDuration.Emplace();
+            definedValue_0 = self.openDuration.unsignedIntValue;
+        }
     }
 
-    using DecodableType = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType;
-    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
-                                                                           clusterID:DecodableType::GetClusterId()
-                                                                           commandID:DecodableType::GetCommandId()
-                                                                               error:error];
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
-        return nil;
+        return CHIP_ERROR_NO_MEMORY;
     }
 
-    chip::TLV::TLVReader reader;
-    reader.Init(buffer->Start(), buffer->DataLength());
-
-    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
-    if (err == CHIP_NO_ERROR) {
-        DecodableType decodedStruct;
-        err = chip::app::DataModel::Decode(reader, decodedStruct);
-        if (err == CHIP_NO_ERROR) {
-            err = [self _setFieldsFromDecodableStruct:decodedStruct];
-            if (err == CHIP_NO_ERROR) {
-                return self;
-            }
-        }
-    }
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
 
-    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
-    MTR_LOG_ERROR("%s", errorStr.UTF8String);
-    if (error != nil) {
-        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
-        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
-    }
-    return nil;
-}
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
 
-@end
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
 
-@implementation MTRDishwasherModeClusterChangeToModeResponseParams (InternalMethods)
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
 {
-    {
-        self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
+        }
+        return nil;
     }
-    {
-        if (decodableStruct.statusText.HasValue()) {
-            self.statusText = AsString(decodableStruct.statusText.Value());
-            if (self.statusText == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
-            }
-        } else {
-            self.statusText = nil;
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
         }
     }
-    return CHIP_NO_ERROR;
+    return decodedObj;
 }
-
 @end
 
-@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams
+@implementation MTRValveConfigurationAndControlClusterCloseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12721,7 +15555,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterCloseParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -12737,11 +15571,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams (InternalMethods)
+@implementation MTRValveConfigurationAndControlClusterCloseParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Type encodableStruct;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -12782,12 +15616,14 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherAlarmClusterResetParams
+@implementation MTRValveConfigurationAndControlClusterSetLevelParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _alarms = @(0);
+        _level = @(0);
+
+        _openDuration = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12796,9 +15632,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherAlarmClusterResetParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterSetLevelParams alloc] init];
 
-    other.alarms = self.alarms;
+    other.level = self.level;
+    other.openDuration = self.openDuration;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12807,20 +15644,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarms:%@; >", NSStringFromClass([self class]), _alarms];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: level:%@; openDuration:%@; >", NSStringFromClass([self class]), _level, _openDuration];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRDishwasherAlarmClusterResetParams (InternalMethods)
+@implementation MTRValveConfigurationAndControlClusterSetLevelParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type encodableStruct;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Type encodableStruct;
     ListFreer listFreer;
     {
-        encodableStruct.alarms = static_cast<std::remove_reference_t<decltype(encodableStruct.alarms)>>(self.alarms.unsignedIntValue);
+        encodableStruct.level = self.level.unsignedCharValue;
+    }
+    {
+        if (self.openDuration != nil) {
+            auto & definedValue_0 = encodableStruct.openDuration.Emplace();
+            definedValue_0 = self.openDuration.unsignedIntValue;
+        }
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -12861,12 +15704,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
+@implementation MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _mask = @(0);
+        _loadControlProgram = [MTRDemandResponseLoadControlClusterLoadControlProgramStruct new];
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12875,9 +15718,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams alloc] init];
 
-    other.mask = self.mask;
+    other.loadControlProgram = self.loadControlProgram;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12886,20 +15729,39 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: mask:%@; >", NSStringFromClass([self class]), _mask];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: loadControlProgram:%@; >", NSStringFromClass([self class]), _loadControlProgram];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type encodableStruct;
     ListFreer listFreer;
     {
-        encodableStruct.mask = static_cast<std::remove_reference_t<decltype(encodableStruct.mask)>>(self.mask.unsignedIntValue);
+        encodableStruct.loadControlProgram.programID = AsByteSpan(self.loadControlProgram.programID);
+        encodableStruct.loadControlProgram.name = AsCharSpan(self.loadControlProgram.name);
+        if (self.loadControlProgram.enrollmentGroup == nil) {
+            encodableStruct.loadControlProgram.enrollmentGroup.SetNull();
+        } else {
+            auto & nonNullValue_1 = encodableStruct.loadControlProgram.enrollmentGroup.SetNonNull();
+            nonNullValue_1 = self.loadControlProgram.enrollmentGroup.unsignedCharValue;
+        }
+        if (self.loadControlProgram.randomStartMinutes == nil) {
+            encodableStruct.loadControlProgram.randomStartMinutes.SetNull();
+        } else {
+            auto & nonNullValue_1 = encodableStruct.loadControlProgram.randomStartMinutes.SetNonNull();
+            nonNullValue_1 = self.loadControlProgram.randomStartMinutes.unsignedCharValue;
+        }
+        if (self.loadControlProgram.randomDurationMinutes == nil) {
+            encodableStruct.loadControlProgram.randomDurationMinutes.SetNull();
+        } else {
+            auto & nonNullValue_1 = encodableStruct.loadControlProgram.randomDurationMinutes.SetNonNull();
+            nonNullValue_1 = self.loadControlProgram.randomDurationMinutes.unsignedCharValue;
+        }
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -12940,10 +15802,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterPauseParams
+@implementation MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _loadControlProgramID = [NSData data];
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12952,8 +15816,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterPauseParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams alloc] init];
 
+    other.loadControlProgramID = self.loadControlProgramID;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12962,18 +15827,21 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: loadControlProgramID:%@; >", NSStringFromClass([self class]), [_loadControlProgramID base64EncodedStringWithOptions:0]];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterPauseParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Pause::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type encodableStruct;
     ListFreer listFreer;
+    {
+        encodableStruct.loadControlProgramID = AsByteSpan(self.loadControlProgramID);
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13013,10 +15881,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterStopParams
+@implementation MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _event = [MTRDemandResponseLoadControlClusterLoadControlEventStruct new];
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13025,8 +15895,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterStopParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams alloc] init];
 
+    other.event = self.event;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13035,18 +15906,118 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: event:%@; >", NSStringFromClass([self class]), _event];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterStopParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Stop::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type encodableStruct;
     ListFreer listFreer;
+    {
+        encodableStruct.event.eventID = AsByteSpan(self.event.eventID);
+        if (self.event.programID == nil) {
+            encodableStruct.event.programID.SetNull();
+        } else {
+            auto & nonNullValue_1 = encodableStruct.event.programID.SetNonNull();
+            nonNullValue_1 = AsByteSpan(self.event.programID);
+        }
+        encodableStruct.event.control = static_cast<std::remove_reference_t<decltype(encodableStruct.event.control)>>(self.event.control.unsignedShortValue);
+        encodableStruct.event.deviceClass = static_cast<std::remove_reference_t<decltype(encodableStruct.event.deviceClass)>>(self.event.deviceClass.unsignedIntValue);
+        if (self.event.enrollmentGroup != nil) {
+            auto & definedValue_1 = encodableStruct.event.enrollmentGroup.Emplace();
+            definedValue_1 = self.event.enrollmentGroup.unsignedCharValue;
+        }
+        encodableStruct.event.criticality = static_cast<std::remove_reference_t<decltype(encodableStruct.event.criticality)>>(self.event.criticality.unsignedCharValue);
+        if (self.event.startTime == nil) {
+            encodableStruct.event.startTime.SetNull();
+        } else {
+            auto & nonNullValue_1 = encodableStruct.event.startTime.SetNonNull();
+            nonNullValue_1 = self.event.startTime.unsignedIntValue;
+        }
+        {
+            using ListType_1 = std::remove_reference_t<decltype(encodableStruct.event.transitions)>;
+            using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+            if (self.event.transitions.count != 0) {
+                auto * listHolder_1 = new ListHolder<ListMemberType_1>(self.event.transitions.count);
+                if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                    return CHIP_ERROR_INVALID_ARGUMENT;
+                }
+                listFreer.add(listHolder_1);
+                for (size_t i_1 = 0; i_1 < self.event.transitions.count; ++i_1) {
+                    if (![self.event.transitions[i_1] isKindOfClass:[MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct class]]) {
+                        // Wrong kind of value.
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    auto element_1 = (MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct *) self.event.transitions[i_1];
+                    listHolder_1->mList[i_1].duration = element_1.duration.unsignedShortValue;
+                    listHolder_1->mList[i_1].control = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].control)>>(element_1.control.unsignedShortValue);
+                    if (element_1.temperatureControl != nil) {
+                        auto & definedValue_3 = listHolder_1->mList[i_1].temperatureControl.Emplace();
+                        if (element_1.temperatureControl.coolingTempOffset != nil) {
+                            auto & definedValue_5 = definedValue_3.coolingTempOffset.Emplace();
+                            if (element_1.temperatureControl.coolingTempOffset == nil) {
+                                definedValue_5.SetNull();
+                            } else {
+                                auto & nonNullValue_6 = definedValue_5.SetNonNull();
+                                nonNullValue_6 = element_1.temperatureControl.coolingTempOffset.unsignedShortValue;
+                            }
+                        }
+                        if (element_1.temperatureControl.heatingtTempOffset != nil) {
+                            auto & definedValue_5 = definedValue_3.heatingtTempOffset.Emplace();
+                            if (element_1.temperatureControl.heatingtTempOffset == nil) {
+                                definedValue_5.SetNull();
+                            } else {
+                                auto & nonNullValue_6 = definedValue_5.SetNonNull();
+                                nonNullValue_6 = element_1.temperatureControl.heatingtTempOffset.unsignedShortValue;
+                            }
+                        }
+                        if (element_1.temperatureControl.coolingTempSetpoint != nil) {
+                            auto & definedValue_5 = definedValue_3.coolingTempSetpoint.Emplace();
+                            if (element_1.temperatureControl.coolingTempSetpoint == nil) {
+                                definedValue_5.SetNull();
+                            } else {
+                                auto & nonNullValue_6 = definedValue_5.SetNonNull();
+                                nonNullValue_6 = element_1.temperatureControl.coolingTempSetpoint.shortValue;
+                            }
+                        }
+                        if (element_1.temperatureControl.heatingTempSetpoint != nil) {
+                            auto & definedValue_5 = definedValue_3.heatingTempSetpoint.Emplace();
+                            if (element_1.temperatureControl.heatingTempSetpoint == nil) {
+                                definedValue_5.SetNull();
+                            } else {
+                                auto & nonNullValue_6 = definedValue_5.SetNonNull();
+                                nonNullValue_6 = element_1.temperatureControl.heatingTempSetpoint.shortValue;
+                            }
+                        }
+                    }
+                    if (element_1.averageLoadControl != nil) {
+                        auto & definedValue_3 = listHolder_1->mList[i_1].averageLoadControl.Emplace();
+                        definedValue_3.loadAdjustment = element_1.averageLoadControl.loadAdjustment.charValue;
+                    }
+                    if (element_1.dutyCycleControl != nil) {
+                        auto & definedValue_3 = listHolder_1->mList[i_1].dutyCycleControl.Emplace();
+                        definedValue_3.dutyCycle = element_1.dutyCycleControl.dutyCycle.unsignedCharValue;
+                    }
+                    if (element_1.powerSavingsControl != nil) {
+                        auto & definedValue_3 = listHolder_1->mList[i_1].powerSavingsControl.Emplace();
+                        definedValue_3.powerSavings = element_1.powerSavingsControl.powerSavings.unsignedCharValue;
+                    }
+                    if (element_1.heatingSourceControl != nil) {
+                        auto & definedValue_3 = listHolder_1->mList[i_1].heatingSourceControl.Emplace();
+                        definedValue_3.heatingSource = static_cast<std::remove_reference_t<decltype(definedValue_3.heatingSource)>>(element_1.heatingSourceControl.heatingSource.unsignedCharValue);
+                    }
+                }
+                encodableStruct.event.transitions = ListType_1(listHolder_1->mList, self.event.transitions.count);
+            } else {
+                encodableStruct.event.transitions = ListType_1();
+            }
+        }
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13086,10 +16057,14 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterStartParams
+@implementation MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _eventID = [NSData data];
+
+        _cancelControl = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13098,8 +16073,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterStartParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams alloc] init];
 
+    other.eventID = self.eventID;
+    other.cancelControl = self.cancelControl;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13108,18 +16085,24 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: eventID:%@; cancelControl:%@; >", NSStringFromClass([self class]), [_eventID base64EncodedStringWithOptions:0], _cancelControl];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterStartParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Start::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Type encodableStruct;
     ListFreer listFreer;
+    {
+        encodableStruct.eventID = AsByteSpan(self.eventID);
+    }
+    {
+        encodableStruct.cancelControl = static_cast<std::remove_reference_t<decltype(encodableStruct.cancelControl)>>(self.cancelControl.unsignedShortValue);
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13159,7 +16142,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterResumeParams
+@implementation MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13171,7 +16154,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterResumeParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13187,11 +16170,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTROperationalStateClusterResumeParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Resume::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13232,28 +16215,31 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterOperationalCommandResponseParams
+@implementation MTREnergyEVSEClusterGetTargetsResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _commandResponseState = [MTROperationalStateClusterErrorStateStruct new];
+        _dayOfWeekforSequence = @(0);
+
+        _chargingTargets = [NSArray array];
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterOperationalCommandResponseParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterGetTargetsResponseParams alloc] init];
 
-    other.commandResponseState = self.commandResponseState;
+    other.dayOfWeekforSequence = self.dayOfWeekforSequence;
+    other.chargingTargets = self.chargingTargets;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: dayOfWeekforSequence:%@; chargingTargets:%@; >", NSStringFromClass([self class]), _dayOfWeekforSequence, _chargingTargets];
     return descriptionString;
 }
 
@@ -13264,7 +16250,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -13299,30 +16285,39 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTROperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+@implementation MTREnergyEVSEClusterGetTargetsResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType &)decodableStruct
 {
     {
-        self.commandResponseState = [MTROperationalStateClusterErrorStateStruct new];
-        self.commandResponseState.errorStateID = [NSNumber numberWithUnsignedChar:decodableStruct.commandResponseState.errorStateID];
-        if (decodableStruct.commandResponseState.errorStateLabel.HasValue()) {
-            self.commandResponseState.errorStateLabel = AsString(decodableStruct.commandResponseState.errorStateLabel.Value());
-            if (self.commandResponseState.errorStateLabel == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
+        self.dayOfWeekforSequence = [NSNumber numberWithUnsignedChar:decodableStruct.dayOfWeekforSequence.Raw()];
+    }
+    {
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = decodableStruct.chargingTargets.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTREnergyEVSEClusterChargingTargetStruct * newElement_0;
+                newElement_0 = [MTREnergyEVSEClusterChargingTargetStruct new];
+                newElement_0.targetTime = [NSNumber numberWithUnsignedShort:entry_0.targetTime];
+                if (entry_0.targetSoC.HasValue()) {
+                    newElement_0.targetSoC = [NSNumber numberWithUnsignedChar:entry_0.targetSoC.Value()];
+                } else {
+                    newElement_0.targetSoC = nil;
+                }
+                if (entry_0.addedEnergy.HasValue()) {
+                    newElement_0.addedEnergy = [NSNumber numberWithLongLong:entry_0.addedEnergy.Value()];
+                } else {
+                    newElement_0.addedEnergy = nil;
+                }
+                [array_0 addObject:newElement_0];
             }
-        } else {
-            self.commandResponseState.errorStateLabel = nil;
-        }
-        if (decodableStruct.commandResponseState.errorStateDetails.HasValue()) {
-            self.commandResponseState.errorStateDetails = AsString(decodableStruct.commandResponseState.errorStateDetails.Value());
-            if (self.commandResponseState.errorStateDetails == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
                 return err;
             }
-        } else {
-            self.commandResponseState.errorStateDetails = nil;
+            self.chargingTargets = array_0;
         }
     }
     return CHIP_NO_ERROR;
@@ -13330,7 +16325,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::Operatio
 
 @end
 
-@implementation MTRRVCOperationalStateClusterPauseParams
+@implementation MTREnergyEVSEClusterDisableParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13342,7 +16337,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterPauseParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterDisableParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13358,11 +16353,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRVCOperationalStateClusterPauseParams (InternalMethods)
+@implementation MTREnergyEVSEClusterDisableParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Pause::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::Disable::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13403,10 +16398,16 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterStopParams
+@implementation MTREnergyEVSEClusterEnableChargingParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _chargingEnabledUntil = nil;
+
+        _minimumChargeCurrent = @(0);
+
+        _maximumChargeCurrent = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13415,8 +16416,11 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterStopParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterEnableChargingParams alloc] init];
 
+    other.chargingEnabledUntil = self.chargingEnabledUntil;
+    other.minimumChargeCurrent = self.minimumChargeCurrent;
+    other.maximumChargeCurrent = self.maximumChargeCurrent;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13425,18 +16429,32 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: chargingEnabledUntil:%@; minimumChargeCurrent:%@; maximumChargeCurrent:%@; >", NSStringFromClass([self class]), _chargingEnabledUntil, _minimumChargeCurrent, _maximumChargeCurrent];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterStopParams (InternalMethods)
+@implementation MTREnergyEVSEClusterEnableChargingParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Type encodableStruct;
     ListFreer listFreer;
+    {
+        if (self.chargingEnabledUntil == nil) {
+            encodableStruct.chargingEnabledUntil.SetNull();
+        } else {
+            auto & nonNullValue_0 = encodableStruct.chargingEnabledUntil.SetNonNull();
+            nonNullValue_0 = self.chargingEnabledUntil.unsignedIntValue;
+        }
+    }
+    {
+        encodableStruct.minimumChargeCurrent = self.minimumChargeCurrent.longLongValue;
+    }
+    {
+        encodableStruct.maximumChargeCurrent = self.maximumChargeCurrent.longLongValue;
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13476,10 +16494,14 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterStartParams
+@implementation MTREnergyEVSEClusterEnableDischargingParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _dischargingEnabledUntil = nil;
+
+        _maximumDischargeCurrent = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13488,8 +16510,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterStartParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterEnableDischargingParams alloc] init];
 
+    other.dischargingEnabledUntil = self.dischargingEnabledUntil;
+    other.maximumDischargeCurrent = self.maximumDischargeCurrent;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13498,18 +16522,29 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: dischargingEnabledUntil:%@; maximumDischargeCurrent:%@; >", NSStringFromClass([self class]), _dischargingEnabledUntil, _maximumDischargeCurrent];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterStartParams (InternalMethods)
+@implementation MTREnergyEVSEClusterEnableDischargingParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Start::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Type encodableStruct;
     ListFreer listFreer;
+    {
+        if (self.dischargingEnabledUntil == nil) {
+            encodableStruct.dischargingEnabledUntil.SetNull();
+        } else {
+            auto & nonNullValue_0 = encodableStruct.dischargingEnabledUntil.SetNonNull();
+            nonNullValue_0 = self.dischargingEnabledUntil.unsignedIntValue;
+        }
+    }
+    {
+        encodableStruct.maximumDischargeCurrent = self.maximumDischargeCurrent.longLongValue;
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13549,7 +16584,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterResumeParams
+@implementation MTREnergyEVSEClusterStartDiagnosticsParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13561,7 +16596,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterStartDiagnosticsParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13577,11 +16612,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRVCOperationalStateClusterResumeParams (InternalMethods)
+@implementation MTREnergyEVSEClusterStartDiagnosticsParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13622,108 +16657,126 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams
+@implementation MTREnergyEVSEClusterSetTargetsParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
+        _dayOfWeekforSequence = @(0);
+
+        _chargingTargets = [NSArray array];
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterOperationalCommandResponseParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterSetTargetsParams alloc] init];
 
-    other.commandResponseState = self.commandResponseState;
+    other.dayOfWeekforSequence = self.dayOfWeekforSequence;
+    other.chargingTargets = self.chargingTargets;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: dayOfWeekforSequence:%@; chargingTargets:%@; >", NSStringFromClass([self class]), _dayOfWeekforSequence, _chargingTargets];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
-{
-    if (!(self = [super init])) {
-        return nil;
-    }
-
-    using DecodableType = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
-    chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
-                                                                           clusterID:DecodableType::GetClusterId()
-                                                                           commandID:DecodableType::GetCommandId()
-                                                                               error:error];
-    if (buffer.IsNull()) {
-        return nil;
-    }
+@end
 
-    chip::TLV::TLVReader reader;
-    reader.Init(buffer->Start(), buffer->DataLength());
+@implementation MTREnergyEVSEClusterSetTargetsParams (InternalMethods)
 
-    CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag());
-    if (err == CHIP_NO_ERROR) {
-        DecodableType decodedStruct;
-        err = chip::app::DataModel::Decode(reader, decodedStruct);
-        if (err == CHIP_NO_ERROR) {
-            err = [self _setFieldsFromDecodableStruct:decodedStruct];
-            if (err == CHIP_NO_ERROR) {
-                return self;
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+{
+    chip::app::Clusters::EnergyEvse::Commands::SetTargets::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.dayOfWeekforSequence = static_cast<std::remove_reference_t<decltype(encodableStruct.dayOfWeekforSequence)>>(self.dayOfWeekforSequence.unsignedCharValue);
+    }
+    {
+        {
+            using ListType_0 = std::remove_reference_t<decltype(encodableStruct.chargingTargets)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (self.chargingTargets.count != 0) {
+                auto * listHolder_0 = new ListHolder<ListMemberType_0>(self.chargingTargets.count);
+                if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                    return CHIP_ERROR_INVALID_ARGUMENT;
+                }
+                listFreer.add(listHolder_0);
+                for (size_t i_0 = 0; i_0 < self.chargingTargets.count; ++i_0) {
+                    if (![self.chargingTargets[i_0] isKindOfClass:[MTREnergyEVSEClusterChargingTargetStruct class]]) {
+                        // Wrong kind of value.
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    auto element_0 = (MTREnergyEVSEClusterChargingTargetStruct *) self.chargingTargets[i_0];
+                    listHolder_0->mList[i_0].targetTime = element_0.targetTime.unsignedShortValue;
+                    if (element_0.targetSoC != nil) {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].targetSoC.Emplace();
+                        definedValue_2 = element_0.targetSoC.unsignedCharValue;
+                    }
+                    if (element_0.addedEnergy != nil) {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].addedEnergy.Emplace();
+                        definedValue_2 = element_0.addedEnergy.longLongValue;
+                    }
+                }
+                encodableStruct.chargingTargets = ListType_0(listHolder_0->mList, self.chargingTargets.count);
+            } else {
+                encodableStruct.chargingTargets = ListType_0();
             }
         }
     }
 
-    NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()];
-    MTR_LOG_ERROR("%s", errorStr.UTF8String);
-    if (error != nil) {
-        NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) };
-        *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo];
+    auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
+    if (buffer.IsNull()) {
+        return CHIP_ERROR_NO_MEMORY;
     }
-    return nil;
-}
 
-@end
+    chip::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
 
-@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+    ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
+    ReturnErrorOnFailure(writer.Finalize(&buffer));
+
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
 {
-    {
-        self.commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
-        self.commandResponseState.errorStateID = [NSNumber numberWithUnsignedChar:decodableStruct.commandResponseState.errorStateID];
-        if (decodableStruct.commandResponseState.errorStateLabel.HasValue()) {
-            self.commandResponseState.errorStateLabel = AsString(decodableStruct.commandResponseState.errorStateLabel.Value());
-            if (self.commandResponseState.errorStateLabel == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
-            }
-        } else {
-            self.commandResponseState.errorStateLabel = nil;
+    chip::System::PacketBufferTLVReader reader;
+    CHIP_ERROR err = [self _encodeToTLVReader:reader];
+    if (err != CHIP_NO_ERROR) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:err];
         }
-        if (decodableStruct.commandResponseState.errorStateDetails.HasValue()) {
-            self.commandResponseState.errorStateDetails = AsString(decodableStruct.commandResponseState.errorStateDetails.Value());
-            if (self.commandResponseState.errorStateDetails == nil) {
-                CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                return err;
-            }
-        } else {
-            self.commandResponseState.errorStateDetails = nil;
+        return nil;
+    }
+
+    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
         }
     }
-    return CHIP_NO_ERROR;
+    return decodedObj;
 }
-
 @end
 
-@implementation MTRHEPAFilterMonitoringClusterResetConditionParams
+@implementation MTREnergyEVSEClusterGetTargetsParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _daysToReturn = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13732,8 +16785,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterGetTargetsParams alloc] init];
 
+    other.daysToReturn = self.daysToReturn;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13742,18 +16796,21 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: daysToReturn:%@; >", NSStringFromClass([self class]), _daysToReturn];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRHEPAFilterMonitoringClusterResetConditionParams (InternalMethods)
+@implementation MTREnergyEVSEClusterGetTargetsParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::GetTargets::Type encodableStruct;
     ListFreer listFreer;
+    {
+        encodableStruct.daysToReturn = static_cast<std::remove_reference_t<decltype(encodableStruct.daysToReturn)>>(self.daysToReturn.unsignedCharValue);
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13793,7 +16850,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
+@implementation MTREnergyEVSEClusterClearTargetsParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13805,7 +16862,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
+    auto other = [[MTREnergyEVSEClusterClearTargetsParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13821,11 +16878,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams (InternalMethods)
+@implementation MTREnergyEVSEClusterClearTargetsParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
+    chip::app::Clusters::EnergyEvse::Commands::ClearTargets::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
index c00abea960dec0..6aa9d29601a79c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
@@ -496,6 +496,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRNetworkCommissioningClusterQueryIdentityParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRNetworkCommissioningClusterQueryIdentityResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType &)decodableStruct;
+
+@end
+
 @interface MTRDiagnosticLogsClusterRetrieveLogsRequestParams (InternalMethods)
 
 - (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
@@ -514,6 +526,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRGeneralDiagnosticsClusterTimeSnapshotParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType &)decodableStruct;
+
+@end
+
 @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams (InternalMethods)
 
 - (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
@@ -724,6 +748,78 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRICDManagementClusterStayActiveResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType &)decodableStruct;
+
+@end
+
+@interface MTRTimerClusterSetTimerParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRTimerClusterResetTimerParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRTimerClusterAddTimeParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRTimerClusterReduceTimeParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenCavityOperationalStateClusterPauseParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenCavityOperationalStateClusterStopParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenCavityOperationalStateClusterStartParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenCavityOperationalStateClusterResumeParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenCavityOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct;
+
+@end
+
+@interface MTROvenModeClusterChangeToModeParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTROvenModeClusterChangeToModeResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct;
+
+@end
+
 @interface MTRModeSelectClusterChangeToModeParams (InternalMethods)
 
 - (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
@@ -814,6 +910,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRMicrowaveOvenControlClusterSetCookingParametersParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRMicrowaveOvenControlClusterAddMoreTimeParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
 @interface MTROperationalStateClusterPauseParams (InternalMethods)
 
 - (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
@@ -886,6 +994,108 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface MTRBooleanSensorConfigurationClusterSuppressRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRValveConfigurationAndControlClusterOpenParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRValveConfigurationAndControlClusterCloseParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRValveConfigurationAndControlClusterSetLevelParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterGetTargetsResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType &)decodableStruct;
+
+@end
+
+@interface MTREnergyEVSEClusterDisableParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterEnableChargingParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterEnableDischargingParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterStartDiagnosticsParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterSetTargetsParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterGetTargetsParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
+@interface MTREnergyEVSEClusterClearTargetsParams (InternalMethods)
+
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
+
+@end
+
 @interface MTRDoorLockClusterLockDoorParams (InternalMethods)
 
 - (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
index 9bfe9808a3d775..0360cbd0c7027c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
@@ -374,6 +374,42 @@ static BOOL CommandNeedsTimedInvokeInICDManagementCluster(AttributeId aAttribute
     }
     }
 }
+static BOOL CommandNeedsTimedInvokeInTimerCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Timer;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOvenCavityOperationalStateCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OvenCavityOperationalState;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOvenModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OvenMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLaundryDryerControlsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LaundryDryerControls;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL CommandNeedsTimedInvokeInModeSelectCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::ModeSelect;
@@ -482,6 +518,24 @@ static BOOL CommandNeedsTimedInvokeInDishwasherAlarmCluster(AttributeId aAttribu
     }
     }
 }
+static BOOL CommandNeedsTimedInvokeInMicrowaveOvenModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MicrowaveOvenMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInMicrowaveOvenControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MicrowaveOvenControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL CommandNeedsTimedInvokeInOperationalStateCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::OperationalState;
@@ -518,6 +572,63 @@ static BOOL CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(Attr
     }
     }
 }
+static BOOL CommandNeedsTimedInvokeInBooleanSensorConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BooleanSensorConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInValveConfigurationAndControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ValveConfigurationAndControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDemandResponseLoadControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DemandResponseLoadControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInEnergyEVSECluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::EnergyEvse;
+    switch (aAttributeId) {
+    case Commands::Disable::Id: {
+        return YES;
+    }
+    case Commands::EnableCharging::Id: {
+        return YES;
+    }
+    case Commands::EnableDischarging::Id: {
+        return YES;
+    }
+    case Commands::StartDiagnostics::Id: {
+        return YES;
+    }
+    case Commands::SetTargets::Id: {
+        return YES;
+    }
+    case Commands::GetTargets::Id: {
+        return YES;
+    }
+    case Commands::ClearTargets::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL CommandNeedsTimedInvokeInDoorLockCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::DoorLock;
@@ -1035,6 +1146,18 @@ BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonn
     case Clusters::IcdManagement::Id: {
         return CommandNeedsTimedInvokeInICDManagementCluster(commandID);
     }
+    case Clusters::Timer::Id: {
+        return CommandNeedsTimedInvokeInTimerCluster(commandID);
+    }
+    case Clusters::OvenCavityOperationalState::Id: {
+        return CommandNeedsTimedInvokeInOvenCavityOperationalStateCluster(commandID);
+    }
+    case Clusters::OvenMode::Id: {
+        return CommandNeedsTimedInvokeInOvenModeCluster(commandID);
+    }
+    case Clusters::LaundryDryerControls::Id: {
+        return CommandNeedsTimedInvokeInLaundryDryerControlsCluster(commandID);
+    }
     case Clusters::ModeSelect::Id: {
         return CommandNeedsTimedInvokeInModeSelectCluster(commandID);
     }
@@ -1071,6 +1194,12 @@ BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonn
     case Clusters::DishwasherAlarm::Id: {
         return CommandNeedsTimedInvokeInDishwasherAlarmCluster(commandID);
     }
+    case Clusters::MicrowaveOvenMode::Id: {
+        return CommandNeedsTimedInvokeInMicrowaveOvenModeCluster(commandID);
+    }
+    case Clusters::MicrowaveOvenControl::Id: {
+        return CommandNeedsTimedInvokeInMicrowaveOvenControlCluster(commandID);
+    }
     case Clusters::OperationalState::Id: {
         return CommandNeedsTimedInvokeInOperationalStateCluster(commandID);
     }
@@ -1083,6 +1212,18 @@ BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonn
     case Clusters::ActivatedCarbonFilterMonitoring::Id: {
         return CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(commandID);
     }
+    case Clusters::BooleanSensorConfiguration::Id: {
+        return CommandNeedsTimedInvokeInBooleanSensorConfigurationCluster(commandID);
+    }
+    case Clusters::ValveConfigurationAndControl::Id: {
+        return CommandNeedsTimedInvokeInValveConfigurationAndControlCluster(commandID);
+    }
+    case Clusters::DemandResponseLoadControl::Id: {
+        return CommandNeedsTimedInvokeInDemandResponseLoadControlCluster(commandID);
+    }
+    case Clusters::EnergyEvse::Id: {
+        return CommandNeedsTimedInvokeInEnergyEVSECluster(commandID);
+    }
     case Clusters::DoorLock::Id: {
         return CommandNeedsTimedInvokeInDoorLockCluster(commandID);
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
index 1fe61e9f7b8839..09ce06a311f23e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -54,6 +54,9 @@
     { 0x0000002B, DeviceTypeClass::Simple, "Matter Fan" },
     { 0x0000002C, DeviceTypeClass::Simple, "Matter Air Quality Sensor" },
     { 0x0000002D, DeviceTypeClass::Simple, "Matter Air Purifier" },
+    { 0x00000041, DeviceTypeClass::Simple, "Matter Boolean Sensor" },
+    { 0x00000042, DeviceTypeClass::Simple, "Matter Valve" },
+    { 0x00000043, DeviceTypeClass::Simple, "Matter Water Leak Detector" },
     { 0x00000070, DeviceTypeClass::Simple, "Matter Refrigerator" },
     { 0x00000071, DeviceTypeClass::Simple, "Matter Temperature Controlled Cabinet" },
     { 0x00000072, DeviceTypeClass::Simple, "Matter Room Air Conditioner" },
@@ -61,6 +64,7 @@
     { 0x00000074, DeviceTypeClass::Simple, "Matter Robotic Vacuum Cleaner" },
     { 0x00000075, DeviceTypeClass::Simple, "Matter Dishwasher" },
     { 0x00000076, DeviceTypeClass::Simple, "Matter Smoke CO Alarm" },
+    { 0x0000007C, DeviceTypeClass::Simple, "Matter Laundry Dryer" },
     { 0x00000100, DeviceTypeClass::Simple, "Matter On/Off Light" },
     { 0x00000101, DeviceTypeClass::Simple, "Matter Dimmable Light" },
     { 0x00000103, DeviceTypeClass::Simple, "Matter On/Off Light Switch" },
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 62d6915ce98264..72e87ce75bd71e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -1193,8 +1193,8 @@ static id _Nullable DecodeEventPayloadForWiFiNetworkDiagnosticsCluster(EventId a
 
         do {
             NSNumber * _Nonnull memberValue;
-            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.associationFailure)];
-            value.associationFailure = memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.associationFailureCause)];
+            value.associationFailureCause = memberValue;
         } while (0);
         do {
             NSNumber * _Nonnull memberValue;
@@ -1245,7 +1245,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 {
     using namespace Clusters::TimeSynchronization;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::DSTTableEmpty::Id: {
         Events::DSTTableEmpty::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1257,8 +1256,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::DSTStatus::Id: {
         Events::DSTStatus::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1276,8 +1273,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::TimeZoneStatus::Id: {
         Events::TimeZoneStatus::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1309,8 +1304,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::TimeFailure::Id: {
         Events::TimeFailure::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1322,8 +1315,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::MissingTrustedTimeSource::Id: {
         Events::MissingTrustedTimeSource::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1335,7 +1326,6 @@ static id _Nullable DecodeEventPayloadForTimeSynchronizationCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1654,6 +1644,135 @@ static id _Nullable DecodeEventPayloadForICDManagementCluster(EventId aEventId,
     *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
     return nil;
 }
+static id _Nullable DecodeEventPayloadForTimerCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::Timer;
+    switch (aEventId) {
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForOvenCavityOperationalStateCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::OvenCavityOperationalState;
+    switch (aEventId) {
+    case Events::OperationalError::Id: {
+        Events::OperationalError::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTROvenCavityOperationalStateClusterOperationalErrorEvent new];
+
+        do {
+            MTROvenCavityOperationalStateClusterErrorStateStruct * _Nonnull memberValue;
+            memberValue = [MTROvenCavityOperationalStateClusterErrorStateStruct new];
+            memberValue.errorStateID = [NSNumber numberWithUnsignedChar:cppValue.errorState.errorStateID];
+            if (cppValue.errorState.errorStateLabel.HasValue()) {
+                memberValue.errorStateLabel = AsString(cppValue.errorState.errorStateLabel.Value());
+                if (memberValue.errorStateLabel == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+            } else {
+                memberValue.errorStateLabel = nil;
+            }
+            if (cppValue.errorState.errorStateDetails.HasValue()) {
+                memberValue.errorStateDetails = AsString(cppValue.errorState.errorStateDetails.Value());
+                if (memberValue.errorStateDetails == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+            } else {
+                memberValue.errorStateDetails = nil;
+            }
+            value.errorState = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::OperationCompletion::Id: {
+        Events::OperationCompletion::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTROvenCavityOperationalStateClusterOperationCompletionEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:cppValue.completionErrorCode];
+            value.completionErrorCode = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.totalOperationalTime.HasValue()) {
+                if (cppValue.totalOperationalTime.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedInt:cppValue.totalOperationalTime.Value().Value()];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.totalOperationalTime = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.pausedTime.HasValue()) {
+                if (cppValue.pausedTime.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedInt:cppValue.pausedTime.Value().Value()];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.pausedTime = memberValue;
+        } while (0);
+
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForOvenModeCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::OvenMode;
+    switch (aEventId) {
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForLaundryDryerControlsCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::LaundryDryerControls;
+    switch (aEventId) {
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
 static id _Nullable DecodeEventPayloadForModeSelectCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     using namespace Clusters::ModeSelect;
@@ -1742,7 +1861,6 @@ static id _Nullable DecodeEventPayloadForRefrigeratorAlarmCluster(EventId aEvent
 {
     using namespace Clusters::RefrigeratorAlarm;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::Notify::Id: {
         Events::Notify::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1775,7 +1893,6 @@ static id _Nullable DecodeEventPayloadForRefrigeratorAlarmCluster(EventId aEvent
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1812,7 +1929,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 {
     using namespace Clusters::SmokeCoAlarm;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::SmokeAlarm::Id: {
         Events::SmokeAlarm::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1830,8 +1946,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::COAlarm::Id: {
         Events::COAlarm::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1849,8 +1963,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::LowBattery::Id: {
         Events::LowBattery::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1868,8 +1980,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::HardwareFault::Id: {
         Events::HardwareFault::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1881,8 +1991,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::EndOfService::Id: {
         Events::EndOfService::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1894,8 +2002,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::SelfTestComplete::Id: {
         Events::SelfTestComplete::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1907,8 +2013,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::AlarmMuted::Id: {
         Events::AlarmMuted::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1920,8 +2024,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::MuteEnded::Id: {
         Events::MuteEnded::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1933,8 +2035,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::InterconnectSmokeAlarm::Id: {
         Events::InterconnectSmokeAlarm::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1952,8 +2052,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::InterconnectCOAlarm::Id: {
         Events::InterconnectCOAlarm::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1971,8 +2069,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::AllClear::Id: {
         Events::AllClear::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -1984,7 +2080,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1997,7 +2092,6 @@ static id _Nullable DecodeEventPayloadForDishwasherAlarmCluster(EventId aEventId
 {
     using namespace Clusters::DishwasherAlarm;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::Notify::Id: {
         Events::Notify::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -2030,7 +2124,30 @@ static id _Nullable DecodeEventPayloadForDishwasherAlarmCluster(EventId aEventId
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForMicrowaveOvenModeCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::MicrowaveOvenMode;
+    switch (aEventId) {
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForMicrowaveOvenControlCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::MicrowaveOvenControl;
+    switch (aEventId) {
     default: {
         break;
     }
@@ -2043,7 +2160,6 @@ static id _Nullable DecodeEventPayloadForOperationalStateCluster(EventId aEventI
 {
     using namespace Clusters::OperationalState;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::OperationalError::Id: {
         Events::OperationalError::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -2082,8 +2198,6 @@ static id _Nullable DecodeEventPayloadForOperationalStateCluster(EventId aEventI
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::OperationCompletion::Id: {
         Events::OperationCompletion::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -2127,7 +2241,6 @@ static id _Nullable DecodeEventPayloadForOperationalStateCluster(EventId aEventI
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2140,7 +2253,6 @@ static id _Nullable DecodeEventPayloadForRVCOperationalStateCluster(EventId aEve
 {
     using namespace Clusters::RvcOperationalState;
     switch (aEventId) {
-#if MTR_ENABLE_PROVISIONAL
     case Events::OperationalError::Id: {
         Events::OperationalError::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -2179,8 +2291,6 @@ static id _Nullable DecodeEventPayloadForRVCOperationalStateCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Events::OperationCompletion::Id: {
         Events::OperationCompletion::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
@@ -2224,7 +2334,6 @@ static id _Nullable DecodeEventPayloadForRVCOperationalStateCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2257,6 +2366,437 @@ static id _Nullable DecodeEventPayloadForActivatedCarbonFilterMonitoringCluster(
     *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
     return nil;
 }
+static id _Nullable DecodeEventPayloadForBooleanSensorConfigurationCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::BooleanSensorConfiguration;
+    switch (aEventId) {
+    case Events::AlarmsStateChanged::Id: {
+        Events::AlarmsStateChanged::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRBooleanSensorConfigurationClusterAlarmsStateChangedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:cppValue.alarmsActive.Raw()];
+            value.alarmsActive = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.alarmsSuppressed.HasValue()) {
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.alarmsSuppressed.Value().Raw()];
+            } else {
+                memberValue = nil;
+            }
+            value.alarmsSuppressed = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::SensorFault::Id: {
+        Events::SensorFault::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRBooleanSensorConfigurationClusterSensorFaultEvent new];
+
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForValveConfigurationAndControlCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::ValveConfigurationAndControl;
+    switch (aEventId) {
+    case Events::ValveStateChanged::Id: {
+        Events::ValveStateChanged::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRValveConfigurationAndControlClusterValveStateChangedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.valveState)];
+            value.valveState = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::ValveFault::Id: {
+        Events::ValveFault::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRValveConfigurationAndControlClusterValveFaultEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedShort:cppValue.valveFault.Raw()];
+            value.valveFault = memberValue;
+        } while (0);
+
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForDemandResponseLoadControlCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::DemandResponseLoadControl;
+    switch (aEventId) {
+    case Events::LoadControlEventStatusChange::Id: {
+        Events::LoadControlEventStatusChange::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRDemandResponseLoadControlClusterLoadControlEventStatusChangeEvent new];
+
+        do {
+            NSData * _Nonnull memberValue;
+            memberValue = AsData(cppValue.eventID);
+            value.eventID = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.transitionIndex.IsNull()) {
+                memberValue = nil;
+            } else {
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.transitionIndex.Value()];
+            }
+            value.transitionIndex = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.status)];
+            value.status = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.criticality)];
+            value.criticality = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedShort:cppValue.control.Raw()];
+            value.control = memberValue;
+        } while (0);
+        do {
+            MTRDemandResponseLoadControlClusterTemperatureControlStruct * _Nullable memberValue;
+            if (cppValue.temperatureControl.HasValue()) {
+                if (cppValue.temperatureControl.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [MTRDemandResponseLoadControlClusterTemperatureControlStruct new];
+                    if (cppValue.temperatureControl.Value().Value().coolingTempOffset.HasValue()) {
+                        if (cppValue.temperatureControl.Value().Value().coolingTempOffset.Value().IsNull()) {
+                            memberValue.coolingTempOffset = nil;
+                        } else {
+                            memberValue.coolingTempOffset = [NSNumber numberWithUnsignedShort:cppValue.temperatureControl.Value().Value().coolingTempOffset.Value().Value()];
+                        }
+                    } else {
+                        memberValue.coolingTempOffset = nil;
+                    }
+                    if (cppValue.temperatureControl.Value().Value().heatingtTempOffset.HasValue()) {
+                        if (cppValue.temperatureControl.Value().Value().heatingtTempOffset.Value().IsNull()) {
+                            memberValue.heatingtTempOffset = nil;
+                        } else {
+                            memberValue.heatingtTempOffset = [NSNumber numberWithUnsignedShort:cppValue.temperatureControl.Value().Value().heatingtTempOffset.Value().Value()];
+                        }
+                    } else {
+                        memberValue.heatingtTempOffset = nil;
+                    }
+                    if (cppValue.temperatureControl.Value().Value().coolingTempSetpoint.HasValue()) {
+                        if (cppValue.temperatureControl.Value().Value().coolingTempSetpoint.Value().IsNull()) {
+                            memberValue.coolingTempSetpoint = nil;
+                        } else {
+                            memberValue.coolingTempSetpoint = [NSNumber numberWithShort:cppValue.temperatureControl.Value().Value().coolingTempSetpoint.Value().Value()];
+                        }
+                    } else {
+                        memberValue.coolingTempSetpoint = nil;
+                    }
+                    if (cppValue.temperatureControl.Value().Value().heatingTempSetpoint.HasValue()) {
+                        if (cppValue.temperatureControl.Value().Value().heatingTempSetpoint.Value().IsNull()) {
+                            memberValue.heatingTempSetpoint = nil;
+                        } else {
+                            memberValue.heatingTempSetpoint = [NSNumber numberWithShort:cppValue.temperatureControl.Value().Value().heatingTempSetpoint.Value().Value()];
+                        }
+                    } else {
+                        memberValue.heatingTempSetpoint = nil;
+                    }
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.temperatureControl = memberValue;
+        } while (0);
+        do {
+            MTRDemandResponseLoadControlClusterAverageLoadControlStruct * _Nullable memberValue;
+            if (cppValue.averageLoadControl.HasValue()) {
+                if (cppValue.averageLoadControl.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [MTRDemandResponseLoadControlClusterAverageLoadControlStruct new];
+                    memberValue.loadAdjustment = [NSNumber numberWithChar:cppValue.averageLoadControl.Value().Value().loadAdjustment];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.averageLoadControl = memberValue;
+        } while (0);
+        do {
+            MTRDemandResponseLoadControlClusterDutyCycleControlStruct * _Nullable memberValue;
+            if (cppValue.dutyCycleControl.HasValue()) {
+                if (cppValue.dutyCycleControl.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [MTRDemandResponseLoadControlClusterDutyCycleControlStruct new];
+                    memberValue.dutyCycle = [NSNumber numberWithUnsignedChar:cppValue.dutyCycleControl.Value().Value().dutyCycle];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.dutyCycleControl = memberValue;
+        } while (0);
+        do {
+            MTRDemandResponseLoadControlClusterPowerSavingsControlStruct * _Nullable memberValue;
+            if (cppValue.powerSavingsControl.HasValue()) {
+                if (cppValue.powerSavingsControl.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [MTRDemandResponseLoadControlClusterPowerSavingsControlStruct new];
+                    memberValue.powerSavings = [NSNumber numberWithUnsignedChar:cppValue.powerSavingsControl.Value().Value().powerSavings];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.powerSavingsControl = memberValue;
+        } while (0);
+        do {
+            MTRDemandResponseLoadControlClusterHeatingSourceControlStruct * _Nullable memberValue;
+            if (cppValue.heatingSourceControl.HasValue()) {
+                if (cppValue.heatingSourceControl.Value().IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [MTRDemandResponseLoadControlClusterHeatingSourceControlStruct new];
+                    memberValue.heatingSource = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.heatingSourceControl.Value().Value().heatingSource)];
+                }
+            } else {
+                memberValue = nil;
+            }
+            value.heatingSourceControl = memberValue;
+        } while (0);
+
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeEventPayloadForEnergyEVSECluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::EnergyEvse;
+    switch (aEventId) {
+    case Events::EVConnected::Id: {
+        Events::EVConnected::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterEVConnectedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionID];
+            value.sessionID = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::EVNotDetected::Id: {
+        Events::EVNotDetected::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterEVNotDetectedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionID];
+            value.sessionID = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.state)];
+            value.state = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionDuration];
+            value.sessionDuration = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithLongLong:cppValue.sessionEnergyCharged];
+            value.sessionEnergyCharged = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.sessionEnergyDischarged.HasValue()) {
+                memberValue = [NSNumber numberWithLongLong:cppValue.sessionEnergyDischarged.Value()];
+            } else {
+                memberValue = nil;
+            }
+            value.sessionEnergyDischarged = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::EnergyTransferStarted::Id: {
+        Events::EnergyTransferStarted::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterEnergyTransferStartedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionID];
+            value.sessionID = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.state)];
+            value.state = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithLongLong:cppValue.maximumCurrent];
+            value.maximumCurrent = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::EnergyTransferStopped::Id: {
+        Events::EnergyTransferStopped::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterEnergyTransferStoppedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionID];
+            value.sessionID = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.state)];
+            value.state = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.reason)];
+            value.reason = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithLongLong:cppValue.energyTransferred];
+            value.energyTransferred = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::Fault::Id: {
+        Events::Fault::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterFaultEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedInt:cppValue.sessionID];
+            value.sessionID = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.state)];
+            value.state = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.faultStatePreviousState)];
+            value.faultStatePreviousState = memberValue;
+        } while (0);
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.faultStateCurrentState)];
+            value.faultStateCurrentState = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::Rfid::Id: {
+        Events::Rfid::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTREnergyEVSEClusterRFIDEvent new];
+
+        do {
+            NSData * _Nonnull memberValue;
+            memberValue = AsData(cppValue.uid);
+            value.uid = memberValue;
+        } while (0);
+
+        return value;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+    return nil;
+}
 static id _Nullable DecodeEventPayloadForDoorLockCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     using namespace Clusters::DoorLock;
@@ -3417,6 +3957,18 @@ id _Nullable MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVRead
     case Clusters::IcdManagement::Id: {
         return DecodeEventPayloadForICDManagementCluster(aPath.mEventId, aReader, aError);
     }
+    case Clusters::Timer::Id: {
+        return DecodeEventPayloadForTimerCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::OvenCavityOperationalState::Id: {
+        return DecodeEventPayloadForOvenCavityOperationalStateCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::OvenMode::Id: {
+        return DecodeEventPayloadForOvenModeCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::LaundryDryerControls::Id: {
+        return DecodeEventPayloadForLaundryDryerControlsCluster(aPath.mEventId, aReader, aError);
+    }
     case Clusters::ModeSelect::Id: {
         return DecodeEventPayloadForModeSelectCluster(aPath.mEventId, aReader, aError);
     }
@@ -3453,6 +4005,12 @@ id _Nullable MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVRead
     case Clusters::DishwasherAlarm::Id: {
         return DecodeEventPayloadForDishwasherAlarmCluster(aPath.mEventId, aReader, aError);
     }
+    case Clusters::MicrowaveOvenMode::Id: {
+        return DecodeEventPayloadForMicrowaveOvenModeCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::MicrowaveOvenControl::Id: {
+        return DecodeEventPayloadForMicrowaveOvenControlCluster(aPath.mEventId, aReader, aError);
+    }
     case Clusters::OperationalState::Id: {
         return DecodeEventPayloadForOperationalStateCluster(aPath.mEventId, aReader, aError);
     }
@@ -3465,6 +4023,18 @@ id _Nullable MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVRead
     case Clusters::ActivatedCarbonFilterMonitoring::Id: {
         return DecodeEventPayloadForActivatedCarbonFilterMonitoringCluster(aPath.mEventId, aReader, aError);
     }
+    case Clusters::BooleanSensorConfiguration::Id: {
+        return DecodeEventPayloadForBooleanSensorConfigurationCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::ValveConfigurationAndControl::Id: {
+        return DecodeEventPayloadForValveConfigurationAndControlCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::DemandResponseLoadControl::Id: {
+        return DecodeEventPayloadForDemandResponseLoadControlCluster(aPath.mEventId, aReader, aError);
+    }
+    case Clusters::EnergyEvse::Id: {
+        return DecodeEventPayloadForEnergyEVSECluster(aPath.mEventId, aReader, aError);
+    }
     case Clusters::DoorLock::Id: {
         return DecodeEventPayloadForDoorLockCluster(aPath.mEventId, aReader, aError);
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index b4f24e39d67f53..bc41a5d20b6979 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -33,6 +33,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSArray * _Nonnull attributeValueList MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRScenesClusterSceneInfoStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sceneCount MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull currentScene MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull currentGroup MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull sceneValid MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull remainingCapacity MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2))
 @interface MTRDescriptorClusterDeviceTypeStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull deviceType MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -317,6 +327,8 @@ MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0))
 @interface MTRNetworkCommissioningClusterNetworkInfoStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSData * _Nonnull networkID MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 @property (nonatomic, copy) NSNumber * _Nonnull connected MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
+@property (nonatomic, copy) NSData * _Nullable networkIdentifier MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSData * _Nullable clientIdentifier MTR_PROVISIONALLY_AVAILABLE;
 @end
 
 MTR_DEPRECATED("Please use MTRNetworkCommissioningClusterNetworkInfoStruct", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0))
@@ -545,7 +557,9 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRWiFiNetworkDiagnosticsClusterAssociationFailureEvent : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull associationFailure MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull associationFailureCause MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull associationFailure MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use associationFailureCause");
 @property (nonatomic, copy) NSNumber * _Nonnull status MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @end
 
@@ -776,6 +790,44 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterErrorStateStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull errorStateID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable errorStateLabel MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable errorStateDetails MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterOperationalStateStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull operationalStateID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable operationalStateLabel MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterOperationalErrorEvent : NSObject <NSCopying>
+@property (nonatomic, copy) MTROvenCavityOperationalStateClusterErrorStateStruct * _Nonnull errorState MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenCavityOperationalStateClusterOperationCompletionEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull completionErrorCode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable totalOperationalTime MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable pausedTime MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenModeClusterModeTagStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nullable mfgCode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull value MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTROvenModeClusterModeOptionStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSString * _Nonnull label MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull mode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSArray * _Nonnull modeTags MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 @interface MTRModeSelectClusterSemanticTagStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull mfgCode MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -925,6 +977,19 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy) NSNumber * _Nonnull mask MTR_PROVISIONALLY_AVAILABLE;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRMicrowaveOvenModeClusterModeTagStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nullable mfgCode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull value MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRMicrowaveOvenModeClusterModeOptionStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSString * _Nonnull label MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull mode MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSArray * _Nonnull modeTags MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_PROVISIONALLY_AVAILABLE
 @interface MTROperationalStateClusterErrorStateStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull errorStateID MTR_PROVISIONALLY_AVAILABLE;
@@ -987,6 +1052,149 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy) NSString * _Nonnull productIdentifierValue MTR_PROVISIONALLY_AVAILABLE;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBooleanSensorConfigurationClusterAlarmsStateChangedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull alarmsActive MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable alarmsSuppressed MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBooleanSensorConfigurationClusterSensorFaultEvent : NSObject <NSCopying>
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRValveConfigurationAndControlClusterValveStateChangedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull valveState MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRValveConfigurationAndControlClusterValveFaultEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull valveFault MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterHeatingSourceControlStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull heatingSource MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterPowerSavingsControlStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull powerSavings MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterDutyCycleControlStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull dutyCycle MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterAverageLoadControlStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull loadAdjustment MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterTemperatureControlStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nullable coolingTempOffset MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable heatingtTempOffset MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable coolingTempSetpoint MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable heatingTempSetpoint MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull duration MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull control MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterTemperatureControlStruct * _Nullable temperatureControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterAverageLoadControlStruct * _Nullable averageLoadControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterDutyCycleControlStruct * _Nullable dutyCycleControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterPowerSavingsControlStruct * _Nullable powerSavingsControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterHeatingSourceControlStruct * _Nullable heatingSourceControl MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterLoadControlEventStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSData * _Nonnull eventID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSData * _Nullable programID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull control MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull deviceClass MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable enrollmentGroup MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull criticality MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable startTime MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSArray * _Nonnull transitions MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterLoadControlProgramStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSData * _Nonnull programID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable enrollmentGroup MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable randomStartMinutes MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable randomDurationMinutes MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRDemandResponseLoadControlClusterLoadControlEventStatusChangeEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSData * _Nonnull eventID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable transitionIndex MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull criticality MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull control MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterTemperatureControlStruct * _Nullable temperatureControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterAverageLoadControlStruct * _Nullable averageLoadControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterDutyCycleControlStruct * _Nullable dutyCycleControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterPowerSavingsControlStruct * _Nullable powerSavingsControl MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterHeatingSourceControlStruct * _Nullable heatingSourceControl MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterChargingTargetStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull targetTime MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable targetSoC MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable addedEnergy MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterEVConnectedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sessionID MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterEVNotDetectedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sessionID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull state MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull sessionDuration MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull sessionEnergyCharged MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable sessionEnergyDischarged MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterEnergyTransferStartedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sessionID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull state MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull maximumCurrent MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterEnergyTransferStoppedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sessionID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull state MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull reason MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull energyTransferred MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterFaultEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull sessionID MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull state MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull faultStatePreviousState MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull faultStateCurrentState MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTREnergyEVSEClusterRFIDEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSData * _Nonnull uid MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 @interface MTRDoorLockClusterCredentialStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull credentialType MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 9a4b63d7f67cc4..2264c028fae6d4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -99,6 +99,48 @@ - (NSNumber * _Nonnull)clusterId
 
 @end
 
+@implementation MTRScenesClusterSceneInfoStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sceneCount = @(0);
+
+        _currentScene = @(0);
+
+        _currentGroup = @(0);
+
+        _sceneValid = @(0);
+
+        _remainingCapacity = @(0);
+
+        _fabricIndex = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRScenesClusterSceneInfoStruct alloc] init];
+
+    other.sceneCount = self.sceneCount;
+    other.currentScene = self.currentScene;
+    other.currentGroup = self.currentGroup;
+    other.sceneValid = self.sceneValid;
+    other.remainingCapacity = self.remainingCapacity;
+    other.fabricIndex = self.fabricIndex;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sceneCount:%@; currentScene:%@; currentGroup:%@; sceneValid:%@; remainingCapacity:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _sceneCount, _currentScene, _currentGroup, _sceneValid, _remainingCapacity, _fabricIndex];
+    return descriptionString;
+}
+
+@end
+
 @implementation MTRDescriptorClusterDeviceTypeStruct
 - (instancetype)init
 {
@@ -1126,6 +1168,10 @@ - (instancetype)init
         _networkID = [NSData data];
 
         _connected = @(0);
+
+        _networkIdentifier = nil;
+
+        _clientIdentifier = nil;
     }
     return self;
 }
@@ -1136,13 +1182,15 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
 
     other.networkID = self.networkID;
     other.connected = self.connected;
+    other.networkIdentifier = self.networkIdentifier;
+    other.clientIdentifier = self.clientIdentifier;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkID:%@; connected:%@; >", NSStringFromClass([self class]), [_networkID base64EncodedStringWithOptions:0], _connected];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkID:%@; connected:%@; networkIdentifier:%@; clientIdentifier:%@; >", NSStringFromClass([self class]), [_networkID base64EncodedStringWithOptions:0], _connected, [_networkIdentifier base64EncodedStringWithOptions:0], [_clientIdentifier base64EncodedStringWithOptions:0]];
     return descriptionString;
 }
 
@@ -1848,7 +1896,7 @@ - (instancetype)init
 {
     if (self = [super init]) {
 
-        _associationFailure = @(0);
+        _associationFailureCause = @(0);
 
         _status = @(0);
     }
@@ -1859,7 +1907,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
 {
     auto other = [[MTRWiFiNetworkDiagnosticsClusterAssociationFailureEvent alloc] init];
 
-    other.associationFailure = self.associationFailure;
+    other.associationFailureCause = self.associationFailureCause;
     other.status = self.status;
 
     return other;
@@ -1867,10 +1915,19 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: associationFailure:%@; status:%@; >", NSStringFromClass([self class]), _associationFailure, _status];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: associationFailureCause:%@; status:%@; >", NSStringFromClass([self class]), _associationFailureCause, _status];
     return descriptionString;
 }
 
+- (void)setAssociationFailure:(NSNumber * _Nonnull)associationFailure
+{
+    self.associationFailureCause = associationFailure;
+}
+
+- (NSNumber * _Nonnull)associationFailure
+{
+    return self.associationFailureCause;
+}
 @end
 
 @implementation MTRWiFiNetworkDiagnosticsClusterConnectionStatusEvent
@@ -2863,6 +2920,192 @@ - (NSString *)description
 
 @end
 
+@implementation MTROvenCavityOperationalStateClusterErrorStateStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _errorStateID = @(0);
+
+        _errorStateLabel = nil;
+
+        _errorStateDetails = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenCavityOperationalStateClusterErrorStateStruct alloc] init];
+
+    other.errorStateID = self.errorStateID;
+    other.errorStateLabel = self.errorStateLabel;
+    other.errorStateDetails = self.errorStateDetails;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorStateID:%@; errorStateLabel:%@; errorStateDetails:%@; >", NSStringFromClass([self class]), _errorStateID, _errorStateLabel, _errorStateDetails];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterOperationalStateStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _operationalStateID = @(0);
+
+        _operationalStateLabel = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenCavityOperationalStateClusterOperationalStateStruct alloc] init];
+
+    other.operationalStateID = self.operationalStateID;
+    other.operationalStateLabel = self.operationalStateLabel;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: operationalStateID:%@; operationalStateLabel:%@; >", NSStringFromClass([self class]), _operationalStateID, _operationalStateLabel];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterOperationalErrorEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _errorState = [MTROvenCavityOperationalStateClusterErrorStateStruct new];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenCavityOperationalStateClusterOperationalErrorEvent alloc] init];
+
+    other.errorState = self.errorState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorState:%@; >", NSStringFromClass([self class]), _errorState];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenCavityOperationalStateClusterOperationCompletionEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _completionErrorCode = @(0);
+
+        _totalOperationalTime = nil;
+
+        _pausedTime = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenCavityOperationalStateClusterOperationCompletionEvent alloc] init];
+
+    other.completionErrorCode = self.completionErrorCode;
+    other.totalOperationalTime = self.totalOperationalTime;
+    other.pausedTime = self.pausedTime;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: completionErrorCode:%@; totalOperationalTime:%@; pausedTime:%@; >", NSStringFromClass([self class]), _completionErrorCode, _totalOperationalTime, _pausedTime];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenModeClusterModeTagStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _mfgCode = nil;
+
+        _value = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenModeClusterModeTagStruct alloc] init];
+
+    other.mfgCode = self.mfgCode;
+    other.value = self.value;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: mfgCode:%@; value:%@; >", NSStringFromClass([self class]), _mfgCode, _value];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROvenModeClusterModeOptionStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _label = @"";
+
+        _mode = @(0);
+
+        _modeTags = [NSArray array];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROvenModeClusterModeOptionStruct alloc] init];
+
+    other.label = self.label;
+    other.mode = self.mode;
+    other.modeTags = self.modeTags;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: label:%@; mode:%@; modeTags:%@; >", NSStringFromClass([self class]), _label, _mode, _modeTags];
+    return descriptionString;
+}
+
+@end
+
 @implementation MTRModeSelectClusterSemanticTagStruct
 - (instancetype)init
 {
@@ -3591,97 +3834,160 @@ - (NSString *)description
 
 @end
 
-@implementation MTROperationalStateClusterErrorStateStruct
+@implementation MTRMicrowaveOvenModeClusterModeTagStruct
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _errorStateID = @(0);
-
-        _errorStateLabel = nil;
+        _mfgCode = nil;
 
-        _errorStateDetails = nil;
+        _value = @(0);
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTROperationalStateClusterErrorStateStruct alloc] init];
+    auto other = [[MTRMicrowaveOvenModeClusterModeTagStruct alloc] init];
 
-    other.errorStateID = self.errorStateID;
-    other.errorStateLabel = self.errorStateLabel;
-    other.errorStateDetails = self.errorStateDetails;
+    other.mfgCode = self.mfgCode;
+    other.value = self.value;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorStateID:%@; errorStateLabel:%@; errorStateDetails:%@; >", NSStringFromClass([self class]), _errorStateID, _errorStateLabel, _errorStateDetails];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: mfgCode:%@; value:%@; >", NSStringFromClass([self class]), _mfgCode, _value];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterOperationalStateStruct
+@implementation MTRMicrowaveOvenModeClusterModeOptionStruct
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _operationalStateID = @(0);
+        _label = @"";
 
-        _operationalStateLabel = nil;
+        _mode = @(0);
+
+        _modeTags = [NSArray array];
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTROperationalStateClusterOperationalStateStruct alloc] init];
+    auto other = [[MTRMicrowaveOvenModeClusterModeOptionStruct alloc] init];
 
-    other.operationalStateID = self.operationalStateID;
-    other.operationalStateLabel = self.operationalStateLabel;
+    other.label = self.label;
+    other.mode = self.mode;
+    other.modeTags = self.modeTags;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: operationalStateID:%@; operationalStateLabel:%@; >", NSStringFromClass([self class]), _operationalStateID, _operationalStateLabel];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: label:%@; mode:%@; modeTags:%@; >", NSStringFromClass([self class]), _label, _mode, _modeTags];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterOperationalErrorEvent
+@implementation MTROperationalStateClusterErrorStateStruct
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _errorState = [MTROperationalStateClusterErrorStateStruct new];
+        _errorStateID = @(0);
+
+        _errorStateLabel = nil;
+
+        _errorStateDetails = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTROperationalStateClusterOperationalErrorEvent alloc] init];
+    auto other = [[MTROperationalStateClusterErrorStateStruct alloc] init];
 
-    other.errorState = self.errorState;
+    other.errorStateID = self.errorStateID;
+    other.errorStateLabel = self.errorStateLabel;
+    other.errorStateDetails = self.errorStateDetails;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorState:%@; >", NSStringFromClass([self class]), _errorState];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorStateID:%@; errorStateLabel:%@; errorStateDetails:%@; >", NSStringFromClass([self class]), _errorStateID, _errorStateLabel, _errorStateDetails];
     return descriptionString;
 }
 
 @end
 
-@implementation MTROperationalStateClusterOperationCompletionEvent
+@implementation MTROperationalStateClusterOperationalStateStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _operationalStateID = @(0);
+
+        _operationalStateLabel = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROperationalStateClusterOperationalStateStruct alloc] init];
+
+    other.operationalStateID = self.operationalStateID;
+    other.operationalStateLabel = self.operationalStateLabel;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: operationalStateID:%@; operationalStateLabel:%@; >", NSStringFromClass([self class]), _operationalStateID, _operationalStateLabel];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterOperationalErrorEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _errorState = [MTROperationalStateClusterErrorStateStruct new];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTROperationalStateClusterOperationalErrorEvent alloc] init];
+
+    other.errorState = self.errorState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: errorState:%@; >", NSStringFromClass([self class]), _errorState];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTROperationalStateClusterOperationCompletionEvent
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3897,6 +4203,674 @@ - (NSString *)description
 
 @end
 
+@implementation MTRBooleanSensorConfigurationClusterAlarmsStateChangedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _alarmsActive = @(0);
+
+        _alarmsSuppressed = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRBooleanSensorConfigurationClusterAlarmsStateChangedEvent alloc] init];
+
+    other.alarmsActive = self.alarmsActive;
+    other.alarmsSuppressed = self.alarmsSuppressed;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarmsActive:%@; alarmsSuppressed:%@; >", NSStringFromClass([self class]), _alarmsActive, _alarmsSuppressed];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRBooleanSensorConfigurationClusterSensorFaultEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRBooleanSensorConfigurationClusterSensorFaultEvent alloc] init];
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRValveConfigurationAndControlClusterValveStateChangedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _valveState = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRValveConfigurationAndControlClusterValveStateChangedEvent alloc] init];
+
+    other.valveState = self.valveState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: valveState:%@; >", NSStringFromClass([self class]), _valveState];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRValveConfigurationAndControlClusterValveFaultEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _valveFault = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRValveConfigurationAndControlClusterValveFaultEvent alloc] init];
+
+    other.valveFault = self.valveFault;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: valveFault:%@; >", NSStringFromClass([self class]), _valveFault];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterHeatingSourceControlStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _heatingSource = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterHeatingSourceControlStruct alloc] init];
+
+    other.heatingSource = self.heatingSource;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: heatingSource:%@; >", NSStringFromClass([self class]), _heatingSource];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterPowerSavingsControlStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _powerSavings = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterPowerSavingsControlStruct alloc] init];
+
+    other.powerSavings = self.powerSavings;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: powerSavings:%@; >", NSStringFromClass([self class]), _powerSavings];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterDutyCycleControlStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _dutyCycle = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterDutyCycleControlStruct alloc] init];
+
+    other.dutyCycle = self.dutyCycle;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: dutyCycle:%@; >", NSStringFromClass([self class]), _dutyCycle];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterAverageLoadControlStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _loadAdjustment = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterAverageLoadControlStruct alloc] init];
+
+    other.loadAdjustment = self.loadAdjustment;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: loadAdjustment:%@; >", NSStringFromClass([self class]), _loadAdjustment];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterTemperatureControlStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _coolingTempOffset = nil;
+
+        _heatingtTempOffset = nil;
+
+        _coolingTempSetpoint = nil;
+
+        _heatingTempSetpoint = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterTemperatureControlStruct alloc] init];
+
+    other.coolingTempOffset = self.coolingTempOffset;
+    other.heatingtTempOffset = self.heatingtTempOffset;
+    other.coolingTempSetpoint = self.coolingTempSetpoint;
+    other.heatingTempSetpoint = self.heatingTempSetpoint;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: coolingTempOffset:%@; heatingtTempOffset:%@; coolingTempSetpoint:%@; heatingTempSetpoint:%@; >", NSStringFromClass([self class]), _coolingTempOffset, _heatingtTempOffset, _coolingTempSetpoint, _heatingTempSetpoint];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _duration = @(0);
+
+        _control = @(0);
+
+        _temperatureControl = nil;
+
+        _averageLoadControl = nil;
+
+        _dutyCycleControl = nil;
+
+        _powerSavingsControl = nil;
+
+        _heatingSourceControl = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct alloc] init];
+
+    other.duration = self.duration;
+    other.control = self.control;
+    other.temperatureControl = self.temperatureControl;
+    other.averageLoadControl = self.averageLoadControl;
+    other.dutyCycleControl = self.dutyCycleControl;
+    other.powerSavingsControl = self.powerSavingsControl;
+    other.heatingSourceControl = self.heatingSourceControl;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: duration:%@; control:%@; temperatureControl:%@; averageLoadControl:%@; dutyCycleControl:%@; powerSavingsControl:%@; heatingSourceControl:%@; >", NSStringFromClass([self class]), _duration, _control, _temperatureControl, _averageLoadControl, _dutyCycleControl, _powerSavingsControl, _heatingSourceControl];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterLoadControlEventStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _eventID = [NSData data];
+
+        _programID = nil;
+
+        _control = @(0);
+
+        _deviceClass = @(0);
+
+        _enrollmentGroup = nil;
+
+        _criticality = @(0);
+
+        _startTime = nil;
+
+        _transitions = [NSArray array];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterLoadControlEventStruct alloc] init];
+
+    other.eventID = self.eventID;
+    other.programID = self.programID;
+    other.control = self.control;
+    other.deviceClass = self.deviceClass;
+    other.enrollmentGroup = self.enrollmentGroup;
+    other.criticality = self.criticality;
+    other.startTime = self.startTime;
+    other.transitions = self.transitions;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: eventID:%@; programID:%@; control:%@; deviceClass:%@; enrollmentGroup:%@; criticality:%@; startTime:%@; transitions:%@; >", NSStringFromClass([self class]), [_eventID base64EncodedStringWithOptions:0], [_programID base64EncodedStringWithOptions:0], _control, _deviceClass, _enrollmentGroup, _criticality, _startTime, _transitions];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterLoadControlProgramStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _programID = [NSData data];
+
+        _name = @"";
+
+        _enrollmentGroup = nil;
+
+        _randomStartMinutes = nil;
+
+        _randomDurationMinutes = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterLoadControlProgramStruct alloc] init];
+
+    other.programID = self.programID;
+    other.name = self.name;
+    other.enrollmentGroup = self.enrollmentGroup;
+    other.randomStartMinutes = self.randomStartMinutes;
+    other.randomDurationMinutes = self.randomDurationMinutes;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: programID:%@; name:%@; enrollmentGroup:%@; randomStartMinutes:%@; randomDurationMinutes:%@; >", NSStringFromClass([self class]), [_programID base64EncodedStringWithOptions:0], _name, _enrollmentGroup, _randomStartMinutes, _randomDurationMinutes];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRDemandResponseLoadControlClusterLoadControlEventStatusChangeEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _eventID = [NSData data];
+
+        _transitionIndex = nil;
+
+        _status = @(0);
+
+        _criticality = @(0);
+
+        _control = @(0);
+
+        _temperatureControl = nil;
+
+        _averageLoadControl = nil;
+
+        _dutyCycleControl = nil;
+
+        _powerSavingsControl = nil;
+
+        _heatingSourceControl = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRDemandResponseLoadControlClusterLoadControlEventStatusChangeEvent alloc] init];
+
+    other.eventID = self.eventID;
+    other.transitionIndex = self.transitionIndex;
+    other.status = self.status;
+    other.criticality = self.criticality;
+    other.control = self.control;
+    other.temperatureControl = self.temperatureControl;
+    other.averageLoadControl = self.averageLoadControl;
+    other.dutyCycleControl = self.dutyCycleControl;
+    other.powerSavingsControl = self.powerSavingsControl;
+    other.heatingSourceControl = self.heatingSourceControl;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: eventID:%@; transitionIndex:%@; status:%@; criticality:%@; control:%@; temperatureControl:%@; averageLoadControl:%@; dutyCycleControl:%@; powerSavingsControl:%@; heatingSourceControl:%@; >", NSStringFromClass([self class]), [_eventID base64EncodedStringWithOptions:0], _transitionIndex, _status, _criticality, _control, _temperatureControl, _averageLoadControl, _dutyCycleControl, _powerSavingsControl, _heatingSourceControl];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterChargingTargetStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _targetTime = @(0);
+
+        _targetSoC = nil;
+
+        _addedEnergy = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterChargingTargetStruct alloc] init];
+
+    other.targetTime = self.targetTime;
+    other.targetSoC = self.targetSoC;
+    other.addedEnergy = self.addedEnergy;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: targetTime:%@; targetSoC:%@; addedEnergy:%@; >", NSStringFromClass([self class]), _targetTime, _targetSoC, _addedEnergy];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterEVConnectedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sessionID = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterEVConnectedEvent alloc] init];
+
+    other.sessionID = self.sessionID;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sessionID:%@; >", NSStringFromClass([self class]), _sessionID];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterEVNotDetectedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sessionID = @(0);
+
+        _state = @(0);
+
+        _sessionDuration = @(0);
+
+        _sessionEnergyCharged = @(0);
+
+        _sessionEnergyDischarged = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterEVNotDetectedEvent alloc] init];
+
+    other.sessionID = self.sessionID;
+    other.state = self.state;
+    other.sessionDuration = self.sessionDuration;
+    other.sessionEnergyCharged = self.sessionEnergyCharged;
+    other.sessionEnergyDischarged = self.sessionEnergyDischarged;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sessionID:%@; state:%@; sessionDuration:%@; sessionEnergyCharged:%@; sessionEnergyDischarged:%@; >", NSStringFromClass([self class]), _sessionID, _state, _sessionDuration, _sessionEnergyCharged, _sessionEnergyDischarged];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterEnergyTransferStartedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sessionID = @(0);
+
+        _state = @(0);
+
+        _maximumCurrent = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterEnergyTransferStartedEvent alloc] init];
+
+    other.sessionID = self.sessionID;
+    other.state = self.state;
+    other.maximumCurrent = self.maximumCurrent;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sessionID:%@; state:%@; maximumCurrent:%@; >", NSStringFromClass([self class]), _sessionID, _state, _maximumCurrent];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterEnergyTransferStoppedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sessionID = @(0);
+
+        _state = @(0);
+
+        _reason = @(0);
+
+        _energyTransferred = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterEnergyTransferStoppedEvent alloc] init];
+
+    other.sessionID = self.sessionID;
+    other.state = self.state;
+    other.reason = self.reason;
+    other.energyTransferred = self.energyTransferred;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sessionID:%@; state:%@; reason:%@; energyTransferred:%@; >", NSStringFromClass([self class]), _sessionID, _state, _reason, _energyTransferred];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterFaultEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _sessionID = @(0);
+
+        _state = @(0);
+
+        _faultStatePreviousState = @(0);
+
+        _faultStateCurrentState = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterFaultEvent alloc] init];
+
+    other.sessionID = self.sessionID;
+    other.state = self.state;
+    other.faultStatePreviousState = self.faultStatePreviousState;
+    other.faultStateCurrentState = self.faultStateCurrentState;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: sessionID:%@; state:%@; faultStatePreviousState:%@; faultStateCurrentState:%@; >", NSStringFromClass([self class]), _sessionID, _state, _faultStatePreviousState, _faultStateCurrentState];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTREnergyEVSEClusterRFIDEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _uid = [NSData data];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTREnergyEVSEClusterRFIDEvent alloc] init];
+
+    other.uid = self.uid;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: uid:%@; >", NSStringFromClass([self class]), [_uid base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
+@end
+
 @implementation MTRDoorLockClusterCredentialStruct
 - (instancetype)init
 {
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
index 2028d1f03ad9f8..c6b5951eeea936 100644
--- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -1513,23 +1513,6 @@ - (void)test017_TestMTRDeviceBasics
     XCTAssertNotEqual(attributeReportsReceived, 0);
     XCTAssertNotEqual(eventReportsReceived, 0);
 
-    // Check that we can read one of those attributes we received.
-    __auto_type * descriptorCluster = [[MTRClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:queue];
-    __auto_type * partsListDictionary = [descriptorCluster readAttributePartsListWithParams:nil];
-    XCTAssertNotNil(partsListDictionary);
-
-    __auto_type * responseValue = @{
-        MTRAttributePathKey : [MTRAttributePath attributePathWithEndpointID:@(0) clusterID:@(MTRClusterIDTypeDescriptorID) attributeID:@(MTRAttributeIDTypeClusterDescriptorAttributePartsListID)],
-        MTRDataKey : partsListDictionary,
-    };
-
-    NSError * error;
-    __auto_type * report = [[MTRAttributeReport alloc] initWithResponseValue:responseValue error:&error];
-    XCTAssertNil(error);
-    XCTAssertNotNil(report);
-    XCTAssertNotNil(report.value);
-    XCTAssertTrue([report.value isKindOfClass:NSArray.class]);
-
     // Before resubscribe, first test write failure and expected value effects
     NSNumber * testEndpointID = @(1);
     NSNumber * testClusterID = @(8);
diff --git a/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift b/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
index aa4f21c4463491..b800588e55cd03 100644
--- a/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
+++ b/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
@@ -100,8 +100,8 @@ class MTRSwiftDeviceTestDelegate : NSObject, MTRDeviceDelegate {
 // Because we are using things from Matter.framework that are flagged
 // as only being available starting with macOS 13.5, we need to flag our
 // code with the same availability annotation.
-@available(macOS, introduced: 14.2)
-@available(iOS, introduced: 17.2)
+@available(macOS, introduced: 14.1)
+@available(iOS, introduced: 17.1)
 class MTRSwiftDeviceTests : XCTestCase {
     static var sStackInitRan : Bool = false
     static var sNeedsStackShutdown : Bool = true
@@ -292,22 +292,6 @@ class MTRSwiftDeviceTests : XCTestCase {
         XCTAssertNotEqual(attributeReportsReceived, 0)
         XCTAssertNotEqual(eventReportsReceived, 0)
 
-        // Check that we can read one of those attributes we received.
-        let descriptorCluster = MTRClusterDescriptor(device: device, endpointID: 0)
-        let partsListDictionary = descriptorCluster.readAttributePartsList(with: nil)
-        XCTAssertNotNil(partsListDictionary);
-
-        let path = MTRAttributePath(endpointID: 0,
-                                     clusterID: MTRClusterIDType.descriptorID.rawValue as NSNumber,
-                                   attributeID: MTRAttributeIDType.clusterDescriptorAttributePartsListID.rawValue as NSNumber)
-        let responseValue : [String: Any] = [
-            MTRAttributePathKey: path,
-            MTRDataKey: partsListDictionary!,
-        ]
-        let report = try! MTRAttributeReport(responseValue: responseValue)
-        XCTAssertNotNil(report.value)
-        XCTAssertTrue(report.value is [NSNumber])
-
         // Before resubscribe, first test write failure and expected value effects
         let testEndpointID = 1 as NSNumber
         let testClusterID = 8 as NSNumber
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index fcc5d770f64889..a7f00d50661487 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -178,7 +178,6 @@
 		51B22C222740CB1D008D5055 /* MTRCommandPayloadsObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B22C212740CB1D008D5055 /* MTRCommandPayloadsObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		51B22C262740CB32008D5055 /* MTRStructsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B22C252740CB32008D5055 /* MTRStructsObjc.mm */; };
 		51B22C2A2740CB47008D5055 /* MTRCommandPayloadsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B22C292740CB47008D5055 /* MTRCommandPayloadsObjc.mm */; };
-		51B6C5C62AD85B3D003F4D3A /* MTRClusters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */; };
 		51C8E3F82825CDB600D47D00 /* MTRTestKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */; };
 		51C984622A61CE2A00B0AD9A /* MTRFabricInfoChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */; };
 		51CFDDB12AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */; };
@@ -543,9 +542,7 @@
 		51B22C212740CB1D008D5055 /* MTRCommandPayloadsObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandPayloadsObjc.h; sourceTree = "<group>"; };
 		51B22C252740CB32008D5055 /* MTRStructsObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRStructsObjc.mm; sourceTree = "<group>"; };
 		51B22C292740CB47008D5055 /* MTRCommandPayloadsObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCommandPayloadsObjc.mm; sourceTree = "<group>"; };
-		51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MTRClusters.swift; sourceTree = "<group>"; };
 		51B6C5C72AD85B47003F4D3A /* MTRCommandPayloads_Internal.zapt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MTRCommandPayloads_Internal.zapt; sourceTree = "<group>"; };
-		51B6C5C92AD85B50003F4D3A /* MTRClusters-swift.zapt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "MTRClusters-swift.zapt"; sourceTree = "<group>"; };
 		51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestKeys.m; sourceTree = "<group>"; };
 		51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRFabricInfoChecker.m; sourceTree = "<group>"; };
 		51C984612A61CE2A00B0AD9A /* MTRFabricInfoChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRFabricInfoChecker.h; sourceTree = "<group>"; };
@@ -1000,7 +997,6 @@
 				51B22C1D2740CB0A008D5055 /* MTRStructsObjc.h */,
 				51B22C252740CB32008D5055 /* MTRStructsObjc.mm */,
 				5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */,
-				51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */,
 				51F522672AE70734000C4050 /* MTRDeviceTypeMetadata.mm */,
 			);
 			path = "zap-generated";
@@ -1035,7 +1031,6 @@
 				3D843728294984AF0070D20A /* MTRClusters.zapt */,
 				3D843720294984AF0070D20A /* MTRClusters_Internal.zapt */,
 				3D843726294984AF0070D20A /* MTRClusters-src.zapt */,
-				51B6C5C92AD85B50003F4D3A /* MTRClusters-swift.zapt */,
 				3D84371A294984AF0070D20A /* MTRCommandPayloadsObjc.zapt */,
 				3D843727294984AF0070D20A /* MTRCommandPayloadsObjc-src.zapt */,
 				51B6C5C72AD85B47003F4D3A /* MTRCommandPayloads_Internal.zapt */,
@@ -1571,7 +1566,6 @@
 					};
 					B202528C2459E34F00F97062 = {
 						CreatedOnToolsVersion = 11.4.1;
-						LastSwiftMigration = 1420;
 					};
 					B20252952459E34F00F97062 = {
 						CreatedOnToolsVersion = 11.4.1;
@@ -1747,7 +1741,6 @@
 				2C222AD1255C620600E446B9 /* MTRBaseDevice.mm in Sources */,
 				1EC3238D271999E2002A8BF0 /* cluster-objects.cpp in Sources */,
 				3CF134A9289D8D800017A19E /* MTRCSRInfo.mm in Sources */,
-				51B6C5C62AD85B3D003F4D3A /* MTRClusters.swift in Sources */,
 				991DC0892475F47D00C13860 /* MTRDeviceController.mm in Sources */,
 				B2E0D7B7245B0B5C003C5B48 /* MTRQRCodeSetupPayloadParser.mm in Sources */,
 				514304202914CED9004DC7FE /* generic-callback-stubs.cpp in Sources */,
@@ -1908,6 +1901,13 @@
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 				USER_HEADER_SEARCH_PATHS = "";
+				WARNING_CFLAGS = (
+					"-Wformat",
+					"-Wformat-nonliteral",
+					"-Wformat-security",
+					"-Wconversion",
+					"-Wno-documentation",
+				);
 			};
 			name = Debug;
 		};
@@ -1977,6 +1977,13 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "";
+				WARNING_CFLAGS = (
+					"-Wformat",
+					"-Wformat-nonliteral",
+					"-Wformat-security",
+					"-Wconversion",
+					"-Wno-documentation",
+				);
 			};
 			name = Release;
 		};
@@ -2056,7 +2063,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CHIP_ROOT = "$(PROJECT_DIR)/../../..";
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2068,6 +2074,7 @@
 					"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
 					"$(inherited)",
 					"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
+					"MTR_ENABLE_PROVISIONAL=1",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(CHIP_ROOT)/src",
@@ -2086,11 +2093,6 @@
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
 				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
 				OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
 				OTHER_LDFLAGS = "";
@@ -2129,8 +2131,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 				TAPI_VERIFY_MODE = Pedantic;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSION_INFO_EXPORT_DECL = "__attribute__((visibility(\"hidden\")))";
@@ -2140,7 +2140,6 @@
 		BA09EB752474881D00605257 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				"HEADER_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/../../../src";
@@ -2230,7 +2229,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CHIP_ROOT = "$(PROJECT_DIR)/../../..";
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2242,6 +2240,7 @@
 					"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
 					"$(inherited)",
 					"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
+					"MTR_ENABLE_PROVISIONAL=1",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(CHIP_ROOT)/src",
@@ -2260,11 +2259,6 @@
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
 				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
 				OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
 				OTHER_LDFLAGS = "";
@@ -2304,7 +2298,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				STRIP_STYLE = "non-global";
-				SWIFT_VERSION = 5.0;
 				TAPI_VERIFY_MODE = Pedantic;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSION_INFO_EXPORT_DECL = "__attribute__((visibility(\"hidden\")))";
@@ -2314,7 +2307,6 @@
 		BA09EB792474882200605257 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index e29c00161337db..bafca37458c8a3 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -302,6 +302,19 @@
 #define CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION 1
 #endif // CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
 
+/**
+ * The device shall check every WIFI_START_CHECK_TIME_USEC whether Wi-Fi management
+ * has been fully initialized. If after WIFI_START_CHECK_ATTEMPTS Wi-Fi management
+ * still hasn't been initialized, the device configuration is reset, and device
+ * needs to be paired again.
+ */
+#ifndef WIFI_START_CHECK_TIME_USEC
+#define WIFI_START_CHECK_TIME_USEC 100000 // 100ms
+#endif
+#ifndef WIFI_START_CHECK_ATTEMPTS
+#define WIFI_START_CHECK_ATTEMPTS 5
+#endif
+
 /**
  * CHIP_DEVICE_CONFIG_USER_SELECTED_MODE_TIMEOUT_SEC
  *
@@ -346,6 +359,15 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
 #endif
 
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+ *
+ * Enable support for WiFi Per-Device Credentials
+ */
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC 0
+#endif
+
 /**
  * CHIP_DEVICE_CONFIG_WIFI_STATION_RECONNECT_INTERVAL
  *
@@ -852,6 +874,16 @@
 #define CHIP_DEVICE_CONFIG_THREAD_SSED 0
 #endif
 
+/**
+ * CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER
+ *
+ * Enable Thread Border Router service.
+ * Users should ensure OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE is set accordingly within their thread stack
+ *
+ */
+#ifndef CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 0
+#endif
 /**
  * CHIP_DEVICE_CONFIG_THREAD_TASK_NAME
  *
diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
index bf4c55ca438377..28e5c22400c0a7 100644
--- a/src/include/platform/CHIPDeviceEvent.h
+++ b/src/include/platform/CHIPDeviceEvent.h
@@ -168,6 +168,18 @@ enum PublicEventTypes
      */
     kCHIPoBLEConnectionClosed,
 
+    /**
+     * Request BLE connections to be closed.
+     * This is used in the supportsConcurrentConnection = False case.
+     */
+    kCloseAllBleConnections,
+
+    /**
+     * When supportsConcurrentConnection = False, the ConnectNetwork command cannot start until
+     * the BLE device is closed and the WiFi device has been started.
+     */
+    kWiFiDeviceAvailable,
+
     /**
      * Thread State Change
      *
@@ -258,6 +270,12 @@ enum InternalEventTypes
     kCHIPoBLEUnsubscribe,
     kCHIPoBLEWriteReceived,
     kCHIPoBLEIndicateConfirm,
+
+    /**
+     * Post this event in case of a BLE connection error. This event should be posted
+     * if the BLE central disconnects without unsubscribing from the BLE characteristic.
+     * This event should populate CHIPoBLEConnectionError structure.
+     */
     kCHIPoBLEConnectionError,
     kCHIPoBLENotifyConfirm
 };
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
index e846e420f5dc79..4ebf2c6edf4d36 100644
--- a/src/include/platform/ConfigurationManager.h
+++ b/src/include/platform/ConfigurationManager.h
@@ -26,8 +26,9 @@
 
 #include <cstdint>
 
+#include <platform/CHIPDeviceConfig.h>
+
 #if CHIP_HAVE_CONFIG_H
-#include <platform/CHIPDeviceBuildConfig.h>
 #include <setup_payload/CHIPAdditionalDataPayloadBuildConfig.h>
 #endif
 
@@ -124,7 +125,9 @@ class ConfigurationManager
 
     virtual CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo) = 0;
 
-    virtual CHIP_ERROR RunUnitTests() = 0;
+#if CHIP_CONFIG_TEST
+    virtual void RunUnitTests() = 0;
+#endif
 
     virtual bool IsFullyProvisioned()   = 0;
     virtual void InitiateFactoryReset() = 0;
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index d1bbd22a93a3a2..20be5ac9ae6b62 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -27,7 +27,6 @@
 #include <app/AttributeAccessInterface.h>
 #include <inet/UDPEndPoint.h>
 #include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceBuildConfig.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CHIPDeviceEvent.h>
 
diff --git a/src/include/platform/DeviceControlServer.h b/src/include/platform/DeviceControlServer.h
index ce98110c2154d4..073f6a035e95b0 100644
--- a/src/include/platform/DeviceControlServer.h
+++ b/src/include/platform/DeviceControlServer.h
@@ -36,7 +36,8 @@ class DeviceControlServer final
     CHIP_ERROR PostCommissioningCompleteEvent(NodeId peerNodeId, FabricIndex accessingFabricIndex);
     CHIP_ERROR SetRegulatoryConfig(uint8_t location, const CharSpan & countryCode);
     CHIP_ERROR PostConnectedToOperationalNetworkEvent(ByteSpan networkID);
-
+    CHIP_ERROR PostCloseAllBLEConnectionsToOperationalNetworkEvent();
+    CHIP_ERROR PostWiFiDeviceAvailableNetworkEvent();
     static DeviceControlServer & DeviceControlSvr();
 
 private:
diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h
index 338c43947fb472..a99ca6ee61beb1 100644
--- a/src/include/platform/DiagnosticDataProvider.h
+++ b/src/include/platform/DiagnosticDataProvider.h
@@ -25,7 +25,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <inet/InetInterface.h>
 #include <lib/core/ClusterEnums.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/GeneralFaults.h>
 
 namespace chip {
diff --git a/src/include/platform/KeyValueStoreManager.h b/src/include/platform/KeyValueStoreManager.h
index eb24efbb091763..cb777571d486b3 100644
--- a/src/include/platform/KeyValueStoreManager.h
+++ b/src/include/platform/KeyValueStoreManager.h
@@ -30,7 +30,7 @@
 #include <type_traits>
 
 #include <lib/core/CHIPError.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/include/platform/LockTracker.h b/src/include/platform/LockTracker.h
index 0c240f229c0c03..3e0a7781479462 100644
--- a/src/include/platform/LockTracker.h
+++ b/src/include/platform/LockTracker.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 
 /// Defines support for asserting that the chip stack is locked by the current thread via
 /// the macro:
diff --git a/src/include/platform/NetworkCommissioning.h b/src/include/platform/NetworkCommissioning.h
index 8ae56f3cd80d0b..c24648b3e582b8 100644
--- a/src/include/platform/NetworkCommissioning.h
+++ b/src/include/platform/NetworkCommissioning.h
@@ -23,10 +23,14 @@
 
 #pragma once
 
+#include <credentials/CHIPCert.h>
+#include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/core/Optional.h>
 #include <lib/support/ThreadOperationalDataset.h>
+#include <lib/support/Variant.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
 #include <app-common/zap-generated/cluster-enums.h>
@@ -79,8 +83,12 @@ class Iterator
 struct Network
 {
     uint8_t networkID[kMaxNetworkIDLen];
-    uint8_t networkIDLen;
-    bool connected;
+    uint8_t networkIDLen = 0;
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    Optional<Credentials::CertificateKeyIdStorage> networkIdentifier;
+    Optional<Credentials::CertificateKeyIdStorage> clientIdentifier;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    bool connected = false;
 };
 
 static_assert(sizeof(Network::networkID) <= std::numeric_limits<decltype(Network::networkIDLen)>::max(),
@@ -123,6 +131,7 @@ using ThreadScanResponseIterator = Iterator<ThreadScanResponse>;
 using Status                     = app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum;
 using WiFiBand                   = app::Clusters::NetworkCommissioning::WiFiBandEnum;
 using WiFiSecurity               = app::Clusters::NetworkCommissioning::WiFiSecurityBitmap;
+using ThreadCapabilities         = app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap;
 
 // BaseDriver and WirelessDriver are the common interfaces for a network driver, platform drivers should not implement this
 // directly, instead, users are expected to implement WiFiDriver, ThreadDriver and EthernetDriver.
@@ -276,6 +285,80 @@ class WiFiDriver : public Internal::WirelessDriver
      */
     virtual void ScanNetworks(ByteSpan ssid, ScanCallback * callback) = 0;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+    virtual bool SupportsPerDeviceCredentials() { return false; };
+
+    /**
+     * @brief Adds or updates a WiFi network with Per-Device Credentials on the device.
+     *
+     * @param ssid                          The SSID of the network to be added / updated.
+     * @param networkIdentity               The Network Identity of the network, in compact-pdc-identity format.
+     * @param clientIdentityNetworkIndex    If present, the index of the existing network configuration of which the Client
+     *                                      Identity is to be re-used. Otherwise a new Client Identity shall be generated.
+     * @param outStatus                     The application-level status code (Status::kSuccess on success).
+     * @param outDebugText                  A debug text buffer that may be populated by the driver. The size of the span
+     *                                      must be reduced to the length of text emitted (or 0, if none).
+     * @param outClientIdentity             On success, the Client Identity that was generated or copied, depending on the
+     *                                      presence of `clientIdentityNetworkIndex`.
+     * @param outNextworkIndex              On success, the index of the network entry that was added or updated.
+     *
+     * @retval CHIP_NO_ERROR and outStatus == kSuccess on success.
+     * @retval CHIP_NO_ERROR and outStatus != kSuccess for application-level errors. outDebugText should be populated.
+     * @retval CHIP_ERROR_* on internal errors. None of the output parameters will be examined in this case.
+     */
+    virtual CHIP_ERROR AddOrUpdateNetworkWithPDC(ByteSpan ssid, ByteSpan networkIdentity,
+                                                 Optional<uint8_t> clientIdentityNetworkIndex, Status & outStatus,
+                                                 MutableCharSpan & outDebugText, MutableByteSpan & outClientIdentity,
+                                                 uint8_t & outNetworkIndex)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+
+    /**
+     * @brief Retrieves the Network Identity associated with a network.
+     *
+     * @param networkIndex          The 0-based index of the network.
+     * @param outNetworkIdentity    The output buffer to be populated with the Network
+     *                              Identity in compact-pdc-identity TLV format.
+     *
+     * @return CHIP_NO_ERROR on success or a CHIP_ERROR on failure.
+     */
+    virtual CHIP_ERROR GetNetworkIdentity(uint8_t networkIndex, MutableByteSpan & outNetworkIdentity)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+
+    /**
+     * @brief Retrieves the Network Client Identity associated with a network.
+     *
+     * @param networkIndex          The 0-based index of the network.
+     * @param outNetworkIdentity    The output buffer to be populated with the Network
+     *                              Client Identity in compact-pdc-identity TLV format.
+     *
+     * @return CHIP_NO_ERROR on success or a CHIP_ERROR on failure.
+     */
+    virtual CHIP_ERROR GetClientIdentity(uint8_t networkIndex, MutableByteSpan & outClientIdentity)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+
+    /**
+     * @brief Signs the specified message with the private key of a Network Client Identity.
+     */
+    virtual CHIP_ERROR SignWithClientIdentity(uint8_t networkIndex, ByteSpan & message, Crypto::P256ECDSASignature & outSignature)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
+
+    /**
+     *  @brief Provide all the frequency bands supported by the Wi-Fi interface
+     *
+     *  Provide a default implementation that returns the 2.4 Ghz band support.
+     *  Note: WiFi platforms should implement this function in their WiFiDriver to provide their complete device capabilities
+     */
+    virtual WiFiBand GetSupportedWiFiBands() { return WiFiBand::k2g4; }
+
     ~WiFiDriver() override = default;
 };
 
@@ -315,6 +398,16 @@ class ThreadDriver : public Internal::WirelessDriver
      */
     virtual void ScanNetworks(ScanCallback * callback) = 0;
 
+    /**
+     * @brief Provide all of the Thread features supported by the Thread interface
+     */
+    virtual ThreadCapabilities GetSupportedThreadFeatures() = 0;
+
+    /**
+     * @brief Return the Thread version supported by the Thread interface
+     */
+    virtual uint16_t GetThreadVersion() = 0;
+
     ~ThreadDriver() override = default;
 };
 
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
index a0f5abfec4e134..4ce673ec4129c4 100644
--- a/src/include/platform/PlatformManager.h
+++ b/src/include/platform/PlatformManager.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <platform/AttributeList.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/CHIPDeviceEvent.h>
 #include <system/PlatformEventSupport.h>
 #include <system/SystemLayer.h>
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.h b/src/include/platform/internal/GenericConfigurationManagerImpl.h
index 21310be54641d9..fa7e19503f845e 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.h
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.h
@@ -103,7 +103,9 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
     CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
     CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override;
     CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override;
-    CHIP_ERROR RunUnitTests(void) override;
+#if CHIP_CONFIG_TEST
+    void RunUnitTests() override;
+#endif
     bool IsFullyProvisioned() override;
     void InitiateFactoryReset() override;
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
index 4f77ae9f975162..60493db5b678cf 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
@@ -663,15 +663,14 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSecondaryPairingInst
     return CHIP_NO_ERROR;
 }
 
+#if CHIP_CONFIG_TEST
 template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::RunUnitTests()
+void GenericConfigurationManagerImpl<ConfigClass>::RunUnitTests()
 {
-#if !defined(NDEBUG)
     ChipLogProgress(DeviceLayer, "Running configuration unit test");
     RunConfigUnitTest();
-#endif
-    return CHIP_NO_ERROR;
 }
+#endif
 
 template <class ConfigClass>
 void GenericConfigurationManagerImpl<ConfigClass>::LogDeviceConfig()
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
index ee87cfb7726989..5c50a8dfdaf6ca 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
@@ -107,7 +107,10 @@ void GenericPlatformManagerImpl_POSIX<ImplClass>::_UnlockChipStack()
 #if CHIP_STACK_LOCK_TRACKING_ENABLED
     if (!mChipStackIsLocked)
     {
-        ChipLogError(DeviceLayer, "_UnlockChipStack may error status");
+        ChipLogError(DeviceLayer, "_UnlockChipStack while unlocked");
+#if CHIP_STACK_LOCK_TRACKING_ERROR_FATAL
+        chipDie();
+#endif
     }
     mChipStackIsLocked = false;
 #endif
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp
index b1d0012761092c..7a5d9c265b1880 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp
@@ -34,6 +34,7 @@
 
 #include <system/SystemError.h>
 #include <system/SystemLayer.h>
+#include <system/SystemStats.h>
 
 #include <zephyr/sys/reboot.h>
 
@@ -139,6 +140,8 @@ CHIP_ERROR GenericPlatformManagerImpl_Zephyr<ImplClass>::_PostEvent(const ChipDe
         return System::MapErrorZephyr(status);
     }
 
+    SYSTEM_STATS_INCREMENT(System::Stats::kPlatformMgr_NumEvents);
+
     // Wake CHIP thread to process the event. If the function is called from ISR, such as a Zephyr
     // timer handler, do not signal the thread directly because that involves taking a mutex, which
     // is forbidden in ISRs. Instead, submit a task to the system work queue to do the singalling.
@@ -159,7 +162,10 @@ void GenericPlatformManagerImpl_Zephyr<ImplClass>::ProcessDeviceEvents()
     ChipDeviceEvent event;
 
     while (k_msgq_get(&mChipEventQueue, &event, K_NO_WAIT) == 0)
+    {
+        SYSTEM_STATS_DECREMENT(System::Stats::kPlatformMgr_NumEvents);
         Impl()->DispatchEvent(&event);
+    }
 }
 
 template <class ImplClass>
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
index 3f81be89647e6f..08004fe337d519 100644
--- a/src/inet/BUILD.gn
+++ b/src/inet/BUILD.gn
@@ -56,6 +56,8 @@ buildconfig_header("inet_buildconfig") {
 
   defines += [ "INET_TCP_END_POINT_IMPL_CONFIG_FILE=<inet/TCPEndPointImpl${chip_system_config_inet}.h>" ]
   defines += [ "INET_UDP_END_POINT_IMPL_CONFIG_FILE=<inet/UDPEndPointImpl${chip_system_config_inet}.h>" ]
+
+  visibility = [ ":inet_config_header" ]
 }
 
 source_set("inet_config_header") {
@@ -63,10 +65,9 @@ source_set("inet_config_header") {
 
   public_configs = [ "${chip_root}/src:includes" ]
 
-  public_deps = [
-    ":inet_buildconfig",
-    "${chip_root}/src/system:system_config_header",
-  ]
+  public_deps = [ "${chip_root}/src/system:system_config_header" ]
+
+  deps = [ ":inet_buildconfig" ]
 }
 
 static_library("inet") {
@@ -97,7 +98,7 @@ static_library("inet") {
   public_deps = [
     ":inet_config_header",
     "${chip_root}/src/lib/support",
-    "${chip_root}/src/platform:platform_buildconfig",
+    "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/system",
     "${nlio_root}:nlio",
   ]
diff --git a/src/inet/tests/TestInetCommonOptions.cpp b/src/inet/tests/TestInetCommonOptions.cpp
index b424f4b16577eb..727b6a107b28f1 100644
--- a/src/inet/tests/TestInetCommonOptions.cpp
+++ b/src/inet/tests/TestInetCommonOptions.cpp
@@ -26,7 +26,9 @@
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
+#ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
+#endif
 
 #include "TestInetCommonOptions.h"
 
diff --git a/src/lib/address_resolve/AddressResolve.h b/src/lib/address_resolve/AddressResolve.h
index c50d8c78d39d74..dc960232e83afa 100644
--- a/src/lib/address_resolve/AddressResolve.h
+++ b/src/lib/address_resolve/AddressResolve.h
@@ -33,7 +33,8 @@ struct ResolveResult
 {
     Transport::PeerAddress address;
     ReliableMessageProtocolConfig mrpRemoteConfig;
-    bool supportsTcp = false;
+    bool supportsTcp         = false;
+    bool isICDOperatingAsLIT = false;
 
     ResolveResult() : address(Transport::Type::kUdp), mrpRemoteConfig(GetDefaultMRPConfig()) {}
 };
diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
index c0c511e473ee03..9b8e0240654682 100644
--- a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
+++ b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
@@ -287,6 +287,11 @@ void Resolver::OnOperationalNodeResolved(const Dnssd::ResolvedNodeData & nodeDat
         result.mrpRemoteConfig = nodeData.resolutionData.GetRemoteMRPConfig();
         result.supportsTcp     = nodeData.resolutionData.supportsTcp;
 
+        if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue())
+        {
+            result.isICDOperatingAsLIT = nodeData.resolutionData.isICDOperatingAsLIT.Value();
+        }
+
         for (size_t i = 0; i < nodeData.resolutionData.numIPs; i++)
         {
 #if !INET_CONFIG_ENABLE_IPV4
diff --git a/src/lib/address_resolve/tests/TestAddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/tests/TestAddressResolve_DefaultImpl.cpp
index 05d2491475ecef..f926fc227ea294 100644
--- a/src/lib/address_resolve/tests/TestAddressResolve_DefaultImpl.cpp
+++ b/src/lib/address_resolve/tests/TestAddressResolve_DefaultImpl.cpp
@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2021 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,33 +24,45 @@ using namespace chip::AddressResolve;
 
 namespace {
 
+using chip::Dnssd::IPAddressSorter::IpScore;
+using chip::Dnssd::IPAddressSorter::ScoreIpAddress;
+
 constexpr uint8_t kNumberOfAvailableSlots = CHIP_CONFIG_MDNS_RESOLVE_LOOKUP_RESULTS;
 
 Transport::PeerAddress GetAddressWithLowScore(uint16_t port = CHIP_PORT, Inet::InterfaceId interfaceId = Inet::InterfaceId::Null())
 {
-    // Embedded IPv4
+    // Unique Local - expect score "3"
     Inet::IPAddress ipAddress;
-    Inet::IPAddress::FromString("0:0:0:0:0:0:111.22.33.44", ipAddress);
-
+    if (!Inet::IPAddress::FromString("fdff:aabb:ccdd:1::4", ipAddress))
+    {
+        ChipLogError(NotSpecified, "!!!!!!!! IP Parse failure");
+    }
     return Transport::PeerAddress::UDP(ipAddress, port, interfaceId);
 }
 
 Transport::PeerAddress GetAddressWithMediumScore(uint16_t port                 = CHIP_PORT,
                                                  Inet::InterfaceId interfaceId = Inet::InterfaceId::Null())
 {
-    // Unique Local
-    Inet::IPAddress ipAddress;
-    Inet::IPAddress::FromString("fdff:aabb:ccdd:1::4", ipAddress);
 
+    // Global Unicast - expect score '4'
+    Inet::IPAddress ipAddress;
+    if (!Inet::IPAddress::FromString("2001::aabb:ccdd:2233:4455", ipAddress))
+    {
+        ChipLogError(NotSpecified, "!!!!!!!! IP Parse failure");
+    }
     return Transport::PeerAddress::UDP(ipAddress, port, interfaceId);
 }
 
 Transport::PeerAddress GetAddressWithHighScore(uint16_t port = CHIP_PORT, Inet::InterfaceId interfaceId = Inet::InterfaceId::Null())
 {
-    // Global Unicast
+    // LinkLocal - expect score '7'
+    // Likely that the interfaceId is wrong (link local needs it),
+    // however we do not expect sorter to care
     Inet::IPAddress ipAddress;
-    Inet::IPAddress::FromString("2001::aabb:ccdd:2233:4455", ipAddress);
-
+    if (!Inet::IPAddress::FromString("fe80::aabb:ccdd:2233:4455", ipAddress))
+    {
+        ChipLogError(NotSpecified, "!!!!!!!! IP Parse failure");
+    }
     return Transport::PeerAddress::UDP(ipAddress, port, interfaceId);
 }
 
@@ -66,6 +77,15 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
     ResolveResult highResult;
     highResult.address = GetAddressWithHighScore();
 
+    // Ensure test expectations regarding ordering is matched
+
+    IpScore lowScore    = ScoreIpAddress(lowResult.address.GetIPAddress(), Inet::InterfaceId::Null());
+    IpScore mediumScore = ScoreIpAddress(mediumResult.address.GetIPAddress(), Inet::InterfaceId::Null());
+    IpScore highScore   = ScoreIpAddress(highResult.address.GetIPAddress(), Inet::InterfaceId::Null());
+
+    NL_TEST_ASSERT(inSuite, to_underlying(lowScore) < to_underlying(mediumScore));
+    NL_TEST_ASSERT(inSuite, to_underlying(mediumScore) < to_underlying(highScore));
+
     ResolveResult outResult;
 
     AddressResolve::NodeLookupHandle handle;
diff --git a/src/lib/address_resolve/tool.cpp b/src/lib/address_resolve/tool.cpp
index 094b4e8c55c50b..8423649ca928a0 100644
--- a/src/lib/address_resolve/tool.cpp
+++ b/src/lib/address_resolve/tool.cpp
@@ -59,7 +59,9 @@ class PrintOutNodeListener : public chip::AddressResolve::NodeListener
         ChipLogProgress(Discovery, "   Supports TCP:                  %s", result.supportsTcp ? "YES" : "NO");
         ChipLogProgress(Discovery, "   MRP IDLE retransmit timeout:   %u ms", result.mrpRemoteConfig.mIdleRetransTimeout.count());
         ChipLogProgress(Discovery, "   MRP ACTIVE retransmit timeout: %u ms", result.mrpRemoteConfig.mActiveRetransTimeout.count());
-        ChipLogProgress(Discovery, "   MRP ACTIVE Threshold timet:    %u ms", result.mrpRemoteConfig.mActiveThresholdTime.count());
+        ChipLogProgress(Discovery, "   MRP ACTIVE Threshold time:     %u ms", result.mrpRemoteConfig.mActiveThresholdTime.count());
+        ChipLogProgress(Discovery, "   ICD is operating as a:         %s", result.isICDOperatingAsLIT ? "LIT" : "SIT");
+
         NotifyDone();
     }
 
@@ -117,7 +119,8 @@ bool Cmd_Node(int argc, const char ** argv)
         return false;
     }
 
-    ChipLogProgress(NotSpecified, "Will search for node %" PRIx64 " on fabric %" PRIx64, node, fabric);
+    ChipLogProgress(NotSpecified, "Will search for node 0x" ChipLogFormatX64 " on fabric 0x" ChipLogFormatX64,
+                    ChipLogValueX64(node), ChipLogValueX64(fabric));
 
     AddressResolve::NodeLookupRequest request(PeerId().SetNodeId(node).SetCompressedFabricId(fabric));
 
diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
index dd03742071afb4..85f8b8c6449592 100644
--- a/src/lib/core/BUILD.gn
+++ b/src/lib/core/BUILD.gn
@@ -66,7 +66,11 @@ buildconfig_header("chip_buildconfig") {
     "CHIP_CONFIG_MINMDNS_MAX_PARALLEL_RESOLVES=${chip_config_minmdns_max_parallel_resolves}",
     "CHIP_CONFIG_CANCELABLE_HAS_INFO_STRING_FIELD=${chip_config_cancelable_has_info_string_field}",
     "CHIP_CONFIG_BIG_ENDIAN_TARGET=${chip_target_is_big_endian}",
+    "CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_WRITE=${chip_tlv_validate_char_string_on_write}",
+    "CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ=${chip_tlv_validate_char_string_on_read}",
   ]
+
+  visibility = [ ":chip_config_header" ]
 }
 
 source_set("chip_config_header") {
@@ -75,12 +79,13 @@ source_set("chip_config_header") {
   public_configs = [ "${chip_root}/src:includes" ]
 
   public_deps = [
-    ":chip_buildconfig",
     "${chip_root}/src/ble:ble_config_header",
     "${chip_root}/src/inet:inet_config_header",
     "${chip_root}/src/system:system_config_header",
   ]
 
+  deps = [ ":chip_buildconfig" ]
+
   allow_circular_includes_from = [ "${chip_root}/src/ble:ble_config_header" ]
 }
 
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index 60efb7118bb72f..8de07080773026 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -1432,6 +1432,62 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_SCENES_MAX_EXTENSION_FIELDSET_SIZE_PER_CLUSTER 128
 #endif
 
+/**
+ * @brief The maximum number bytes taken by a scene. This needs to be increased if the number of clusters per scene is increased.
+ * @note The default number (256) is based on the assumption that the maximum number of clusters per scene is 3 and that those
+ * clusers are onOff, level control and color control cluster.
+ * @warning Changing this value will not only affect the RAM usage of a scene but also the size of the scene table in the flash.
+ *  A scene's size can be calculated based on the following structure:
+ *  Scene TLV (struct)
+ *  {
+ *  	2 bytes GroupID,
+ *  	1 byte SceneID,
+ *  	0 - 16 bytes SceneName,
+ *  	4 bytes Transition time in miliseconds,
+ *
+ *  	Extension field sets TLV (array)
+ *  	[
+ *  		EFS TLV (struct)
+ *  		{
+ *  			4 bytes for the cluster ID,
+ *  			Attribute Value List TLV (array)
+ *  			[
+ *  				AttributeValue Pair TLV (struct)
+ *  				{
+ *  					Attribute ID
+ *  					4 bytes attributeID,
+ *  					AttributeValue
+ *  					1 - 8 bytes AttributeValue,
+ *  				},
+ *  				.
+ *  				.
+ *  				.
+ *
+ *  			],
+ *
+ *  		},
+ *  		.
+ *  		.
+ *  		.
+ *  	],
+ *  }
+ *
+ *  Including all the TLV fields, the following values can help estimate the needed size for a scenes given a number of clusters:
+ *  Empty EFS Scene Max name size: 33bytes
+ *  Scene Max name size + OnOff : 51 bytes
+ *  Scene Max name size + LevelControl : 60 bytes
+ *  Scene Max name size + ColorControl : 126 bytes
+ *  Scene Max name size + OnOff + LevelControl + ColoControl : 171 bytes
+ *
+ *  Cluster Sizes:
+ *  OnOff Cluster Max Size: 18 bytes
+ *  LevelControl Cluster Max Size: 27 bytes
+ *  Color Control Cluster Max Size: 93 bytes
+ * */
+#ifndef CHIP_CONFIG_SCENES_MAX_SERIALIZED_SCENE_SIZE_BYTES
+#define CHIP_CONFIG_SCENES_MAX_SERIALIZED_SCENE_SIZE_BYTES 256
+#endif
+
 /**
  * @def CHIP_CONFIG_MAX_SCENES_CONCURRENT_ITERATORS
  *
@@ -1443,6 +1499,31 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_MAX_SCENES_CONCURRENT_ITERATORS 2
 #endif
 
+/**
+ * @def CHIP_CONFIG_MAX_SCENES_TABLE_SIZE
+ *
+ * @brief This defines how many scenes a single endpoint is allowed to allocate in flash memory. This value MUST at least 16
+ * per spec and MUST be increased to allow for configuring a greater scene table size from Zap.
+ */
+#ifndef CHIP_CONFIG_MAX_SCENES_TABLE_SIZE
+#if CHIP_CONFIG_TEST
+#define CHIP_CONFIG_MAX_SCENES_TABLE_SIZE 24
+#else
+#define CHIP_CONFIG_MAX_SCENES_TABLE_SIZE 16
+#endif // CHIP_CONFIG_TEST
+#endif // CHIP_CONFIG_MAX_SCENES_TABLE_SIZE
+
+/**
+ * @def CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+ *
+ * @brief This define enables the automatic registration of the default scene handlers in the scene table for each sceneable
+ * cluster. If a user wants to use their own scene handlers, they can disable this flag and implement their own handlers. They can
+ * use ScenesServer::Instance().RegisterSceneHandler() to have their handlers called when a scene is recalled or stored.
+ */
+#ifndef CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#define CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS 1
+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+
 /**
  * @def CHIP_CONFIG_TIME_ZONE_LIST_MAX_SIZE
  *
@@ -1489,7 +1570,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  * @brief Default value for the ICD Management cluster IdleModeDuration attribute, in seconds
  */
 #ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
-#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC 2
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC 300
 #endif
 
 /**
@@ -1586,6 +1667,29 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED 0
 #endif
 
+/**
+ * @def CHIP_CONFIG_MAX_PATHS_PER_INVOKE
+ *
+ * @brief The maximum number of elements in the InvokeRequests list that the Node is able to process.
+ */
+#ifndef CHIP_CONFIG_MAX_PATHS_PER_INVOKE
+#define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 1
+#endif
+
+#if CHIP_CONFIG_MAX_PATHS_PER_INVOKE < 1 || CHIP_CONFIG_MAX_PATHS_PER_INVOKE > 65535
+#error "CHIP_CONFIG_MAX_PATHS_PER_INVOKE is not allowed to be a number less than 1 or greater than 65535"
+#endif
+
+/**
+ * @def CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE
+ *
+ * @brief Defines the entry iterator delegate pool size of the ICDObserver object pool in ICDManager.h.
+ *        Two are used in the default implementation. Users can increase it to register more observers.
+ */
+#ifndef CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE
+#define CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE 2
+#endif
+
 /**
  * @}
  */
diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
index 51db50cf14496a..fe7090007812dd 100644
--- a/src/lib/core/CHIPError.cpp
+++ b/src/lib/core/CHIPError.cpp
@@ -113,12 +113,18 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_WRONG_ENCRYPTION_TYPE.AsInteger():
         desc = "Wrong encryption type";
         break;
+    case CHIP_ERROR_INVALID_UTF8.AsInteger():
+        desc = "Character string is not a valid utf-8 encoding";
+        break;
     case CHIP_ERROR_INTEGRITY_CHECK_FAILED.AsInteger():
         desc = "Integrity check failed";
         break;
     case CHIP_ERROR_INVALID_SIGNATURE.AsInteger():
         desc = "Invalid signature";
         break;
+    case CHIP_ERROR_INVALID_TLV_CHAR_STRING.AsInteger():
+        desc = "Invalid TLV Char string encoding.";
+        break;
     case CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE.AsInteger():
         desc = "Unsupported signature type";
         break;
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index 1b621a694fbc8c..0bc63cb055f59c 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -581,7 +581,14 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_WRONG_ENCRYPTION_TYPE                       CHIP_CORE_ERROR(0x11)
 
-// AVAILABLE: 0x12
+/**
+ *  @def CHIP_ERROR_INVALID_UTF8
+ *
+ *  @brief
+ *    Invalid UTF8 string (contains some characters that are invalid)
+ *
+ */
+#define CHIP_ERROR_INVALID_UTF8                                CHIP_CORE_ERROR(0x12)
 
 /**
  *  @def CHIP_ERROR_INTEGRITY_CHECK_FAILED
@@ -602,7 +609,15 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_INVALID_SIGNATURE                           CHIP_CORE_ERROR(0x14)
 
-// AVAILABLE: 0x15
+/**
+ *  @def CHIP_ERROR_INVALID_TLV_CHAR_STRING
+ *
+ *  @brief
+ *    Invalid TLV character string (e.g. null terminator)
+ *
+ */
+#define CHIP_ERROR_INVALID_TLV_CHAR_STRING                     CHIP_CORE_ERROR(0x15)
+
 // AVAILABLE: 0x16
 
 /**
diff --git a/src/lib/core/OTAImageHeader.cpp b/src/lib/core/OTAImageHeader.cpp
index ebf644fff9daf8..674c08afb31429 100644
--- a/src/lib/core/OTAImageHeader.cpp
+++ b/src/lib/core/OTAImageHeader.cpp
@@ -163,7 +163,7 @@ CHIP_ERROR OTAImageHeaderParser::DecodeTlv(OTAImageHeader & header)
         ReturnErrorOnFailure(tlvReader.Next());
     }
 
-    VerifyOrReturnError(tlvReader.GetTag() == TLV::ContextTag(Tag::kImageDigestType), CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(tlvReader.Expect(TLV::ContextTag(Tag::kImageDigestType)));
     ReturnErrorOnFailure(tlvReader.Get(header.mImageDigestType));
     ReturnErrorOnFailure(tlvReader.Next(TLV::ContextTag(Tag::kImageDigest)));
     ReturnErrorOnFailure(tlvReader.Get(header.mImageDigest));
diff --git a/src/lib/core/Optional.h b/src/lib/core/Optional.h
index 3b673e36fa7071..7278484a6e6be9 100644
--- a/src/lib/core/Optional.h
+++ b/src/lib/core/Optional.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <new>
+#include <type_traits>
 
 #include <lib/core/CHIPCore.h>
 #include <lib/core/InPlace.h>
@@ -73,6 +74,28 @@ class Optional
         }
     }
 
+    // Converts an Optional of an implicitly convertible type
+    template <class U, std::enable_if_t<!std::is_same_v<T, U> && std::is_convertible_v<const U, T>, bool> = true>
+    constexpr Optional(const Optional<U> & other) : mHasValue(other.HasValue())
+    {
+        if (mHasValue)
+        {
+            new (&mValue.mData) T(other.Value());
+        }
+    }
+
+    // Converts an Optional of a type that requires explicit conversion
+    template <class U,
+              std::enable_if_t<!std::is_same_v<T, U> && !std::is_convertible_v<const U, T> && std::is_constructible_v<T, const U &>,
+                               bool> = true>
+    constexpr explicit Optional(const Optional<U> & other) : mHasValue(other.HasValue())
+    {
+        if (mHasValue)
+        {
+            new (&mValue.mData) T(other.Value());
+        }
+    }
+
     constexpr Optional(Optional && other) : mHasValue(other.mHasValue)
     {
         if (mHasValue)
diff --git a/src/lib/core/TLVReader.cpp b/src/lib/core/TLVReader.cpp
index c44d0947d87d1c..9ef55edfe3a91f 100644
--- a/src/lib/core/TLVReader.cpp
+++ b/src/lib/core/TLVReader.cpp
@@ -32,6 +32,7 @@
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
+#include <lib/support/utf8.h>
 
 namespace chip {
 namespace TLV {
@@ -330,6 +331,25 @@ CHIP_ERROR TLVReader::Get(CharSpan & v) const
     }
 
     v = CharSpan(Uint8::to_const_char(bytes), len);
+#if CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ
+    // Spec requirement: A.11.2. UTF-8 and Octet Strings
+    //
+    // For UTF-8 strings, the value octets SHALL encode a valid
+    // UTF-8 character (code points) sequence.
+    //
+    // Senders SHALL NOT include a terminating null character to
+    // mark the end of a string.
+
+    if (!Utf8::IsValid(v))
+    {
+        return CHIP_ERROR_INVALID_UTF8;
+    }
+
+    if (!v.empty() && (v.back() == 0))
+    {
+        return CHIP_ERROR_INVALID_TLV_CHAR_STRING;
+    }
+#endif // CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ
     return CHIP_NO_ERROR;
 }
 
@@ -583,23 +603,31 @@ CHIP_ERROR TLVReader::Next()
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR TLVReader::Expect(Tag expectedTag)
+{
+    VerifyOrReturnError(GetType() != kTLVType_NotSpecified, CHIP_ERROR_WRONG_TLV_TYPE);
+    VerifyOrReturnError(GetTag() == expectedTag, CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR TLVReader::Next(Tag expectedTag)
 {
-    CHIP_ERROR err = Next();
-    if (err != CHIP_NO_ERROR)
-        return err;
-    if (mElemTag != expectedTag)
-        return CHIP_ERROR_UNEXPECTED_TLV_ELEMENT;
+    ReturnErrorOnFailure(Next());
+    ReturnErrorOnFailure(Expect(expectedTag));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TLVReader::Expect(TLVType expectedType, Tag expectedTag)
+{
+    VerifyOrReturnError(GetType() == expectedType, CHIP_ERROR_WRONG_TLV_TYPE);
+    VerifyOrReturnError(GetTag() == expectedTag, CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR TLVReader::Next(TLVType expectedType, Tag expectedTag)
 {
-    CHIP_ERROR err = Next(expectedTag);
-    if (err != CHIP_NO_ERROR)
-        return err;
-    if (GetType() != expectedType)
-        return CHIP_ERROR_WRONG_TLV_TYPE;
+    ReturnErrorOnFailure(Next());
+    ReturnErrorOnFailure(Expect(expectedType, expectedTag));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/lib/core/TLVReader.h b/src/lib/core/TLVReader.h
index 0acc618bc86598..744402a8b059cd 100644
--- a/src/lib/core/TLVReader.h
+++ b/src/lib/core/TLVReader.h
@@ -167,56 +167,57 @@ class DLL_EXPORT TLVReader
      * Advances the TLVReader object to the next TLV element to be read, asserting the tag of
      * the new element.
      *
-     * The Next(Tag expectedTag) method is a convenience method that has the
-     * same behavior as Next(), but also verifies that the tag of the new TLV element matches
-     * the supplied argument.
+     * This is a convenience method that combines the behavior of Next() and Expect(...).
      *
-     * @param[in] expectedTag               The expected tag for the next element.
+     * Note that if this method returns an error, the reader may or may not have been advanced already.
+     * In use cases where this is important, separate calls to Next() and Expect(...) should be made.
      *
-     * @retval #CHIP_NO_ERROR              If the reader was successfully positioned on a new element.
-     * @retval #CHIP_END_OF_TLV            If no further elements are available.
+     * @retval #CHIP_NO_ERROR              If the reader was successfully positioned on a new element
+     *                                     matching the expected parameters.
+     * @retval other                       See return values of Next() and Expect().
+     */
+    CHIP_ERROR Next(Tag expectedTag);
+
+    /**
+     * Checks that the TLV reader is positioned at an element with the expected tag.
+     *
+     * @retval #CHIP_NO_ERROR              If the reader is positioned on the expected element.
+     * @retval #CHIP_ERROR_WRONG_TLV_TYPE  If the reader is not positioned on an element.
      * @retval #CHIP_ERROR_UNEXPECTED_TLV_ELEMENT
      *                                      If the tag associated with the new element does not match the
      *                                      value of the @p expectedTag argument.
-     * @retval #CHIP_ERROR_TLV_UNDERRUN    If the underlying TLV encoding ended prematurely.
-     * @retval #CHIP_ERROR_INVALID_TLV_ELEMENT
-     *                                      If the reader encountered an invalid or unsupported TLV
-     *                                      element type.
-     * @retval #CHIP_ERROR_INVALID_TLV_TAG If the reader encountered a TLV tag in an invalid context.
-     * @retval other                        Other CHIP or platform error codes returned by the configured
-     *                                      TLVBackingStore.
-     *
      */
-    CHIP_ERROR Next(Tag expectedTag);
+    CHIP_ERROR Expect(Tag expectedTag);
 
     /**
      * Advances the TLVReader object to the next TLV element to be read, asserting the type and tag of
      * the new element.
      *
-     * The Next(TLVType expectedType, Tag expectedTag) method is a convenience method that has the
-     * same behavior as Next(), but also verifies that the type and tag of the new TLV element match
-     * the supplied arguments.
+     * This is a convenience method that combines the behavior of Next() and Expect(...).
+     *
+     * Note that if this method returns an error, the reader may or may not have been advanced already.
+     * In use cases where this is important, separate calls to Next() and Expect(...) should be made.
+     *
+     * @retval #CHIP_NO_ERROR              If the reader was successfully positioned on a new element
+     *                                     matching the expected parameters.
+     * @retval other                       See return values of Next() and Expect().
+     */
+    CHIP_ERROR Next(TLVType expectedType, Tag expectedTag);
+
+    /**
+     * Checks that the TLV reader is positioned at an element with the expected type and tag.
      *
      * @param[in] expectedType              The expected data type for the next element.
      * @param[in] expectedTag               The expected tag for the next element.
      *
-     * @retval #CHIP_NO_ERROR              If the reader was successfully positioned on a new element.
-     * @retval #CHIP_END_OF_TLV            If no further elements are available.
+     * @retval #CHIP_NO_ERROR              If the reader is positioned on the expected element.
      * @retval #CHIP_ERROR_WRONG_TLV_TYPE  If the type of the new element does not match the value
      *                                      of the @p expectedType argument.
      * @retval #CHIP_ERROR_UNEXPECTED_TLV_ELEMENT
      *                                      If the tag associated with the new element does not match the
      *                                      value of the @p expectedTag argument.
-     * @retval #CHIP_ERROR_TLV_UNDERRUN    If the underlying TLV encoding ended prematurely.
-     * @retval #CHIP_ERROR_INVALID_TLV_ELEMENT
-     *                                      If the reader encountered an invalid or unsupported TLV
-     *                                      element type.
-     * @retval #CHIP_ERROR_INVALID_TLV_TAG If the reader encountered a TLV tag in an invalid context.
-     * @retval other                        Other CHIP or platform error codes returned by the configured
-     *                                      TLVBackingStore.
-     *
      */
-    CHIP_ERROR Next(TLVType expectedType, Tag expectedTag);
+    CHIP_ERROR Expect(TLVType expectedType, Tag expectedTag);
 
     /**
      * Returns the type of the current TLV element.
diff --git a/src/lib/core/TLVTags.cpp b/src/lib/core/TLVTags.cpp
index 8d3e744b4667a3..bc44d52af12490 100644
--- a/src/lib/core/TLVTags.cpp
+++ b/src/lib/core/TLVTags.cpp
@@ -38,7 +38,7 @@ StringBuilderBase & Tag::AppendTo(StringBuilderBase & out)
     }
     else
     {
-        out.AddFormat("UnknownTag(0x%" PRIX64 ")", mVal);
+        out.AddFormat("UnknownTag(0x" ChipLogFormatX64 ")", ChipLogValueX64(mVal));
     }
 
     return out;
diff --git a/src/lib/core/TLVWriter.cpp b/src/lib/core/TLVWriter.cpp
index 5249e0b4789f7a..eb93e781524677 100644
--- a/src/lib/core/TLVWriter.cpp
+++ b/src/lib/core/TLVWriter.cpp
@@ -33,6 +33,7 @@
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
+#include <lib/support/utf8.h>
 
 #include <stdarg.h>
 #include <stdint.h>
@@ -252,10 +253,30 @@ CHIP_ERROR TLVWriter::PutString(Tag tag, const char * buf)
 
 CHIP_ERROR TLVWriter::PutString(Tag tag, const char * buf, uint32_t len)
 {
+#if CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_WRITE
+    // Spec requirement: A.11.2. UTF-8 and Octet Strings
+    //
+    // For UTF-8 strings, the value octets SHALL encode a valid
+    // UTF-8 character (code points) sequence.
+    //
+    // Senders SHALL NOT include a terminating null character to
+    // mark the end of a string.
+
+    if (!Utf8::IsValid(CharSpan(buf, len)))
+    {
+        return CHIP_ERROR_INVALID_UTF8;
+    }
+
+    if ((len > 0) && (buf[len - 1] == 0))
+    {
+        return CHIP_ERROR_INVALID_TLV_CHAR_STRING;
+    }
+#endif // CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ
+
     return WriteElementWithData(kTLVType_UTF8String, tag, reinterpret_cast<const uint8_t *>(buf), len);
 }
 
-CHIP_ERROR TLVWriter::PutString(Tag tag, Span<const char> str)
+CHIP_ERROR TLVWriter::PutString(Tag tag, CharSpan str)
 {
     if (!CanCastTo<uint32_t>(str.size()))
     {
diff --git a/src/lib/core/TLVWriter.h b/src/lib/core/TLVWriter.h
index 9bbf8a6b4fbf32..59478f15e7123c 100644
--- a/src/lib/core/TLVWriter.h
+++ b/src/lib/core/TLVWriter.h
@@ -573,7 +573,7 @@ class DLL_EXPORT TLVWriter
      *                              TLVBackingStore.
      *
      */
-    CHIP_ERROR PutString(Tag tag, Span<const char> str);
+    CHIP_ERROR PutString(Tag tag, CharSpan str);
 
     /**
      * @brief
diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni
index 839f9b6507b734..51ef44493b8461 100644
--- a/src/lib/core/core.gni
+++ b/src/lib/core/core.gni
@@ -91,6 +91,13 @@ declare_args() {
 
   # Whether the target architecture is big-endian (true) or little-endian (false).
   chip_target_is_big_endian = false
+
+  # Validation on TLV encode/decode for string validity of character
+  # strings:
+  #   - SHALL NOT end with binary 0 (spec still allows embedded 0)
+  #   - SHALL be valid UTF8
+  chip_tlv_validate_char_string_on_write = true
+  chip_tlv_validate_char_string_on_read = false
 }
 
 if (chip_target_style == "") {
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
index 3e9f41a30a4fdd..fec35d773d55bf 100644
--- a/src/lib/core/tests/TestCHIPErrorStr.cpp
+++ b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -67,8 +67,10 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_UNKNOWN_KEY_TYPE,
     CHIP_ERROR_KEY_NOT_FOUND,
     CHIP_ERROR_WRONG_ENCRYPTION_TYPE,
+    CHIP_ERROR_INVALID_UTF8,
     CHIP_ERROR_INTEGRITY_CHECK_FAILED,
     CHIP_ERROR_INVALID_SIGNATURE,
+    CHIP_ERROR_INVALID_TLV_CHAR_STRING,
     CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE,
     CHIP_ERROR_INVALID_MESSAGE_LENGTH,
     CHIP_ERROR_BUFFER_TOO_SMALL,
diff --git a/src/lib/core/tests/TestOptional.cpp b/src/lib/core/tests/TestOptional.cpp
index 607829834a717f..b54d8de1120a4c 100644
--- a/src/lib/core/tests/TestOptional.cpp
+++ b/src/lib/core/tests/TestOptional.cpp
@@ -23,11 +23,13 @@
  *
  */
 
-#include <inttypes.h>
-#include <stdint.h>
-#include <string.h>
+#include <array>
+#include <cinttypes>
+#include <cstdint>
+#include <cstring>
 
 #include <lib/core/Optional.h>
+#include <lib/support/Span.h>
 #include <lib/support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
@@ -184,6 +186,39 @@ static void TestMove(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, Count::created == 4 && Count::destroyed == 4);
 }
 
+static void TestConversion(nlTestSuite * inSuite, void * inContext)
+{
+    // FixedSpan is implicitly convertible from std::array
+    using WidgetView    = FixedSpan<const bool, 10>;
+    using WidgetStorage = std::array<bool, 10>;
+
+    auto optStorage                   = MakeOptional<WidgetStorage>();
+    auto const & constOptStorage      = optStorage;
+    auto optOtherStorage              = MakeOptional<WidgetStorage>();
+    auto const & constOptOtherStorage = optOtherStorage;
+
+    NL_TEST_ASSERT(inSuite, optStorage.HasValue());
+    NL_TEST_ASSERT(inSuite, optOtherStorage.HasValue());
+
+    Optional<WidgetView> optView(constOptStorage);
+    NL_TEST_ASSERT(inSuite, optView.HasValue());
+    NL_TEST_ASSERT(inSuite, &optView.Value()[0] == &optStorage.Value()[0]);
+
+    optView = optOtherStorage;
+    optView = constOptOtherStorage;
+    NL_TEST_ASSERT(inSuite, optView.HasValue());
+    NL_TEST_ASSERT(inSuite, &optView.Value()[0] == &optOtherStorage.Value()[0]);
+
+    struct ExplicitBool
+    {
+        explicit ExplicitBool(bool) {}
+    };
+    Optional<ExplicitBool> e(Optional<bool>(true)); // OK, explicitly constructing the optional
+
+    // The following should not compile
+    // e = Optional<bool>(false); // relies on implicit conversion
+}
+
 /**
  *   Test Suite. It lists all the test functions.
  */
@@ -195,7 +230,7 @@ static const nlTest sTests[] =
     NL_TEST_DEF("OptionalMake", TestMake),
     NL_TEST_DEF("OptionalCopy", TestCopy),
     NL_TEST_DEF("OptionalMove", TestMove),
-
+    NL_TEST_DEF("OptionalConversion", TestConversion),
     NL_TEST_SENTINEL()
 };
 // clang-format on
diff --git a/src/lib/core/tests/TestTLV.cpp b/src/lib/core/tests/TestTLV.cpp
index 0ea46d463bcc3e..529da85a247fc5 100644
--- a/src/lib/core/tests/TestTLV.cpp
+++ b/src/lib/core/tests/TestTLV.cpp
@@ -3628,6 +3628,59 @@ void TestTLVReaderErrorHandling(nlTestSuite * inSuite)
     chip::Platform::MemoryFree(const_cast<uint8_t *>(data));
 }
 
+void TestTLVReaderExpect(nlTestSuite * inSuite)
+{
+    // Prepare some test data
+    uint8_t buffer[20];
+    TLVWriter writer;
+    writer.Init(buffer, sizeof(buffer));
+    TLVType outerContainer;
+    NL_TEST_ASSERT_SUCCESS(inSuite, writer.StartContainer(AnonymousTag(), kTLVType_Structure, outerContainer));
+    NL_TEST_ASSERT_SUCCESS(inSuite, writer.PutBoolean(ContextTag(23), false));
+    NL_TEST_ASSERT_SUCCESS(inSuite, writer.EndContainer(outerContainer));
+
+    TLVReader reader;
+    reader.Init(buffer, writer.GetLengthWritten());
+
+    // Positioned before the first element
+    NL_TEST_ASSERT(inSuite, reader.GetType() == kTLVType_NotSpecified);
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(AnonymousTag()) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT(inSuite, reader.Expect(ContextTag(23)) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT(inSuite, reader.Expect(kTLVType_Boolean, AnonymousTag()) == CHIP_ERROR_WRONG_TLV_TYPE);
+
+    // Positioned on kTLVType_Structure / AnonymousTag(),
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Next());
+    NL_TEST_ASSERT(inSuite, reader.GetType() == kTLVType_Structure);
+    NL_TEST_ASSERT(inSuite, reader.GetTag() == AnonymousTag());
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(ContextTag(23)) == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Expect(AnonymousTag()));
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(kTLVType_SignedInteger, AnonymousTag()) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Expect(kTLVType_Structure, AnonymousTag()));
+
+    // Positioned before first struct element
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.EnterContainer(outerContainer));
+    NL_TEST_ASSERT(inSuite, reader.GetType() == kTLVType_NotSpecified);
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(AnonymousTag()) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT(inSuite, reader.Expect(ContextTag(23)) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT(inSuite, reader.Expect(kTLVType_Boolean, AnonymousTag()) == CHIP_ERROR_WRONG_TLV_TYPE);
+
+    // Positioned on kTLVType_Boolean / ContextTag(23)
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Next());
+    NL_TEST_ASSERT(inSuite, reader.GetType() == kTLVType_Boolean);
+    NL_TEST_ASSERT(inSuite, reader.GetTag() == ContextTag(23));
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(AnonymousTag()) == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    NL_TEST_ASSERT(inSuite, reader.Expect(ContextTag(42)) == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Expect(ContextTag(23)));
+
+    NL_TEST_ASSERT(inSuite, reader.Expect(kTLVType_SignedInteger, ContextTag(23)) == CHIP_ERROR_WRONG_TLV_TYPE);
+    NL_TEST_ASSERT_SUCCESS(inSuite, reader.Expect(kTLVType_Boolean, ContextTag(23)));
+}
+
 /**
  *  Test that CHIP TLV reader returns an error when a read is requested that
  *  would truncate the output.
@@ -3789,6 +3842,8 @@ void CheckTLVReader(nlTestSuite * inSuite, void * inContext)
 
     TestTLVReaderErrorHandling(inSuite);
 
+    TestTLVReaderExpect(inSuite);
+
     TestTLVReaderTruncatedReads(inSuite);
 
     TestTLVReaderInPractice(inSuite);
diff --git a/src/lib/dnssd/Advertiser.h b/src/lib/dnssd/Advertiser.h
index 322ee3c871d60e..bfb587acec2ad7 100644
--- a/src/lib/dnssd/Advertiser.h
+++ b/src/lib/dnssd/Advertiser.h
@@ -101,6 +101,13 @@ class BaseAdvertisingParams
     }
     Optional<bool> GetTcpSupported() const { return mTcpSupported; }
 
+    Derived & SetICDOperatingAsLIT(Optional<bool> operatesAsLIT)
+    {
+        mICDOperatesAsLIT = operatesAsLIT;
+        return *reinterpret_cast<Derived *>(this);
+    }
+    Optional<bool> GetICDOperatingAsLIT() const { return mICDOperatesAsLIT; }
+
 private:
     uint16_t mPort                   = CHIP_PORT;
     Inet::InterfaceId mInterfaceId   = Inet::InterfaceId::Null();
@@ -109,6 +116,7 @@ class BaseAdvertisingParams
     size_t mMacLength                = 0;
     Optional<ReliableMessageProtocolConfig> mLocalMRPConfig;
     Optional<bool> mTcpSupported;
+    Optional<bool> mICDOperatesAsLIT;
 };
 
 /// Defines parameters required for advertising a CHIP node
diff --git a/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp b/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
index 26c0a37d0dd879..b58e696940883d 100644
--- a/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
+++ b/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
@@ -23,6 +23,7 @@
 #include "MinimalMdnsServer.h"
 #include "ServiceNaming.h"
 
+#include <app/AppConfig.h>
 #include <crypto/RandUtils.h>
 #include <lib/dnssd/Advertiser_ImplMinimalMdnsAllocator.h>
 #include <lib/dnssd/minimal_mdns/AddressPolicy.h>
@@ -219,6 +220,7 @@ class AdvertiserMinMdns : public ServiceAdvertiser,
         char sessionActiveThresholdBuf[KeySize(TxtFieldKey::kSessionActiveThreshold) +
                                        ValSize(TxtFieldKey::kSessionActiveThreshold) + 2];
         char tcpSupportedBuf[KeySize(TxtFieldKey::kTcpSupported) + ValSize(TxtFieldKey::kTcpSupported) + 2];
+        char operatingICDAsLITBuf[KeySize(TxtFieldKey::kLongIdleTimeICD) + ValSize(TxtFieldKey::kLongIdleTimeICD) + 2];
     };
     template <class Derived>
     CHIP_ERROR AddCommonTxtEntries(const BaseAdvertisingParams<Derived> & params, CommonTxtEntryStorage & storage,
@@ -229,6 +231,14 @@ class AdvertiserMinMdns : public ServiceAdvertiser,
         if (optionalMrp.HasValue())
         {
             auto mrp = optionalMrp.Value();
+
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+            // An ICD operating as a LIT should not advertise its slow polling interval.
+            // When the ICD doesn't support the LIT feature, it doesn't set nor advertise the GetICDOperatingAsLIT entry.
+            // Therefore when GetICDOperatingAsLIT has no value or a value of 0, we advertise the slow polling interval
+            // otherwise we don't include the SII key in the advertisement.
+            if (!params.GetICDOperatingAsLIT().ValueOr(false))
+#endif
             {
                 if (mrp.mIdleRetransTimeout > kMaxRetryInterval)
                 {
@@ -280,6 +290,15 @@ class AdvertiserMinMdns : public ServiceAdvertiser,
                                 CHIP_ERROR_INVALID_STRING_LENGTH);
             txtFields[numTxtFields++] = storage.tcpSupportedBuf;
         }
+        if (params.GetICDOperatingAsLIT().HasValue())
+        {
+            size_t writtenCharactersNumber =
+                static_cast<size_t>(snprintf(storage.operatingICDAsLITBuf, sizeof(storage.operatingICDAsLITBuf), "ICD=%d",
+                                             params.GetICDOperatingAsLIT().Value()));
+            VerifyOrReturnError((writtenCharactersNumber > 0) && (writtenCharactersNumber < sizeof(storage.operatingICDAsLITBuf)),
+                                CHIP_ERROR_INVALID_STRING_LENGTH);
+            txtFields[numTxtFields++] = storage.operatingICDAsLITBuf;
+        }
         return CHIP_NO_ERROR;
     }
 
diff --git a/src/lib/dnssd/BUILD.gn b/src/lib/dnssd/BUILD.gn
index 313ae728688b80..68b90f1f8a2251 100644
--- a/src/lib/dnssd/BUILD.gn
+++ b/src/lib/dnssd/BUILD.gn
@@ -34,6 +34,8 @@ static_library("dnssd") {
     "IPAddressSorter.cpp",
     "IPAddressSorter.h",
     "Resolver.h",
+    "ResolverProxy.cpp",
+    "ResolverProxy.h",
     "ServiceNaming.cpp",
     "ServiceNaming.h",
     "TxtFields.cpp",
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index 88cafdebd2c0e1..64eebbbb59962a 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -39,11 +39,11 @@ namespace {
 
 static void HandleNodeResolve(void * context, DnssdService * result, const Span<Inet::IPAddress> & addresses, CHIP_ERROR error)
 {
-    ResolverDelegateProxy * proxy = static_cast<ResolverDelegateProxy *>(context);
+    DiscoveryContext * discoveryContext = static_cast<DiscoveryContext *>(context);
 
-    if (CHIP_NO_ERROR != error)
+    if (error != CHIP_NO_ERROR)
     {
-        proxy->Release();
+        discoveryContext->Release();
         return;
     }
 
@@ -51,31 +51,24 @@ static void HandleNodeResolve(void * context, DnssdService * result, const Span<
     result->ToDiscoveredNodeData(addresses, nodeData);
 
     nodeData.LogDetail();
-    proxy->OnNodeDiscovered(nodeData);
-    proxy->Release();
+    discoveryContext->OnNodeDiscovered(nodeData);
+    discoveryContext->Release();
 }
 
 static void HandleNodeBrowse(void * context, DnssdService * services, size_t servicesSize, bool finalBrowse, CHIP_ERROR error)
 {
-    ResolverDelegateProxy * proxy = static_cast<ResolverDelegateProxy *>(context);
+    DiscoveryContext * discoveryContext = static_cast<DiscoveryContext *>(context);
 
     if (error != CHIP_NO_ERROR)
     {
-        // We don't have access to the ResolverProxy here to clear out its
-        // mDiscoveryContext.  The underlying implementation of
-        // ChipDnssdStopBrowse needs to handle a possibly-stale reference
-        // safely, so this won't lead to crashes, but it can lead to
-        // mis-behavior if a stale mDiscoveryContext happens to match a newer
-        // browse operation.
-        //
-        // TODO: Have a way to clear that state here.
-        proxy->Release();
+        discoveryContext->ClearBrowseIdentifier();
+        discoveryContext->Release();
         return;
     }
 
     for (size_t i = 0; i < servicesSize; ++i)
     {
-        proxy->Retain();
+        discoveryContext->Retain();
         // For some platforms browsed services are already resolved, so verify if resolve is really needed or call resolve callback
 
         // Check if SRV, TXT and AAAA records were received in DNS responses
@@ -92,15 +85,8 @@ static void HandleNodeBrowse(void * context, DnssdService * services, size_t ser
 
     if (finalBrowse)
     {
-        // We don't have access to the ResolverProxy here to clear out its
-        // mDiscoveryContext.  The underlying implementation of
-        // ChipDnssdStopBrowse needs to handle a possibly-stale reference
-        // safely, so this won't lead to crashes, but it can lead to
-        // mis-behavior if a stale mDiscoveryContext happens to match a newer
-        // browse operation.
-        //
-        // TODO: Have a way to clear that state here.
-        proxy->Release();
+        discoveryContext->ClearBrowseIdentifier();
+        discoveryContext->Release();
     }
 }
 
@@ -224,9 +210,21 @@ CHIP_ERROR CopyTxtRecord(TxtFieldKey key, char * buffer, size_t bufferLen, const
     case TxtFieldKey::kTcpSupported:
         return CopyTextRecordValue(buffer, bufferLen, params.GetTcpSupported());
     case TxtFieldKey::kSessionIdleInterval:
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+        // A ICD operating as a LIT should not advertise its slow polling interval
+        if (params.GetICDOperatingAsLIT().HasValue() && params.GetICDOperatingAsLIT().Value())
+        {
+            // returning WELL_UNINITIALIZED ensures that the SII string isn't added by the AddTxtRecord
+            // without erroring out the action.
+            return CHIP_ERROR_WELL_UNINITIALIZED;
+        }
+        FALLTHROUGH;
+#endif
     case TxtFieldKey::kSessionActiveInterval:
     case TxtFieldKey::kSessionActiveThreshold:
         return CopyTextRecordValue(buffer, bufferLen, params.GetLocalMRPConfig(), key);
+    case TxtFieldKey::kLongIdleTimeICD:
+        return CopyTextRecordValue(buffer, bufferLen, params.GetICDOperatingAsLIT());
     default:
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
@@ -386,7 +384,6 @@ CHIP_ERROR DiscoveryImplPlatform::InitImpl()
 void DiscoveryImplPlatform::Shutdown()
 {
     VerifyOrReturn(mState != State::kUninitialized);
-    mResolverProxy.Shutdown();
     ChipDnssdShutdown();
     mState = State::kUninitialized;
 }
@@ -399,20 +396,6 @@ void DiscoveryImplPlatform::HandleDnssdInit(void * context, CHIP_ERROR initError
     {
         publisher->mState = State::kInitialized;
 
-        // TODO: this is wrong, however we need resolverproxy initialized
-        // otherwise DiscoveryImplPlatform is not usable.
-        //
-        // We rely on the fact that resolverproxy does not use the endpoint
-        // nor does DiscoveryImplPlatform use it (since init will be called
-        // twice now)
-        //
-        // The problem is that:
-        //   - DiscoveryImplPlatform contains a ResolverProxy
-        //   - ResolverProxy::Init calls Dnssd::Resolver::Instance().Init
-        // which results in a recursive dependency (proxy initializes the
-        // class that it is contained in).
-        publisher->mResolverProxy.Init(nullptr);
-
         // Post an event that will start advertising
         DeviceLayer::ChipDeviceEvent event;
         event.Type = DeviceLayer::DeviceEventType::kDnssdInitialized;
@@ -569,6 +552,7 @@ CHIP_ERROR DiscoveryImplPlatform::Advertise(const OperationalAdvertisingParamete
     ADD_TXT_RECORD(SessionActiveInterval);
     ADD_TXT_RECORD(SessionActiveThreshold);
     ADD_TXT_RECORD(TcpSupported);
+    ADD_TXT_RECORD(LongIdleTimeICD); // Optional, will not be added if related 'params' doesn't have a value
 
     ADD_PTR_RECORD(CompressedFabricId);
 
@@ -588,6 +572,7 @@ CHIP_ERROR DiscoveryImplPlatform::Advertise(const CommissionAdvertisingParameter
     ADD_TXT_RECORD(SessionActiveInterval);
     ADD_TXT_RECORD(SessionActiveThreshold);
     ADD_TXT_RECORD(TcpSupported);
+    ADD_TXT_RECORD(LongIdleTimeICD); // Optional, will not be added if related 'params' doesn't have a value
 
     ADD_PTR_RECORD(VendorId);
     ADD_PTR_RECORD(DeviceType);
@@ -657,125 +642,131 @@ void DiscoveryImplPlatform::NodeIdResolutionNoLongerNeeded(const PeerId & peerId
     ChipDnssdResolveNoLongerNeeded(name);
 }
 
-CHIP_ERROR DiscoveryImplPlatform::DiscoverCommissionableNodes(DiscoveryFilter filter)
+CHIP_ERROR DiscoveryImplPlatform::DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context)
 {
     ReturnErrorOnFailure(InitImpl());
-    return mResolverProxy.DiscoverCommissionableNodes(filter);
-}
-
-CHIP_ERROR DiscoveryImplPlatform::DiscoverCommissioners(DiscoveryFilter filter)
-{
-    ReturnErrorOnFailure(InitImpl());
-    return mResolverProxy.DiscoverCommissioners(filter);
-}
-
-CHIP_ERROR DiscoveryImplPlatform::StopDiscovery()
-{
-    ReturnErrorOnFailure(InitImpl());
-    return mResolverProxy.StopDiscovery();
-}
-
-CHIP_ERROR DiscoveryImplPlatform::ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId)
-{
-    ReturnErrorOnFailure(InitImpl());
-    return mResolverProxy.ReconfirmRecord(hostname, address, interfaceId);
-}
-
-DiscoveryImplPlatform & DiscoveryImplPlatform::GetInstance()
-{
-    return sManager.get();
-}
-
-ServiceAdvertiser & chip::Dnssd::ServiceAdvertiser::Instance()
-{
-    return DiscoveryImplPlatform::GetInstance();
-}
-
-Resolver & chip::Dnssd::Resolver::Instance()
-{
-    return DiscoveryImplPlatform::GetInstance();
-}
-
-ResolverProxy::~ResolverProxy()
-{
-    Shutdown();
-}
-
-CHIP_ERROR ResolverProxy::DiscoverCommissionableNodes(DiscoveryFilter filter)
-{
-    StopDiscovery();
-
-    VerifyOrReturnError(mDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    mDelegate->Retain();
+    StopDiscovery(context);
 
     if (filter.type == DiscoveryFilterType::kInstanceName)
     {
-        // when we have the instance name, no need to browse, only need to resolve
+        // When we have the instance name, no need to browse, only need to resolve.
         DnssdService service;
 
         ReturnErrorOnFailure(MakeServiceSubtype(service.mName, sizeof(service.mName), filter));
         Platform::CopyString(service.mType, kCommissionableServiceName);
         service.mProtocol    = DnssdServiceProtocol::kDnssdProtocolUdp;
         service.mAddressType = Inet::IPAddressType::kAny;
-        return ChipDnssdResolve(&service, Inet::InterfaceId::Null(), HandleNodeResolve, mDelegate);
+
+        // Increase the reference count of the context to keep it alive until HandleNodeResolve is called back.
+        CHIP_ERROR error = ChipDnssdResolve(&service, Inet::InterfaceId::Null(), HandleNodeResolve, context.Retain());
+
+        if (error != CHIP_NO_ERROR)
+        {
+            context.Release();
+        }
+
+        return error;
     }
 
     char serviceName[kMaxCommissionableServiceNameSize];
     ReturnErrorOnFailure(MakeServiceTypeName(serviceName, sizeof(serviceName), filter, DiscoveryType::kCommissionableNode));
 
     intptr_t browseIdentifier;
-    ReturnErrorOnFailure(ChipDnssdBrowse(serviceName, DnssdServiceProtocol::kDnssdProtocolUdp, Inet::IPAddressType::kAny,
-                                         Inet::InterfaceId::Null(), HandleNodeBrowse, mDelegate, &browseIdentifier));
-    mDiscoveryContext.Emplace(browseIdentifier);
-    return CHIP_NO_ERROR;
+    // Increase the reference count of the context to keep it alive until HandleNodeBrowse is called back.
+    CHIP_ERROR error = ChipDnssdBrowse(serviceName, DnssdServiceProtocol::kDnssdProtocolUdp, Inet::IPAddressType::kAny,
+                                       Inet::InterfaceId::Null(), HandleNodeBrowse, context.Retain(), &browseIdentifier);
+
+    if (error == CHIP_NO_ERROR)
+    {
+        context.SetBrowseIdentifier(browseIdentifier);
+    }
+    else
+    {
+        context.Release();
+    }
+
+    return error;
 }
 
-CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
+CHIP_ERROR DiscoveryImplPlatform::DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context)
 {
-    StopDiscovery();
-
-    VerifyOrReturnError(mDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    mDelegate->Retain();
+    ReturnErrorOnFailure(InitImpl());
+    StopDiscovery(context);
 
     if (filter.type == DiscoveryFilterType::kInstanceName)
     {
-        // when we have the instance name, no need to browse, only need to resolve
+        // When we have the instance name, no need to browse, only need to resolve.
         DnssdService service;
 
         ReturnErrorOnFailure(MakeServiceSubtype(service.mName, sizeof(service.mName), filter));
         Platform::CopyString(service.mType, kCommissionerServiceName);
         service.mProtocol    = DnssdServiceProtocol::kDnssdProtocolUdp;
         service.mAddressType = Inet::IPAddressType::kAny;
-        return ChipDnssdResolve(&service, Inet::InterfaceId::Null(), HandleNodeResolve, mDelegate);
+
+        // Increase the reference count of the context to keep it alive until HandleNodeResolve is called back.
+        CHIP_ERROR error = ChipDnssdResolve(&service, Inet::InterfaceId::Null(), HandleNodeResolve, context.Retain());
+
+        if (error != CHIP_NO_ERROR)
+        {
+            context.Release();
+        }
     }
 
     char serviceName[kMaxCommissionerServiceNameSize];
     ReturnErrorOnFailure(MakeServiceTypeName(serviceName, sizeof(serviceName), filter, DiscoveryType::kCommissionerNode));
 
     intptr_t browseIdentifier;
-    ReturnErrorOnFailure(ChipDnssdBrowse(serviceName, DnssdServiceProtocol::kDnssdProtocolUdp, Inet::IPAddressType::kAny,
-                                         Inet::InterfaceId::Null(), HandleNodeBrowse, mDelegate, &browseIdentifier));
-    mDiscoveryContext.Emplace(browseIdentifier);
-    return CHIP_NO_ERROR;
+    // Increase the reference count of the context to keep it alive until HandleNodeBrowse is called back.
+    CHIP_ERROR error = ChipDnssdBrowse(serviceName, DnssdServiceProtocol::kDnssdProtocolUdp, Inet::IPAddressType::kAny,
+                                       Inet::InterfaceId::Null(), HandleNodeBrowse, context.Retain(), &browseIdentifier);
+
+    if (error == CHIP_NO_ERROR)
+    {
+        context.SetBrowseIdentifier(browseIdentifier);
+    }
+    else
+    {
+        context.Release();
+    }
+
+    return error;
 }
 
-CHIP_ERROR ResolverProxy::StopDiscovery()
+CHIP_ERROR DiscoveryImplPlatform::StopDiscovery(DiscoveryContext & context)
 {
-    if (!mDiscoveryContext.HasValue())
+    if (!context.GetBrowseIdentifier().HasValue())
     {
         // No discovery going on.
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR err = ChipDnssdStopBrowse(mDiscoveryContext.Value());
-    mDiscoveryContext.ClearValue();
-    return err;
+    const auto browseIdentifier = context.GetBrowseIdentifier().Value();
+    context.ClearBrowseIdentifier();
+
+    return ChipDnssdStopBrowse(browseIdentifier);
 }
 
-CHIP_ERROR ResolverProxy::ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId)
+CHIP_ERROR DiscoveryImplPlatform::ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId)
 {
+    ReturnErrorOnFailure(InitImpl());
+
     return ChipDnssdReconfirmRecord(hostname, address, interfaceId);
 }
 
+DiscoveryImplPlatform & DiscoveryImplPlatform::GetInstance()
+{
+    return sManager.get();
+}
+
+ServiceAdvertiser & chip::Dnssd::ServiceAdvertiser::Instance()
+{
+    return DiscoveryImplPlatform::GetInstance();
+}
+
+Resolver & chip::Dnssd::Resolver::Instance()
+{
+    return DiscoveryImplPlatform::GetInstance();
+}
+
 } // namespace Dnssd
 } // namespace chip
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.h b/src/lib/dnssd/Discovery_ImplPlatform.h
index 994112e9be1f8e..a3f79796ca535c 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.h
+++ b/src/lib/dnssd/Discovery_ImplPlatform.h
@@ -23,7 +23,6 @@
 #include <lib/core/Global.h>
 #include <lib/dnssd/Advertiser.h>
 #include <lib/dnssd/Resolver.h>
-#include <lib/dnssd/ResolverProxy.h>
 #include <lib/dnssd/platform/Dnssd.h>
 #include <platform/CHIPDeviceConfig.h>
 
@@ -52,15 +51,11 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver
 
     // Members that implement Resolver interface.
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override
-    {
-        mResolverProxy.SetCommissioningDelegate(delegate);
-    }
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR StopDiscovery() override;
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
 
     static DiscoveryImplPlatform & GetInstance();
@@ -97,7 +92,6 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver
 
     State mState = State::kUninitialized;
     uint8_t mCommissionableInstanceName[sizeof(uint64_t)];
-    ResolverProxy mResolverProxy;
     OperationalResolveDelegate * mOperationalDelegate = nullptr;
 
     friend class Global<DiscoveryImplPlatform>;
diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h
index 81c8e975480347..ae4e95f4341b85 100644
--- a/src/lib/dnssd/Resolver.h
+++ b/src/lib/dnssd/Resolver.h
@@ -28,6 +28,7 @@
 #include <lib/core/CHIPError.h>
 #include <lib/core/Optional.h>
 #include <lib/core/PeerId.h>
+#include <lib/core/ReferenceCounted.h>
 #include <lib/dnssd/Constants.h>
 #include <lib/support/BytesToHex.h>
 #include <messaging/ReliableMessageProtocolConfig.h>
@@ -48,6 +49,7 @@ struct CommonResolutionData
     uint16_t port                         = 0;
     char hostName[kHostNameMaxLength + 1] = {};
     bool supportsTcp                      = false;
+    Optional<bool> isICDOperatingAsLIT;
     Optional<System::Clock::Milliseconds32> mrpRetryIntervalIdle;
     Optional<System::Clock::Milliseconds32> mrpRetryIntervalActive;
     Optional<System::Clock::Milliseconds16> mrpRetryActiveThreshold;
@@ -81,12 +83,14 @@ struct CommonResolutionData
     void Reset()
     {
         memset(hostName, 0, sizeof(hostName));
-        mrpRetryIntervalIdle   = NullOptional;
-        mrpRetryIntervalActive = NullOptional;
-        numIPs                 = 0;
-        port                   = 0;
-        supportsTcp            = false;
-        interfaceId            = Inet::InterfaceId::Null();
+        mrpRetryIntervalIdle    = NullOptional;
+        mrpRetryIntervalActive  = NullOptional;
+        mrpRetryActiveThreshold = NullOptional;
+        isICDOperatingAsLIT     = NullOptional;
+        numIPs                  = 0;
+        port                    = 0;
+        supportsTcp             = false;
+        interfaceId             = Inet::InterfaceId::Null();
         for (auto & addr : ipAddress)
         {
             addr = chip::Inet::IPAddress::Any;
@@ -127,7 +131,23 @@ struct CommonResolutionData
         {
             ChipLogDetail(Discovery, "\tMrp Interval active: not present");
         }
+        if (mrpRetryActiveThreshold.HasValue())
+        {
+            ChipLogDetail(Discovery, "\tMrp Active Threshold: %u ms", mrpRetryActiveThreshold.Value().count());
+        }
+        else
+        {
+            ChipLogDetail(Discovery, "\tMrp Active Threshold: not present");
+        }
         ChipLogDetail(Discovery, "\tTCP Supported: %d", supportsTcp);
+        if (isICDOperatingAsLIT.HasValue())
+        {
+            ChipLogDetail(Discovery, "\tThe ICD operates in %s", isICDOperatingAsLIT.Value() ? "LIT" : "SIT");
+        }
+        else
+        {
+            ChipLogDetail(Discovery, "\tICD: not present");
+        }
     }
 };
 
@@ -333,6 +353,43 @@ class CommissioningResolveDelegate
     virtual void OnNodeDiscovered(const DiscoveredNodeData & nodeData) = 0;
 };
 
+/**
+ * Node discovery context class.
+ *
+ * This class enables multiple clients of the global DNS-SD resolver to start simultaneous
+ * discovery operations.
+ *
+ * An object of this class is shared between a resolver client and the concrete resolver
+ * implementation. The client is responsible for allocating the context and passing it to
+ * the resolver when initiating a discovery operation. The resolver, in turn, is supposed to retain
+ * the context until the operation is finished. This allows the client to release the ownership of
+ * the context at any time without putting the resolver at risk of using a deleted object.
+ */
+class DiscoveryContext : public ReferenceCounted<DiscoveryContext>
+{
+public:
+    void SetBrowseIdentifier(intptr_t identifier) { mBrowseIdentifier.Emplace(identifier); }
+    void ClearBrowseIdentifier() { mBrowseIdentifier.ClearValue(); }
+    const Optional<intptr_t> & GetBrowseIdentifier() const { return mBrowseIdentifier; }
+
+    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) { mCommissioningDelegate = delegate; }
+    void OnNodeDiscovered(const DiscoveredNodeData & nodeData)
+    {
+        if (mCommissioningDelegate != nullptr)
+        {
+            mCommissioningDelegate->OnNodeDiscovered(nodeData);
+        }
+        else
+        {
+            ChipLogError(Discovery, "Missing commissioning delegate. Data discarded");
+        }
+    }
+
+private:
+    CommissioningResolveDelegate * mCommissioningDelegate = nullptr;
+    Optional<intptr_t> mBrowseIdentifier;
+};
+
 /**
  * Interface for resolving CHIP DNS-SD services
  */
@@ -366,11 +423,6 @@ class Resolver
      */
     virtual void SetOperationalDelegate(OperationalResolveDelegate * delegate) = 0;
 
-    /**
-     * If nullptr is passed, the previously registered delegate is unregistered.
-     */
-    virtual void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) = 0;
-
     /**
      * Requests resolution of the given operational node service.
      *
@@ -412,18 +464,26 @@ class Resolver
     /**
      * Finds all commissionable nodes matching the given filter.
      *
-     * Whenever a new matching node is found and a resolver delegate has been registered,
-     * the node information is passed to the delegate's `OnNodeDiscoveryComplete` method.
+     * Whenever a new matching node is found, the node information is passed to
+     * the `OnNodeDiscovered` method of the commissioning delegate configured
+     * in the context object.
+     *
+     * This method is expected to increase the reference count of the context
+     * object for as long as it takes to complete the discovery request.
      */
-    virtual CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) = 0;
+    virtual CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) = 0;
 
     /**
      * Finds all commissioner nodes matching the given filter.
      *
-     * Whenever a new matching node is found and a resolver delegate has been registered,
-     * the node information is passed to the delegate's `OnNodeDiscoveryComplete` method.
+     * Whenever a new matching node is found, the node information is passed to
+     * the `OnNodeDiscovered` method of the commissioning delegate configured
+     * in the context object.
+     *
+     * This method is expected to increase the reference count of the context
+     * object for as long as it takes to complete the discovery request.
      */
-    virtual CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) = 0;
+    virtual CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) = 0;
 
     /**
      * Stop discovery (of commissionable or commissioner nodes).
@@ -431,7 +491,7 @@ class Resolver
      * Some back ends may not support stopping discovery, so consumers should
      * not assume they will stop getting callbacks after calling this.
      */
-    virtual CHIP_ERROR StopDiscovery() = 0;
+    virtual CHIP_ERROR StopDiscovery(DiscoveryContext & context) = 0;
 
     /**
      * Verify the validity of an address that appears to be out of date (for example
diff --git a/src/lib/dnssd/ResolverProxy.cpp b/src/lib/dnssd/ResolverProxy.cpp
new file mode 100644
index 00000000000000..3e7446ebbbdc6b
--- /dev/null
+++ b/src/lib/dnssd/ResolverProxy.cpp
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ResolverProxy.h"
+
+#include <lib/support/CHIPMem.h>
+
+namespace chip {
+namespace Dnssd {
+
+CHIP_ERROR ResolverProxy::Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint)
+{
+    VerifyOrReturnError(mContext == nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    ReturnErrorOnFailure(mResolver.Init(udpEndPoint));
+    mContext = Platform::New<DiscoveryContext>();
+    VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    return CHIP_NO_ERROR;
+}
+
+void ResolverProxy::Shutdown()
+{
+    VerifyOrReturn(mContext != nullptr);
+    mContext->SetCommissioningDelegate(nullptr);
+    mContext->Release();
+    mContext = nullptr;
+}
+
+CHIP_ERROR ResolverProxy::DiscoverCommissionableNodes(DiscoveryFilter filter)
+{
+    VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    return mResolver.DiscoverCommissionableNodes(filter, *mContext);
+}
+
+CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
+{
+    VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    return mResolver.DiscoverCommissioners(filter, *mContext);
+}
+
+CHIP_ERROR ResolverProxy::StopDiscovery()
+{
+    VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    return mResolver.StopDiscovery(*mContext);
+}
+
+} // namespace Dnssd
+} // namespace chip
diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h
index 176316ef8cd053..09a50e89c1a209 100644
--- a/src/lib/dnssd/ResolverProxy.h
+++ b/src/lib/dnssd/ResolverProxy.h
@@ -17,112 +17,48 @@
 
 #pragma once
 
-#include <lib/core/ReferenceCounted.h>
 #include <lib/dnssd/Resolver.h>
 
 namespace chip {
 namespace Dnssd {
 
-class ResolverDelegateProxy : public ReferenceCounted<ResolverDelegateProxy>, public CommissioningResolveDelegate
-
+/**
+ * Convenience class for discovering Matter commissioners and commissionable nodes.
+ *
+ * The class simplifies the usage of the global DNS-SD resolver to discover Matter nodes by managing
+ * the lifetime of the discovery context object.
+ *
+ * The proxy provides a method to register an external commissioning delegate whose
+ * `OnNodeDiscovered` method is called whenever a new node is discovered. The delegate is
+ * automatically unregistered when the proxy is shut down or destroyed.
+ *
+ * The proxy can be safely shut down or destroyed even if the last discovery operation has not
+ * finished yet.
+ */
+class ResolverProxy
 {
 public:
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) { mCommissioningDelegate = delegate; }
-
-    // CommissioningResolveDelegate
-    void OnNodeDiscovered(const DiscoveredNodeData & nodeData) override
-    {
-        if (mCommissioningDelegate != nullptr)
-        {
-            mCommissioningDelegate->OnNodeDiscovered(nodeData);
-        }
-        else
-        {
-            ChipLogError(Discovery, "Missing commissioning delegate. Data discarded.");
-        }
-    }
+    explicit ResolverProxy(Resolver * resolver = nullptr) : mResolver(resolver != nullptr ? *resolver : Resolver::Instance()) {}
+    ~ResolverProxy() { Shutdown(); }
 
-private:
-    CommissioningResolveDelegate * mCommissioningDelegate = nullptr;
-};
+    CHIP_ERROR Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint = nullptr);
+    void Shutdown();
 
-class ResolverProxy : public Resolver
-{
-public:
-    ResolverProxy() {}
-    ~ResolverProxy() override;
-
-    // Resolver interface.
-    CHIP_ERROR Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint = nullptr) override
+    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate)
     {
-        ReturnErrorOnFailure(chip::Dnssd::Resolver::Instance().Init(udpEndPoint));
-        VerifyOrReturnError(mDelegate == nullptr, CHIP_ERROR_INCORRECT_STATE);
-        mDelegate = chip::Platform::New<ResolverDelegateProxy>();
-
-        if (mDelegate != nullptr)
+        if (mContext != nullptr)
         {
-            if (mPreInitCommissioningDelegate != nullptr)
-            {
-                ChipLogProgress(Discovery, "Setting commissioning delegate post init");
-                mDelegate->SetCommissioningDelegate(mPreInitCommissioningDelegate);
-                mPreInitCommissioningDelegate = nullptr;
-            }
+            mContext->SetCommissioningDelegate(delegate);
         }
-
-        return mDelegate != nullptr ? CHIP_NO_ERROR : CHIP_ERROR_NO_MEMORY;
     }
 
-    bool IsInitialized() override { return Resolver::Instance().IsInitialized(); }
-
-    void SetOperationalDelegate(OperationalResolveDelegate * delegate) override
-    {
-        /// Unfortunately cannot remove this method since it is in a Resolver interface.
-        ChipLogError(Discovery, "!!! Operational proxy does NOT support operational discovery");
-        ChipLogError(Discovery, "!!! Please use AddressResolver or DNSSD Resolver directly");
-        chipDie(); // force detection of invalid usages.
-    }
-
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override
-    {
-        if (mDelegate != nullptr)
-        {
-            mDelegate->SetCommissioningDelegate(delegate);
-        }
-        else
-        {
-            if (delegate != nullptr)
-            {
-                ChipLogError(Discovery, "Delaying proxy of commissioning discovery: missing delegate");
-            }
-            mPreInitCommissioningDelegate = delegate;
-        }
-    }
-
-    void Shutdown() override
-    {
-        VerifyOrReturn(mDelegate != nullptr);
-        mDelegate->SetCommissioningDelegate(nullptr);
-        mDelegate->Release();
-        mDelegate = nullptr;
-    }
-
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR StopDiscovery() override;
-    CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
-
-    // TODO: ResolverProxy should not be used anymore to implement operational node resolution
-    //       This method still here because Resolver interface requires it
-    CHIP_ERROR ResolveNodeId(const PeerId & peerId) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override {}
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter());
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter());
+    CHIP_ERROR StopDiscovery();
 
 private:
-    ResolverDelegateProxy * mDelegate                            = nullptr;
-    CommissioningResolveDelegate * mPreInitCommissioningDelegate = nullptr;
-
-    // While discovery (commissionable or commissioner) is ongoing,
-    // mDiscoveryContext may have a value to allow StopDiscovery to work.
-    Optional<intptr_t> mDiscoveryContext;
+    Resolver & mResolver;
+    DiscoveryContext * mContext = nullptr;
 };
 
 } // namespace Dnssd
diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
index 416c747d830cc6..64461965367b13 100644
--- a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
+++ b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
@@ -23,7 +23,6 @@
 #include <lib/dnssd/ActiveResolveAttempts.h>
 #include <lib/dnssd/IncrementalResolve.h>
 #include <lib/dnssd/MinimalMdnsServer.h>
-#include <lib/dnssd/ResolverProxy.h>
 #include <lib/dnssd/ServiceNaming.h>
 #include <lib/dnssd/minimal_mdns/Logging.h>
 #include <lib/dnssd/minimal_mdns/Parser.h>
@@ -274,6 +273,7 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate
     {
         GlobalMinimalMdnsServer::Instance().SetResponseDelegate(this);
     }
+    ~MinMdnsResolver() { SetDiscoveryContext(nullptr); }
 
     //// MdnsPacketDelegate implementation
     void OnMdnsPacketData(const BytesRange & data, const chip::Inet::IPPacketInfo * info) override;
@@ -283,21 +283,21 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate
     bool IsInitialized() override;
     void Shutdown() override;
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override { mCommissioningDelegate = delegate; }
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override;
-    CHIP_ERROR StopDiscovery() override;
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
 
 private:
-    OperationalResolveDelegate * mOperationalDelegate     = nullptr;
-    CommissioningResolveDelegate * mCommissioningDelegate = nullptr;
-    System::Layer * mSystemLayer                          = nullptr;
+    OperationalResolveDelegate * mOperationalDelegate = nullptr;
+    DiscoveryContext * mDiscoveryContext              = nullptr;
+    System::Layer * mSystemLayer                      = nullptr;
     ActiveResolveAttempts mActiveResolves;
     PacketParser mPacketParser;
 
+    void SetDiscoveryContext(DiscoveryContext * context);
     void ScheduleIpAddressResolve(SerializedQNameIterator hostName);
 
     CHIP_ERROR SendAllPendingQueries();
@@ -332,6 +332,21 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate
     char qnameStorage[kMaxQnameSize];
 };
 
+void MinMdnsResolver::SetDiscoveryContext(DiscoveryContext * context)
+{
+    if (mDiscoveryContext != nullptr)
+    {
+        mDiscoveryContext->Release();
+    }
+
+    if (context != nullptr)
+    {
+        context->Retain();
+    }
+
+    mDiscoveryContext = context;
+}
+
 void MinMdnsResolver::ScheduleIpAddressResolve(SerializedQNameIterator hostName)
 {
     HeapQName target(hostName);
@@ -409,9 +424,9 @@ void MinMdnsResolver::AdvancePendingResolverStates()
 
             if (discoveredNodeIsRelevant)
             {
-                if (mCommissioningDelegate != nullptr)
+                if (mDiscoveryContext != nullptr)
                 {
-                    mCommissioningDelegate->OnNodeDiscovered(nodeData);
+                    mDiscoveryContext->OnNodeDiscovered(nodeData);
                 }
                 else
                 {
@@ -670,18 +685,26 @@ void MinMdnsResolver::ExpireIncrementalResolvers()
     }
 }
 
-CHIP_ERROR MinMdnsResolver::DiscoverCommissionableNodes(DiscoveryFilter filter)
+CHIP_ERROR MinMdnsResolver::DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context)
 {
+    // minmdns currently supports only one discovery context at a time so override the previous context
+    SetDiscoveryContext(&context);
+
     return BrowseNodes(DiscoveryType::kCommissionableNode, filter);
 }
 
-CHIP_ERROR MinMdnsResolver::DiscoverCommissioners(DiscoveryFilter filter)
+CHIP_ERROR MinMdnsResolver::DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context)
 {
+    // minmdns currently supports only one discovery context at a time so override the previous context
+    SetDiscoveryContext(&context);
+
     return BrowseNodes(DiscoveryType::kCommissionerNode, filter);
 }
 
-CHIP_ERROR MinMdnsResolver::StopDiscovery()
+CHIP_ERROR MinMdnsResolver::StopDiscovery(DiscoveryContext & context)
 {
+    SetDiscoveryContext(nullptr);
+
     return mActiveResolves.CompleteAllBrowses();
 }
 
@@ -740,37 +763,5 @@ Resolver & chip::Dnssd::Resolver::Instance()
     return gResolver;
 }
 
-ResolverProxy::~ResolverProxy()
-{
-    // TODO: this is a hack: resolver proxies used for commissionable discovery
-    //       and they don't interact well with each other.
-    gResolver.SetCommissioningDelegate(nullptr);
-    Shutdown();
-}
-
-CHIP_ERROR ResolverProxy::DiscoverCommissionableNodes(DiscoveryFilter filter)
-{
-    VerifyOrReturnError(mDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    chip::Dnssd::Resolver::Instance().SetCommissioningDelegate(mDelegate);
-    return chip::Dnssd::Resolver::Instance().DiscoverCommissionableNodes(filter);
-}
-
-CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
-{
-    VerifyOrReturnError(mDelegate != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    chip::Dnssd::Resolver::Instance().SetCommissioningDelegate(mDelegate);
-    return chip::Dnssd::Resolver::Instance().DiscoverCommissioners(filter);
-}
-
-CHIP_ERROR ResolverProxy::StopDiscovery()
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ResolverProxy::ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
 } // namespace Dnssd
 } // namespace chip
diff --git a/src/lib/dnssd/Resolver_ImplNone.cpp b/src/lib/dnssd/Resolver_ImplNone.cpp
index 3d0d97f57cd449..9a1f40f3008dff 100644
--- a/src/lib/dnssd/Resolver_ImplNone.cpp
+++ b/src/lib/dnssd/Resolver_ImplNone.cpp
@@ -17,7 +17,6 @@
 
 #include "Resolver.h"
 
-#include <lib/dnssd/ResolverProxy.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 namespace chip {
@@ -31,7 +30,6 @@ class NoneResolver : public Resolver
     bool IsInitialized() override { return true; }
     void Shutdown() override {}
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {}
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override {}
 
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override
     {
@@ -42,12 +40,15 @@ class NoneResolver : public Resolver
     {
         ChipLogError(Discovery, "Failed to stop resolving node ID: dnssd resolving not available");
     }
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR StopDiscovery() override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+    CHIP_ERROR StopDiscovery(DiscoveryContext & context) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
@@ -63,30 +64,5 @@ Resolver & chip::Dnssd::Resolver::Instance()
     return gResolver;
 }
 
-ResolverProxy::~ResolverProxy()
-{
-    Shutdown();
-}
-
-CHIP_ERROR ResolverProxy::DiscoverCommissionableNodes(DiscoveryFilter filter)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ResolverProxy::StopDiscovery()
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ResolverProxy::ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
 } // namespace Dnssd
 } // namespace chip
diff --git a/src/lib/dnssd/TxtFields.cpp b/src/lib/dnssd/TxtFields.cpp
index 8befc309a085b5..db11983ea869d7 100644
--- a/src/lib/dnssd/TxtFields.cpp
+++ b/src/lib/dnssd/TxtFields.cpp
@@ -105,6 +105,16 @@ bool MakeBoolFromAsciiDecimal(const ByteSpan & val)
     return val.size() == 1 && static_cast<char>(*val.data()) == '1';
 }
 
+Optional<bool> MakeOptionalBoolFromAsciiDecimal(const ByteSpan & val)
+{
+    char character = static_cast<char>(*val.data());
+    if (val.size() == 1 && ((character == '1') || (character == '0')))
+    {
+        return MakeOptional(character == '1');
+    }
+    return NullOptional;
+}
+
 size_t GetPlusSignIdx(const ByteSpan & value)
 {
     // First value is the vendor id, second (after the +) is the product.
@@ -261,6 +271,9 @@ void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, CommonRes
     case TxtFieldKey::kTcpSupported:
         nodeData.supportsTcp = Internal::MakeBoolFromAsciiDecimal(value);
         break;
+    case TxtFieldKey::kLongIdleTimeICD:
+        nodeData.isICDOperatingAsLIT = Internal::MakeOptionalBoolFromAsciiDecimal(value);
+        break;
     default:
         break;
     }
diff --git a/src/lib/dnssd/TxtFields.h b/src/lib/dnssd/TxtFields.h
index fdd616d1d2b1dc..6e84fa372a8339 100644
--- a/src/lib/dnssd/TxtFields.h
+++ b/src/lib/dnssd/TxtFields.h
@@ -36,6 +36,7 @@ static constexpr size_t kKeySessionActiveIntervalMaxLength       = 7; // [SAI] 0
 static constexpr size_t kKeySessionActiveThresholdMaxLength      = 5; // [SAT] 0-65535
 static constexpr System::Clock::Milliseconds32 kMaxRetryInterval = 3600000_ms32;
 static constexpr size_t kKeyTcpSupportedMaxLength                = 1;
+static constexpr size_t kKeyLongIdleTimeICDMaxLength             = 1;
 
 // Commissionable/commissioner node TXT entries
 static constexpr size_t kKeyLongDiscriminatorMaxLength  = 5;
@@ -69,6 +70,7 @@ enum class TxtFieldKey : uint8_t
     kSessionActiveInterval,
     kSessionActiveThreshold,
     kTcpSupported,
+    kLongIdleTimeICD,
     kCount,
 };
 
@@ -95,6 +97,7 @@ constexpr const TxtFieldInfo txtFieldInfo[static_cast<size_t>(TxtFieldKey::kCoun
     { TxtFieldKey::kSessionActiveInterval, kKeySessionActiveIntervalMaxLength, "SAI", TxtKeyUse::kCommon },
     { TxtFieldKey::kSessionActiveThreshold, kKeySessionActiveThresholdMaxLength, "SAT", TxtKeyUse::kCommon },
     { TxtFieldKey::kTcpSupported, kKeyTcpSupportedMaxLength, "T", TxtKeyUse::kCommon },
+    { TxtFieldKey::kLongIdleTimeICD, kKeyLongIdleTimeICDMaxLength, "ICD", TxtKeyUse::kCommon },
 };
 #ifdef CHIP_CONFIG_TEST
 
diff --git a/src/lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h b/src/lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h
index f7b34f10591e9d..c5b8f9e21f060b 100644
--- a/src/lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h
+++ b/src/lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h
@@ -311,7 +311,7 @@ class CheckOnlyServer : private chip::PoolImpl<ServerBase::EndpointInfo, 0, chip
             found = false;
         }
     };
-    static constexpr size_t kMaxExpectedTxt = 12;
+    static constexpr size_t kMaxExpectedTxt = 13;
     KV mExpectedTxt[kMaxExpectedTxt];
     size_t mNumExpectedTxtRecords = 0;
     size_t mNumReceivedTxtRecords = 0;
diff --git a/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp b/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp
index 24d8d159fc6ded..6623f0ac63ec3c 100644
--- a/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp
+++ b/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp
@@ -14,6 +14,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <app/AppConfig.h>
 #include <lib/dnssd/Advertiser.h>
 
 #include <string>
@@ -181,15 +182,43 @@ CommissionAdvertisingParameters commissionableNodeParamsLargeEnhanced =
         .SetProductId(chip::Optional<uint16_t>(897))
         .SetRotatingDeviceId(chip::Optional<const char *>("id_that_spins"))
         .SetTcpSupported(chip::Optional<bool>(true))
+        .SetICDOperatingAsLIT(chip::Optional<bool>(false))
         // 3600005 is more than the max so should be adjusted down
         .SetLocalMRPConfig(Optional<ReliableMessageProtocolConfig>::Value(3600000_ms32, 3600005_ms32, 65535_ms16));
 QNamePart txtCommissionableNodeParamsLargeEnhancedParts[] = { "D=22",          "VP=555+897",       "CM=2",       "DT=70000",
                                                               "DN=testy-test", "RI=id_that_spins", "PI=Pair me", "PH=3",
-                                                              "SAI=3600000",   "SII=3600000",      "SAT=65535",  "T=1" };
+                                                              "SAI=3600000",   "SII=3600000",      "SAT=65535",  "T=1",
+                                                              "ICD=0" };
 FullQName txtCommissionableNodeParamsLargeEnhancedName    = FullQName(txtCommissionableNodeParamsLargeEnhancedParts);
 TxtResourceRecord txtCommissionableNodeParamsLargeEnhanced =
     TxtResourceRecord(instanceName, txtCommissionableNodeParamsLargeEnhancedName);
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+CommissionAdvertisingParameters commissionableNodeParamsEnhancedAsICDLIT =
+    CommissionAdvertisingParameters()
+        .SetCommissionAdvertiseMode(CommssionAdvertiseMode::kCommissionableNode)
+        .SetMac(ByteSpan(kMac, sizeof(kMac)))
+        .SetLongDiscriminator(22)
+        .SetShortDiscriminator(2)
+        .SetVendorId(chip::Optional<uint16_t>(555))
+        .SetDeviceType(chip::Optional<uint32_t>(70000))
+        .SetCommissioningMode(CommissioningMode::kEnabledEnhanced)
+        .SetDeviceName(chip::Optional<const char *>("testy-test"))
+        .SetPairingHint(chip::Optional<uint16_t>(3))
+        .SetPairingInstruction(chip::Optional<const char *>("Pair me"))
+        .SetProductId(chip::Optional<uint16_t>(897))
+        .SetTcpSupported(chip::Optional<bool>(true))
+        .SetICDOperatingAsLIT(chip::Optional<bool>(true))
+        .SetLocalMRPConfig(Optional<ReliableMessageProtocolConfig>::Value(3600000_ms32, 3600000_ms32, 65535_ms16));
+// With ICD Operation as LIT, SII key will not be added to the advertissement
+QNamePart txtCommissionableNodeParamsEnhancedAsICDLITParts[] = { "D=22",          "VP=555+897", "CM=2", "DT=70000",
+                                                                 "DN=testy-test", "PI=Pair me", "PH=3", "SAI=3600000",
+                                                                 "SAT=65535",     "T=1",        "ICD=1" };
+FullQName txtCommissionableNodeParamsEnhancedAsICDLITName    = FullQName(txtCommissionableNodeParamsEnhancedAsICDLITParts);
+TxtResourceRecord txtCommissionableNodeParamsEnhancedAsICDLIT =
+    TxtResourceRecord(instanceName, txtCommissionableNodeParamsEnhancedAsICDLITName);
+#endif
+
 // Our server doesn't do anything with this, blank is fine.
 Inet::IPPacketInfo packetInfo;
 
@@ -452,6 +481,28 @@ void CommissionableAdverts(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, SendQuery(instanceName) == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, server.GetSendCalled());
     NL_TEST_ASSERT(inSuite, server.GetHeaderFound());
+
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    NL_TEST_ASSERT(inSuite, mdnsAdvertiser.Advertise(commissionableNodeParamsEnhancedAsICDLIT) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, mdnsAdvertiser.FinalizeServiceUpdate() == CHIP_NO_ERROR);
+    ChipLogProgress(Discovery, "Testing response to _matterc._udp.local for enhanced parameters With ICD as LIT");
+    server.Reset();
+    server.AddExpectedRecord(&ptrCommissionableNode);
+    server.AddExpectedRecord(&srvCommissionableNode);
+    server.AddExpectedRecord(&txtCommissionableNodeParamsEnhancedAsICDLIT);
+    NL_TEST_ASSERT(inSuite, SendQuery(kMatterCommissionableNodeQueryName) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, server.GetSendCalled());
+    NL_TEST_ASSERT(inSuite, server.GetHeaderFound());
+
+    ChipLogProgress(Discovery, "Testing response to instance name for enhanced parameters With ICD as LIT");
+    server.Reset();
+    // Just the SRV and TXT should return
+    server.AddExpectedRecord(&srvCommissionableNode);
+    server.AddExpectedRecord(&txtCommissionableNodeParamsEnhancedAsICDLIT);
+    NL_TEST_ASSERT(inSuite, SendQuery(instanceName) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, server.GetSendCalled());
+    NL_TEST_ASSERT(inSuite, server.GetHeaderFound());
+#endif
 }
 
 void CommissionableAndOperationalAdverts(nlTestSuite * inSuite, void * inContext)
diff --git a/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp b/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp
index 70522395428e9b..39316ae129bd36 100644
--- a/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp
+++ b/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp
@@ -312,36 +312,36 @@ void PtrSrvTxtMultipleRespondersToInstance(nlTestSuite * inSuite, void * inConte
 
 void PtrSrvTxtMultipleRespondersToServiceListing(nlTestSuite * inSuite, void * inContext)
 {
-    CommonTestElements common1(inSuite, "test1");
-    CommonTestElements common2(inSuite, "test2");
-
+    auto common1 = std::make_unique<CommonTestElements>(inSuite, "test1");
+    auto common2 = std::make_unique<CommonTestElements>(inSuite, "test2");
     // Just use the server from common1.
-    ResponseSender responseSender(&common1.server);
+    ResponseSender responseSender(&common1->server);
 
-    NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&common1.queryResponder) == CHIP_NO_ERROR);
-    common1.queryResponder.AddResponder(&common1.ptrResponder).SetReportInServiceListing(true);
-    common1.queryResponder.AddResponder(&common1.srvResponder);
-    common1.queryResponder.AddResponder(&common1.txtResponder);
+    NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&common1->queryResponder) == CHIP_NO_ERROR);
+    common1->queryResponder.AddResponder(&common1->ptrResponder).SetReportInServiceListing(true);
+    common1->queryResponder.AddResponder(&common1->srvResponder);
+    common1->queryResponder.AddResponder(&common1->txtResponder);
 
-    NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&common2.queryResponder) == CHIP_NO_ERROR);
-    common2.queryResponder.AddResponder(&common2.ptrResponder).SetReportInServiceListing(true);
-    common2.queryResponder.AddResponder(&common2.srvResponder);
-    common2.queryResponder.AddResponder(&common2.txtResponder);
+    NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&common2->queryResponder) == CHIP_NO_ERROR);
+    common2->queryResponder.AddResponder(&common2->ptrResponder).SetReportInServiceListing(true);
+    common2->queryResponder.AddResponder(&common2->srvResponder);
+    common2->queryResponder.AddResponder(&common2->txtResponder);
 
     // Build a query for the instance
-    common1.recordWriter.WriteQName(common1.dnsSd);
-    QueryData queryData = QueryData(QType::ANY, QClass::IN, false, common1.requestNameStart, common1.requestBytesRange);
+    common1->recordWriter.WriteQName(common1->dnsSd);
+    QueryData queryData = QueryData(QType::ANY, QClass::IN, false, common1->requestNameStart, common1->requestBytesRange);
 
     // Should get service listing from both.
-    PtrResourceRecord serviceRecord1 = PtrResourceRecord(common1.dnsSd, common1.ptrRecord.GetName());
-    common1.server.AddExpectedRecord(&serviceRecord1);
-    PtrResourceRecord serviceRecord2 = PtrResourceRecord(common2.dnsSd, common2.ptrRecord.GetName());
-    common1.server.AddExpectedRecord(&serviceRecord2);
+    PtrResourceRecord serviceRecord1 = PtrResourceRecord(common1->dnsSd, common1->ptrRecord.GetName());
+    common1->server.AddExpectedRecord(&serviceRecord1);
+    PtrResourceRecord serviceRecord2 = PtrResourceRecord(common2->dnsSd, common2->ptrRecord.GetName());
+    common1->server.AddExpectedRecord(&serviceRecord2);
 
-    responseSender.Respond(1, queryData, &common1.packetInfo, ResponseConfiguration());
+    responseSender.Respond(1, queryData, &common1->packetInfo, ResponseConfiguration());
 
-    NL_TEST_ASSERT(inSuite, common1.server.GetSendCalled());
-    NL_TEST_ASSERT(inSuite, common1.server.GetHeaderFound());
+    NL_TEST_ASSERT(inSuite, common1->server.GetSendCalled());
+
+    NL_TEST_ASSERT(inSuite, common1->server.GetHeaderFound());
 }
 
 const nlTest sTests[] = {
diff --git a/src/lib/dnssd/platform/tests/TestPlatform.cpp b/src/lib/dnssd/platform/tests/TestPlatform.cpp
index 3b7f91b4d8ba85..93141ca403dc6a 100644
--- a/src/lib/dnssd/platform/tests/TestPlatform.cpp
+++ b/src/lib/dnssd/platform/tests/TestPlatform.cpp
@@ -53,7 +53,8 @@ OperationalAdvertisingParameters operationalParams2 =
         .SetPort(CHIP_PORT)
         .EnableIpV4(true)
         .SetLocalMRPConfig(Optional<ReliableMessageProtocolConfig>::Value(32_ms32, 30_ms32, 10_ms16)) // SII and SAI to match below
-        .SetTcpSupported(Optional<bool>(true));
+        .SetTcpSupported(Optional<bool>(true))
+        .SetICDOperatingAsLIT(Optional<bool>(false));
 test::ExpectedCall operationalCall2 = test::ExpectedCall()
                                           .SetProtocol(DnssdServiceProtocol::kDnssdProtocolTcp)
                                           .SetServiceName("_matter")
@@ -63,7 +64,8 @@ test::ExpectedCall operationalCall2 = test::ExpectedCall()
                                           .AddTxt("SII", "32")
                                           .AddTxt("SAI", "30")
                                           .AddTxt("SAT", "10")
-                                          .AddTxt("T", "1");
+                                          .AddTxt("T", "1")
+                                          .AddTxt("ICD", "0");
 
 CommissionAdvertisingParameters commissionableNodeParamsSmall =
     CommissionAdvertisingParameters()
@@ -87,15 +89,16 @@ CommissionAdvertisingParameters commissionableNodeParamsLargeBasic =
         .SetMac(ByteSpan(kMac, sizeof(kMac)))
         .SetLongDiscriminator(22)
         .SetShortDiscriminator(2)
-        .SetVendorId(chip::Optional<uint16_t>(555))
-        .SetDeviceType(chip::Optional<uint32_t>(70000))
+        .SetVendorId(Optional<uint16_t>(555))
+        .SetDeviceType(Optional<uint32_t>(70000))
         .SetCommissioningMode(CommissioningMode::kEnabledBasic)
-        .SetDeviceName(chip::Optional<const char *>("testy-test"))
-        .SetPairingHint(chip::Optional<uint16_t>(3))
-        .SetPairingInstruction(chip::Optional<const char *>("Pair me"))
-        .SetProductId(chip::Optional<uint16_t>(897))
-        .SetRotatingDeviceId(chip::Optional<const char *>("id_that_spins"))
-        .SetTcpSupported(chip::Optional<bool>(true))
+        .SetDeviceName(Optional<const char *>("testy-test"))
+        .SetPairingHint(Optional<uint16_t>(3))
+        .SetPairingInstruction(Optional<const char *>("Pair me"))
+        .SetProductId(Optional<uint16_t>(897))
+        .SetRotatingDeviceId(Optional<const char *>("id_that_spins"))
+        .SetTcpSupported(Optional<bool>(true))
+        .SetICDOperatingAsLIT(Optional<bool>(false))
         // 3600005 is over the max, so this should be adjusted by the platform
         .SetLocalMRPConfig(Optional<ReliableMessageProtocolConfig>::Value(3600000_ms32, 3600005_ms32, 65535_ms16));
 
@@ -112,6 +115,7 @@ test::ExpectedCall commissionableLargeBasic = test::ExpectedCall()
                                                   .AddTxt("PI", "Pair me")
                                                   .AddTxt("PH", "3")
                                                   .AddTxt("T", "1")
+                                                  .AddTxt("ICD", "0")
                                                   .AddTxt("SII", "3600000")
                                                   .AddTxt("SAI", "3600000")
                                                   .AddTxt("SAT", "65535")
diff --git a/src/lib/dnssd/tests/TestTxtFields.cpp b/src/lib/dnssd/tests/TestTxtFields.cpp
index d4502b7f756b1a..9c3f6bd08ae5ba 100644
--- a/src/lib/dnssd/tests/TestTxtFields.cpp
+++ b/src/lib/dnssd/tests/TestTxtFields.cpp
@@ -80,6 +80,9 @@ void TestGetTxtFieldKey(nlTestSuite * inSuite, void * inContext)
     strcpy(key, "T");
     NL_TEST_ASSERT(inSuite, GetTxtFieldKey(GetSpan(key)) == TxtFieldKey::kTcpSupported);
 
+    strcpy(key, "ICD");
+    NL_TEST_ASSERT(inSuite, GetTxtFieldKey(GetSpan(key)) == TxtFieldKey::kLongIdleTimeICD);
+
     strcpy(key, "XX");
     NL_TEST_ASSERT(inSuite, GetTxtFieldKey(GetSpan(key)) == TxtFieldKey::kUnknown);
 }
@@ -288,6 +291,7 @@ bool NodeDataIsEmpty(const DiscoveredNodeData & node)
         node.commissionData.commissioningMode != 0 || node.commissionData.deviceType != 0 ||
         node.commissionData.rotatingIdLen != 0 || node.commissionData.pairingHint != 0 ||
         node.resolutionData.mrpRetryIntervalIdle.HasValue() || node.resolutionData.mrpRetryIntervalActive.HasValue() ||
+        node.resolutionData.mrpRetryActiveThreshold.HasValue() || node.resolutionData.isICDOperatingAsLIT.HasValue() ||
         node.resolutionData.supportsTcp)
     {
         return false;
@@ -387,7 +391,8 @@ bool NodeDataIsEmpty(const ResolvedNodeData & nodeData)
 {
     return nodeData.operationalData.peerId == PeerId{} && nodeData.resolutionData.numIPs == 0 &&
         nodeData.resolutionData.port == 0 && !nodeData.resolutionData.mrpRetryIntervalIdle.HasValue() &&
-        !nodeData.resolutionData.mrpRetryIntervalActive.HasValue() && !nodeData.resolutionData.supportsTcp;
+        !nodeData.resolutionData.mrpRetryIntervalActive.HasValue() && !nodeData.resolutionData.supportsTcp &&
+        !nodeData.resolutionData.isICDOperatingAsLIT.HasValue();
 }
 
 void ResetRetryIntervalIdle(DiscoveredNodeData & nodeData)
@@ -410,6 +415,16 @@ void ResetRetryIntervalActive(ResolvedNodeData & nodeData)
     nodeData.resolutionData.mrpRetryIntervalActive.ClearValue();
 }
 
+void ResetRetryActiveThreshold(DiscoveredNodeData & nodeData)
+{
+    nodeData.resolutionData.mrpRetryActiveThreshold.ClearValue();
+}
+
+void ResetRetryActiveThreshold(ResolvedNodeData & nodeData)
+{
+    nodeData.resolutionData.mrpRetryActiveThreshold.ClearValue();
+}
+
 // Test SAI (formally CRI)
 template <class NodeData>
 void TxtFieldSessionIdleInterval(nlTestSuite * inSuite, void * inContext)
@@ -559,7 +574,7 @@ void TxtFieldSessionActiveThreshold(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, nodeData.resolutionData.GetMrpRetryActiveThreshold().Value() == 65535_ms16);
 
     // Test no other fields were populated
-    ResetRetryIntervalActive(nodeData);
+    ResetRetryActiveThreshold(nodeData);
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(nodeData));
 
     // Invalid SAI - negative value
@@ -630,6 +645,41 @@ void TxtFieldTcpSupport(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, nodeData.resolutionData.supportsTcp == false);
 }
 
+// Test ICD (ICD operation Mode)
+template <class NodeData>
+void TxtFieldICDoperatesAsLIT(nlTestSuite * inSuite, void * inContext)
+{
+    char key[4];
+    char val[16];
+    NodeData nodeData;
+
+    // ICD is operating as a LIT device
+    strcpy(key, "ICD");
+    strcpy(val, "1");
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), nodeData.resolutionData);
+    NL_TEST_ASSERT(inSuite, nodeData.resolutionData.isICDOperatingAsLIT.HasValue());
+    NL_TEST_ASSERT(inSuite, nodeData.resolutionData.isICDOperatingAsLIT.Value());
+
+    // Test no other fields were populated
+    nodeData.resolutionData.isICDOperatingAsLIT.ClearValue();
+    NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(nodeData));
+
+    // ICD is operating as a SIT device
+    strcpy(key, "ICD");
+    strcpy(val, "0");
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), nodeData.resolutionData);
+    NL_TEST_ASSERT(inSuite, nodeData.resolutionData.isICDOperatingAsLIT.HasValue());
+    NL_TEST_ASSERT(inSuite, nodeData.resolutionData.isICDOperatingAsLIT.Value() == false);
+
+    nodeData.resolutionData.isICDOperatingAsLIT.ClearValue();
+    NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(nodeData));
+    // Invalid value, No key set
+    strcpy(key, "ICD");
+    strcpy(val, "asdf");
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), nodeData.resolutionData);
+    NL_TEST_ASSERT(inSuite, nodeData.resolutionData.isICDOperatingAsLIT.HasValue() == false);
+}
+
 // Test IsDeviceTreatedAsSleepy() with CRI
 template <class NodeData>
 void TestIsDeviceSessionIdle(nlTestSuite * inSuite, void * inContext)
@@ -699,12 +749,14 @@ const nlTest sTests[] = {
     NL_TEST_DEF("TxtDiscoveredFieldMrpRetryIntervalActive", TxtFieldSessionActiveInterval<DiscoveredNodeData>),
     NL_TEST_DEF("TxtDiscoveredFieldMrpRetryActiveThreshold", TxtFieldSessionActiveThreshold<DiscoveredNodeData>),
     NL_TEST_DEF("TxtDiscoveredFieldTcpSupport", (TxtFieldTcpSupport<DiscoveredNodeData>) ),
-    NL_TEST_DEF("TxtDiscoveredIsDeviceSessiondle", TestIsDeviceSessionIdle<DiscoveredNodeData>),
+    NL_TEST_DEF("TxtDiscoveredIsICDoperatingAsLIT", (TxtFieldICDoperatesAsLIT<DiscoveredNodeData>) ),
+    NL_TEST_DEF("TxtDiscoveredIsDeviceSessionIdle", TestIsDeviceSessionIdle<DiscoveredNodeData>),
     NL_TEST_DEF("TxtDiscoveredIsDeviceSessionActive", TestIsDeviceSessionActive<DiscoveredNodeData>),
     NL_TEST_DEF("TxtResolvedFieldMrpRetryIntervalIdle", TxtFieldSessionIdleInterval<ResolvedNodeData>),
     NL_TEST_DEF("TxtResolvedFieldMrpRetryIntervalActive", TxtFieldSessionActiveInterval<ResolvedNodeData>),
     NL_TEST_DEF("TxtResolvedFieldMrpRetryActiveThreshold", TxtFieldSessionActiveThreshold<ResolvedNodeData>),
     NL_TEST_DEF("TxtResolvedFieldTcpSupport", (TxtFieldTcpSupport<ResolvedNodeData>) ),
+    NL_TEST_DEF("TxtResolvedFieldICDoperatingAsLIT", (TxtFieldICDoperatesAsLIT<ResolvedNodeData>) ),
     NL_TEST_DEF("TxtResolvedIsDeviceSessionIdle", TestIsDeviceSessionIdle<ResolvedNodeData>),
     NL_TEST_DEF("TxtResolvedIsDeviceSessionActive", TestIsDeviceSessionActive<ResolvedNodeData>),
     NL_TEST_SENTINEL()
diff --git a/src/lib/shell/MainLoopSilabs.cpp b/src/lib/shell/MainLoopSilabs.cpp
index 9cb5dfed0bd586..7c391f1a89d9ba 100644
--- a/src/lib/shell/MainLoopSilabs.cpp
+++ b/src/lib/shell/MainLoopSilabs.cpp
@@ -118,8 +118,8 @@ void ReadLine(char * buffer, size_t max)
                 if (isprint(static_cast<int>(buffer[line_sz])) || buffer[line_sz] == '\t')
                 {
                     streamer_printf(streamer_get(), "%c", buffer[line_sz]);
-                    line_sz++;
                 }
+                line_sz++;
                 break;
             }
         }
diff --git a/src/lib/shell/commands/Dns.cpp b/src/lib/shell/commands/Dns.cpp
index 83fd12fc0b3ff1..69d1b478523893 100644
--- a/src/lib/shell/commands/Dns.cpp
+++ b/src/lib/shell/commands/Dns.cpp
@@ -59,9 +59,11 @@ class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, pub
                         result.mrpRemoteConfig.mIdleRetransTimeout.count());
         streamer_printf(streamer_get(), "   MRP ACTIVE retransmit timeout: %u ms\r\n",
                         result.mrpRemoteConfig.mActiveRetransTimeout.count());
-        streamer_printf(streamer_get(), "   MRP ACTIVE Threshold timet:    %u ms\r\n",
+        streamer_printf(streamer_get(), "   MRP ACTIVE Threshold time:     %u ms\r\n",
                         result.mrpRemoteConfig.mActiveThresholdTime.count());
 
+        streamer_printf(streamer_get(), "   ICD is operating as a:         %s\r\n", result.isICDOperatingAsLIT ? "LIT" : "SIT");
+
         // Schedule a retry. Not called directly so we do not recurse in OnNodeAddressResolved
         DeviceLayer::SystemLayer().ScheduleLambda([this] {
             CHIP_ERROR err = AddressResolve::Resolver::Instance().TryNextResult(Handle());
@@ -116,7 +118,18 @@ class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, pub
         if (retryInterval.HasValue())
             streamer_printf(streamer_get(), "   MRP retry interval (active): %" PRIu32 "ms\r\n", retryInterval.Value());
 
+        if (nodeData.resolutionData.GetMrpRetryActiveThreshold().HasValue())
+        {
+            streamer_printf(streamer_get(), "   MRP retry active threshold time: %" PRIu32 "ms\r\n",
+                            nodeData.resolutionData.GetMrpRetryActiveThreshold().Value());
+        }
         streamer_printf(streamer_get(), "   Supports TCP: %s\r\n", nodeData.resolutionData.supportsTcp ? "yes" : "no");
+
+        if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue())
+        {
+            streamer_printf(streamer_get(), "   ICD is operating as a: %s\r\n",
+                            nodeData.resolutionData.isICDOperatingAsLIT.Value() ? "LIT" : "SIT");
+        }
         streamer_printf(streamer_get(), "   IP addresses:\r\n");
         for (uint8_t i = 0; i < nodeData.resolutionData.numIPs; i++)
         {
@@ -198,12 +211,7 @@ bool ParseSubType(int argc, char ** argv, Dnssd::DiscoveryFilter & filter)
 CHIP_ERROR BrowseCommissionableHandler(int argc, char ** argv)
 {
     Dnssd::DiscoveryFilter filter;
-
-    if (!ParseSubType(argc, argv, filter))
-    {
-        streamer_printf(streamer_get(), "Invalid argument\r\n");
-        return CHIP_ERROR_INVALID_ARGUMENT;
-    }
+    VerifyOrReturnError(ParseSubType(argc, argv, filter), CHIP_ERROR_INVALID_ARGUMENT);
 
     streamer_printf(streamer_get(), "Browsing commissionable nodes...\r\n");
 
@@ -213,12 +221,7 @@ CHIP_ERROR BrowseCommissionableHandler(int argc, char ** argv)
 CHIP_ERROR BrowseCommissionerHandler(int argc, char ** argv)
 {
     Dnssd::DiscoveryFilter filter;
-
-    if (!ParseSubType(argc, argv, filter))
-    {
-        streamer_printf(streamer_get(), "Invalid argument\r\n");
-        return CHIP_ERROR_INVALID_ARGUMENT;
-    }
+    VerifyOrReturnError(ParseSubType(argc, argv, filter), CHIP_ERROR_INVALID_ARGUMENT);
 
     streamer_printf(streamer_get(), "Browsing commissioners...\r\n");
 
@@ -233,6 +236,9 @@ CHIP_ERROR BrowseHandler(int argc, char ** argv)
         return CHIP_NO_ERROR;
     }
 
+    sResolverProxy.Init(DeviceLayer::UDPEndPointManager());
+    sResolverProxy.SetCommissioningDelegate(&sDnsShellResolverDelegate);
+
     return sShellDnsBrowseSubcommands.ExecCommand(argc, argv);
 }
 
@@ -244,9 +250,6 @@ CHIP_ERROR DnsHandler(int argc, char ** argv)
         return CHIP_NO_ERROR;
     }
 
-    sResolverProxy.Init(DeviceLayer::UDPEndPointManager());
-    sResolverProxy.SetCommissioningDelegate(&sDnsShellResolverDelegate);
-
     return sShellDnsSubcommands.ExecCommand(argc, argv);
 }
 
diff --git a/src/lib/shell/commands/Stat.cpp b/src/lib/shell/commands/Stat.cpp
index c67db5468bf47f..88262e1e8daa1a 100644
--- a/src/lib/shell/commands/Stat.cpp
+++ b/src/lib/shell/commands/Stat.cpp
@@ -21,6 +21,14 @@
 #include <platform/DiagnosticDataProvider.h>
 #include <system/SystemStats.h>
 
+#if CHIP_HAVE_CONFIG_H
+#include <crypto/CryptoBuildConfig.h>
+#endif // CHIP_HAVE_CONFIG_H
+
+#if CHIP_CRYPTO_MBEDTLS
+#include <mbedtls/memory_buffer_alloc.h>
+#endif
+
 using namespace chip;
 
 namespace chip {
@@ -46,6 +54,15 @@ CHIP_ERROR StatPeakHandler(int argc, char ** argv)
         streamer_printf(streamer_get(), "Heap allocated bytes: %u\r\n", static_cast<unsigned>(heapWatermark));
     }
 
+#if CHIP_CRYPTO_MBEDTLS && defined(MBEDTLS_MEMORY_DEBUG)
+    size_t maxUsed   = 0;
+    size_t maxBlocks = 0;
+
+    mbedtls_memory_buffer_alloc_max_get(&maxUsed, &maxBlocks);
+
+    streamer_printf(streamer_get(), "mbedTLS heap allocated bytes: %u\r\n", static_cast<unsigned>(maxUsed));
+#endif
+
     return CHIP_NO_ERROR;
 }
 
@@ -64,6 +81,10 @@ CHIP_ERROR StatResetHandler(int argc, char ** argv)
         ReturnErrorOnFailure(DeviceLayer::GetDiagnosticDataProvider().ResetWatermarks());
     }
 
+#if CHIP_CRYPTO_MBEDTLS && defined(MBEDTLS_MEMORY_DEBUG)
+    mbedtls_memory_buffer_alloc_max_reset();
+#endif
+
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/lib/shell/streamer_esp32.cpp b/src/lib/shell/streamer_esp32.cpp
index 5f71279a0cc0bc..c92170ec730812 100644
--- a/src/lib/shell/streamer_esp32.cpp
+++ b/src/lib/shell/streamer_esp32.cpp
@@ -95,8 +95,8 @@ int streamer_esp32_init(streamer_t * streamer)
     esp_vfs_dev_uart_register();
 #endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     esp_console_config_t console_config = {
-        .max_cmdline_length = 256,
-        .max_cmdline_args   = 32,
+        .max_cmdline_length = CONFIG_CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH,
+        .max_cmdline_args   = CONFIG_CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT,
     };
     ESP_ERROR_CHECK(esp_console_init(&console_config));
     linenoiseSetMultiLine(1);
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index c1118ef0aa588b..fde92cc5adbe82 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -214,6 +214,8 @@ static_library("support") {
     "logging/BinaryLogging.cpp",
     "logging/BinaryLogging.h",
     "logging/CHIPLogging.h",
+    "utf8.cpp",
+    "utf8.h",
     "verhoeff/Verhoeff.cpp",
     "verhoeff/Verhoeff.h",
     "verhoeff/Verhoeff10.cpp",
@@ -249,7 +251,8 @@ static_library("support") {
     ":verifymacros_no_logging",
     "${chip_root}/src/lib/core:chip_config_header",
     "${chip_root}/src/lib/core:error",
-    "${chip_root}/src/platform:platform_buildconfig",
+    "${chip_root}/src/platform:platform_config_header",
+    "${chip_root}/src/system:system_config_header",
     "${nlassert_root}:nlassert",
     "${nlio_root}:nlio",
   ]
@@ -309,6 +312,7 @@ static_library("testing") {
   public_deps = [
     ":support",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/platform",
     "${nlassert_root}:nlassert",
     "${nlunit_test_root}:nlunit-test",
   ]
diff --git a/src/lib/support/BitFlags.h b/src/lib/support/BitFlags.h
index ec64f19f5f9676..3cc7dc4a24fdb2 100644
--- a/src/lib/support/BitFlags.h
+++ b/src/lib/support/BitFlags.h
@@ -50,19 +50,19 @@ class BitFlags
     BitFlags(const BitFlags & other)       = default;
     BitFlags & operator=(const BitFlags &) = default;
 
-    explicit BitFlags(FlagsEnum value) : mValue(static_cast<IntegerType>(value)) {}
-    explicit BitFlags(IntegerType value) : mValue(value) {}
+    explicit constexpr BitFlags(FlagsEnum value) : mValue(static_cast<IntegerType>(value)) {}
+    explicit constexpr BitFlags(IntegerType value) : mValue(value) {}
 
     template <typename... Args>
-    BitFlags(FlagsEnum flag, Args &&... args) : mValue(Or(flag, std::forward<Args>(args)...))
+    constexpr BitFlags(FlagsEnum flag, Args &&... args) : mValue(Or(flag, std::forward<Args>(args)...))
     {}
 
     template <typename... Args>
-    BitFlags(const BitFlags<FlagsEnum> & flags, Args &&... args) : mValue(Or(flags, std::forward<Args>(args)...))
+    constexpr BitFlags(const BitFlags<FlagsEnum> & flags, Args &&... args) : mValue(Or(flags, std::forward<Args>(args)...))
     {}
 
     template <typename... Args>
-    BitFlags(IntegerType value, Args &&... args) : mValue(value | Or(std::forward<Args>(args)...))
+    constexpr BitFlags(IntegerType value, Args &&... args) : mValue(value | Or(std::forward<Args>(args)...))
     {}
 
     /**
@@ -221,7 +221,7 @@ class BitFlags
      *
      * @note            This is intended to be used only to store flags into a raw binary record.
      */
-    IntegerType Raw() const { return mValue; }
+    constexpr IntegerType Raw() const { return mValue; }
 
     /**
      * Get the address of the flags as a pointer to the underlying integer type.
diff --git a/src/lib/support/BitMask.h b/src/lib/support/BitMask.h
index 313f113ad80154..d614e681f4e945 100644
--- a/src/lib/support/BitMask.h
+++ b/src/lib/support/BitMask.h
@@ -87,7 +87,7 @@ class BitMask : public BitFlags<FlagsEnum, StorageType>
         IntegerType updated = static_cast<IntegerType>(BitFlags<FlagsEnum, StorageType>::Raw() & ~bitMask);
 
         // Set the right bits
-        updated |= static_cast<IntegerType>(bitMask & (value << shift));
+        updated = static_cast<IntegerType>(updated | (bitMask & (value << shift)));
 
         BitFlags<FlagsEnum, StorageType>::SetRaw(updated);
 
diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp
index f07837ade467bd..b6919f8c076b4a 100644
--- a/src/lib/support/JniReferences.cpp
+++ b/src/lib/support/JniReferences.cpp
@@ -21,6 +21,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
+#include <string>
 
 namespace chip {
 
@@ -35,7 +36,7 @@ void JniReferences::SetJavaVm(JavaVM * jvm, const char * clsType)
     JNIEnv * env = GetEnvForCurrentThread();
     // Any chip.devicecontroller.* class will work here - just need something to call getClassLoader() on.
     jclass chipClass = env->FindClass(clsType);
-    VerifyOrReturn(chipClass != nullptr, ChipLogError(Support, "clsType can not found"));
+    VerifyOrReturn(chipClass != nullptr, ChipLogError(Support, "clsType can not be found"));
 
     jclass classClass              = env->FindClass("java/lang/Class");
     jclass classLoaderClass        = env->FindClass("java/lang/ClassLoader");
@@ -47,6 +48,36 @@ void JniReferences::SetJavaVm(JavaVM * jvm, const char * clsType)
     chip::JniReferences::GetInstance().GetClassRef(env, "java/util/List", mListClass);
     chip::JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", mArrayListClass);
     chip::JniReferences::GetInstance().GetClassRef(env, "java/util/HashMap", mHashMapClass);
+
+    // Determine if the Java code has proper Java 8 support or not.
+    // The class and method chosen here are arbitrary, all we care about is
+    // looking up any method that has an Optional parameter.
+    jclass controllerParamsClass = env->FindClass("chip/devicecontroller/ControllerParams");
+    VerifyOrReturn(controllerParamsClass != nullptr, ChipLogError(Support, "controllerParamsClass is nullptr"));
+
+    jmethodID getCountryCodeMethod = env->GetMethodID(controllerParamsClass, "getCountryCode", "()Ljava/util/Optional;");
+    if (getCountryCodeMethod == nullptr)
+    {
+        // GetMethodID will have thrown an exception previously if it returned nullptr.
+        env->ExceptionClear();
+        VerifyOrReturn(env->GetMethodID(controllerParamsClass, "getCountryCode", "()Lj$/util/Optional;") != nullptr,
+                       ChipLogError(Support, "Method getCountryCode can not be found"));
+        use_java8_optional = false;
+    }
+    else
+    {
+        use_java8_optional = true;
+    }
+
+    if (use_java8_optional)
+    {
+        chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", mOptionalClass);
+    }
+    else
+    {
+        chip::JniReferences::GetInstance().GetClassRef(env, "j$/util/Optional", mOptionalClass);
+    }
+    VerifyOrReturn(mOptionalClass != nullptr, ChipLogError(Support, "mOptionalClass is nullptr"));
 }
 
 JNIEnv * JniReferences::GetEnvForCurrentThread()
@@ -90,11 +121,11 @@ CHIP_ERROR JniReferences::GetLocalClassRef(JNIEnv * env, const char * clsType, j
 {
     jclass cls = nullptr;
 
-    // Try `j$/util/Optional` when enabling Java8.
-    if (strcmp(clsType, "java/util/Optional") == 0)
+    // Try `j$/util/Optional` when enabling Java8. Check whether mOptionalClass
+    // is null because this method is used to originally set mOptionalClass.
+    if (mOptionalClass != nullptr && (strcmp(clsType, "java/util/Optional") == 0 || strcmp(clsType, "j$/util/Optional") == 0))
     {
-        cls = env->FindClass("j$/util/Optional");
-        env->ExceptionClear();
+        cls = mOptionalClass;
     }
 
     if (cls == nullptr)
@@ -129,6 +160,18 @@ CHIP_ERROR JniReferences::N2J_ByteArray(JNIEnv * env, const uint8_t * inArray, j
     return err;
 }
 
+static std::string StrReplaceAll(const std::string & source, const std::string & from, const std::string & to)
+{
+    std::string newString = source;
+    size_t pos            = 0;
+    while ((pos = newString.find(from, pos)) != std::string::npos)
+    {
+        newString.replace(pos, from.length(), to);
+        pos += to.length();
+    }
+    return newString;
+}
+
 CHIP_ERROR JniReferences::FindMethod(JNIEnv * env, jobject object, const char * methodName, const char * methodSignature,
                                      jmethodID * methodId)
 {
@@ -146,21 +189,14 @@ CHIP_ERROR JniReferences::FindMethod(JNIEnv * env, jobject object, const char *
         return CHIP_NO_ERROR;
     }
 
-    // Try `j$` when enabling Java8.
-    std::string methodSignature_java8_str(methodSignature);
-    size_t pos = methodSignature_java8_str.find("java/util/Optional");
-    if (pos != std::string::npos)
+    std::string method_signature = methodSignature;
+    if (!use_java8_optional)
     {
-        // Replace all "java/util/Optional" with "j$/util/Optional".
-        while (pos != std::string::npos)
-        {
-            methodSignature_java8_str.replace(pos, strlen("java/util/Optional"), "j$/util/Optional");
-            pos = methodSignature_java8_str.find("java/util/Optional");
-        }
-        *methodId = env->GetMethodID(javaClass, methodName, methodSignature_java8_str.c_str());
-        env->ExceptionClear();
+        method_signature = StrReplaceAll(method_signature, "java/util/Optional", "j$/util/Optional");
     }
 
+    *methodId = env->GetMethodID(javaClass, methodName, method_signature.data());
+
     VerifyOrReturnError(*methodId != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
 
     return CHIP_NO_ERROR;
@@ -226,24 +262,23 @@ void JniReferences::ThrowError(JNIEnv * env, jclass exceptionCls, CHIP_ERROR err
 
 CHIP_ERROR JniReferences::CreateOptional(jobject objectToWrap, jobject & outOptional)
 {
-    JNIEnv * env = GetEnvForCurrentThread();
-    jclass optionalCls;
-    chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", optionalCls);
-    VerifyOrReturnError(optionalCls != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-    chip::JniClass jniClass(optionalCls);
+    VerifyOrReturnError(mOptionalClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
 
-    jmethodID ofMethod = env->GetStaticMethodID(optionalCls, "ofNullable", "(Ljava/lang/Object;)Ljava/util/Optional;");
-    env->ExceptionClear();
+    JNIEnv * const env = GetEnvForCurrentThread();
+    VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV);
 
-    // Try `Lj$/util/Optional;` when enabling Java8.
-    if (ofMethod == nullptr)
+    jmethodID ofMethod = nullptr;
+    if (use_java8_optional)
     {
-        ofMethod = env->GetStaticMethodID(optionalCls, "ofNullable", "(Ljava/lang/Object;)Lj$/util/Optional;");
-        env->ExceptionClear();
+        ofMethod = env->GetStaticMethodID(mOptionalClass, "ofNullable", "(Ljava/lang/Object;)Ljava/util/Optional;");
+    }
+    else
+    {
+        ofMethod = env->GetStaticMethodID(mOptionalClass, "ofNullable", "(Ljava/lang/Object;)Lj$/util/Optional;");
     }
-
     VerifyOrReturnError(ofMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
-    outOptional = env->CallStaticObjectMethod(optionalCls, ofMethod, objectToWrap);
+
+    outOptional = env->CallStaticObjectMethod(mOptionalClass, ofMethod, objectToWrap);
 
     VerifyOrReturnError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
@@ -252,13 +287,12 @@ CHIP_ERROR JniReferences::CreateOptional(jobject objectToWrap, jobject & outOpti
 
 CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & optionalValue)
 {
-    JNIEnv * env = GetEnvForCurrentThread();
-    jclass optionalCls;
-    chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", optionalCls);
-    VerifyOrReturnError(optionalCls != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-    chip::JniClass jniClass(optionalCls);
+    VerifyOrReturnError(mOptionalClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
+
+    JNIEnv * const env = GetEnvForCurrentThread();
+    VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV);
 
-    jmethodID isPresentMethod = env->GetMethodID(optionalCls, "isPresent", "()Z");
+    jmethodID isPresentMethod = env->GetMethodID(mOptionalClass, "isPresent", "()Z");
     VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
     jboolean isPresent = optionalObj && env->CallBooleanMethod(optionalObj, isPresentMethod);
 
@@ -268,7 +302,7 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option
         return CHIP_NO_ERROR;
     }
 
-    jmethodID getMethod = env->GetMethodID(optionalCls, "get", "()Ljava/lang/Object;");
+    jmethodID getMethod = env->GetMethodID(mOptionalClass, "get", "()Ljava/lang/Object;");
     VerifyOrReturnError(getMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
     optionalValue = env->CallObjectMethod(optionalObj, getMethod);
     return CHIP_NO_ERROR;
diff --git a/src/lib/support/JniReferences.h b/src/lib/support/JniReferences.h
index 9a0fea52019040..4abef990822b0c 100644
--- a/src/lib/support/JniReferences.h
+++ b/src/lib/support/JniReferences.h
@@ -190,8 +190,12 @@ class JniReferences
     jobject mClassLoader       = nullptr;
     jmethodID mFindClassMethod = nullptr;
 
+    // These are global refs and therefore safe to persist.
     jclass mHashMapClass   = nullptr;
     jclass mListClass      = nullptr;
     jclass mArrayListClass = nullptr;
+    jclass mOptionalClass  = nullptr;
+
+    bool use_java8_optional = false;
 };
 } // namespace chip
diff --git a/src/lib/support/PersistedCounter.h b/src/lib/support/PersistedCounter.h
index a8caeb467a3f3e..8e52b9e6077699 100644
--- a/src/lib/support/PersistedCounter.h
+++ b/src/lib/support/PersistedCounter.h
@@ -95,7 +95,8 @@ class PersistedCounter : public MonotonicallyIncreasingCounter<T>
         // Compiler should optimize these branches.
         if (is_same_v<decltype(T), uint64_t>)
         {
-            ChipLogDetail(EventLogging, "PersistedCounter::Init() aEpoch 0x%" PRIx64 " startValue 0x%" PRIx64, aEpoch, startValue);
+            ChipLogDetail(EventLogging, "PersistedCounter::Init() aEpoch 0x" ChipLogFormatX64 " startValue 0x" ChipLogFormatX64,
+                          ChipLogValueX64(aEpoch), ChipLogValueX64(startValue));
         }
         else if (is_same_v<decltype(T), uint32_t>)
         {
@@ -153,7 +154,8 @@ class PersistedCounter : public MonotonicallyIncreasingCounter<T>
         // Compiler should optimize these branches.
         if (is_same_v<decltype(T), uint64_t>)
         {
-            ChipLogDetail(EventLogging, "PersistedCounter::WriteStartValue() aStartValue 0x%" PRIx64, aStartValue);
+            ChipLogDetail(EventLogging, "PersistedCounter::WriteStartValue() aStartValue 0x" ChipLogFormatX64,
+                          ChipLogValueX64(aStartValue));
         }
         else
         {
diff --git a/src/lib/support/PersistentStorageMacros.h b/src/lib/support/PersistentStorageMacros.h
index 57038b5751b861..986686d9facbb0 100644
--- a/src/lib/support/PersistentStorageMacros.h
+++ b/src/lib/support/PersistentStorageMacros.h
@@ -37,6 +37,7 @@ namespace chip {
         /* 2 * sizeof(chip::NodeId) to accommodate 2 character for each byte in Node Id */                                         \
         char key[len + 2 * sizeof(chip::NodeId) + 1];                                                                              \
         nlSTATIC_ASSERT_PRINT(sizeof(node) <= sizeof(uint64_t), "Node ID size is greater than expected");                          \
+        /* Be careful about switching to ChipLogFormatX64: it would change the storage keys! */                                    \
         snprintf(key, sizeof(key), "%s%" PRIx64, keyPrefix, node);                                                                 \
         action;                                                                                                                    \
     } while (0)
diff --git a/src/lib/support/Span.h b/src/lib/support/Span.h
index aad5ffe4bfa5fe..a6f63c7c59f33e 100644
--- a/src/lib/support/Span.h
+++ b/src/lib/support/Span.h
@@ -58,14 +58,38 @@ class Span
     // should be used to construct empty Spans. All other cases involving null are invalid.
     Span(std::nullptr_t null, size_t size) = delete;
 
-    template <class U, size_t N, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
+    // Creates a Span view of a plain array.
+    //
+    // Note that this constructor template explicitly excludes `const char[]`, see below.
+    template <
+        class U, size_t N,
+        std::enable_if_t<!std::is_same_v<U, const char> && sizeof(U) == sizeof(T) && std::is_convertible_v<U *, T *>, bool> = true>
     constexpr explicit Span(U (&databuf)[N]) : mDataBuf(databuf), mDataLen(N)
     {}
 
+    // Explicitly disallow the creation of a CharSpan from a `const char[]` to prevent the
+    // creation of spans from string literals that incorrectly include the trailing '\0' byte.
+    // If CharSpan("Hi!") were allowed, it would be a span of length 4, not 3 as intended.
+    //
+    // To create a CharSpan literal, use the `_span` operator instead, e.g. "Hi!"_span.
+    template <
+        class U, size_t N,
+        std::enable_if_t<std::is_same_v<U, const char> && 1 == sizeof(T) && std::is_convertible_v<const char *, T *>, bool> = true>
+    constexpr explicit Span(U (&databuf)[N]) = delete;
+
+    // Creates a (potentially mutable) Span view of an std::array
     template <class U, size_t N, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
     constexpr Span(std::array<U, N> & arr) : mDataBuf(arr.data()), mDataLen(N)
     {}
 
+    template <class U, size_t N, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
+    constexpr Span(std::array<U, N> && arr) = delete; // would be a view of an rvalue
+
+    // Creates a Span view of an std::array
+    template <class U, size_t N, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<const U *, T *>::value>>
+    constexpr Span(const std::array<U, N> & arr) : mDataBuf(arr.data()), mDataLen(N)
+    {}
+
     template <size_t N>
     constexpr Span & operator=(T (&databuf)[N])
     {
@@ -106,13 +130,10 @@ class Span
     reference front() const { return (*this)[0]; }
     reference back() const { return (*this)[size() - 1]; }
 
-    template <class U, typename = std::enable_if_t<std::is_same<std::remove_const_t<T>, std::remove_const_t<U>>::value>>
-    bool data_equal(const Span<U> & other) const
+    bool data_equal(const Span<const T> & other) const
     {
         return (size() == other.size()) && (empty() || (memcmp(data(), other.data(), size() * sizeof(T)) == 0));
     }
-    template <class U, size_t N, typename = std::enable_if_t<std::is_same<std::remove_const_t<T>, std::remove_const_t<U>>::value>>
-    inline bool data_equal(const FixedSpan<U, N> & other) const;
 
     Span SubSpan(size_t offset, size_t length) const
     {
@@ -265,10 +286,19 @@ class FixedSpan
         static_assert(M >= N, "Passed-in buffer too small for FixedSpan");
     }
 
+    // Creates a (potentially mutable) FixedSpan view of an std::array
     template <class U, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
     constexpr FixedSpan(std::array<U, N> & arr) : mDataBuf(arr.data())
     {}
 
+    template <class U, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
+    constexpr FixedSpan(std::array<U, N> && arr) = delete; // would be a view of an rvalue
+
+    // Creates a FixedSpan view of an std::array
+    template <class U, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<const U *, T *>::value>>
+    constexpr FixedSpan(const std::array<U, N> & arr) : mDataBuf(arr.data())
+    {}
+
     // Allow implicit construction from a FixedSpan of sufficient size over a
     // type that has the same size as ours, as long as the pointers are convertible.
     template <class U, size_t M, typename = std::enable_if_t<sizeof(U) == sizeof(T) && std::is_convertible<U *, T *>::value>>
@@ -296,15 +326,7 @@ class FixedSpan
     reference front() const { return (*this)[0]; }
     reference back() const { return (*this)[size() - 1]; }
 
-    // Allow data_equal for spans that are over the same type up to const-ness.
-    template <class U, typename = std::enable_if_t<std::is_same<std::remove_const_t<T>, std::remove_const_t<U>>::value>>
-    bool data_equal(const FixedSpan<U, N> & other) const
-    {
-        return (memcmp(data(), other.data(), N * sizeof(T)) == 0);
-    }
-
-    template <class U, typename = std::enable_if_t<std::is_same<std::remove_const_t<T>, std::remove_const_t<U>>::value>>
-    bool data_equal(const Span<U> & other) const
+    bool data_equal(const Span<const T> & other) const
     {
         return (N == other.size() && memcmp(data(), other.data(), N * sizeof(T)) == 0);
     }
@@ -326,13 +348,6 @@ template <class U, size_t N, typename>
 constexpr Span<T>::Span(const FixedSpan<U, N> & other) : mDataBuf(other.data()), mDataLen(other.size())
 {}
 
-template <class T>
-template <class U, size_t N, typename>
-inline bool Span<T>::data_equal(const FixedSpan<U, N> & other) const
-{
-    return other.data_equal(*this);
-}
-
 template <typename T>
 [[deprecated("Use !empty()")]] inline bool IsSpanUsable(const Span<T> & span)
 {
diff --git a/src/lib/support/UnitTestUtils.cpp b/src/lib/support/UnitTestUtils.cpp
index c63bd5be015596..84976405a20940 100644
--- a/src/lib/support/UnitTestUtils.cpp
+++ b/src/lib/support/UnitTestUtils.cpp
@@ -18,7 +18,7 @@
 #include <lib/support/UnitTestUtils.h>
 
 // Platform specific includes for test_utils
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 #if CHIP_DEVICE_LAYER_TARGET_EFR32 || CHIP_DEVICE_LAYER_TARGET_AMEBA
 #include <FreeRTOS.h>
 #include <task.h>
diff --git a/src/lib/support/tests/BUILD.gn b/src/lib/support/tests/BUILD.gn
index 49147e7814dab8..1fd19e8d32190e 100644
--- a/src/lib/support/tests/BUILD.gn
+++ b/src/lib/support/tests/BUILD.gn
@@ -55,6 +55,7 @@ chip_test_suite_using_nltest("tests") {
     "TestTimeUtils.cpp",
     "TestTlvJson.cpp",
     "TestTlvToJson.cpp",
+    "TestUtf8.cpp",
     "TestVariant.cpp",
     "TestZclString.cpp",
   ]
diff --git a/src/lib/support/tests/TestSpan.cpp b/src/lib/support/tests/TestSpan.cpp
index 303eb3f596637b..37e8d97de3488c 100644
--- a/src/lib/support/tests/TestSpan.cpp
+++ b/src/lib/support/tests/TestSpan.cpp
@@ -27,6 +27,8 @@
 
 #include <nlunit-test.h>
 
+#include <array>
+
 using namespace chip;
 
 static void TestByteSpan(nlTestSuite * inSuite, void * inContext)
@@ -297,6 +299,11 @@ static void TestLiteral(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, literal.size() == 3);
     NL_TEST_ASSERT(inSuite, literal.data_equal(CharSpan::fromCharString("HI!")));
     NL_TEST_ASSERT(inSuite, ""_span.size() == 0);
+
+    // These should be compile errors -- if they were allowed they would produce
+    // a CharSpan that includes the trailing '\0' byte in the value.
+    // constexpr CharSpan disallowed1("abcd");
+    // constexpr CharSpan disallowed2{ "abcd" };
 }
 
 static void TestConversionConstructors(nlTestSuite * inSuite, void * inContext)
@@ -324,6 +331,31 @@ static void TestConversionConstructors(nlTestSuite * inSuite, void * inContext)
     Span<Foo> span6(testSpan2);
 
     FixedSpan<Foo, 2> span7(testSpan2);
+
+    std::array<Bar, 3> array;
+    const auto & constArray = array;
+    FixedSpan<Foo, 3> span9(array);
+    FixedSpan<const Foo, 3> span10(constArray);
+    Span<Foo> span11(array);
+    Span<const Foo> span12(constArray);
+
+    // Various places around the code base expect these conversions to be implicit
+    ([](FixedSpan<Foo, 3> f) {})(array);
+    ([](Span<Foo> f) {})(array);
+    ([](FixedSpan<const Foo, 3> f) {})(constArray);
+    ([](Span<const Foo> f) {})(constArray);
+
+    NL_TEST_ASSERT(inSuite, span10.data_equal(span10));
+    NL_TEST_ASSERT(inSuite, span10.data_equal(span9));
+    NL_TEST_ASSERT(inSuite, span10.data_equal(array));
+    NL_TEST_ASSERT(inSuite, span10.data_equal(constArray));
+    NL_TEST_ASSERT(inSuite, span9.data_equal(span9));
+    NL_TEST_ASSERT(inSuite, span9.data_equal(span10));
+    NL_TEST_ASSERT(inSuite, span9.data_equal(array));
+    NL_TEST_ASSERT(inSuite, span9.data_equal(constArray));
+
+    // The following should not compile
+    // Span<const Foo> error1 = std::array<Foo, 3>(); // Span would point into a temporary value
 }
 
 #define NL_TEST_DEF_FN(fn) NL_TEST_DEF("Test " #fn, fn)
diff --git a/src/lib/support/tests/TestTlvJson.cpp b/src/lib/support/tests/TestTlvJson.cpp
index 95a8967820317e..9d9a91e243a3c1 100644
--- a/src/lib/support/tests/TestTlvJson.cpp
+++ b/src/lib/support/tests/TestTlvJson.cpp
@@ -133,8 +133,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
                       "   \"value\" : 1.0\n"
                       "}\n");
 
-    const char charBuf[] = "hello";
-    CharSpan charSpan(charBuf);
+    CharSpan charSpan = "hello"_span;
     EncodeAndValidate(charSpan,
                       "{\n"
                       "   \"value\" : \"hello\"\n"
diff --git a/src/lib/support/tests/TestUtf8.cpp b/src/lib/support/tests/TestUtf8.cpp
new file mode 100644
index 00000000000000..a18ed74f65c8ae
--- /dev/null
+++ b/src/lib/support/tests/TestUtf8.cpp
@@ -0,0 +1,190 @@
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <functional>
+
+#include <lib/support/UnitTestRegistration.h>
+#include <lib/support/utf8.h>
+
+#include <nlunit-test.h>
+
+namespace {
+
+using namespace chip;
+
+#define TEST_VALID_BYTES(...)                                                                                                      \
+    do                                                                                                                             \
+    {                                                                                                                              \
+        uint8_t _buff[] = { __VA_ARGS__ };                                                                                         \
+        CharSpan _span(reinterpret_cast<const char *>(_buff), sizeof(_buff));                                                      \
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(_span));                                                                             \
+    } while (0)
+
+#define TEST_INVALID_BYTES(...)                                                                                                    \
+    do                                                                                                                             \
+    {                                                                                                                              \
+        uint8_t _buff[] = { __VA_ARGS__ };                                                                                         \
+        CharSpan _span(reinterpret_cast<const char *>(_buff), sizeof(_buff));                                                      \
+        NL_TEST_ASSERT(inSuite, !Utf8::IsValid(_span));                                                                            \
+    } while (0)
+
+void TestValidStrings(nlTestSuite * inSuite, void * inContext)
+{
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan())); // empty span ok
+
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("abc")));
+
+    // Various tests from https://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
+
+    // Generic UTF8
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("κόσμε")));
+
+    // First possible sequence of a certain length
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("€")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("ࠀ")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("𐀀")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("�����")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("������")));
+
+    // Last possible sequence of a certain length
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("߿")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("￿")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("����")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("�����")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("������")));
+
+    // Other boundary conditions
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("퟿")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("�")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("􏿿")));
+    NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan::fromCharString("����")));
+
+    // NOTE: UTF8 allows embeded NULLs
+    //       even though strings like that are probably not ideal for handling
+    //       Test that we allow this, but consider later to disallow them
+    //       completely if the spec is updated as such
+    {
+        char zero[16] = { 0 };
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 0)));
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 1)));
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 2)));
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 3)));
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 4)));
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(zero, 16)));
+    }
+
+    {
+        char insideZero[] = "test\0zero";
+        NL_TEST_ASSERT(inSuite, Utf8::IsValid(CharSpan(insideZero)));
+    }
+
+    // Test around forbidden 0xD800..0xDFFF UTF-16 surrogate pairs.
+    TEST_VALID_BYTES(0b1110'1101, 0b10'011111, 0b10'111111);
+    TEST_VALID_BYTES(0b1110'1110, 0b10'000000, 0b10'000000);
+}
+
+void TestInvalidStrings(nlTestSuite * inSuite, void * inContext)
+{
+    // Overly long sequences
+    TEST_INVALID_BYTES(0xc0, 0b10'111111);
+    TEST_INVALID_BYTES(0xc1, 0b10'111111);
+
+    TEST_INVALID_BYTES(0xe0, 0b1001'1111, 0x80); // A
+    TEST_INVALID_BYTES(0xed, 0b1011'0000, 0x80); // B
+    TEST_INVALID_BYTES(0xf0, 0b1000'1111, 0x80); // C
+
+    // Invalid 0xD800 .. 0xDFFF UTF-16 surrogates that should not appear in UTF-8.
+    TEST_INVALID_BYTES(0b1110'1101, 0b10'100000, 0b10'000000);
+    TEST_INVALID_BYTES(0b1110'1101, 0b10'111111, 0b10'111111);
+
+    // Outside codepoint
+    TEST_INVALID_BYTES(0xf4, 0x90, 0x80, 0x80); // D
+    TEST_INVALID_BYTES(0xf4, 0x91, 0x82, 0x83);
+    TEST_INVALID_BYTES(0xf5, 0x81, 0x82, 0x83);
+
+    // Missing continuation
+    TEST_INVALID_BYTES(0xC2);
+    TEST_INVALID_BYTES(0xE0);
+    TEST_INVALID_BYTES(0xE1);
+    TEST_INVALID_BYTES(0xE1, 0x9F);
+    TEST_INVALID_BYTES(0xED, 0x9F);
+    TEST_INVALID_BYTES(0xEE, 0x9F);
+    TEST_INVALID_BYTES(0xF0);
+    TEST_INVALID_BYTES(0xF0, 0x9F);
+    TEST_INVALID_BYTES(0xF0, 0x9F, 0x9F);
+    TEST_INVALID_BYTES(0xF1);
+    TEST_INVALID_BYTES(0xF1, 0x9F);
+    TEST_INVALID_BYTES(0xF1, 0x9F, 0x9F);
+    TEST_INVALID_BYTES(0xF4);
+    TEST_INVALID_BYTES(0xF4, 0x9F);
+    TEST_INVALID_BYTES(0xF4, 0x9F, 0x9F);
+
+    // More tests from  https://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
+    TEST_INVALID_BYTES(0x80); // First continuation byte
+    TEST_INVALID_BYTES(0xBF); // Last continuation byte
+
+    // Impossible bytes
+    TEST_INVALID_BYTES(0xFE);
+    TEST_INVALID_BYTES(0xFF);
+    TEST_INVALID_BYTES(0xFE, 0xFE, 0xFF, 0xFF);
+
+    // Overlong sequences
+    // 4.1  Examples of an overlong ASCII character (in w3c tests)
+    TEST_INVALID_BYTES(0xc0, 0xaf);
+    TEST_INVALID_BYTES(0xe0, 0x80, 0xaf);
+    TEST_INVALID_BYTES(0xf0, 0x80, 0x80, 0xaf);
+    TEST_INVALID_BYTES(0xf8, 0x80, 0x80, 0x80, 0xaf);
+    TEST_INVALID_BYTES(0xfc, 0x80, 0x80, 0x80, 0x80, 0xaf);
+    // 4.2  Maximum overlong sequences (in w3c tests)
+    TEST_INVALID_BYTES(0xc1, 0xbf);
+    TEST_INVALID_BYTES(0xe0, 0x9f, 0xbf);
+    TEST_INVALID_BYTES(0xf0, 0x8f, 0xbf, 0xbf);
+    TEST_INVALID_BYTES(0xf8, 0x87, 0xbf, 0xbf, 0xbf);
+    TEST_INVALID_BYTES(0xfc, 0x83, 0xbf, 0xbf, 0xbf, 0xbf);
+    // 4.3  Overlong representation of the NUL character (in w3c tests)
+    TEST_INVALID_BYTES(0xc0, 0x80);
+    TEST_INVALID_BYTES(0xe0, 0x80, 0x80);
+    TEST_INVALID_BYTES(0xf0, 0x80, 0x80, 0x80);
+    TEST_INVALID_BYTES(0xf8, 0x80, 0x80, 0x80, 0x80);
+    TEST_INVALID_BYTES(0xfc, 0x80, 0x80, 0x80, 0x80, 0x80);
+}
+
+} // namespace
+
+// clang-format off
+const nlTest sTests[] =
+{
+    NL_TEST_DEF("TestValidStrings", TestValidStrings),
+    NL_TEST_DEF("TestInvalidStrings", TestInvalidStrings),
+    NL_TEST_SENTINEL()
+};
+// clang-format on
+
+int TestUtf8()
+{
+    nlTestSuite theSuite = { "UTF8 validator tests", &sTests[0], nullptr, nullptr };
+
+    nlTestRunner(&theSuite, nullptr);
+    return nlTestRunnerStats(&theSuite);
+}
+
+CHIP_REGISTER_TEST_SUITE(TestUtf8);
diff --git a/src/lib/support/utf8.cpp b/src/lib/support/utf8.cpp
new file mode 100644
index 00000000000000..d1511de08ede19
--- /dev/null
+++ b/src/lib/support/utf8.cpp
@@ -0,0 +1,194 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include "utf8.h"
+
+namespace chip {
+namespace Utf8 {
+
+namespace {
+/**
+   State machine for UTF8 valid bytes
+
+Table 3-7. Well-Formed UTF-8 Byte Sequences
+
+Code Points       | First B  | Second B   | Third B | Fourth B
+------------------+----------+------------+---------+---------
+U+0000..U+007F    | 00..7F   |            |         |
+U+0080..U+07FF    | C2..DF   | 80..BF     |         |
+U+0800..U+0FFF    | E0       | A0..BF (A) | 80..BF  |
+U+1000..U+CFFF    | E1..EC   | 80..BF     | 80..BF  |
+U+D000..U+D7FF    | ED       | 80..9F (B) | 80..BF  |
+U+E000..U+FFFF    | EE..EF   | 80..BF     | 80..BF  |
+U+10000..U+3FFFF  | F0       | 90..BF (C) | 80..BF  | 80..BF
+U+40000..U+FFFFF  | F1..F3   | 80..BF     | 80..BF  | 80..BF
+U+100000..U+10FFFF| F4       | 80..8F (D) | 80..BF  | 80..BF
+*/
+
+enum class ParserState
+{
+    kFirstByte,
+    kSecondByte_A,
+    kSecondByte_B,
+    kSecondByte_C,
+    kSecondByte_D,
+    kExtraOneByte,    // 0x80 .. 0xBF  once
+    kExtraTwoBytes,   // 0x80 .. 0xBF  twice
+    kExtraThreeBytes, // 0x80 .. 0xBF  three times
+    //
+    kInvalid, // some error
+};
+
+ParserState NextState(ParserState state, uint8_t value)
+{
+    switch (state)
+    {
+    case ParserState::kFirstByte:
+        if (value <= 0x7F)
+        {
+            return ParserState::kFirstByte;
+        }
+        else if ((value >= 0xC2) && (value <= 0xDF))
+        {
+            return ParserState::kExtraOneByte;
+        }
+        else if (value == 0xE0)
+        {
+            return ParserState::kSecondByte_A;
+        }
+        else if ((value >= 0xE1) && (value <= 0xEC))
+        {
+            return ParserState::kExtraTwoBytes;
+        }
+        else if (value == 0xED)
+        {
+            return ParserState::kSecondByte_B;
+        }
+        else if ((value >= 0xEE) && (value <= 0xEF))
+        {
+            return ParserState::kExtraTwoBytes;
+        }
+        else if (value == 0xF0)
+        {
+            return ParserState::kSecondByte_C;
+        }
+        else if ((value >= 0xF1) && (value <= 0xF3))
+        {
+            return ParserState::kExtraThreeBytes;
+        }
+        else if (value == 0xF4)
+        {
+            return ParserState::kSecondByte_D;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kSecondByte_A:
+        if (value >= 0xA0 && value <= 0xBF)
+        {
+            return ParserState::kExtraOneByte;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kSecondByte_B:
+        if (value >= 0x80 && value <= 0x9F)
+        {
+            return ParserState::kExtraOneByte;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kSecondByte_C:
+        if (value >= 0x90 && value <= 0xBF)
+        {
+            return ParserState::kExtraTwoBytes;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kSecondByte_D:
+        if (value >= 0x80 && value <= 0x8F)
+        {
+            return ParserState::kExtraTwoBytes;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kExtraOneByte:
+        if (value >= 0x80 && value <= 0xBF)
+        {
+            return ParserState::kFirstByte;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kExtraTwoBytes:
+        if (value >= 0x80 && value <= 0xBF)
+        {
+            return ParserState::kExtraOneByte;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    case ParserState::kExtraThreeBytes:
+        if (value >= 0x80 && value <= 0xBF)
+        {
+            return ParserState::kExtraTwoBytes;
+        }
+        else
+        {
+            return ParserState::kInvalid;
+        }
+    default:
+        return ParserState::kInvalid;
+    }
+}
+
+} // namespace
+
+bool IsValid(CharSpan span)
+{
+    ParserState state = ParserState::kFirstByte;
+
+    const char * data    = span.data();
+    const size_t kLength = span.size();
+
+    // Every byte should be valid
+    for (size_t i = 0; i < kLength; i++)
+    {
+        state = NextState(state, static_cast<uint8_t>(data[i]));
+
+        if (state == ParserState::kInvalid)
+        {
+            return false;
+        }
+    }
+
+    // finally no continuation should be expected
+    return state == ParserState::kFirstByte;
+}
+
+} // namespace Utf8
+} // namespace chip
diff --git a/src/lib/support/utf8.h b/src/lib/support/utf8.h
new file mode 100644
index 00000000000000..71a2bb6612e4fd
--- /dev/null
+++ b/src/lib/support/utf8.h
@@ -0,0 +1,47 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace Utf8 {
+
+/**
+ * Validate that the given span looks like a valid UTF-8 string
+ *
+ * UTF-8 encoding described at
+ * https://www.unicode.org/versions/Unicode12.0.0/UnicodeStandard-12.0.pdf
+ * but TLDR is:
+ *
+ * | Scalar Value               | First B  | Second B | Third B  | Fourth B |
+ * +----------------------------+----------+----------+----------+----------+
+ * | 00000000 0xxxxxxx          | 0xxxxxxx |          |          |          |
+ * | 00000yyy yyxxxxxx          | 110yyyyy | 10xxxxxx |          |          |
+ * | zzzzyyyy yyxxxxxx          | 1110zzzz | 10yyyyyy | 10xxxxxx |          |
+ * | 000uuuuu zzzzyyyy yyxxxxxx | 11110uuu | 10uuzzzz | 10yyyyyy | 10xxxxxx |
+ * +----------------------------+----------+----------+----------+----------+
+ *
+ * Further more, individual encodings must be minimally encoded, so
+ * 0xC0 is not a valid first byte( 1100_0000 10xxxxxx could have been encoded
+ * as one-byte)
+ */
+bool IsValid(CharSpan span);
+
+} // namespace Utf8
+} // namespace chip
diff --git a/src/messaging/BUILD.gn b/src/messaging/BUILD.gn
index cd32155d71a5d7..7289e7413b0039 100644
--- a/src/messaging/BUILD.gn
+++ b/src/messaging/BUILD.gn
@@ -77,8 +77,4 @@ static_library("messaging") {
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/raw",
   ]
-
-  if (chip_enable_icd_server) {
-    public_deps += [ "${chip_root}/src/app/icd:manager" ]
-  }
 }
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index 1b93bff5a62e62..31d579e660502c 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -113,7 +113,7 @@ CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgTyp
     // If session requires MRP, NoAutoRequestAck send flag is not specified and is not a group exchange context, request reliable
     // transmission.
     bool reliableTransmissionRequested =
-        GetSessionHandle()->RequireMRP() && !sendFlags.Has(SendMessageFlags::kNoAutoRequestAck) && !IsGroupExchangeContext();
+        GetSessionHandle()->AllowsMRP() && !sendFlags.Has(SendMessageFlags::kNoAutoRequestAck) && !IsGroupExchangeContext();
 
     bool currentMessageExpectResponse = false;
     // If a response message is expected...
@@ -322,11 +322,11 @@ ExchangeContext::ExchangeContext(ExchangeManager * em, uint16_t ExchangeId, cons
 
     SetAckPending(false);
 
-    // Do not request Ack for multicast
-    SetAutoRequestAck(!session->IsGroupSession());
+    // Try to use MRP by default, if it is allowed.
+    SetAutoRequestAck(session->AllowsMRP());
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    app::ICDNotifier::GetInstance().BroadcastActiveRequestNotification(app::ICDListener::KeepActiveFlags::kExchangeContextOpen);
+    app::ICDNotifier::GetInstance().BroadcastActiveRequestNotification(app::ICDListener::KeepActiveFlag::kExchangeContextOpen);
 #endif
 
 #if defined(CHIP_EXCHANGE_CONTEXT_DETAIL_LOGGING)
@@ -345,7 +345,7 @@ ExchangeContext::~ExchangeContext()
     VerifyOrDie(mFlags.Has(Flags::kFlagClosed));
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    app::ICDNotifier::GetInstance().BroadcastActiveRequestWithdrawal(app::ICDListener::KeepActiveFlags::kExchangeContextOpen);
+    app::ICDNotifier::GetInstance().BroadcastActiveRequestWithdrawal(app::ICDListener::KeepActiveFlag::kExchangeContextOpen);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     // Ideally, in this scenario, the retransmit table should
@@ -531,34 +531,37 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         MessageHandled();
     });
 
-    if (mDispatch.IsReliableTransmissionAllowed() && !IsGroupExchangeContext())
+    if (mSession->AllowsMRP())
     {
-        if (!msgFlags.Has(MessageFlagValues::kDuplicateMessage) && payloadHeader.IsAckMsg() &&
-            payloadHeader.GetAckMessageCounter().HasValue())
+        if (mDispatch.IsReliableTransmissionAllowed())
         {
-            HandleRcvdAck(payloadHeader.GetAckMessageCounter().Value());
+            if (!msgFlags.Has(MessageFlagValues::kDuplicateMessage) && payloadHeader.IsAckMsg() &&
+                payloadHeader.GetAckMessageCounter().HasValue())
+            {
+                HandleRcvdAck(payloadHeader.GetAckMessageCounter().Value());
+            }
+
+            if (payloadHeader.NeedsAck())
+            {
+                // An acknowledgment needs to be sent back to the peer for this message on this exchange,
+                HandleNeedsAck(messageCounter, msgFlags);
+            }
         }
 
-        if (payloadHeader.NeedsAck())
+        if (IsAckPending() && !mDelegate)
         {
-            // An acknowledgment needs to be sent back to the peer for this message on this exchange,
-            HandleNeedsAck(messageCounter, msgFlags);
+            // The incoming message wants an ack, but we have no delegate, so
+            // there's not going to be a response to piggyback on.  Just flush the
+            // ack out right now.
+            ReturnErrorOnFailure(FlushAcks());
         }
-    }
 
-    if (IsAckPending() && !mDelegate)
-    {
-        // The incoming message wants an ack, but we have no delegate, so
-        // there's not going to be a response to piggyback on.  Just flush the
-        // ack out right now.
-        ReturnErrorOnFailure(FlushAcks());
-    }
-
-    // The SecureChannel::StandaloneAck message type is only used for MRP; do not pass such messages to the application layer.
-    if (isStandaloneAck)
-    {
-        return CHIP_NO_ERROR;
-    }
+        // The SecureChannel::StandaloneAck message type is only used for MRP; do not pass such messages to the application layer.
+        if (isStandaloneAck)
+        {
+            return CHIP_NO_ERROR;
+        }
+    } // AllowsMRP
 
     // Since the message is duplicate, let's not forward it up the stack
     if (isDuplicate)
@@ -566,23 +569,26 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         return CHIP_NO_ERROR;
     }
 
-    if (IsEphemeralExchange())
+    if (mSession->AllowsMRP())
     {
-        // The EphemeralExchange has done its job, since StandaloneAck is sent in previous FlushAcks() call.
-        return CHIP_NO_ERROR;
-    }
+        if (IsEphemeralExchange())
+        {
+            // The EphemeralExchange has done its job, since StandaloneAck is sent in previous FlushAcks() call.
+            return CHIP_NO_ERROR;
+        }
 
-    if (IsWaitingForAck())
-    {
-        // The only way we can get here is a spec violation on the other side:
-        // we sent a message that needs an ack, and the other side responded
-        // with a message that does not contain an ack for the message we sent.
-        // Just drop this message; if we delivered it to our delegate it might
-        // try to send another message-needing-an-ack in response, which would
-        // violate our internal invariants.
-        ChipLogError(ExchangeManager, "Dropping message without piggyback ack when we are waiting for an ack.");
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
+        if (IsWaitingForAck())
+        {
+            // The only way we can get here is a spec violation on the other side:
+            // we sent a message that needs an ack, and the other side responded
+            // with a message that does not contain an ack for the message we sent.
+            // Just drop this message; if we delivered it to our delegate it might
+            // try to send another message-needing-an-ack in response, which would
+            // violate our internal invariants.
+            ChipLogError(ExchangeManager, "Dropping message without piggyback ack when we are waiting for an ack.");
+            return CHIP_ERROR_INCORRECT_STATE;
+        }
+    } // AllowsMRP
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     // message received
diff --git a/src/messaging/ExchangeMessageDispatch.cpp b/src/messaging/ExchangeMessageDispatch.cpp
index 1ffbfe3657c6cd..950be48ae5802a 100644
--- a/src/messaging/ExchangeMessageDispatch.cpp
+++ b/src/messaging/ExchangeMessageDispatch.cpp
@@ -51,45 +51,61 @@ CHIP_ERROR ExchangeMessageDispatch::SendMessage(SessionManager * sessionManager,
     PayloadHeader payloadHeader;
     payloadHeader.SetExchangeID(exchangeId).SetMessageType(protocol, type).SetInitiator(isInitiator);
 
-    // If there is a pending acknowledgment piggyback it on this message.
-    if (reliableMessageContext->HasPiggybackAckPending())
+    if (session->AllowsMRP())
     {
-        payloadHeader.SetAckMessageCounter(reliableMessageContext->TakePendingPeerAckMessageCounter());
-    }
-
-    if (IsReliableTransmissionAllowed() && reliableMessageContext->AutoRequestAck() &&
-        reliableMessageContext->GetReliableMessageMgr() != nullptr && isReliableTransmission)
-    {
-        auto * reliableMessageMgr = reliableMessageContext->GetReliableMessageMgr();
-
-        payloadHeader.SetNeedsAck(true);
-
-        ReliableMessageMgr::RetransTableEntry * entry = nullptr;
-
-        // Add to Table for subsequent sending
-        ReturnErrorOnFailure(reliableMessageMgr->AddToRetransTable(reliableMessageContext, &entry));
-        auto deleter = [reliableMessageMgr](ReliableMessageMgr::RetransTableEntry * e) {
-            reliableMessageMgr->ClearRetransTable(*e);
-        };
-        std::unique_ptr<ReliableMessageMgr::RetransTableEntry, decltype(deleter)> entryOwner(entry, deleter);
-
-        ReturnErrorOnFailure(sessionManager->PrepareMessage(session, payloadHeader, std::move(message), entryOwner->retainedBuf));
-        CHIP_ERROR err = sessionManager->SendPreparedMessage(session, entryOwner->retainedBuf);
-        err            = ReliableMessageMgr::MapSendError(err, exchangeId, isInitiator);
-        ReturnErrorOnFailure(err);
-        reliableMessageMgr->StartRetransmision(entryOwner.release());
+        // If there is a pending acknowledgment piggyback it on this message.
+        if (reliableMessageContext->HasPiggybackAckPending())
+        {
+            payloadHeader.SetAckMessageCounter(reliableMessageContext->TakePendingPeerAckMessageCounter());
+        }
+
+        if (IsReliableTransmissionAllowed() && reliableMessageContext->AutoRequestAck() &&
+            reliableMessageContext->GetReliableMessageMgr() != nullptr && isReliableTransmission)
+        {
+            auto * reliableMessageMgr = reliableMessageContext->GetReliableMessageMgr();
+
+            payloadHeader.SetNeedsAck(true);
+
+            ReliableMessageMgr::RetransTableEntry * entry = nullptr;
+
+            // Add to Table for subsequent sending
+            ReturnErrorOnFailure(reliableMessageMgr->AddToRetransTable(reliableMessageContext, &entry));
+            auto deleter = [reliableMessageMgr](ReliableMessageMgr::RetransTableEntry * e) {
+                reliableMessageMgr->ClearRetransTable(*e);
+            };
+            std::unique_ptr<ReliableMessageMgr::RetransTableEntry, decltype(deleter)> entryOwner(entry, deleter);
+
+            ReturnErrorOnFailure(
+                sessionManager->PrepareMessage(session, payloadHeader, std::move(message), entryOwner->retainedBuf));
+            CHIP_ERROR err = sessionManager->SendPreparedMessage(session, entryOwner->retainedBuf);
+            err            = ReliableMessageMgr::MapSendError(err, exchangeId, isInitiator);
+            ReturnErrorOnFailure(err);
+            reliableMessageMgr->StartRetransmision(entryOwner.release());
+        }
+        else
+        {
+            ReturnErrorOnFailure(PrepareAndSendNonMRPMessage(sessionManager, session, payloadHeader, std::move(message)));
+        }
     }
     else
     {
-        // If the channel itself is providing reliability, let's not request MRP acks
-        payloadHeader.SetNeedsAck(false);
-        EncryptedPacketBufferHandle preparedMessage;
-        ReturnErrorOnFailure(sessionManager->PrepareMessage(session, payloadHeader, std::move(message), preparedMessage));
-        ReturnErrorOnFailure(sessionManager->SendPreparedMessage(session, preparedMessage));
+        ReturnErrorOnFailure(PrepareAndSendNonMRPMessage(sessionManager, session, payloadHeader, std::move(message)));
     }
 
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR ExchangeMessageDispatch::PrepareAndSendNonMRPMessage(SessionManager * sessionManager, const SessionHandle & session,
+                                                                PayloadHeader & payloadHeader,
+                                                                System::PacketBufferHandle && message)
+{
+    payloadHeader.SetNeedsAck(false);
+    EncryptedPacketBufferHandle preparedMessage;
+    ReturnErrorOnFailure(sessionManager->PrepareMessage(session, payloadHeader, std::move(message), preparedMessage));
+    ReturnErrorOnFailure(sessionManager->SendPreparedMessage(session, preparedMessage));
+
+    return CHIP_NO_ERROR;
+}
+
 } // namespace Messaging
 } // namespace chip
diff --git a/src/messaging/ExchangeMessageDispatch.h b/src/messaging/ExchangeMessageDispatch.h
index 35f12e06e80d36..8585ebd422fc5f 100644
--- a/src/messaging/ExchangeMessageDispatch.h
+++ b/src/messaging/ExchangeMessageDispatch.h
@@ -48,6 +48,10 @@ class ExchangeMessageDispatch
 
     // TODO: remove IsReliableTransmissionAllowed, this function should be provided over session.
     virtual bool IsReliableTransmissionAllowed() const { return true; }
+
+private:
+    CHIP_ERROR PrepareAndSendNonMRPMessage(SessionManager * sessionManager, const SessionHandle & session,
+                                           PayloadHeader & payloadHeader, System::PacketBufferHandle && message);
 };
 
 } // namespace Messaging
diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
index dddc9c6fd4ce8f..2ca22031094bb7 100644
--- a/src/messaging/ExchangeMgr.cpp
+++ b/src/messaging/ExchangeMgr.cpp
@@ -372,8 +372,10 @@ void ExchangeManager::SendStandaloneAckIfNeeded(const PacketHeader & packetHeade
                                                 const SessionHandle & session, MessageFlags msgFlags,
                                                 System::PacketBufferHandle && msgBuf)
 {
-    // If we need to send a StandaloneAck, create a EphemeralExchange for the purpose to send the StandaloneAck
-    if (!payloadHeader.NeedsAck())
+
+    // If using the MRP protocol and we need to send a StandaloneAck, create an EphemeralExchange to send
+    // the StandaloneAck.
+    if (!session->AllowsMRP() || !payloadHeader.NeedsAck())
         return;
 
     // If rcvd msg is from initiator then this exchange is created as not Initiator.
diff --git a/src/messaging/ReliableMessageMgr.cpp b/src/messaging/ReliableMessageMgr.cpp
index e22bd4db24a517..4ddf1801da0ade 100644
--- a/src/messaging/ReliableMessageMgr.cpp
+++ b/src/messaging/ReliableMessageMgr.cpp
@@ -38,7 +38,6 @@
 #include <platform/ConnectivityManager.h>
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <app/icd/ICDManager.h>  // nogncheck
 #include <app/icd/ICDNotifier.h> // nogncheck
 #endif
 
@@ -89,9 +88,10 @@ void ReliableMessageMgr::TicklessDebugDumpRetransTable(const char * log)
 
     mRetransTable.ForEachActiveObject([&](auto * entry) {
         ChipLogDetail(ExchangeManager,
-                      "EC:" ChipLogFormatExchange " MessageCounter:" ChipLogFormatMessageCounter " NextRetransTimeCtr:%" PRIu64,
+                      "EC:" ChipLogFormatExchange " MessageCounter:" ChipLogFormatMessageCounter
+                      " NextRetransTimeCtr: 0x" ChipLogFormatX64,
                       ChipLogValueExchange(&entry->ec.Get()), entry->retainedBuf.GetMessageCounter(),
-                      entry->nextRetransTime.count());
+                      ChipLogValueX64(entry->nextRetransTime.count()));
         return Loop::Continue;
     });
 #endif
@@ -102,7 +102,7 @@ void ReliableMessageMgr::ExecuteActions()
     System::Clock::Timestamp now = System::SystemClock().GetMonotonicTimestamp();
 
 #if defined(RMP_TICKLESS_DEBUG)
-    ChipLogDetail(ExchangeManager, "ReliableMessageMgr::ExecuteActions at %" PRIu64 "ms", now.count());
+    ChipLogDetail(ExchangeManager, "ReliableMessageMgr::ExecuteActions at 0x" ChipLogFormatX64 "ms", ChipLogValueX64(now.count()));
 #endif
 
     ExecuteForAllContext([&](ReliableMessageContext * rc) {
@@ -259,7 +259,7 @@ System::Clock::Timestamp ReliableMessageMgr::GetBackoff(System::Clock::Timestamp
     // Implement:
     //   "An ICD sender SHOULD increase t to also account for its own sleepy interval
     //   required to receive the acknowledgment"
-    mrpBackoffTime += app::ICDManager::GetFastPollingInterval();
+    mrpBackoffTime += CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL;
 #endif
 
     mrpBackoffTime += CHIP_CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST;
@@ -397,8 +397,10 @@ void ReliableMessageMgr::StartTimer()
         const auto nextWakeDelay           = (nextWakeTime > now) ? nextWakeTime - now : 0_ms;
 
 #if defined(RMP_TICKLESS_DEBUG)
-        ChipLogDetail(ExchangeManager, "ReliableMessageMgr::StartTimer at %" PRIu64 "ms wake at %" PRIu64 "ms (in %" PRIu64 "ms)",
-                      now.count(), nextWakeTime.count(), nextWakeDelay.count());
+        ChipLogDetail(ExchangeManager,
+                      "ReliableMessageMgr::StartTimer at 0x" ChipLogFormatX64 "ms wake at 0x" ChipLogFormatX64
+                      "ms (in 0x" ChipLogFormatX64 "ms)",
+                      ChipLogValueX64(now.count()), ChipLogValueX64(nextWakeTime.count()), ChipLogValueX64(nextWakeDelay.count()));
 #endif
         VerifyOrDie(mSystemLayer->StartTimer(nextWakeDelay, Timeout, this) == CHIP_NO_ERROR);
     }
diff --git a/src/messaging/ReliableMessageProtocolConfig.cpp b/src/messaging/ReliableMessageProtocolConfig.cpp
index 652531c8ee8567..c81325432cc51b 100644
--- a/src/messaging/ReliableMessageProtocolConfig.cpp
+++ b/src/messaging/ReliableMessageProtocolConfig.cpp
@@ -27,10 +27,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <system/SystemClock.h>
 
-#if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <app/icd/ICDManagementServer.h> // nogncheck
-#include <app/icd/ICDManager.h>          // nogncheck
-#endif
+#include <platform/CHIPDeviceConfig.h>
 
 namespace chip {
 
@@ -73,9 +70,9 @@ Optional<ReliableMessageProtocolConfig> GetLocalMRPConfig()
     // TODO ICD LIT shall not advertise the SII key
     // Increase local MRP retry intervals by ICD polling intervals. That is, intervals for
     // which the device can be at sleep and not be able to receive any messages).
-    config.mIdleRetransTimeout += app::ICDManager::GetSlowPollingInterval();
-    config.mActiveRetransTimeout += app::ICDManager::GetFastPollingInterval();
-    config.mActiveThresholdTime = System::Clock::Milliseconds16(ICDManagementServer::GetInstance().GetActiveModeThresholdMs());
+    config.mIdleRetransTimeout += CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL;
+    config.mActiveRetransTimeout += CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL;
+    config.mActiveThresholdTime = System::Clock::Milliseconds16(CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS);
 #endif
 
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
diff --git a/src/messaging/tests/MessagingContext.cpp b/src/messaging/tests/MessagingContext.cpp
index a7cf5369cccef1..3073d7490c8280 100644
--- a/src/messaging/tests/MessagingContext.cpp
+++ b/src/messaging/tests/MessagingContext.cpp
@@ -105,10 +105,10 @@ void MessagingContext::SetMRPMode(MRPMode mode)
 {
     if (mode == MRPMode::kDefault)
     {
-        mSessionBobToAlice->AsSecureSession()->SetRemoteMRPConfig(GetDefaultMRPConfig());
-        mSessionAliceToBob->AsSecureSession()->SetRemoteMRPConfig(GetDefaultMRPConfig());
-        mSessionCharlieToDavid->AsSecureSession()->SetRemoteMRPConfig(GetDefaultMRPConfig());
-        mSessionDavidToCharlie->AsSecureSession()->SetRemoteMRPConfig(GetDefaultMRPConfig());
+        mSessionBobToAlice->AsSecureSession()->SetRemoteSessionParameters(GetDefaultMRPConfig());
+        mSessionAliceToBob->AsSecureSession()->SetRemoteSessionParameters(GetDefaultMRPConfig());
+        mSessionCharlieToDavid->AsSecureSession()->SetRemoteSessionParameters(GetDefaultMRPConfig());
+        mSessionDavidToCharlie->AsSecureSession()->SetRemoteSessionParameters(GetDefaultMRPConfig());
 
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
         ClearLocalMRPConfigOverride();
@@ -132,13 +132,13 @@ void MessagingContext::SetMRPMode(MRPMode mode)
         VerifyOrDie(false);
 #endif
 
-        mSessionBobToAlice->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+        mSessionBobToAlice->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
             MessagingContext::kResponsiveIdleRetransTimeout, MessagingContext::kResponsiveActiveRetransTimeout));
-        mSessionAliceToBob->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+        mSessionAliceToBob->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
             MessagingContext::kResponsiveIdleRetransTimeout, MessagingContext::kResponsiveActiveRetransTimeout));
-        mSessionCharlieToDavid->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+        mSessionCharlieToDavid->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
             MessagingContext::kResponsiveIdleRetransTimeout, MessagingContext::kResponsiveActiveRetransTimeout));
-        mSessionDavidToCharlie->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+        mSessionDavidToCharlie->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
             MessagingContext::kResponsiveIdleRetransTimeout, MessagingContext::kResponsiveActiveRetransTimeout));
     }
 }
diff --git a/src/messaging/tests/TestAbortExchangesForFabric.cpp b/src/messaging/tests/TestAbortExchangesForFabric.cpp
index 33b2dfce33d958..5bf92fb69b30d7 100644
--- a/src/messaging/tests/TestAbortExchangesForFabric.cpp
+++ b/src/messaging/tests/TestAbortExchangesForFabric.cpp
@@ -163,10 +163,10 @@ void CommonCheckAbortAllButOneExchange(nlTestSuite * inSuite, TestContext & ctx,
     const auto & sessionHandle1 = session1.Get();
     const auto & sessionHandle2 = session2.Get();
 
-    session1->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+    session1->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
         Test::MessagingContext::kResponsiveIdleRetransTimeout, Test::MessagingContext::kResponsiveActiveRetransTimeout));
 
-    session1Reply->AsSecureSession()->SetRemoteMRPConfig(ReliableMessageProtocolConfig(
+    session1Reply->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig(
         Test::MessagingContext::kResponsiveIdleRetransTimeout, Test::MessagingContext::kResponsiveActiveRetransTimeout));
 
     NL_TEST_ASSERT(inSuite, session1);
@@ -206,6 +206,12 @@ void CommonCheckAbortAllButOneExchange(nlTestSuite * inSuite, TestContext & ctx,
         // trigger a MRP failure due to timing out waiting for an ACK.
         //
         auto waitTimeout = System::Clock::Milliseconds32(1000);
+
+#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1
+        // If running as an ICD, increase waitTimeout to account for the polling interval
+        waitTimeout += CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL;
+#endif
+
         // Account for the retry delay booster, so that we do not timeout our IO processing before the
         // retransmission failure is triggered.
         waitTimeout += CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS * CHIP_CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST;
diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp
index 325f27c782832c..6ef5f796abc25d 100644
--- a/src/messaging/tests/TestReliableMessageProtocol.cpp
+++ b/src/messaging/tests/TestReliableMessageProtocol.cpp
@@ -395,10 +395,10 @@ void TestReliableMessageProtocol::CheckResendApplicationMessage(nlTestSuite * in
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         System::Clock::Timestamp(300), // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         System::Clock::Timestamp(300), // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's drop the initial message
     auto & loopback               = ctx.GetLoopback();
@@ -508,10 +508,10 @@ void TestReliableMessageProtocol::CheckCloseExchangeAndResendApplicationMessage(
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's drop the initial message
     auto & loopback               = ctx.GetLoopback();
@@ -567,10 +567,10 @@ void TestReliableMessageProtocol::CheckFailedMessageRetainOnSend(nlTestSuite * i
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     mockSender.mMessageDispatch.mRetainMessageOnSend = false;
     // Let's drop the initial message
@@ -657,10 +657,10 @@ void TestReliableMessageProtocol::CheckResendApplicationMessageWithPeerExchange(
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's drop the initial message
     auto & loopback               = ctx.GetLoopback();
@@ -719,10 +719,10 @@ void TestReliableMessageProtocol::CheckDuplicateMessageClosedExchange(nlTestSuit
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_INITIAL_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's not drop the message. Expectation is that it is received by the peer, but the ack is dropped
     auto & loopback               = ctx.GetLoopback();
@@ -786,10 +786,10 @@ void TestReliableMessageProtocol::CheckDuplicateOldMessageClosedExchange(nlTestS
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_INITIAL_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's not drop the message. Expectation is that it is received by the peer, but the ack is dropped
     auto & loopback               = ctx.GetLoopback();
@@ -887,10 +887,10 @@ void TestReliableMessageProtocol::CheckResendSessionEstablishmentMessageWithPeer
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's drop the initial message
     auto & loopback               = inctx.GetLoopback();
@@ -951,10 +951,10 @@ void TestReliableMessageProtocol::CheckDuplicateMessage(nlTestSuite * inSuite, v
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_INITIAL_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_RMP_DEFAULT_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Let's not drop the message. Expectation is that it is received by the peer, but the ack is dropped
     auto & loopback               = ctx.GetLoopback();
@@ -1453,10 +1453,10 @@ void TestReliableMessageProtocol::CheckLostResponseWithPiggyback(nlTestSuite * i
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 
     // Make sure that we resend our message before the other side does.
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // We send a message, the other side sends an application-level response
     // (which is lost), then we do a retransmit that is acked, then the other
@@ -1491,10 +1491,10 @@ void TestReliableMessageProtocol::CheckLostResponseWithPiggyback(nlTestSuite * i
     // Make sure receiver resends after sender does, and there's enough of a gap
     // that we are very unlikely to actually trigger the resends on the receiver
     // when we trigger the resends on the sender.
-    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         256_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         256_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     // Now send a message from the other side, but drop it.
     loopback.mNumMessagesToDrop = 1;
@@ -1601,10 +1601,10 @@ void TestReliableMessageProtocol::CheckIsPeerActiveNotInitiator(nlTestSuite * in
 
     mockSender.mTestSuite = inSuite;
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         1000_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         1000_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
@@ -1655,10 +1655,10 @@ void TestReliableMessageProtocol::CheckIsPeerActiveNotInitiator(nlTestSuite * in
     NL_TEST_ASSERT(inSuite, !exchange->HasReceivedAtLeastOneMessage());
     NL_TEST_ASSERT(inSuite, mockReceiver.mExchange->HasReceivedAtLeastOneMessage());
 
-    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         1000_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         100_ms32,  // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     mockReceiver.mRetainExchange = false;
     mockSender.mRetainExchange   = false;
@@ -1681,7 +1681,7 @@ void TestReliableMessageProtocol::CheckIsPeerActiveNotInitiator(nlTestSuite * in
     NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);
 
     // // Retrasnmit message
-    ctx.GetIOContext().DriveIOUntil(150_ms32, [&] { return loopback.mSentMessageCount >= 4; });
+    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mSentMessageCount >= 4; });
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite, mockSender.IsOnMessageReceivedCalled);
@@ -1828,7 +1828,13 @@ void TestReliableMessageProtocol::CheckGetBackoff(nlTestSuite * inSuite, void *
                             backoff.count());
 
             NL_TEST_ASSERT(inSuite, backoff >= test.backoffMin);
-            NL_TEST_ASSERT(inSuite, backoff <= test.backoffMax + retryBoosterTimeout);
+
+            auto maxBackoff = test.backoffMax + retryBoosterTimeout;
+#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1
+            // If running as an ICD, increase maxBackoff to account for the polling interval
+            maxBackoff += CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL;
+#endif
+            NL_TEST_ASSERT(inSuite, backoff <= maxBackoff);
         }
     }
 }
@@ -1864,10 +1870,10 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     constexpr uint32_t kMaxMRPTransmits = 5; // Counting the initial message.
 
@@ -1894,7 +1900,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);
 
     // Wait for all but the last retransmit to happen.
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mDroppedMessageCount >= kMaxMRPTransmits - 1; });
+    ctx.GetIOContext().DriveIOUntil(5000_ms32, [&] { return loopback.mDroppedMessageCount >= kMaxMRPTransmits - 1; });
     ctx.DrainAndServiceIO();
 
     // Ensure that nothing has been sent yet.
@@ -1908,7 +1914,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     // Now allow through the next message (our last retransmit), but make sure
     // there is no standalone ack for it.
     mockReceiver.SetDropAckResponse(true);
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits; });
+    ctx.GetIOContext().DriveIOUntil(5000_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits; });
     ctx.DrainAndServiceIO();
 
     // Verify that message was sent and received but nothing else has been sent.
@@ -1926,10 +1932,10 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     loopback.mNumMessagesToDrop   = kMaxMRPTransmits - 1;
     loopback.mDroppedMessageCount = 0;
 
-    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     buffer = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD));
     NL_TEST_ASSERT(inSuite, !buffer.IsNull());
@@ -1946,7 +1952,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);  // We did not get a response.
 
     // Now wait for all but the last retransmit to happen from the other side.
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits - 1; });
+    ctx.GetIOContext().DriveIOUntil(5000_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits - 1; });
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == kMaxMRPTransmits - 1);
@@ -1957,7 +1963,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);  // We did not get a response.
 
     // Now wait for us to time out our MRP context for sure.
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return rm->TestGetCountRetransTable() == 1; });
+    ctx.GetIOContext().DriveIOUntil(5000_ms32, [&] { return rm->TestGetCountRetransTable() == 1; });
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == kMaxMRPTransmits - 1);
@@ -1968,7 +1974,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite *
     NL_TEST_ASSERT(inSuite, !mockSender.mResponseTimedOut);          // We did not time out yet.
 
     // Now wait for the last retransmit (and our ack) to to happen.
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits; });
+    ctx.GetIOContext().DriveIOUntil(5000_ms32, [&] { return loopback.mSentMessageCount >= kMaxMRPTransmits; });
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == kMaxMRPTransmits + 1);
@@ -2026,10 +2032,10 @@ void TestReliableMessageProtocol::CheckApplicationResponseNeverComes(nlTestSuite
     ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
     NL_TEST_ASSERT(inSuite, rm != nullptr);
 
-    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         30_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     constexpr uint32_t kMaxMRPTransmits = 5; // Counting the initial message.
 
@@ -2056,7 +2062,7 @@ void TestReliableMessageProtocol::CheckApplicationResponseNeverComes(nlTestSuite
     NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);
 
     // Wait for all but the last retransmit to happen.
-    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mDroppedMessageCount >= kMaxMRPTransmits - 1; });
+    ctx.GetIOContext().DriveIOUntil(1000_ms32, [&] { return loopback.mDroppedMessageCount >= kMaxMRPTransmits - 1; });
     ctx.DrainAndServiceIO();
 
     // Ensure that nothing has been sent yet.
@@ -2127,8 +2133,8 @@ void TestReliableMessageProtocol::CheckApplicationResponseNeverComes(nlTestSuite
 int TestReliableMessageProtocol::InitializeTestCase(void * inContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(inContext);
-    ctx.GetSessionAliceToBob()->AsSecureSession()->SetRemoteMRPConfig(GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()));
-    ctx.GetSessionBobToAlice()->AsSecureSession()->SetRemoteMRPConfig(GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()));
+    ctx.GetSessionAliceToBob()->AsSecureSession()->SetRemoteSessionParameters(GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()));
+    ctx.GetSessionBobToAlice()->AsSecureSession()->SetRemoteSessionParameters(GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()));
     return SUCCESS;
 }
 
diff --git a/src/platform/ASR/ASRConfig.cpp b/src/platform/ASR/ASRConfig.cpp
index 86eb4ec9582ebf..1e87f3af518804 100644
--- a/src/platform/ASR/ASRConfig.cpp
+++ b/src/platform/ASR/ASRConfig.cpp
@@ -221,46 +221,35 @@ bool ASRConfig::ConfigValueExists(Key key)
 CHIP_ERROR ASRConfig::ReadFactoryConfigValue(asr_matter_partition_t matter_partition, uint8_t * buf, size_t bufSize,
                                              size_t & outLen)
 {
-    int32_t ret = 0;
+    factory_error_t ret = asr_factory_config_read(matter_partition, buf, (uint32_t) bufSize, (uint32_t *) &outLen);
 
-    ret = asr_factory_config_read(matter_partition, buf, (uint32_t) bufSize, (uint32_t *) &outLen);
-
-    if (ret != 0)
-        ChipLogProgress(DeviceLayer, "asr_factory_config_read: %d failed, ret = %d\n", matter_partition, static_cast<int>(ret));
-
-    if (ret == 0)
-    {
-        return CHIP_NO_ERROR;
-    }
-    else
+    if (ret != FACTORY_NO_ERROR)
     {
+        ChipLogProgress(DeviceLayer, "asr_factory_config_read: %d failed, err = %d\n", matter_partition, ret);
         outLen = 0;
         return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
     }
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ASRConfig::ReadFactoryConfigValue(asr_matter_partition_t matter_partition, uint32_t & val)
 {
-    int32_t ret = 0;
     uint8_t buf[4];
-    size_t outlen = 0;
-
-    ret = asr_factory_config_read(matter_partition, buf, sizeof(uint32_t), (uint32_t *) &outlen);
+    size_t outlen       = 0;
+    factory_error_t ret = asr_factory_config_read(matter_partition, buf, sizeof(uint32_t), (uint32_t *) &outlen);
 
     if (outlen > sizeof(uint32_t))
-        ret = -1;
+        return CHIP_ERROR_BUFFER_TOO_SMALL;
 
-    if (ret != 0)
-        ChipLogProgress(DeviceLayer, "asr_factory_config_read: %d failed, ret = %d\n", matter_partition, static_cast<int>(ret));
-
-    if (ret == 0)
+    if (ret != FACTORY_NO_ERROR)
     {
-        val = *((uint32_t *) buf);
-        return CHIP_NO_ERROR;
+        ChipLogProgress(DeviceLayer, "asr_factory_config_read: %d failed, err = %d\n", matter_partition, ret);
+        return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
     }
     else
     {
-        return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
+        val = *((uint32_t *) buf);
+        return CHIP_NO_ERROR;
     }
 }
 #endif
diff --git a/src/platform/ASR/ASRConfig.h b/src/platform/ASR/ASRConfig.h
old mode 100644
new mode 100755
index af10b47b08d2f9..71c90a3a79b242
--- a/src/platform/ASR/ASRConfig.h
+++ b/src/platform/ASR/ASRConfig.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "asr_factory_config.h"
+#include "ASRFactoryDataParser.h"
 #include <string.h>
 
 namespace chip {
diff --git a/src/platform/ASR/ASRFactoryDataParser.cpp b/src/platform/ASR/ASRFactoryDataParser.cpp
new file mode 100755
index 00000000000000..9483b5cdac5f94
--- /dev/null
+++ b/src/platform/ASR/ASRFactoryDataParser.cpp
@@ -0,0 +1,277 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ASRFactoryDataParser.h"
+
+#if CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
+/* Logic partition on flash devices for matter */
+const matter_partition_t asr_matter_partitions_table[] =
+{
+    [ASR_VERSION_PARTITION] =
+    {
+        .partition_name = "version",
+    },
+    [ASR_CONFIG_PARTITION] =
+    {
+        .partition_name = "config",
+    },
+    [ASR_ITERATION_COUNT_PARTITION] =
+    {
+        .partition_name = "iteration-count",
+    },
+    [ASR_SALT_PARTITION] =
+    {
+        .partition_name = "salt",
+    },
+    [ASR_VERIFIER_PARTITION] =
+    {
+        .partition_name = "verifier",
+    },
+    [ASR_DISCRIMINATOR_PARTITION] =
+    {
+        .partition_name = "discriminator",
+    },
+    [ASR_DAC_CERT_PARTITION] =
+    {
+        .partition_name = "dac-cert",
+    },
+    [ASR_DAC_KEY_PARTITION] =
+    {
+        .partition_name = "dac-pri-key",
+    },
+    [ASR_DAC_PUB_KEY_PARTITION] =
+    {
+        .partition_name = "dac-pub-key",
+    },
+    [ASR_PAI_CERT_PARTITION] =
+    {
+        .partition_name = "pai-cert",
+    },
+    [ASR_CERT_DCLRN_PARTITION] =
+    {
+        .partition_name = "cert-dclrn",
+    },
+    [ASR_CHIP_ID_PARTITION] =
+    {
+        .partition_name = "chip-id",
+    },
+#if CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
+    [ASR_VENDOR_NAME_PARTITION] =
+    {
+        .partition_name = "vendor-name",
+    },
+    [ASR_VENDOR_ID_PARTITION] =
+    {
+        .partition_name = "vendor-id",
+    },
+    [ASR_PRODUCT_NAME_PARTITION] =
+    {
+        .partition_name = "product-name",
+    },
+    [ASR_PRODUCT_ID_PARTITION] =
+    {
+        .partition_name = "product-id",
+    },
+    [ASR_ROTATING_UNIQUE_ID_PARTITION] =
+    {
+        .partition_name = "rd-id-uid",
+    },
+    [ASR_MANUFACTURY_DATE_PARTITION] =
+    {
+        .partition_name = "mfg-date",
+    },
+    [ASR_SERIAL_NUMBER_PARTITION] =
+    {
+        .partition_name = "serial-num",
+    },
+    [ASR_HARDWARE_VERSION_PARTITION] =
+    {
+        .partition_name = "hardware-ver",
+    },
+    [ASR_HARDWARE_VERSION_STR_PARTITION] =
+    {
+        .partition_name = "hw-ver-str",
+    },
+    [ASR_PRODUCT_URL_PARTITION] =
+    {
+        .partition_name = "product-url",
+    },
+    [ASR_PRODUCT_LABEL_PARTITION] =
+    {
+        .partition_name = "product-label",
+    },
+    [ASR_PART_NUMBER_PARTITION] =
+    {
+        .partition_name = "part-number",
+    },
+#endif
+    [ASR_MATTER_PARTITION_MAX] =
+    {
+        .partition_name = NULL, //for end don't change,
+    }
+};
+
+static asr_tlv_context matter_tlv_ctx;
+
+static factory_error_t asr_matter_find_by_name(const char * name, uint8_t * buf, uint32_t buf_len, uint32_t * out_len)
+{
+    tlv_header_t tlv;
+
+    if (asr_tlv_find_by_name(&matter_tlv_ctx, &tlv, MIXCLASS_MATTERCONFIG_TAG,
+                             (char *) name)) // parse the data according to the tlv packaging tool
+    {
+        uint32_t value_len = tlv_htons(tlv->data_len);
+
+        value_len -= MAX_NAME_LEN;
+
+        if (value_len > buf_len)
+        {
+            return FACTORY_BUFFER_TOO_SMALL;
+        }
+
+        *out_len = value_len;
+
+        memcpy(buf, tlv->data + MAX_NAME_LEN, value_len);
+
+        return FACTORY_NO_ERROR;
+    }
+    else
+    {
+        return FACTORY_VALUE_NOT_FOUND;
+    }
+}
+
+static uint32_t asr_find_factory_version()
+{
+    uint8_t buf[4];
+    size_t outlen  = 0;
+    uint32_t value = 0;
+    if (FACTORY_NO_ERROR ==
+        asr_matter_find_by_name((const char *) asr_matter_partitions_table[ASR_VERSION_PARTITION].partition_name, buf,
+                                sizeof(uint32_t), (uint32_t *) &outlen))
+    {
+        value = *(uint32_t *) buf;
+    }
+    return value;
+}
+
+static uint32_t asr_find_factory_config()
+{
+    uint8_t buf[4];
+    size_t outlen  = 0;
+    uint32_t value = 0;
+    if (FACTORY_NO_ERROR ==
+        asr_matter_find_by_name((const char *) asr_matter_partitions_table[ASR_CONFIG_PARTITION].partition_name, buf,
+                                sizeof(uint32_t), (uint32_t *) &outlen))
+    {
+        value = *(uint32_t *) buf;
+    }
+    return value;
+}
+
+static factory_error_t asr_factory_dac_prvkey_get(uint8_t * pRdBuf, uint32_t * pOutLen)
+{
+    static constexpr uint32_t kDACPrivateKeySize = 32;
+    if (NULL == pRdBuf || NULL == pOutLen)
+    {
+        return FACTORY_INVALID_INPUT;
+    }
+
+    if (asr_find_factory_config() & ASR_CONFIG_MATTER_NO_KEY)
+    {
+#if defined(CFG_PLF_RV32) || defined(CFG_PLF_DUET)
+        uint32_t off_set;
+        uint8_t ucCipher[kDACPrivateKeySize];
+        tlv_area_header_t tlv_headr_p = (tlv_area_header_t) MATTER_FLASH_START_ADDR;
+        off_set                       = tlv_headr_p->data_len + 3 * sizeof(uint32_t); // magic_num,crc32_value,data_len
+        // get DAC cipher
+        if (asr_flash_read(ASR_CONFIG_BASE, (uint32_t *) &off_set, (void *) ucCipher, kDACPrivateKeySize) == 0)
+        {
+            if (asr_factory_decrypt_dac_prvkey(ucCipher, kDACPrivateKeySize, pRdBuf, pOutLen) == 0)
+            {
+                return FACTORY_NO_ERROR;
+            }
+        }
+#endif
+        return FACTORY_NOT_SUPPORTED;
+    }
+    else
+    {
+        return asr_matter_find_by_name((const char *) asr_matter_partitions_table[ASR_DAC_KEY_PARTITION].partition_name, pRdBuf,
+                                       kDACPrivateKeySize, pOutLen);
+    }
+}
+
+static int asr_partition_members_count_cb(tlv_header_t tlv, void * arg1, void * arg2)
+{
+    int * count = (int *) arg1;
+
+    *count = *count + 1;
+
+    return 0;
+}
+
+static factory_error_t asr_partition_table_load(void)
+{
+    int table_members = 0;
+
+    if (asr_tlv_poll_class_members(&matter_tlv_ctx, MIXCLASS_MATTERCONFIG_TAG, asr_partition_members_count_cb, &table_members,
+                                   NULL))
+    {
+        if (table_members > 0)
+        {
+            if (asr_find_factory_version() == ASR_MATTER_FACTORY_VERSION)
+            {
+                return FACTORY_NO_ERROR;
+            }
+            else
+            {
+                return FACTORY_VERSION_MISMATCH;
+            }
+        }
+    }
+    return FACTORY_DATA_CHECK_FAILED;
+}
+
+factory_error_t asr_factory_config_read(asr_matter_partition_t matter_partition, uint8_t * buf, uint32_t buf_len,
+                                        uint32_t * out_len)
+{
+
+    if (matter_partition >= ASR_MATTER_PARTITION_MAX)
+    {
+        return FACTORY_INVALID_INPUT;
+    }
+
+    if (matter_partition == ASR_DAC_KEY_PARTITION)
+    {
+        return asr_factory_dac_prvkey_get(buf, out_len);
+    }
+
+    return asr_matter_find_by_name((const char *) asr_matter_partitions_table[matter_partition].partition_name, buf, buf_len,
+                                   out_len);
+}
+
+factory_error_t asr_factory_check()
+{
+    if (asr_tlv_init(&matter_tlv_ctx, MATTER_FLASH_START_ADDR) != 0)
+    {
+        return FACTORY_DATA_INIT_FAILED;
+    }
+
+    return asr_partition_table_load();
+}
+#endif // CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
diff --git a/src/platform/ASR/ASRFactoryDataParser.h b/src/platform/ASR/ASRFactoryDataParser.h
new file mode 100644
index 00000000000000..e3de051fedf7f3
--- /dev/null
+++ b/src/platform/ASR/ASRFactoryDataParser.h
@@ -0,0 +1,116 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "stdint.h"
+#include "string.h"
+#include "tlv_decode.h"
+#ifdef CFG_PLF_RV32
+#include "asr_flash.h"
+#include "asr_rv32.h"
+#elif defined CFG_PLF_DUET
+#include "duet_cm4.h"
+#include "duet_flash.h"
+#define asr_flash_read duet_flash_read
+#define asr_factory_decrypt_dac_prvkey duet_factory_decrypt_dac_prvkey
+#else
+#include "lega_cm4.h"
+#include "lega_flash.h"
+#define asr_flash_read lega_flash_read
+#endif
+
+#ifndef CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
+#define CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER 0
+#endif // CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
+
+#ifndef CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
+#define CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER 0
+#endif // CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
+
+#define ASR_CONFIG_BASE PARTITION_MATTER_CONFIG
+#define ASR_MATTER_FACTORY_VERSION 2
+#define ASR_CONFIG_MATTER_NO_KEY 0x01
+
+#if CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
+typedef enum ASR_MATTER_PARTITION_T
+{
+    ASR_VERSION_PARTITION = 0x00,
+    ASR_CONFIG_PARTITION,
+    ASR_ITERATION_COUNT_PARTITION,
+    ASR_SALT_PARTITION,
+    ASR_VERIFIER_PARTITION,
+    ASR_DISCRIMINATOR_PARTITION,
+    ASR_DAC_CERT_PARTITION,
+    ASR_DAC_KEY_PARTITION,
+    ASR_DAC_PUB_KEY_PARTITION,
+    ASR_PAI_CERT_PARTITION,
+    ASR_CERT_DCLRN_PARTITION,
+    ASR_CHIP_ID_PARTITION,
+#if CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
+    ASR_VENDOR_NAME_PARTITION,
+    ASR_VENDOR_ID_PARTITION,
+    ASR_PRODUCT_NAME_PARTITION,
+    ASR_PRODUCT_ID_PARTITION,
+    ASR_ROTATING_UNIQUE_ID_PARTITION,
+    ASR_MANUFACTURY_DATE_PARTITION,
+    ASR_SERIAL_NUMBER_PARTITION,
+    ASR_HARDWARE_VERSION_PARTITION,
+    ASR_HARDWARE_VERSION_STR_PARTITION,
+    ASR_PRODUCT_URL_PARTITION,
+    ASR_PRODUCT_LABEL_PARTITION,
+    ASR_PART_NUMBER_PARTITION,
+#endif
+    ASR_MATTER_PARTITION_MAX,
+} asr_matter_partition_t;
+
+typedef struct
+{
+    const char * partition_name;
+} matter_partition_t;
+
+typedef enum
+{
+    FACTORY_NO_ERROR = 0x00,
+    FACTORY_BUFFER_TOO_SMALL,
+    FACTORY_VALUE_NOT_FOUND,
+    FACTORY_INVALID_INPUT,
+    FACTORY_NOT_SUPPORTED,
+    FACTORY_VERSION_MISMATCH,
+    FACTORY_DATA_CHECK_FAILED,
+    FACTORY_DATA_INIT_FAILED,
+} factory_error_t;
+
+/**
+ * @brief Tries to read the factory data within the given partition.
+ *
+ * @param matter_partition The matter partition to be find out.
+ * @param buf Output buffer to store found factory data.
+ * @param buf_len Size of buffer.
+ * @param outlen Actual size of found factory data.
+ * @return FACTORY_NO_ERROR on success, other factory_error_t values from implementation on other errors.
+ */
+factory_error_t asr_factory_config_read(asr_matter_partition_t matter_partition, uint8_t * buf, uint32_t buf_len,
+                                        uint32_t * out_len);
+/**
+ * @brief Init and check if the factory data filed is valid.
+ *
+ * @return FACTORY_NO_ERROR on success, other factory_error_t values from implementation on other errors.
+ */
+factory_error_t asr_factory_check();
+
+#endif // CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
diff --git a/src/platform/ASR/ASRFactoryDataProvider.cpp b/src/platform/ASR/ASRFactoryDataProvider.cpp
index 0e28c014a72937..c1a436168f6246 100755
--- a/src/platform/ASR/ASRFactoryDataProvider.cpp
+++ b/src/platform/ASR/ASRFactoryDataProvider.cpp
@@ -46,11 +46,11 @@ CHIP_ERROR ASRFactoryDataProvider::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 #if CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
-    uint8_t ret = asr_factory_check();
-    if (ret != 0)
+    factory_error_t ret = asr_factory_check();
+    if (ret != FACTORY_NO_ERROR)
     {
         err = CHIP_ERROR_INTERNAL;
-        ChipLogError(DeviceLayer, "ASR factory data check failed.");
+        ChipLogError(DeviceLayer, "ASR factory data check failed. err = %d", ret);
     }
 #endif
     return err;
@@ -355,9 +355,8 @@ CHIP_ERROR ASRFactoryDataProvider::GetVendorName(char * buf, size_t bufSize)
     ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME), CHIP_ERROR_BUFFER_TOO_SMALL);
     strcpy(buf, CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME);
 #else
-#define BUFFER_MAX_SIZE 32
-    uint8_t buffer[BUFFER_MAX_SIZE + 1] = { 0 };
-    size_t buffer_len                   = BUFFER_MAX_SIZE + 1;
+    size_t buffer_len                                              = ConfigurationManager::kMaxVendorNameLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxVendorNameLength + 1] = { 0 };
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_VENDOR_NAME_PARTITION, buffer, buffer_len, buffer_len));
     ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
     memcpy(buf, buffer, buffer_len);
@@ -373,7 +372,7 @@ CHIP_ERROR ASRFactoryDataProvider::GetVendorId(uint16_t & vendorId)
 #else
     uint32_t vendorId32;
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_VENDOR_ID_PARTITION, vendorId32));
-    vendorId                            = static_cast<uint16_t>(vendorId32);
+    vendorId                                                        = static_cast<uint16_t>(vendorId32);
 #endif
     return CHIP_NO_ERROR;
 }
@@ -384,9 +383,8 @@ CHIP_ERROR ASRFactoryDataProvider::GetProductName(char * buf, size_t bufSize)
     ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME), CHIP_ERROR_BUFFER_TOO_SMALL);
     strcpy(buf, CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME);
 #else
-#define BUFFER_MAX_SIZE 32
-    uint8_t buffer[BUFFER_MAX_SIZE + 1] = { 0 };
-    size_t buffer_len                   = BUFFER_MAX_SIZE + 1;
+    size_t buffer_len                                               = ConfigurationManager::kMaxProductNameLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxProductNameLength + 1] = { 0 };
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_PRODUCT_NAME_PARTITION, buffer, buffer_len, buffer_len));
     ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
     memcpy(buf, buffer, buffer_len);
@@ -402,24 +400,54 @@ CHIP_ERROR ASRFactoryDataProvider::GetProductId(uint16_t & productId)
 #else
     uint32_t productId32;
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_PRODUCT_ID_PARTITION, productId32));
-    productId                           = static_cast<uint16_t>(productId32);
+    productId                                                      = static_cast<uint16_t>(productId32);
 #endif
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ASRFactoryDataProvider::GetPartNumber(char * buf, size_t bufSize)
 {
+#if !CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#else
+    size_t buffer_len                                              = ConfigurationManager::kMaxPartNumberLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxPartNumberLength + 1] = { 0 };
+    ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_PART_NUMBER_PARTITION, buffer, buffer_len, buffer_len));
+    ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(buf, buffer, buffer_len);
+    buf[buffer_len]                                                = 0;
+#endif
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ASRFactoryDataProvider::GetProductURL(char * buf, size_t bufSize)
 {
+#if !CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#else
+    size_t buffer_len                                              = ConfigurationManager::kMaxProductURLLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxProductURLLength + 1] = { 0 };
+    ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_PRODUCT_URL_PARTITION, buffer, buffer_len, buffer_len));
+    ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(buf, buffer, buffer_len);
+    buf[buffer_len]                                                  = 0;
+#endif
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ASRFactoryDataProvider::GetProductLabel(char * buf, size_t bufSize)
 {
+#if !CONFIG_ENABLE_ASR_FACTORY_DEVICE_INFO_PROVIDER
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#else
+    size_t buffer_len                                                = ConfigurationManager::kMaxProductLabelLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxProductLabelLength + 1] = { 0 };
+    ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_PRODUCT_LABEL_PARTITION, buffer, buffer_len, buffer_len));
+    ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(buf, buffer, buffer_len);
+    buf[buffer_len]                                                  = 0;
+#endif
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ASRFactoryDataProvider::GetSerialNumber(char * buf, size_t bufSize)
@@ -428,9 +456,8 @@ CHIP_ERROR ASRFactoryDataProvider::GetSerialNumber(char * buf, size_t bufSize)
     ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER), CHIP_ERROR_BUFFER_TOO_SMALL);
     strcpy(buf, CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER);
 #else
-#define BUFFER_MAX_SIZE 32
-    uint8_t buffer[BUFFER_MAX_SIZE + 1] = { 0 };
-    size_t buffer_len                   = BUFFER_MAX_SIZE + 1;
+    size_t buffer_len                                                = ConfigurationManager::kMaxSerialNumberLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxSerialNumberLength + 1] = { 0 };
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_SERIAL_NUMBER_PARTITION, buffer, buffer_len, buffer_len));
     ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
     memcpy(buf, buffer, buffer_len);
@@ -487,7 +514,7 @@ CHIP_ERROR ASRFactoryDataProvider::GetHardwareVersion(uint16_t & hardwareVersion
 #else
     uint32_t hardwareVersion32;
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_HARDWARE_VERSION_PARTITION, hardwareVersion32));
-    hardwareVersion                     = static_cast<uint16_t>(hardwareVersion32);
+    hardwareVersion   = static_cast<uint16_t>(hardwareVersion32);
 #endif
     return CHIP_NO_ERROR;
 }
@@ -498,9 +525,8 @@ CHIP_ERROR ASRFactoryDataProvider::GetHardwareVersionString(char * buf, size_t b
     ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
     strcpy(buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING);
 #else
-#define BUFFER_MAX_SIZE 32
-    uint8_t buffer[BUFFER_MAX_SIZE + 1] = { 0 };
-    size_t buffer_len                   = BUFFER_MAX_SIZE + 1;
+    size_t buffer_len = ConfigurationManager::kMaxHardwareVersionStringLength + 1;
+    uint8_t buffer[ConfigurationManager::kMaxHardwareVersionStringLength + 1] = { 0 };
     ReturnErrorOnFailure(ASRConfig::ReadFactoryConfigValue(ASR_HARDWARE_VERSION_STR_PARTITION, buffer, buffer_len, buffer_len));
     ReturnErrorCodeIf(bufSize < buffer_len, CHIP_ERROR_BUFFER_TOO_SMALL);
     memcpy(buf, buffer, buffer_len);
diff --git a/src/platform/ASR/BUILD.gn b/src/platform/ASR/BUILD.gn
index eff3c98881cf94..033f07e977835a 100755
--- a/src/platform/ASR/BUILD.gn
+++ b/src/platform/ASR/BUILD.gn
@@ -26,6 +26,8 @@ static_library("ASR") {
     "../SingletonConfigurationManager.cpp",
     "ASRConfig.cpp",
     "ASRConfig.h",
+    "ASRFactoryDataParser.cpp",
+    "ASRFactoryDataParser.h",
     "ASRFactoryDataProvider.cpp",
     "ASRUtils.cpp",
     "ASRUtils.h",
diff --git a/src/platform/ASR/route_hook/asr_route_hook.c b/src/platform/ASR/route_hook/asr_route_hook.c
old mode 100644
new mode 100755
index 0dae344f057e99..85902550aebe19
--- a/src/platform/ASR/route_hook/asr_route_hook.c
+++ b/src/platform/ASR/route_hook/asr_route_hook.c
@@ -3,7 +3,7 @@
 
 #include "asr_route_hook.h"
 #include "asr_route_table.h"
-
+#include "lega_rtos_api.h"
 #include "lwip/icmp6.h"
 #include "lwip/mld6.h"
 #include "lwip/netif.h"
@@ -166,7 +166,7 @@ int8_t asr_route_hook_init()
         return -1;
     }
 
-    for (asr_route_hook_t * iter = s_hooks; iter != NULL; iter++)
+    for (asr_route_hook_t * iter = s_hooks; iter != NULL; iter = iter->next)
     {
         if (iter->netif == lwip_netif)
         {
@@ -175,7 +175,7 @@ int8_t asr_route_hook_init()
         }
     }
 
-    hook = (asr_route_hook_t *) malloc(sizeof(asr_route_hook_t));
+    hook = (asr_route_hook_t *) lega_rtos_malloc(sizeof(asr_route_hook_t));
     if (hook == NULL)
     {
         ASR_LOG("Cannot allocate hook");
@@ -203,7 +203,7 @@ int8_t asr_route_hook_init()
 exit:
     if (ret != 0 && hook != NULL)
     {
-        free(hook);
+        lega_rtos_free(hook);
     }
     return ret;
 }
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 7a7b6a81e689f5..e00c3618bd59da 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -111,6 +111,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       "CHIP_DEVICE_CONFIG_ENABLE_WPA=${chip_device_config_enable_wpa}",
       "CHIP_ENABLE_OPENTHREAD=${chip_enable_openthread}",
       "CHIP_DEVICE_CONFIG_THREAD_FTD=${chip_device_config_thread_ftd}",
+      "CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER=${chip_openthread_border_router}",
       "CHIP_STACK_LOCK_TRACKING_ENABLED=${chip_stack_lock_tracking_log}",
       "CHIP_STACK_LOCK_TRACKING_ERROR_FATAL=${chip_stack_lock_tracking_fatal}",
       "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING=${chip_enable_additional_data_advertising}",
@@ -371,6 +372,12 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     }
 
     defines += [ "CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES=${chip_max_discovered_ip_addresses}" ]
+
+    visibility = [
+      ":platform_config_header",
+      "${chip_root}/src/ble:ble_config_header",
+      "${chip_root}/src/system:system_config_header",
+    ]
   }
 } else if (chip_device_platform == "none") {
   buildconfig_header("platform_buildconfig") {
@@ -392,10 +399,16 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
   }
 }
 
+source_set("platform_config_header") {
+  sources = [ "../include/platform/CHIPDeviceConfig.h" ]
+
+  deps = [ ":platform_buildconfig" ]
+}
+
 if (chip_device_platform != "none") {
-  group("platform_base") {
+  source_set("platform_base") {
     public_deps = [
-      ":platform_buildconfig",
+      ":platform_config_header",
       "${chip_root}/src/ble",
       "${chip_root}/src/inet",
       "${chip_root}/src/lib/core",
@@ -412,7 +425,6 @@ if (chip_device_platform != "none") {
 
     sources = [
       "../include/platform/BuildTime.h",
-      "../include/platform/CHIPDeviceConfig.h",
       "../include/platform/CHIPDeviceError.h",
       "../include/platform/CHIPDeviceEvent.h",
       "../include/platform/CHIPDeviceLayer.h",
diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h
index 8b4ee23eb78c9f..8cb779756bf95b 100644
--- a/src/platform/Darwin/CHIPDevicePlatformConfig.h
+++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h
@@ -25,6 +25,7 @@
 
 // ==================== Platform Adaptations ====================
 
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 
diff --git a/src/platform/DeviceControlServer.cpp b/src/platform/DeviceControlServer.cpp
index da27293ada6008..76008965498028 100644
--- a/src/platform/DeviceControlServer.cpp
+++ b/src/platform/DeviceControlServer.cpp
@@ -73,5 +73,19 @@ CHIP_ERROR DeviceControlServer::PostConnectedToOperationalNetworkEvent(ByteSpan
     return PlatformMgr().PostEvent(&event);
 }
 
+CHIP_ERROR DeviceControlServer::PostCloseAllBLEConnectionsToOperationalNetworkEvent()
+{
+    ChipDeviceEvent event;
+    event.Type = DeviceEventType::kCloseAllBleConnections;
+    return PlatformMgr().PostEvent(&event);
+}
+
+CHIP_ERROR DeviceControlServer::PostWiFiDeviceAvailableNetworkEvent()
+{
+    ChipDeviceEvent event;
+    event.Type = DeviceEventType::kWiFiDeviceAvailable;
+    return PlatformMgr().PostEvent(&event);
+}
+
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
index 0a9c9b7dbaef20..c5b59add8e9e34 100644
--- a/src/platform/ESP32/BUILD.gn
+++ b/src/platform/ESP32/BUILD.gn
@@ -154,7 +154,7 @@ static_library("ESP32") {
       "../OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
       "../OpenThread/GenericNetworkCommissioningThreadDriver.h",
       "../OpenThread/OpenThreadUtils.cpp",
-      "OpenthreadLauncher.c",
+      "OpenthreadLauncher.cpp",
       "OpenthreadLauncher.h",
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
index ba583b64c8fa0b..0c4f036f5177a4 100644
--- a/src/platform/ESP32/CHIPDevicePlatformConfig.h
+++ b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -87,6 +87,7 @@
 #define CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN
 #define CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX
 #define CHIP_DEVICE_CONFIG_CHIPOBLE_SINGLE_CONNECTION CONFIG_CHIPOBLE_SINGLE_CONNECTION
+#define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
index 6180eb77a9e37b..ff36ca21662152 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
@@ -23,7 +23,6 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <app-common/zap-generated/enums.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/support/CHIPMemString.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/platform/ESP32/ESP32Config.cpp b/src/platform/ESP32/ESP32Config.cpp
index 37bfe68d7e0d56..04e02f63004207 100644
--- a/src/platform/ESP32/ESP32Config.cpp
+++ b/src/platform/ESP32/ESP32Config.cpp
@@ -370,10 +370,10 @@ bool ESP32Config::ConfigValueExists(Key key)
 {
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     nvs_iterator_t iterator = NULL;
-    esp_err_t err           = nvs_entry_find(NVS_DEFAULT_PART_NAME, key.Namespace, NVS_TYPE_ANY, &iterator);
+    esp_err_t err           = nvs_entry_find(GetPartitionLabelByNamespace(key.Namespace), key.Namespace, NVS_TYPE_ANY, &iterator);
     for (; iterator && err == ESP_OK; err = nvs_entry_next(&iterator))
 #else
-    nvs_iterator_t iterator = nvs_entry_find(NVS_DEFAULT_PART_NAME, key.Namespace, NVS_TYPE_ANY);
+    nvs_iterator_t iterator = nvs_entry_find(GetPartitionLabelByNamespace(key.Namespace), key.Namespace, NVS_TYPE_ANY);
     for (; iterator; iterator = nvs_entry_next(iterator))
 #endif
     {
diff --git a/src/platform/ESP32/ESP32SecureCertDACProvider.cpp b/src/platform/ESP32/ESP32SecureCertDACProvider.cpp
index f7de0bd9992090..1b06224318231c 100644
--- a/src/platform/ESP32/ESP32SecureCertDACProvider.cpp
+++ b/src/platform/ESP32/ESP32SecureCertDACProvider.cpp
@@ -79,8 +79,8 @@ CHIP_ERROR ESP32SecureCertDACProvider ::GetDeviceAttestationCert(MutableByteSpan
     {
         ESP_FAULT_ASSERT(err == ESP_OK && dac_cert != NULL && dac_len != 0);
         VerifyOrReturnError(dac_len <= kMaxDERCertLength, CHIP_ERROR_UNSUPPORTED_CERT_FORMAT,
-                            esp_secure_cert_free_ca_cert(dac_cert));
-        VerifyOrReturnError(dac_len <= outBuffer.size(), CHIP_ERROR_BUFFER_TOO_SMALL, esp_secure_cert_free_ca_cert(dac_cert));
+                            esp_secure_cert_free_device_cert(dac_cert));
+        VerifyOrReturnError(dac_len <= outBuffer.size(), CHIP_ERROR_BUFFER_TOO_SMALL, esp_secure_cert_free_device_cert(dac_cert));
         memcpy(outBuffer.data(), dac_cert, outBuffer.size());
         outBuffer.reduce_size(dac_len);
         esp_secure_cert_free_device_cert(dac_cert);
diff --git a/src/platform/ESP32/OpenthreadLauncher.c b/src/platform/ESP32/OpenthreadLauncher.cpp
similarity index 56%
rename from src/platform/ESP32/OpenthreadLauncher.c
rename to src/platform/ESP32/OpenthreadLauncher.cpp
index 4eaa674e4d8c48..8c76c1db809082 100644
--- a/src/platform/ESP32/OpenthreadLauncher.c
+++ b/src/platform/ESP32/OpenthreadLauncher.cpp
@@ -20,18 +20,95 @@
 #include "esp_netif.h"
 #include "esp_netif_types.h"
 #include "esp_openthread.h"
+#include "esp_openthread_cli.h"
 #include "esp_openthread_lock.h"
 #include "esp_openthread_netif_glue.h"
 #include "esp_openthread_types.h"
 #include "esp_vfs_eventfd.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "openthread/cli.h"
 #include "openthread/instance.h"
 #include "openthread/logging.h"
 #include "openthread/tasklet.h"
+#include <lib/core/CHIPError.h>
+#include <memory>
 
 static esp_netif_t * openthread_netif                       = NULL;
 static esp_openthread_platform_config_t * s_platform_config = NULL;
+static TaskHandle_t cli_transmit_task                       = NULL;
+static QueueHandle_t cli_transmit_task_queue                = NULL;
+static constexpr uint16_t OTCLI_TRANSMIT_TASK_STACK_SIZE    = 1024;
+static constexpr UBaseType_t OTCLI_TRANSMIT_TASK_PRIORITY   = 5;
+
+CHIP_ERROR cli_transmit_task_post(std::unique_ptr<char[]> && cli_str)
+{
+    char * cmd = cli_str.get();
+    if (!cli_transmit_task_queue || xQueueSend(cli_transmit_task_queue, &cmd, portMAX_DELAY) != pdTRUE)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+    cli_str.release();
+    return CHIP_NO_ERROR;
+}
+
+static int cli_output_callback(void * context, const char * format, va_list args)
+{
+    int ret = 0;
+    char prompt_check[3];
+    vsnprintf(prompt_check, sizeof(prompt_check), format, args);
+    if (!strncmp(prompt_check, "> ", sizeof(prompt_check)) && cli_transmit_task)
+    {
+        xTaskNotifyGive(cli_transmit_task);
+    }
+    else
+    {
+        ret = vprintf(format, args);
+    }
+    return ret;
+}
+
+static void esp_openthread_matter_cli_init(void)
+{
+    otCliInit(esp_openthread_get_instance(), cli_output_callback, NULL);
+}
+
+static void cli_transmit_worker(void * context)
+{
+    cli_transmit_task_queue = xQueueCreate(8, sizeof(char *));
+    if (!cli_transmit_task_queue)
+    {
+        vTaskDelete(NULL);
+        return;
+    }
+
+    while (true)
+    {
+        char * cmd = NULL;
+        if (xQueueReceive(cli_transmit_task_queue, &cmd, portMAX_DELAY) == pdTRUE)
+        {
+            if (cmd)
+            {
+                std::unique_ptr<char[]> cmd_ptr(cmd);
+                esp_openthread_cli_input(cmd_ptr.get());
+            }
+            else
+            {
+                continue;
+            }
+            xTaskNotifyWait(0, 0, NULL, portMAX_DELAY);
+        }
+    }
+    vQueueDelete(cli_transmit_task_queue);
+    vTaskDelete(NULL);
+}
+
+static esp_err_t cli_command_transmit_task(void)
+{
+    xTaskCreate(cli_transmit_worker, "otcli_trans", OTCLI_TRANSMIT_TASK_STACK_SIZE, xTaskGetCurrentTaskHandle(),
+                OTCLI_TRANSMIT_TASK_PRIORITY, &cli_transmit_task);
+    return ESP_OK;
+}
 
 static esp_netif_t * init_openthread_netif(const esp_openthread_platform_config_t * config)
 {
@@ -84,6 +161,10 @@ esp_err_t openthread_init_stack(void)
     assert(s_platform_config);
     // Initialize the OpenThread stack
     ESP_ERROR_CHECK(esp_openthread_init(s_platform_config));
+#if CONFIG_OPENTHREAD_CLI
+    esp_openthread_matter_cli_init();
+    cli_command_transmit_task();
+#endif
     // Initialize the esp_netif bindings
     openthread_netif = init_openthread_netif(s_platform_config);
     free(s_platform_config);
diff --git a/src/platform/ESP32/OpenthreadLauncher.h b/src/platform/ESP32/OpenthreadLauncher.h
index a7f4ef02747eb2..0a10b486d74afc 100644
--- a/src/platform/ESP32/OpenthreadLauncher.h
+++ b/src/platform/ESP32/OpenthreadLauncher.h
@@ -19,15 +19,10 @@
 
 #include <esp_err.h>
 #include <esp_openthread_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <lib/core/CHIPError.h>
+#include <memory>
 
 esp_err_t set_openthread_platform_config(esp_openthread_platform_config_t * config);
 esp_err_t openthread_init_stack(void);
 esp_err_t openthread_launch_task(void);
-
-#ifdef __cplusplus
-}
-#endif
+CHIP_ERROR cli_transmit_task_post(std::unique_ptr<char[]> && cli_str);
diff --git a/src/platform/ESP32/PlatformManagerImpl.cpp b/src/platform/ESP32/PlatformManagerImpl.cpp
index 81bc561cddc667..ed9f6aca7128c9 100644
--- a/src/platform/ESP32/PlatformManagerImpl.cpp
+++ b/src/platform/ESP32/PlatformManagerImpl.cpp
@@ -25,7 +25,6 @@
 /* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <app-common/zap-generated/enums.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <platform/ESP32/DiagnosticDataProviderImpl.h>
 #include <platform/ESP32/ESP32Utils.h>
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index 66a4d29df768d4..877f49e5fb006c 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -1273,6 +1273,8 @@ CHIP_ERROR BLEManagerImpl::HandleGAPDisconnect(struct ble_gap_event * gapEvent)
     peer_delete(gapEvent->disconnect.conn.conn_handle);
 #endif
 
+    // There can be a case where the BLE central disconnects without unsubscribing from the BLE characteristic.
+    // In such situations, it is necessary to clear the subscription and post a connection error event.
     if (UnsetSubscribed(gapEvent->disconnect.conn.conn_handle))
     {
         CHIP_ERROR disconReason;
@@ -1288,7 +1290,12 @@ CHIP_ERROR BLEManagerImpl::HandleGAPDisconnect(struct ble_gap_event * gapEvent)
             disconReason = BLE_ERROR_CHIPOBLE_PROTOCOL_ABORT;
             break;
         }
-        HandleConnectionError(gapEvent->disconnect.conn.conn_handle, disconReason);
+
+        ChipDeviceEvent connectionErrorEvent;
+        connectionErrorEvent.Type                           = DeviceEventType::kCHIPoBLEConnectionError;
+        connectionErrorEvent.CHIPoBLEConnectionError.ConId  = gapEvent->disconnect.conn.conn_handle;
+        connectionErrorEvent.CHIPoBLEConnectionError.Reason = disconReason;
+        ReturnErrorOnFailure(PlatformMgr().PostEvent(&connectionErrorEvent));
     }
 
     ChipDeviceEvent disconnectEvent;
diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn
index 51a3be470e36c3..7da725e63034be 100644
--- a/src/platform/Infineon/CYW30739/BUILD.gn
+++ b/src/platform/Infineon/CYW30739/BUILD.gn
@@ -82,9 +82,6 @@ static_library("CYW30739") {
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
 
     deps += [
       "${chip_root}/third_party/openthread/platforms:libopenthread-platform",
diff --git a/src/platform/Infineon/CYW30739/args.gni b/src/platform/Infineon/CYW30739/args.gni
index a0d31c75f4c49b..252c5e6716e59e 100644
--- a/src/platform/Infineon/CYW30739/args.gni
+++ b/src/platform/Infineon/CYW30739/args.gni
@@ -64,3 +64,9 @@ openthread_config_ip6_slaac_enable = true
 openthread_config_joiner_enable = true
 openthread_config_log_output = "platform_defined"
 openthread_config_srp_client_enable = true
+
+# TODO: this should be removed once sufficient flash for things
+#       like:
+#
+# ./scripts/build/build_examples.py --target cyw30739-cyw930739m2evb_01-ota-requestor build
+chip_detail_logging = false
diff --git a/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp
index 753b82369512a2..67ed7f1d8eab4b 100644
--- a/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp
+++ b/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp
@@ -118,7 +118,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     CHIP_ERROR err   = CHIP_NO_ERROR;
     cy_rslt_t result = CY_RSLT_SUCCESS;
     cy_wcm_mac_t mac;
-    result = cy_wcm_get_mac_addr(CY_WCM_INTERFACE_TYPE_STA, &mac, 1);
+    result = cy_wcm_get_mac_addr(CY_WCM_INTERFACE_TYPE_STA, &mac);
     if (result != CY_RSLT_SUCCESS)
     {
         err = CHIP_ERROR_INTERNAL;
diff --git a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
index 7e23d7dfaf5a00..9ac41f5d211cbb 100644
--- a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
+++ b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
@@ -43,8 +43,8 @@
 #include <lwip/nd6.h>
 #include <lwip/netif.h>
 
+#include "cy_network_mw_core.h"
 #include "lwip/opt.h"
-#include <cy_lwip.h>
 #include <platform/Infineon/PSOC6/NetworkCommissioningDriver.h>
 #include <type_traits>
 
@@ -446,10 +446,13 @@ void ConnectivityManagerImpl::DriveAPState()
                 // Compute the amount of idle time before the AP should be deactivated and
                 // arm a timer to fire at that time.
                 System::Clock::Timeout apTimeout = (mLastAPDemandTime + mWiFiAPIdleTimeout) - now;
-                err                              = DeviceLayer::SystemLayer().StartTimer(apTimeout, DriveAPState, nullptr);
-                SuccessOrExit(err);
                 ChipLogProgress(DeviceLayer, "Next WiFi AP timeout in %" PRIu32 " ms",
                                 System::Clock::Milliseconds32(apTimeout).count());
+                SystemLayer().ScheduleLambda([apTimeout, this] {
+                    CHIP_ERROR ret = CHIP_NO_ERROR;
+                    ret            = DeviceLayer::SystemLayer().StartTimer(apTimeout, DriveAPState, this);
+                    VerifyOrReturn(ret == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "StartTimer failed %s: ", chip::ErrorStr(ret)));
+                });
             }
             else
             {
@@ -605,9 +608,11 @@ void ConnectivityManagerImpl::DriveStationState()
                 System::Clock::Timeout timeToNextConnect = (mLastStationConnectFailTime + mWiFiStationReconnectInterval) - now;
                 ChipLogProgress(DeviceLayer, "Next WiFi station reconnect in %" PRIu32 " ms ",
                                 System::Clock::Milliseconds32(timeToNextConnect).count());
-
-                err = DeviceLayer::SystemLayer().StartTimer(timeToNextConnect, DriveStationState, NULL);
-                SuccessOrExit(err);
+                SystemLayer().ScheduleLambda([timeToNextConnect, this] {
+                    CHIP_ERROR ret = CHIP_NO_ERROR;
+                    ret            = DeviceLayer::SystemLayer().StartTimer(timeToNextConnect, DriveStationState, this);
+                    VerifyOrReturn(ret == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "StartTimer failed %s: ", chip::ErrorStr(ret)));
+                });
             }
         }
     }
@@ -634,7 +639,7 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
     // If the WiFi station is currently in the connected state...
     if ((mWiFiStationState == kWiFiStationState_Connected) || stationConnected)
     {
-        net_interface = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
+        net_interface = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
         if (net_interface != NULL && netif_is_up(net_interface) && netif_is_link_up(net_interface))
         {
             if (!ip4_addr_isany(netif_ip4_addr(net_interface)) && !ip4_addr_isany(netif_ip4_gw(net_interface)))
diff --git a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
index 761e04286d075d..b09fd83cecc5df 100644
--- a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
@@ -23,8 +23,8 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
+#include "cy_network_mw_core.h"
 #include "cyhal_system.h"
-#include <cy_lwip.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DiagnosticDataProvider.h>
@@ -155,7 +155,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     struct netif * net_interface;
     CHIP_ERROR err         = CHIP_NO_ERROR;
     NetworkInterface * ifp = new NetworkInterface();
-    net_interface          = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
+    net_interface          = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
     if (net_interface)
     {
         /* Update Network Interface list */
diff --git a/src/platform/Infineon/PSOC6/P6Utils.cpp b/src/platform/Infineon/PSOC6/P6Utils.cpp
index 62cdb83f96f711..2964cc4b5dfa5b 100644
--- a/src/platform/Infineon/PSOC6/P6Utils.cpp
+++ b/src/platform/Infineon/PSOC6/P6Utils.cpp
@@ -24,7 +24,7 @@
 /* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <cy_lwip.h>
+#include "cy_network_mw_core.h"
 #include <cy_wcm.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/support/CodeUtils.h>
@@ -472,7 +472,7 @@ CHIP_ERROR P6Utils::p6_start_ap(void)
     }
     /* Link Local IPV6 AP address for AP */
     cy_wcm_ip_address_t ipv6_addr;
-    result = cy_wcm_get_ipv6_addr(CY_WCM_INTERFACE_TYPE_AP, CY_WCM_IPV6_LINK_LOCAL, &ipv6_addr, 1);
+    result = cy_wcm_get_ipv6_addr(CY_WCM_INTERFACE_TYPE_AP, CY_WCM_IPV6_LINK_LOCAL, &ipv6_addr);
     if (result != CY_RSLT_SUCCESS)
     {
         ChipLogError(DeviceLayer, "cy_wcm_get_ipv6_addr() failed result %ld", result);
@@ -727,7 +727,7 @@ CHIP_ERROR P6Utils::ping_init(void)
 {
     CHIP_ERROR err               = CHIP_NO_ERROR;
     struct netif * net_interface = NULL;
-    net_interface                = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
+    net_interface                = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
     ping_target                  = &net_interface->gw;
 
     /* Ping to Gateway address */
diff --git a/src/platform/Linux/BLEManagerImpl.cpp b/src/platform/Linux/BLEManagerImpl.cpp
index bf0f4eb2f909bd..978dc158124c12 100644
--- a/src/platform/Linux/BLEManagerImpl.cpp
+++ b/src/platform/Linux/BLEManagerImpl.cpp
@@ -32,7 +32,6 @@
  *       platform/<PLATFORM>/BLEManagerImpl.h after defining interface class. */
 #include "platform/internal/BLEManager.h"
 
-#include <cassert>
 #include <type_traits>
 #include <utility>
 
@@ -63,9 +62,8 @@ const ChipBleUUID ChipUUID_CHIPoBLEChar_TX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0
 
 void HandleConnectTimeout(chip::System::Layer *, void * apEndpoint)
 {
-    assert(apEndpoint != nullptr);
-
-    CancelConnect(static_cast<BluezEndpoint *>(apEndpoint));
+    VerifyOrDie(apEndpoint != nullptr);
+    static_cast<BluezEndpoint *>(apEndpoint)->CancelConnect();
     BLEManagerImpl::HandleConnectFailed(CHIP_ERROR_TIMEOUT);
 }
 
@@ -101,10 +99,14 @@ CHIP_ERROR BLEManagerImpl::_Init()
 
 void BLEManagerImpl::_Shutdown()
 {
-    // ensure scan resources are cleared (e.g. timeout timers)
-    mDeviceScanner.reset();
+    // Ensure scan resources are cleared (e.g. timeout timers).
+    mDeviceScanner.Shutdown();
+    // Stop advertising and free resources.
+    mBLEAdvertisement.Shutdown();
+    // Make sure that the endpoint is not used by the timer.
+    DeviceLayer::SystemLayer().CancelTimer(HandleConnectTimeout, &mEndpoint);
     // Release BLE connection resources (unregister from BlueZ).
-    ShutdownBluezBleLayer(mpEndpoint);
+    mEndpoint.Shutdown();
     mFlags.Clear(Flags::kBluezBLELayerInitialized);
 }
 
@@ -184,32 +186,15 @@ uint16_t BLEManagerImpl::_NumConnections()
 
 CHIP_ERROR BLEManagerImpl::ConfigureBle(uint32_t aAdapterId, bool aIsCentral)
 {
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    mBLEAdvConfig.mpBleName         = mDeviceName;
-    mBLEAdvConfig.mAdapterId        = aAdapterId;
-    mBLEAdvConfig.mMajor            = 1;
-    mBLEAdvConfig.mMinor            = 1;
-    mBLEAdvConfig.mVendorId         = 1;
-    mBLEAdvConfig.mProductId        = 1;
-    mBLEAdvConfig.mDeviceId         = 1;
-    mBLEAdvConfig.mDuration         = 2;
-    mBLEAdvConfig.mPairingStatus    = 0;
-    mBLEAdvConfig.mType             = ChipAdvType::BLUEZ_ADV_TYPE_UNDIRECTED_CONNECTABLE_SCANNABLE;
-    mBLEAdvConfig.mpAdvertisingUUID = "0xFFF6";
 
+    mAdapterId = aAdapterId;
     mIsCentral = aIsCentral;
 
-    return err;
-}
-
-CHIP_ERROR BLEManagerImpl::StartBLEAdvertising()
-{
-    return StartBluezAdv(mpEndpoint);
-}
+    mBLEAdvType       = ChipAdvType::BLUEZ_ADV_TYPE_UNDIRECTED_CONNECTABLE_SCANNABLE;
+    mBLEAdvDurationMs = 2;
+    mpBLEAdvUUID      = "0xFFF6";
 
-CHIP_ERROR BLEManagerImpl::StopBLEAdvertising()
-{
-    return StopBluezAdv(mpEndpoint);
+    return CHIP_NO_ERROR;
 }
 
 void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
@@ -290,12 +275,6 @@ void BLEManagerImpl::HandlePlatformSpecificBLEEvent(const ChipDeviceEvent * apEv
         HandleIndicationReceived(apEvent->Platform.BLEIndicationReceived.mConnection, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_TX,
                                  PacketBufferHandle::Adopt(apEvent->Platform.BLEIndicationReceived.mData));
         break;
-    case DeviceEventType::kPlatformLinuxBLEPeripheralAdvConfiguredComplete:
-        VerifyOrExit(apEvent->Platform.BLEPeripheralAdvConfiguredComplete.mIsSuccess, err = CHIP_ERROR_INCORRECT_STATE);
-        sInstance.mFlags.Set(Flags::kAdvertisingConfigured).Clear(Flags::kControlOpInProgress);
-        controlOpComplete = true;
-        ChipLogProgress(DeviceLayer, "CHIPoBLE advertising config complete");
-        break;
     case DeviceEventType::kPlatformLinuxBLEPeripheralAdvStartComplete:
         VerifyOrExit(apEvent->Platform.BLEPeripheralAdvStartComplete.mIsSuccess, err = CHIP_ERROR_INCORRECT_STATE);
         sInstance.mFlags.Clear(Flags::kControlOpInProgress).Clear(Flags::kAdvertisingRefreshNeeded);
@@ -592,16 +571,14 @@ void BLEManagerImpl::DriveBLEState()
     // Initializes the Bluez BLE layer if needed.
     if (mServiceMode == ConnectivityManager::kCHIPoBLEServiceMode_Enabled && !mFlags.Has(Flags::kBluezBLELayerInitialized))
     {
-        err = InitBluezBleLayer(mIsCentral, nullptr, mBLEAdvConfig, mpEndpoint);
-        SuccessOrExit(err);
+        SuccessOrExit(err = mEndpoint.Init(mAdapterId, mIsCentral, nullptr, mDeviceName));
         mFlags.Set(Flags::kBluezBLELayerInitialized);
     }
 
     // Register the CHIPoBLE application with the Bluez BLE layer if needed.
     if (!mIsCentral && mServiceMode == ConnectivityManager::kCHIPoBLEServiceMode_Enabled && !mFlags.Has(Flags::kAppRegistered))
     {
-        err = BluezGattsAppRegister(mpEndpoint);
-        SuccessOrExit(err);
+        SuccessOrExit(err = mEndpoint.RegisterGattApplication());
         mFlags.Set(Flags::kControlOpInProgress);
         ExitNow();
     }
@@ -615,20 +592,17 @@ void BLEManagerImpl::DriveBLEState()
         {
             mFlags.Clear(Flags::kAdvertisingRefreshNeeded);
 
-            // Configure advertising data if it hasn't been done yet.  This is an asynchronous step which
-            // must complete before advertising can be started.  When that happens, this method will
-            // be called again, and execution will proceed to the code below.
+            // Configure advertising data if it hasn't been done yet.
             if (!mFlags.Has(Flags::kAdvertisingConfigured))
             {
-                err = BluezAdvertisementSetup(mpEndpoint);
-                ExitNow();
+                SuccessOrExit(err = mBLEAdvertisement.Init(mEndpoint, mBLEAdvType, mpBLEAdvUUID, mBLEAdvDurationMs));
+                mFlags.Set(Flags::kAdvertisingConfigured);
             }
 
-            // Start advertising.  This is also an asynchronous step.
-            err = StartBLEAdvertising();
-            SuccessOrExit(err);
-
-            sInstance.mFlags.Set(Flags::kAdvertising);
+            // Start advertising. This is an asynchronous step. BLE manager will be notified of
+            // advertising start completion via a call to NotifyBLEPeripheralAdvStartComplete.
+            SuccessOrExit(err = mBLEAdvertisement.Start());
+            mFlags.Set(Flags::kControlOpInProgress);
             ExitNow();
         }
     }
@@ -638,8 +612,7 @@ void BLEManagerImpl::DriveBLEState()
     {
         if (mFlags.Has(Flags::kAdvertising))
         {
-            err = StopBLEAdvertising();
-            SuccessOrExit(err);
+            SuccessOrExit(err = mBLEAdvertisement.Stop());
             mFlags.Set(Flags::kControlOpInProgress);
 
             ExitNow();
@@ -662,6 +635,10 @@ void BLEManagerImpl::DriveBLEState(intptr_t arg)
 void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
 {
     ChipLogProgress(Ble, "Got notification regarding chip connection closure");
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA && !CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
+    // In Non-Concurrent mode start the Wi-Fi, as BLE has been stopped
+    DeviceLayer::ConnectivityMgrImpl().StartNonConcurrentWiFiManagement();
+#endif
 }
 
 void BLEManagerImpl::InitiateScan(BleScanState scanType)
@@ -675,24 +652,24 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
         return;
     }
 
-    if (mpEndpoint == nullptr)
+    if (!mFlags.Has(Flags::kBluezBLELayerInitialized))
     {
         BleConnectionDelegate::OnConnectionError(mBLEScanConfig.mAppState, CHIP_ERROR_INCORRECT_STATE);
         ChipLogError(Ble, "BLE Layer is not yet initialized");
         return;
     }
 
-    if (mpEndpoint->mpAdapter == nullptr)
+    if (mEndpoint.GetAdapter() == nullptr)
     {
         BleConnectionDelegate::OnConnectionError(mBLEScanConfig.mAppState, CHIP_ERROR_INCORRECT_STATE);
         ChipLogError(Ble, "No adapter available for new connection establishment");
         return;
     }
 
-    mDeviceScanner               = Internal::ChipDeviceScanner::Create(mpEndpoint->mpAdapter, this);
     mBLEScanConfig.mBleScanState = scanType;
 
-    if (!mDeviceScanner)
+    CHIP_ERROR err = mDeviceScanner.Init(mEndpoint.GetAdapter(), this);
+    if (err != CHIP_NO_ERROR)
     {
         mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
         BleConnectionDelegate::OnConnectionError(mBLEScanConfig.mAppState, CHIP_ERROR_INTERNAL);
@@ -700,7 +677,7 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
         return;
     }
 
-    CHIP_ERROR err = mDeviceScanner->StartScan(kNewConnectionScanTimeout);
+    err = mDeviceScanner.StartScan(kNewConnectionScanTimeout);
     if (err != CHIP_NO_ERROR)
     {
         mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
@@ -713,7 +690,7 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
 void BLEManagerImpl::CleanScanConfig()
 {
     if (mBLEScanConfig.mBleScanState == BleScanState::kConnecting)
-        DeviceLayer::SystemLayer().CancelTimer(HandleConnectTimeout, mpEndpoint);
+        DeviceLayer::SystemLayer().CancelTimer(HandleConnectTimeout, &mEndpoint);
 
     mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
 }
@@ -735,10 +712,10 @@ void BLEManagerImpl::NewConnection(BleLayer * bleLayer, void * appState, const S
 CHIP_ERROR BLEManagerImpl::CancelConnection()
 {
     if (mBLEScanConfig.mBleScanState == BleScanState::kConnecting)
-        CancelConnect(mpEndpoint);
+        mEndpoint.CancelConnect();
     // If in discovery mode, stop scan.
     else if (mBLEScanConfig.mBleScanState != BleScanState::kNotScanning)
-        mDeviceScanner->StopScan();
+        mDeviceScanner.StopScan();
     return CHIP_NO_ERROR;
 }
 
@@ -751,15 +728,6 @@ void BLEManagerImpl::NotifyBLEPeripheralRegisterAppComplete(bool aIsSuccess, voi
     PlatformMgr().PostEventOrDie(&event);
 }
 
-void BLEManagerImpl::NotifyBLEPeripheralAdvConfiguredComplete(bool aIsSuccess, void * apAppstate)
-{
-    ChipDeviceEvent event;
-    event.Type = DeviceEventType::kPlatformLinuxBLEPeripheralAdvConfiguredComplete;
-    event.Platform.BLEPeripheralAdvConfiguredComplete.mIsSuccess = aIsSuccess;
-    event.Platform.BLEPeripheralAdvConfiguredComplete.mpAppstate = apAppstate;
-    PlatformMgr().PostEventOrDie(&event);
-}
-
 void BLEManagerImpl::NotifyBLEPeripheralAdvStartComplete(bool aIsSuccess, void * apAppstate)
 {
     ChipDeviceEvent event;
@@ -808,12 +776,12 @@ void BLEManagerImpl::OnDeviceScanned(BluezDevice1 & device, const chip::Ble::Chi
     mBLEScanConfig.mBleScanState = BleScanState::kConnecting;
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
-    DeviceLayer::SystemLayer().StartTimer(kConnectTimeout, HandleConnectTimeout, mpEndpoint);
+    DeviceLayer::SystemLayer().StartTimer(kConnectTimeout, HandleConnectTimeout, &mEndpoint);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
-    mDeviceScanner->StopScan();
+    mDeviceScanner.StopScan();
 
-    ConnectDevice(device, mpEndpoint);
+    mEndpoint.ConnectDevice(device);
 }
 
 void BLEManagerImpl::OnScanComplete()
diff --git a/src/platform/Linux/BLEManagerImpl.h b/src/platform/Linux/BLEManagerImpl.h
index 2cc764b742cf13..5cd3ed2460adf9 100644
--- a/src/platform/Linux/BLEManagerImpl.h
+++ b/src/platform/Linux/BLEManagerImpl.h
@@ -23,11 +23,13 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 #include <ble/BleLayer.h>
 #include <platform/internal/BLEManager.h>
 
+#include "bluez/BluezAdvertisement.h"
 #include "bluez/BluezEndpoint.h"
 #include "bluez/ChipDeviceScanner.h"
 #include "bluez/Types.h"
@@ -38,21 +40,6 @@ namespace Internal {
 
 void HandleIncomingBleConnection(Ble::BLEEndPoint * bleEP);
 
-struct BLEAdvConfig
-{
-    char * mpBleName;
-    uint32_t mAdapterId;
-    uint8_t mMajor;
-    uint8_t mMinor;
-    uint16_t mVendorId;
-    uint16_t mProductId;
-    uint64_t mDeviceId;
-    uint8_t mPairingStatus;
-    ChipAdvType mType;
-    uint16_t mDuration;
-    const char * mpAdvertisingUUID;
-};
-
 enum class BleScanState : uint8_t
 {
     kNotScanning,
@@ -106,7 +93,6 @@ class BLEManagerImpl final : public BLEManager,
     static void HandleTXComplete(BLE_CONNECTION_OBJECT user_data);
 
     static void NotifyBLEPeripheralRegisterAppComplete(bool aIsSuccess, void * apAppstate);
-    static void NotifyBLEPeripheralAdvConfiguredComplete(bool aIsSuccess, void * apAppstate);
     static void NotifyBLEPeripheralAdvStartComplete(bool aIsSuccess, void * apAppstate);
     static void NotifyBLEPeripheralAdvStopComplete(bool aIsSuccess, void * apAppstate);
 
@@ -187,9 +173,6 @@ class BLEManagerImpl final : public BLEManager,
         kMaxAdvertisementDataSetSize = 31  // TODO: verify this
     };
 
-    CHIP_ERROR StartBLEAdvertising();
-    CHIP_ERROR StopBLEAdvertising();
-
     void DriveBLEState();
     static void DriveBLEState(intptr_t arg);
 
@@ -198,13 +181,20 @@ class BLEManagerImpl final : public BLEManager,
     void CleanScanConfig();
 
     CHIPoBLEServiceMode mServiceMode;
-    BLEAdvConfig mBLEAdvConfig;
-    BLEScanConfig mBLEScanConfig;
     BitFlags<Flags> mFlags;
+
+    uint32_t mAdapterId = 0;
     char mDeviceName[kMaxDeviceNameLength + 1];
-    bool mIsCentral            = false;
-    BluezEndpoint * mpEndpoint = nullptr;
-    std::unique_ptr<ChipDeviceScanner> mDeviceScanner;
+    bool mIsCentral = false;
+    BluezEndpoint mEndpoint;
+
+    BluezAdvertisement mBLEAdvertisement;
+    ChipAdvType mBLEAdvType    = ChipAdvType::BLUEZ_ADV_TYPE_UNDIRECTED_CONNECTABLE_SCANNABLE;
+    uint16_t mBLEAdvDurationMs = 20;
+    const char * mpBLEAdvUUID  = nullptr;
+
+    ChipDeviceScanner mDeviceScanner;
+    BLEScanConfig mBLEScanConfig;
 };
 
 /**
diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
index a2cfa6b39cbaa8..635fd446eb941e 100644
--- a/src/platform/Linux/BUILD.gn
+++ b/src/platform/Linux/BUILD.gn
@@ -91,6 +91,8 @@ static_library("Linux") {
       "BlePlatformConfig.h",
       "bluez/AdapterIterator.cpp",
       "bluez/AdapterIterator.h",
+      "bluez/BluezAdvertisement.cpp",
+      "bluez/BluezAdvertisement.h",
       "bluez/BluezConnection.cpp",
       "bluez/BluezConnection.h",
       "bluez/BluezEndpoint.cpp",
diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h
index 530e2716308842..70ed39d62899d5 100644
--- a/src/platform/Linux/CHIPDevicePlatformConfig.h
+++ b/src/platform/Linux/CHIPDevicePlatformConfig.h
@@ -26,6 +26,7 @@
 // ==================== Platform Adaptations ====================
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #else
diff --git a/src/platform/Linux/CHIPDevicePlatformEvent.h b/src/platform/Linux/CHIPDevicePlatformEvent.h
index 009f39148aef92..8618b9ebeaa0a8 100644
--- a/src/platform/Linux/CHIPDevicePlatformEvent.h
+++ b/src/platform/Linux/CHIPDevicePlatformEvent.h
@@ -53,7 +53,6 @@ enum InternalPlatformSpecificEventTypes
     kPlatformLinuxBLEC1WriteEvent,
     kPlatformLinuxBLEOutOfBuffersEvent,
     kPlatformLinuxBLEPeripheralRegisterAppComplete,
-    kPlatformLinuxBLEPeripheralAdvConfiguredComplete,
     kPlatformLinuxBLEPeripheralAdvStartComplete,
     kPlatformLinuxBLEPeripheralAdvStopComplete
 };
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index bbc96914e64e4b..01d7a9668ff615 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -20,6 +20,7 @@
 
 #include <platform/CommissionableDataProvider.h>
 #include <platform/ConnectivityManager.h>
+#include <platform/DeviceControlServer.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/Linux/ConnectivityUtils.h>
 #include <platform/Linux/DiagnosticDataProviderImpl.h>
@@ -765,6 +766,23 @@ bool ConnectivityManagerImpl::IsWiFiManagementStarted()
     return ret;
 }
 
+void ConnectivityManagerImpl::StartNonConcurrentWiFiManagement()
+{
+    StartWiFiManagement();
+
+    for (int cnt = 0; cnt < WIFI_START_CHECK_ATTEMPTS; cnt++)
+    {
+        if (IsWiFiManagementStarted())
+        {
+            DeviceControlServer::DeviceControlSvr().PostWiFiDeviceAvailableNetworkEvent();
+            ChipLogProgress(DeviceLayer, "Non-concurrent mode Wi-Fi Management Started.");
+            return;
+        }
+        usleep(WIFI_START_CHECK_TIME_USEC);
+    }
+    ChipLogError(Ble, "Non-concurrent mode Wi-Fi Management taking too long to start.");
+}
+
 void ConnectivityManagerImpl::DriveAPState()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1017,7 +1035,7 @@ ConnectivityManagerImpl::ConnectWiFiNetworkAsync(ByteSpan ssid, ByteSpan credent
     memcpy(keyStr, credentials.data(), credentials.size());
     g_variant_builder_add(&builder, "{sv}", "ssid", g_variant_new_string(ssidStr));
     g_variant_builder_add(&builder, "{sv}", "psk", g_variant_new_string(keyStr));
-    g_variant_builder_add(&builder, "{sv}", "key_mgmt", g_variant_new_string("WPA-PSK"));
+    g_variant_builder_add(&builder, "{sv}", "key_mgmt", g_variant_new_string("SAE WPA-PSK"));
     args = g_variant_builder_end(&builder);
 
     result = wpa_fi_w1_wpa_supplicant1_interface_call_add_network_sync(mWpaSupplicant.iface, args, &mWpaSupplicant.networkPath,
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index df9e893f8ec5a6..1325c6cd83f21d 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -137,6 +137,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     void StartWiFiManagement();
     bool IsWiFiManagementStarted();
+    void StartNonConcurrentWiFiManagement();
     int32_t GetDisconnectReason();
     CHIP_ERROR GetWiFiBssId(MutableByteSpan & value);
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType);
diff --git a/src/platform/Linux/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp
index 2924d48612317e..8084ceca43b55a 100644
--- a/src/platform/Linux/ConnectivityUtils.cpp
+++ b/src/platform/Linux/ConnectivityUtils.cpp
@@ -21,7 +21,6 @@
  *          statistics(extracted from /proc/net/wireless) on Linux platforms.
  */
 
-#include <app-common/zap-generated/enums.h>
 #include <platform/Linux/ConnectivityUtils.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
@@ -658,34 +657,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate1G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate25g;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate5G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate40G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate200G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate400G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index f102b47b65ca6e..b363fa652a6cf2 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -23,7 +23,6 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <app-common/zap-generated/enums.h>
 #include <app/data-model/List.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPMemString.h>
diff --git a/src/platform/Linux/NetworkCommissioningDriver.h b/src/platform/Linux/NetworkCommissioningDriver.h
index d54470e70cb7fe..69169b697864d1 100644
--- a/src/platform/Linux/NetworkCommissioningDriver.h
+++ b/src/platform/Linux/NetworkCommissioningDriver.h
@@ -145,6 +145,8 @@ class LinuxThreadDriver final : public ThreadDriver
     // ThreadDriver
     Status AddOrUpdateNetwork(ByteSpan operationalDataset, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
     void ScanNetworks(ThreadDriver::ScanCallback * callback) override;
+    ThreadCapabilities GetSupportedThreadFeatures() override;
+    uint16_t GetThreadVersion() override;
 
 private:
     ThreadNetworkIterator mThreadIterator = ThreadNetworkIterator(this);
diff --git a/src/platform/Linux/NetworkCommissioningThreadDriver.cpp b/src/platform/Linux/NetworkCommissioningThreadDriver.cpp
index ed82e2a08e636f..9bb6015809fc9a 100644
--- a/src/platform/Linux/NetworkCommissioningThreadDriver.cpp
+++ b/src/platform/Linux/NetworkCommissioningThreadDriver.cpp
@@ -197,6 +197,25 @@ bool LinuxThreadDriver::ThreadNetworkIterator::Next(Network & item)
     return true;
 }
 
+ThreadCapabilities LinuxThreadDriver::GetSupportedThreadFeatures()
+{
+    BitMask<ThreadCapabilities> capabilites = 0;
+    capabilites.SetField(ThreadCapabilities::kIsBorderRouterCapable, CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER);
+    capabilites.SetField(ThreadCapabilities::kIsRouterCapable, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSleepyEndDeviceCapable, !CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsFullThreadDevice, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSynchronizedSleepyEndDeviceCapable,
+                         (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_SSED));
+    return capabilites;
+}
+
+uint16_t LinuxThreadDriver::GetThreadVersion()
+{
+    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
+    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
+    return 0;
+}
+
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 } // namespace NetworkCommissioning
diff --git a/src/platform/Linux/PlatformManagerImpl.cpp b/src/platform/Linux/PlatformManagerImpl.cpp
index a1c83faf299389..0098eb01ae96eb 100644
--- a/src/platform/Linux/PlatformManagerImpl.cpp
+++ b/src/platform/Linux/PlatformManagerImpl.cpp
@@ -35,7 +35,6 @@
 
 #include <mutex>
 
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Events.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
index a880490d85fb00..1eb5958bef17af 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.cpp
+++ b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -663,9 +663,9 @@ void ThreadStackManagerImpl::_OnNetworkScanFinished(GAsyncResult * res)
                                    &joiner_udp_port, &channel, &rssi, &lqi, &version, &is_native, &is_joinable))
         {
             ChipLogProgress(DeviceLayer,
-                            "Thread Network: %s (%016" PRIx64 ") ExtPanId(%016" PRIx64 ") RSSI %d LQI %u"
+                            "Thread Network: %s (" ChipLogFormatX64 ") ExtPanId(" ChipLogFormatX64 ") RSSI %d LQI %u"
                             " Version %u",
-                            network_name, ext_address, ext_panid, rssi, lqi, version);
+                            network_name, ChipLogValueX64(ext_address), ChipLogValueX64(ext_panid), rssi, lqi, version);
             NetworkCommissioning::ThreadScanResponse networkScanned;
             networkScanned.panId         = panid;
             networkScanned.extendedPanId = ext_panid;
diff --git a/src/platform/Linux/bluez/BluezAdvertisement.cpp b/src/platform/Linux/bluez/BluezAdvertisement.cpp
new file mode 100644
index 00000000000000..19212fbe717475
--- /dev/null
+++ b/src/platform/Linux/bluez/BluezAdvertisement.cpp
@@ -0,0 +1,347 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "BluezAdvertisement.h"
+
+#include <memory>
+#include <unistd.h>
+
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/ConfigurationManager.h>
+#include <platform/GLibTypeDeleter.h>
+#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/PlatformManager.h>
+
+#include "BluezEndpoint.h"
+#include "Types.h"
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+BluezLEAdvertisement1 * BluezAdvertisement::CreateLEAdvertisement()
+{
+    BluezLEAdvertisement1 * adv;
+    BluezObjectSkeleton * object;
+    GVariant * serviceData;
+    GVariant * serviceUUID;
+    GVariantBuilder serviceDataBuilder;
+    GVariantBuilder serviceUUIDsBuilder;
+    GAutoPtr<char> debugStr;
+    const char * localNamePtr;
+    char localName[32];
+
+    ChipLogDetail(DeviceLayer, "Create BLE adv object at %s", mpAdvPath);
+    object = bluez_object_skeleton_new(mpAdvPath);
+
+    adv = bluez_leadvertisement1_skeleton_new();
+
+    g_variant_builder_init(&serviceDataBuilder, G_VARIANT_TYPE("a{sv}"));
+    g_variant_builder_init(&serviceUUIDsBuilder, G_VARIANT_TYPE("as"));
+
+    g_variant_builder_add(&serviceDataBuilder, "{sv}", mpAdvUUID,
+                          g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, &mDeviceIdInfo, sizeof(mDeviceIdInfo), sizeof(uint8_t)));
+    g_variant_builder_add(&serviceUUIDsBuilder, "s", mpAdvUUID);
+
+    localNamePtr = mpAdapterName;
+    if (localNamePtr == nullptr)
+    {
+        g_snprintf(localName, sizeof(localName), "%s%04x", CHIP_DEVICE_CONFIG_BLE_DEVICE_NAME_PREFIX, getpid() & 0xffff);
+        localNamePtr = localName;
+    }
+
+    serviceData = g_variant_builder_end(&serviceDataBuilder);
+    serviceUUID = g_variant_builder_end(&serviceUUIDsBuilder);
+
+    debugStr = GAutoPtr<char>(g_variant_print(serviceData, TRUE));
+    ChipLogDetail(DeviceLayer, "SET service data to %s", StringOrNullMarker(debugStr.get()));
+
+    bluez_leadvertisement1_set_type_(adv, (mAdvType & BLUEZ_ADV_TYPE_CONNECTABLE) ? "peripheral" : "broadcast");
+    // empty manufacturer data
+    // empty solicit UUIDs
+    bluez_leadvertisement1_set_service_data(adv, serviceData);
+    // empty data
+
+    // Setting "Discoverable" to False on the adapter and to True on the advertisement convinces
+    // Bluez to set "BR/EDR Not Supported" flag. Bluez doesn't provide API to do that explicitly
+    // and the flag is necessary to force using LE transport.
+    bluez_leadvertisement1_set_discoverable(adv, (mAdvType & BLUEZ_ADV_TYPE_SCANNABLE) ? TRUE : FALSE);
+    if (mAdvType & BLUEZ_ADV_TYPE_SCANNABLE)
+        bluez_leadvertisement1_set_discoverable_timeout(adv, UINT16_MAX);
+
+    // advertising name corresponding to the PID and object path, for debug purposes
+    bluez_leadvertisement1_set_local_name(adv, localNamePtr);
+    bluez_leadvertisement1_set_service_uuids(adv, serviceUUID);
+
+    // 0xffff means no appearance
+    bluez_leadvertisement1_set_appearance(adv, 0xffff);
+
+    bluez_leadvertisement1_set_duration(adv, mAdvDurationMs);
+    // empty duration, we don't have a clear notion what it would mean to timeslice between toble and anyone else
+    bluez_leadvertisement1_set_timeout(adv, 0);
+    // empty secondary channel for now
+
+    bluez_object_skeleton_set_leadvertisement1(object, adv);
+    g_signal_connect(adv, "handle-release",
+                     G_CALLBACK(+[](BluezLEAdvertisement1 * aAdv, GDBusMethodInvocation * aInv, BluezAdvertisement * self) {
+                         return self->BluezLEAdvertisement1Release(aAdv, aInv);
+                     }),
+                     this);
+
+    g_dbus_object_manager_server_export(mpRoot, G_DBUS_OBJECT_SKELETON(object));
+    g_object_unref(object);
+
+    return adv;
+}
+
+gboolean BluezAdvertisement::BluezLEAdvertisement1Release(BluezLEAdvertisement1 * aAdv, GDBusMethodInvocation * aInvocation)
+{
+    ChipLogDetail(DeviceLayer, "Release BLE adv object in %s", __func__);
+    g_dbus_object_manager_server_unexport(mpRoot, mpAdvPath);
+    g_object_unref(mpAdv);
+    mpAdv          = nullptr;
+    mIsAdvertising = false;
+    return TRUE;
+}
+
+CHIP_ERROR BluezAdvertisement::InitImpl()
+{
+    // When creating D-Bus proxy object, the thread default context must be initialized. Otherwise,
+    // all D-Bus signals will be delivered to the GLib global default main context.
+    VerifyOrDie(g_main_context_get_thread_default() != nullptr);
+
+    mpAdv = CreateLEAdvertisement();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BluezAdvertisement::Init(const BluezEndpoint & aEndpoint, ChipAdvType aAdvType, const char * aAdvUUID,
+                                    uint32_t aAdvDurationMs)
+{
+    GAutoPtr<char> rootPath;
+    CHIP_ERROR err;
+
+    VerifyOrExit(mpAdv == nullptr, err = CHIP_ERROR_INCORRECT_STATE;
+                 ChipLogError(DeviceLayer, "FAIL: BLE advertisement already initialized in %s", __func__));
+
+    mpRoot        = reinterpret_cast<GDBusObjectManagerServer *>(g_object_ref(aEndpoint.GetGattApplicationObjectManager()));
+    mpAdapter     = reinterpret_cast<BluezAdapter1 *>(g_object_ref(aEndpoint.GetAdapter()));
+    mpAdapterName = g_strdup(aEndpoint.GetAdapterName());
+
+    g_object_get(G_OBJECT(mpRoot), "object-path", &MakeUniquePointerReceiver(rootPath).Get(), nullptr);
+    mpAdvPath      = g_strdup_printf("%s/advertising", rootPath.get());
+    mAdvType       = aAdvType;
+    mpAdvUUID      = g_strdup(aAdvUUID);
+    mAdvDurationMs = aAdvDurationMs;
+
+    err = ConfigurationMgr().GetBLEDeviceIdentificationInfo(mDeviceIdInfo);
+    ReturnErrorOnFailure(err);
+
+#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
+    mDeviceIdInfo.SetAdditionalDataFlag(true);
+#endif
+
+    err = PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezAdvertisement * self) { return self->InitImpl(); }, this);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
+                        ChipLogError(Ble, "Failed to schedule BLE advertisement Init() on CHIPoBluez thread"));
+
+    mIsInitialized = true;
+
+exit:
+    return err;
+}
+
+void BluezAdvertisement::Shutdown()
+{
+    VerifyOrReturn(mIsInitialized);
+
+    // Make sure that the advertisement is stopped before we start cleaning up.
+    if (mIsAdvertising)
+    {
+        CHIP_ERROR err = Stop();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(DeviceLayer, "Failed to stop BLE advertisement before shutdown: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+    }
+
+    // Release resources on the glib thread to synchronize with potential signal handlers
+    // attached to the advertising object that may run on the glib thread.
+    PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezAdvertisement * self) {
+            if (self->mpRoot != nullptr)
+            {
+                g_object_unref(self->mpRoot);
+                self->mpRoot = nullptr;
+            }
+            if (self->mpAdapter != nullptr)
+            {
+                g_object_unref(self->mpAdapter);
+                self->mpAdapter = nullptr;
+            }
+            if (self->mpAdv != nullptr)
+            {
+                g_object_unref(self->mpAdv);
+                self->mpAdv = nullptr;
+            }
+            return CHIP_NO_ERROR;
+        },
+        this);
+
+    g_free(mpAdvPath);
+    mpAdvPath = nullptr;
+    g_free(mpAdapterName);
+    mpAdapterName = nullptr;
+    g_free(mpAdvUUID);
+    mpAdvUUID = nullptr;
+
+    mIsInitialized = false;
+}
+
+void BluezAdvertisement::StartDone(GObject * aObject, GAsyncResult * aResult)
+{
+    BluezLEAdvertisingManager1 * advMgr = BLUEZ_LEADVERTISING_MANAGER1(aObject);
+    GAutoPtr<GError> error;
+    gboolean success = FALSE;
+
+    success =
+        bluez_leadvertising_manager1_call_register_advertisement_finish(advMgr, aResult, &MakeUniquePointerReceiver(error).Get());
+    if (success == FALSE)
+    {
+        g_dbus_object_manager_server_unexport(mpRoot, mpAdvPath);
+    }
+    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: RegisterAdvertisement : %s", error->message));
+
+    mIsAdvertising = true;
+
+    ChipLogDetail(DeviceLayer, "RegisterAdvertisement complete");
+
+exit:
+    BLEManagerImpl::NotifyBLEPeripheralAdvStartComplete(success == TRUE, nullptr);
+}
+
+CHIP_ERROR BluezAdvertisement::StartImpl()
+{
+    GDBusObject * adapter;
+    BluezLEAdvertisingManager1 * advMgr = nullptr;
+    GVariantBuilder optionsBuilder;
+    GVariant * options;
+
+    VerifyOrExit(!mIsAdvertising, ChipLogError(DeviceLayer, "FAIL: Advertising has already been enabled in %s", __func__));
+    VerifyOrExit(mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL mpAdapter in %s", __func__));
+
+    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(mpAdapter));
+    VerifyOrExit(adapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adapter in %s", __func__));
+
+    advMgr = bluez_object_get_leadvertising_manager1(BLUEZ_OBJECT(adapter));
+    VerifyOrExit(advMgr != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL advMgr in %s", __func__));
+
+    g_variant_builder_init(&optionsBuilder, G_VARIANT_TYPE("a{sv}"));
+    options = g_variant_builder_end(&optionsBuilder);
+
+    bluez_leadvertising_manager1_call_register_advertisement(
+        advMgr, mpAdvPath, options, nullptr,
+        [](GObject * aObject, GAsyncResult * aResult, void * aData) {
+            reinterpret_cast<BluezAdvertisement *>(aData)->StartDone(aObject, aResult);
+        },
+        this);
+
+exit:
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BluezAdvertisement::Start()
+{
+    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+
+    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezAdvertisement * self) { return self->StartImpl(); }, this);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
+                        ChipLogError(Ble, "Failed to schedule BLE advertisement Start() on CHIPoBluez thread"));
+    return err;
+}
+
+void BluezAdvertisement::StopDone(GObject * aObject, GAsyncResult * aResult)
+{
+    BluezLEAdvertisingManager1 * advMgr = BLUEZ_LEADVERTISING_MANAGER1(aObject);
+    GAutoPtr<GError> error;
+    gboolean success = FALSE;
+
+    success =
+        bluez_leadvertising_manager1_call_unregister_advertisement_finish(advMgr, aResult, &MakeUniquePointerReceiver(error).Get());
+
+    if (success == FALSE)
+    {
+        g_dbus_object_manager_server_unexport(mpRoot, mpAdvPath);
+    }
+    else
+    {
+        mIsAdvertising = false;
+    }
+
+    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: UnregisterAdvertisement : %s", error->message));
+
+    ChipLogDetail(DeviceLayer, "UnregisterAdvertisement complete");
+
+exit:
+    BLEManagerImpl::NotifyBLEPeripheralAdvStopComplete(success == TRUE, nullptr);
+}
+
+CHIP_ERROR BluezAdvertisement::StopImpl()
+{
+    GDBusObject * adapter;
+    BluezLEAdvertisingManager1 * advMgr = nullptr;
+
+    VerifyOrExit(mIsAdvertising, ChipLogError(DeviceLayer, "FAIL: Advertising has already been disabled in %s", __func__));
+    VerifyOrExit(mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL mpAdapter in %s", __func__));
+
+    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(mpAdapter));
+    VerifyOrExit(adapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adapter in %s", __func__));
+
+    advMgr = bluez_object_get_leadvertising_manager1(BLUEZ_OBJECT(adapter));
+    VerifyOrExit(advMgr != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL advMgr in %s", __func__));
+
+    bluez_leadvertising_manager1_call_unregister_advertisement(
+        advMgr, mpAdvPath, nullptr,
+        [](GObject * aObject, GAsyncResult * aResult, void * aData) {
+            reinterpret_cast<BluezAdvertisement *>(aData)->StopDone(aObject, aResult);
+        },
+        this);
+
+exit:
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BluezAdvertisement::Stop()
+{
+    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+
+    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezAdvertisement * self) { return self->StopImpl(); }, this);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
+                        ChipLogError(Ble, "Failed to schedule BLE advertisement Stop() on CHIPoBluez thread"));
+    return err;
+}
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Linux/bluez/BluezAdvertisement.h b/src/platform/Linux/bluez/BluezAdvertisement.h
new file mode 100644
index 00000000000000..6ae2974d706b35
--- /dev/null
+++ b/src/platform/Linux/bluez/BluezAdvertisement.h
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+
+#include <ble/CHIPBleServiceData.h>
+#include <lib/core/CHIPError.h>
+#include <platform/Linux/dbus/bluez/DbusBluez.h>
+
+#include "Types.h"
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+class BluezEndpoint;
+
+class BluezAdvertisement
+{
+public:
+    BluezAdvertisement() = default;
+    ~BluezAdvertisement() { Shutdown(); }
+
+    CHIP_ERROR Init(const BluezEndpoint & aEndpoint, ChipAdvType aAdvType, const char * aAdvUUID, uint32_t aAdvDurationMs);
+    void Shutdown();
+
+    /// Start BLE advertising.
+    ///
+    /// BLE advertising is started asynchronously. Application will be notified of
+    /// completion via a call to BLEManagerImpl::NotifyBLEPeripheralAdvStartComplete().
+    CHIP_ERROR Start();
+
+    /// Stop BLE advertising.
+    ///
+    /// BLE advertising is stopped asynchronously. Application will be notified of
+    /// completion via a call to BLEManagerImpl::NotifyBLEPeripheralAdvStopComplete().
+    CHIP_ERROR Stop();
+
+private:
+    BluezLEAdvertisement1 * CreateLEAdvertisement();
+    gboolean BluezLEAdvertisement1Release(BluezLEAdvertisement1 * aAdv, GDBusMethodInvocation * aInv);
+
+    CHIP_ERROR InitImpl();
+
+    void StartDone(GObject * aObject, GAsyncResult * aResult);
+    CHIP_ERROR StartImpl();
+
+    void StopDone(GObject * aObject, GAsyncResult * aResult);
+    CHIP_ERROR StopImpl();
+
+    // Objects (interfaces) used by LE advertisement
+    GDBusObjectManagerServer * mpRoot = nullptr;
+    BluezAdapter1 * mpAdapter         = nullptr;
+    BluezLEAdvertisement1 * mpAdv     = nullptr;
+
+    bool mIsInitialized = false;
+    bool mIsAdvertising = false;
+
+    Ble::ChipBLEDeviceIdentificationInfo mDeviceIdInfo;
+    char * mpAdvPath     = nullptr;
+    char * mpAdapterName = nullptr;
+    char * mpAdvUUID     = nullptr;
+    ChipAdvType mAdvType;
+    uint16_t mAdvDurationMs = 0;
+};
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Linux/bluez/BluezConnection.cpp b/src/platform/Linux/bluez/BluezConnection.cpp
index 2d4286a4fe6069..39b5bb0bdb8ba6 100644
--- a/src/platform/Linux/bluez/BluezConnection.cpp
+++ b/src/platform/Linux/bluez/BluezConnection.cpp
@@ -59,10 +59,10 @@ gboolean BluezIsCharOnService(BluezGattCharacteristic1 * aChar, BluezGattService
 
 } // namespace
 
-BluezConnection::BluezConnection(BluezEndpoint * apEndpoint, BluezDevice1 * apDevice) :
-    mpEndpoint(apEndpoint), mpDevice(BLUEZ_DEVICE1(g_object_ref(apDevice)))
+BluezConnection::BluezConnection(const BluezEndpoint & aEndpoint, BluezDevice1 * apDevice) :
+    mpDevice(BLUEZ_DEVICE1(g_object_ref(apDevice)))
 {
-    Init();
+    Init(aEndpoint);
 }
 
 BluezConnection::~BluezConnection()
@@ -93,21 +93,21 @@ BluezConnection::ConnectionDataBundle::ConnectionDataBundle(const BluezConnectio
     mData(g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, aBuf->Start(), aBuf->DataLength(), sizeof(uint8_t)))
 {}
 
-CHIP_ERROR BluezConnection::Init()
+CHIP_ERROR BluezConnection::Init(const BluezEndpoint & aEndpoint)
 {
     // populate the service and the characteristics
     GList * objects = nullptr;
     GList * l;
 
-    if (!mpEndpoint->mIsCentral)
+    if (!aEndpoint.mIsCentral)
     {
-        mpService = BLUEZ_GATT_SERVICE1(g_object_ref(mpEndpoint->mpService));
-        mpC1      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(mpEndpoint->mpC1));
-        mpC2      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(mpEndpoint->mpC2));
+        mpService = BLUEZ_GATT_SERVICE1(g_object_ref(aEndpoint.mpService));
+        mpC1      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(aEndpoint.mpC1));
+        mpC2      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(aEndpoint.mpC2));
     }
     else
     {
-        objects = g_dbus_object_manager_get_objects(mpEndpoint->mpObjMgr);
+        objects = g_dbus_object_manager_get_objects(aEndpoint.mpObjMgr);
 
         for (l = objects; l != nullptr; l = l->next)
         {
diff --git a/src/platform/Linux/bluez/BluezConnection.h b/src/platform/Linux/bluez/BluezConnection.h
index 3a64ac931220a8..fa8a6392fa1ec5 100644
--- a/src/platform/Linux/bluez/BluezConnection.h
+++ b/src/platform/Linux/bluez/BluezConnection.h
@@ -32,12 +32,12 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-struct BluezEndpoint;
+class BluezEndpoint;
 
 class BluezConnection
 {
 public:
-    BluezConnection(BluezEndpoint * apEndpoint, BluezDevice1 * apDevice);
+    BluezConnection(const BluezEndpoint & aEndpoint, BluezDevice1 * apDevice);
     ~BluezConnection();
 
     const char * GetPeerAddress() const;
@@ -95,7 +95,7 @@ class BluezConnection
         GAutoPtr<GVariant> mData;
     };
 
-    CHIP_ERROR Init();
+    CHIP_ERROR Init(const BluezEndpoint & aEndpoint);
 
     static CHIP_ERROR BluezDisconnect(BluezConnection * apConn);
 
@@ -115,7 +115,6 @@ class BluezConnection
     static void UnsubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConn);
     static CHIP_ERROR UnsubscribeCharacteristicImpl(BluezConnection * apConn);
 
-    BluezEndpoint * mpEndpoint;
     BluezDevice1 * mpDevice;
 
     bool mNotifyAcquired = false;
diff --git a/src/platform/Linux/bluez/BluezEndpoint.cpp b/src/platform/Linux/bluez/BluezEndpoint.cpp
index 8fbfd81be4308a..4c315f11a7d581 100644
--- a/src/platform/Linux/bluez/BluezEndpoint.cpp
+++ b/src/platform/Linux/bluez/BluezEndpoint.cpp
@@ -45,7 +45,6 @@
 
 #include "BluezEndpoint.h"
 
-#include <cassert>
 #include <cstring>
 #include <errno.h>
 #include <memory>
@@ -65,6 +64,7 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/GLibTypeDeleter.h>
+#include <platform/Linux/dbus/bluez/DbusBluez.h>
 #include <platform/PlatformManager.h>
 #include <platform/internal/BLEManager.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
@@ -79,238 +79,15 @@ namespace Internal {
 
 constexpr uint16_t kMaxConnectRetries = 4;
 
-static BluezConnection * GetBluezConnectionViaDevice(BluezEndpoint * apEndpoint);
-
-static gboolean BluezAdvertisingRelease(BluezLEAdvertisement1 * aAdv, GDBusMethodInvocation * aInvocation, gpointer apClosure)
-{
-    bool isSuccess           = false;
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    VerifyOrExit(aAdv != nullptr, ChipLogError(DeviceLayer, "BluezLEAdvertisement1 is NULL in %s", __func__));
-    ChipLogDetail(DeviceLayer, "Release adv object in %s", __func__);
-
-    g_dbus_object_manager_server_unexport(endpoint->mpRoot, endpoint->mpAdvPath);
-    endpoint->mIsAdvertising = false;
-    isSuccess                = true;
-exit:
-
-    return isSuccess ? TRUE : FALSE;
-}
-
-static BluezLEAdvertisement1 * BluezAdvertisingCreate(BluezEndpoint * apEndpoint)
-{
-    BluezLEAdvertisement1 * adv = nullptr;
-    BluezObjectSkeleton * object;
-    GVariant * serviceData;
-    GVariant * serviceUUID;
-    GAutoPtr<char> localName;
-    GVariantBuilder serviceDataBuilder;
-    GVariantBuilder serviceUUIDsBuilder;
-    GAutoPtr<char> debugStr;
-
-    VerifyOrExit(apEndpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    if (apEndpoint->mpAdvPath == nullptr)
-        apEndpoint->mpAdvPath = g_strdup_printf("%s/advertising", apEndpoint->mpRootPath);
-
-    ChipLogDetail(DeviceLayer, "Create adv object at %s", apEndpoint->mpAdvPath);
-    object = bluez_object_skeleton_new(apEndpoint->mpAdvPath);
-
-    adv = bluez_leadvertisement1_skeleton_new();
-
-    g_variant_builder_init(&serviceDataBuilder, G_VARIANT_TYPE("a{sv}"));
-    g_variant_builder_init(&serviceUUIDsBuilder, G_VARIANT_TYPE("as"));
-
-    g_variant_builder_add(&serviceDataBuilder, "{sv}", apEndpoint->mpAdvertisingUUID,
-                          g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, &apEndpoint->mDeviceIdInfo,
-                                                    sizeof(apEndpoint->mDeviceIdInfo), sizeof(uint8_t)));
-    g_variant_builder_add(&serviceUUIDsBuilder, "s", apEndpoint->mpAdvertisingUUID);
-
-    if (apEndpoint->mpAdapterName != nullptr)
-        localName = GAutoPtr<char>(g_strdup_printf("%s", apEndpoint->mpAdapterName));
-    else
-        localName = GAutoPtr<char>(g_strdup_printf("%s%04x", CHIP_DEVICE_CONFIG_BLE_DEVICE_NAME_PREFIX, getpid() & 0xffff));
-
-    serviceData = g_variant_builder_end(&serviceDataBuilder);
-    serviceUUID = g_variant_builder_end(&serviceUUIDsBuilder);
-
-    debugStr = GAutoPtr<char>(g_variant_print(serviceData, TRUE));
-    ChipLogDetail(DeviceLayer, "SET service data to %s", StringOrNullMarker(debugStr.get()));
-
-    bluez_leadvertisement1_set_type_(adv, (apEndpoint->mType & BLUEZ_ADV_TYPE_CONNECTABLE) ? "peripheral" : "broadcast");
-    // empty manufacturer data
-    // empty solicit UUIDs
-    bluez_leadvertisement1_set_service_data(adv, serviceData);
-    // empty data
-
-    // Setting "Discoverable" to False on the adapter and to True on the advertisement convinces
-    // Bluez to set "BR/EDR Not Supported" flag. Bluez doesn't provide API to do that explicitly
-    // and the flag is necessary to force using LE transport.
-    bluez_leadvertisement1_set_discoverable(adv, (apEndpoint->mType & BLUEZ_ADV_TYPE_SCANNABLE) ? TRUE : FALSE);
-    if (apEndpoint->mType & BLUEZ_ADV_TYPE_SCANNABLE)
-        bluez_leadvertisement1_set_discoverable_timeout(adv, UINT16_MAX);
-
-    // advertising name corresponding to the PID and object path, for debug purposes
-    bluez_leadvertisement1_set_local_name(adv, localName.get());
-    bluez_leadvertisement1_set_service_uuids(adv, serviceUUID);
-
-    // 0xffff means no appearance
-    bluez_leadvertisement1_set_appearance(adv, 0xffff);
-
-    bluez_leadvertisement1_set_duration(adv, apEndpoint->mDuration);
-    // empty duration, we don't have a clear notion what it would mean to timeslice between toble and anyone else
-    bluez_leadvertisement1_set_timeout(adv, 0);
-    // empty secondary channel for now
-
-    bluez_object_skeleton_set_leadvertisement1(object, adv);
-    g_signal_connect(adv, "handle-release", G_CALLBACK(BluezAdvertisingRelease), apEndpoint);
-
-    g_dbus_object_manager_server_export(apEndpoint->mpRoot, G_DBUS_OBJECT_SKELETON(object));
-    g_object_unref(object);
-
-    BLEManagerImpl::NotifyBLEPeripheralAdvConfiguredComplete(true, nullptr);
-
-exit:
-    return adv;
-}
-
-static void BluezAdvStartDone(GObject * aObject, GAsyncResult * aResult, gpointer apClosure)
-{
-    BluezLEAdvertisingManager1 * advMgr = BLUEZ_LEADVERTISING_MANAGER1(aObject);
-    GAutoPtr<GError> error;
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    gboolean success         = FALSE;
-
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    success =
-        bluez_leadvertising_manager1_call_register_advertisement_finish(advMgr, aResult, &MakeUniquePointerReceiver(error).Get());
-    if (success == FALSE)
-    {
-        g_dbus_object_manager_server_unexport(endpoint->mpRoot, endpoint->mpAdvPath);
-    }
-    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: RegisterAdvertisement : %s", error->message));
-
-    endpoint->mIsAdvertising = true;
-
-    ChipLogDetail(DeviceLayer, "RegisterAdvertisement complete");
-
-exit:
-    BLEManagerImpl::NotifyBLEPeripheralAdvStartComplete(success == TRUE, nullptr);
-}
-
-static void BluezAdvStopDone(GObject * aObject, GAsyncResult * aResult, gpointer apClosure)
-{
-    BluezLEAdvertisingManager1 * advMgr = BLUEZ_LEADVERTISING_MANAGER1(aObject);
-    BluezEndpoint * endpoint            = static_cast<BluezEndpoint *>(apClosure);
-    GAutoPtr<GError> error;
-    gboolean success = FALSE;
-
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    success =
-        bluez_leadvertising_manager1_call_unregister_advertisement_finish(advMgr, aResult, &MakeUniquePointerReceiver(error).Get());
-
-    if (success == FALSE)
-    {
-        g_dbus_object_manager_server_unexport(endpoint->mpRoot, endpoint->mpAdvPath);
-    }
-    else
-    {
-        endpoint->mIsAdvertising = false;
-    }
-
-    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: UnregisterAdvertisement : %s", error->message));
-
-    ChipLogDetail(DeviceLayer, "UnregisterAdvertisement complete");
-
-exit:
-    BLEManagerImpl::NotifyBLEPeripheralAdvStopComplete(success == TRUE, nullptr);
-}
-
-static CHIP_ERROR BluezAdvSetup(BluezEndpoint * endpoint)
-{
-    BluezLEAdvertisement1 * adv;
-
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    VerifyOrExit(endpoint->mIsAdvertising == FALSE, ChipLogError(DeviceLayer, "FAIL: Advertising already enabled in %s", __func__));
-    VerifyOrExit(endpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL endpoint->mpAdapter in %s", __func__));
-
-    adv = BluezAdvertisingCreate(endpoint);
-    VerifyOrExit(adv != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adv in %s", __func__));
-
-exit:
-    return CHIP_NO_ERROR;
-}
-
-static CHIP_ERROR BluezAdvStart(BluezEndpoint * endpoint)
-{
-    GDBusObject * adapter;
-    BluezLEAdvertisingManager1 * advMgr = nullptr;
-    GVariantBuilder optionsBuilder;
-    GVariant * options;
-
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    VerifyOrExit(!endpoint->mIsAdvertising,
-                 ChipLogError(DeviceLayer, "FAIL: Advertising has already been enabled in %s", __func__));
-    VerifyOrExit(endpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL endpoint->mpAdapter in %s", __func__));
-
-    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(endpoint->mpAdapter));
-    VerifyOrExit(adapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adapter in %s", __func__));
-
-    advMgr = bluez_object_get_leadvertising_manager1(BLUEZ_OBJECT(adapter));
-    VerifyOrExit(advMgr != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL advMgr in %s", __func__));
-
-    g_variant_builder_init(&optionsBuilder, G_VARIANT_TYPE("a{sv}"));
-    options = g_variant_builder_end(&optionsBuilder);
-
-    bluez_leadvertising_manager1_call_register_advertisement(advMgr, endpoint->mpAdvPath, options, nullptr, BluezAdvStartDone,
-                                                             endpoint);
-
-exit:
-    return CHIP_NO_ERROR;
-}
-
-static CHIP_ERROR BluezAdvStop(BluezEndpoint * endpoint)
-{
-    GDBusObject * adapter;
-    BluezLEAdvertisingManager1 * advMgr = nullptr;
-
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    VerifyOrExit(endpoint->mIsAdvertising,
-                 ChipLogError(DeviceLayer, "FAIL: Advertising has already been disabled in %s", __func__));
-    VerifyOrExit(endpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL endpoint->mpAdapter in %s", __func__));
-
-    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(endpoint->mpAdapter));
-    VerifyOrExit(adapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adapter in %s", __func__));
-
-    advMgr = bluez_object_get_leadvertising_manager1(BLUEZ_OBJECT(adapter));
-    VerifyOrExit(advMgr != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL advMgr in %s", __func__));
-
-    bluez_leadvertising_manager1_call_unregister_advertisement(advMgr, endpoint->mpAdvPath, nullptr, BluezAdvStopDone, endpoint);
-
-exit:
-    return CHIP_NO_ERROR;
-}
-
-static gboolean BluezCharacteristicReadValue(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                             GVariant * aOptions)
+gboolean BluezEndpoint::BluezCharacteristicReadValue(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
+                                                     GVariant * aOptions)
 {
-    GVariant * val;
-    ChipLogDetail(DeviceLayer, "Received BluezCharacteristicReadValue");
-    val = bluez_gatt_characteristic1_get_value(aChar);
+    ChipLogDetail(DeviceLayer, "Received %s", __func__);
+    GVariant * val = bluez_gatt_characteristic1_get_value(aChar);
     bluez_gatt_characteristic1_complete_read_value(aChar, aInvocation, val);
     return TRUE;
 }
 
-static gboolean BluezCharacteristicWriteValueError(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                                   GVariant * aValue, GVariant * aOptions, gpointer apClosure)
-{
-    ChipLogDetail(DeviceLayer, "BluezCharacteristicWriteValueError");
-    g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.NotSupported",
-                                               "Write for characteristic is unsupported");
-    return TRUE;
-}
-
 static void Bluez_gatt_characteristic1_complete_acquire_write_with_fd(GDBusMethodInvocation * invocation, int fd, guint16 mtu)
 {
     GUnixFDList * fd_list = g_unix_fd_list_new();
@@ -320,8 +97,8 @@ static void Bluez_gatt_characteristic1_complete_acquire_write_with_fd(GDBusMetho
     g_object_unref(fd_list);
 }
 
-static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                                GVariant * aOptions, gpointer apEndpoint)
+gboolean BluezEndpoint::BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
+                                                        GVariant * aOptions)
 {
     int fds[2] = { -1, -1 };
 #if CHIP_ERROR_LOGGING
@@ -331,14 +108,10 @@ static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar
     GAutoPtr<GVariant> option_mtu;
     uint16_t mtu;
 
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
-
-    VerifyOrReturnValue(endpoint != nullptr, FALSE, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    conn = GetBluezConnectionViaDevice(endpoint);
+    conn = GetBluezConnectionViaDevice();
     VerifyOrReturnValue(
         conn != nullptr, FALSE,
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No Chipoble connection"));
+        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No CHIPoBLE connection"));
 
     ChipLogDetail(DeviceLayer, "BluezCharacteristicAcquireWrite is called, conn: %p", conn);
 
@@ -369,14 +142,14 @@ static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar
 static gboolean BluezCharacteristicAcquireWriteError(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
                                                      GVariant * aOptions)
 {
-    ChipLogDetail(DeviceLayer, "BluezCharacteristicAcquireWriteError is called");
+    ChipLogDetail(DeviceLayer, "Received %s", __func__);
     g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.NotSupported",
                                                "AcquireWrite for characteristic is unsupported");
     return TRUE;
 }
 
-static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                                 GVariant * aOptions, gpointer apEndpoint)
+gboolean BluezEndpoint::BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
+                                                         GVariant * aOptions)
 {
     int fds[2] = { -1, -1 };
 #if CHIP_ERROR_LOGGING
@@ -387,11 +160,8 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
     GAutoPtr<GVariant> option_mtu;
     uint16_t mtu;
 
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
-    VerifyOrReturnValue(endpoint != nullptr, FALSE, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
-    isAdditionalAdvertising = (aChar == endpoint->mpC3);
+    isAdditionalAdvertising = (aChar == mpC3);
 #endif
 
     if (bluez_gatt_characteristic1_get_notifying(aChar))
@@ -400,10 +170,10 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
         return FALSE;
     }
 
-    conn = GetBluezConnectionViaDevice(endpoint);
+    conn = GetBluezConnectionViaDevice();
     VerifyOrReturnValue(
         conn != nullptr, FALSE,
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No Chipoble connection"));
+        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No CHIPoBLE connection"));
 
     VerifyOrReturnValue(
         g_variant_lookup(aOptions, "mtu", "q", &mtu), FALSE, ChipLogError(DeviceLayer, "FAIL: No MTU in options in %s", __func__);
@@ -436,95 +206,17 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
 static gboolean BluezCharacteristicAcquireNotifyError(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
                                                       GVariant * aOptions)
 {
-    ChipLogDetail(DeviceLayer, "TRACE: AcquireNotify is called");
+    ChipLogDetail(DeviceLayer, "Received %s", __func__);
     g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.NotSupported",
                                                "AcquireNotify for characteristic is unsupported");
     return TRUE;
 }
 
-static gboolean BluezCharacteristicStartNotify(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                               gpointer apEndpoint)
+gboolean BluezEndpoint::BluezCharacteristicConfirm(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation)
 {
-    bool isSuccess         = false;
-    BluezConnection * conn = nullptr;
-
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    conn = GetBluezConnectionViaDevice(endpoint);
-    VerifyOrExit(conn != nullptr,
-                 g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No Chipoble connection"));
-
-    if (bluez_gatt_characteristic1_get_notifying(aChar) == TRUE)
-    {
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "Characteristic is already subscribed");
-    }
-    else
-    {
-        bluez_gatt_characteristic1_complete_start_notify(aChar, aInvocation);
-        bluez_gatt_characteristic1_set_notifying(aChar, TRUE);
-        conn->SetNotifyAcquired(true);
-        BLEManagerImpl::HandleTXCharCCCDWrite(conn);
-    }
-    isSuccess = true;
-
-exit:
-    return isSuccess ? TRUE : FALSE;
-}
-
-static gboolean BluezCharacteristicStartNotifyError(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation)
-{
-    g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.NotSupported",
-                                               "Subscribing to characteristic is unsupported");
-    return TRUE;
-}
-
-static gboolean BluezCharacteristicStopNotify(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                              gpointer apEndpoint)
-{
-    bool isSuccess         = false;
-    BluezConnection * conn = nullptr;
-
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    conn = GetBluezConnectionViaDevice(endpoint);
-    VerifyOrExit(conn != nullptr,
-                 g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No Chipoble connection"));
-
-    if (bluez_gatt_characteristic1_get_notifying(aChar) == FALSE)
-    {
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "Characteristic is already unsubscribed");
-    }
-    else
-    {
-        bluez_gatt_characteristic1_complete_start_notify(aChar, aInvocation);
-        bluez_gatt_characteristic1_set_notifying(aChar, FALSE);
-    }
-    conn->SetNotifyAcquired(false);
-
-    isSuccess = true;
-
-exit:
-    return isSuccess ? TRUE : FALSE;
-}
-
-static gboolean BluezCharacteristicConfirm(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                           gpointer apClosure)
-{
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    BluezConnection * conn   = GetBluezConnectionViaDevice(endpoint);
-
+    BluezConnection * conn = GetBluezConnectionViaDevice();
     ChipLogDetail(Ble, "Indication confirmation, %p", conn);
     BLEManagerImpl::HandleTXComplete(conn);
-
-    return TRUE;
-}
-
-static gboolean BluezCharacteristicStopNotifyError(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation)
-{
-    g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed",
-                                               "Unsubscribing from characteristic is unsupported");
     return TRUE;
 }
 
@@ -539,31 +231,34 @@ static gboolean BluezIsDeviceOnAdapter(BluezDevice1 * aDevice, BluezAdapter1 * a
     return strcmp(bluez_device1_get_adapter(aDevice), g_dbus_proxy_get_object_path(G_DBUS_PROXY(aAdapter))) == 0 ? TRUE : FALSE;
 }
 
-static BluezGattCharacteristic1 * BluezCharacteristicCreate(BluezGattService1 * aService, const char * aCharName,
-                                                            const char * aUUID, GDBusObjectManagerServer * aRoot)
+BluezGattCharacteristic1 * BluezEndpoint::CreateGattCharacteristic(BluezGattService1 * aService, const char * aCharName,
+                                                                   const char * aUUID, const char * const * aFlags)
 {
     const char * servicePath = g_dbus_object_get_object_path(g_dbus_interface_get_object(G_DBUS_INTERFACE(aService)));
-    char * charPath          = g_strdup_printf("%s/%s", servicePath, aCharName);
+    GAutoPtr<char> charPath(g_strdup_printf("%s/%s", servicePath, aCharName));
     BluezObjectSkeleton * object;
     BluezGattCharacteristic1 * characteristic;
 
-    ChipLogDetail(DeviceLayer, "Create characteristic object at %s", charPath);
-    object = bluez_object_skeleton_new(charPath);
+    ChipLogDetail(DeviceLayer, "Create characteristic object at %s", charPath.get());
+    object = bluez_object_skeleton_new(charPath.get());
 
     characteristic = bluez_gatt_characteristic1_skeleton_new();
     bluez_gatt_characteristic1_set_uuid(characteristic, aUUID);
+    bluez_gatt_characteristic1_set_flags(characteristic, aFlags);
     bluez_gatt_characteristic1_set_service(characteristic, servicePath);
 
-    bluez_object_skeleton_set_gatt_characteristic1(object, characteristic);
-    g_dbus_object_manager_server_export(aRoot, G_DBUS_OBJECT_SKELETON(object));
+    // Initialize value to empty array, so it can be read without prior write from the client side.
+    auto value = g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, nullptr, 0, sizeof(uint8_t));
+    bluez_gatt_characteristic1_set_value(characteristic, value);
 
-    g_free(charPath);
+    bluez_object_skeleton_set_gatt_characteristic1(object, characteristic);
+    g_dbus_object_manager_server_export(mpRoot, G_DBUS_OBJECT_SKELETON(object));
     g_object_unref(object);
 
     return characteristic;
 }
 
-static void BluezPeripheralRegisterAppDone(GObject * aObject, GAsyncResult * aResult, gpointer apClosure)
+void BluezEndpoint::RegisterGattApplicationDone(GObject * aObject, GAsyncResult * aResult)
 {
     GAutoPtr<GError> error;
     BluezGattManager1 * gattMgr = BLUEZ_GATT_MANAGER1(aObject);
@@ -580,16 +275,16 @@ static void BluezPeripheralRegisterAppDone(GObject * aObject, GAsyncResult * aRe
     ChipLogDetail(DeviceLayer, "BluezPeripheralRegisterAppDone done");
 }
 
-static CHIP_ERROR BluezPeripheralRegisterApp(BluezEndpoint * endpoint)
+CHIP_ERROR BluezEndpoint::RegisterGattApplicationImpl()
 {
     GDBusObject * adapter;
     BluezGattManager1 * gattMgr;
     GVariantBuilder optionsBuilder;
     GVariant * options;
 
-    VerifyOrExit(endpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL endpoint->mpAdapter in %s", __func__));
+    VerifyOrExit(mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL mpAdapter in %s", __func__));
 
-    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(endpoint->mpAdapter));
+    adapter = g_dbus_interface_get_object(G_DBUS_INTERFACE(mpAdapter));
     VerifyOrExit(adapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL adapter in %s", __func__));
 
     gattMgr = bluez_object_get_gatt_manager1(BLUEZ_OBJECT(adapter));
@@ -598,71 +293,69 @@ static CHIP_ERROR BluezPeripheralRegisterApp(BluezEndpoint * endpoint)
     g_variant_builder_init(&optionsBuilder, G_VARIANT_TYPE("a{sv}"));
     options = g_variant_builder_end(&optionsBuilder);
 
-    bluez_gatt_manager1_call_register_application(gattMgr, endpoint->mpRootPath, options, nullptr, BluezPeripheralRegisterAppDone,
-                                                  nullptr);
+    bluez_gatt_manager1_call_register_application(
+        gattMgr, mpRootPath, options, nullptr,
+        +[](GObject * aObj, GAsyncResult * aResult, void * self) {
+            reinterpret_cast<BluezEndpoint *>(self)->RegisterGattApplicationDone(aObj, aResult);
+        },
+        this);
 
 exit:
     return CHIP_NO_ERROR;
 }
 
 /// Update the table of open BLE connections whenever a new device is spotted or its attributes have changed.
-static void UpdateConnectionTable(BluezDevice1 * apDevice, BluezEndpoint & aEndpoint)
+void BluezEndpoint::UpdateConnectionTable(BluezDevice1 * apDevice)
 {
     const char * objectPath      = g_dbus_proxy_get_object_path(G_DBUS_PROXY(apDevice));
-    BluezConnection * connection = static_cast<BluezConnection *>(g_hash_table_lookup(aEndpoint.mpConnMap, objectPath));
+    BluezConnection * connection = GetBluezConnection(objectPath);
 
     if (connection != nullptr && !bluez_device1_get_connected(apDevice))
     {
         ChipLogDetail(DeviceLayer, "Bluez disconnected");
         BLEManagerImpl::CHIPoBluez_ConnectionClosed(connection);
+        mConnMap.erase(objectPath);
         // TODO: the connection object should be released after BLEManagerImpl finishes cleaning up its resources
         // after the disconnection. Releasing it here doesn't cause any issues, but it's error-prone.
         chip::Platform::Delete(connection);
-        g_hash_table_remove(aEndpoint.mpConnMap, objectPath);
         return;
     }
 
-    if (connection == nullptr && !bluez_device1_get_connected(apDevice) && aEndpoint.mIsCentral)
+    if (connection == nullptr && !bluez_device1_get_connected(apDevice) && mIsCentral)
     {
         return;
     }
 
     if (connection == nullptr && bluez_device1_get_connected(apDevice) &&
-        (!aEndpoint.mIsCentral || bluez_device1_get_services_resolved(apDevice)))
+        (!mIsCentral || bluez_device1_get_services_resolved(apDevice)))
     {
-        connection                 = chip::Platform::New<BluezConnection>(&aEndpoint, apDevice);
-        aEndpoint.mpPeerDevicePath = g_strdup(objectPath);
-        g_hash_table_insert(aEndpoint.mpConnMap, aEndpoint.mpPeerDevicePath, connection);
+        connection                 = chip::Platform::New<BluezConnection>(*this, apDevice);
+        mpPeerDevicePath           = g_strdup(objectPath);
+        mConnMap[mpPeerDevicePath] = connection;
 
         ChipLogDetail(DeviceLayer, "New BLE connection: conn %p, device %s, path %s", connection, connection->GetPeerAddress(),
-                      aEndpoint.mpPeerDevicePath);
+                      mpPeerDevicePath);
 
         BLEManagerImpl::HandleNewConnection(connection);
     }
 }
 
-static void BluezSignalInterfacePropertiesChanged(GDBusObjectManagerClient * aManager, GDBusObjectProxy * aObject,
-                                                  GDBusProxy * aInterface, GVariant * aChangedProperties,
-                                                  const gchar * const * aInvalidatedProps, gpointer apClosure)
+void BluezEndpoint::BluezSignalInterfacePropertiesChanged(GDBusObjectManagerClient * aManager, GDBusObjectProxy * aObject,
+                                                          GDBusProxy * aInterface, GVariant * aChangedProperties,
+                                                          const char * const * aInvalidatedProps)
 {
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    VerifyOrReturn(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    VerifyOrReturn(endpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL endpoint->mpAdapter in %s", __func__));
+    VerifyOrReturn(mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL mpAdapter in %s", __func__));
     VerifyOrReturn(strcmp(g_dbus_proxy_get_interface_name(aInterface), DEVICE_INTERFACE) == 0, );
 
     BluezDevice1 * device = BLUEZ_DEVICE1(aInterface);
-    VerifyOrReturn(BluezIsDeviceOnAdapter(device, endpoint->mpAdapter));
+    VerifyOrReturn(BluezIsDeviceOnAdapter(device, mpAdapter));
 
-    UpdateConnectionTable(device, *endpoint);
+    UpdateConnectionTable(device);
 }
 
-static void BluezHandleNewDevice(BluezDevice1 * device, BluezEndpoint * apEndpoint)
+void BluezEndpoint::HandleNewDevice(BluezDevice1 * device)
 {
-    VerifyOrExit(apEndpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-    if (apEndpoint->mIsCentral)
-    {
-        return;
-    }
+    VerifyOrReturn(!mIsCentral);
 
     // We need to handle device connection both this function and BluezSignalInterfacePropertiesChanged
     // When a device is connected for first time, this function will be triggered.
@@ -671,194 +364,126 @@ static void BluezHandleNewDevice(BluezDevice1 * device, BluezEndpoint * apEndpoi
     BluezConnection * conn;
     VerifyOrExit(bluez_device1_get_connected(device), ChipLogError(DeviceLayer, "FAIL: device is not connected"));
 
-    conn = static_cast<BluezConnection *>(
-        g_hash_table_lookup(apEndpoint->mpConnMap, g_dbus_proxy_get_object_path(G_DBUS_PROXY(device))));
+    conn = GetBluezConnection(g_dbus_proxy_get_object_path(G_DBUS_PROXY(device)));
     VerifyOrExit(conn == nullptr,
                  ChipLogError(DeviceLayer, "FAIL: connection already tracked: conn: %p new device: %s", conn,
                               g_dbus_proxy_get_object_path(G_DBUS_PROXY(device))));
 
-    conn                         = chip::Platform::New<BluezConnection>(apEndpoint, device);
-    apEndpoint->mpPeerDevicePath = g_strdup(g_dbus_proxy_get_object_path(G_DBUS_PROXY(device)));
-    g_hash_table_insert(apEndpoint->mpConnMap, apEndpoint->mpPeerDevicePath, conn);
+    conn                       = chip::Platform::New<BluezConnection>(*this, device);
+    mpPeerDevicePath           = g_strdup(g_dbus_proxy_get_object_path(G_DBUS_PROXY(device)));
+    mConnMap[mpPeerDevicePath] = conn;
 
-    ChipLogDetail(DeviceLayer, "BLE device connected: conn %p, device %s, path %s", conn, conn->GetPeerAddress(),
-                  apEndpoint->mpPeerDevicePath);
+    ChipLogDetail(DeviceLayer, "BLE device connected: conn %p, device %s, path %s", conn, conn->GetPeerAddress(), mpPeerDevicePath);
 
 exit:
     return;
 }
 
-static void BluezSignalOnObjectAdded(GDBusObjectManager * aManager, GDBusObject * aObject, BluezEndpoint * endpoint)
+void BluezEndpoint::BluezSignalOnObjectAdded(GDBusObjectManager * aManager, GDBusObject * aObject)
 {
     // TODO: right now we do not handle addition/removal of adapters
     // Primary focus here is to handle addition of a device
     GAutoPtr<BluezDevice1> device(bluez_object_get_device1(BLUEZ_OBJECT(aObject)));
-
     VerifyOrReturn(device.get() != nullptr);
 
-    if (BluezIsDeviceOnAdapter(device.get(), endpoint->mpAdapter) == TRUE)
+    if (BluezIsDeviceOnAdapter(device.get(), mpAdapter) == TRUE)
     {
-        BluezHandleNewDevice(device.get(), endpoint);
+        HandleNewDevice(device.get());
     }
 }
 
-static void BluezSignalOnObjectRemoved(GDBusObjectManager * aManager, GDBusObject * aObject, gpointer apClosure)
+void BluezEndpoint::BluezSignalOnObjectRemoved(GDBusObjectManager * aManager, GDBusObject * aObject)
 {
     // TODO: for Device1, lookup connection, and call otPlatTobleHandleDisconnected
-    // for Adapter1: unclear, crash if this pertains to our adapter? at least null out the endpoint->mpAdapter.
+    // for Adapter1: unclear, crash if this pertains to our adapter? at least null out the self->mpAdapter.
     // for Characteristic1, or GattService -- handle here via calling otPlatTobleHandleDisconnected, or ignore.
 }
 
-static BluezGattService1 * BluezServiceCreate(BluezEndpoint * endpoint)
+BluezGattService1 * BluezEndpoint::CreateGattService(const char * aUUID)
 {
     BluezObjectSkeleton * object;
     BluezGattService1 * service;
 
-    endpoint->mpServicePath = g_strdup_printf("%s/service", endpoint->mpRootPath);
-    ChipLogDetail(DeviceLayer, "CREATE service object at %s", endpoint->mpServicePath);
-    object = bluez_object_skeleton_new(endpoint->mpServicePath);
+    mpServicePath = g_strdup_printf("%s/service", mpRootPath);
+    ChipLogDetail(DeviceLayer, "CREATE service object at %s", mpServicePath);
+    object = bluez_object_skeleton_new(mpServicePath);
 
     service = bluez_gatt_service1_skeleton_new();
-    bluez_gatt_service1_set_uuid(service, "0xFFF6");
+    bluez_gatt_service1_set_uuid(service, aUUID);
     // device is only valid for remote services
     bluez_gatt_service1_set_primary(service, TRUE);
 
     // includes -- unclear whether required.  Might be filled in later
     bluez_object_skeleton_set_gatt_service1(object, service);
-    g_dbus_object_manager_server_export(endpoint->mpRoot, G_DBUS_OBJECT_SKELETON(object));
+    g_dbus_object_manager_server_export(mpRoot, G_DBUS_OBJECT_SKELETON(object));
     g_object_unref(object);
 
     return service;
 }
 
-static void bluezObjectsSetup(BluezEndpoint * apEndpoint)
+void BluezEndpoint::SetupAdapter()
 {
-    GList * objects = nullptr;
-    GList * l;
-    char * expectedPath = nullptr;
-
-    VerifyOrExit(apEndpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
+    char expectedPath[32];
+    snprintf(expectedPath, sizeof(expectedPath), BLUEZ_PATH "/hci%u", mAdapterId);
 
-    expectedPath = g_strdup_printf("%s/hci%d", BLUEZ_PATH, apEndpoint->mAdapterId);
-    objects      = g_dbus_object_manager_get_objects(apEndpoint->mpObjMgr);
-
-    for (l = objects; l != nullptr && apEndpoint->mpAdapter == nullptr; l = l->next)
+    GList * objects = g_dbus_object_manager_get_objects(mpObjMgr);
+    for (auto l = objects; l != nullptr && mpAdapter == nullptr; l = l->next)
     {
         BluezObject * object = BLUEZ_OBJECT(l->data);
-        GList * interfaces;
-        GList * ll;
-        interfaces = g_dbus_object_get_interfaces(G_DBUS_OBJECT(object));
 
-        for (ll = interfaces; ll != nullptr; ll = ll->next)
+        GList * interfaces = g_dbus_object_get_interfaces(G_DBUS_OBJECT(object));
+        for (auto ll = interfaces; ll != nullptr; ll = ll->next)
         {
             if (BLUEZ_IS_ADAPTER1(ll->data))
             { // we found the adapter
                 BluezAdapter1 * adapter = BLUEZ_ADAPTER1(ll->data);
-                char * addr             = const_cast<char *>(bluez_adapter1_get_address(adapter));
-                if (apEndpoint->mpAdapterAddr == nullptr) // no adapter address provided, bind to the hci indicated by nodeid
+                if (mpAdapterAddr == nullptr) // no adapter address provided, bind to the hci indicated by nodeid
                 {
                     if (strcmp(g_dbus_proxy_get_object_path(G_DBUS_PROXY(adapter)), expectedPath) == 0)
                     {
-                        apEndpoint->mpAdapter = static_cast<BluezAdapter1 *>(g_object_ref(adapter));
+                        mpAdapter = static_cast<BluezAdapter1 *>(g_object_ref(adapter));
                     }
                 }
                 else
                 {
-                    if (strcmp(apEndpoint->mpAdapterAddr, addr) == 0)
+                    if (strcmp(bluez_adapter1_get_address(adapter), mpAdapterAddr) == 0)
                     {
-                        apEndpoint->mpAdapter = static_cast<BluezAdapter1 *>(g_object_ref(adapter));
+                        mpAdapter = static_cast<BluezAdapter1 *>(g_object_ref(adapter));
                     }
                 }
             }
         }
         g_list_free_full(interfaces, g_object_unref);
     }
-    VerifyOrExit(apEndpoint->mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL apEndpoint->mpAdapter in %s", __func__));
-    bluez_adapter1_set_powered(apEndpoint->mpAdapter, TRUE);
+
+    VerifyOrExit(mpAdapter != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL mpAdapter in %s", __func__));
+
+    bluez_adapter1_set_powered(mpAdapter, TRUE);
 
     // Setting "Discoverable" to False on the adapter and to True on the advertisement convinces
     // Bluez to set "BR/EDR Not Supported" flag. Bluez doesn't provide API to do that explicitly
     // and the flag is necessary to force using LE transport.
-    bluez_adapter1_set_discoverable(apEndpoint->mpAdapter, FALSE);
+    bluez_adapter1_set_discoverable(mpAdapter, FALSE);
 
 exit:
     g_list_free_full(objects, g_object_unref);
-    g_free(expectedPath);
 }
 
-static BluezConnection * GetBluezConnectionViaDevice(BluezEndpoint * apEndpoint)
+BluezConnection * BluezEndpoint::GetBluezConnection(const char * aPath)
 {
-    BluezConnection * retval =
-        static_cast<BluezConnection *>(g_hash_table_lookup(apEndpoint->mpConnMap, apEndpoint->mpPeerDevicePath));
-    // ChipLogError(DeviceLayer, "acquire connection object %p in (%s)", retval, __func__);
-    return retval;
+    auto it = mConnMap.find(aPath);
+    return (it != mConnMap.end()) ? it->second : nullptr;
 }
 
-static void EndpointCleanup(BluezEndpoint * apEndpoint)
+BluezConnection * BluezEndpoint::GetBluezConnectionViaDevice()
 {
-    if (apEndpoint != nullptr)
-    {
-        if (apEndpoint->mpOwningName != nullptr)
-        {
-            g_free(apEndpoint->mpOwningName);
-            apEndpoint->mpOwningName = nullptr;
-        }
-        if (apEndpoint->mpAdapterName != nullptr)
-        {
-            g_free(apEndpoint->mpAdapterName);
-            apEndpoint->mpAdapterName = nullptr;
-        }
-        if (apEndpoint->mpAdapterAddr != nullptr)
-        {
-            g_free(apEndpoint->mpAdapterAddr);
-            apEndpoint->mpAdapterAddr = nullptr;
-        }
-        if (apEndpoint->mpRootPath != nullptr)
-        {
-            g_free(apEndpoint->mpRootPath);
-            apEndpoint->mpRootPath = nullptr;
-        }
-        if (apEndpoint->mpAdvPath != nullptr)
-        {
-            g_free(apEndpoint->mpAdvPath);
-            apEndpoint->mpAdvPath = nullptr;
-        }
-        if (apEndpoint->mpServicePath != nullptr)
-        {
-            g_free(apEndpoint->mpServicePath);
-            apEndpoint->mpServicePath = nullptr;
-        }
-        if (apEndpoint->mpConnMap != nullptr)
-        {
-            g_hash_table_destroy(apEndpoint->mpConnMap);
-            apEndpoint->mpConnMap = nullptr;
-        }
-        if (apEndpoint->mpAdvertisingUUID != nullptr)
-        {
-            g_free(apEndpoint->mpAdvertisingUUID);
-            apEndpoint->mpAdvertisingUUID = nullptr;
-        }
-        if (apEndpoint->mpPeerDevicePath != nullptr)
-        {
-            g_free(apEndpoint->mpPeerDevicePath);
-            apEndpoint->mpPeerDevicePath = nullptr;
-        }
-        if (apEndpoint->mpConnectCancellable != nullptr)
-        {
-            g_object_unref(apEndpoint->mpConnectCancellable);
-            apEndpoint->mpConnectCancellable = nullptr;
-        }
-        g_free(apEndpoint);
-    }
+    return GetBluezConnection(mpPeerDevicePath);
 }
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
 static void UpdateAdditionalDataCharacteristic(BluezGattCharacteristic1 * characteristic)
 {
-    if (characteristic == nullptr)
-    {
-        return;
-    }
+    VerifyOrReturn(characteristic != nullptr);
 
     // Construct the TLV for the additional data
     GVariant * cValue = nullptr;
@@ -900,7 +525,7 @@ static void UpdateAdditionalDataCharacteristic(BluezGattCharacteristic1 * charac
 }
 #endif
 
-static void BluezPeripheralObjectsSetup(BluezEndpoint * endpoint)
+void BluezEndpoint::SetupGattService()
 {
 
     static const char * const c1_flags[] = { "write", nullptr };
@@ -909,239 +534,214 @@ static void BluezPeripheralObjectsSetup(BluezEndpoint * endpoint)
     static const char * const c3_flags[] = { "read", nullptr };
 #endif
 
-    endpoint->mpService = BluezServiceCreate(endpoint);
+    mpService = CreateGattService(CHIP_BLE_UUID_SERVICE_SHORT_STRING);
+
     // C1 characteristic
-    endpoint->mpC1 = BluezCharacteristicCreate(endpoint->mpService, "c1", CHIP_PLAT_BLE_UUID_C1_STRING, endpoint->mpRoot);
-    bluez_gatt_characteristic1_set_flags(endpoint->mpC1, c1_flags);
-
-    g_signal_connect(endpoint->mpC1, "handle-read-value", G_CALLBACK(BluezCharacteristicReadValue), endpoint);
-    g_signal_connect(endpoint->mpC1, "handle-write-value", G_CALLBACK(BluezCharacteristicWriteValueError), nullptr);
-    g_signal_connect(endpoint->mpC1, "handle-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWrite), endpoint);
-    g_signal_connect(endpoint->mpC1, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotifyError), nullptr);
-    g_signal_connect(endpoint->mpC1, "handle-start-notify", G_CALLBACK(BluezCharacteristicStartNotifyError), nullptr);
-    g_signal_connect(endpoint->mpC1, "handle-stop-notify", G_CALLBACK(BluezCharacteristicStopNotifyError), nullptr);
-    g_signal_connect(endpoint->mpC1, "handle-confirm", G_CALLBACK(BluezCharacteristicConfirmError), nullptr);
-
-    endpoint->mpC2 = BluezCharacteristicCreate(endpoint->mpService, "c2", CHIP_PLAT_BLE_UUID_C2_STRING, endpoint->mpRoot);
-    bluez_gatt_characteristic1_set_flags(endpoint->mpC2, c2_flags);
-    g_signal_connect(endpoint->mpC2, "handle-read-value", G_CALLBACK(BluezCharacteristicReadValue), endpoint);
-    g_signal_connect(endpoint->mpC2, "handle-write-value", G_CALLBACK(BluezCharacteristicWriteValueError), nullptr);
-    g_signal_connect(endpoint->mpC2, "handle-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
-    g_signal_connect(endpoint->mpC2, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotify), endpoint);
-    g_signal_connect(endpoint->mpC2, "handle-start-notify", G_CALLBACK(BluezCharacteristicStartNotify), endpoint);
-    g_signal_connect(endpoint->mpC2, "handle-stop-notify", G_CALLBACK(BluezCharacteristicStopNotify), endpoint);
-    g_signal_connect(endpoint->mpC2, "handle-confirm", G_CALLBACK(BluezCharacteristicConfirm), endpoint);
-
-    ChipLogDetail(DeviceLayer, "CHIP BTP C1 %s", bluez_gatt_characteristic1_get_service(endpoint->mpC1));
-    ChipLogDetail(DeviceLayer, "CHIP BTP C2 %s", bluez_gatt_characteristic1_get_service(endpoint->mpC2));
+    mpC1 = CreateGattCharacteristic(mpService, "c1", CHIP_PLAT_BLE_UUID_C1_STRING, c1_flags);
+    g_signal_connect(mpC1, "handle-read-value",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicReadValue(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC1, "handle-acquire-write",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicAcquireWrite(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC1, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotifyError), nullptr);
+    g_signal_connect(mpC1, "handle-confirm", G_CALLBACK(BluezCharacteristicConfirmError), nullptr);
+
+    // C2 characteristic
+    mpC2 = CreateGattCharacteristic(mpService, "c2", CHIP_PLAT_BLE_UUID_C2_STRING, c2_flags);
+    g_signal_connect(mpC2, "handle-read-value",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicReadValue(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC2, "handle-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
+    g_signal_connect(mpC2, "handle-acquire-notify",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicAcquireNotify(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC2, "handle-confirm",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, BluezEndpoint * self) {
+                         return self->BluezCharacteristicConfirm(aChar, aInv);
+                     }),
+                     this);
+
+    ChipLogDetail(DeviceLayer, "CHIP BTP C1 %s", bluez_gatt_characteristic1_get_service(mpC1));
+    ChipLogDetail(DeviceLayer, "CHIP BTP C2 %s", bluez_gatt_characteristic1_get_service(mpC2));
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
     ChipLogDetail(DeviceLayer, "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING is TRUE");
     // Additional data characteristics
-    endpoint->mpC3 = BluezCharacteristicCreate(endpoint->mpService, "c3", CHIP_PLAT_BLE_UUID_C3_STRING, endpoint->mpRoot);
-    bluez_gatt_characteristic1_set_flags(endpoint->mpC3, c3_flags);
-    g_signal_connect(endpoint->mpC3, "handle-read-value", G_CALLBACK(BluezCharacteristicReadValue), endpoint);
-    g_signal_connect(endpoint->mpC3, "handle-write-value", G_CALLBACK(BluezCharacteristicWriteValueError), nullptr);
-    g_signal_connect(endpoint->mpC3, "handle-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
-    g_signal_connect(endpoint->mpC3, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotify), endpoint);
-    g_signal_connect(endpoint->mpC3, "handle-start-notify", G_CALLBACK(BluezCharacteristicStartNotify), endpoint);
-    g_signal_connect(endpoint->mpC3, "handle-stop-notify", G_CALLBACK(BluezCharacteristicStopNotify), endpoint);
-    g_signal_connect(endpoint->mpC3, "handle-confirm", G_CALLBACK(BluezCharacteristicConfirm), endpoint);
+    mpC3 = CreateGattCharacteristic(mpService, "c3", CHIP_PLAT_BLE_UUID_C3_STRING, c3_flags);
+    g_signal_connect(mpC3, "handle-read-value",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicReadValue(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC3, "handle-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
+    g_signal_connect(mpC3, "handle-acquire-notify",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOpt,
+                                    BluezEndpoint * self) { return self->BluezCharacteristicAcquireNotify(aChar, aInv, aOpt); }),
+                     this);
+    g_signal_connect(mpC3, "handle-confirm",
+                     G_CALLBACK(+[](BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, BluezEndpoint * self) {
+                         return self->BluezCharacteristicConfirm(aChar, aInv);
+                     }),
+                     this);
+
     // update the characteristic value
-    UpdateAdditionalDataCharacteristic(endpoint->mpC3);
-    ChipLogDetail(DeviceLayer, "CHIP BTP C3 %s", bluez_gatt_characteristic1_get_service(endpoint->mpC3));
+    UpdateAdditionalDataCharacteristic(mpC3);
+    ChipLogDetail(DeviceLayer, "CHIP BTP C3 %s", bluez_gatt_characteristic1_get_service(mpC3));
 #else
     ChipLogDetail(DeviceLayer, "CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING is FALSE");
 #endif
 }
 
-static void BluezOnBusAcquired(GDBusConnection * aConn, const gchar * aName, gpointer apClosure)
+void BluezEndpoint::SetupGattServer(GDBusConnection * aConn)
 {
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
+    VerifyOrReturn(!mIsCentral);
 
-    ChipLogDetail(DeviceLayer, "TRACE: Bus acquired for name %s", aName);
+    mpRootPath = g_strdup_printf("/chipoble/%04x", getpid() & 0xffff);
+    mpRoot     = g_dbus_object_manager_server_new(mpRootPath);
 
-    if (!endpoint->mIsCentral)
-    {
-        endpoint->mpRootPath = g_strdup_printf("/chipoble/%04x", getpid() & 0xffff);
-        endpoint->mpRoot     = g_dbus_object_manager_server_new(endpoint->mpRootPath);
-        g_dbus_object_manager_server_set_connection(endpoint->mpRoot, aConn);
+    SetupGattService();
 
-        BluezPeripheralObjectsSetup(endpoint);
-    }
-
-exit:
-    return;
+    // Set connection after the service is set up in order to reduce the number
+    // of signals sent on the bus.
+    g_dbus_object_manager_server_set_connection(mpRoot, aConn);
 }
 
-static CHIP_ERROR StartupEndpointBindings(BluezEndpoint * endpoint)
+CHIP_ERROR BluezEndpoint::StartupEndpointBindings()
 {
-    VerifyOrReturnError(endpoint != nullptr, CHIP_ERROR_INVALID_ARGUMENT,
-                        ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
     GAutoPtr<GError> err;
     GAutoPtr<GDBusConnection> conn(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &MakeUniquePointerReceiver(err).Get()));
     VerifyOrReturnError(conn != nullptr, CHIP_ERROR_INTERNAL,
                         ChipLogError(DeviceLayer, "FAIL: get bus sync in %s, error: %s", __func__, err->message));
 
-    if (endpoint->mpAdapterName != nullptr)
-        endpoint->mpOwningName = g_strdup_printf("%s", endpoint->mpAdapterName);
+    if (mpAdapterName != nullptr)
+        mpOwningName = g_strdup_printf("%s", mpAdapterName);
     else
-        endpoint->mpOwningName = g_strdup_printf("C-%04x", getpid() & 0xffff);
+        mpOwningName = g_strdup_printf("C-%04x", getpid() & 0xffff);
+    ChipLogDetail(DeviceLayer, "TRACE: Bus acquired for name %s", mpOwningName);
 
-    BluezOnBusAcquired(conn.get(), endpoint->mpOwningName, endpoint);
+    SetupGattServer(conn.get());
 
-    GDBusObjectManager * manager = g_dbus_object_manager_client_new_sync(
+    mpObjMgr = g_dbus_object_manager_client_new_sync(
         conn.get(), G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, BLUEZ_INTERFACE, "/", bluez_object_manager_client_get_proxy_type,
         nullptr /* unused user data in the Proxy Type Func */, nullptr /*destroy notify */, nullptr /* cancellable */,
         &MakeUniquePointerReceiver(err).Get());
-    VerifyOrReturnError(manager != nullptr, CHIP_ERROR_INTERNAL,
+    VerifyOrReturnError(mpObjMgr != nullptr, CHIP_ERROR_INTERNAL,
                         ChipLogError(DeviceLayer, "FAIL: Error getting object manager client: %s", err->message));
 
-    endpoint->mpObjMgr = manager;
-    bluezObjectsSetup(endpoint);
-
-    g_signal_connect(manager, "object-added", G_CALLBACK(BluezSignalOnObjectAdded), endpoint);
-    g_signal_connect(manager, "object-removed", G_CALLBACK(BluezSignalOnObjectRemoved), endpoint);
-    g_signal_connect(manager, "interface-proxy-properties-changed", G_CALLBACK(BluezSignalInterfacePropertiesChanged), endpoint);
+    g_signal_connect(mpObjMgr, "object-added", G_CALLBACK(+[](GDBusObjectManager * aMgr, GDBusObject * aObj, BluezEndpoint * self) {
+                         return self->BluezSignalOnObjectAdded(aMgr, aObj);
+                     }),
+                     this);
+    g_signal_connect(mpObjMgr, "object-removed",
+                     G_CALLBACK(+[](GDBusObjectManager * aMgr, GDBusObject * aObj, BluezEndpoint * self) {
+                         return self->BluezSignalOnObjectRemoved(aMgr, aObj);
+                     }),
+                     this);
+    g_signal_connect(mpObjMgr, "interface-proxy-properties-changed",
+                     G_CALLBACK(+[](GDBusObjectManagerClient * aMgr, GDBusObjectProxy * aObj, GDBusProxy * aIface,
+                                    GVariant * aChangedProps, const char * const * aInvalidatedProps, BluezEndpoint * self) {
+                         return self->BluezSignalInterfacePropertiesChanged(aMgr, aObj, aIface, aChangedProps, aInvalidatedProps);
+                     }),
+                     this);
+
+    SetupAdapter();
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR StartBluezAdv(BluezEndpoint * apEndpoint)
-{
-    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(BluezAdvStart, apEndpoint);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
-                        ChipLogError(Ble, "Failed to schedule BluezAdvStart() on CHIPoBluez thread"));
-    return err;
-}
-
-CHIP_ERROR StopBluezAdv(BluezEndpoint * apEndpoint)
-{
-    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(BluezAdvStop, apEndpoint);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
-                        ChipLogError(Ble, "Failed to schedule BluezAdvStop() on CHIPoBluez thread"));
-    return err;
-}
-
-CHIP_ERROR BluezAdvertisementSetup(BluezEndpoint * apEndpoint)
-{
-    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(BluezAdvSetup, apEndpoint);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
-                        ChipLogError(Ble, "Failed to schedule BluezAdvSetup() on CHIPoBluez thread"));
-    return err;
-}
-
-CHIP_ERROR BluezGattsAppRegister(BluezEndpoint * apEndpoint)
+CHIP_ERROR BluezEndpoint::RegisterGattApplication()
 {
-    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(BluezPeripheralRegisterApp, apEndpoint);
+    CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezEndpoint * self) { return self->RegisterGattApplicationImpl(); }, this);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE,
-                        ChipLogError(Ble, "Failed to schedule BluezPeripheralRegisterApp() on CHIPoBluez thread"));
+                        ChipLogError(Ble, "Failed to schedule RegisterGattApplication() on CHIPoBluez thread"));
     return err;
 }
 
-static CHIP_ERROR ConfigureBluezAdv(const BLEAdvConfig & aBleAdvConfig, BluezEndpoint * apEndpoint)
+CHIP_ERROR BluezEndpoint::Init(uint32_t aAdapterId, bool aIsCentral, const char * apBleAddr, const char * apBleName)
 {
-    const char * msg = nullptr;
-    CHIP_ERROR err   = CHIP_NO_ERROR;
-    VerifyOrExit(aBleAdvConfig.mpBleName != nullptr, msg = "FAIL: BLE name is NULL");
-    VerifyOrExit(aBleAdvConfig.mpAdvertisingUUID != nullptr, msg = "FAIL: BLE mpAdvertisingUUID is NULL");
-
-    apEndpoint->mpAdapterName     = g_strdup(aBleAdvConfig.mpBleName);
-    apEndpoint->mpAdvertisingUUID = g_strdup(aBleAdvConfig.mpAdvertisingUUID);
-    apEndpoint->mAdapterId        = aBleAdvConfig.mAdapterId;
-    apEndpoint->mType             = aBleAdvConfig.mType;
-    apEndpoint->mDuration         = aBleAdvConfig.mDuration;
-    apEndpoint->mDuration         = aBleAdvConfig.mDuration;
-
-    err = ConfigurationMgr().GetBLEDeviceIdentificationInfo(apEndpoint->mDeviceIdInfo);
-    SuccessOrExit(err);
+    CHIP_ERROR err;
 
-#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
-    apEndpoint->mDeviceIdInfo.SetAdditionalDataFlag(true);
-#endif
-
-exit:
-    if (nullptr != msg)
-    {
-        ChipLogDetail(DeviceLayer, "%s in %s", msg, __func__);
-        err = CHIP_ERROR_INCORRECT_STATE;
-    }
-    return err;
-}
-
-CHIP_ERROR InitBluezBleLayer(bool aIsCentral, const char * apBleAddr, const BLEAdvConfig & aBleAdvConfig,
-                             BluezEndpoint *& apEndpoint)
-{
-    BluezEndpoint * endpoint = g_new0(BluezEndpoint, 1);
-    CHIP_ERROR err           = CHIP_NO_ERROR;
+    mAdapterId = aAdapterId;
+    mIsCentral = aIsCentral;
 
     if (apBleAddr != nullptr)
-        endpoint->mpAdapterAddr = g_strdup(apBleAddr);
-
-    endpoint->mpConnMap  = g_hash_table_new(g_str_hash, g_str_equal);
-    endpoint->mIsCentral = aIsCentral;
+        mpAdapterAddr = g_strdup(apBleAddr);
 
     if (!aIsCentral)
     {
-        err = ConfigureBluezAdv(aBleAdvConfig, endpoint);
-        SuccessOrExit(err);
+        mpAdapterName = g_strdup(apBleName);
     }
     else
     {
-        endpoint->mAdapterId           = aBleAdvConfig.mAdapterId;
-        endpoint->mpConnectCancellable = g_cancellable_new();
+        mpConnectCancellable = g_cancellable_new();
     }
 
-    err = PlatformMgrImpl().GLibMatterContextInvokeSync(StartupEndpointBindings, endpoint);
-    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "Failed to schedule endpoint initialization"));
+    err = PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezEndpoint * self) { return self->StartupEndpointBindings(); }, this);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err, ChipLogError(DeviceLayer, "Failed to schedule endpoint initialization"));
 
-exit:
-    if (err == CHIP_NO_ERROR)
-    {
-        apEndpoint = endpoint;
-        ChipLogDetail(DeviceLayer, "PlatformBlueZInit init success");
-    }
-    else
-    {
-        EndpointCleanup(endpoint);
-    }
+    ChipLogDetail(DeviceLayer, "BlueZ integration init success");
+    mIsInitialized = true;
 
-    return err;
+    return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ShutdownBluezBleLayer(BluezEndpoint * apEndpoint)
-{
-    VerifyOrReturnError(apEndpoint != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    g_object_unref(apEndpoint->mpAdapter);
-    EndpointCleanup(apEndpoint);
-    return CHIP_NO_ERROR;
+void BluezEndpoint::Shutdown()
+{
+    VerifyOrReturn(mIsInitialized);
+
+    // Run endpoint cleanup on the CHIPoBluez thread. This is necessary because the
+    // cleanup function releases the D-Bus manager client object, which handles D-Bus
+    // signals. Otherwise, we will face race condition when the D-Bus signal is in
+    // the middle of being processed when the cleanup function is called.
+    PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BluezEndpoint * self) {
+            if (self->mpObjMgr != nullptr)
+                g_object_unref(self->mpObjMgr);
+            if (self->mpAdapter != nullptr)
+                g_object_unref(self->mpAdapter);
+            if (self->mpDevice != nullptr)
+                g_object_unref(self->mpDevice);
+            if (self->mpRoot != nullptr)
+                g_object_unref(self->mpRoot);
+            if (self->mpService != nullptr)
+                g_object_unref(self->mpService);
+            if (self->mpC1 != nullptr)
+                g_object_unref(self->mpC1);
+            if (self->mpC2 != nullptr)
+                g_object_unref(self->mpC2);
+            if (self->mpC3 != nullptr)
+                g_object_unref(self->mpC3);
+            if (self->mpConnectCancellable != nullptr)
+                g_object_unref(self->mpConnectCancellable);
+            return CHIP_NO_ERROR;
+        },
+        this);
+
+    g_free(mpOwningName);
+    g_free(mpAdapterName);
+    g_free(mpAdapterAddr);
+    g_free(mpRootPath);
+    g_free(mpServicePath);
+    g_free(mpPeerDevicePath);
+
+    mIsInitialized = false;
 }
 
 // ConnectDevice callbacks
 
-struct ConnectParams
+void BluezEndpoint::ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointer apParams)
 {
-    ConnectParams(BluezDevice1 * device, BluezEndpoint * endpoint) :
-        mDevice(reinterpret_cast<BluezDevice1 *>(g_object_ref(device))), mEndpoint(endpoint), mNumRetries(0)
-    {}
-    ~ConnectParams() { g_object_unref(mDevice); }
-    BluezDevice1 * mDevice;
-    BluezEndpoint * mEndpoint;
-    uint16_t mNumRetries;
-};
-
-static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointer apParams)
-{
-    BluezDevice1 * device = BLUEZ_DEVICE1(aObject);
-    GAutoPtr<GError> error;
-    gboolean success       = bluez_device1_call_connect_finish(device, aResult, &MakeUniquePointerReceiver(error).Get());
+    BluezDevice1 * device  = BLUEZ_DEVICE1(aObject);
     ConnectParams * params = static_cast<ConnectParams *>(apParams);
+    GAutoPtr<GError> error;
 
-    assert(params != nullptr);
-
-    if (!success)
+    if (!bluez_device1_call_connect_finish(device, aResult, &MakeUniquePointerReceiver(error).Get()))
     {
         ChipLogError(DeviceLayer, "FAIL: ConnectDevice : %s (%d)", error->message, error->code);
 
@@ -1156,7 +756,7 @@ static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointe
             g_clear_error(&MakeUniquePointerReceiver(error).Get());
 
             bluez_device1_call_disconnect_sync(device, nullptr, &MakeUniquePointerReceiver(error).Get());
-            bluez_device1_call_connect(device, params->mEndpoint->mpConnectCancellable, ConnectDeviceDone, params);
+            bluez_device1_call_connect(device, params->mEndpoint.mpConnectCancellable, ConnectDeviceDone, params);
             return;
         }
 
@@ -1170,23 +770,16 @@ static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointe
     chip::Platform::Delete(params);
 }
 
-static CHIP_ERROR ConnectDeviceImpl(ConnectParams * apParams)
+CHIP_ERROR BluezEndpoint::ConnectDeviceImpl(ConnectParams * apParams)
 {
-    BluezDevice1 * device    = apParams->mDevice;
-    BluezEndpoint * endpoint = apParams->mEndpoint;
-
-    assert(device != nullptr);
-    assert(endpoint != nullptr);
-
-    g_cancellable_reset(endpoint->mpConnectCancellable);
-    bluez_device1_call_connect(device, endpoint->mpConnectCancellable, ConnectDeviceDone, apParams);
-
+    g_cancellable_reset(apParams->mEndpoint.mpConnectCancellable);
+    bluez_device1_call_connect(apParams->mpDevice, apParams->mEndpoint.mpConnectCancellable, ConnectDeviceDone, apParams);
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectDevice(BluezDevice1 & aDevice, BluezEndpoint * apEndpoint)
+CHIP_ERROR BluezEndpoint::ConnectDevice(BluezDevice1 & aDevice)
 {
-    auto params = chip::Platform::New<ConnectParams>(&aDevice, apEndpoint);
+    auto params = chip::Platform::New<ConnectParams>(*this, &aDevice);
     VerifyOrReturnError(params != nullptr, CHIP_ERROR_NO_MEMORY);
 
     if (PlatformMgrImpl().GLibMatterContextInvokeSync(ConnectDeviceImpl, params) != CHIP_NO_ERROR)
@@ -1199,10 +792,10 @@ CHIP_ERROR ConnectDevice(BluezDevice1 & aDevice, BluezEndpoint * apEndpoint)
     return CHIP_NO_ERROR;
 }
 
-void CancelConnect(BluezEndpoint * apEndpoint)
+void BluezEndpoint::CancelConnect()
 {
-    assert(apEndpoint->mpConnectCancellable != nullptr);
-    g_cancellable_cancel(apEndpoint->mpConnectCancellable);
+    VerifyOrDie(mpConnectCancellable != nullptr);
+    g_cancellable_cancel(mpConnectCancellable);
 }
 
 } // namespace Internal
diff --git a/src/platform/Linux/bluez/BluezEndpoint.h b/src/platform/Linux/bluez/BluezEndpoint.h
index 1500b55a370215..24b7ad140cde65 100644
--- a/src/platform/Linux/bluez/BluezEndpoint.h
+++ b/src/platform/Linux/bluez/BluezEndpoint.h
@@ -45,13 +45,16 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
+#include <string>
+#include <unordered_map>
 
 #include <gio/gio.h>
 #include <glib.h>
 
 #include <ble/CHIPBleServiceData.h>
 #include <lib/core/CHIPError.h>
+#include <platform/Linux/dbus/bluez/DbusBluez.h>
 
 #include "BluezConnection.h"
 #include "Types.h"
@@ -60,57 +63,102 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-struct BLEAdvConfig;
-
-struct BluezEndpoint
+class BluezEndpoint
 {
-    char * mpOwningName; // Bus owning name
+public:
+    BluezEndpoint()  = default;
+    ~BluezEndpoint() = default;
+
+    CHIP_ERROR Init(uint32_t aAdapterId, bool aIsCentral, const char * apBleAddr, const char * apBleName);
+    void Shutdown();
+
+    BluezAdapter1 * GetAdapter() const { return mpAdapter; }
+    const char * GetAdapterName() const { return mpAdapterName; }
+
+    CHIP_ERROR RegisterGattApplication();
+    GDBusObjectManagerServer * GetGattApplicationObjectManager() const { return mpRoot; }
+
+    CHIP_ERROR ConnectDevice(BluezDevice1 & aDevice);
+    void CancelConnect();
+
+private:
+    struct ConnectParams
+    {
+        ConnectParams(const BluezEndpoint & aEndpoint, BluezDevice1 * apDevice) : mEndpoint(aEndpoint), mpDevice(apDevice) {}
+        ~ConnectParams() = default;
+
+        const BluezEndpoint & mEndpoint;
+        BluezDevice1 * mpDevice;
+        uint16_t mNumRetries = 0;
+    };
+
+    CHIP_ERROR StartupEndpointBindings();
+
+    void SetupAdapter();
+    void SetupGattServer(GDBusConnection * aConn);
+    void SetupGattService();
+
+    BluezGattService1 * CreateGattService(const char * aUUID);
+    BluezGattCharacteristic1 * CreateGattCharacteristic(BluezGattService1 * aService, const char * aCharName, const char * aUUID,
+                                                        const char * const * aFlags);
+
+    void HandleNewDevice(BluezDevice1 * aDevice);
+    void UpdateConnectionTable(BluezDevice1 * aDevice);
+    BluezConnection * GetBluezConnection(const char * aPath);
+    BluezConnection * GetBluezConnectionViaDevice();
+
+    gboolean BluezCharacteristicReadValue(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOptions);
+    gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOptions);
+    gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv, GVariant * aOptions);
+    gboolean BluezCharacteristicConfirm(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInv);
+
+    void BluezSignalOnObjectAdded(GDBusObjectManager * aManager, GDBusObject * aObject);
+    void BluezSignalOnObjectRemoved(GDBusObjectManager * aManager, GDBusObject * aObject);
+    void BluezSignalInterfacePropertiesChanged(GDBusObjectManagerClient * aManager, GDBusObjectProxy * aObject,
+                                               GDBusProxy * aInterface, GVariant * aChangedProperties,
+                                               const char * const * aInvalidatedProps);
+
+    void RegisterGattApplicationDone(GObject * aObject, GAsyncResult * aResult);
+    CHIP_ERROR RegisterGattApplicationImpl();
+
+    static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointer apParams);
+    static CHIP_ERROR ConnectDeviceImpl(ConnectParams * apParams);
+
+    bool mIsCentral     = false;
+    bool mIsInitialized = false;
+
+    // Bus owning name
+    char * mpOwningName = nullptr;
 
     // Adapter properties
-    char * mpAdapterName;
-    char * mpAdapterAddr;
+    uint32_t mAdapterId  = 0;
+    char * mpAdapterName = nullptr;
+    char * mpAdapterAddr = nullptr;
 
     // Paths for objects published by this service
-    char * mpRootPath;
-    char * mpAdvPath;
-    char * mpServicePath;
+    char * mpRootPath    = nullptr;
+    char * mpServicePath = nullptr;
 
-    // Objects (interfaces) subscibed to by this service
+    // Objects (interfaces) subscribed to by this service
     GDBusObjectManager * mpObjMgr = nullptr;
     BluezAdapter1 * mpAdapter     = nullptr;
     BluezDevice1 * mpDevice       = nullptr;
 
     // Objects (interfaces) published by this service
-    GDBusObjectManagerServer * mpRoot;
-    BluezGattService1 * mpService;
-    BluezGattCharacteristic1 * mpC1;
-    BluezGattCharacteristic1 * mpC2;
+    GDBusObjectManagerServer * mpRoot = nullptr;
+    BluezGattService1 * mpService     = nullptr;
+    BluezGattCharacteristic1 * mpC1   = nullptr;
+    BluezGattCharacteristic1 * mpC2   = nullptr;
     // additional data characteristics
-    BluezGattCharacteristic1 * mpC3;
-
-    // map device path to the connection
-    GHashTable * mpConnMap;
-    uint32_t mAdapterId;
-    bool mIsCentral;
-    char * mpAdvertisingUUID;
-    chip::Ble::ChipBLEDeviceIdentificationInfo mDeviceIdInfo;
-    ChipAdvType mType;  ///< Advertisement type.
-    uint16_t mDuration; ///< Advertisement interval (in ms).
-    bool mIsAdvertising;
-    char * mpPeerDevicePath;
-    GCancellable * mpConnectCancellable = nullptr;
-};
+    BluezGattCharacteristic1 * mpC3 = nullptr;
 
-CHIP_ERROR InitBluezBleLayer(bool aIsCentral, const char * apBleAddr, const BLEAdvConfig & aBleAdvConfig,
-                             BluezEndpoint *& apEndpoint);
-CHIP_ERROR ShutdownBluezBleLayer(BluezEndpoint * apEndpoint);
-CHIP_ERROR StartBluezAdv(BluezEndpoint * apEndpoint);
-CHIP_ERROR StopBluezAdv(BluezEndpoint * apEndpoint);
-CHIP_ERROR BluezGattsAppRegister(BluezEndpoint * apEndpoint);
-CHIP_ERROR BluezAdvertisementSetup(BluezEndpoint * apEndpoint);
+    std::unordered_map<std::string, BluezConnection *> mConnMap;
+    GCancellable * mpConnectCancellable = nullptr;
+    char * mpPeerDevicePath             = nullptr;
 
-CHIP_ERROR ConnectDevice(BluezDevice1 & aDevice, BluezEndpoint * apEndpoint);
-void CancelConnect(BluezEndpoint * apEndpoint);
+    // Allow BluezConnection to access our private members
+    friend class BluezConnection;
+};
 
 } // namespace Internal
 } // namespace DeviceLayer
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.cpp b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
index 050df86dabc9ef..1670dfc082bebd 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.cpp
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
@@ -33,43 +33,6 @@ namespace Internal {
 
 namespace {
 
-// Helper context for creating GDBusObjectManager with
-// chip::DeviceLayer::GLibMatterContextInvokeSync()
-struct GDBusCreateObjectManagerContext
-{
-    GDBusObjectManager * object = nullptr;
-    // Cancellable passed to g_dbus_object_manager_client_new_for_bus_sync()
-    // which later can be used to cancel the scan operation.
-    GCancellable * cancellable = nullptr;
-
-    GDBusCreateObjectManagerContext() : cancellable(g_cancellable_new()) {}
-    ~GDBusCreateObjectManagerContext()
-    {
-        g_object_unref(cancellable);
-        if (object != nullptr)
-        {
-            g_object_unref(object);
-        }
-    }
-};
-
-CHIP_ERROR MainLoopCreateObjectManager(GDBusCreateObjectManagerContext * context)
-{
-    // When creating D-Bus proxy object, the thread default context must be initialized. Otherwise,
-    // all D-Bus signals will be delivered to the GLib global default main context.
-    VerifyOrDie(g_main_context_get_thread_default() != nullptr);
-
-    GAutoPtr<GError> err;
-    context->object = g_dbus_object_manager_client_new_for_bus_sync(
-        G_BUS_TYPE_SYSTEM, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, BLUEZ_INTERFACE, "/",
-        bluez_object_manager_client_get_proxy_type, nullptr /* unused user data in the Proxy Type Func */,
-        nullptr /* destroy notify */, context->cancellable, &MakeUniquePointerReceiver(err).Get());
-    VerifyOrReturnError(context->object != nullptr, CHIP_ERROR_INTERNAL,
-                        ChipLogError(Ble, "Failed to get DBUS object manager for device scanning: %s", err->message));
-
-    return CHIP_NO_ERROR;
-}
-
 /// Retrieve CHIP device identification info from the device advertising data
 bool BluezGetChipDeviceInfo(BluezDevice1 & aDevice, chip::Ble::ChipBLEDeviceIdentificationInfo & aDeviceInfo)
 {
@@ -89,18 +52,42 @@ bool BluezGetChipDeviceInfo(BluezDevice1 & aDevice, chip::Ble::ChipBLEDeviceIden
 
 } // namespace
 
-ChipDeviceScanner::ChipDeviceScanner(GDBusObjectManager * manager, BluezAdapter1 * adapter, GCancellable * cancellable,
-                                     ChipDeviceScannerDelegate * delegate) :
-    mManager(manager),
-    mAdapter(adapter), mCancellable(cancellable), mDelegate(delegate)
+CHIP_ERROR ChipDeviceScanner::Init(BluezAdapter1 * adapter, ChipDeviceScannerDelegate * delegate)
 {
-    g_object_ref(mAdapter);
-    g_object_ref(mCancellable);
-    g_object_ref(mManager);
+
+    // Make this function idempotent by shutting down previously initialized state if any.
+    Shutdown();
+
+    mAdapter     = BLUEZ_ADAPTER1(g_object_ref(adapter));
+    mCancellable = g_cancellable_new();
+    mDelegate    = delegate;
+
+    // Create the D-Bus object manager client object on the glib thread, so that all D-Bus signals
+    // will be delivered to the glib thread.
+    ReturnErrorOnFailure(PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](ChipDeviceScanner * self) {
+            // When creating D-Bus proxy object, the thread default context must be initialized.
+            VerifyOrDie(g_main_context_get_thread_default() != nullptr);
+
+            GAutoPtr<GError> err;
+            self->mManager = g_dbus_object_manager_client_new_for_bus_sync(
+                G_BUS_TYPE_SYSTEM, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, BLUEZ_INTERFACE, "/",
+                bluez_object_manager_client_get_proxy_type, nullptr /* unused user data in the Proxy Type Func */,
+                nullptr /* destroy notify */, self->mCancellable, &MakeUniquePointerReceiver(err).Get());
+            VerifyOrReturnError(self->mManager != nullptr, CHIP_ERROR_INTERNAL,
+                                ChipLogError(Ble, "Failed to get D-Bus object manager for device scanning: %s", err->message));
+            return CHIP_NO_ERROR;
+        },
+        this));
+
+    mIsInitialized = true;
+    return CHIP_NO_ERROR;
 }
 
-ChipDeviceScanner::~ChipDeviceScanner()
+void ChipDeviceScanner::Shutdown()
 {
+    VerifyOrReturn(mIsInitialized);
+
     StopScan();
 
     // mTimerExpired should only be set to true in the TimerExpiredCallback, which means we are in that callback
@@ -110,34 +97,29 @@ ChipDeviceScanner::~ChipDeviceScanner()
         chip::DeviceLayer::SystemLayer().CancelTimer(TimerExpiredCallback, this);
     }
 
-    g_object_unref(mManager);
-    g_object_unref(mCancellable);
-    g_object_unref(mAdapter);
-
-    mManager     = nullptr;
-    mAdapter     = nullptr;
-    mCancellable = nullptr;
-    mDelegate    = nullptr;
-}
-
-std::unique_ptr<ChipDeviceScanner> ChipDeviceScanner::Create(BluezAdapter1 * adapter, ChipDeviceScannerDelegate * delegate)
-{
-    GDBusCreateObjectManagerContext context;
-    CHIP_ERROR err;
-
-    err = PlatformMgrImpl().GLibMatterContextInvokeSync(MainLoopCreateObjectManager, &context);
-    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Ble, "Failed to create BLE object manager"));
-
-    return std::make_unique<ChipDeviceScanner>(context.object, adapter, context.cancellable, delegate);
-
-exit:
-    return std::unique_ptr<ChipDeviceScanner>();
+    // Release resources on the glib thread. This is necessary because the D-Bus manager client
+    // object handles D-Bus signals. Otherwise, we might face a race when the manager object is
+    // released during a D-Bus signal being processed.
+    PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](ChipDeviceScanner * self) {
+            if (self->mManager != nullptr)
+                g_object_unref(self->mManager);
+            if (self->mAdapter != nullptr)
+                g_object_unref(self->mAdapter);
+            if (self->mCancellable != nullptr)
+                g_object_unref(self->mCancellable);
+            return CHIP_NO_ERROR;
+        },
+        this);
+
+    mIsInitialized = false;
 }
 
 CHIP_ERROR ChipDeviceScanner::StartScan(System::Clock::Timeout timeout)
 {
     assertChipStackLockedByCurrentThread();
-    ReturnErrorCodeIf(mIsScanning, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(!mIsScanning, CHIP_ERROR_INCORRECT_STATE);
 
     mIsScanning = true; // optimistic, to allow all callbacks to check this
     if (PlatformMgrImpl().GLibMatterContextInvokeSync(MainLoopStartScan, this) != CHIP_NO_ERROR)
@@ -169,15 +151,16 @@ CHIP_ERROR ChipDeviceScanner::StartScan(System::Clock::Timeout timeout)
 void ChipDeviceScanner::TimerExpiredCallback(chip::System::Layer * layer, void * appState)
 {
     ChipDeviceScanner * chipDeviceScanner = static_cast<ChipDeviceScanner *>(appState);
-    chipDeviceScanner->MarkTimerExpired();
+    chipDeviceScanner->mTimerExpired      = true;
     chipDeviceScanner->mDelegate->OnScanError(CHIP_ERROR_TIMEOUT);
     chipDeviceScanner->StopScan();
 }
 
 CHIP_ERROR ChipDeviceScanner::StopScan()
 {
-    ReturnErrorCodeIf(!mIsScanning, CHIP_NO_ERROR);
-    ReturnErrorCodeIf(mIsStopping, CHIP_NO_ERROR);
+    VerifyOrReturnError(mIsScanning, CHIP_NO_ERROR);
+    VerifyOrReturnError(!mIsStopping, CHIP_NO_ERROR);
+
     mIsStopping = true;
     g_cancellable_cancel(mCancellable); // in case we are currently running a scan
 
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.h b/src/platform/Linux/bluez/ChipDeviceScanner.h
index ef8830a6fac820..16b8c91682650c 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.h
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.h
@@ -20,7 +20,6 @@
 #include <platform/CHIPDeviceConfig.h>
 
 #include <glib.h>
-#include <memory>
 
 #include <ble/CHIPBleServiceData.h>
 #include <lib/core/CHIPError.h>
@@ -53,15 +52,18 @@ class ChipDeviceScannerDelegate
 class ChipDeviceScanner
 {
 public:
-    /// NOTE: prefer to use the  ::Create method instead direct constructor calling.
-    ChipDeviceScanner(GDBusObjectManager * manager, BluezAdapter1 * adapter, GCancellable * cancellable,
-                      ChipDeviceScannerDelegate * delegate);
-
+    ChipDeviceScanner()                                      = default;
     ChipDeviceScanner(ChipDeviceScanner &&)                  = default;
     ChipDeviceScanner(const ChipDeviceScanner &)             = delete;
     ChipDeviceScanner & operator=(const ChipDeviceScanner &) = delete;
 
-    ~ChipDeviceScanner();
+    ~ChipDeviceScanner() { Shutdown(); }
+
+    /// Initialize the scanner.
+    CHIP_ERROR Init(BluezAdapter1 * adapter, ChipDeviceScannerDelegate * delegate);
+
+    /// Release any resources associated with the scanner.
+    void Shutdown();
 
     /// Initiate a scan for devices, with the given timeout
     ///
@@ -72,15 +74,6 @@ class ChipDeviceScanner
     /// Stop any currently running scan
     CHIP_ERROR StopScan();
 
-    /// Should only be called by TimerExpiredCallback.
-    void MarkTimerExpired() { mTimerExpired = true; }
-
-    /// Create a new device scanner
-    ///
-    /// Convenience method to allocate any required variables.
-    /// On success, maintains a reference to the provided adapter.
-    static std::unique_ptr<ChipDeviceScanner> Create(BluezAdapter1 * adapter, ChipDeviceScannerDelegate * delegate);
-
 private:
     static void TimerExpiredCallback(chip::System::Layer * layer, void * appState);
     static CHIP_ERROR MainLoopStartScan(ChipDeviceScanner * self);
@@ -103,6 +96,7 @@ class ChipDeviceScanner
     ChipDeviceScannerDelegate * mDelegate = nullptr;
     gulong mObjectAddedSignal             = 0;
     gulong mInterfaceChangedSignal        = 0;
+    bool mIsInitialized                   = false;
     bool mIsScanning                      = false;
     bool mIsStopping                      = false;
     /// Used to track if timer has already expired and doesn't need to be canceled.
diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
index 90d4191b1f1428..0859c3f723d5d5 100644
--- a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
+++ b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
@@ -245,6 +245,24 @@ bool GenericThreadDriver::ThreadNetworkIterator::Next(Network & item)
     return true;
 }
 
+ThreadCapabilities GenericThreadDriver::GetSupportedThreadFeatures()
+{
+    BitMask<ThreadCapabilities> capabilites = 0;
+    capabilites.SetField(ThreadCapabilities::kIsBorderRouterCapable,
+                         CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER /*OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE*/);
+    capabilites.SetField(ThreadCapabilities::kIsRouterCapable, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSleepyEndDeviceCapable, !CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsFullThreadDevice, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSynchronizedSleepyEndDeviceCapable,
+                         (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_SSED));
+    return capabilites;
+}
+
+uint16_t GenericThreadDriver::GetThreadVersion()
+{
+    return otThreadGetVersion();
+}
+
 } // namespace NetworkCommissioning
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.h b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.h
index 4a87d07e2fb084..bbfec6a44ff879 100644
--- a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.h
+++ b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.h
@@ -96,6 +96,8 @@ class GenericThreadDriver final : public ThreadDriver
     uint8_t GetMaxNetworks() override { return 1; }
     uint8_t GetScanNetworkTimeoutSeconds() override { return scanNetworkTimeoutSeconds; }
     uint8_t GetConnectNetworkTimeoutSeconds() override { return connectNetworkTimeout; }
+    ThreadCapabilities GetSupportedThreadFeatures() override;
+    uint16_t GetThreadVersion() override;
 
     void SetScanNetworkTimeoutSeconds(uint8_t scanTimeoutSec) { scanNetworkTimeoutSeconds = scanTimeoutSec; }
     void SetConnectNetworkTimeoutSeconds(uint8_t connectTimeoutSec) { connectNetworkTimeout = connectTimeoutSec; }
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
index a75f791966ac41..7bc357f0705cc9 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -65,9 +65,6 @@
 #include <app/data-model/Encode.h>
 
 #include <limits>
-#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
-#include <app/server/Server.h>
-#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
 extern "C" void otSysProcessDrivers(otInstance * aInstance);
 
 #if CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
@@ -210,15 +207,6 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnPlatformEvent(const
             }
         }
 
-#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
-        if (event->ThreadStateChange.AddressChanged && isThreadAttached)
-        {
-            // Refresh Multicast listening
-            ChipLogDetail(DeviceLayer, "Thread Attached updating Multicast address");
-            Server::GetInstance().RejoinExistingMulticastGroups();
-        }
-#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
-
 #if CHIP_DETAIL_LOGGING
         LogOpenThreadStateChange(mOTInst, event->ThreadStateChange.OpenThread.Flags);
 #endif // CHIP_DETAIL_LOGGING
@@ -499,9 +487,13 @@ ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<I
         ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
+#if OPENTHREAD_API_VERSION >= 347
+    if (otLinkGetCslPeriod(mOTInst) != 0)
+#else
     if (otLinkCslGetPeriod(mOTInst) != 0)
+#endif // OPENTHREAD_API_VERSION
         ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice);
-#endif
+#endif // CHIP_DEVICE_CONFIG_THREAD_SSED
 
     ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
 
@@ -1765,8 +1757,13 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetPollingInter
 // * poll period for SED devices that poll the parent for data
 // * CSL period for SSED devices that listen for messages in scheduled time slots.
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
+#if OPENTHREAD_API_VERSION >= 347
+    // Get CSL period in units of us and divide by 1000 to get milliseconds.
+    uint32_t curIntervalMS = otLinkGetCslPeriod(mOTInst) / 1000;
+#else
     // Get CSL period in units of 10 symbols, convert it to microseconds and divide by 1000 to get milliseconds.
     uint32_t curIntervalMS = otLinkCslGetPeriod(mOTInst) * OT_US_PER_TEN_SYMBOLS / 1000;
+#endif // OPENTHREAD_API_VERSION
 #else
     uint32_t curIntervalMS = otLinkGetPollPeriod(mOTInst);
 #endif
@@ -1774,9 +1771,15 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetPollingInter
     if (pollingInterval.count() != curIntervalMS)
     {
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
+#if OPENTHREAD_API_VERSION >= 347
+        // Set CSL period in units of us and divide by 1000 to get milliseconds.
+        otErr         = otLinkSetCslPeriod(mOTInst, pollingInterval.count() * 1000);
+        curIntervalMS = otLinkGetCslPeriod(mOTInst) / 1000;
+#else
         // Set CSL period in units of 10 symbols, convert it to microseconds and divide by 1000 to get milliseconds.
         otErr         = otLinkCslSetPeriod(mOTInst, pollingInterval.count() * 1000 / OT_US_PER_TEN_SYMBOLS);
         curIntervalMS = otLinkCslGetPeriod(mOTInst) * OT_US_PER_TEN_SYMBOLS / 1000;
+#endif // OPENTHREAD_API_VERSION
 #else
         otErr         = otLinkSetPollPeriod(mOTInst, pollingInterval.count());
         curIntervalMS = otLinkGetPollPeriod(mOTInst);
diff --git a/src/platform/Tizen/ConfigurationManagerImpl.cpp b/src/platform/Tizen/ConfigurationManagerImpl.cpp
index 78d556881443a8..8efe079993b7aa 100644
--- a/src/platform/Tizen/ConfigurationManagerImpl.cpp
+++ b/src/platform/Tizen/ConfigurationManagerImpl.cpp
@@ -26,7 +26,6 @@
 #include "ConfigurationManagerImpl.h"
 
 #include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceBuildConfig.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/Tizen/PosixConfig.h>
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp
index 9000ee710c0664..c97196babfbfcf 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.cpp
+++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp
@@ -27,10 +27,9 @@
 #include <wifi-manager.h>
 #endif
 
-#include <inet/InetBuildConfig.h>
+#include <inet/InetConfig.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceBuildConfig.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CHIPDeviceEvent.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h
index 04d692a1f05f8f..a22eb71eb7deb2 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.h
+++ b/src/platform/Tizen/ConnectivityManagerImpl.h
@@ -21,9 +21,8 @@
 
 #include <cstdint>
 
-#include <inet/InetBuildConfig.h>
+#include <inet/InetConfig.h>
 #include <lib/core/CHIPError.h>
-#include <platform/CHIPDeviceBuildConfig.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CHIPDeviceEvent.h>
 #include <system/SystemClock.h>
diff --git a/src/platform/Tizen/ConnectivityUtils.cpp b/src/platform/Tizen/ConnectivityUtils.cpp
index b74a2832b93237..15a8ec60fd3a06 100644
--- a/src/platform/Tizen/ConnectivityUtils.cpp
+++ b/src/platform/Tizen/ConnectivityUtils.cpp
@@ -17,7 +17,6 @@
 
 #include "ConnectivityUtils.h"
 
-#include <app-common/zap-generated/enums.h>
 #include <platform/Tizen/ConnectivityUtils.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
@@ -447,34 +446,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, PHYRateEnum & p
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate1G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate25g;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate5G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate40G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate200G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate400G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);
diff --git a/src/platform/Tizen/DnssdImpl.cpp b/src/platform/Tizen/DnssdImpl.cpp
index 646d40af5a8f53..64b6d45932e2d2 100644
--- a/src/platform/Tizen/DnssdImpl.cpp
+++ b/src/platform/Tizen/DnssdImpl.cpp
@@ -32,7 +32,7 @@
 #include <lib/dnssd/platform/Dnssd.h>
 #include <net/if.h>
 
-#include <inet/InetBuildConfig.h>
+#include <inet/InetConfig.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
diff --git a/src/platform/Tizen/Logging.cpp b/src/platform/Tizen/Logging.cpp
index da29fc8926ef69..117059e9d15569 100644
--- a/src/platform/Tizen/Logging.cpp
+++ b/src/platform/Tizen/Logging.cpp
@@ -20,7 +20,7 @@
 
 #include <dlog.h>
 
-#include <core/CHIPBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/support/EnforceFormat.h>
 #include <lib/support/logging/Constants.h>
 #include <platform/logging/LogV.h>
diff --git a/src/platform/Tizen/NetworkCommissioningDriver.h b/src/platform/Tizen/NetworkCommissioningDriver.h
index cdd0ceecd2abd2..64db40b2d5ce23 100644
--- a/src/platform/Tizen/NetworkCommissioningDriver.h
+++ b/src/platform/Tizen/NetworkCommissioningDriver.h
@@ -147,6 +147,8 @@ class TizenThreadDriver final : public ThreadDriver
     // ThreadDriver
     Status AddOrUpdateNetwork(ByteSpan operationalDataset, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
     void ScanNetworks(ThreadDriver::ScanCallback * callback) override;
+    ThreadCapabilities GetSupportedThreadFeatures() override;
+    uint16_t GetThreadVersion() override;
 
 private:
     ThreadNetworkIterator mThreadIterator = ThreadNetworkIterator(this);
diff --git a/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp b/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
index 8d61c5c4bd3627..003564b4c90f0f 100644
--- a/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
@@ -164,6 +164,25 @@ bool TizenThreadDriver::ThreadNetworkIterator::Next(Network & item)
     return false;
 }
 
+ThreadCapabilities TizenThreadDriver::GetSupportedThreadFeatures()
+{
+    BitMask<ThreadCapabilities> capabilites = 0;
+    capabilites.SetField(ThreadCapabilities::kIsBorderRouterCapable,
+                         CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER /*OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE*/);
+    capabilites.SetField(ThreadCapabilities::kIsRouterCapable, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSleepyEndDeviceCapable, !CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsFullThreadDevice, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSynchronizedSleepyEndDeviceCapable,
+                         (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_SSED));
+    return capabilites;
+}
+
+uint16_t TizenThreadDriver::GetThreadVersion()
+{
+    // TODO Needs to be implemented with Tizen Thread stack api
+    return 0;
+}
+
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 } // namespace NetworkCommissioning
diff --git a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
index d6501cbde80e38..a92ead9764c203 100644
--- a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
@@ -24,7 +24,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/KeyValueStoreManager.h>
 #include <platform/NetworkCommissioning.h>
 
diff --git a/src/platform/Tizen/SystemTimeSupport.cpp b/src/platform/Tizen/SystemTimeSupport.cpp
index bfc33b7dd23a9c..452c9039bfb939 100644
--- a/src/platform/Tizen/SystemTimeSupport.cpp
+++ b/src/platform/Tizen/SystemTimeSupport.cpp
@@ -30,7 +30,7 @@
 #include <cstdint>
 #include <ctime>
 
-#include <core/CHIPBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <system/SystemClock.h>
diff --git a/src/platform/Zephyr/ConfigurationManagerImpl.cpp b/src/platform/Zephyr/ConfigurationManagerImpl.cpp
index 378e35e1006fe3..1c357a92a952f3 100644
--- a/src/platform/Zephyr/ConfigurationManagerImpl.cpp
+++ b/src/platform/Zephyr/ConfigurationManagerImpl.cpp
@@ -168,9 +168,11 @@ CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t
     return ZephyrConfig::WriteConfigValueBin(key, data, dataLen);
 }
 
-void ConfigurationManagerImpl::RunConfigUnitTest(void)
+void ConfigurationManagerImpl::RunConfigUnitTest()
 {
+#if CHIP_CONFIG_TEST
     ZephyrConfig::RunConfigUnitTest();
+#endif
 }
 
 void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
diff --git a/src/platform/Zephyr/ConfigurationManagerImpl.h b/src/platform/Zephyr/ConfigurationManagerImpl.h
index 87f9e30335b8fc..ad29e813384c52 100644
--- a/src/platform/Zephyr/ConfigurationManagerImpl.h
+++ b/src/platform/Zephyr/ConfigurationManagerImpl.h
@@ -67,7 +67,7 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     CHIP_ERROR WriteConfigValueStr(Key key, const char * str) override;
     CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen) override;
     CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen) override;
-    void RunConfigUnitTest(void) override;
+    void RunConfigUnitTest() override;
 
     // ===== Private members reserved for use by this class only.
 
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
index 82bfbcb17fe5e9..3c0a106aea7412 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -123,7 +123,7 @@ DiagnosticDataProviderImpl::DiagnosticDataProviderImpl() : mBootReason(Determine
 
 bool DiagnosticDataProviderImpl::SupportsWatermarks()
 {
-#ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
+#if defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT)
     return true;
 #else
     return false;
@@ -165,7 +165,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapUsed(uint64_t & currentHeap
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark)
 {
-#ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
+#if defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT)
     Malloc::Stats stats;
     ReturnErrorOnFailure(Malloc::GetStats(stats));
 
@@ -178,7 +178,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
 
 CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
 {
-#ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
+#if defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT)
     Malloc::ResetMaxStats();
     return CHIP_NO_ERROR;
 #else
diff --git a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
index a9c532d93f69ce..ae68f9c680795c 100644
--- a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
@@ -23,7 +23,10 @@
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/tcpip.h>
+#endif
+
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 #include <platform/bouffalolab/BL702/wifi_mgmr_portable.h>
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
@@ -62,8 +65,10 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     CHIP_ERROR err;
     TaskHandle_t backup_eventLoopTask;
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
     // Initialize LwIP.
     tcpip_init(NULL, NULL);
+#endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     otRadio_opt_t opt;
diff --git a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
index 3b9e0313a5b66f..784dfa396cd371 100644
--- a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
@@ -17,16 +17,16 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp>
-
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
 
-#include <openthread/platform/entropy.h>
+#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp>
 
 #include <lib/support/CHIPPlatformMemory.h>
 
+#include <openthread/platform/entropy.h>
+
 #include <mbedtls/platform.h>
 
 #include <openthread_port.h>
@@ -51,7 +51,7 @@ CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
     // Initialize the generic implementation base classes.
     err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
     SuccessOrExit(err);
-    err = GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>::DoInit(otInstanceInitSingle());
+    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
     SuccessOrExit(err);
 
     mbedtls_platform_set_calloc_free(pvPortCalloc, vPortFree);
diff --git a/src/platform/bouffalolab/BL702L/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702L/DiagnosticDataProviderImpl.cpp
index fcd805ebfccf65..5dcc64a52927f1 100644
--- a/src/platform/bouffalolab/BL702L/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL702L/DiagnosticDataProviderImpl.cpp
@@ -21,8 +21,7 @@
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 
-#include "FreeRTOS.h"
-#include <lwip/tcpip.h>
+#include <FreeRTOS.h>
 
 extern "C" {
 #include <bl_sys.h>
diff --git a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
index ef9adadc941d8c..d72c1090064968 100644
--- a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
@@ -24,7 +24,9 @@
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/tcpip.h>
+#endif
 
 extern "C" {
 #include <bl_sec.h>
@@ -68,8 +70,10 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     ReturnErrorOnFailure(System::Clock::InitClock_RealTime());
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
     // Initialize LwIP.
     tcpip_init(NULL, NULL);
+#endif
 
     err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16);
     SuccessOrExit(err);
diff --git a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
index e2ceec4e40219f..bc6a558b20f6c2 100644
--- a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
@@ -17,12 +17,14 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp>
-
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
 
+#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp>
+
+#include <lib/support/CHIPPlatformMemory.h>
+
 #include <openthread/platform/entropy.h>
 
 #include <mbedtls/platform.h>
@@ -54,7 +56,7 @@ CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
     // Initialize the generic implementation base classes.
     err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
     SuccessOrExit(err);
-    err = GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>::DoInit(otInst);
+    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
     SuccessOrExit(err);
 
     mbedtls_platform_set_calloc_free(pvPortCalloc, vPortFree);
diff --git a/src/platform/bouffalolab/common/BLConfig.cpp b/src/platform/bouffalolab/common/BLConfig.cpp
index 818c64069b71df..bac1580f9f7c19 100644
--- a/src/platform/bouffalolab/common/BLConfig.cpp
+++ b/src/platform/bouffalolab/common/BLConfig.cpp
@@ -26,12 +26,13 @@ namespace Internal {
 
 void BLConfig::Init(void)
 {
+    env_node_obj node;
+
     easyflash_init();
     ef_load_env_cache();
 
-    if (ef_get_env(kBLKey_factoryResetFlag))
+    if (ef_get_env_obj(kBLKey_factoryResetFlag, &node))
     {
-
         ef_print_env_cb([](env_node_obj_t env, void * arg1, void * arg2) {
             if (ENV_WRITE == env->status)
             {
diff --git a/src/platform/bouffalolab/common/Logging.cpp b/src/platform/bouffalolab/common/Logging.cpp
index bc773c530d6bdc..b05912f180f33b 100644
--- a/src/platform/bouffalolab/common/Logging.cpp
+++ b/src/platform/bouffalolab/common/Logging.cpp
@@ -16,7 +16,7 @@
  */
 #include <stdio.h>
 
-#include <platform/CHIPDeviceBuildConfig.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <platform/logging/LogV.h>
 
 #include <CHIPDevicePlatformConfig.h>
diff --git a/src/platform/bouffalolab/common/SystemPlatformConfig.h b/src/platform/bouffalolab/common/SystemPlatformConfig.h
index 0441601762ced5..c42b2671f84b48 100644
--- a/src/platform/bouffalolab/common/SystemPlatformConfig.h
+++ b/src/platform/bouffalolab/common/SystemPlatformConfig.h
@@ -30,5 +30,9 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
 
+#if CHIP_ENABLE_OPENTHREAD
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 8
+#endif
+
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t)
 #define CHIP_CONFIG_SHA256_CONTEXT_SIZE ((7 + 1 + 5 + 18 + 16 + 16 + 7) * sizeof(unsigned int))
diff --git a/src/platform/bouffalolab/common/ThreadStackManagerImpl.h b/src/platform/bouffalolab/common/ThreadStackManagerImpl.h
index dc69f270e17c93..462d2de76ac32d 100644
--- a/src/platform/bouffalolab/common/ThreadStackManagerImpl.h
+++ b/src/platform/bouffalolab/common/ThreadStackManagerImpl.h
@@ -17,13 +17,10 @@
 
 #pragma once
 
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
-
 #include <openthread/tasklet.h>
 #include <openthread/thread.h>
-
-#include <queue.h>
+#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 
 extern "C" void otSysEventSignalPending(void);
 extern "C" void otrLock(void);
@@ -41,7 +38,7 @@ class ThreadStackManagerImpl;
  * using the Bouffalolab SDK and the OpenThread stack.
  */
 class ThreadStackManagerImpl final : public ThreadStackManager,
-                                     public Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>,
+                                     public Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>,
                                      public Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>
 {
     // Allow the ThreadStackManager interface class to delegate method calls to
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
index 18dfc7dff0bf58..c86b77ec45f4eb 100644
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
+++ b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
@@ -52,8 +52,6 @@ static_library("cc13x2_26x2") {
     "${chip_root}/src/crypto",
     "${chip_root}/src/platform:platform_base",
   ]
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
 
   if (chip_enable_ble) {
     sources += [
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
index 1dd6933b2f23ca..18298ed0ce5841 100644
--- a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
+++ b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
@@ -52,8 +52,6 @@ static_library("cc13x4_26x4") {
     "${chip_root}/src/crypto",
     "${chip_root}/src/platform:platform_base",
   ]
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
 
   if (chip_enable_ble) {
     sources += [
diff --git a/src/platform/device.gni b/src/platform/device.gni
index cf1dc07325a664..9afb252ca0b809 100644
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -59,6 +59,11 @@ declare_args() {
 declare_args() {
   chip_openthread_ftd = chip_enable_openthread
 
+  # Set platform define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER
+  # Users should ensure that it sets their thread stack define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE
+  # or that their setting matches.
+  chip_openthread_border_router = false
+
   # Enable wifi support.
   chip_enable_wifi =
       chip_device_platform == "linux" || chip_device_platform == "esp32" ||
diff --git a/src/platform/fake/ConfigurationManagerImpl.h b/src/platform/fake/ConfigurationManagerImpl.h
index 9347d22052c247..510b2fc0dacc83 100644
--- a/src/platform/fake/ConfigurationManagerImpl.h
+++ b/src/platform/fake/ConfigurationManagerImpl.h
@@ -85,8 +85,8 @@ class ConfigurationManagerImpl : public ConfigurationManager
     CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
-#if !defined(NDEBUG)
-    CHIP_ERROR RunUnitTests(void) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+#if CHIP_CONFIG_TEST
+    void RunUnitTests() override {}
 #endif
     bool IsFullyProvisioned() override { return false; }
     void LogDeviceConfig() override {}
diff --git a/src/platform/fake/DnssdImpl.h b/src/platform/fake/DnssdImpl.h
index 1608a30247c7ef..95ccd5ec23fd5a 100644
--- a/src/platform/fake/DnssdImpl.h
+++ b/src/platform/fake/DnssdImpl.h
@@ -169,7 +169,7 @@ struct ExpectedCall
         }
     }
 
-    static constexpr size_t kMaxTxtRecords                = 12;
+    static constexpr size_t kMaxTxtRecords                = 13;
     static constexpr size_t kMaxSubtypes                  = 10;
     CallType callType                                     = CallType::kUnknown;
     DnssdServiceProtocol protocol                         = DnssdServiceProtocol::kDnssdProtocolUnknown;
diff --git a/src/platform/logging/BUILD.gn b/src/platform/logging/BUILD.gn
index 28a787d6e3f6fe..6039b101e20482 100644
--- a/src/platform/logging/BUILD.gn
+++ b/src/platform/logging/BUILD.gn
@@ -18,7 +18,7 @@ if (current_os == "android") {
       "${chip_root}/src/lib/core:chip_config_header",
       "${chip_root}/src/lib/support:attributes",
       "${chip_root}/src/lib/support:logging_constants",
-      "${chip_root}/src/platform:platform_buildconfig",
+      "${chip_root}/src/platform:platform_config_header",
       "${chip_root}/src/platform/logging:headers",
     ]
 
@@ -43,7 +43,7 @@ static_library("stdio") {
     "${chip_root}/src/lib/core:chip_config_header",
     "${chip_root}/src/lib/support:attributes",
     "${chip_root}/src/lib/support:logging_constants",
-    "${chip_root}/src/platform:platform_buildconfig",
+    "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/platform/logging:headers",
   ]
 
diff --git a/src/platform/mbed/OTAImageProcessorImpl.cpp b/src/platform/mbed/OTAImageProcessorImpl.cpp
index 0777c8606fb30b..a5a725f19ee0a4 100644
--- a/src/platform/mbed/OTAImageProcessorImpl.cpp
+++ b/src/platform/mbed/OTAImageProcessorImpl.cpp
@@ -543,8 +543,8 @@ int OTAImageProcessorImpl::ProgramMemory()
     }
     ChipLogProgress(SoftwareUpdate,
                     "Secondary slot program with offset: "
-                    "0x%" PRIx64,
-                    mParams.downloadedBytes);
+                    "0x" ChipLogFormatX64,
+                    ChipLogValueX64(mParams.downloadedBytes));
     mParams.downloadedBytes += mBlock.size();
 
     return ret;
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
index 8407b1e6bcd001..7461d3650d86a6 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -27,65 +27,22 @@
 
 // ==================== Platform Adaptations ====================
 
-#ifndef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE
-#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING
-#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT
-#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT
-#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER
-#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID CONFIG_CHIP_DEVICE_VENDOR_ID
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME CONFIG_CHIP_DEVICE_VENDOR_NAME
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME CONFIG_CHIP_DEVICE_PRODUCT_NAME
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
-#endif
-
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
-#endif
+#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
+#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
 
 #ifdef CONFIG_NET_L2_OPENTHREAD
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
@@ -204,9 +161,11 @@
 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
 
 #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 6144
 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
 
+#define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 64
+
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
@@ -249,10 +208,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
 #endif // CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE
 
-#ifdef CONFIG_CHIP_DEVICE_TYPE
-#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
-#endif // CONFIG_CHIP_DEVICE_TYPE
-
 #ifdef CONFIG_CHIP_EXTENDED_DISCOVERY
 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
 #endif // CONFIG_CHIP_EXTENDED_DISCOVERY
diff --git a/src/platform/nrfconnect/Reboot.cpp b/src/platform/nrfconnect/Reboot.cpp
index 5b1b6abdde68ad..439adebddc0ea4 100644
--- a/src/platform/nrfconnect/Reboot.cpp
+++ b/src/platform/nrfconnect/Reboot.cpp
@@ -56,13 +56,7 @@ void Reboot(SoftwareRebootReason reason)
 {
     const RetainedReason retainedReason = EncodeReason(reason);
 
-    // The parameter passed to sys_reboot() is retained in GPREGRET (general-purpose
-    // retention register) on nRF52 SOC family, but nRF53 ignores the parameter, so
-    // set it manually.
-
-#ifdef CONFIG_SOC_SERIES_NRF53X
     nrf_power_gpregret_set(NRF_POWER, retainedReason);
-#endif
 
     sys_reboot(retainedReason);
 }
diff --git a/src/platform/nrfconnect/SystemPlatformConfig.h b/src/platform/nrfconnect/SystemPlatformConfig.h
index cd863d5c67dcd4..ce0df4d5f69ff5 100644
--- a/src/platform/nrfconnect/SystemPlatformConfig.h
+++ b/src/platform/nrfconnect/SystemPlatformConfig.h
@@ -47,4 +47,8 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_USE_LWIP 0
 #define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
 
+#ifndef CONFIG_ARCH_POSIX
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 8
+#endif
+
 // ========== Platform-specific Configuration Overrides =========
diff --git a/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp b/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp
index 3df9b60c2157de..7576171adb2f76 100644
--- a/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp
+++ b/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp
@@ -147,10 +147,6 @@ CHIP_ERROR NrfWiFiDriver::CommitConfiguration()
 
 CHIP_ERROR NrfWiFiDriver::RevertConfiguration()
 {
-    // Abort Connection Recovery if it is in progress during reverting configuration.
-    // This is needed to stop recovery process after failsafe timer expiring.
-    WiFiManager::Instance().AbortConnectionRecovery();
-
     LoadFromStorage();
 
     if (WiFiManager::StationStatus::CONNECTING <= WiFiManager::Instance().GetStationStatus())
diff --git a/src/platform/nrfconnect/wifi/WiFiManager.cpp b/src/platform/nrfconnect/wifi/WiFiManager.cpp
index 68192516b73437..c3435a954fab50 100644
--- a/src/platform/nrfconnect/wifi/WiFiManager.cpp
+++ b/src/platform/nrfconnect/wifi/WiFiManager.cpp
@@ -142,8 +142,8 @@ const Map<uint32_t, WiFiManager::NetEventHandler, 5>
     WiFiManager::sEventHandlerMap({ { NET_EVENT_WIFI_SCAN_RESULT, WiFiManager::ScanResultHandler },
                                     { NET_EVENT_WIFI_SCAN_DONE, WiFiManager::ScanDoneHandler },
                                     { NET_EVENT_WIFI_CONNECT_RESULT, WiFiManager::ConnectHandler },
-                                    { NET_EVENT_WIFI_DISCONNECT_RESULT, WiFiManager::NetworkDrivenDisconnectHandler },
-                                    { NET_EVENT_WIFI_DISCONNECT_COMPLETE, WiFiManager::ApplicationDrivenDisconnectHandler } });
+                                    { NET_EVENT_WIFI_DISCONNECT_RESULT, WiFiManager::DisconnectHandler },
+                                    { NET_EVENT_WIFI_DISCONNECT_COMPLETE, WiFiManager::DisconnectHandler } });
 
 void WiFiManager::WifiMgmtEventHandler(net_mgmt_event_callback * cb, uint32_t mgmtEvent, net_if * iface)
 {
@@ -168,7 +168,7 @@ CHIP_ERROR WiFiManager::Init()
 
         if (maddr && !net_if_ipv6_maddr_is_joined(maddr) && !net_ipv6_is_addr_mcast_link_all_nodes(&addr))
         {
-            net_if_ipv6_maddr_join(maddr);
+            net_if_ipv6_maddr_join(iface, maddr);
         }
 
         return CHIP_NO_ERROR;
@@ -206,32 +206,10 @@ CHIP_ERROR WiFiManager::Scan(const ByteSpan & ssid, ScanResultCallback resultCal
     mCachedWiFiState    = mWiFiState;
     mWiFiState          = WIFI_STATE_SCANNING;
     mSsidFound          = false;
-    mRecoveryArmed      = true;
-    // TODO Workaround for recovery mechanism to wait before the next scan request until the WiFi supplicant is not busy.
-    static bool workaroundDone;
 
-    int ret = net_mgmt(NET_REQUEST_WIFI_SCAN, iface, NULL, 0);
-
-    if (ret)
+    if (0 != net_mgmt(NET_REQUEST_WIFI_SCAN, iface, NULL, 0))
     {
-        ChipLogError(DeviceLayer, "Scan request failed %d", ret);
-        if (ret == -EBUSY && !workaroundDone)
-        {
-            // TODO Wi-Fi driver returned an error during recovery.
-            // As a workaround schedule the recovery timer one more time in WifiSupplicantWorkaroundTime time.
-            // This allows the device to run the Scan method without
-            // rebooting when the "Device or resource busy" error occurs.
-            DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds32(kWifiSupplicantWorkaroundTime), Recover, nullptr);
-            workaroundDone = true;
-            return CHIP_NO_ERROR;
-        }
-        else
-        {
-            // TODO The workaround has not worked, so reboot the device
-            ChipLogError(DeviceLayer, "WiFi driver does not respond, resetting the device...");
-            workaroundDone = false;
-            PlatformMgr().Shutdown();
-        }
+        ChipLogError(DeviceLayer, "Scan request failed");
         return CHIP_ERROR_INTERNAL;
     }
 
@@ -412,21 +390,13 @@ void WiFiManager::ScanDoneHandler(Platform::UniquePtr<uint8_t> data)
         // Internal scan is supposed to be followed by a connection request if the SSID has been found
         if (Instance().mInternalScan)
         {
-            if (Instance().mRecoveryArmed)
+
+            if (!Instance().mSsidFound)
             {
-                if (!Instance().mSsidFound)
-                {
-                    ChipLogProgress(DeviceLayer, "No requested SSID found");
-                    auto currentTimeout = Instance().CalculateNextRecoveryTime();
-                    ChipLogProgress(DeviceLayer, "Starting connection recover: re-scanning... (next attempt in %d ms)",
-                                    currentTimeout.count());
-                    DeviceLayer::SystemLayer().StartTimer(currentTimeout, Recover, nullptr);
-                    return;
-                }
-                else
-                {
-                    Instance().AbortConnectionRecovery();
-                }
+                auto currentTimeout = Instance().CalculateNextRecoveryTime();
+                ChipLogProgress(DeviceLayer, "Starting connection recover: re-scanning... (next attempt in %d ms)",
+                                currentTimeout.count());
+                DeviceLayer::SystemLayer().StartTimer(currentTimeout, Recover, nullptr);
             }
 
             Instance().mWiFiState = WIFI_STATE_ASSOCIATING;
@@ -517,8 +487,6 @@ void WiFiManager::ConnectHandler(Platform::UniquePtr<uint8_t> data)
                 ChipLogError(DeviceLayer, "Cannot post event [error: %s]", ErrorStr(error));
             }
         }
-        // Ensure fresh recovery for future connection requests.
-        Instance().ResetRecoveryTime();
         // cleanup the provisioning data as it is configured per each connect request
         Instance().ClearStationProvisioningData();
     });
@@ -530,18 +498,8 @@ void WiFiManager::ConnectHandler(Platform::UniquePtr<uint8_t> data)
     }
 }
 
-void WiFiManager::NetworkDrivenDisconnectHandler(Platform::UniquePtr<uint8_t>)
+void WiFiManager::DisconnectHandler(Platform::UniquePtr<uint8_t>)
 {
-    // Workaround: schedule the application level connection recovery in kSupplicantReconnectionTimeoutMs to give WPA supplicant
-    // some time to restore it.
-    if (!Instance().mRecoveryArmed)
-    {
-        Instance().mRecoveryArmed = true;
-        DeviceLayer::SystemLayer().StartTimer(
-            System::Clock::Milliseconds32(kSupplicantReconnectionTimeoutMs),
-            [](System::Layer * layer, void * param) { Instance().Disconnect(); }, nullptr);
-    }
-
     SystemLayer().ScheduleLambda([] {
         ChipLogProgress(DeviceLayer, "WiFi station disconnected");
         Instance().mWiFiState = WIFI_STATE_DISCONNECTED;
@@ -549,24 +507,6 @@ void WiFiManager::NetworkDrivenDisconnectHandler(Platform::UniquePtr<uint8_t>)
     });
 }
 
-void WiFiManager::ApplicationDrivenDisconnectHandler(Platform::UniquePtr<uint8_t>)
-{
-    if (!Instance().mRecoveryArmed)
-    {
-        return;
-    }
-
-    if (!Instance().mApplicationDisconnectRequested)
-    {
-        Instance().AbortConnectionRecovery();
-    }
-    else
-    {
-        Instance().mApplicationDisconnectRequested = false;
-        SystemLayer().ScheduleLambda([] { Recover(nullptr, nullptr); });
-    }
-}
-
 WiFiManager::StationStatus WiFiManager::GetStationStatus() const
 {
     return WiFiManager::sStatusMap[mWiFiState];
@@ -580,23 +520,6 @@ void WiFiManager::PostConnectivityStatusChange(ConnectivityChange changeType)
     PlatformMgr().PostEventOrDie(&networkEvent);
 }
 
-System::Clock::Milliseconds32 WiFiManager::CalculateNextRecoveryTime()
-{
-    if (mConnectionRecoveryTimeMs > kConnectionRecoveryMaxIntervalMs)
-    {
-        // Find the new random jitter value in range [-jitter, +jitter].
-        int32_t jitter            = chip::Crypto::GetRandU32() % (2 * jitter + 1) - jitter;
-        mConnectionRecoveryTimeMs = kConnectionRecoveryMaxIntervalMs + jitter;
-        return System::Clock::Milliseconds32(mConnectionRecoveryTimeMs);
-    }
-    else
-    {
-        uint32_t currentRecoveryTimeout = mConnectionRecoveryTimeMs;
-        mConnectionRecoveryTimeMs       = mConnectionRecoveryTimeMs * 2;
-        return System::Clock::Milliseconds32(currentRecoveryTimeout);
-    }
-}
-
 void WiFiManager::Recover(System::Layer *, void *)
 {
     // Prevent scheduling recovery if we are already connected to the network.
@@ -626,7 +549,23 @@ void WiFiManager::AbortConnectionRecovery()
 {
     DeviceLayer::SystemLayer().CancelTimer(Recover, nullptr);
     Instance().ResetRecoveryTime();
-    Instance().mRecoveryArmed = false;
+}
+
+System::Clock::Milliseconds32 WiFiManager::CalculateNextRecoveryTime()
+{
+    if (mConnectionRecoveryTimeMs > kConnectionRecoveryMaxIntervalMs)
+    {
+        // Find the new random jitter value in range [-jitter, +jitter].
+        int32_t jitter            = chip::Crypto::GetRandU32() % (2 * jitter + 1) - jitter;
+        mConnectionRecoveryTimeMs = kConnectionRecoveryMaxIntervalMs + jitter;
+        return System::Clock::Milliseconds32(mConnectionRecoveryTimeMs);
+    }
+    else
+    {
+        uint32_t currentRecoveryTimeout = mConnectionRecoveryTimeMs;
+        mConnectionRecoveryTimeMs       = mConnectionRecoveryTimeMs * 2;
+        return System::Clock::Milliseconds32(currentRecoveryTimeout);
+    }
 }
 
 CHIP_ERROR WiFiManager::SetLowPowerMode(bool onoff)
diff --git a/src/platform/nrfconnect/wifi/WiFiManager.h b/src/platform/nrfconnect/wifi/WiFiManager.h
index a22ab4789173db..248f7dccc67bc7 100644
--- a/src/platform/nrfconnect/wifi/WiFiManager.h
+++ b/src/platform/nrfconnect/wifi/WiFiManager.h
@@ -173,10 +173,6 @@ class WiFiManager
     static constexpr uint32_t kConnectionRecoveryMaxIntervalMs     = CONFIG_CHIP_WIFI_CONNECTION_RECOVERY_MAXIMUM_INTERVAL;
     static constexpr uint32_t kConnectionRecoveryJitterMs          = CONFIG_CHIP_WIFI_CONNECTION_RECOVERY_JITTER;
     static constexpr uint32_t kConnectionRecoveryMaxRetries        = CONFIG_CHIP_WIFI_CONNECTION_RECOVERY_MAX_RETRIES_NUMBER;
-    static constexpr uint32_t kSupplicantReconnectionTimeoutMs     = 60000;
-
-    static_assert(kConnectionRecoveryMinIntervalMs < kConnectionRecoveryMaxIntervalMs);
-    static_assert(kConnectionRecoveryJitterMs <= kConnectionRecoveryMaxIntervalMs);
 
     CHIP_ERROR Init();
     CHIP_ERROR Scan(const ByteSpan & ssid, ScanResultCallback resultCallback, ScanDoneCallback doneCallback,
@@ -200,16 +196,14 @@ class WiFiManager
     };
 
     constexpr static uint32_t kWifiManagementEvents = NET_EVENT_WIFI_SCAN_RESULT | NET_EVENT_WIFI_SCAN_DONE |
-        NET_EVENT_WIFI_CONNECT_RESULT | NET_EVENT_WIFI_DISCONNECT_RESULT | NET_EVENT_WIFI_DISCONNECT_COMPLETE |
-        NET_EVENT_WIFI_IFACE_STATUS;
+        NET_EVENT_WIFI_CONNECT_RESULT | NET_EVENT_WIFI_DISCONNECT_RESULT | NET_EVENT_WIFI_IFACE_STATUS;
 
     // Event handling
     static void WifiMgmtEventHandler(net_mgmt_event_callback * cb, uint32_t mgmtEvent, net_if * iface);
     static void ScanResultHandler(Platform::UniquePtr<uint8_t> data);
     static void ScanDoneHandler(Platform::UniquePtr<uint8_t> data);
     static void ConnectHandler(Platform::UniquePtr<uint8_t> data);
-    static void NetworkDrivenDisconnectHandler(Platform::UniquePtr<uint8_t> data);
-    static void ApplicationDrivenDisconnectHandler(Platform::UniquePtr<uint8_t> data);
+    static void DisconnectHandler(Platform::UniquePtr<uint8_t> data);
     static void PostConnectivityStatusChange(ConnectivityChange changeType);
     static void SendRouterSolicitation(System::Layer * layer, void * param);
 
@@ -239,10 +233,7 @@ class WiFiManager
     bool mSsidFound{ false };
     uint32_t mConnectionRecoveryCounter{ 0 };
     uint32_t mConnectionRecoveryTimeMs{ kConnectionRecoveryMinIntervalMs };
-    bool mRecoveryArmed{ false };
     bool mApplicationDisconnectRequested{ false };
-    // TODO Workaround for recovery mechanism to wait before the next scan request until the WiFi supplicant is not busy.
-    static constexpr uint32_t kWifiSupplicantWorkaroundTime = 8000;
 
     static const Map<wifi_iface_state, StationStatus, 10> sStatusMap;
     static const Map<uint32_t, NetEventHandler, 5> sEventHandlerMap;
diff --git a/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp
index 92ef8c0c310d29..10e9f8d528b12f 100644
--- a/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp
@@ -22,7 +22,6 @@
  *          for nxp platform.
  */
 
-#include <app-common/zap-generated/enums.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include "DiagnosticDataProviderImpl.h"
diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn
index 193ba06d78a271..a58609f28ef539 100644
--- a/src/platform/nxp/k32w/k32w0/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w0/BUILD.gn
@@ -143,7 +143,4 @@ static_library("k32w0") {
   }
 
   public_deps += [ "${chip_root}/src/crypto" ]
-
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
 }
diff --git a/src/platform/nxp/k32w/k32w1/BUILD.gn b/src/platform/nxp/k32w/k32w1/BUILD.gn
index 5b42263b8380a0..187a7360cd27d2 100644
--- a/src/platform/nxp/k32w/k32w1/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w1/BUILD.gn
@@ -106,7 +106,4 @@ static_library("k32w1") {
   }
 
   public_deps += [ "${chip_root}/src/crypto" ]
-
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
 }
diff --git a/src/platform/nxp/mw320/ConnectivityUtils.cpp b/src/platform/nxp/mw320/ConnectivityUtils.cpp
index 4756dc85065c84..a4e881c1e96df0 100644
--- a/src/platform/nxp/mw320/ConnectivityUtils.cpp
+++ b/src/platform/nxp/mw320/ConnectivityUtils.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "ConnectivityUtils.h"
-#include <app-common/zap-generated/enums.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <netdb.h>
diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
index 3b357371b0c03a..f669ce4b937751 100644
--- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
@@ -21,7 +21,6 @@
  *          for k32w0 platform.
  */
 
-#include <app-common/zap-generated/enums.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <crypto/CHIPCryptoPAL.h>
diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn
index d8a72d1e449718..5de785556ef7f7 100644
--- a/src/platform/nxp/rt/rw61x/BUILD.gn
+++ b/src/platform/nxp/rt/rw61x/BUILD.gn
@@ -144,10 +144,5 @@ static_library("nxp_platform") {
     "${chip_root}/src/platform:syscalls_stub",
   ]
 
-  public_configs = [
-    ":nxp_platform_config",
-
-    # address_resolve config needed by the include of server.h in ConfigurationManagerImpl.cpp
-    "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-  ]
+  public_configs = [ ":nxp_platform_config" ]
 }
diff --git a/src/platform/qpg/BUILD.gn b/src/platform/qpg/BUILD.gn
index 9122243c005874..1087c6d06677c8 100644
--- a/src/platform/qpg/BUILD.gn
+++ b/src/platform/qpg/BUILD.gn
@@ -72,7 +72,6 @@ static_library("qpg") {
 
     public_configs += [
       "${chip_root}/third_party/openthread/platforms/qpg:openthread_qpg_config",
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
     ]
 
     sources += [
diff --git a/src/platform/qpg/ConfigurationManagerImpl.cpp b/src/platform/qpg/ConfigurationManagerImpl.cpp
index 872b05cc6c08f6..a7a59bf1438483 100644
--- a/src/platform/qpg/ConfigurationManagerImpl.cpp
+++ b/src/platform/qpg/ConfigurationManagerImpl.cpp
@@ -70,11 +70,6 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
         err = StoreRebootCount(1);
         SuccessOrExit(err);
     }
-    if (!QPGConfig::ConfigValueExists(QPGConfig::kCounterKey_TotalOperationalHours))
-    {
-        err = StoreTotalOperationalHours(0);
-        SuccessOrExit(err);
-    }
 
     qvRebootReason = qvCHIP_GetResetReason();
 
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
index 1afd80c1e5181f..da5435009685cb 100644
--- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
@@ -24,6 +24,7 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <platform/DiagnosticDataProvider.h>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 #include <platform/PlatformManager.h>
 #include <platform/qpg/DiagnosticDataProviderImpl.h>
 
@@ -181,5 +182,27 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMax
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface ** netifpp)
+{
+    NetworkInterface * ifp = new NetworkInterface();
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    const char * threadNetworkName = otThreadGetNetworkName(ThreadStackMgrImpl().OTInstance());
+    ifp->name                      = Span<const char>(threadNetworkName, strlen(threadNetworkName));
+    ifp->isOperational             = true;
+    ifp->offPremiseServicesReachableIPv4.SetNull();
+    ifp->offPremiseServicesReachableIPv6.SetNull();
+    ifp->type = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::kThread;
+    uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
+    ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
+    ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
+#else
+    ifp->isOperational = false;
+    ifp->type          = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::kUnspecified;
+#endif
+    *netifpp = ifp;
+    return CHIP_NO_ERROR;
+}
+
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.h b/src/platform/qpg/DiagnosticDataProviderImpl.h
index 7f0e9147c0b53b..2da5292409021d 100644
--- a/src/platform/qpg/DiagnosticDataProviderImpl.h
+++ b/src/platform/qpg/DiagnosticDataProviderImpl.h
@@ -54,6 +54,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults) override;
     CHIP_ERROR GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults) override;
     CHIP_ERROR GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults) override;
+    CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
 };
 
 /**
diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn
index 36d3a05787c16f..e244ad178a9848 100644
--- a/src/platform/silabs/efr32/BUILD.gn
+++ b/src/platform/silabs/efr32/BUILD.gn
@@ -124,9 +124,7 @@ static_library("efr32") {
       deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
     }
 
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
+    public_configs = []
   }
 
   if (chip_enable_wifi) {
diff --git a/src/platform/silabs/efr32/Efr32OpaqueKeypair.h b/src/platform/silabs/efr32/Efr32OpaqueKeypair.h
index 9b17d42b590fbe..97c4a5a2e1a572 100644
--- a/src/platform/silabs/efr32/Efr32OpaqueKeypair.h
+++ b/src/platform/silabs/efr32/Efr32OpaqueKeypair.h
@@ -132,7 +132,7 @@ class EFR32OpaqueKeypair
      *
      * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
      **/
-    CHIP_ERROR Delete();
+    CHIP_ERROR DestroyKey();
 
 protected:
     void * mContext      = nullptr;
diff --git a/src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp b/src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp
index 5eb9f1f28a7ace..7a74c137596070 100644
--- a/src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp
+++ b/src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp
@@ -124,7 +124,7 @@ EFR32OpaqueKeypair::~EFR32OpaqueKeypair()
         // Delete volatile keys, since nobody else can after we drop the key ID.
         if (!mIsPersistent)
         {
-            Delete();
+            DestroyKey();
         }
 
         MemoryFree(mContext);
@@ -145,7 +145,7 @@ CHIP_ERROR EFR32OpaqueKeypair::Load(EFR32OpaqueKeyId opaque_id)
     // If the object contains a volatile key, clean it up before reusing the object storage
     if (mHasKey && !mIsPersistent)
     {
-        Delete();
+        DestroyKey();
     }
 
     key_id = psa_key_id_from_opaque(opaque_id);
@@ -342,7 +342,7 @@ CHIP_ERROR EFR32OpaqueKeypair::Derive(const uint8_t * their_key, size_t their_ke
     return error;
 }
 
-CHIP_ERROR EFR32OpaqueKeypair::Delete()
+CHIP_ERROR EFR32OpaqueKeypair::DestroyKey()
 {
     CHIP_ERROR error    = CHIP_NO_ERROR;
     psa_status_t status = PSA_ERROR_BAD_STATE;
diff --git a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp
index 314c0ad4d3f54b..67b7c5e7d48fcc 100644
--- a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp
+++ b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp
@@ -209,7 +209,7 @@ CHIP_ERROR Efr32PsaOperationalKeystore::NewOpKeypairForFabric(FabricIndex fabric
         }
         else
         {
-            mPendingKeypair->Delete();
+            mPendingKeypair->DestroyKey();
             if (id == kEFR32OpaqueKeyIdVolatile)
             {
                 id = kEFR32OpaqueKeyIdUnknown;
@@ -313,9 +313,7 @@ CHIP_ERROR Efr32PsaOperationalKeystore::CommitOpKeypairForFabric(FabricIndex fab
     // There's a good chance we'll need the key again soon
     mCachedKey->Load(id);
 
-    mPendingKeypair         = nullptr;
-    mIsPendingKeypairActive = false;
-    mPendingFabricIndex     = kUndefinedFabricIndex;
+    ResetPendingKey(true /* keepKeyPairInStorage */);
 
     return CHIP_NO_ERROR;
 }
@@ -361,7 +359,7 @@ CHIP_ERROR Efr32PsaOperationalKeystore::RemoveOpKeypairForFabric(FabricIndex fab
     if (id == cachedId)
     {
         // Delete from persistent storage and unload
-        mCachedKey->Delete();
+        mCachedKey->DestroyKey();
         return CHIP_NO_ERROR;
     }
 
@@ -372,7 +370,7 @@ CHIP_ERROR Efr32PsaOperationalKeystore::RemoveOpKeypairForFabric(FabricIndex fab
         return CHIP_ERROR_INTERNAL;
     }
 
-    mCachedKey->Delete();
+    mCachedKey->DestroyKey();
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h
index 4cb035e1459d2c..868535b97a63dd 100644
--- a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h
+++ b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h
@@ -94,13 +94,17 @@ class Efr32PsaOperationalKeystore : public chip::Crypto::OperationalKeystore
     bool mIsInitialized                      = false;
 
 private:
-    void ResetPendingKey()
+    void ResetPendingKey(bool keepKeyPairInStorage = false)
     {
-        if (mPendingKeypair != nullptr)
+        if (mPendingKeypair != nullptr && !keepKeyPairInStorage)
         {
-            mPendingKeypair->Delete();
-            Platform::Delete(mPendingKeypair);
+            // This removes the PSA Keypair from storage and unloads it
+            // using the EFR32OpaqueKeypair context.
+            // We destroy it when the OperationKeyStore process failed.
+            mPendingKeypair->DestroyKey();
         }
+
+        Platform::Delete(mPendingKeypair);
         mPendingKeypair         = nullptr;
         mIsPendingKeypairActive = false;
         mPendingFabricIndex     = kUndefinedFabricIndex;
diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h
index 58ca6d7b961d54..64be3e24d386e6 100644
--- a/src/platform/silabs/rs911x/rsi_ble_config.h
+++ b/src/platform/silabs/rs911x/rsi_ble_config.h
@@ -20,11 +20,11 @@
 
 #include "rsi_ble_apis.h"
 #if (SIWX_917 | EXP_BOARD)
+#include "rsi_bt_common_apis.h"
 #include "rsi_user.h"
 #else
 #include <rsi_data_types.h>
 #endif
-
 /******************************************************
  * *                      Macros
  * ******************************************************/
@@ -40,7 +40,7 @@
 #define RSI_BLE_GATT_WRITE_EVENT (0x03)
 #define RSI_BLE_MTU_EVENT (0x04)
 #define RSI_BLE_GATT_INDICATION_CONFIRMATION (0x05)
-#define RSI_BLE_RESP_ATT_VALUE (0x06)
+#define RSI_BLE_EVENT_GATT_RD (0x08)
 #define RSI_SSID (0x0D)
 #define RSI_SECTYPE (0x0E)
 #define RSI_BLE_WLAN_DISCONN_NOTIFY (0x0F)
@@ -56,6 +56,19 @@
 
 #define RSI_BLE_DEV_NAME "CCP_DEVICE"
 #define RSI_BLE_SET_RAND_ADDR "00:23:A7:12:34:56"
+#define RSI_BLE_EVENT_GATT_RD (0x08)
+
+#define CLEAR_WHITELIST (0x00)
+#define ADD_DEVICE_TO_WHITELIST (0x01)
+#define DELETE_DEVICE_FROM_WHITELIST (0x02)
+
+#define CLEAR_ACCEPTLIST (0x00)
+#define ADD_DEVICE_TO_ACCEPTLIST (0x01)
+#define DELETE_DEVICE_FROM_ACCEPTLIST (0x02)
+
+#define RSI_BLE_TX_OCTETS 251
+#define RSI_BLE_TX_TIME 2120 // microseconds
+#define RSI_BLE_MATTER_CUSTOM_SERVICE_DATA_LENGTH 240
 
 #define ALL_PHYS (0x00)
 
@@ -72,55 +85,31 @@
 #define RSI_BLE_NAME_SPACE (0x01)
 #define RSI_BLE_DESCRIPTION (0x010B)
 
-#define RSI_BLE_MAX_NBR_ATT_REC (80)
-
 //! BLE characteristic custom service uuid
 #define RSI_BLE_CUSTOM_SERVICE_UUID (0xFFF6)
 #define RSI_BLE_CUSTOM_LEVEL_UUID (0x1FF1)
-#define RSI_BLE_TX_OCTETS 251
-#define RSI_BLE_TX_TIME 2120
-#define RSI_BLE_MATTER_CUSTOM_SERVICE_DATA_LENGTH 240
+
+#ifdef RSI_M4_INTERFACE
+#define RSI_BLE_MAX_NBR_ATT_REC (20)
 
 #if (SIWX_917 | EXP_BOARD)
-#define RSI_EXT_TCPIP_FEATURE_BITMAP 0
-#define CLEAR_ACCEPTLIST (0x00)
-#define ADD_DEVICE_TO_ACCEPTLIST (0x01)
-#define DELETE_DEVICE_FROM_ACCEPTLIST (0x02)
-#define RSI_BLE_MAX_NBR_PERIPHERALS (3)
-#define RSI_BLE_MAX_NBR_CENTRALS (1)
-#define RSI_FEATURE_BIT_MAP                                                                                                        \
-    (SL_SI91X_FEAT_ULP_GPIO_BASED_HANDSHAKE | SL_SI91X_FEAT_DEV_TO_HOST_ULP_GPIO_1) //! To set wlan feature select bit map
-#define RSI_TCP_IP_FEATURE_BIT_MAP                                                                                                 \
-    (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT) //! TCP/IP feature select bitmap for selecting TCP/IP features
-#define RSI_CUSTOM_FEATURE_BIT_MAP SL_SI91X_FEAT_CUSTOM_FEAT_EXTENTION_VALID //! To set custom feature select bit map
-#define RSI_BT_FEATURE_BITMAP (SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL)
-#define RSI_CONFIG_FEATURE_BITMAP 0
-#define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature check
+#define RSI_BLE_MAX_NBR_PERIPHERALS (1)
+#else
+#define RSI_BLE_MAX_NBR_SLAVES (1)
+#endif
 
-#ifdef CHIP_9117
-#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
-    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV |                       \
-     SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0 | SL_SI91X_EXT_FEAT_IEEE_80211W)
+#define RSI_BLE_NUM_CONN_EVENTS (2)
 #else
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
-    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV |                       \
-     SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0)
-#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
-#else  // EXP_BOARD
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2))
-#endif /* CHIP_9117 */
+#define RSI_BLE_MAX_NBR_ATT_REC (80)
 
-#else // For RS9116
+#if (SIWX_917 | EXP_BOARD)
+#define RSI_BLE_MAX_NBR_PERIPHERALS (3)
+#else
 #define RSI_BLE_MAX_NBR_SLAVES (3)
-#define RSI_BLE_MAX_NBR_MASTERS (1)
-//! set handshake type of power mode
-#define RSI_HAND_SHAKE_TYPE GPIO_BASED
 #endif
-#define CLEAR_WHITELIST (0x00)
-#define ADD_DEVICE_TO_WHITELIST (0x01)
-#define DELETE_DEVICE_FROM_WHITELIST (0x02)
+
 #define RSI_BLE_NUM_CONN_EVENTS (20)
+#endif
 
 #define RSI_BLE_MAX_NBR_ATT_SERV (10)
 
@@ -270,6 +259,37 @@
 #define BLE_ATT_REC_SIZE (500)
 #define NO_OF_VAL_ATT (5) //! Attribute value count
 
+#if (SIWX_917 | EXP_BOARD)
+#define RSI_BLE_MAX_NBR_CENTRALS (1)
+#define FRONT_END_SWITCH_SEL2 BIT(30)
+#define RSI_FEATURE_BIT_MAP                                                                                                        \
+    (SL_SI91X_FEAT_ULP_GPIO_BASED_HANDSHAKE | SL_SI91X_FEAT_DEV_TO_HOST_ULP_GPIO_1) //! To set wlan feature select bit map
+#define RSI_TCP_IP_FEATURE_BIT_MAP                                                                                                 \
+    (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT) //! TCP/IP feature select bitmap for selecting TCP/IP features
+#define RSI_CUSTOM_FEATURE_BIT_MAP SL_SI91X_FEAT_CUSTOM_FEAT_EXTENTION_VALID //! To set custom feature select bit map
+
+#ifdef CHIP_9117
+#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition
+#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
+    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV |                       \
+     SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0 | SL_SI91X_EXT_FEAT_IEEE_80211W)
+#else
+#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
+    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV |                       \
+     SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0)
+#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
+#else  // EXP_BOARD
+#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2))
+#endif /* CHIP_9117 */
+
+#define RSI_EXT_TCPIP_FEATURE_BITMAP 0
+#define RSI_BT_FEATURE_BITMAP (SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL)
+#define RSI_CONFIG_FEATURE_BITMAP 0
+#define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature checks
+#else
+#define RSI_BLE_MAX_NBR_MASTERS (1)
+#define RSI_HAND_SHAKE_TYPE GPIO_BASED
+#endif
 /***********************************************************************************************************************************************/
 //! user defined structure
 /***********************************************************************************************************************************************/
diff --git a/src/platform/stm32/BUILD.gn b/src/platform/stm32/BUILD.gn
index bc823db59aedf1..43f656d0eca988 100644
--- a/src/platform/stm32/BUILD.gn
+++ b/src/platform/stm32/BUILD.gn
@@ -89,10 +89,6 @@ static_library("stm32") {
     public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
 
     deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
-
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
   }
 
   # Set the compiler flags
diff --git a/src/platform/stm32/args.gni b/src/platform/stm32/args.gni
index 38080e25dd39ad..7af2988e199e70 100644
--- a/src/platform/stm32/args.gni
+++ b/src/platform/stm32/args.gni
@@ -24,6 +24,7 @@ chip_device_platform = "stm32"
 # add board protector for stm32wb
 chip_with_lwip = false
 mbedtls_target = "${stm32_sdk_build_root}:mbedtls"
+openthread_external_mbedtls = mbedtls_target
 
 # GLOBAL CONFIG
 chip_monolithic_tests = false
diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp
index c0fb4998645df7..220501a84f673a 100644
--- a/src/platform/telink/BLEManagerImpl.cpp
+++ b/src/platform/telink/BLEManagerImpl.cpp
@@ -180,8 +180,11 @@ CHIP_ERROR BLEManagerImpl::_Init(void)
 
 void BLEManagerImpl::_Shutdown()
 {
-    bt_disable();
-    mBLERadioInitialized = false;
+    if (mBLERadioInitialized)
+    {
+        bt_disable();
+        mBLERadioInitialized = false;
+    }
 }
 
 void BLEManagerImpl::DriveBLEState(intptr_t arg)
diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h
index 1849ea0ff57918..07967f8b273e4f 100644
--- a/src/platform/telink/CHIPDevicePlatformConfig.h
+++ b/src/platform/telink/CHIPDevicePlatformConfig.h
@@ -101,7 +101,11 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #endif
 
+#ifdef CONFIG_BT
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
+#endif
 
 // ========== Platform-specific Configuration =========
 
diff --git a/src/platform/telink/CHIPPlatformConfig.h b/src/platform/telink/CHIPPlatformConfig.h
index f1b17fe1f2948d..9e0dc3dd36e8f7 100644
--- a/src/platform/telink/CHIPPlatformConfig.h
+++ b/src/platform/telink/CHIPPlatformConfig.h
@@ -64,10 +64,6 @@
 
 #ifdef CONFIG_PM
 
-#ifndef CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
-#define CHIP_CONFIG_ENABLE_SERVER_IM_EVENT 0
-#endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
-
 #ifndef CHIP_CONFIG_MAX_GROUP_DATA_PEERS
 #define CHIP_CONFIG_MAX_GROUP_DATA_PEERS 7
 #endif // CHIP_CONFIG_MAX_GROUP_DATA_PEERS
diff --git a/src/platform/telink/tlsr9518adk80d_mars.conf b/src/platform/telink/tlsr9518adk80d_mars.conf
new file mode 100644
index 00000000000000..1b7b4a47378f6c
--- /dev/null
+++ b/src/platform/telink/tlsr9518adk80d_mars.conf
@@ -0,0 +1,17 @@
+CONFIG_CHIP_USE_MARS_SENSOR=y
+CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=y
+
+# SHT3XD
+CONFIG_I2C=y
+CONFIG_SENSOR=y
+
+# WS2812
+CONFIG_LED_STRIP=y
+CONFIG_LED_STRIP_LOG_LEVEL_DBG=y
+CONFIG_WS2812_STRIP=y
+CONFIG_WS2812_STRIP_GPIO_TELINK=y
+
+# DFU via USB
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
diff --git a/src/platform/telink/tlsr9518adk80d_mars.overlay b/src/platform/telink/tlsr9518adk80d_mars.overlay
new file mode 100644
index 00000000000000..303474ca04774d
--- /dev/null
+++ b/src/platform/telink/tlsr9518adk80d_mars.overlay
@@ -0,0 +1,109 @@
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/led/led.h>
+
+/ {
+	aliases {
+		led-strip = &led_strip;
+	};
+
+	leds {
+		/delete-node/ led_3;
+
+		led_red: led_3 {
+			label = "LED Red";
+			gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	pwm_leds {
+		/delete-node/ pwm_led_0;
+		/delete-node/ pwm_led_1;
+		/delete-node/ pwm_led_2;
+		/delete-node/ pwm_led_3;
+
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Blue";
+		};
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Green";
+		};
+		pwm_led2: pwm_led_2 {
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Red";
+		};
+		pwm_led3: pwm_led_3 {
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM IDENTIFY LED Green";
+		};
+	};
+
+	keys {
+		/delete-node/ button_1;
+		/delete-node/ button_4;
+		compatible = "gpio-keys";
+		key_1: button_1 {
+			gpios = <&gpiod 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_4: button_4 {
+			gpios = <&gpiod 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+	};
+
+	led_strip: ws2812 {
+		compatible = "worldsemi,ws2812-gpio";
+
+		chain-length = <1>; /* arbitrary; change at will */
+		color-mapping = <LED_COLOR_ID_GREEN
+				 LED_COLOR_ID_RED
+				 LED_COLOR_ID_BLUE>;
+		in-gpios = <&gpiob 4 0>;
+	};
+};
+
+&gpioc {
+	interrupts = <38 1>;
+};
+
+&gpiod {
+	interrupts = <37 1>;
+	status = "okay";
+};
+
+&pinctrl {
+	/* Define I2C pins: SCL(PE0), SDA(PC2) */
+	i2c_scl_pe0_default: i2c_scl_pe0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_0, B91_FUNC_A)>;
+	};
+	i2c_sda_pc2_default: i2c_sda_pc2_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_C, B9x_PIN_2, B91_FUNC_A)>;
+	};
+
+	/* PWMs */
+	pwm_ch0_pe3_default: pwm_ch0_pe3_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_3, B91_FUNC_C)>;
+	};
+	pwm_ch1_pb5_default: pwm_ch1_pb5_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_5, B91_FUNC_C)>;
+	};
+	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B91_FUNC_C)>;
+	};
+	pwm_ch4_pe4_default: pwm_ch4_pe4_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_4, B91_FUNC_C)>;
+	};
+};
+
+&i2c {
+	pinctrl-0 = <&i2c_scl_pe0_default &i2c_sda_pc2_default>;
+
+	sht3xd@44 {
+		compatible = "sensirion,sht3xd";
+		reg = <0x44>;
+	};
+};
+
+&pwm0 {
+	pinctrl-0 = <&pwm_ch0_pe3_default &pwm_ch1_pb5_default &pwm_ch2_pe2_default &pwm_ch4_pe4_default>;
+};
diff --git a/src/platform/telink/tlsr9518adk80d_mars_boot.overlay b/src/platform/telink/tlsr9518adk80d_mars_boot.overlay
new file mode 100644
index 00000000000000..64a998bb306178
--- /dev/null
+++ b/src/platform/telink/tlsr9518adk80d_mars_boot.overlay
@@ -0,0 +1,28 @@
+/ {
+	leds {
+		/delete-node/ led_0;
+
+		led_blue: led_0 {
+			label = "LED Blue";
+			gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	keys {
+		/delete-node/ button_dfu;
+
+		key_dfu: button_dfu {
+			label = "USB DFU";
+			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+	};
+};
+
+&gpioc {
+	interrupts = <38 1>;
+};
+
+&gpiod {
+	interrupts = <37 1>;
+	status = "okay";
+};
diff --git a/src/platform/telink/tlsr9528a_retention.overlay b/src/platform/telink/tlsr9528a_retention.overlay
new file mode 100644
index 00000000000000..98a0e5af508f32
--- /dev/null
+++ b/src/platform/telink/tlsr9528a_retention.overlay
@@ -0,0 +1,55 @@
+/ {
+	/*
+	 * There is no way to keep GPIOs
+	 * during deep-sleep mode so output GPIOs
+	 * and PWM's are useless.
+	 */
+
+	aliases {
+		/delete-property/ led0;
+		/delete-property/ led1;
+		/delete-property/ led2;
+		/delete-property/ led3;
+		/delete-property/ mcuboot-led0;
+		/delete-property/ pwm-led0;
+		/delete-property/ pwm-0;
+	};
+
+	/delete-node/ leds;
+	/delete-node/ pwm_leds;
+
+	keys {
+		/delete-node/ button_1;
+		/delete-node/ button_3;
+		compatible = "gpio-keys";
+		key_1: button_1 {
+			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_2: button_2 {
+			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_3: button_3 {
+			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_4: button_4 {
+			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+
+		key_matrix_col1: key_matrix_col1 {
+			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_col2: key_matrix_col2 {
+			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_row1: key_matrix_row1 {
+			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+		};
+		key_matrix_row2: key_matrix_row2 {
+			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+		};
+	};
+};
+
+&pwm0 {
+	status = "disabled";
+};
diff --git a/src/platform/tests/TestConfigurationMgr.cpp b/src/platform/tests/TestConfigurationMgr.cpp
index a113594868ad2c..07cbec3c357c94 100644
--- a/src/platform/tests/TestConfigurationMgr.cpp
+++ b/src/platform/tests/TestConfigurationMgr.cpp
@@ -55,15 +55,17 @@ static void TestPlatformMgr_Init(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 }
 
-#if !defined(NDEBUG)
 static void TestPlatformMgr_RunUnitTest(nlTestSuite * inSuite, void * inContext)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
+#if CHIP_DEVICE_LAYER_TARGET_OPEN_IOT_SDK
+    // TODO: Fix RunUnitTests() for Open IOT SDK.
+    // Previously, TestPlatformMgr_RunUnitTest was only run if !NDEBUG while the Open IOT SDK
+    // test runner was built with NDEBUG set.
+    return;
+#endif
 
-    err = ConfigurationMgr().RunUnitTests();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    ConfigurationMgr().RunUnitTests();
 }
-#endif
 
 static void TestConfigurationMgr_SerialNumber(nlTestSuite * inSuite, void * inContext)
 {
@@ -450,9 +452,7 @@ static void TestConfigurationMgr_GetProductId(nlTestSuite * inSuite, void * inCo
  */
 static const nlTest sTests[] = {
     NL_TEST_DEF("Test PlatformMgr::Init", TestPlatformMgr_Init),
-#if !defined(NDEBUG)
     NL_TEST_DEF("Test PlatformMgr::RunUnitTest", TestPlatformMgr_RunUnitTest),
-#endif
     NL_TEST_DEF("Test ConfigurationMgr::SerialNumber", TestConfigurationMgr_SerialNumber),
     NL_TEST_DEF("Test ConfigurationMgr::UniqueId", TestConfigurationMgr_UniqueId),
     NL_TEST_DEF("Test ConfigurationMgr::ManufacturingDate", TestConfigurationMgr_ManufacturingDate),
diff --git a/src/platform/tests/TestPlatformTime.cpp b/src/platform/tests/TestPlatformTime.cpp
index 8c4e9b838e3dfe..aa7c931dd67782 100644
--- a/src/platform/tests/TestPlatformTime.cpp
+++ b/src/platform/tests/TestPlatformTime.cpp
@@ -67,8 +67,11 @@ static void TestDevice_GetMonotonicMicroseconds(nlTestSuite * inSuite, void * in
         const Clock::Microseconds64 Tend   = System::SystemClock().GetMonotonicMicroseconds64();
         const Clock::Microseconds64 Tdelta = Tend - Tstart;
 
-        ChipLogProgress(DeviceLayer, "Start=%" PRIu64 " End=%" PRIu64 " Delta=%" PRIu64 " Expected=%" PRIu64, Tstart.count(),
-                        Tend.count(), Tdelta.count(), Tdelay.count());
+        ChipLogProgress(DeviceLayer,
+                        "Start=0x" ChipLogFormatX64 " End=0x" ChipLogFormatX64 " Delta=0x" ChipLogFormatX64
+                        " Expected=0x" ChipLogFormatX64,
+                        ChipLogValueX64(Tstart.count()), ChipLogValueX64(Tend.count()), ChipLogValueX64(Tdelta.count()),
+                        ChipLogValueX64(Tdelay.count()));
 
         // verify that timers don't fire early
         NL_TEST_ASSERT(inSuite, Tdelta > (Tdelay - margin));
@@ -98,8 +101,11 @@ static void TestDevice_GetMonotonicMilliseconds(nlTestSuite * inSuite, void * in
         const Clock::Milliseconds64 Tend   = System::SystemClock().GetMonotonicMilliseconds64();
         const Clock::Milliseconds64 Tdelta = Tend - Tstart;
 
-        ChipLogProgress(DeviceLayer, "Start=%" PRIu64 " End=%" PRIu64 " Delta=%" PRIu64 " Expected=%" PRIu64, Tstart.count(),
-                        Tend.count(), Tdelta.count(), Tdelay.count());
+        ChipLogProgress(DeviceLayer,
+                        "Start=0x" ChipLogFormatX64 " End=0x" ChipLogFormatX64 " Delta=0x" ChipLogFormatX64
+                        " Expected=0x" ChipLogFormatX64,
+                        ChipLogValueX64(Tstart.count()), ChipLogValueX64(Tend.count()), ChipLogValueX64(Tdelta.count()),
+                        ChipLogValueX64(Tdelay.count()));
 
         // verify that timers don't fire early
         NL_TEST_ASSERT(inSuite, Tdelta > (Tdelay - margin));
diff --git a/src/platform/webos/ConnectivityUtils.cpp b/src/platform/webos/ConnectivityUtils.cpp
index ff4ea526a0e6f0..f137ac8de2019a 100644
--- a/src/platform/webos/ConnectivityUtils.cpp
+++ b/src/platform/webos/ConnectivityUtils.cpp
@@ -21,7 +21,6 @@
  *          statistics(extracted from /proc/net/wireless) on webOS platforms.
  */
 
-#include <app-common/zap-generated/enums.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/webos/ConnectivityUtils.h>
 
@@ -566,34 +565,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate1G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate25g;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate5G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate10G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate40G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate100G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate200G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G;
+        pHYRate = app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum::kRate400G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index 0c6136e8f0f584..22f90ed72e3bd6 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -23,7 +23,6 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <app-common/zap-generated/enums.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/platform/webos/NetworkCommissioningDriver.h b/src/platform/webos/NetworkCommissioningDriver.h
index b466353743d713..b862e32966e65d 100644
--- a/src/platform/webos/NetworkCommissioningDriver.h
+++ b/src/platform/webos/NetworkCommissioningDriver.h
@@ -145,6 +145,8 @@ class LinuxThreadDriver final : public ThreadDriver
     // ThreadDriver
     Status AddOrUpdateNetwork(ByteSpan operationalDataset, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
     void ScanNetworks(ThreadDriver::ScanCallback * callback) override;
+    ThreadCapabilities GetSupportedThreadFeatures() override;
+    uint16_t GetThreadVersion() override;
 
 private:
     ThreadNetworkIterator mThreadIterator = ThreadNetworkIterator(this);
diff --git a/src/platform/webos/NetworkCommissioningThreadDriver.cpp b/src/platform/webos/NetworkCommissioningThreadDriver.cpp
index fbc7e68ba68592..557d3f6f7f7cf7 100644
--- a/src/platform/webos/NetworkCommissioningThreadDriver.cpp
+++ b/src/platform/webos/NetworkCommissioningThreadDriver.cpp
@@ -197,6 +197,25 @@ bool LinuxThreadDriver::ThreadNetworkIterator::Next(Network & item)
     return true;
 }
 
+ThreadCapabilities LinuxThreadDriver::GetSupportedThreadFeatures()
+{
+    BitMask<ThreadCapabilities> capabilites = 0;
+    capabilites.SetField(ThreadCapabilities::kIsBorderRouterCapable, CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER);
+    capabilites.SetField(ThreadCapabilities::kIsRouterCapable, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSleepyEndDeviceCapable, !CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsFullThreadDevice, CHIP_DEVICE_CONFIG_THREAD_FTD);
+    capabilites.SetField(ThreadCapabilities::kIsSynchronizedSleepyEndDeviceCapable,
+                         (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_SSED));
+    return capabilites;
+}
+
+uint16_t LinuxThreadDriver::GetThreadVersion()
+{
+    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
+    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
+    return 0;
+}
+
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 } // namespace NetworkCommissioning
diff --git a/src/platform/webos/PlatformManagerImpl.cpp b/src/platform/webos/PlatformManagerImpl.cpp
index fb353702ad622f..55995248caa5f0 100644
--- a/src/platform/webos/PlatformManagerImpl.cpp
+++ b/src/platform/webos/PlatformManagerImpl.cpp
@@ -35,7 +35,6 @@
 
 #include <thread>
 
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Events.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/protocols/bdx/BdxMessages.cpp b/src/protocols/bdx/BdxMessages.cpp
index 1db14be54ff3a9..861be46ea30013 100644
--- a/src/protocols/bdx/BdxMessages.cpp
+++ b/src/protocols/bdx/BdxMessages.cpp
@@ -585,6 +585,6 @@ void BlockQueryWithSkip::LogMessage(bdx::MessageType messageType) const
 {
     ChipLogAutomation("BlockQueryWithSkip");
     ChipLogAutomation("  Block Counter: %" PRIu32, BlockCounter);
-    ChipLogAutomation("  Bytes To Skip: %" PRIu64, BytesToSkip);
+    ChipLogAutomation("  Bytes To Skip: 0x" ChipLogFormatX64, ChipLogValueX64(BytesToSkip));
 }
 #endif // CHIP_AUTOMATION_LOGGING
diff --git a/src/protocols/secure_channel/BUILD.gn b/src/protocols/secure_channel/BUILD.gn
index 5a24a984719a5e..2061b04e82b6d5 100644
--- a/src/protocols/secure_channel/BUILD.gn
+++ b/src/protocols/secure_channel/BUILD.gn
@@ -61,4 +61,6 @@ static_library("secure_channel") {
     "${chip_root}/src/tracing:macros",
     "${chip_root}/src/transport",
   ]
+
+  deps = [ "${chip_root}/src/app:revision_info" ]
 }
diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
index 2afc40feacaf02..6e51d000e3822c 100644
--- a/src/protocols/secure_channel/CASESession.cpp
+++ b/src/protocols/secure_channel/CASESession.cpp
@@ -41,6 +41,7 @@
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/CASEDestinationId.h>
 #include <protocols/secure_channel/PairingSession.h>
+#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/SessionResumptionStorage.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <system/SystemClock.h>
@@ -640,13 +641,11 @@ CHIP_ERROR CASESession::RecoverInitiatorIpk()
 CHIP_ERROR CASESession::SendSigma1()
 {
     MATTER_TRACE_SCOPE("SendSigma1", "CASESession");
-    const size_t mrpParamsSize =
-        mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t), sizeof(uint16_t)) : 0;
-    size_t data_len = TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize, // initiatorRandom
-                                                  sizeof(uint16_t),            // initiatorSessionId,
-                                                  kSHA256_Hash_Length,         // destinationId
-                                                  kP256_PublicKey_Length,      // InitiatorEphPubKey,
-                                                  mrpParamsSize,               // initiatorMRPParams
+    size_t data_len = TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize,          // initiatorRandom
+                                                  sizeof(uint16_t),                     // initiatorSessionId,
+                                                  kSHA256_Hash_Length,                  // destinationId
+                                                  kP256_PublicKey_Length,               // InitiatorEphPubKey,
+                                                  SessionParameters::kEstimatedTLVSize, // initiatorSessionParams
                                                   SessionResumptionStorage::kResumptionIdSize, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES);
 
     System::PacketBufferTLVWriter tlvWriter;
@@ -699,11 +698,7 @@ CHIP_ERROR CASESession::SendSigma1()
     ReturnErrorOnFailure(
         tlvWriter.PutBytes(TLV::ContextTag(4), mEphemeralKey->Pubkey(), static_cast<uint32_t>(mEphemeralKey->Pubkey().Length())));
 
-    if (mLocalMRPConfig.HasValue())
-    {
-        ChipLogDetail(SecureChannel, "Including MRP parameters");
-        ReturnErrorOnFailure(EncodeMRPParameters(TLV::ContextTag(5), mLocalMRPConfig.Value(), tlvWriter));
-    }
+    ReturnErrorOnFailure(EncodeSessionParameters(TLV::ContextTag(5), mLocalMRPConfig, tlvWriter));
 
     // Try to find persistent session, and resume it.
     bool resuming = false;
@@ -916,10 +911,9 @@ CHIP_ERROR CASESession::HandleSigma1(System::PacketBufferHandle && msg)
 CHIP_ERROR CASESession::SendSigma2Resume()
 {
     MATTER_TRACE_SCOPE("SendSigma2Resume", "CASESession");
-    const size_t mrpParamsSize =
-        mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t), sizeof(uint16_t)) : 0;
-    size_t max_sigma2_resume_data_len = TLV::EstimateStructOverhead(
-        SessionResumptionStorage::kResumptionIdSize, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, sizeof(uint16_t), mrpParamsSize);
+    size_t max_sigma2_resume_data_len =
+        TLV::EstimateStructOverhead(SessionResumptionStorage::kResumptionIdSize, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES,
+                                    sizeof(uint16_t), SessionParameters::kEstimatedTLVSize);
 
     System::PacketBufferTLVWriter tlvWriter;
     System::PacketBufferHandle msg_R2_resume;
@@ -948,11 +942,7 @@ CHIP_ERROR CASESession::SendSigma2Resume()
 
     ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(3), GetLocalSessionId().Value()));
 
-    if (mLocalMRPConfig.HasValue())
-    {
-        ChipLogDetail(SecureChannel, "Including MRP parameters");
-        ReturnErrorOnFailure(EncodeMRPParameters(TLV::ContextTag(4), mLocalMRPConfig.Value(), tlvWriter));
-    }
+    ReturnErrorOnFailure(EncodeSessionParameters(TLV::ContextTag(4), mLocalMRPConfig, tlvWriter));
 
     ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType));
     ReturnErrorOnFailure(tlvWriter.Finalize(&msg_R2_resume));
@@ -1067,10 +1057,10 @@ CHIP_ERROR CASESession::SendSigma2()
                                          msg_R2_Encrypted.Get() + msg_r2_signed_enc_len, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES));
 
     // Construct Sigma2 Msg
-    const size_t mrpParamsSize =
-        mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t), sizeof(uint16_t)) : 0;
-    size_t data_len = TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize, sizeof(uint16_t), kP256_PublicKey_Length,
-                                                  msg_r2_signed_enc_len, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, mrpParamsSize);
+    size_t size_of_local_session_id = sizeof(uint16_t);
+    size_t data_len =
+        TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize, size_of_local_session_id, kP256_PublicKey_Length,
+                                    msg_r2_signed_enc_len, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, SessionParameters::kEstimatedTLVSize);
 
     System::PacketBufferHandle msg_R2 = System::PacketBufferHandle::New(data_len);
     VerifyOrReturnError(!msg_R2.IsNull(), CHIP_ERROR_NO_MEMORY);
@@ -1086,11 +1076,9 @@ CHIP_ERROR CASESession::SendSigma2()
                                                 static_cast<uint32_t>(mEphemeralKey->Pubkey().Length())));
     ReturnErrorOnFailure(tlvWriterMsg2.PutBytes(TLV::ContextTag(4), msg_R2_Encrypted.Get(),
                                                 static_cast<uint32_t>(msg_r2_signed_enc_len + CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES)));
-    if (mLocalMRPConfig.HasValue())
-    {
-        ChipLogDetail(SecureChannel, "Including MRP parameters");
-        ReturnErrorOnFailure(EncodeMRPParameters(TLV::ContextTag(5), mLocalMRPConfig.Value(), tlvWriterMsg2));
-    }
+
+    ReturnErrorOnFailure(EncodeSessionParameters(TLV::ContextTag(5), mLocalMRPConfig, tlvWriterMsg2));
+
     ReturnErrorOnFailure(tlvWriterMsg2.EndContainer(outerContainerType));
     ReturnErrorOnFailure(tlvWriterMsg2.Finalize(&msg_R2));
 
@@ -1147,7 +1135,7 @@ CHIP_ERROR CASESession::HandleSigma2Resume(System::PacketBufferHandle && msg)
     if (tlvReader.Next() != CHIP_END_OF_TLV)
     {
         SuccessOrExit(err = DecodeMRPParametersIfPresent(TLV::ContextTag(4), tlvReader));
-        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
     }
 
     ChipLogDetail(SecureChannel, "Peer assigned session session ID %d", responderSessionId);
@@ -1340,7 +1328,7 @@ CHIP_ERROR CASESession::HandleSigma2(System::PacketBufferHandle && msg)
     if (tlvReader.Next() != CHIP_END_OF_TLV)
     {
         SuccessOrExit(err = DecodeMRPParametersIfPresent(TLV::ContextTag(kTag_Sigma2_ResponderMRPParams), tlvReader));
-        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
     }
 
 exit:
@@ -2029,7 +2017,7 @@ CHIP_ERROR CASESession::ParseSigma1(TLV::ContiguousBufferTLVReader & tlvReader,
     if (err == CHIP_NO_ERROR && tlvReader.GetTag() == ContextTag(kInitiatorMRPParamsTag))
     {
         ReturnErrorOnFailure(DecodeMRPParametersIfPresent(TLV::ContextTag(kInitiatorMRPParamsTag), tlvReader));
-        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
         err = tlvReader.Next();
     }
 
diff --git a/src/protocols/secure_channel/PASESession.cpp b/src/protocols/secure_channel/PASESession.cpp
index 966bc1dbe8dae0..28979dc69e021d 100644
--- a/src/protocols/secure_channel/PASESession.cpp
+++ b/src/protocols/secure_channel/PASESession.cpp
@@ -41,6 +41,7 @@
 #include <lib/support/TypeTraits.h>
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/Constants.h>
+#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <setup_payload/SetupPayload.h>
 #include <system/TLVPacketBufferBackingStore.h>
@@ -270,13 +271,12 @@ CHIP_ERROR PASESession::SendPBKDFParamRequest()
 
     ReturnErrorOnFailure(DRBG_get_bytes(mPBKDFLocalRandomData, sizeof(mPBKDFLocalRandomData)));
 
-    const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0;
-    const size_t max_msg_len   = TLV::EstimateStructOverhead(kPBKDFParamRandomNumberSize, // initiatorRandom,
-                                                             sizeof(uint16_t),            // initiatorSessionId
-                                                             sizeof(PasscodeId),          // passcodeId,
-                                                             sizeof(uint8_t),             // hasPBKDFParameters
-                                                             mrpParamsSize                // MRP Parameters
-      );
+    const size_t max_msg_len = TLV::EstimateStructOverhead(kPBKDFParamRandomNumberSize,         // initiatorRandom,
+                                                           sizeof(uint16_t),                    // initiatorSessionId
+                                                           sizeof(PasscodeId),                  // passcodeId,
+                                                           sizeof(uint8_t),                     // hasPBKDFParameters
+                                                           SessionParameters::kEstimatedTLVSize // Session Parameters
+    );
 
     System::PacketBufferHandle req = System::PacketBufferHandle::New(max_msg_len);
     VerifyOrReturnError(!req.IsNull(), CHIP_ERROR_NO_MEMORY);
@@ -290,11 +290,9 @@ CHIP_ERROR PASESession::SendPBKDFParamRequest()
     ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), GetLocalSessionId().Value()));
     ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(3), kDefaultCommissioningPasscodeId));
     ReturnErrorOnFailure(tlvWriter.PutBoolean(TLV::ContextTag(4), mHavePBKDFParameters));
-    if (mLocalMRPConfig.HasValue())
-    {
-        ChipLogDetail(SecureChannel, "Including MRP parameters in PBKDF param request");
-        ReturnErrorOnFailure(EncodeMRPParameters(TLV::ContextTag(5), mLocalMRPConfig.Value(), tlvWriter));
-    }
+
+    ReturnErrorOnFailure(EncodeSessionParameters(TLV::ContextTag(5), mLocalMRPConfig, tlvWriter));
+
     ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType));
     ReturnErrorOnFailure(tlvWriter.Finalize(&req));
 
@@ -357,7 +355,7 @@ CHIP_ERROR PASESession::HandlePBKDFParamRequest(System::PacketBufferHandle && ms
     if (tlvReader.Next() != CHIP_END_OF_TLV)
     {
         SuccessOrExit(err = DecodeMRPParametersIfPresent(TLV::ContextTag(5), tlvReader));
-        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+        mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
     }
 
     err = SendPBKDFParamResponse(ByteSpan(initiatorRandom), hasPBKDFParameters);
@@ -382,13 +380,12 @@ CHIP_ERROR PASESession::SendPBKDFParamResponse(ByteSpan initiatorRandom, bool in
 
     ReturnErrorOnFailure(DRBG_get_bytes(mPBKDFLocalRandomData, sizeof(mPBKDFLocalRandomData)));
 
-    const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0;
     const size_t max_msg_len =
         TLV::EstimateStructOverhead(kPBKDFParamRandomNumberSize,                                // initiatorRandom
                                     kPBKDFParamRandomNumberSize,                                // responderRandom
                                     sizeof(uint16_t),                                           // responderSessionId
                                     TLV::EstimateStructOverhead(sizeof(uint32_t), mSaltLength), // pbkdf_parameters
-                                    mrpParamsSize                                               // MRP Parameters
+                                    SessionParameters::kEstimatedTLVSize                        // Session Parameters
         );
 
     System::PacketBufferHandle resp = System::PacketBufferHandle::New(max_msg_len);
@@ -413,11 +410,7 @@ CHIP_ERROR PASESession::SendPBKDFParamResponse(ByteSpan initiatorRandom, bool in
         ReturnErrorOnFailure(tlvWriter.EndContainer(pbkdfParamContainer));
     }
 
-    if (mLocalMRPConfig.HasValue())
-    {
-        ChipLogDetail(SecureChannel, "Including MRP parameters in PBKDF param response");
-        ReturnErrorOnFailure(EncodeMRPParameters(TLV::ContextTag(5), mLocalMRPConfig.Value(), tlvWriter));
-    }
+    ReturnErrorOnFailure(EncodeSessionParameters(TLV::ContextTag(5), mLocalMRPConfig, tlvWriter));
 
     ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType));
     ReturnErrorOnFailure(tlvWriter.Finalize(&resp));
@@ -481,7 +474,7 @@ CHIP_ERROR PASESession::HandlePBKDFParamResponse(System::PacketBufferHandle && m
         if (tlvReader.Next() != CHIP_END_OF_TLV)
         {
             SuccessOrExit(err = DecodeMRPParametersIfPresent(TLV::ContextTag(5), tlvReader));
-            mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+            mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
         }
 
         // TODO - Add a unit test that exercises mHavePBKDFParameters path
@@ -506,7 +499,7 @@ CHIP_ERROR PASESession::HandlePBKDFParamResponse(System::PacketBufferHandle && m
         if (tlvReader.Next() != CHIP_END_OF_TLV)
         {
             SuccessOrExit(err = DecodeMRPParametersIfPresent(TLV::ContextTag(5), tlvReader));
-            mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig(mRemoteMRPConfig);
+            mExchangeCtxt->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
         }
     }
 
diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp
index af555bfeee5046..63a1701e66541f 100644
--- a/src/protocols/secure_channel/PairingSession.cpp
+++ b/src/protocols/secure_channel/PairingSession.cpp
@@ -18,6 +18,10 @@
 
 #include <protocols/secure_channel/PairingSession.h>
 
+#include <app/DataModelRevision.h>
+#include <app/InteractionModelRevision.h>
+#include <app/SpecificationVersion.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/core/TLVTypes.h>
 #include <lib/support/SafeInt.h>
 
@@ -44,7 +48,7 @@ CHIP_ERROR PairingSession::ActivateSecureSession(const Transport::PeerAddress &
 
     // Call Activate last, otherwise errors on anything after would lead to
     // a partially valid session.
-    secureSession->Activate(GetLocalScopedNodeId(), GetPeer(), GetPeerCATs(), peerSessionId, mRemoteMRPConfig);
+    secureSession->Activate(GetLocalScopedNodeId(), GetPeer(), GetPeerCATs(), peerSessionId, GetRemoteSessionParameters());
 
     ChipLogDetail(Inet, "New secure session activated for device " ChipLogFormatScopedNodeId ", LSID:%d PSID:%d!",
                   ChipLogValueScopedNodeId(GetPeer()), secureSession->GetLocalSessionId(), peerSessionId);
@@ -88,19 +92,44 @@ void PairingSession::DiscardExchange()
     }
 }
 
-CHIP_ERROR PairingSession::EncodeMRPParameters(TLV::Tag tag, const ReliableMessageProtocolConfig & mrpLocalConfig,
-                                               TLV::TLVWriter & tlvWriter)
+CHIP_ERROR PairingSession::EncodeSessionParameters(TLV::Tag tag, const Optional<ReliableMessageProtocolConfig> & providedMrpConfig,
+                                                   TLV::TLVWriter & tlvWriter)
 {
+    // TODO: https://github.com/project-chip/connectedhomeip/issues/30456. Based on the spec we need to send values here now,
+    // but it is not entirely clear what we should be sending here when `providedMrpConfig.HasValue() == false`. For now we
+    // are sending the default MRP config values.
+    ReliableMessageProtocolConfig mrpLocalConfig = GetDefaultMRPConfig();
+    if (providedMrpConfig.HasValue())
+    {
+        mrpLocalConfig = providedMrpConfig.Value();
+    }
     TLV::TLVType mrpParamsContainer;
     ReturnErrorOnFailure(tlvWriter.StartContainer(tag, TLV::kTLVType_Structure, mrpParamsContainer));
-    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(1), mrpLocalConfig.mIdleRetransTimeout.count()));
-    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), mrpLocalConfig.mActiveRetransTimeout.count()));
-    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(3), mrpLocalConfig.mActiveThresholdTime.count()));
+    ReturnErrorOnFailure(
+        tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kSessionIdleInterval), mrpLocalConfig.mIdleRetransTimeout.count()));
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kSessionActiveInterval),
+                                       mrpLocalConfig.mActiveRetransTimeout.count()));
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kSessionActiveThreshold),
+                                       mrpLocalConfig.mActiveThresholdTime.count()));
+
+    uint16_t dataModel = CHIP_DEVICE_DATA_MODEL_REVISION;
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kDataModelRevision), dataModel));
+
+    uint16_t interactionModel = CHIP_DEVICE_INTERACTION_MODEL_REVISION;
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kInteractionModelRevision), interactionModel));
+
+    uint32_t specVersion = CHIP_DEVICE_SPECIFICATION_VERSION;
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kSpecificationVersion), specVersion));
+
+    uint16_t maxPathsPerInvoke = CHIP_CONFIG_MAX_PATHS_PER_INVOKE;
+    ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(SessionParameters::Tag::kMaxPathsPerInvoke), maxPathsPerInvoke));
     return tlvWriter.EndContainer(mrpParamsContainer);
 }
 
 CHIP_ERROR PairingSession::DecodeMRPParametersIfPresent(TLV::Tag expectedTag, TLV::ContiguousBufferTLVReader & tlvReader)
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
     // The MRP parameters are optional.
     if (tlvReader.GetTag() != expectedTag)
     {
@@ -110,50 +139,89 @@ CHIP_ERROR PairingSession::DecodeMRPParametersIfPresent(TLV::Tag expectedTag, TL
     TLV::TLVType containerType = TLV::kTLVType_Structure;
     ReturnErrorOnFailure(tlvReader.EnterContainer(containerType));
 
-    uint32_t tlvElementValue = 0;
-
     ReturnErrorOnFailure(tlvReader.Next());
 
     ChipLogDetail(SecureChannel, "Found MRP parameters in the message");
 
     // All TLV elements in the structure are optional. If the first element is present, process it and move
     // the TLV reader to the next element.
-    if (TLV::TagNumFromTag(tlvReader.GetTag()) == 1)
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kSessionIdleInterval)
     {
-        ReturnErrorOnFailure(tlvReader.Get(tlvElementValue));
-        mRemoteMRPConfig.mIdleRetransTimeout = System::Clock::Milliseconds32(tlvElementValue);
+        uint32_t idleRetransTimeout;
+        ReturnErrorOnFailure(tlvReader.Get(idleRetransTimeout));
+        mRemoteSessionParams.SetMRPIdleRetransTimeout(System::Clock::Milliseconds32(idleRetransTimeout));
 
         // The next element is optional. If it's not present, return CHIP_NO_ERROR.
-        CHIP_ERROR err = tlvReader.Next();
-        if (err == CHIP_END_OF_TLV)
-        {
-            return tlvReader.ExitContainer(containerType);
-        }
-        ReturnErrorOnFailure(err);
+        SuccessOrExit(err = tlvReader.Next());
     }
 
-    if (TLV::TagNumFromTag(tlvReader.GetTag()) == 2)
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kSessionActiveInterval)
     {
-        ReturnErrorOnFailure(tlvReader.Get(tlvElementValue));
-        mRemoteMRPConfig.mActiveRetransTimeout = System::Clock::Milliseconds32(tlvElementValue);
+        uint32_t activeRetransTimeout;
+        ReturnErrorOnFailure(tlvReader.Get(activeRetransTimeout));
+        mRemoteSessionParams.SetMRPActiveRetransTimeout(System::Clock::Milliseconds32(activeRetransTimeout));
 
         // The next element is optional. If it's not present, return CHIP_NO_ERROR.
-        CHIP_ERROR err = tlvReader.Next();
-        if (err == CHIP_END_OF_TLV)
-        {
-            return tlvReader.ExitContainer(containerType);
-        }
-        ReturnErrorOnFailure(err);
+        SuccessOrExit(err = tlvReader.Next());
     }
 
-    if (TLV::TagNumFromTag(tlvReader.GetTag()) == 3)
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kSessionActiveThreshold)
     {
-        ReturnErrorOnFailure(tlvReader.Get(tlvElementValue));
-        mRemoteMRPConfig.mActiveThresholdTime = System::Clock::Milliseconds16(tlvElementValue);
+        uint16_t activeThresholdTime;
+        ReturnErrorOnFailure(tlvReader.Get(activeThresholdTime));
+        mRemoteSessionParams.SetMRPActiveThresholdTime(System::Clock::Milliseconds16(activeThresholdTime));
+
+        // The next element is optional. If it's not present, return CHIP_NO_ERROR.
+        SuccessOrExit(err = tlvReader.Next());
+    }
+
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kDataModelRevision)
+    {
+        uint16_t dataModelRevision;
+        ReturnErrorOnFailure(tlvReader.Get(dataModelRevision));
+        mRemoteSessionParams.SetDataModelRevision(dataModelRevision);
+
+        // The next element is optional. If it's not present, return CHIP_NO_ERROR.
+        SuccessOrExit(err = tlvReader.Next());
+    }
+
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kInteractionModelRevision)
+    {
+        uint16_t interactionModelRevision;
+        ReturnErrorOnFailure(tlvReader.Get(interactionModelRevision));
+        mRemoteSessionParams.SetInteractionModelRevision(interactionModelRevision);
+
+        // The next element is optional. If it's not present, return CHIP_NO_ERROR.
+        SuccessOrExit(err = tlvReader.Next());
+    }
+
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kSpecificationVersion)
+    {
+        uint32_t specificationVersion;
+        ReturnErrorOnFailure(tlvReader.Get(specificationVersion));
+        mRemoteSessionParams.SetSpecificationVersion(specificationVersion);
+
+        // The next element is optional. If it's not present, return CHIP_NO_ERROR.
+        SuccessOrExit(err = tlvReader.Next());
     }
-    // Future proofing - Don't error out if there are other tags
 
-    return tlvReader.ExitContainer(containerType);
+    if (TLV::TagNumFromTag(tlvReader.GetTag()) == SessionParameters::Tag::kMaxPathsPerInvoke)
+    {
+        uint16_t maxPathsPerInvoke;
+        ReturnErrorOnFailure(tlvReader.Get(maxPathsPerInvoke));
+        mRemoteSessionParams.SetMaxPathsPerInvoke(maxPathsPerInvoke);
+
+        // The next element is optional. If it's not present, return CHIP_NO_ERROR.
+        SuccessOrExit(err = tlvReader.Next());
+    }
+
+    // Future proofing - Don't error out if there are other tags
+exit:
+    if (err == CHIP_END_OF_TLV)
+    {
+        return tlvReader.ExitContainer(containerType);
+    }
+    return err;
 }
 
 bool PairingSession::IsSessionEstablishmentInProgress()
diff --git a/src/protocols/secure_channel/PairingSession.h b/src/protocols/secure_channel/PairingSession.h
index c604cd0662dfd3..844fa33a41ae68 100644
--- a/src/protocols/secure_channel/PairingSession.h
+++ b/src/protocols/secure_channel/PairingSession.h
@@ -30,6 +30,7 @@
 #include <messaging/ExchangeContext.h>
 #include <protocols/secure_channel/Constants.h>
 #include <protocols/secure_channel/SessionEstablishmentDelegate.h>
+#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <transport/CryptoContext.h>
 #include <transport/SecureSession.h>
@@ -96,14 +97,15 @@ class DLL_EXPORT PairingSession : public SessionDelegate
      */
     virtual CHIP_ERROR DeriveSecureSession(CryptoContext & session) const = 0;
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return mRemoteMRPConfig; }
-    void SetRemoteMRPConfig(const ReliableMessageProtocolConfig & config) { mRemoteMRPConfig = config; }
+    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return mRemoteSessionParams.GetMRPConfig(); }
+    const SessionParameters & GetRemoteSessionParameters() const { return mRemoteSessionParams; }
+    void SetRemoteMRPConfig(const ReliableMessageProtocolConfig & config) { mRemoteSessionParams.SetMRPConfig(config); }
 
     /**
-     * Encode the provided MRP parameters using the provided TLV tag.
+     * Encode the Session Parameters using the provided TLV tag.
      */
-    static CHIP_ERROR EncodeMRPParameters(TLV::Tag tag, const ReliableMessageProtocolConfig & mrpLocalConfig,
-                                          TLV::TLVWriter & tlvWriter);
+    static CHIP_ERROR EncodeSessionParameters(TLV::Tag tag, const Optional<ReliableMessageProtocolConfig> & mrpLocalConfig,
+                                              TLV::TLVWriter & tlvWriter);
 
 protected:
     /**
@@ -200,7 +202,7 @@ class DLL_EXPORT PairingSession : public SessionDelegate
 
     /**
      * Try to decode the current element (pointed by the TLV reader) as MRP parameters.
-     * If the MRP parameters are found, mRemoteMRPConfig is updated with the devoded values.
+     * If the MRP parameters are found, mRemoteSessionParams is updated with the devoded values.
      *
      * MRP parameters are optional. So, if the TLV reader is not pointing to the MRP parameters,
      * the function is a noop.
@@ -231,9 +233,9 @@ class DLL_EXPORT PairingSession : public SessionDelegate
     SessionEstablishmentDelegate * mDelegate   = nullptr;
 
     // mLocalMRPConfig is our config which is sent to the other end and used by the peer session.
-    // mRemoteMRPConfig is received from other end and set to our session.
+    // mRemoteSessionParams is received from other end and set to our session.
     Optional<ReliableMessageProtocolConfig> mLocalMRPConfig;
-    ReliableMessageProtocolConfig mRemoteMRPConfig = GetDefaultMRPConfig();
+    SessionParameters mRemoteSessionParams;
 
 private:
     Optional<uint16_t> mPeerSessionId;
diff --git a/src/protocols/secure_channel/SessionParameters.h b/src/protocols/secure_channel/SessionParameters.h
new file mode 100644
index 00000000000000..a595e7803aa633
--- /dev/null
+++ b/src/protocols/secure_channel/SessionParameters.h
@@ -0,0 +1,109 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <lib/core/TLV.h>
+#include <messaging/ReliableMessageProtocolConfig.h>
+
+namespace chip {
+
+// TODO We should get part of this from constexpr that is in ReliableMessageProtocolConfig.h
+
+class SessionParameters
+{
+public:
+    SessionParameters(ReliableMessageProtocolConfig mrpConfig = GetDefaultMRPConfig()) : mMRPConfig(mrpConfig) {}
+
+    // This estimated TLV size calc is here instead of messaging/ReliableMessageProtocolConfig.h
+    // because we would need to add `include <lib/core/TLV.h>`. While we could make it all work
+    // from a build standpoint, if any new MRP config gets added accessors will still need to be
+    // added here so having this calc done here isn't problematic.
+    static constexpr size_t kSizeOfSessionIdleInterval      = sizeof(uint32_t);
+    static constexpr size_t kSizeOfSessionActiveInterval    = sizeof(uint32_t);
+    static constexpr size_t kSizeOfSessionActiveThreshold   = sizeof(uint16_t);
+    static constexpr size_t kSizeOfDataModelRevision        = sizeof(uint16_t);
+    static constexpr size_t kSizeOfInteractionModelRevision = sizeof(uint16_t);
+    static constexpr size_t kSizeOfSpecificationVersion     = sizeof(uint32_t);
+    static constexpr size_t kSizeOfMaxPathsPerInvoke        = sizeof(uint16_t);
+
+    static constexpr size_t kEstimatedTLVSize = TLV::EstimateStructOverhead(
+        kSizeOfSessionIdleInterval, kSizeOfSessionActiveInterval, kSizeOfSessionActiveThreshold, kSizeOfDataModelRevision,
+        kSizeOfInteractionModelRevision, kSizeOfSpecificationVersion, kSizeOfMaxPathsPerInvoke);
+
+    // From Section 4.12.8 "Parameters and Constants" in chapter "Secure Channel".
+    enum Tag : uint32_t
+    {
+        kSessionIdleInterval      = 1,
+        kSessionActiveInterval    = 2,
+        kSessionActiveThreshold   = 3,
+        kDataModelRevision        = 4,
+        kInteractionModelRevision = 5,
+        kSpecificationVersion     = 6,
+        kMaxPathsPerInvoke        = 7,
+    };
+
+    const ReliableMessageProtocolConfig & GetMRPConfig() const { return mMRPConfig; }
+    void SetMRPConfig(const ReliableMessageProtocolConfig & config) { mMRPConfig = config; }
+    void SetMRPIdleRetransTimeout(const System::Clock::Milliseconds32 idleRetransTimeout)
+    {
+        mMRPConfig.mIdleRetransTimeout = idleRetransTimeout;
+    }
+    void SetMRPActiveRetransTimeout(const System::Clock::Milliseconds32 activeRetransTimeout)
+    {
+        mMRPConfig.mActiveRetransTimeout = activeRetransTimeout;
+    }
+    void SetMRPActiveThresholdTime(const System::Clock::Milliseconds16 activeThresholdTime)
+    {
+        mMRPConfig.mActiveThresholdTime = activeThresholdTime;
+    }
+
+    const Optional<uint16_t> & GetDataModelRevision() const { return mDataModelRevision; }
+    void SetDataModelRevision(const uint16_t dataModelRevision) { mDataModelRevision = MakeOptional(dataModelRevision); }
+
+    const Optional<uint16_t> & GetInteractionModelRevision() const { return mInteractionModelRevision; }
+    void SetInteractionModelRevision(const uint16_t interactionModelRevision)
+    {
+        mInteractionModelRevision = MakeOptional(interactionModelRevision);
+    }
+
+    const Optional<uint32_t> & GetSpecificationVersion() const { return mSpecificationVersion; }
+    void SetSpecificationVersion(const uint32_t specificationVersion)
+    {
+        mSpecificationVersion = MakeOptional(specificationVersion);
+    }
+
+    uint16_t GetMaxPathsPerInvoke() const { return mMaxPathsPerInvoke; }
+    void SetMaxPathsPerInvoke(const uint16_t maxPathsPerInvoke) { mMaxPathsPerInvoke = maxPathsPerInvoke; }
+
+private:
+    ReliableMessageProtocolConfig mMRPConfig;
+    // For legacy reasons if we do not get DataModelRevision it means either 16 or 17. But there isn't
+    // a way to know for certain.
+    Optional<uint16_t> mDataModelRevision;
+    // For legacy reasons if we do not get InteractionModelRevision it means either 10 or 11. But there
+    // isn't a way to know for certain.
+    Optional<uint16_t> mInteractionModelRevision;
+    // For legacy reasons if we do not get SpecificationVersion it means that version is less than
+    // 0x01030000. But there isn't a way to know for certain.
+    Optional<uint32_t> mSpecificationVersion;
+    // When maxPathsPerInvoke is not provided legacy is always 1
+    uint16_t mMaxPathsPerInvoke = 1;
+};
+
+} // namespace chip
diff --git a/src/protocols/secure_channel/tests/TestPASESession.cpp b/src/protocols/secure_channel/tests/TestPASESession.cpp
index 9e7f4356c9d005..b22a899f7225d0 100644
--- a/src/protocols/secure_channel/tests/TestPASESession.cpp
+++ b/src/protocols/secure_channel/tests/TestPASESession.cpp
@@ -256,10 +256,21 @@ void SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inContext, S
         NL_TEST_ASSERT(inSuite, rm != nullptr);
         NL_TEST_ASSERT(inSuite, rc != nullptr);
 
-        contextCommissioner->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig({
-            64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
-            64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-        });
+        // Adding an if-else to avoid affecting non-ICD tests
+#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1
+        // Increase local MRP retry intervals to take into account the increase response delay from an ICD
+        contextCommissioner->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(
+            ReliableMessageProtocolConfig({
+                1000_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
+                1000_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+            }));
+#else  // CHIP_CONFIG_ENABLE_ICD_SERVER != 1
+        contextCommissioner->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(
+            ReliableMessageProtocolConfig({
+                64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
+                64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+            }));
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     }
 
     NL_TEST_ASSERT(inSuite,
@@ -279,8 +290,15 @@ void SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inContext, S
 
     while (delegate.mMessageDropped)
     {
+        auto waitTimeout = 100_ms + CHIP_CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST;
+
+#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1
+        // If running as an ICD, increase waitTimeout to account for the polling interval
+        waitTimeout += CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL;
+#endif
+
         // Wait some time so the dropped message will be retransmitted when we drain the IO.
-        chip::test_utils::SleepMillis((100_ms + CHIP_CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST).count());
+        chip::test_utils::SleepMillis(waitTimeout.count());
         delegate.mMessageDropped = false;
         ReliableMessageMgr::Timeout(&ctx.GetSystemLayer(), ctx.GetExchangeManager().GetReliableMessageMgr());
         ctx.DrainAndServiceIO();
@@ -439,10 +457,10 @@ void SecurePairingFailedHandshake(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm != nullptr);
     NL_TEST_ASSERT(inSuite, rc != nullptr);
 
-    contextCommissioner->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteMRPConfig({
+    contextCommissioner->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(ReliableMessageProtocolConfig({
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
         64_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
-    });
+    }));
 
     NL_TEST_ASSERT(inSuite,
                    ctx.GetExchangeManager().RegisterUnsolicitedMessageHandlerForType(
diff --git a/src/protocols/secure_channel/tests/TestPairingSession.cpp b/src/protocols/secure_channel/tests/TestPairingSession.cpp
index 714a18e03fc1a4..ac1c4537888bc8 100644
--- a/src/protocols/secure_channel/tests/TestPairingSession.cpp
+++ b/src/protocols/secure_channel/tests/TestPairingSession.cpp
@@ -46,7 +46,7 @@ class TestPairingSession : public PairingSession
 
     void OnSessionReleased() override {}
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return mRemoteMRPConfig; }
+    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return PairingSession::GetRemoteMRPConfig(); }
 
     CHIP_ERROR DeriveSecureSession(CryptoContext & session) const override { return CHIP_NO_ERROR; }
 
@@ -70,7 +70,8 @@ void PairingSessionEncodeDecodeMRPParams(nlTestSuite * inSuite, void * inContext
     NL_TEST_ASSERT(inSuite,
                    writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerContainerType) == CHIP_NO_ERROR);
 
-    NL_TEST_ASSERT(inSuite, PairingSession::EncodeMRPParameters(TLV::ContextTag(1), config, writer) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite,
+                   PairingSession::EncodeSessionParameters(TLV::ContextTag(1), MakeOptional(config), writer) == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, writer.EndContainer(outerContainerType) == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, writer.Finalize(&buf) == CHIP_NO_ERROR);
diff --git a/src/python_testing/TC_DeviceBasicComposition.py b/src/python_testing/TC_DeviceBasicComposition.py
index 1f5dc38813a975..30a4353f7ffe88 100644
--- a/src/python_testing/TC_DeviceBasicComposition.py
+++ b/src/python_testing/TC_DeviceBasicComposition.py
@@ -15,101 +15,22 @@
 #    limitations under the License.
 #
 
-import base64
-import copy
-import functools
-import json
 import logging
-import pathlib
-import sys
-from collections import defaultdict
-from dataclasses import dataclass, field
-from pprint import pprint
-from typing import Any, Callable, Optional
+from dataclasses import dataclass
+from typing import Any, Callable
 
 import chip.clusters as Clusters
 import chip.clusters.ClusterObjects
 import chip.tlv
+from basic_composition_support import BasicCompositionTests
 from chip.clusters.Attribute import ValueDecodeFailure
-from conformance_support import ConformanceDecision, conformance_allowed
+from global_attribute_ids import GlobalAttributeIds
 from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, MatterBaseTest,
                                     async_test_body, default_matter_test_main)
 from mobly import asserts
-from spec_parsing_support import CommandType, build_xml_clusters
-
-
-def MatterTlvToJson(tlv_data: dict[int, Any]) -> dict[str, Any]:
-    """Given TLV data for a specific cluster instance, convert to the Matter JSON format."""
-
-    matter_json_dict = {}
-
-    key_type_mappings = {
-        chip.tlv.uint: "UINT",
-        int: "INT",
-        bool: "BOOL",
-        list: "ARRAY",
-        dict: "STRUCT",
-        chip.tlv.float32: "FLOAT",
-        float: "DOUBLE",
-        bytes: "BYTES",
-        str: "STRING",
-        ValueDecodeFailure: "ERROR",
-        type(None): "NULL",
-    }
-
-    def ConvertValue(value) -> Any:
-        if isinstance(value, ValueDecodeFailure):
-            raise ValueError(f"Bad Value: {str(value)}")
-
-        if isinstance(value, bytes):
-            return base64.b64encode(value).decode("UTF-8")
-        elif isinstance(value, list):
-            value = [ConvertValue(item) for item in value]
-        elif isinstance(value, dict):
-            value = MatterTlvToJson(value)
-
-        return value
-
-    for key in tlv_data:
-        value_type = type(tlv_data[key])
-        value = copy.deepcopy(tlv_data[key])
-
-        element_type: str = key_type_mappings[value_type]
-        sub_element_type = ""
-
-        try:
-            new_value = ConvertValue(value)
-        except ValueError as e:
-            new_value = str(e)
-
-        if element_type:
-            if element_type == "ARRAY":
-                if len(new_value):
-                    sub_element_type = key_type_mappings[type(tlv_data[key][0])]
-                else:
-                    sub_element_type = "?"
-
-        new_key = ""
-        if element_type:
-            if sub_element_type:
-                new_key = f"{str(key)}:{element_type}-{sub_element_type}"
-            else:
-                new_key = f"{str(key)}:{element_type}"
-        else:
-            new_key = str(key)
-
-        matter_json_dict[new_key] = new_value
-
-    return matter_json_dict
-
-
-@dataclass
-class TagProblem:
-    root: int
-    missing_attribute: bool
-    missing_feature: bool
-    duplicates: set[int]
-    same_tag: set[int] = field(default_factory=set)
+from taglist_and_topology_test_support import (create_device_type_list_for_root, create_device_type_lists, find_tag_list_problems,
+                                               find_tree_roots, get_all_children, get_direct_children_of_root, parts_list_cycles,
+                                               separate_endpoint_types)
 
 
 def check_int_in_range(min_value: int, max_value: int, allow_null: bool = False) -> Callable:
@@ -179,232 +100,11 @@ def check_no_duplicates(obj: Any) -> None:
         raise ValueError(f"Value {str(obj)} contains duplicate values")
 
 
-def separate_endpoint_types(endpoint_dict: dict[int, Any]) -> tuple[list[int], list[int]]:
-    """Returns a tuple containing the list of flat endpoints and a list of tree endpoints"""
-    flat = []
-    tree = []
-    for endpoint_id, endpoint in endpoint_dict.items():
-        if endpoint_id == 0:
-            continue
-        aggregator_id = 0x000e
-        content_app_id = 0x0024
-        device_types = [d.deviceType for d in endpoint[Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]]
-        if aggregator_id in device_types:
-            flat.append(endpoint_id)
-        else:
-            if content_app_id in device_types:
-                continue
-            tree.append(endpoint_id)
-    return (flat, tree)
-
-
-def get_all_children(endpoint_id, endpoint_dict: dict[int, Any]) -> set[int]:
-    """Returns all the children (include subchildren) of the given endpoint
-       This assumes we've already checked that there are no cycles, so we can do the dumb things and just trace the tree
-    """
-    children = set()
-
-    def add_children(endpoint_id, children):
-        immediate_children = endpoint_dict[endpoint_id][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]
-        if not immediate_children:
-            return
-        children.update(set(immediate_children))
-        for child in immediate_children:
-            add_children(child, children)
-
-    add_children(endpoint_id, children)
-    return children
-
-
-def find_tree_roots(tree_endpoints: list[int], endpoint_dict: dict[int, Any]) -> set[int]:
-    """Returns a set of all the endpoints in tree_endpoints that are roots for a tree (not include singletons)"""
-    tree_roots = set()
-
-    def find_tree_root(current_id):
-        for endpoint_id, endpoint in endpoint_dict.items():
-            if endpoint_id not in tree_endpoints:
-                continue
-            if current_id in endpoint[Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]:
-                # this is not the root, move up
-                return find_tree_root(endpoint_id)
-        return current_id
-
-    for endpoint_id in tree_endpoints:
-        root = find_tree_root(endpoint_id)
-        if root != endpoint_id:
-            tree_roots.add(root)
-    return tree_roots
-
-
-def parts_list_cycles(tree_endpoints: list[int], endpoint_dict: dict[int, Any]) -> list[int]:
-    """Returns a list of all the endpoints in the tree_endpoints list that contain cycles"""
-    def parts_list_cycle_detect(visited: set, current_id: int) -> bool:
-        if current_id in visited:
-            return True
-        visited.add(current_id)
-        for child in endpoint_dict[current_id][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]:
-            child_has_cycles = parts_list_cycle_detect(visited, child)
-            if child_has_cycles:
-                return True
-        return False
-
-    cycles = []
-    # This is quick enough that we can do all the endpoints wihtout searching for the roots
-    for endpoint_id in tree_endpoints:
-        visited = set()
-        if parts_list_cycle_detect(visited, endpoint_id):
-            cycles.append(endpoint_id)
-    return cycles
-
-
-def create_device_type_lists(roots: list[int], endpoint_dict: dict[int, Any]) -> dict[int, dict[int, set[int]]]:
-    """Returns a list of endpoints per device type for each root in the list"""
-    device_types = {}
-    for root in roots:
-        tree_device_types = defaultdict(set)
-        eps = get_all_children(root, endpoint_dict)
-        eps.add(root)
-        for ep in eps:
-            for d in endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]:
-                tree_device_types[d.deviceType].add(ep)
-        device_types[root] = tree_device_types
-
-    return device_types
-
-
-def get_direct_children_of_root(endpoint_dict: dict[int, Any]) -> set[int]:
-    root_children = set(endpoint_dict[0][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList])
-    direct_children = root_children
-    for ep in root_children:
-        ep_children = set(endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList])
-        direct_children = direct_children - ep_children
-    return direct_children
-
-
-def create_device_type_list_for_root(direct_children, endpoint_dict: dict[int, Any]) -> dict[int, set[int]]:
-    device_types = defaultdict(set)
-    for ep in direct_children:
-        for d in endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]:
-            device_types[d.deviceType].add(ep)
-    return device_types
-
-
-def cmp_tag_list(a: Clusters.Descriptor.Structs.SemanticTagStruct, b: Clusters.Descriptor.Structs.SemanticTagStruct):
-    if a.mfgCode != b.mfgCode:
-        return -1 if a.mfgCode < b.mfgCode else 1
-    if a.namespaceID != b.namespaceID:
-        return -1 if a.namespaceID < b.namespaceID else 1
-    if a.tag != b.tag:
-        return -1 if a.tag < b.tag else 1
-    if a.label != b.label:
-        return -1 if a.label < b.label else 1
-    return 0
-
-
-def find_tag_list_problems(roots: list[int], device_types: dict[int, dict[int, set[int]]], endpoint_dict: dict[int, Any]) -> dict[int, TagProblem]:
-    """Checks for non-spec compliant tag lists"""
-    tag_problems = {}
-    for root in roots:
-        for _, endpoints in device_types[root].items():
-            if len(endpoints) < 2:
-                continue
-            for endpoint in endpoints:
-                missing_feature = not bool(endpoint_dict[endpoint][Clusters.Descriptor]
-                                           [Clusters.Descriptor.Attributes.FeatureMap] & Clusters.Descriptor.Bitmaps.Feature.kTagList)
-                if Clusters.Descriptor.Attributes.TagList not in endpoint_dict[endpoint][Clusters.Descriptor] or endpoint_dict[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList] == []:
-                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=True,
-                                                        missing_feature=missing_feature, duplicates=endpoints)
-                    continue
-                # Check that this tag isn't the same as the other tags in the endpoint list
-                duplicate_tags = set()
-                for other in endpoints:
-                    if other == endpoint:
-                        continue
-                    # The OTHER endpoint is missing a tag list attribute - ignore this here, we'll catch that when we assess this endpoint as the primary
-                    if Clusters.Descriptor.Attributes.TagList not in endpoint_dict[other][Clusters.Descriptor]:
-                        continue
-
-                    if sorted(endpoint_dict[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList], key=functools.cmp_to_key(cmp_tag_list)) == sorted(endpoint_dict[other][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList], key=functools.cmp_to_key(cmp_tag_list)):
-                        duplicate_tags.add(other)
-                if len(duplicate_tags) != 0:
-                    duplicate_tags.add(endpoint)
-                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=False, missing_feature=missing_feature,
-                                                        duplicates=endpoints, same_tag=duplicate_tags)
-                    continue
-                if missing_feature:
-                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=False,
-                                                        missing_feature=missing_feature, duplicates=endpoints)
-
-    return tag_problems
-
-
-class TC_DeviceBasicComposition(MatterBaseTest):
+class TC_DeviceBasicComposition(MatterBaseTest, BasicCompositionTests):
     @async_test_body
     async def setup_class(self):
         super().setup_class()
-        dev_ctrl = self.default_controller
-        self.problems = []
-
-        do_test_over_pase = self.user_params.get("use_pase_only", True)
-        dump_device_composition_path: Optional[str] = self.user_params.get("dump_device_composition_path", None)
-
-        if do_test_over_pase:
-            info = self.get_setup_payload_info()
-
-            commissionable_nodes = dev_ctrl.DiscoverCommissionableNodes(
-                info.filter_type, info.filter_value, stopOnFirst=True, timeoutSecond=15)
-            logging.info(f"Commissionable nodes: {commissionable_nodes}")
-            # TODO: Support BLE
-            if commissionable_nodes is not None and len(commissionable_nodes) > 0:
-                commissionable_node = commissionable_nodes[0]
-                instance_name = f"{commissionable_node.instanceName}._matterc._udp.local"
-                vid = f"{commissionable_node.vendorId}"
-                pid = f"{commissionable_node.productId}"
-                address = f"{commissionable_node.addresses[0]}"
-                logging.info(f"Found instance {instance_name}, VID={vid}, PID={pid}, Address={address}")
-
-                node_id = 1
-                dev_ctrl.EstablishPASESessionIP(address, info.passcode, node_id)
-            else:
-                asserts.fail("Failed to find the DUT according to command line arguments.")
-        else:
-            # Using the already commissioned node
-            node_id = self.dut_node_id
-
-        wildcard_read = (await dev_ctrl.Read(node_id, [()]))
-        endpoints_tlv = wildcard_read.tlvAttributes
-
-        node_dump_dict = {endpoint_id: MatterTlvToJson(endpoints_tlv[endpoint_id]) for endpoint_id in endpoints_tlv}
-        logging.info(f"Raw TLV contents of Node: {json.dumps(node_dump_dict, indent=2)}")
-
-        if dump_device_composition_path is not None:
-            with open(pathlib.Path(dump_device_composition_path).with_suffix(".json"), "wt+") as outfile:
-                json.dump(node_dump_dict, outfile, indent=2)
-            with open(pathlib.Path(dump_device_composition_path).with_suffix(".txt"), "wt+") as outfile:
-                pprint(wildcard_read.attributes, outfile, indent=1, width=200, compact=True)
-
-        logging.info("###########################################################")
-        logging.info("Start of actual tests")
-        logging.info("###########################################################")
-
-        # ======= State kept for use by all tests =======
-
-        # All endpoints in "full object" indexing format
-        self.endpoints = wildcard_read.attributes
-
-        # All endpoints in raw TLV format
-        self.endpoints_tlv = wildcard_read.tlvAttributes
-
-    def get_test_name(self) -> str:
-        """Return the function name of the caller. Used to create logging entries."""
-        return sys._getframe().f_back.f_code.co_name
-
-    def fail_current_test(self, msg: Optional[str] = None):
-        if not msg:
-            # Without a message, just log the last problem seen
-            asserts.fail(msg=self.problems[-1].problem)
-        else:
-            asserts.fail(msg)
+        await self.setup_class_helper()
 
     # ======= START OF ACTUAL TESTS =======
     def test_TC_SM_1_1(self):
@@ -468,30 +168,28 @@ def test_DT_1_1(self):
     def test_IDM_10_1(self):
         self.print_step(1, "Perform a wildcard read of attributes on all endpoints - already done")
 
-        self.print_step(2, "Validate all global attributes are present")
-
         @dataclass
         class RequiredMandatoryAttribute:
             id: int
             name: str
             validators: list[Callable]
 
-        ATTRIBUTE_LIST_ID = 0xFFFB
-
         ATTRIBUTES_TO_CHECK = [
-            RequiredMandatoryAttribute(id=0xFFFD, name="ClusterRevision", validators=[check_int_in_range(1, 0xFFFF)]),
-            RequiredMandatoryAttribute(id=0xFFFC, name="FeatureMap", validators=[check_int_in_range(0, 0xFFFF_FFFF)]),
-            RequiredMandatoryAttribute(id=0xFFFB, name="AttributeList",
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.CLUSTER_REVISION_ID, name="ClusterRevision",
+                                       validators=[check_int_in_range(1, 0xFFFF)]),
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.FEATURE_MAP_ID, name="FeatureMap",
+                                       validators=[check_int_in_range(0, 0xFFFF_FFFF)]),
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.ATTRIBUTE_LIST_ID, name="AttributeList",
                                        validators=[check_non_empty_list_of_ints_in_range(0, 0xFFFF_FFFF), check_no_duplicates]),
             # TODO: Check for EventList
             # RequiredMandatoryAttribute(id=0xFFFA, name="EventList", validator=check_list_of_ints_in_range(0, 0xFFFF_FFFF)),
-            RequiredMandatoryAttribute(id=0xFFF9, name="AcceptedCommandList",
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID, name="AcceptedCommandList",
                                        validators=[check_list_of_ints_in_range(0, 0xFFFF_FFFF), check_no_duplicates]),
-            RequiredMandatoryAttribute(id=0xFFF8, name="GeneratedCommandList",
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.GENERATED_COMMAND_LIST_ID, name="GeneratedCommandList",
                                        validators=[check_list_of_ints_in_range(0, 0xFFFF_FFFF), check_no_duplicates]),
         ]
 
-        self.print_step(3, "Validate all reported attributes match AttributeList")
+        self.print_step(2, "Validate all global attributes are present")
         success = True
         for endpoint_id, endpoint in self.endpoints_tlv.items():
             for cluster_id, cluster in endpoint.items():
@@ -500,7 +198,7 @@ class RequiredMandatoryAttribute:
 
                     has_attribute = (req_attribute.id in cluster)
                     location = AttributePathLocation(endpoint_id, cluster_id, req_attribute.id)
-                    logging.info(
+                    logging.debug(
                         f"Checking for mandatory global {attribute_string} on {location.as_cluster_string(self.cluster_mapper)}: {'found' if has_attribute else 'not_found'}")
 
                     # Check attribute is actually present
@@ -510,27 +208,73 @@ class RequiredMandatoryAttribute:
                         success = False
                         continue
 
+        self.print_step(3, "Validate the global attributes are in range and do not contain duplicates")
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                for req_attribute in ATTRIBUTES_TO_CHECK:
                     # Validate attribute value based on the provided validators.
                     for validator in req_attribute.validators:
                         try:
                             validator(cluster[req_attribute.id])
                         except ValueError as e:
+                            location = AttributePathLocation(endpoint_id, cluster_id, req_attribute.id)
                             self.record_error(self.get_test_name(), location=location,
                                               problem=f"Failed validation of value on {location.as_string(self.cluster_mapper)}: {str(e)}", spec_location="Global Elements")
                             success = False
                             continue
 
+        self.print_step(4, "Validate the attribute list exactly matches the set of reported attributes")
+        if success:
+            for endpoint_id, endpoint in self.endpoints_tlv.items():
+                for cluster_id, cluster in endpoint.items():
+                    attribute_list = cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID]
+                    for attribute_id in attribute_list:
+                        location = AttributePathLocation(endpoint_id, cluster_id, attribute_id)
+                        has_attribute = attribute_id in cluster
+
+                        attribute_string = self.cluster_mapper.get_attribute_string(cluster_id, attribute_id)
+                        logging.debug(
+                            f"Checking presence of claimed supported {attribute_string} on {location.as_cluster_string(self.cluster_mapper)}: {'found' if has_attribute else 'not_found'}")
+
+                        # Check attribute is actually present.
+                        if not has_attribute:
+                            # TODO: Handle detecting write-only attributes from schema.
+                            if "WriteOnly" in attribute_string:
+                                continue
+
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f"Did not find {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} when it was claimed in AttributeList ({attribute_list})", spec_location="AttributeList Attribute")
+                            success = False
+                            continue
+
+                        attribute_value = cluster[attribute_id]
+                        if isinstance(attribute_value, ValueDecodeFailure):
+                            self.record_warning(self.get_test_name(), location=location,
+                                                problem=f"Found a failure to read/decode {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} when it was claimed as supported in AttributeList ({attribute_list}): {str(attribute_value)}", spec_location="AttributeList Attribute")
+                            # Warn only for now
+                            # TODO: Fail in the future
+                            continue
+                    for attribute_id in cluster:
+                        if attribute_id not in attribute_list:
+                            attribute_string = self.cluster_mapper.get_attribute_string(cluster_id, attribute_id)
+                            location = AttributePathLocation(endpoint_id, cluster_id, attribute_id)
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f'Found attribute {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} not listed in attribute list', spec_location="AttributeList Attribute")
+                            success = False
+
+        self.print_step(
+            5, "Validate that the global attributes do not contain any additional values in the standard or scoped range that are not defined by the cluster specification")
         # Validate there are attributes in the global range that are not in the required list
         allowed_globals = [a.id for a in ATTRIBUTES_TO_CHECK]
         # also allow event list because it's not disallowed
         event_list_id = 0xFFFA
         allowed_globals.append(event_list_id)
         global_range_min = 0x0000_F000
-        standard_range_max = 0x000_4FFF
+        attribute_standard_range_max = 0x000_4FFF
         mei_range_min = 0x0001_0000
         for endpoint_id, endpoint in self.endpoints_tlv.items():
             for cluster_id, cluster in endpoint.items():
-                globals = [a for a in cluster[ATTRIBUTE_LIST_ID] if a >= global_range_min and a < mei_range_min]
+                globals = [a for a in cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID] if a >= global_range_min and a < mei_range_min]
                 unexpected_globals = sorted(list(set(globals) - set(allowed_globals)))
                 for unexpected in unexpected_globals:
                     location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=unexpected)
@@ -544,7 +288,8 @@ class RequiredMandatoryAttribute:
                 if cluster_id not in chip.clusters.ClusterObjects.ALL_ATTRIBUTES:
                     # Skip clusters that are not part of the standard generated corpus (e.g. MS clusters)
                     continue
-                standard_attributes = [a for a in cluster[ATTRIBUTE_LIST_ID] if a <= standard_range_max]
+                standard_attributes = [a for a in cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID]
+                                       if a <= attribute_standard_range_max]
                 allowed_standard_attributes = chip.clusters.ClusterObjects.ALL_ATTRIBUTES[cluster_id]
                 unexpected_standard_attributes = sorted(list(set(standard_attributes) - set(allowed_standard_attributes)))
                 for unexpected in unexpected_standard_attributes:
@@ -554,25 +299,91 @@ class RequiredMandatoryAttribute:
                     success = False
 
         # validate there are no attributes in the range between standard and global
+        # This is de-facto already covered in the check above, assuming the spec hasn't defined any values in this range, but we should make sure
         for endpoint_id, endpoint in self.endpoints_tlv.items():
             for cluster_id, cluster in endpoint.items():
-                bad_range_values = [a for a in cluster[ATTRIBUTE_LIST_ID] if a > standard_range_max and a < global_range_min]
+                bad_range_values = [a for a in cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID] if a >
+                                    attribute_standard_range_max and a < global_range_min]
                 for bad in bad_range_values:
                     location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=bad)
                     self.record_error(self.get_test_name(), location=location,
                                       problem=f"Attribute in undefined range {bad} in cluster {cluster_id}", spec_location=f"Cluster {cluster_id}")
                     success = False
 
+        command_standard_range_max = 0x0000_00FF
+        # Command lists only have a scoped range, so we only need to check for known command ids, no global range check
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                if cluster_id not in chip.clusters.ClusterObjects.ALL_CLUSTERS:
+                    continue
+                standard_accepted_commands = [
+                    a for a in cluster[GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID] if a <= command_standard_range_max]
+                standard_generated_commands = [
+                    a for a in cluster[GlobalAttributeIds.GENERATED_COMMAND_LIST_ID] if a <= command_standard_range_max]
+                if cluster_id in chip.clusters.ClusterObjects.ALL_ACCEPTED_COMMANDS:
+                    allowed_accepted_commands = [a for a in chip.clusters.ClusterObjects.ALL_ACCEPTED_COMMANDS[cluster_id]]
+                else:
+                    allowed_accepted_commands = []
+                if cluster_id in chip.clusters.ClusterObjects.ALL_GENERATED_COMMANDS:
+                    allowed_generated_commands = [a for a in chip.clusters.ClusterObjects.ALL_GENERATED_COMMANDS[cluster_id]]
+                else:
+                    allowed_generated_commands = []
+
+                # Compare the set of commands in the standard range that the DUT says it accepts vs. the commands we know about.
+                unexpected_accepted_commands = sorted(list(set(standard_accepted_commands) - set(allowed_accepted_commands)))
+                unexpected_generated_commands = sorted(list(set(standard_generated_commands) - set(allowed_generated_commands)))
+
+                for unexpected in unexpected_accepted_commands:
+                    location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=unexpected)
+                    self.record_error(self.get_test_name(
+                    ), location=location, problem=f'Unexpected accepted command {unexpected} in cluster {cluster_id} allowed: {allowed_accepted_commands} listed: {standard_accepted_commands}', spec_location=f'Cluster {cluster_id}')
+                    success = False
+
+                for unexpected in unexpected_generated_commands:
+                    location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=unexpected)
+                    self.record_error(self.get_test_name(
+                    ), location=location, problem=f'Unexpected generated command {unexpected} in cluster {cluster_id} allowed: {allowed_generated_commands} listed: {standard_generated_commands}', spec_location=f'Cluster {cluster_id}')
+                    success = False
+
+        self.print_step(
+            6, "Validate that none of the global attribute IDs contain values with prefixes outside of the allowed standard or MEI prefix range")
+        is_ci = self.check_pics('PICS_SDK_CI_ONLY')
+        if is_ci:
+            # test vendor prefixes are allowed in the CI because we use them internally in examples
+            bad_prefix_min = 0xFFF5_0000
+        else:
+            # test vendor prefixes are not allowed in products
+            bad_prefix_min = 0xFFF1_0000
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                attr_prefixes = [a & 0xFFFF_0000 for a in cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID]]
+                cmd_values = cluster[GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID] + \
+                    cluster[GlobalAttributeIds.GENERATED_COMMAND_LIST_ID]
+                cmd_prefixes = [a & 0xFFFF_0000 for a in cmd_values]
+                bad_attrs = [a for a in attr_prefixes if a >= bad_prefix_min]
+                bad_cmds = [a for a in cmd_prefixes if a >= bad_prefix_min]
+                for bad in bad_attrs:
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=bad)
+                    self.record_error(self.get_test_name(
+                    ), location=location, problem=f'Attribute with bad prefix {attribute_id} in cluster {cluster_id}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                    success = False
+                for bad in bad_cmds:
+                    location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=bad)
+                    self.record_error(self.get_test_name(
+                    ), location=location, problem=f'Command with bad prefix {attribute_id} in cluster {cluster_id}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                    success = False
+
+        self.print_step(7, "Validate that none of the MEI global attribute IDs contain values outside of the allowed suffix range")
         # Validate that any attribute in the manufacturer prefix range is in the standard suffix range.
-        suffix_mask = 0x000_FFFF
+        suffix_mask = 0x0000_FFFF
         for endpoint_id, endpoint in self.endpoints_tlv.items():
             for cluster_id, cluster in endpoint.items():
-                manufacturer_range_values = [a for a in cluster[ATTRIBUTE_LIST_ID] if a > mei_range_min]
+                manufacturer_range_values = [a for a in cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID] if a > mei_range_min]
                 for manufacturer_value in manufacturer_range_values:
                     suffix = manufacturer_value & suffix_mask
                     location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
                                                      attribute_id=manufacturer_value)
-                    if suffix > standard_range_max and suffix < global_range_min:
+                    if suffix > attribute_standard_range_max and suffix < global_range_min:
                         self.record_error(self.get_test_name(), location=location,
                                           problem=f"Manufacturer attribute in undefined range {manufacturer_value} in cluster {cluster_id}",
                                           spec_location=f"Cluster {cluster_id}")
@@ -583,54 +394,75 @@ class RequiredMandatoryAttribute:
                                           spec_location=f"Cluster {cluster_id}")
                         success = False
 
-        # TODO: maybe while we're at it, we should check that the command list doesn't contain unexpected commands.
-
-        # Validate presence of claimed attributes
-        if success:
-            # TODO: Also check the reverse: that each attribute appears in the AttributeList.
-            logging.info(
-                "Validating that a wildcard read on each cluster provided all attributes claimed in AttributeList mandatory global attribute")
-
-            for endpoint_id, endpoint in self.endpoints_tlv.items():
-                for cluster_id, cluster in endpoint.items():
-                    attribute_list = cluster[ATTRIBUTE_LIST_ID]
-                    for attribute_id in attribute_list:
-                        location = AttributePathLocation(endpoint_id, cluster_id, attribute_id)
-                        has_attribute = attribute_id in cluster
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                accepted_manufacturer_range_values = [
+                    a for a in cluster[GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID] if a > mei_range_min]
+                generated_manufacturer_range_values = [
+                    a for a in cluster[GlobalAttributeIds.GENERATED_COMMAND_LIST_ID] if a > mei_range_min]
+                all_command_manufacturer_range_values = accepted_manufacturer_range_values + generated_manufacturer_range_values
+                for manufacturer_value in all_command_manufacturer_range_values:
+                    suffix = manufacturer_value & suffix_mask
+                    location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=manufacturer_value)
+                    if suffix > command_standard_range_max:
+                        self.record_error(self.get_test_name(
+                        ), location=location, problem=f'Manufacturer command in the undefined suffix range {manufacturer_value} in cluster {cluster_id}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                        success = False
 
-                        attribute_string = self.cluster_mapper.get_attribute_string(cluster_id, attribute_id)
-                        logging.info(
-                            f"Checking presence of claimed supported {attribute_string} on {location.as_cluster_string(self.cluster_mapper)}: {'found' if has_attribute else 'not_found'}")
+        self.print_step(8, "Validate that all cluster ID prefixes are in the standard or MEI range")
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            cluster_prefixes = [a & 0xFFFF_0000 for a in endpoint.keys()]
+            bad_clusters_ids = [a for a in cluster_prefixes if a >= bad_prefix_min]
+            for bad in bad_clusters_ids:
+                location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=bad)
+                self.record_error(self.get_test_name(), location=location,
+                                  problem=f'Bad cluster id prefix {bad}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                success = False
 
-                        # Check attribute is actually present.
-                        if not has_attribute:
-                            # TODO: Handle detecting write-only attributes from schema.
-                            if "WriteOnly" in attribute_string:
-                                continue
+        self.print_step(9, "Validate that all clusters in the standard range have a known cluster ID")
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            standard_clusters = [a for a in endpoint.keys() if a < mei_range_min]
+            unknown_clusters = sorted(list(set(standard_clusters) - set(chip.clusters.ClusterObjects.ALL_CLUSTERS)))
+            for bad in unknown_clusters:
+                location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=bad)
+                self.record_error(self.get_test_name(
+                ), location=location, problem=f'Unknown cluster ID in the standard range {bad}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                success = False
 
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem=f"Did not find {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} when it was claimed in AttributeList ({attribute_list})", spec_location="AttributeList Attribute")
-                            success = False
-                            continue
+        self.print_step(10, "Validate that all clusters in the MEI range have a suffix in the manufacturer suffix range")
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            mei_clusters = [a for a in endpoint.keys() if a >= mei_range_min]
+            bad_clusters = [a for a in mei_clusters if ((a & 0x0000_FFFF) < 0xFC00) or ((a & 0x0000_FFFF) > 0xFFFE)]
+            for bad in bad_clusters:
+                location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=bad)
+                self.record_error(self.get_test_name(
+                ), location=location, problem=f'MEI cluster with an out of range suffix {bad}', spec_location='Manufacturer Extensible Identifier (MEI)')
+                success = False
 
-                        attribute_value = cluster[attribute_id]
-                        if isinstance(attribute_value, ValueDecodeFailure):
-                            self.record_warning(self.get_test_name(), location=location,
-                                                problem=f"Found a failure to read/decode {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} when it was claimed as supported in AttributeList ({attribute_list}): {str(attribute_value)}", spec_location="AttributeList Attribute")
-                            # Warn only for now
-                            # TODO: Fail in the future
-                            continue
-                    for attribute_id in cluster:
-                        if attribute_id not in attribute_list:
-                            attribute_string = self.cluster_mapper.get_attribute_string(cluster_id, attribute_id)
-                            location = AttributePathLocation(endpoint_id, cluster_id, attribute_id)
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem=f'Found attribute {attribute_string} on {location.as_cluster_string(self.cluster_mapper)} not listed in attribute list', spec_location="AttributeList Attribute")
-                            success = False
+        self.print_step(11, "Validate that standard cluster FeatureMap attributes contains only known feature flags")
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                if cluster_id not in chip.clusters.ClusterObjects.ALL_CLUSTERS:
+                    continue
+                feature_map = cluster[GlobalAttributeIds.FEATURE_MAP_ID]
+                feature_mask = 0
+                try:
+                    feature_map_enum = chip.clusters.ClusterObjects.ALL_CLUSTERS[cluster_id].Bitmaps.Feature
+                    for f in feature_map_enum:
+                        feature_mask = feature_mask | f
+                except AttributeError:
+                    # If there is no feature bitmap, feature mask 0 is correct
+                    pass
+                feature_map_extras = feature_map & ~feature_mask
+                if feature_map_extras != 0:
+                    location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id)
+                    self.record_error(self.get_test_name(), location=location,
+                                      problem=f'Standard cluster {cluster_id} with unkonwn feature {feature_map_extras:02x}')
+                    success = False
 
         if not success:
             self.fail_current_test(
-                "At least one cluster was missing a mandatory global attribute or had differences between claimed attributes supported and actual.")
+                "At least one cluster has failed the range and support checks for its listed attributes, commands or features")
 
     def test_IDM_11_1(self):
         success = True
@@ -873,129 +705,6 @@ def test_DESC_2_2(self):
         if problems or root_problems:
             self.fail_current_test("Problems with tags lists")
 
-    def test_spec_conformance(self):
-        success = True
-        # TODO: provisional needs to be an input parameter
-        allow_provisional = True
-        clusters, problems = build_xml_clusters()
-        self.problems = self.problems + problems
-        for id in sorted(list(clusters.keys())):
-            print(f'{id} 0x{id:02x}: {clusters[id].name}')
-        for endpoint_id, endpoint in self.endpoints_tlv.items():
-            for cluster_id, cluster in endpoint.items():
-                if cluster_id not in clusters.keys():
-                    if (cluster_id & 0xFFFF_0000) != 0:
-                        # manufacturer cluster
-                        continue
-                    location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id)
-                    # TODO: update this from a warning once we have all the data
-                    self.record_warning(self.get_test_name(), location=location,
-                                        problem='Standard cluster found on device, but is not present in spec data')
-                    continue
-
-                # TODO: switch to use global FEATURE_MAP_ID etc. once the IDM-10.1 change is merged.
-                FEATURE_MAP_ID = 0xFFFC
-                ATTRIBUTE_LIST_ID = 0xFFFB
-                ACCEPTED_COMMAND_ID = 0xFFF9
-                GENERATED_COMMAND_ID = 0xFFF8
-
-                feature_map = cluster[FEATURE_MAP_ID]
-                attribute_list = cluster[ATTRIBUTE_LIST_ID]
-                all_command_list = cluster[ACCEPTED_COMMAND_ID] + cluster[GENERATED_COMMAND_ID]
-
-                # Feature conformance checking
-                feature_masks = [1 << i for i in range(32) if feature_map & (1 << i)]
-                for f in feature_masks:
-                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=FEATURE_MAP_ID)
-                    if f not in clusters[cluster_id].features.keys():
-                        self.record_error(self.get_test_name(), location=location, problem=f'Unknown feature with mask 0x{f:02x}')
-                        success = False
-                        continue
-                    xml_feature = clusters[cluster_id].features[f]
-                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
-                    if not conformance_allowed(conformance_decision, allow_provisional):
-                        self.record_error(self.get_test_name(), location=location,
-                                          problem=f'Disallowed feature with mask 0x{f:02x}')
-                        success = False
-                for feature_mask, xml_feature in clusters[cluster_id].features.items():
-                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
-                    if conformance_decision == ConformanceDecision.MANDATORY and feature_mask not in feature_masks:
-                        self.record_error(self.get_test_name(), location=location,
-                                          problem=f'Required feature with mask 0x{f:02x} is not present in feature map')
-                        success = False
-
-                # Attribute conformance checking
-                for attribute_id, attribute in cluster.items():
-                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
-                    if attribute_id not in clusters[cluster_id].attributes.keys():
-                        # TODO: Consolidate the range checks with IDM-10.1 once that lands
-                        if attribute_id <= 0x4FFF:
-                            # manufacturer attribute
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem='Standard attribute found on device, but not in spec')
-                            success = False
-                        continue
-                    xml_attribute = clusters[cluster_id].attributes[attribute_id]
-                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
-                    if not conformance_allowed(conformance_decision, allow_provisional):
-                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
-                        self.record_error(self.get_test_name(), location=location,
-                                          problem=f'Attribute 0x{attribute_id:02x} is included, but is disallowed by conformance')
-                        success = False
-                for attribute_id, xml_attribute in clusters[cluster_id].attributes.items():
-                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
-                    if conformance_decision == ConformanceDecision.MANDATORY and attribute_id not in cluster.keys():
-                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
-                        self.record_error(self.get_test_name(), location=location,
-                                          problem=f'Attribute 0x{attribute_id:02x} is required, but is not present on the DUT')
-                        success = False
-
-                def check_spec_conformance_for_commands(command_type: CommandType) -> bool:
-                    success = True
-                    # TODO: once IDM-10.1 lands, use the globals
-                    global_attribute_id = 0xFFF9 if command_type == CommandType.ACCEPTED else 0xFFF8
-                    xml_commands_dict = clusters[cluster_id].accepted_commands if command_type == CommandType.ACCEPTED else clusters[cluster_id].generated_commands
-                    command_list = cluster[global_attribute_id]
-                    for command_id in command_list:
-                        location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
-                        if command_id not in xml_commands_dict:
-                            # TODO: Consolidate range checks with IDM-10.1 once that lands
-                            if command_id <= 0xFF:
-                                # manufacturer command
-                                continue
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem='Standard command found on device, but not in spec')
-                            success = False
-                            continue
-                        xml_command = xml_commands_dict[command_id]
-                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
-                        if not conformance_allowed(conformance_decision, allow_provisional):
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem=f'Command 0x{command_id:02x} is included, but disallowed by conformance')
-                            success = False
-                    for command_id, xml_command in xml_commands_dict.items():
-                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
-                        if conformance_decision == ConformanceDecision.MANDATORY and command_id not in command_list:
-                            location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
-                            self.record_error(self.get_test_name(), location=location,
-                                              problem=f'Command 0x{command_id:02x} is required, but is not present on the DUT')
-                            success = False
-                    return success
-
-                # Command conformance checking
-                cmd_success = check_spec_conformance_for_commands(CommandType.ACCEPTED)
-                success = False if not cmd_success else success
-                cmd_success = check_spec_conformance_for_commands(CommandType.GENERATED)
-                success = False if not cmd_success else success
-
-        # TODO: Add choice checkers
-
-        if not success:
-            # TODO: Right now, we have failures in all-cluster, so we can't fail this test and keep it in CI. For now, just log.
-            # Issue tracking: #29812
-            # self.fail_current_test("Problems with conformance")
-            logging.error("Problems found with conformance, this should turn into a test failure once #29812 is resolved")
-
 
 if __name__ == "__main__":
     default_matter_test_main()
diff --git a/src/python_testing/TC_DeviceConformance.py b/src/python_testing/TC_DeviceConformance.py
new file mode 100644
index 00000000000000..ddccc041cba567
--- /dev/null
+++ b/src/python_testing/TC_DeviceConformance.py
@@ -0,0 +1,220 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from typing import Callable
+
+import chip.clusters as Clusters
+from basic_composition_support import BasicCompositionTests
+from chip.tlv import uint
+from conformance_support import ConformanceDecision, conformance_allowed
+from global_attribute_ids import GlobalAttributeIds
+from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, MatterBaseTest,
+                                    async_test_body, default_matter_test_main)
+from spec_parsing_support import CommandType, build_xml_clusters
+
+
+class TC_DeviceConformance(MatterBaseTest, BasicCompositionTests):
+    @async_test_body
+    async def setup_class(self):
+        super().setup_class()
+        await self.setup_class_helper()
+        self.xml_clusters, self.problems = build_xml_clusters()
+
+    def test_TC_IDM_10_2(self):
+        def conformance_str(conformance: Callable, feature_map: uint, feature_dict: dict[str, uint]) -> str:
+            codes = []
+            for mask, details in feature_dict.items():
+                if mask & feature_map:
+                    codes.append(details.code)
+
+            return f'Conformance: {str(conformance)}, implemented features: {",".join(codes)}'
+
+        ignore_in_progress = self.user_params.get("ignore_in_progress", False)
+        is_ci = self.check_pics('PICS_SDK_CI_ONLY')
+
+        ignore_attributes: dict[int, list[int]] = {}
+        ignore_features: dict[int, list[int]] = {}
+        if ignore_in_progress:
+            # This is a manually curated list of attributes that are in-progress in the SDK, but have landed in the spec
+            in_progress_attributes = {Clusters.BasicInformation.id: [0x15, 0x016],
+                                      Clusters.PowerSource.id: [0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A]}
+            ignore_attributes.update(in_progress_attributes)
+            # The spec currently has an error on the power source features
+            # This should be removed once https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/7823 lands
+            in_progress_features = {Clusters.PowerSource.id: [(1 << 2), (1 << 3), (1 << 4), (1 << 5)]}
+            ignore_features.update(in_progress_features)
+
+        if is_ci:
+            # The network commissioning clusters on the CI select the features on the fly and end up non-conformant
+            # on these attributes. Production devices should not.
+            ci_ignore_attributes = {Clusters.NetworkCommissioning.id: [
+                Clusters.NetworkCommissioning.Attributes.ScanMaxTimeSeconds.attribute_id, Clusters.NetworkCommissioning.Attributes.ConnectMaxTimeSeconds.attribute_id]}
+            ignore_attributes.update(ci_ignore_attributes)
+
+        success = True
+        allow_provisional = self.user_params.get("allow_provisional", False)
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                if cluster_id not in self.xml_clusters.keys():
+                    if (cluster_id & 0xFFFF_0000) != 0:
+                        # manufacturer cluster
+                        continue
+                    location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id)
+                    # TODO: update this from a warning once we have all the data
+                    self.record_warning(self.get_test_name(), location=location,
+                                        problem='Standard cluster found on device, but is not present in spec data')
+                    continue
+
+                feature_map = cluster[GlobalAttributeIds.FEATURE_MAP_ID]
+                attribute_list = cluster[GlobalAttributeIds.ATTRIBUTE_LIST_ID]
+                all_command_list = cluster[GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID] + \
+                    cluster[GlobalAttributeIds.GENERATED_COMMAND_LIST_ID]
+
+                # Feature conformance checking
+                feature_masks = [1 << i for i in range(32) if feature_map & (1 << i)]
+                for f in feature_masks:
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
+                                                     attribute_id=GlobalAttributeIds.FEATURE_MAP_ID)
+                    if f not in self.xml_clusters[cluster_id].features.keys():
+                        self.record_error(self.get_test_name(), location=location, problem=f'Unknown feature with mask 0x{f:02x}')
+                        success = False
+                        continue
+                    if cluster_id in ignore_features and f in ignore_features[cluster_id]:
+                        continue
+                    xml_feature = self.xml_clusters[cluster_id].features[f]
+                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
+                    if not conformance_allowed(conformance_decision, allow_provisional):
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Disallowed feature with mask 0x{f:02x}')
+                        success = False
+                for feature_mask, xml_feature in self.xml_clusters[cluster_id].features.items():
+                    if cluster_id in ignore_features and feature_mask in ignore_features[cluster_id]:
+                        continue
+                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
+                    if conformance_decision == ConformanceDecision.MANDATORY and feature_mask not in feature_masks:
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Required feature with mask 0x{f:02x} is not present in feature map. {conformance_str(xml_feature.conformance, feature_map, self.xml_clusters[cluster_id].features)}')
+                        success = False
+
+                # Attribute conformance checking
+                for attribute_id, attribute in cluster.items():
+                    if cluster_id in ignore_attributes and attribute_id in ignore_attributes[cluster_id]:
+                        continue
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                    if attribute_id not in self.xml_clusters[cluster_id].attributes.keys():
+                        # TODO: Consolidate the range checks with IDM-10.1 once that lands
+                        if attribute_id <= 0x4FFF:
+                            # manufacturer attribute
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem='Standard attribute found on device, but not in spec')
+                            success = False
+                        continue
+                    xml_attribute = self.xml_clusters[cluster_id].attributes[attribute_id]
+                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
+                    if not conformance_allowed(conformance_decision, allow_provisional):
+                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Attribute 0x{attribute_id:02x} is included, but is disallowed by conformance. {conformance_str(xml_attribute.conformance, feature_map, self.xml_clusters[cluster_id].features)}')
+                        success = False
+                for attribute_id, xml_attribute in self.xml_clusters[cluster_id].attributes.items():
+                    if cluster_id in ignore_attributes and attribute_id in ignore_attributes[cluster_id]:
+                        continue
+                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
+                    if conformance_decision == ConformanceDecision.MANDATORY and attribute_id not in cluster.keys():
+                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Attribute 0x{attribute_id:02x} is required, but is not present on the DUT. {conformance_str(xml_attribute.conformance, feature_map, self.xml_clusters[cluster_id].features)}')
+                        success = False
+
+                def check_spec_conformance_for_commands(command_type: CommandType) -> bool:
+                    success = True
+                    global_attribute_id = GlobalAttributeIds.ACCEPTED_COMMAND_LIST_ID if command_type == CommandType.ACCEPTED else GlobalAttributeIds.GENERATED_COMMAND_LIST_ID
+                    xml_commands_dict = self.xml_clusters[cluster_id].accepted_commands if command_type == CommandType.ACCEPTED else self.xml_clusters[cluster_id].generated_commands
+                    command_list = cluster[global_attribute_id]
+                    for command_id in command_list:
+                        location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
+                        if command_id not in xml_commands_dict:
+                            # TODO: Consolidate range checks with IDM-10.1 once that lands
+                            if command_id <= 0xFF:
+                                # manufacturer command
+                                continue
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem='Standard command found on device, but not in spec')
+                            success = False
+                            continue
+                        xml_command = xml_commands_dict[command_id]
+                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
+                        if not conformance_allowed(conformance_decision, allow_provisional):
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f'Command 0x{command_id:02x} is included, but disallowed by conformance. {conformance_str(xml_command.conformance, feature_map, self.xml_clusters[cluster_id].features)}')
+                            success = False
+                    for command_id, xml_command in xml_commands_dict.items():
+                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
+                        if conformance_decision == ConformanceDecision.MANDATORY and command_id not in command_list:
+                            location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f'Command 0x{command_id:02x} is required, but is not present on the DUT. {conformance_str(xml_command.conformance, feature_map, self.xml_clusters[cluster_id].features)}')
+                            success = False
+                    return success
+
+                # Command conformance checking
+                cmd_success = check_spec_conformance_for_commands(CommandType.ACCEPTED)
+                success = False if not cmd_success else success
+                cmd_success = check_spec_conformance_for_commands(CommandType.GENERATED)
+                success = False if not cmd_success else success
+
+        # TODO: Add choice checkers
+
+        if not success:
+            self.fail_current_test("Problems with conformance")
+
+    def test_IDM_10_3(self):
+        success = True
+
+        ignore_in_progress = self.user_params.get("ignore_in_progress", False)
+
+        ignore_revisions: list[int] = []
+        if ignore_in_progress:
+            # This is a manually curated list of cluster revisions that are in-progress in the SDK, but have landed in the spec
+            in_progress_revisions = [Clusters.BasicInformation.id, Clusters.PowerSource.id, Clusters.NetworkCommissioning.id]
+            ignore_revisions.extend(in_progress_revisions)
+
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                if cluster_id not in self.xml_clusters.keys():
+                    if (cluster_id & 0xFFFF_0000) != 0:
+                        # manufacturer cluster
+                        continue
+                    location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id)
+                    # TODO: update this from a warning once we have all the data
+                    self.record_warning(self.get_test_name(), location=location,
+                                        problem='Standard cluster found on device, but is not present in spec data')
+                    continue
+                if cluster_id in ignore_revisions:
+                    continue
+                if int(self.xml_clusters[cluster_id].revision) != cluster[GlobalAttributeIds.CLUSTER_REVISION_ID]:
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
+                                                     attribute_id=GlobalAttributeIds.CLUSTER_REVISION_ID)
+                    self.record_error(self.get_test_name(
+                    ), location=location, problem=f'Revision found on cluster ({cluster[GlobalAttributeIds.CLUSTER_REVISION_ID]}) does not match revision listed in the spec ({self.xml_clusters[cluster_id].revision})')
+                    success = False
+        if not success:
+            self.fail_current_test("Problems with cluster revision on at least one cluster")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_ICDM_2_1.py b/src/python_testing/TC_ICDM_2_1.py
index bf6f2a3f117717..20770c400ddd3f 100644
--- a/src/python_testing/TC_ICDM_2_1.py
+++ b/src/python_testing/TC_ICDM_2_1.py
@@ -14,10 +14,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+import logging
+
 import chip.clusters as Clusters
 from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
+logger = logging.getLogger('PythonMatterControllerTEST')
+logger.setLevel(logging.INFO)
+
 
 class TC_ICDM_2_1(MatterBaseTest):
     async def read_icdm_attribute_expect_success(self, endpoint, attribute):
@@ -27,13 +32,17 @@ async def read_icdm_attribute_expect_success(self, endpoint, attribute):
     @async_test_body
     async def test_TC_ICDM_2_1(self):
 
+        if not self.check_pics("ICDM.S"):
+            logger.info("Test skipped because PICS ICDM.S is not set")
+            return
+
         endpoint = self.user_params.get("endpoint", 0)
 
         self.print_step(1, "Commissioning, already done")
         attributes = Clusters.IcdManagement.Attributes
         idleModeDuration = 0
 
-        # Idle Mode Interval attribute test
+        # Idle Mode Duration attribute test
         if (self.check_pics("ICDM.S.A0000")):
             self.print_step(2, "Read IdleModeDuration Attribute")
 
@@ -44,7 +53,7 @@ async def test_TC_ICDM_2_1(self):
         else:
             asserts.assert_true(False, "IdleModeDuration is a mandatory attribute and must be present in the PICS file")
 
-        # Active Mode Interval attribute test
+        # Active Mode Duration attribute test
         if (self.check_pics("ICDM.S.A0001")):
             self.print_step(2, "Read ActiveModeDuration Attribute")
 
@@ -80,8 +89,10 @@ async def test_TC_ICDM_2_1(self):
         if (self.check_pics("ICDM.S.A0003")):
             self.print_step(2, "Read ICDCounter Attribute")
 
-            await self.read_icdm_attribute_expect_success(endpoint=endpoint,
-                                                          attribute=attributes.ICDCounter)
+            ICDCounter = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
+                                                                       attribute=attributes.ICDCounter)
+            asserts.assert_true(0 <= ICDCounter <= 4294967295,
+                                "ICDCounter attribute does not fit in a uint32.")
 
         # ClientsSupportedPerFabric attribute test
         if (self.check_pics("ICDM.S.A0003")):
@@ -89,8 +100,10 @@ async def test_TC_ICDM_2_1(self):
 
             clientsSupportedPerFabric = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
                                                                                       attribute=attributes.ClientsSupportedPerFabric)
+            asserts.assert_true(0 <= clientsSupportedPerFabric <= 65535,
+                                "ActiveModeThreshold ClientsSupportedPerFabric does not fit in a uint16.")
             asserts.assert_greater_equal(clientsSupportedPerFabric, 1,
-                                         "ActiveModeThreshold attribute is smaller than minimum value (300).")
+                                         "ClientsSupportedPerFabric attribute is smaller than minimum value (1).")
 
 
 if __name__ == "__main__":
diff --git a/src/python_testing/TC_IDM_10_1.py b/src/python_testing/TC_IDM_10_1.py
deleted file mode 100644
index 44ac9f3f64712c..00000000000000
--- a/src/python_testing/TC_IDM_10_1.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-#    Copyright (c) 2022 Project CHIP Authors
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-import logging
-
-from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
-from mobly import asserts
-
-STANDARD_PREFIX = 0x0000
-MANUFACTURER_CODE_RANGE = range(0x0001, 0xFFF0 + 1)
-TEST_VENDOR_RANGE = range(0xFFF1, 0xFFF4 + 1)
-INVALID_VENDOR_RANGE = range(0xFFF5, 0xFFFF + 1)
-
-ATTRIBUTE_ID_RANGE = range(0x0000, 0x4FFF + 1)
-GLOBAL_ATTRIBUTE_ID_RANGE = range(0xF000, 0xFFFE + 1)
-COMMAND_ID_RANGE = range(0x00, 0xFF + 1)
-
-ATTRIBUTE_LIST_ID = 0xFFFB
-ACCEPTED_COMMAND_LIST_ID = 0xFFF9
-GENERATED_COMMAND_LIST_ID = 0xFFF8
-
-
-def split_element_into_prefix_suffix(element):
-    return (element >> 16), (element & 0xFFFF)
-
-
-def validate_attribute_id_range(attribute_id):
-    prefix, suffix = split_element_into_prefix_suffix(attribute_id)
-
-    if prefix == STANDARD_PREFIX:
-        if suffix not in ATTRIBUTE_ID_RANGE and suffix not in GLOBAL_ATTRIBUTE_ID_RANGE:
-            asserts.fail(f"Invalid attribute id (0x{attribute_id:08X}) in standard range")
-
-    elif prefix in MANUFACTURER_CODE_RANGE:
-        if suffix not in ATTRIBUTE_ID_RANGE:
-            asserts.fail(f"Invalid attribute id (0x{attribute_id:08X}) in MC range")
-
-    elif prefix in TEST_VENDOR_RANGE:
-        if suffix in ATTRIBUTE_ID_RANGE:
-            logging.info(f"Warning: Attribute id (0x{attribute_id:08X}) found in test vendor range")
-        else:
-            asserts.fail(f"Invalid attribute id (0x{attribute_id:08X}) in Test Vendor MC range")
-
-    else:  # prefix in INVALID_VENDOR_RANGE
-        asserts.fail(f"Invalid attribute id (0x{attribute_id:08X}) in invalid range")
-
-
-def validate_command_id_range(command_id):
-    prefix, suffix = split_element_into_prefix_suffix(command_id)
-
-    if prefix == STANDARD_PREFIX:
-        if suffix not in COMMAND_ID_RANGE:
-            asserts.fail(f"Invalid command id (0x{command_id:08X}) in standard range")
-
-    elif prefix in MANUFACTURER_CODE_RANGE:
-        if suffix not in COMMAND_ID_RANGE:
-            asserts.fail(f"Invalid command id (0x{command_id:08X}) in MC range")
-
-    elif prefix in TEST_VENDOR_RANGE:
-        if suffix in COMMAND_ID_RANGE:
-            logging.info(f"Warning: Command id (0x{command_id:08X}) found in test vendor range")
-        else:
-            asserts.fail(f"Invalid command id (0x{command_id:08X}) in Test Vendor MC range")
-
-    else:  # prefix in INVALID_VENDOR_RANGE
-        asserts.fail(f"Invalid command id (0x{command_id:08X}) in invalid range")
-
-
-class TC_IDM_10_1(MatterBaseTest):
-    @async_test_body
-    async def test_xx_1_1(self):
-
-        dev_ctrl = self.default_controller
-
-        self.print_step(1, "Perform a wildcard read of attributes on all endpoints")
-        wildcard_read = (await dev_ctrl.Read(self.dut_node_id, [()]))
-        endpoints_tlv = wildcard_read.tlvAttributes
-
-        self.print_step(2, "Check invalid elements on all clusters, across all endpoints")
-        for endpoint_id, endpoint in endpoints_tlv.items():
-            logging.info(f"Verifying Endpoint: {endpoint_id}")
-
-            for cluster_id, cluster in endpoint.items():
-                logging.info(f"Verifying ClusterID: 0x{cluster_id:04X}")
-
-                attribute_list = cluster[ATTRIBUTE_LIST_ID]
-                accepted_command_list = cluster[ACCEPTED_COMMAND_LIST_ID]
-                generated_command_list = cluster[GENERATED_COMMAND_LIST_ID]
-
-                # -- Attributes
-                logging.info(f"AttributeList: {[f'0x{attribute_id:04X}' for attribute_id in attribute_list]}")
-
-                for attribute_id in attribute_list:
-                    validate_attribute_id_range(attribute_id)
-
-                # -- Commands
-                logging.info(f"AcceptedCommandList: {[f'0x{command_id:02X}' for command_id in accepted_command_list]}")
-
-                for command_id in accepted_command_list:
-                    validate_command_id_range(command_id)
-
-                logging.info(f"GeneratedCommandList: {[f'0x{command_id:02X}' for command_id in generated_command_list]}")
-                for command_id in generated_command_list:
-                    validate_command_id_range(command_id)
-
-
-if __name__ == "__main__":
-    default_matter_test_main()
diff --git a/src/python_testing/TC_TIMESYNC_2_6.py b/src/python_testing/TC_TIMESYNC_2_6.py
index 23ed1a5575b6dd..ebd02ff3622f83 100644
--- a/src/python_testing/TC_TIMESYNC_2_6.py
+++ b/src/python_testing/TC_TIMESYNC_2_6.py
@@ -35,7 +35,7 @@ async def send_set_default_ntp_cmd(self, ntp: typing.Union[Nullable, str]) -> No
     async def send_set_default_ntp_cmd_expect_error(self, ntp: typing.Union[Nullable, str], error: Status) -> None:
         try:
             await self.send_single_cmd(cmd=Clusters.Objects.TimeSynchronization.Commands.SetDefaultNTP(defaultNTP=ntp))
-            asserts.assert_true(False, "Unexpected SetTimeZone command success")
+            asserts.assert_true(False, "Unexpected SetDefaultNTP command success")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, error, "Unexpected error returned")
             pass
diff --git a/src/python_testing/TestCommissioningTimeSync.py b/src/python_testing/TestCommissioningTimeSync.py
index dfd7c55f8d21f4..509aabfc6aa500 100644
--- a/src/python_testing/TestCommissioningTimeSync.py
+++ b/src/python_testing/TestCommissioningTimeSync.py
@@ -89,7 +89,7 @@ async def commission_and_base_checks(self):
 
     async def create_commissioner(self):
         if self.commissioner:
-            self.destroy_current_commissioner()
+            await self.destroy_current_commissioner()
         new_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
         new_fabric_admin = new_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=2)
         self.commissioner = new_fabric_admin.NewController(nodeId=112233, useTestCommissioner=True)
@@ -230,6 +230,57 @@ async def test_FabricCheckStage(self):
             kCheckForMatchingFabric), "Incorrectly ran check for matching fabric stage")
         asserts.assert_equal(self.commissioner.GetFabricCheckResult(), -1, "Fabric check result incorrectly set")
 
+    @async_test_body
+    async def test_TimeZoneName(self):
+        await self.create_commissioner()
+        self.commissioner.SetTimeZone(offset=3600, validAt=0, name="test")
+        await self.commission_and_base_checks()
+        asserts.assert_true(self.commissioner.CheckStageSuccessful(kConfigureTimeZone), 'Time zone was not successfully set')
+
+        received = await self.read_single_attribute_check_success(cluster=Clusters.TimeSynchronization, attribute=Clusters.TimeSynchronization.Attributes.TimeZone)
+        expected = [Clusters.TimeSynchronization.Structs.TimeZoneStruct(offset=3600, validAt=0, name="test")]
+        asserts.assert_equal(received, expected, "Time zone was not correctly set by commissioner")
+
+        await self.create_commissioner()
+        # name is max 64 per the spec
+        sixty_five_byte_string = "x" * 65
+        self.commissioner.SetTimeZone(offset=3600, validAt=0, name=sixty_five_byte_string)
+        await self.commission_and_base_checks()
+        asserts.assert_true(self.commissioner.CheckStageSuccessful(kConfigureTimeZone), 'Time zone was not successfully set')
+
+        received = await self.read_single_attribute_check_success(cluster=Clusters.TimeSynchronization, attribute=Clusters.TimeSynchronization.Attributes.TimeZone)
+        expected = [Clusters.TimeSynchronization.Structs.TimeZoneStruct(offset=3600, validAt=0, name=None)]
+        asserts.assert_equal(received, expected, "Commissioner did not ignore too-long name")
+
+        await self.create_commissioner()
+        # name is max 64 per the spec
+        sixty_four_byte_string = "x" * 64
+        self.commissioner.SetTimeZone(offset=3600, validAt=0, name=sixty_four_byte_string)
+        await self.commission_and_base_checks()
+        asserts.assert_true(self.commissioner.CheckStageSuccessful(kConfigureTimeZone), 'Time zone was not successfully set')
+
+        received = await self.read_single_attribute_check_success(cluster=Clusters.TimeSynchronization, attribute=Clusters.TimeSynchronization.Attributes.TimeZone)
+        expected = [Clusters.TimeSynchronization.Structs.TimeZoneStruct(offset=3600, validAt=0, name=sixty_four_byte_string)]
+        asserts.assert_equal(received, expected, "Time zone 64 byte name was not correctly set")
+
+    @async_test_body
+    async def test_DefaultNtpSize(self):
+        await self.create_commissioner()
+        too_long_name = "x." + "x" * 127
+        self.commissioner.SetDefaultNTP(too_long_name)
+        await self.commission_and_base_checks()
+        asserts.assert_false(self.commissioner.CheckStageSuccessful(kConfigureDefaultNTP),
+                             'Commissioner attempted to set default NTP to a too long value')
+
+        await self.create_commissioner()
+        just_fits_name = "x." + "x" * 126
+        self.commissioner.SetDefaultNTP(just_fits_name)
+        await self.commission_and_base_checks()
+        asserts.assert_true(self.commissioner.CheckStageSuccessful(kConfigureDefaultNTP),
+                            'Commissioner did not correctly set default NTP')
+        received = await self.read_single_attribute_check_success(cluster=Clusters.TimeSynchronization, attribute=Clusters.TimeSynchronization.Attributes.DefaultNTP)
+        asserts.assert_equal(received, just_fits_name, 'Commissioner incorrectly set default NTP name')
+
 
 # TODO(cecille): Test - Add hooks to change the time zone response to indicate no DST is needed
 # TODO(cecille): Test - Set commissioningParameters TimeZone and DST list size to > node list size to ensure they get truncated
diff --git a/src/python_testing/TestConformanceSupport.py b/src/python_testing/TestConformanceSupport.py
index 53f9e885ff9449..b383f1acb63cc7 100644
--- a/src/python_testing/TestConformanceSupport.py
+++ b/src/python_testing/TestConformanceSupport.py
@@ -53,6 +53,7 @@ async def test_conformance_mandatory(self):
         xml_callable = parse_callable_from_xml(et, self.params)
         for f in self.feature_maps:
             asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+        asserts.assert_equal(str(xml_callable), 'M')
 
     @async_test_body
     async def test_conformance_optional(self):
@@ -61,6 +62,7 @@ async def test_conformance_optional(self):
         xml_callable = parse_callable_from_xml(et, self.params)
         for f in self.feature_maps:
             asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+        asserts.assert_equal(str(xml_callable), 'O')
 
     @async_test_body
     async def test_conformance_disallowed(self):
@@ -69,12 +71,14 @@ async def test_conformance_disallowed(self):
         xml_callable = parse_callable_from_xml(et, self.params)
         for f in self.feature_maps:
             asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED)
+        asserts.assert_equal(str(xml_callable), 'X')
 
         xml = '<deprecateConform />'
         et = ElementTree.fromstring(xml)
         xml_callable = parse_callable_from_xml(et, self.params)
         for f in self.feature_maps:
             asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED)
+        asserts.assert_equal(str(xml_callable), 'D')
 
     @async_test_body
     async def test_conformance_provisional(self):
@@ -83,6 +87,16 @@ async def test_conformance_provisional(self):
         xml_callable = parse_callable_from_xml(et, self.params)
         for f in self.feature_maps:
             asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL)
+        asserts.assert_equal(str(xml_callable), 'P')
+
+    @async_test_body
+    async def test_conformance_zigbee(self):
+        xml = '<condition name="Zigbee"/>'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'Zigbee')
 
     @async_test_body
     async def test_conformance_mandatory_on_condition(self):
@@ -96,6 +110,7 @@ async def test_conformance_mandatory_on_condition(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB')
 
         xml = ('<mandatoryConform>'
                '<feature name="CD" />'
@@ -107,6 +122,7 @@ async def test_conformance_mandatory_on_condition(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'CD')
 
         # single attribute mandatory
         xml = ('<mandatoryConform>'
@@ -119,6 +135,7 @@ async def test_conformance_mandatory_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'attr1')
 
         xml = ('<mandatoryConform>'
                '<attribute name="attr2" />'
@@ -130,6 +147,7 @@ async def test_conformance_mandatory_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'attr2')
 
         # test command in optional and in boolean - this is the same as attribute essentially, so testing every permutation is overkill
 
@@ -146,6 +164,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[AB]')
 
         xml = ('<optionalConform>'
                '<feature name="CD" />'
@@ -157,6 +176,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[CD]')
 
         # single attribute optional
         xml = ('<optionalConform>'
@@ -169,6 +189,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[attr1]')
 
         xml = ('<optionalConform>'
                '<attribute name="attr2" />'
@@ -180,6 +201,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[attr2]')
 
         # single command optional
         xml = ('<optionalConform>'
@@ -192,6 +214,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[cmd1]')
 
         xml = ('<optionalConform>'
                '<command name="cmd2" />'
@@ -203,6 +226,7 @@ async def test_conformance_optional_on_condition(self):
                 asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[cmd2]')
 
     @async_test_body
     async def test_conformance_not_term_mandatory(self):
@@ -219,6 +243,7 @@ async def test_conformance_not_term_mandatory(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '!AB')
 
         xml = ('<mandatoryConform>'
                '<notTerm>'
@@ -232,6 +257,7 @@ async def test_conformance_not_term_mandatory(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '!CD')
 
         # single attribute not mandatory
         xml = ('<mandatoryConform>'
@@ -246,6 +272,7 @@ async def test_conformance_not_term_mandatory(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '!attr1')
 
         xml = ('<mandatoryConform>'
                '<notTerm>'
@@ -259,6 +286,7 @@ async def test_conformance_not_term_mandatory(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '!attr2')
 
     @async_test_body
     async def test_conformance_not_term_optional(self):
@@ -275,6 +303,7 @@ async def test_conformance_not_term_optional(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[!AB]')
 
         xml = ('<optionalConform>'
                '<notTerm>'
@@ -288,6 +317,7 @@ async def test_conformance_not_term_optional(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[!CD]')
 
     @async_test_body
     async def test_conformance_and_term(self):
@@ -305,6 +335,7 @@ async def test_conformance_and_term(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB & CD')
 
         # and term for attributes only
         xml = ('<mandatoryConform>'
@@ -320,6 +351,7 @@ async def test_conformance_and_term(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'attr1 & attr2')
 
         # and term for feature and attribute
         xml = ('<mandatoryConform>'
@@ -336,6 +368,7 @@ async def test_conformance_and_term(self):
                     asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY)
                 else:
                     asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB & attr2')
 
     @async_test_body
     async def test_conformance_or_term(self):
@@ -353,6 +386,7 @@ async def test_conformance_or_term(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB | CD')
 
         # or term attribute only
         xml = ('<mandatoryConform>'
@@ -368,6 +402,7 @@ async def test_conformance_or_term(self):
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'attr1 | attr2')
 
         # or term feature and attribute
         xml = ('<mandatoryConform>'
@@ -384,6 +419,7 @@ async def test_conformance_or_term(self):
                     asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY)
                 else:
                     asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB | attr2')
 
     @async_test_body
     async def test_conformance_and_term_with_not(self):
@@ -403,6 +439,7 @@ async def test_conformance_and_term_with_not(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[!AB & CD]')
 
     @async_test_body
     async def test_conformance_or_term_with_not(self):
@@ -422,6 +459,7 @@ async def test_conformance_or_term_with_not(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB | !CD')
 
         # not around or term with
         xml = ('<optionalConform>'
@@ -439,6 +477,7 @@ async def test_conformance_or_term_with_not(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[!(AB | CD)]')
 
     @async_test_body
     async def test_conformance_and_term_with_three_terms(self):
@@ -459,6 +498,7 @@ async def test_conformance_and_term_with_three_terms(self):
         asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.NOT_APPLICABLE)
         # all features
         asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL)
+        asserts.assert_equal(str(xml_callable), '[AB & CD & EF]')
 
         # and term with one of each
         xml = ('<optionalConform>'
@@ -477,6 +517,7 @@ async def test_conformance_and_term_with_three_terms(self):
                         asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL)
                     else:
                         asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[AB & attr1 & cmd1]')
 
     @async_test_body
     async def test_conformance_or_term_with_three_terms(self):
@@ -496,6 +537,7 @@ async def test_conformance_or_term_with_three_terms(self):
         asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.OPTIONAL)
         # all features
         asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL)
+        asserts.assert_equal(str(xml_callable), '[AB | CD | EF]')
 
         # or term with one of each
         xml = ('<optionalConform>'
@@ -514,6 +556,7 @@ async def test_conformance_or_term_with_three_terms(self):
                         asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL)
                     else:
                         asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), '[AB | attr1 | cmd1]')
 
     def test_conformance_otherwise(self):
         # AB, O
@@ -530,6 +573,7 @@ def test_conformance_otherwise(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+        asserts.assert_equal(str(xml_callable), 'AB, O')
 
         # AB, [CD]
         xml = ('<otherwiseConform>'
@@ -549,6 +593,7 @@ def test_conformance_otherwise(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+        asserts.assert_equal(str(xml_callable), 'AB, [CD]')
 
         # AB & !CD, P
         xml = ('<otherwiseConform>'
@@ -569,6 +614,7 @@ def test_conformance_otherwise(self):
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
             else:
                 asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL)
+        asserts.assert_equal(str(xml_callable), 'AB & !CD, P')
 
 
 if __name__ == "__main__":
diff --git a/src/python_testing/TestGroupTableReports.py b/src/python_testing/TestGroupTableReports.py
new file mode 100644
index 00000000000000..a97417d4f64204
--- /dev/null
+++ b/src/python_testing/TestGroupTableReports.py
@@ -0,0 +1,140 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+import logging
+import queue
+from typing import List
+
+import chip.clusters as Clusters
+from chip.clusters import ClusterObjects as ClusterObjects
+from chip.clusters.Attribute import SubscriptionTransaction, TypedAttributePath
+from chip.interaction_model import Status
+from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
+from mobly import asserts
+
+
+class AttributeChangeCallback:
+    def __init__(self, expected_attribute: ClusterObjects.ClusterAttributeDescriptor, output: queue.Queue):
+        self._output = output
+        self._expected_attribute = expected_attribute
+
+    def __call__(self, path: TypedAttributePath, transaction: SubscriptionTransaction):
+        if path.AttributeType == self._expected_attribute:
+            q = (path, transaction)
+            logging.info(f'Got subscription report for {path.AttributeType}')
+            self._output.put(q)
+
+
+def WaitForAttributeReport(q: queue.Queue, expected_attribute: ClusterObjects.ClusterAttributeDescriptor):
+    try:
+        path, transaction = q.get(block=True, timeout=10)
+    except queue.Empty:
+        asserts.fail("Failed to receive a report for the attribute change for {}".format(expected_attribute))
+
+    asserts.assert_equal(path.AttributeType, expected_attribute, "Received incorrect attribute report")
+    try:
+        transaction.GetAttribute(path)
+    except KeyError:
+        asserts.fail("Attribute not found in returned report")
+
+
+class TestGroupTableReports(MatterBaseTest):
+
+    @async_test_body
+    async def test_group_table_reports(self):
+        self.print_step(1, "Commissioning, already done")
+
+        self.TH1 = self.default_controller
+
+        self.kGroupKeyset1 = 0x01a1
+
+        self.print_step(2, "TH Adds Keyset 1 to the Group Key Management Cluster")
+        self.groupKey = Clusters.GroupKeyManagement.Structs.GroupKeySetStruct(
+            groupKeySetID=self.kGroupKeyset1,
+            groupKeySecurityPolicy=Clusters.GroupKeyManagement.Enums.GroupKeySecurityPolicyEnum.kTrustFirst,
+            epochKey0="0123456789abcdef".encode(),
+            epochStartTime0=1110000,
+            epochKey1="0123456789abcdef".encode(),
+            epochStartTime1=1110001,
+            epochKey2="0123456789abcdef".encode(),
+            epochStartTime2=1110002)
+
+        await self.TH1.SendCommand(self.dut_node_id, 0, Clusters.GroupKeyManagement.Commands.KeySetWrite(self.groupKey))
+
+        self.kGroup1 = 0x0101
+        self.kGroup2 = 0x0102
+        self.kGroup3 = 0x0103
+
+        self.print_step(3, "TH maps Keyset 1 to Group 1, 2 and 3")
+        mapping_structs: List[Clusters.GroupKeyManagement.Structs.GroupKeyMapStruct] = []
+
+        mapping_structs.append(Clusters.GroupKeyManagement.Structs.GroupKeyMapStruct(
+            groupId=self.kGroup1,
+            groupKeySetID=self.kGroupKeyset1,
+            fabricIndex=1))
+
+        mapping_structs.append(Clusters.GroupKeyManagement.Structs.GroupKeyMapStruct(
+            groupId=self.kGroup2,
+            groupKeySetID=self.kGroupKeyset1,
+            fabricIndex=1))
+
+        mapping_structs.append(Clusters.GroupKeyManagement.Structs.GroupKeyMapStruct(
+            groupId=self.kGroup3,
+            groupKeySetID=self.kGroupKeyset1,
+            fabricIndex=1))
+
+        result = await self.TH1.WriteAttribute(self.dut_node_id, [(0, Clusters.GroupKeyManagement.Attributes.GroupKeyMap(mapping_structs))])
+        asserts.assert_equal(result[0].Status, Status.Success, "GroupKeyMap write failed")
+
+        self.print_step(4, "TH subscribes to the GroupTable attribute from the Group Key Management Cluster")
+        subscription_gcm = await self.TH1.ReadAttribute(nodeid=self.dut_node_id, attributes=[(0, Clusters.GroupKeyManagement.Attributes.GroupTable)], reportInterval=(1, 5), fabricFiltered=False, keepSubscriptions=True, autoResubscribe=False)
+        gcm_queue = queue.Queue()
+        gcm_cb = AttributeChangeCallback(Clusters.GroupKeyManagement.Attributes.GroupTable, gcm_queue)
+        subscription_gcm.SetAttributeUpdateCallback(gcm_cb)
+
+        self.print_step(5, "TH Adds Group1 to the Group Cluster")
+        result = await self.TH1.SendCommand(self.dut_node_id, 1, Clusters.Groups.Commands.AddGroup(self.kGroup1, "Group1"))
+
+        self.print_step(6, "TH waits for subscription report for the GroupTable attribute from the Group Key Management Cluster")
+        WaitForAttributeReport(gcm_queue, Clusters.GroupKeyManagement.Attributes.GroupTable)
+
+        self.print_step(7, "TH Adds Group2 to the Group Cluster")
+        result = await self.TH1.SendCommand(self.dut_node_id, 1, Clusters.Groups.Commands.AddGroup(self.kGroup2, "Group2"))
+
+        self.print_step(8, "TH waits for subscription report for the GroupTable attribute from the Group Key Management Cluster")
+        WaitForAttributeReport(gcm_queue, Clusters.GroupKeyManagement.Attributes.GroupTable)
+
+        self.print_step(9, "TH Adds Group3 to the Group Cluster")
+        result = await self.TH1.SendCommand(self.dut_node_id, 1, Clusters.Groups.Commands.AddGroup(self.kGroup3, "Group3"))
+
+        self.print_step(10, "TH waits for subscription report for the GroupTable attribute from the Group Key Management Cluster")
+        WaitForAttributeReport(gcm_queue, Clusters.GroupKeyManagement.Attributes.GroupTable)
+
+        self.print_step(12, "TH removes Group2 from the Group Cluster")
+        result = await self.TH1.SendCommand(self.dut_node_id, 1, Clusters.Groups.Commands.RemoveGroup(self.kGroup2))
+
+        self.print_step(13, "TH waits for subscription report for the GroupTable attribute from the Group Key Management Cluster")
+        WaitForAttributeReport(gcm_queue, Clusters.GroupKeyManagement.Attributes.GroupTable)
+
+        self.print_step(14, "TH removes All Groups from the Group Cluster")
+        await self.TH1.SendCommand(self.dut_node_id, 1, Clusters.Groups.Commands.RemoveAllGroups())
+
+        self.print_step(15, "TH waits for subscription report for the GroupTable attribute from the Group Key Management Cluster")
+        WaitForAttributeReport(gcm_queue, Clusters.GroupKeyManagement.Attributes.GroupTable)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TestMatterTestingSupport.py b/src/python_testing/TestMatterTestingSupport.py
index f69182ad6b5350..e713f4f0e71a61 100644
--- a/src/python_testing/TestMatterTestingSupport.py
+++ b/src/python_testing/TestMatterTestingSupport.py
@@ -25,9 +25,9 @@
 from matter_testing_support import (MatterBaseTest, async_test_body, compare_time, default_matter_test_main,
                                     get_wait_seconds_from_set_time, parse_pics, type_matches, utc_time_in_matter_epoch)
 from mobly import asserts, signals
-from TC_DeviceBasicComposition import (TagProblem, create_device_type_list_for_root, create_device_type_lists,
-                                       find_tag_list_problems, find_tree_roots, get_all_children, get_direct_children_of_root,
-                                       parts_list_cycles, separate_endpoint_types)
+from taglist_and_topology_test_support import (TagProblem, create_device_type_list_for_root, create_device_type_lists,
+                                               find_tag_list_problems, find_tree_roots, get_all_children,
+                                               get_direct_children_of_root, parts_list_cycles, separate_endpoint_types)
 
 
 def get_raw_type_list():
diff --git a/src/python_testing/basic_composition_support.py b/src/python_testing/basic_composition_support.py
new file mode 100644
index 00000000000000..523c41c223875d
--- /dev/null
+++ b/src/python_testing/basic_composition_support.py
@@ -0,0 +1,163 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+
+import base64
+import copy
+import json
+import logging
+import pathlib
+import sys
+from pprint import pprint
+from typing import Any, Optional
+
+import chip.clusters.ClusterObjects
+import chip.tlv
+from chip.clusters.Attribute import ValueDecodeFailure
+from mobly import asserts
+
+
+def MatterTlvToJson(tlv_data: dict[int, Any]) -> dict[str, Any]:
+    """Given TLV data for a specific cluster instance, convert to the Matter JSON format."""
+
+    matter_json_dict = {}
+
+    key_type_mappings = {
+        chip.tlv.uint: "UINT",
+        int: "INT",
+        bool: "BOOL",
+        list: "ARRAY",
+        dict: "STRUCT",
+        chip.tlv.float32: "FLOAT",
+        float: "DOUBLE",
+        bytes: "BYTES",
+        str: "STRING",
+        ValueDecodeFailure: "ERROR",
+        type(None): "NULL",
+    }
+
+    def ConvertValue(value) -> Any:
+        if isinstance(value, ValueDecodeFailure):
+            raise ValueError(f"Bad Value: {str(value)}")
+
+        if isinstance(value, bytes):
+            return base64.b64encode(value).decode("UTF-8")
+        elif isinstance(value, list):
+            value = [ConvertValue(item) for item in value]
+        elif isinstance(value, dict):
+            value = MatterTlvToJson(value)
+
+        return value
+
+    for key in tlv_data:
+        value_type = type(tlv_data[key])
+        value = copy.deepcopy(tlv_data[key])
+
+        element_type: str = key_type_mappings[value_type]
+        sub_element_type = ""
+
+        try:
+            new_value = ConvertValue(value)
+        except ValueError as e:
+            new_value = str(e)
+
+        if element_type:
+            if element_type == "ARRAY":
+                if len(new_value):
+                    sub_element_type = key_type_mappings[type(tlv_data[key][0])]
+                else:
+                    sub_element_type = "?"
+
+        new_key = ""
+        if element_type:
+            if sub_element_type:
+                new_key = f"{str(key)}:{element_type}-{sub_element_type}"
+            else:
+                new_key = f"{str(key)}:{element_type}"
+        else:
+            new_key = str(key)
+
+        matter_json_dict[new_key] = new_value
+
+    return matter_json_dict
+
+
+class BasicCompositionTests:
+    async def setup_class_helper(self):
+        dev_ctrl = self.default_controller
+        self.problems = []
+
+        do_test_over_pase = self.user_params.get("use_pase_only", True)
+        dump_device_composition_path: Optional[str] = self.user_params.get("dump_device_composition_path", None)
+
+        if do_test_over_pase:
+            info = self.get_setup_payload_info()
+
+            commissionable_nodes = dev_ctrl.DiscoverCommissionableNodes(
+                info.filter_type, info.filter_value, stopOnFirst=True, timeoutSecond=15)
+            logging.info(f"Commissionable nodes: {commissionable_nodes}")
+            # TODO: Support BLE
+            if commissionable_nodes is not None and len(commissionable_nodes) > 0:
+                commissionable_node = commissionable_nodes[0]
+                instance_name = f"{commissionable_node.instanceName}._matterc._udp.local"
+                vid = f"{commissionable_node.vendorId}"
+                pid = f"{commissionable_node.productId}"
+                address = f"{commissionable_node.addresses[0]}"
+                logging.info(f"Found instance {instance_name}, VID={vid}, PID={pid}, Address={address}")
+
+                node_id = 1
+                dev_ctrl.EstablishPASESessionIP(address, info.passcode, node_id)
+            else:
+                asserts.fail("Failed to find the DUT according to command line arguments.")
+        else:
+            # Using the already commissioned node
+            node_id = self.dut_node_id
+
+        wildcard_read = (await dev_ctrl.Read(node_id, [()]))
+        endpoints_tlv = wildcard_read.tlvAttributes
+
+        node_dump_dict = {endpoint_id: MatterTlvToJson(endpoints_tlv[endpoint_id]) for endpoint_id in endpoints_tlv}
+        logging.debug(f"Raw TLV contents of Node: {json.dumps(node_dump_dict, indent=2)}")
+
+        if dump_device_composition_path is not None:
+            with open(pathlib.Path(dump_device_composition_path).with_suffix(".json"), "wt+") as outfile:
+                json.dump(node_dump_dict, outfile, indent=2)
+            with open(pathlib.Path(dump_device_composition_path).with_suffix(".txt"), "wt+") as outfile:
+                pprint(wildcard_read.attributes, outfile, indent=1, width=200, compact=True)
+
+        logging.info("###########################################################")
+        logging.info("Start of actual tests")
+        logging.info("###########################################################")
+
+        # ======= State kept for use by all tests =======
+
+        # All endpoints in "full object" indexing format
+        self.endpoints = wildcard_read.attributes
+
+        # All endpoints in raw TLV format
+        self.endpoints_tlv = wildcard_read.tlvAttributes
+
+    def get_test_name(self) -> str:
+        """Return the function name of the caller. Used to create logging entries."""
+        return sys._getframe().f_back.f_code.co_name
+
+    def fail_current_test(self, msg: Optional[str] = None):
+        if not msg:
+            # Without a message, just log the last problem seen
+            asserts.fail(msg=self.problems[-1].problem)
+        else:
+            asserts.fail(msg)
diff --git a/src/python_testing/conformance_support.py b/src/python_testing/conformance_support.py
index 2dabb584c9d0f7..3cbef4150dd5b3 100644
--- a/src/python_testing/conformance_support.py
+++ b/src/python_testing/conformance_support.py
@@ -34,6 +34,7 @@
 FEATURE_TAG = 'feature'
 ATTRIBUTE_TAG = 'attribute'
 COMMAND_TAG = 'command'
+CONDITION_TAG = 'condition'
 
 
 class ConformanceException(Exception):
@@ -67,74 +68,139 @@ def conformance_allowed(conformance_decision: ConformanceDecision, allow_provisi
     return True
 
 
-def mandatory(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-    return ConformanceDecision.MANDATORY
+class zigbee:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.NOT_APPLICABLE
+
+    def __str__(self):
+        return "Zigbee"
+
+
+class mandatory:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.MANDATORY
 
+    def __str__(self):
+        return 'M'
+
+
+class optional:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.OPTIONAL
 
-def optional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-    return ConformanceDecision.OPTIONAL
+    def __str__(self):
+        return 'O'
 
 
-def deprecated(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-    return ConformanceDecision.DISALLOWED
+class deprecated:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.DISALLOWED
 
+    def __str__(self):
+        return 'D'
 
-def disallowed(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-    return ConformanceDecision.DISALLOWED
 
+class disallowed:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.DISALLOWED
 
-def provisional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-    return ConformanceDecision.PROVISIONAL
+    def __str__(self):
+        return 'X'
 
 
-def feature(requiredFeature: uint) -> Callable:
-    def feature_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        if requiredFeature & feature_map != 0:
+class provisional:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return ConformanceDecision.PROVISIONAL
+
+    def __str__(self):
+        return 'P'
+
+
+class feature:
+    def __init__(self, requiredFeature: uint, code: str):
+        self.requiredFeature = requiredFeature
+        self.code = code
+
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if self.requiredFeature & feature_map != 0:
             return ConformanceDecision.MANDATORY
         return ConformanceDecision.NOT_APPLICABLE
-    return feature_inner
 
+    def __str__(self):
+        return f'{self.code}'
 
-def attribute(requiredAttribute: uint) -> Callable:
-    def attribute_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        if requiredAttribute in attribute_list:
+
+class attribute:
+    def __init__(self, requiredAttribute: uint, name: str):
+        self.requiredAttribute = requiredAttribute
+        self.name = name
+
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if self.requiredAttribute in attribute_list:
             return ConformanceDecision.MANDATORY
         return ConformanceDecision.NOT_APPLICABLE
-    return attribute_inner
 
+    def __str__(self):
+        return f'{self.name}'
+
+
+class command:
+    def __init__(self, requiredCommand: uint, name: str):
+        self.requiredCommand = requiredCommand
+        self.name = name
 
-def command(requiredCommand: uint) -> Callable:
-    def command_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        if requiredCommand in all_command_list:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if self.requiredCommand in all_command_list:
             return ConformanceDecision.MANDATORY
         return ConformanceDecision.NOT_APPLICABLE
-    return command_inner
 
+    def __str__(self):
+        return f'{self.name}'
+
+
+def strip_outer_parentheses(inner: str) -> str:
+    if inner[0] == '(' and inner[-1] == ')':
+        return inner[1:-1]
+    return inner
 
-def optional_wrapper(op: Callable) -> Callable:
-    def optional_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        decision = op(feature_map, attribute_list, all_command_list)
+
+class optional_wrapper:
+    def __init__(self, op: Callable):
+        self.op = op
+
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        decision = self.op(feature_map, attribute_list, all_command_list)
         if decision == ConformanceDecision.MANDATORY or decision == ConformanceDecision.OPTIONAL:
             return ConformanceDecision.OPTIONAL
         elif decision == ConformanceDecision.NOT_APPLICABLE:
             return ConformanceDecision.NOT_APPLICABLE
         else:
             raise ConformanceException(f'Optional wrapping invalid op {decision}')
-    return optional_wrapper_inner
 
+    def __str__(self):
+        return f'[{strip_outer_parentheses(str(self.op))}]'
+
+
+class mandatory_wrapper:
+    def __init__(self, op: Callable):
+        self.op = op
+
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return self.op(feature_map, attribute_list, all_command_list)
+
+    def __str__(self):
+        return strip_outer_parentheses(str(self.op))
 
-def mandatory_wrapper(op: Callable) -> Callable:
-    def mandatory_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        return op(feature_map, attribute_list, all_command_list)
-    return mandatory_wrapper_inner
 
+class not_operation:
+    def __init__(self, op: Callable):
+        self.op = op
 
-def not_operation(op: Callable):
-    def not_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
         # not operations can't be used with anything that returns DISALLOWED
         # not operations also can't be used with things that are optional
         # ie, ![AB] doesn't make sense, nor does !O
-        decision = op(feature_map, attribute_list, all_command_list)
+        decision = self.op(feature_map, attribute_list, all_command_list)
         if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
             raise ConformanceException('NOT operation on optional or disallowed item')
         elif decision == ConformanceDecision.NOT_APPLICABLE:
@@ -143,12 +209,17 @@ def not_operation_inner(feature_map: uint, attribute_list: list[uint], all_comma
             return ConformanceDecision.NOT_APPLICABLE
         else:
             raise ConformanceException('NOT called on item with non-conformance value')
-    return not_operation_inner
 
+    def __str__(self):
+        return f'!{str(self.op)}'
+
+
+class and_operation:
+    def __init__(self, op_list: list[Callable]):
+        self.op_list = op_list
 
-def and_operation(op_list: list[Callable]) -> Callable:
-    def and_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        for op in op_list:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        for op in self.op_list:
             decision = op(feature_map, attribute_list, all_command_list)
             # and operations can't happen on optional or disallowed
             if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
@@ -160,12 +231,18 @@ def and_operation_inner(feature_map: uint, attribute_list: list[uint], all_comma
             else:
                 raise ConformanceException('Oplist item returned non-conformance value')
         return ConformanceDecision.MANDATORY
-    return and_operation_inner
 
+    def __str__(self):
+        op_strs = [str(op) for op in self.op_list]
+        return f'({" & ".join(op_strs)})'
+
+
+class or_operation:
+    def __init__(self, op_list: list[Callable]):
+        self.op_list = op_list
 
-def or_operation(op_list: list[Callable]) -> Callable:
-    def or_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
-        for op in op_list:
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        for op in self.op_list:
             decision = op(feature_map, attribute_list, all_command_list)
             if decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
                 raise ConformanceException('OR operation on optional or disallowed item')
@@ -178,58 +255,69 @@ def or_operation_inner(feature_map: uint, attribute_list: list[uint], all_comman
             else:
                 raise ConformanceException('Oplist item returned non-conformance value')
         return ConformanceDecision.NOT_APPLICABLE
-    return or_operation_inner
+
+    def __str__(self):
+        op_strs = [str(op) for op in self.op_list]
+        return f'({" | ".join(op_strs)})'
 
 # TODO: add xor operation once it's required
 # TODO: how would equal and unequal operations work here?
 
 
-def otherwise(op_list: list[Callable]) -> Callable:
-    def otherwise_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+class otherwise:
+    def __init__(self, op_list: list[Callable]):
+        self.op_list = op_list
+
+    def __call__(self, feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
         # Otherwise operations apply from left to right. If any of them
         # has a definite decision (optional, mandatory or disallowed), that is the one that applies
         # Provisional items are meant to be marked as the first item in the list
         # Deprecated items are either on their own, or follow an O as O,D.
         # For O,D, optional applies (leftmost), but we should consider some way to warn here as well,
         # possibly in another function
-        for op in op_list:
+        for op in self.op_list:
             decision = op(feature_map, attribute_list, all_command_list)
             if decision == ConformanceDecision.NOT_APPLICABLE:
                 continue
             return decision
         return ConformanceDecision.NOT_APPLICABLE
-    return otherwise_inner
+
+    def __str__(self):
+        op_strs = [strip_outer_parentheses(str(op)) for op in self.op_list]
+        return ', '.join(op_strs)
 
 
 def parse_callable_from_xml(element: ElementTree.Element, params: ConformanceParseParameters) -> Callable:
     if len(list(element)) == 0:
         # no subchildren here, so this can only be mandatory, optional, provisional, deprecated, disallowed, feature or attribute
         if element.tag == MANDATORY_CONFORM:
-            return mandatory
+            return mandatory()
         elif element.tag == OPTIONAL_CONFORM:
-            return optional
+            return optional()
         elif element.tag == PROVISIONAL_CONFORM:
-            return provisional
+            return provisional()
         elif element.tag == DEPRECATE_CONFORM:
-            return deprecated
+            return deprecated()
         elif element.tag == DISALLOW_CONFORM:
-            return disallowed
+            return disallowed()
         elif element.tag == FEATURE_TAG:
             try:
-                return feature(params.feature_map[element.get('name')])
+                return feature(params.feature_map[element.get('name')], element.get('name'))
             except KeyError:
                 raise ConformanceException(f'Conformance specifies feature not in feature table: {element.get("name")}')
         elif element.tag == ATTRIBUTE_TAG:
             # Some command conformance tags are marked as attribute, so if this key isn't in attribute, try command
             name = element.get('name')
             if name in params.attribute_map:
-                return attribute(params.attribute_map[name])
+                return attribute(params.attribute_map[name], name)
             elif name in params.command_map:
-                return command(params.command_map[name])
+                return command(params.command_map[name], name)
             else:
                 raise ConformanceException(f'Conformance specifies attribute or command not in table: {name}')
         elif element.tag == COMMAND_TAG:
-            return command(params.command_map[element.get('name')])
+            return command(params.command_map[element.get('name')], element.get('name'))
+        elif element.tag == CONDITION_TAG and element.get('name').lower() == 'zigbee':
+            return zigbee()
         else:
             raise ConformanceException(
                 f'Unexpected xml conformance element with no children {str(element.tag)} {str(element.attrib)}')
diff --git a/src/python_testing/global_attribute_ids.py b/src/python_testing/global_attribute_ids.py
new file mode 100644
index 00000000000000..63d37952a00e2c
--- /dev/null
+++ b/src/python_testing/global_attribute_ids.py
@@ -0,0 +1,28 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This file should be removed once we have a good way to get this from the codegen or XML
+
+from enum import IntEnum
+
+
+class GlobalAttributeIds(IntEnum):
+    ATTRIBUTE_LIST_ID = 0xFFFB
+    ACCEPTED_COMMAND_LIST_ID = 0xFFF9
+    GENERATED_COMMAND_LIST_ID = 0xFFF8
+    FEATURE_MAP_ID = 0xFFFC
+    CLUSTER_REVISION_ID = 0xFFFD
diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py
index 398a01f6cd9d17..1b3fab9b8c8a3e 100644
--- a/src/python_testing/matter_testing_support.py
+++ b/src/python_testing/matter_testing_support.py
@@ -300,6 +300,18 @@ def get_attribute_string(self, cluster_id: int, attribute_id) -> str:
                 return f"Attribute {attribute_name} ({attribute_id}, 0x{attribute_id:04X})"
 
 
+def id_str(id):
+    return f'{id} (0x{id:02x})'
+
+
+def cluster_id_str(id):
+    if id in Clusters.ClusterObjects.ALL_CLUSTERS.keys():
+        s = Clusters.ClusterObjects.ALL_CLUSTERS[id].__name__
+    else:
+        s = "Unknown cluster"
+    return f'{id_str(id)} {s}'
+
+
 @dataclass
 class AttributePathLocation:
     endpoint_id: int
@@ -319,6 +331,11 @@ def as_string(self, mapper: ClusterMapper):
 
         return desc
 
+    def __str__(self):
+        return (f'\n        Endpoint: {self.endpoint_id},'
+                f'\n        Cluster:  {cluster_id_str(self.cluster_id)},'
+                f'\n        Attribute:{id_str(self.attribute_id)}')
+
 
 @dataclass
 class EventPathLocation:
@@ -326,6 +343,11 @@ class EventPathLocation:
     cluster_id: int
     event_id: int
 
+    def __str__(self):
+        return (f'\n        Endpoint: {self.endpoint_id},'
+                f'\n        Cluster:  {cluster_id_str(self.cluster_id)},'
+                f'\n        Event:    {id_str(self.event_id)}')
+
 
 @dataclass
 class CommandPathLocation:
@@ -333,12 +355,21 @@ class CommandPathLocation:
     cluster_id: int
     command_id: int
 
+    def __str__(self):
+        return (f'\n        Endpoint: {self.endpoint_id},'
+                f'\n        Cluster:  {cluster_id_str(self.cluster_id)},'
+                f'\n        Command:  {id_str(self.command_id)}')
+
 
 @dataclass
 class ClusterPathLocation:
     endpoint_id: int
     cluster_id: int
 
+    def __str__(self):
+        return (f'\n       Endpoint: {self.endpoint_id},'
+                f'\n       Cluster:  {cluster_id_str(self.cluster_id)}')
+
 
 @dataclass
 class FeaturePathLocation:
@@ -346,6 +377,11 @@ class FeaturePathLocation:
     cluster_id: int
     feature_code: str
 
+    def __str__(self):
+        return (f'\n        Endpoint: {self.endpoint_id},'
+                f'\n        Cluster:  {cluster_id_str(self.cluster_id)},'
+                f'\n        Feature:  {self.feature_code}')
+
 # ProblemSeverity is not using StrEnum, but rather Enum, since StrEnum only
 # appeared in 3.11. To make it JSON serializable easily, multiple inheritance
 # from `str` is used. See https://stackoverflow.com/a/51976841.
@@ -365,6 +401,13 @@ class ProblemNotice:
     problem: str
     spec_location: str = ""
 
+    def __str__(self):
+        return (f'\nProblem: {str(self.severity)}'
+                f'\n    test_name: {self.test_name}'
+                f'\n    location: {str(self.location)}'
+                f'\n    problem: {self.problem}'
+                f'\n    spec_location: {self.spec_location}\n')
+
 
 @dataclass
 class SetupPayloadInfo:
@@ -400,6 +443,8 @@ def _init_stack(self, already_initialized: bool, **kwargs):
             self._chip_stack = ChipStack(**kwargs)
             builtins.chipStack = self._chip_stack
 
+        chip.logging.RedirectToPythonLogging()
+
         self._storage = self._chip_stack.GetStorageManager()
         self._certificate_authority_manager = chip.CertificateAuthority.CertificateAuthorityManager(chipStack=self._chip_stack)
         self._certificate_authority_manager.LoadAuthoritiesFromStorage()
@@ -498,7 +543,7 @@ def teardown_class(self):
         logging.info("Problems found:")
         logging.info("===============")
         for problem in self.problems:
-            logging.info(f"- {json.dumps(dataclass_asdict(problem))}")
+            logging.info(str(problem))
         logging.info("###########################################################")
 
         super().teardown_class()
diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py
index 9e014aa95dd2aa..fa08f34d776a5d 100644
--- a/src/python_testing/spec_parsing_support.py
+++ b/src/python_testing/spec_parsing_support.py
@@ -18,16 +18,18 @@
 import glob
 import logging
 import os
+import typing
 import xml.etree.ElementTree as ElementTree
 from copy import deepcopy
 from dataclasses import dataclass
 from enum import Enum, auto
 from typing import Callable
 
+import chip.clusters as Clusters
 from chip.tlv import uint
 from conformance_support import (DEPRECATE_CONFORM, DISALLOW_CONFORM, MANDATORY_CONFORM, OPTIONAL_CONFORM, OTHERWISE_CONFORM,
                                  PROVISIONAL_CONFORM, ConformanceDecision, ConformanceException, ConformanceParseParameters,
-                                 or_operation, parse_callable_from_xml)
+                                 feature, optional, or_operation, parse_callable_from_xml)
 from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, EventPathLocation,
                                     FeaturePathLocation, ProblemNotice, ProblemSeverity)
 
@@ -78,22 +80,6 @@ class CommandType(Enum):
     GENERATED = auto()
 
 
-def has_zigbee_conformance(conformance: ElementTree.Element) -> bool:
-    # For clusters, things with zigbee conformance can share IDs with the matter elements, so we don't want them
-
-    # TODO: it's actually possible for a thing to have a zigbee conformance AND to have other conformances, and we should check
-    # for that, but for now, this is fine because that hasn't happened in the cluster conformances YET.
-    # It does happen for device types, so we need to be careful there.
-    condition = conformance.iter('condition')
-    for c in condition:
-        try:
-            c.attrib['name'].lower() == "zigbee"
-            return True
-        except KeyError:
-            continue
-    return False
-
-
 class ClusterParser:
     def __init__(self, cluster, cluster_id, name):
         self._problems: list[ProblemNotice] = []
@@ -126,11 +112,11 @@ def get_conformance(self, element: ElementTree.Element) -> ElementTree.Element:
         if element.tag == 'feature':
             location = FeaturePathLocation(endpoint_id=0, cluster_id=self._cluster_id, feature_code=element.attrib['code'])
         elif element.tag == 'command':
-            location = CommandPathLocation(endpoint_id=0, cluster_id=self._cluster_id, command_id=element.attrib['id'])
+            location = CommandPathLocation(endpoint_id=0, cluster_id=self._cluster_id, command_id=int(element.attrib['id'], 0))
         elif element.tag == 'attribute':
-            location = AttributePathLocation(endpoint_id=0, cluster_id=self._cluster_id, attribute_id=element.attrib['id'])
+            location = AttributePathLocation(endpoint_id=0, cluster_id=self._cluster_id, attribute_id=int(element.attrib['id'], 0))
         elif element.tag == 'event':
-            location = EventPathLocation(endpoint_id=0, cluster_id=self._cluster_id, event_id=element.attrib['id'])
+            location = EventPathLocation(endpoint_id=0, cluster_id=self._cluster_id, event_id=int(element.attrib['id'], 0))
         else:
             location = ClusterPathLocation(endpoing_id=0, cluster_id=self._cluster_id)
         self._problems.append(ProblemNotice(test_name='Spec XML parsing', location=location,
@@ -150,8 +136,6 @@ def get_all_type(self, type_container: str, type_name: str, key_name: str) -> li
                     # This is a conformance tag, which uses the same name
                     continue
                 conformance = self.get_conformance(element)
-                if has_zigbee_conformance(conformance):
-                    continue
                 ret.append((element, conformance))
         return ret
 
@@ -264,7 +248,11 @@ def parse_events(self) -> dict[uint, XmlAttribute]:
         return events
 
     def create_cluster(self) -> XmlCluster:
-        return XmlCluster(revision=self._cluster.attrib['revision'], derived=self._derived,
+        try:
+            revision = int(self._cluster.attrib['revision'], 0)
+        except ValueError:
+            revision = 0
+        return XmlCluster(revision=revision, derived=self._derived,
                           name=self._name, feature_map=self.params.feature_map,
                           attribute_map=self.params.attribute_map, command_map=self.params.command_map,
                           features=self.parse_features(),
@@ -309,6 +297,25 @@ def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]:
             else:
                 derived_clusters[name] = new
 
+    # There are a few clusters where the conformance columns are listed as desc. These clusters need specific, targeted tests
+    # to properly assess conformance. Here, we list them as Optional to allow these for the general test. Targeted tests are described below.
+    # Descriptor - TagList feature - this feature is mandated when the duplicate condition holds for the endpoint. It is tested in DESC-2.2
+    # Actions cluster - all commands - these need to be listed in the ActionsList attribute to be supported.
+    #                                  We do not currently have a test for this. Please see https://github.com/CHIP-Specifications/chip-test-plans/issues/3646.
+    def remove_problem(location: typing.Union[CommandPathLocation, FeaturePathLocation]):
+        nonlocal problems
+        problems = [p for p in problems if p.location != location]
+
+    descriptor_id = Clusters.Descriptor.id
+    code = 'TAGLIST'
+    mask = clusters[descriptor_id].feature_map[code]
+    clusters[descriptor_id].features[mask].conformance = optional()
+    remove_problem(FeaturePathLocation(endpoint_id=0, cluster_id=descriptor_id, feature_code=code))
+    action_id = Clusters.Actions.id
+    for c in Clusters.ClusterObjects.ALL_ACCEPTED_COMMANDS[action_id]:
+        clusters[action_id].accepted_commands[c].conformance = optional()
+        remove_problem(CommandPathLocation(endpoint_id=0, cluster_id=action_id, command_id=c))
+
     # We have the information now about which clusters are derived, so we need to fix them up. Apply first the base cluster,
     # then add the specific cluster overtop
     for id, c in clusters.items():
@@ -340,4 +347,46 @@ def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]:
                              features=features, attributes=attributes, accepted_commands=accepted_commands,
                              generated_commands=generated_commands, events=events)
             clusters[id] = new
+
+    # workaround for aliased clusters not appearing in the xml. Remove this once https://github.com/csa-data-model/projects/issues/373 is addressed
+    conc_clusters = {0x040C: 'Carbon Monoxide Concentration Measurement',
+                     0x040D: 'Carbon Dioxide Concentration Measurement',
+                     0x0413: 'Nitrogen Dioxide Concentration Measurement',
+                     0x0415: 'Ozone Concentration Measurement',
+                     0x042A: 'PM2.5 Concentration Measurement',
+                     0x042B: 'Formaldehyde Concentration Measurement',
+                     0x042C: 'PM1 Concentration Measurement',
+                     0x042D: 'PM10 Concentration Measurement',
+                     0x042E: 'Total Volatile Organic Compounds Concentration Measurement',
+                     0x042F: 'Radon Concentration Measurement'}
+    conc_base_name = 'Concentration Measurement Clusters'
+    resource_clusters = {0x0071: 'HEPA Filter Monitoring',
+                         0x0072: 'Activated Carbon Filter Monitoring'}
+    resource_base_name = 'Resource Monitoring Clusters'
+    water_clusters = {0x0405: 'Relative Humidity Measurement',
+                      0x0407: 'Leaf Wetness Measurement',
+                      0x0408: 'Soil Moisture Measurement'}
+    water_base_name = 'Water Content Measurement Clusters'
+    aliases = {conc_base_name: conc_clusters, resource_base_name: resource_clusters, water_base_name: water_clusters}
+    for alias_base_name, aliased_clusters in aliases.items():
+        for id, alias_name in aliased_clusters.items():
+            base = derived_clusters[alias_base_name]
+            new = deepcopy(base)
+            new.derived = alias_base_name
+            new.name = alias_name
+            clusters[id] = new
+
+    # Workaround for temp control cluster - this is parsed incorrectly in the DM XML and is missing all its attributes
+    # Remove this workaround when https://github.com/csa-data-model/projects/issues/330 is fixed
+    temp_control_id = Clusters.TemperatureControl.id
+    if temp_control_id in clusters and not clusters[temp_control_id].attributes:
+        clusters[temp_control_id].attributes = {
+            0x00: XmlAttribute(name='TemperatureSetpoint', datatype='temperature', conformance=feature(0x01, 'TN')),
+            0x01: XmlAttribute(name='MinTemperature', datatype='temperature', conformance=feature(0x01, 'TN')),
+            0x02: XmlAttribute(name='MaxTemperature', datatype='temperature', conformance=feature(0x01, 'TN')),
+            0x03: XmlAttribute(name='Step', datatype='temperature', conformance=feature(0x04, 'STEP')),
+            0x04: XmlAttribute(name='SelectedTemperatureLevel', datatype='uint8', conformance=feature(0x02, 'TL')),
+            0x05: XmlAttribute(name='SupportedTemperatureLevels', datatype='list', conformance=feature(0x02, 'TL')),
+        }
+
     return clusters, problems
diff --git a/src/python_testing/taglist_and_topology_test_support.py b/src/python_testing/taglist_and_topology_test_support.py
new file mode 100644
index 00000000000000..af3bb05bea21b6
--- /dev/null
+++ b/src/python_testing/taglist_and_topology_test_support.py
@@ -0,0 +1,191 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import functools
+from collections import defaultdict
+from dataclasses import dataclass, field
+from typing import Any
+
+import chip.clusters as Clusters
+
+
+@dataclass
+class TagProblem:
+    root: int
+    missing_attribute: bool
+    missing_feature: bool
+    duplicates: set[int]
+    same_tag: set[int] = field(default_factory=set)
+
+
+def separate_endpoint_types(endpoint_dict: dict[int, Any]) -> tuple[list[int], list[int]]:
+    """Returns a tuple containing the list of flat endpoints and a list of tree endpoints"""
+    flat = []
+    tree = []
+    for endpoint_id, endpoint in endpoint_dict.items():
+        if endpoint_id == 0:
+            continue
+        aggregator_id = 0x000e
+        content_app_id = 0x0024
+        device_types = [d.deviceType for d in endpoint[Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]]
+        if aggregator_id in device_types:
+            flat.append(endpoint_id)
+        else:
+            if content_app_id in device_types:
+                continue
+            tree.append(endpoint_id)
+    return (flat, tree)
+
+
+def get_all_children(endpoint_id, endpoint_dict: dict[int, Any]) -> set[int]:
+    """Returns all the children (include subchildren) of the given endpoint
+       This assumes we've already checked that there are no cycles, so we can do the dumb things and just trace the tree
+    """
+    children = set()
+
+    def add_children(endpoint_id, children):
+        immediate_children = endpoint_dict[endpoint_id][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]
+        if not immediate_children:
+            return
+        children.update(set(immediate_children))
+        for child in immediate_children:
+            add_children(child, children)
+
+    add_children(endpoint_id, children)
+    return children
+
+
+def find_tree_roots(tree_endpoints: list[int], endpoint_dict: dict[int, Any]) -> set[int]:
+    """Returns a set of all the endpoints in tree_endpoints that are roots for a tree (not include singletons)"""
+    tree_roots = set()
+
+    def find_tree_root(current_id):
+        for endpoint_id, endpoint in endpoint_dict.items():
+            if endpoint_id not in tree_endpoints:
+                continue
+            if current_id in endpoint[Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]:
+                # this is not the root, move up
+                return find_tree_root(endpoint_id)
+        return current_id
+
+    for endpoint_id in tree_endpoints:
+        root = find_tree_root(endpoint_id)
+        if root != endpoint_id:
+            tree_roots.add(root)
+    return tree_roots
+
+
+def parts_list_cycles(tree_endpoints: list[int], endpoint_dict: dict[int, Any]) -> list[int]:
+    """Returns a list of all the endpoints in the tree_endpoints list that contain cycles"""
+    def parts_list_cycle_detect(visited: set, current_id: int) -> bool:
+        if current_id in visited:
+            return True
+        visited.add(current_id)
+        for child in endpoint_dict[current_id][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]:
+            child_has_cycles = parts_list_cycle_detect(visited, child)
+            if child_has_cycles:
+                return True
+        return False
+
+    cycles = []
+    # This is quick enough that we can do all the endpoints without searching for the roots
+    for endpoint_id in tree_endpoints:
+        visited = set()
+        if parts_list_cycle_detect(visited, endpoint_id):
+            cycles.append(endpoint_id)
+    return cycles
+
+
+def create_device_type_lists(roots: list[int], endpoint_dict: dict[int, Any]) -> dict[int, dict[int, set[int]]]:
+    """Returns a list of endpoints per device type for each root in the list"""
+    device_types = {}
+    for root in roots:
+        tree_device_types = defaultdict(set)
+        eps = get_all_children(root, endpoint_dict)
+        eps.add(root)
+        for ep in eps:
+            for d in endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]:
+                tree_device_types[d.deviceType].add(ep)
+        device_types[root] = tree_device_types
+
+    return device_types
+
+
+def get_direct_children_of_root(endpoint_dict: dict[int, Any]) -> set[int]:
+    root_children = set(endpoint_dict[0][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList])
+    direct_children = root_children
+    for ep in root_children:
+        ep_children = set(endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList])
+        direct_children = direct_children - ep_children
+    return direct_children
+
+
+def create_device_type_list_for_root(direct_children, endpoint_dict: dict[int, Any]) -> dict[int, set[int]]:
+    device_types = defaultdict(set)
+    for ep in direct_children:
+        for d in endpoint_dict[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]:
+            device_types[d.deviceType].add(ep)
+    return device_types
+
+
+def cmp_tag_list(a: Clusters.Descriptor.Structs.SemanticTagStruct, b: Clusters.Descriptor.Structs.SemanticTagStruct):
+    if a.mfgCode != b.mfgCode:
+        return -1 if a.mfgCode < b.mfgCode else 1
+    if a.namespaceID != b.namespaceID:
+        return -1 if a.namespaceID < b.namespaceID else 1
+    if a.tag != b.tag:
+        return -1 if a.tag < b.tag else 1
+    if a.label != b.label:
+        return -1 if a.label < b.label else 1
+    return 0
+
+
+def find_tag_list_problems(roots: list[int], device_types: dict[int, dict[int, set[int]]], endpoint_dict: dict[int, Any]) -> dict[int, TagProblem]:
+    """Checks for non-spec compliant tag lists"""
+    tag_problems = {}
+    for root in roots:
+        for _, endpoints in device_types[root].items():
+            if len(endpoints) < 2:
+                continue
+            for endpoint in endpoints:
+                missing_feature = not bool(endpoint_dict[endpoint][Clusters.Descriptor]
+                                           [Clusters.Descriptor.Attributes.FeatureMap] & Clusters.Descriptor.Bitmaps.Feature.kTagList)
+                if Clusters.Descriptor.Attributes.TagList not in endpoint_dict[endpoint][Clusters.Descriptor] or endpoint_dict[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList] == []:
+                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=True,
+                                                        missing_feature=missing_feature, duplicates=endpoints)
+                    continue
+                # Check that this tag isn't the same as the other tags in the endpoint list
+                duplicate_tags = set()
+                for other in endpoints:
+                    if other == endpoint:
+                        continue
+                    # The OTHER endpoint is missing a tag list attribute - ignore this here, we'll catch that when we assess this endpoint as the primary
+                    if Clusters.Descriptor.Attributes.TagList not in endpoint_dict[other][Clusters.Descriptor]:
+                        continue
+
+                    if sorted(endpoint_dict[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList], key=functools.cmp_to_key(cmp_tag_list)) == sorted(endpoint_dict[other][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList], key=functools.cmp_to_key(cmp_tag_list)):
+                        duplicate_tags.add(other)
+                if len(duplicate_tags) != 0:
+                    duplicate_tags.add(endpoint)
+                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=False, missing_feature=missing_feature,
+                                                        duplicates=endpoints, same_tag=duplicate_tags)
+                    continue
+                if missing_feature:
+                    tag_problems[endpoint] = TagProblem(root=root, missing_attribute=False,
+                                                        missing_feature=missing_feature, duplicates=endpoints)
+
+    return tag_problems
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 86e02725e261c6..cc0293ea864642 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -68,6 +68,10 @@ if (chip_device_platform == "cc13x2_26x2") {
   import("//build_overrides/mt793x_sdk.gni")
 } else if (chip_device_platform == "stm32") {
   import("//build_overrides/stm32_sdk.gni")
+} else if (chip_device_platform == "bl702") {
+  import("//build_overrides/bouffalolab_iot_sdk.gni")
+} else if (chip_device_platform == "bl702l") {
+  import("//build_overrides/bouffalolab_iot_sdk.gni")
 }
 
 buildconfig_header("system_buildconfig") {
@@ -162,11 +166,13 @@ source_set("system_config_header") {
     "${chip_root}/src:includes",
   ]
 
-  public_deps = [
+  deps = [
     ":system_buildconfig",
     "${chip_root}/src/platform:platform_buildconfig",
   ]
 
+  public_deps = []
+
   if (target_cpu != "esp32") {
     if (chip_system_config_use_lwip) {
       public_deps += [ "${chip_root}/src/lwip" ]
@@ -192,6 +198,12 @@ source_set("system_config_header") {
       if (chip_device_platform == "stm32") {
         public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
       }
+      if (chip_device_platform == "bl702") {
+        public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
+      }
+      if (chip_device_platform == "bl702l") {
+        public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
+      }
 
       # Add platform here as needed.
     }
@@ -210,7 +222,6 @@ static_library("system") {
     "SystemAlignSize.h",
     "SystemClock.cpp",
     "SystemClock.h",
-    "SystemConfig.h",
     "SystemError.cpp",
     "SystemError.h",
     "SystemEvent.h",
@@ -243,9 +254,10 @@ static_library("system") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
+    ":system_config_header",
     "${chip_root}/src/lib/core:error",
     "${chip_root}/src/lib/support",
-    "${chip_root}/src/platform:platform_buildconfig",
+    "${chip_root}/src/platform:platform_config_header",
     "${nlassert_root}:nlassert",
   ]
 
diff --git a/src/system/SystemLayerImplSelect.h b/src/system/SystemLayerImplSelect.h
index 361feef991460f..060657e77a72ef 100644
--- a/src/system/SystemLayerImplSelect.h
+++ b/src/system/SystemLayerImplSelect.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "system/SystemConfig.h"
+
 #if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
 #include <sys/select.h>
 #endif
diff --git a/src/system/SystemStats.cpp b/src/system/SystemStats.cpp
index c5be271ea16666..5ef16369ccc853 100644
--- a/src/system/SystemStats.cpp
+++ b/src/system/SystemStats.cpp
@@ -54,6 +54,7 @@ static const Label sStatsStrings[chip::System::Stats::kNumEntries] = {
 #endif
     "Exchange contexts",
     "Unsolicited message handlers",
+    "Platform events",
 };
 
 count_t sResourcesInUse[kNumEntries];
diff --git a/src/system/SystemStats.h b/src/system/SystemStats.h
index 9e11b15f38fd12..1bda5f2c5b1623 100644
--- a/src/system/SystemStats.h
+++ b/src/system/SystemStats.h
@@ -68,6 +68,7 @@ enum
 #endif
     kExchangeMgr_NumContexts,
     kExchangeMgr_NumUMHandlers,
+    kPlatformMgr_NumEvents,
     kNumEntries
 };
 
diff --git a/src/test_driver/efr32/include/FreeRTOSConfig.h b/src/test_driver/efr32/include/FreeRTOSConfig.h
index c74684789ac1bd..cffb27fed50709 100644
--- a/src/test_driver/efr32/include/FreeRTOSConfig.h
+++ b/src/test_driver/efr32/include/FreeRTOSConfig.h
@@ -237,7 +237,7 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
 #define configENABLE_BACKWARD_COMPATIBILITY (1)
 #define configSUPPORT_STATIC_ALLOCATION (1)
 #define configSUPPORT_DYNAMIC_ALLOCATION (1)
-#define configTOTAL_HEAP_SIZE ((size_t) (20 * 1024))
+#define configTOTAL_HEAP_SIZE ((size_t) (32 * 1024))
 
 /* Optional functions - most linkers will remove unused functions anyway. */
 #define INCLUDE_vTaskPrioritySet (1)
diff --git a/src/test_driver/nrfconnect/main/runner.cpp b/src/test_driver/nrfconnect/main/runner.cpp
index 7cff68e0efcbc6..99848e423c1390 100644
--- a/src/test_driver/nrfconnect/main/runner.cpp
+++ b/src/test_driver/nrfconnect/main/runner.cpp
@@ -19,6 +19,8 @@
 #include <lib/support/UnitTestRegistration.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <unistd.h>
+
 #include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
 
@@ -27,7 +29,7 @@ using namespace ::chip::DeviceLayer;
 
 LOG_MODULE_REGISTER(runner, CONFIG_MATTER_LOG_LEVEL);
 
-extern "C" void main(void)
+extern "C" int main(void)
 {
     VerifyOrDie(settings_subsys_init() == 0);
 
@@ -35,5 +37,5 @@ extern "C" void main(void)
     int status = RunRegisteredUnitTests();
     LOG_INF("CHIP test status: %d", status);
 
-    exit(status);
+    _exit(status);
 }
diff --git a/src/test_driver/nrfconnect/prj.conf b/src/test_driver/nrfconnect/prj.conf
index 134b2abe55c7d7..a4af4f769a4c67 100644
--- a/src/test_driver/nrfconnect/prj.conf
+++ b/src/test_driver/nrfconnect/prj.conf
@@ -92,3 +92,4 @@ CONFIG_CHIP_BUILD_TESTS=y
 CONFIG_CHIP_ENABLE_DNSSD_SRP=n
 CONFIG_CHIP_DEVICE_VENDOR_ID=65521
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32768
+CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
diff --git a/src/test_driver/openiotsdk/integration-tests/tv-app/test_app.py b/src/test_driver/openiotsdk/integration-tests/tv-app/test_app.py
index 306da35acd10ef..cb3663f23cab11 100644
--- a/src/test_driver/openiotsdk/integration-tests/tv-app/test_app.py
+++ b/src/test_driver/openiotsdk/integration-tests/tv-app/test_app.py
@@ -282,7 +282,7 @@ def test_tv_ctrl(device, controller):
                                     catalogVendorID=TV_CTRL_TEST_APP_ADMIN_VENDOR_ID, applicationID=application_id)),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == ApplicationLauncher.Enums.ApplicationLauncherStatusEnum.kSuccess
+    assert res.status == ApplicationLauncher.Enums.StatusEnum.kSuccess
     ret = device.wait_for_output("ApplicationLauncherManager::HandleLaunchApp")
     assert ret is not None and len(ret) > 0
 
@@ -291,7 +291,7 @@ def test_tv_ctrl(device, controller):
                                     catalogVendorID=TV_CTRL_TEST_APP_ADMIN_VENDOR_ID, applicationID=application_id)),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == ApplicationLauncher.Enums.ApplicationLauncherStatusEnum.kSuccess
+    assert res.status == ApplicationLauncher.Enums.StatusEnum.kSuccess
     ret = device.wait_for_output("ApplicationLauncherManager::HandleStopApp")
     assert ret is not None and len(ret) > 0
 
@@ -300,7 +300,7 @@ def test_tv_ctrl(device, controller):
                                     catalogVendorID=TV_CTRL_TEST_APP_ADMIN_VENDOR_ID, applicationID=application_id)),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == ApplicationLauncher.Enums.ApplicationLauncherStatusEnum.kSuccess
+    assert res.status == ApplicationLauncher.Enums.StatusEnum.kSuccess
     ret = device.wait_for_output("ApplicationLauncherManager::HandleHideApp")
     assert ret is not None and len(ret) > 0
 
@@ -326,7 +326,7 @@ def test_tv_ctrl(device, controller):
                                 dict(match=channels[1].name),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == Channel.Enums.ChannelStatusEnum.kSuccess
+    assert res.status == Channel.Enums.StatusEnum.kSuccess
 
     err, res = read_zcl_attribute(devCtrl, "Channel", "CurrentChannel", nodeId, endpoint)
     assert err == 0
@@ -359,7 +359,7 @@ def test_tv_ctrl(device, controller):
 
     err, res = read_zcl_attribute(devCtrl, "ContentLauncher", "SupportedStreamingProtocols", nodeId, endpoint)
     assert err == 0
-    assert res.value == ContentLauncher.Bitmaps.SupportedStreamingProtocol.kDash | ContentLauncher.Bitmaps.SupportedStreamingProtocol.kHls
+    assert res.value == ContentLauncher.Bitmaps.SupportedProtocolsBitmap.kDash | ContentLauncher.Bitmaps.SupportedProtocolsBitmap.kHls
 
     err, res = send_zcl_command(devCtrl, "ContentLauncher", "LaunchContent", nodeId, endpoint,
                                 dict(search=ContentLauncher.Structs.ContentSearchStruct(parameterList=[
@@ -373,7 +373,7 @@ def test_tv_ctrl(device, controller):
                                     autoPlay=True, data=None),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == ContentLauncher.Enums.ContentLaunchStatusEnum.kSuccess
+    assert res.status == ContentLauncher.Enums.StatusEnum.kSuccess
     ret = device.wait_for_output("ContentLauncherManager::HandleLaunchContent")
     assert ret is not None and len(ret) > 0
     ret = device.wait_for_output("TEST CASE found match=TV Show Example type={}".format(TV_CTRL_TEST_CONTENT_PARAMETER_TYPE_1))
@@ -394,7 +394,7 @@ def test_tv_ctrl(device, controller):
                                      )),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == ContentLauncher.Enums.ContentLaunchStatusEnum.kSuccess
+    assert res.status == ContentLauncher.Enums.StatusEnum.kSuccess
     ret = device.wait_for_output("ContentLauncherManager::HandleLaunchUrl")
     assert ret is not None and len(ret) > 0
     ret = device.wait_for_output("ContentLauncherManager::HandleLaunchUrl TEST CASE ContentURL={} DisplayString={} BrandingInformation.ProviderName={}".format(
@@ -408,13 +408,13 @@ def test_tv_ctrl(device, controller):
         err, res = send_zcl_command(devCtrl, "KeypadInput", "SendKey", nodeId, endpoint,
                                     dict(keyCode=keyCode), requestTimeoutMs=1000)
         assert err == 0
-        assert res.status == KeypadInput.Enums.KeypadInputStatusEnum.kSuccess
+        assert res.status == KeypadInput.Enums.StatusEnum.kSuccess
 
     err, res = send_zcl_command(devCtrl, "KeypadInput", "SendKey", nodeId, endpoint,
                                 dict(keyCode=TV_CTRL_TEST_KEY_PAD_UNSUPPORTED_KEY),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == KeypadInput.Enums.KeypadInputStatusEnum.kUnsupportedKey
+    assert res.status == KeypadInput.Enums.StatusEnum.kUnsupportedKey
 
     # TargetNavigator
     err, res = read_zcl_attribute(devCtrl, "TargetNavigator", "TargetList", nodeId, endpoint)
@@ -431,7 +431,7 @@ def test_tv_ctrl(device, controller):
                                 dict(target=current_target_id, data=None),
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == TargetNavigator.Enums.TargetNavigatorStatusEnum.kSuccess
+    assert res.status == TargetNavigator.Enums.StatusEnum.kSuccess
 
     err, res = read_zcl_attribute(devCtrl, "TargetNavigator", "CurrentTarget", nodeId, endpoint)
     assert err == 0
@@ -527,7 +527,7 @@ def test_tv_ctrl(device, controller):
                                 None,
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == MediaPlayback.Enums.MediaPlaybackStatusEnum.kSuccess
+    assert res.status == MediaPlayback.Enums.StatusEnum.kSuccess
 
     err, res = read_zcl_attribute(devCtrl, "MediaPlayback", "CurrentState", nodeId, TV_CTRL_TEST_APP_ENDPOINT_ID)
     assert err == 0
@@ -537,7 +537,7 @@ def test_tv_ctrl(device, controller):
                                 None,
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == MediaPlayback.Enums.MediaPlaybackStatusEnum.kSuccess
+    assert res.status == MediaPlayback.Enums.StatusEnum.kSuccess
 
     err, res = read_zcl_attribute(devCtrl, "MediaPlayback", "CurrentState", nodeId, TV_CTRL_TEST_APP_ENDPOINT_ID)
     assert err == 0
@@ -547,7 +547,7 @@ def test_tv_ctrl(device, controller):
                                 None,
                                 requestTimeoutMs=1000)
     assert err == 0
-    assert res.status == MediaPlayback.Enums.MediaPlaybackStatusEnum.kSuccess
+    assert res.status == MediaPlayback.Enums.StatusEnum.kSuccess
 
     err, res = read_zcl_attribute(devCtrl, "MediaPlayback", "CurrentState", nodeId, TV_CTRL_TEST_APP_ENDPOINT_ID)
     assert err == 0
@@ -564,6 +564,6 @@ def test_tv_ctrl(device, controller):
     # WakeOnLan
     err, res = read_zcl_attribute(devCtrl, "WakeOnLan", "MACAddress", nodeId, TV_CTRL_TEST_APP_ENDPOINT_ID)
     assert err == 0
-    assert res.value == "0000000000"
+    assert res.value == "000000000000"
 
     assert disconnect_device(devCtrl, nodeId)
diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md
index d1fc7e78447c1c..fe07f2e976793c 100644
--- a/src/test_driver/tizen/README.md
+++ b/src/test_driver/tizen/README.md
@@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in
 
 ```sh
 # Pull the image from hub.docker.com
-docker pull ghcr.io/project-chip/chip-build-tizen-qemu:22
+docker pull ghcr.io/project-chip/chip-build-tizen-qemu:26
 ```
 
 ## Building and Running Tests on QEMU
@@ -21,7 +21,7 @@ All steps described below should be done inside the docker container.
 
 ```sh
 docker run -it --rm --name chip-tizen-qemu \
-    ghcr.io/project-chip/chip-build-tizen-qemu:22 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:26 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository
diff --git a/src/tools/PICS-generator/PICSGenerator.py b/src/tools/PICS-generator/PICSGenerator.py
new file mode 100644
index 00000000000000..aa774f9cb127e3
--- /dev/null
+++ b/src/tools/PICS-generator/PICSGenerator.py
@@ -0,0 +1,446 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import argparse
+import json
+import os
+import pathlib
+import sys
+import xml.etree.ElementTree as ET
+
+import chip.clusters as Clusters
+from rich.console import Console
+
+# Add the path to python_testing folder, in order to be able to import from matter_testing_support
+sys.path.append(os.path.abspath(sys.path[0] + "/../../python_testing"))
+from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main  # noqa: E402
+
+console = None
+
+
+def GenerateDevicePicsXmlFiles(clusterName, clusterPicsCode, featurePicsList, attributePicsList, acceptedCommandPicsList, generatedCommandPicsList, outputPathStr):
+
+    xmlPath = xmlTemplatePathStr
+    fileName = ""
+
+    print(f"Handling PICS for {clusterName}")
+
+    # Map clusters to common XML template if needed
+    otaProviderCluster = "OTA Software Update Provider Cluster"
+    otaRequestorCluster = "OTA Software Update Requestor Cluster"
+    onOffCluster = "On/Off Cluster"
+    groupKeyManagementCluster = "Group Key Management Cluster"
+    nodeOperationalCredentialsCluster = "Node Operational Credentials Cluster"
+    basicInformationCluster = "Basic Information Cluster"
+    networkCommissioningCluster = "Network Commissioning Cluster"
+
+    if otaProviderCluster in clusterName or otaRequestorCluster in clusterName:
+        clusterName = "OTA Software Update"
+
+    elif onOffCluster == clusterName:
+        clusterName = clusterName.replace("/", "-")
+
+    elif groupKeyManagementCluster == clusterName:
+        clusterName = "Group Communication"
+
+    elif nodeOperationalCredentialsCluster == clusterName or basicInformationCluster == clusterName or networkCommissioningCluster == clusterName:
+        clusterName = clusterName.replace("Cluster", "").strip()
+
+    # Determine if file has already been handled and use this file
+    for outputFolderFileName in os.listdir(outputPathStr):
+        if clusterName in outputFolderFileName:
+            xmlPath = outputPathStr
+            fileName = outputFolderFileName
+            break
+
+    # If no file is found in output folder, determine if there is a match for the cluster name in input folder
+    if fileName == "":
+        for file in xmlFileList:
+            if file.lower().startswith(clusterName.lower()):
+                fileName = file
+                break
+        else:
+            console.print(f"[red]Could not find matching file for \"{clusterName}\" ❌")
+            return
+
+    try:
+        # Open the XML PICS template file
+        console.print(f"Open \"{xmlPath}{fileName}\"")
+        parser = ET.XMLParser(target=ET.TreeBuilder(insert_comments=True))
+        tree = ET.parse(f"{xmlPath}{fileName}", parser)
+        root = tree.getroot()
+    except ET.ParseError:
+        console.print(f"[red]Could not find \"{fileName}\" ❌")
+        return
+
+    # Usage PICS
+    # console.print(clusterPicsCode)
+    usageNode = root.find('usage')
+    for picsItem in usageNode:
+        itemNumberElement = picsItem.find('itemNumber')
+
+        console.print(f"Searching for {itemNumberElement.text}")
+
+        if itemNumberElement.text == f"{clusterPicsCode}":
+            console.print("Found usage PICS value in XML template ✅")
+            supportElement = picsItem.find('support')
+            # console.print(f"Support: {supportElement.text}")
+            supportElement.text = "true"
+
+            # Since usage PICS (server or client) is not a list, we can break out when a match is found,
+            # no reason to keep iterating through the elements.
+            break
+
+    # Feature PICS
+    # console.print(featurePicsList)
+    featureNode = root.find("./clusterSide[@type='Server']/features")
+    for picsItem in featureNode:
+        itemNumberElement = picsItem.find('itemNumber')
+
+        console.print(f"Searching for {itemNumberElement.text}")
+
+        if f"{itemNumberElement.text}" in featurePicsList:
+            console.print("Found feature PICS value in XML template ✅")
+            supportElement = picsItem.find('support')
+            supportElement.text = "true"
+
+    # Attributes PICS
+    # TODO: Only check if list is not empty
+    # console.print(attributePicsList)
+    serverAttributesNode = root.find("./clusterSide[@type='Server']/attributes")
+    for picsItem in serverAttributesNode:
+        itemNumberElement = picsItem.find('itemNumber')
+
+        console.print(f"Searching for {itemNumberElement.text}")
+
+        if f"{itemNumberElement.text}" in attributePicsList:
+            console.print("Found attribute PICS value in XML template ✅")
+            supportElement = picsItem.find('support')
+            supportElement.text = "true"
+
+    # AcceptedCommandList PICS
+    # TODO: Only check if list is not empty
+    # console.print(acceptedCommandPicsList)
+    serverCommandsReceivedNode = root.find("./clusterSide[@type='Server']/commandsReceived")
+    for picsItem in serverCommandsReceivedNode:
+        itemNumberElement = picsItem.find('itemNumber')
+
+        console.print(f"Searching for {itemNumberElement.text}")
+
+        if f"{itemNumberElement.text}" in acceptedCommandPicsList:
+            console.print("Found acceptedCommand PICS value in XML template ✅")
+            supportElement = picsItem.find('support')
+            supportElement.text = "true"
+
+    # GeneratedCommandList PICS
+    # console.print(generatedCommandPicsList)
+    # TODO: Only check if list is not empty
+    serverCommandsGeneratedNode = root.find("./clusterSide[@type='Server']/commandsGenerated")
+    for picsItem in serverCommandsGeneratedNode:
+        itemNumberElement = picsItem.find('itemNumber')
+
+        console.print(f"Searching for {itemNumberElement.text}")
+
+        if f"{itemNumberElement.text}" in generatedCommandPicsList:
+            console.print("Found generatedCommand PICS value in XML template ✅")
+            supportElement = picsItem.find('support')
+            supportElement.text = "true"
+
+    # Event PICS (Work in progress)
+    # The ability to set event PICS is fairly limited, due to EventList not being supported,
+    # as well as no way to check for event support in the current Matter SDK.
+
+    # This implementation marks an event as supported if:
+    # 1) Event is mandatody
+    # 2) The event is mandatory based on a feature that is supported (Cross check against feature list) (Not supported yet)
+    serverEventsNode = root.find("./clusterSide[@type='Server']/events")
+    for picsItem in serverEventsNode:
+        itemNumberElement = picsItem.find('itemNumber')
+        statusElement = picsItem.find('status')
+
+        try:
+            condition = statusElement.attrib['cond']
+            console.print(f"Checking {itemNumberElement.text} with conformance {statusElement.text} and condition {condition}")
+        except ET.ParseError:
+            condition = ""
+            console.print(f"Checking {itemNumberElement.text} with conformance {statusElement.text}")
+
+        if statusElement.text == "M":
+
+            # Is event mandated by the server
+            if condition == clusterPicsCode:
+                console.print("Found event mandated by server ✅")
+                supportElement = picsItem.find('support')
+                supportElement.text = "true"
+                continue
+
+            if condition in featurePicsList:
+                console.print("Found event mandated by feature ✅")
+                supportElement = picsItem.find('support')
+                supportElement.text = "true"
+                continue
+
+            if condition == "":
+                console.print("Event is mandated without a condition ✅")
+                continue
+
+    # Grabbing the header from the XML templates
+    inputFile = open(f"{xmlPath}{fileName}", "r")
+    outputFile = open(f"{outputPathStr}/{fileName}", "ab")
+    xmlHeader = ""
+    inputLine = inputFile.readline().lstrip()
+
+    while 'clusterPICS' not in inputLine:
+        xmlHeader += inputLine
+        inputLine = inputFile.readline().lstrip()
+
+    # Write the PICS XML header
+    outputFile.write(xmlHeader.encode())
+
+    # Write the PICS XML data
+    tree.write(outputFile)
+
+
+async def DeviceMapping(devCtrl, nodeID, outputPathStr):
+
+    # --- Device mapping --- #
+    console.print("[blue]Perform device mapping")
+    # Determine how many endpoints to map
+    # Test step 1 - Read parts list
+
+    partsListResponse = await devCtrl.ReadAttribute(nodeID, [(rootNodeEndpointID, Clusters.Descriptor.Attributes.PartsList)])
+    partsList = partsListResponse[0][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList]
+
+    # Add endpoint 0 to the parts list, since this is not returned by the device
+    partsList.insert(0, 0)
+    # console.print(partsList)
+
+    for endpoint in partsList:
+        # Test step 2 - Map each available endpoint
+        console.print(f"Mapping endpoint: {endpoint}")
+
+        # Create endpoint specific output folder and register this as output folder
+        endpointOutputPathStr = f"{outputPathStr}endpoint{endpoint}/"
+        endpointOutputPath = pathlib.Path(endpointOutputPathStr)
+        if not endpointOutputPath.exists():
+            endpointOutputPath.mkdir()
+
+        # Read device list (Not required)
+        deviceListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, Clusters.Descriptor.Attributes.DeviceTypeList)])
+
+        for deviceTypeData in deviceListResponse[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.DeviceTypeList]:
+            console.print(f"Device Type: {deviceTypeData.deviceType}")
+
+        # Read server list
+        serverListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, Clusters.Descriptor.Attributes.ServerList)])
+        serverList = serverListResponse[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.ServerList]
+
+        for server in serverList:
+            featurePicsList = []
+            attributePicsList = []
+            acceptedCommandListPicsList = []
+            generatedCommandListPicsList = []
+
+            clusterClass = getattr(Clusters, devCtrl.GetClusterHandler().GetClusterInfoById(server)['clusterName'])
+            clusterID = f"0x{server:04x}"
+
+            # Does the clusterInfoDict contain the found cluster ID?
+            if clusterID not in clusterInfoDict:
+                console.print(f"[red]Cluster ID ({clusterID}) not in list! ❌")
+                continue
+
+            clusterName = clusterInfoDict[clusterID]['Name']
+            clusterPICS = f"{clusterInfoDict[clusterID]['PICS_Code']}{serverTag}"
+
+            console.print(f"{clusterName} - {clusterPICS}")
+
+            # Print PICS for specific server from dict
+            # console.print(clusterInfoDict[f"0x{server:04x}"])
+
+            # Read feature map
+            featureMapResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, clusterClass.Attributes.FeatureMap)])
+            # console.print(f"FeatureMap: {featureMapResponse[endpoint][clusterClass][clusterClass.Attributes.FeatureMap]}")
+
+            featureMapValue = featureMapResponse[endpoint][clusterClass][clusterClass.Attributes.FeatureMap]
+            featureMapBitString = "{:08b}".format(featureMapValue).lstrip("0")
+            for bitLocation in range(len(featureMapBitString)):
+                if featureMapValue >> bitLocation & 1 == 1:
+                    # console.print(f"{clusterPICS}{featureTag}{bitLocation:02x}")
+                    featurePicsList.append(f"{clusterPICS}{featureTag}{bitLocation:02x}")
+
+            console.print("Collected feature PICS:")
+            console.print(featurePicsList)
+
+            # Read attribute list
+            attributeListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, clusterClass.Attributes.AttributeList)])
+            attributeList = attributeListResponse[endpoint][clusterClass][clusterClass.Attributes.AttributeList]
+            # console.print(f"AttributeList: {attributeList}")
+
+            # Convert attribute to PICS code
+            for attribute in attributeList:
+                if (attribute != 0xfff8 and attribute != 0xfff9 and attribute != 0xfffa and attribute != 0xfffb and attribute != 0xfffc and attribute != 0xfffd):
+                    # console.print(f"{clusterPICS}{attributeTag}{attribute:04x}")
+                    attributePicsList.append(f"{clusterPICS}{attributeTag}{attribute:04x}")
+                '''
+                else:
+                    console.print(f"[yellow]Ignore global attribute 0x{attribute:04x}")
+                '''
+
+            console.print("Collected attribute PICS:")
+            console.print(attributePicsList)
+
+            # Read AcceptedCommandList
+            acceptedCommandListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, clusterClass.Attributes.AcceptedCommandList)])
+            acceptedCommandList = acceptedCommandListResponse[endpoint][clusterClass][clusterClass.Attributes.AcceptedCommandList]
+            # console.print(f"AcceptedCommandList: {acceptedCommandList}")
+
+            # Convert accepted command to PICS code
+            for acceptedCommand in acceptedCommandList:
+                # console.print(f"{clusterPICS}{commandTag}{acceptedCommand:02x}{acceptedCommandTag}")
+                acceptedCommandListPicsList.append(f"{clusterPICS}{commandTag}{acceptedCommand:02x}{acceptedCommandTag}")
+
+            console.print("Collected accepted command PICS:")
+            console.print(acceptedCommandListPicsList)
+
+            # Read GeneratedCommandList
+            generatedCommandListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, clusterClass.Attributes.GeneratedCommandList)])
+            generatedCommandList = generatedCommandListResponse[endpoint][clusterClass][clusterClass.Attributes.GeneratedCommandList]
+            # console.print(f"GeneratedCommandList: {generatedCommandList}")
+
+            # Convert accepted command to PICS code
+            for generatedCommand in generatedCommandList:
+                # console.print(f"{clusterPICS}{commandTag}{generatedCommand:02x}{generatedCommandTag}")
+                generatedCommandListPicsList.append(f"{clusterPICS}{commandTag}{generatedCommand:02x}{generatedCommandTag}")
+
+            console.print("Collected generated command PICS:")
+            console.print(generatedCommandListPicsList)
+
+            # Write the collected PICS to a PICS XML file
+            GenerateDevicePicsXmlFiles(clusterName, clusterPICS, featurePicsList, attributePicsList,
+                                       acceptedCommandListPicsList, generatedCommandListPicsList, endpointOutputPathStr)
+
+        # Read client list
+        clientListResponse = await devCtrl.ReadAttribute(nodeID, [(endpoint, Clusters.Descriptor.Attributes.ClientList)])
+        clientList = clientListResponse[endpoint][Clusters.Descriptor][Clusters.Descriptor.Attributes.ClientList]
+
+        for client in clientList:
+            clusterID = f"0x{client:04x}"
+            clusterName = clusterInfoDict[clusterID]['Name']
+            clusterPICS = f"{clusterInfoDict[clusterID]['PICS_Code']}{clientTag}"
+
+            console.print(f"{clusterName} - {clusterPICS}")
+
+            GenerateDevicePicsXmlFiles(clusterName, clusterPICS, [], [], [], [], endpointOutputPathStr)
+
+
+def cleanDirectory(pathToClean):
+    for entry in pathToClean.iterdir():
+        if entry.is_file():
+            pathlib.Path(entry).unlink()
+        elif entry.is_dir():
+            cleanDirectory(entry)
+            pathlib.Path(entry).rmdir()
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--cluster-data', required=True)
+parser.add_argument('--pics-template', required=True)
+parser.add_argument('--pics-output', required=True)
+args, unknown = parser.parse_known_args()
+
+basePath = os.path.dirname(__file__)
+clusterInfoInputPathStr = args.cluster_data
+
+xmlTemplatePathStr = args.pics_template
+if not xmlTemplatePathStr.endswith('/'):
+    xmlTemplatePathStr += '/'
+
+baseOutputPathStr = args.pics_output
+if not baseOutputPathStr.endswith('/'):
+    baseOutputPathStr += '/'
+
+serverTag = ".S"
+clientTag = ".C"
+featureTag = ".F"
+attributeTag = ".A"
+commandTag = ".C"
+acceptedCommandTag = ".Rsp"
+generatedCommandTag = ".Tx"
+
+# List of globale attributes (server)
+# Does not read ClusterRevision [0xFFFD] (not relevant), EventList [0xFFFA] (Provisional)
+featureMapAttributeId = "0xFFFC"
+attributeListAttributeId = "0xFFFB"
+acceptedCommandListAttributeId = "0xFFF9"
+generatedCommandListAttributeId = "0xFFF8"
+
+# Endpoint define
+rootNodeEndpointID = 0
+
+# Load cluster info
+inputJson = {}
+clusterInfoDict = {}
+
+print("Generating cluster data dict from JSON input")
+
+with open(clusterInfoInputPathStr, 'rb') as clusterInfoInputFile:
+    clusterInfoJson = json.load(clusterInfoInputFile)
+
+    for cluster in clusterInfoJson:
+        clusterData = clusterInfoJson[f"{cluster}"]["Data created by Script"]
+
+        try:
+            # Check if cluster id is a value hex value
+            clusterIdValid = int(clusterData["Id"].lower(), 16)
+
+            # Add cluster data to dict
+            clusterInfoDict[clusterData["Id"].lower()] = {
+                "Name": clusterData["Cluster Name"],
+                "PICS_Code": clusterData["PICS Code"],
+            }
+
+        except ValueError:
+            print(f"Ignore ClusterID: {clusterData['Id']} - {clusterData['Cluster Name']}")
+
+# Load PICS XML templates
+print("Capture list of PICS XML templates")
+xmlFileList = os.listdir(xmlTemplatePathStr)
+
+# Setup output path
+baseOutputPath = pathlib.Path(baseOutputPathStr)
+if not baseOutputPath.exists():
+    print("Create output folder")
+    baseOutputPath.mkdir()
+else:
+    print("Clean output folder")
+    cleanDirectory(baseOutputPath)
+
+
+class DeviceMappingTest(MatterBaseTest):
+    @async_test_body
+    async def test_device_mapping(self):
+
+        # Create console to print
+        global console
+        console = Console()
+
+        # Run device mapping function
+        await DeviceMapping(self.default_controller, self.dut_node_id, baseOutputPathStr)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/tools/PICS-generator/README.md b/src/tools/PICS-generator/README.md
new file mode 100644
index 00000000000000..1f5964d80e9b5e
--- /dev/null
+++ b/src/tools/PICS-generator/README.md
@@ -0,0 +1,83 @@
+---
+orphan: true
+---
+
+# Tool information
+
+This tool reads out the supported elements and generates the appropriate PICS
+files for the device. The tool outputs the PICS for all endpoints and outputs
+these in a single folder.
+
+Note: The tool does relay on what the the device is able to express and for now
+there are areas which the tool can not cover:
+
+-   PICS in base.xml
+-   Only mandatory events are marked as supported, since the global attribute
+    with list of events is provisional
+
+# Setup
+
+This tool uses the python environment used by the python_testing efforts, which
+can be built using the below command.
+
+```
+scripts/build_python.sh -m platform -i out/python_env
+```
+
+Once the python environment is build it can be activated using this command:
+
+```
+source out/python_env/bin/activate
+```
+
+The script uses the json based data model in order to convert cluster
+identifiers into PICS Codes. The file can be downloaded here:
+[https://groups.csa-iot.org/wg/matter-csg/document/27290](https://groups.csa-iot.org/wg/matter-csg/document/27290)
+
+NOTE: The tool has been verified using the "Specification_version
+0.7-spring2024.json" version.
+
+The script uses the PICS XML templates for generate the PICS output. These files
+can be downloaded here:
+[https://groups.csa-iot.org/wg/matter-csg/document/26122](https://groups.csa-iot.org/wg/matter-csg/document/26122)
+
+NOTE: The tool has been verified using V24 PICS (used for Matter 1.2
+certification)
+
+# How to run
+
+The tool does, as mentioned above, have external dependencies, these are
+provided to the tool using these arguments:
+
+-   --cluster-data is the absolute path to the JSON file containing the cluster
+    data
+-   --pics-template is the absolute path to the folder containing the PICS
+    templates
+-   --pics-output is the absolute path to the output folder to be used
+
+If the device has not been commissioned this can be done by passing in the
+commissioning information:
+
+```
+python3 'src/python_testing/PICSGenerator.py' --cluster-data <pathToClusterJson> --pics-template <pathToPicsTemplateFolder> --pics-output <outputPath> --commissioning-method ble-thread --discriminator <DESCRIMINATOR> --passcode <PASSCODE> --thread-dataset-hex <DATASET_AS_HEX>
+```
+
+In case the device uses a development PAA, the following parameter should be
+added.
+
+```
+--paa-trust-store-path credentials/development/paa-root-certs
+```
+
+In case the device uses a production PAA, the following parameter should be
+added.
+
+```
+--paa-trust-store-path credentials/production/paa-root-certs
+```
+
+If a device has already been commissioned, the tool can be executed like this:
+
+```
+python3 'src/python_testing/PICSGenerator.py' --cluster-data <pathToClusterJson> --pics-template <pathToPicsTemplateFolder> --pics-output <outputPath>
+```
diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp
index 7ca215b526017a..a8857ae72baa58 100644
--- a/src/tools/chip-cert/CertUtils.cpp
+++ b/src/tools/chip-cert/CertUtils.cpp
@@ -216,38 +216,53 @@ void ToolChipDN::PrintDN(FILE * file, const char * name) const
 
 namespace {
 
+template <size_t N>
+bool HasRawPrefix(const uint8_t * buffer, size_t len, const uint8_t (&prefix)[N])
+{
+    return len >= N && memcmp(buffer, prefix, N) == 0;
+}
+
+bool HasStringPrefix(const uint8_t * buffer, size_t len, const char * prefix)
+{
+    size_t prefixLen = strlen(prefix);
+    return len >= prefixLen && memcmp(buffer, prefix, prefixLen) == 0;
+}
+
 CertFormat DetectCertFormat(const uint8_t * cert, uint32_t certLen)
 {
-    static const uint8_t chipRawPrefix[] = { 0x15, 0x30, 0x01 };
-    static const char * chipHexPrefix    = "153001";
-    static const char * chipB64Prefix    = "FTAB";
-    static const uint8_t derRawPrefix[]  = { 0x30, 0x82 };
-    static const char * derHexPrefix     = "30820";
-    static const char * pemMarker        = "-----BEGIN CERTIFICATE-----";
+    static const uint8_t chipRawPrefix[]           = { 0x15, 0x30, 0x01 };
+    static const char * chipHexPrefix              = "153001";
+    static const char * chipB64Prefix              = "FTAB";
+    static const uint8_t chipCompactPdcRawPrefix[] = { 0x15, 0x30, 0x09 };
+    static const char * chipCompactPdcHexPrefix    = "153009";
+    static const char * chipCompactPdcB64Prefix    = "FTAJ";
+    static const uint8_t derRawPrefix[]            = { 0x30, 0x82 };
+    static const char * derHexPrefix               = "30820";
+    static const char * pemMarker                  = "-----BEGIN CERTIFICATE-----";
 
     VerifyOrReturnError(cert != nullptr, kCertFormat_Unknown);
 
-    if ((certLen > sizeof(chipRawPrefix)) && (memcmp(cert, chipRawPrefix, sizeof(chipRawPrefix)) == 0))
+    if (HasRawPrefix(cert, certLen, chipRawPrefix) || HasRawPrefix(cert, certLen, chipCompactPdcRawPrefix))
     {
         return kCertFormat_Chip_Raw;
     }
 
-    if ((certLen > strlen(chipHexPrefix)) && (memcmp(cert, chipHexPrefix, strlen(chipHexPrefix)) == 0))
+    if (HasStringPrefix(cert, certLen, chipHexPrefix) || HasStringPrefix(cert, certLen, chipCompactPdcHexPrefix))
     {
         return kCertFormat_Chip_Hex;
     }
 
-    if ((certLen > strlen(chipB64Prefix)) && (memcmp(cert, chipB64Prefix, strlen(chipB64Prefix)) == 0))
+    if (HasStringPrefix(cert, certLen, chipB64Prefix) || HasStringPrefix(cert, certLen, chipCompactPdcB64Prefix))
     {
         return kCertFormat_Chip_Base64;
     }
 
-    if ((certLen > sizeof(derRawPrefix)) && (memcmp(cert, derRawPrefix, sizeof(derRawPrefix)) == 0))
+    if (HasRawPrefix(cert, certLen, derRawPrefix))
     {
         return kCertFormat_X509_DER;
     }
 
-    if ((certLen > strlen(derHexPrefix)) && (memcmp(cert, derHexPrefix, strlen(derHexPrefix)) == 0))
+    if (HasStringPrefix(cert, certLen, derHexPrefix))
     {
         return kCertFormat_X509_Hex;
     }
@@ -260,23 +275,26 @@ CertFormat DetectCertFormat(const uint8_t * cert, uint32_t certLen)
     return kCertFormat_Unknown;
 }
 
-bool SetCertSerialNumber(X509 * cert)
+bool SetCertSerialNumber(X509 * cert, uint64_t value = kUseRandomSerialNumber)
 {
     bool res = true;
     uint64_t rnd;
     ASN1_INTEGER * snInt = X509_get_serialNumber(cert);
 
-    // Generate a random value to be used as the serial number.
-    if (!RAND_bytes(reinterpret_cast<uint8_t *>(&rnd), sizeof(rnd)))
+    if (value == kUseRandomSerialNumber)
     {
-        ReportOpenSSLErrorAndExit("RAND_bytes", res = false);
-    }
+        // Generate a random value to be used as the serial number.
+        if (!RAND_bytes(reinterpret_cast<uint8_t *>(&rnd), sizeof(rnd)))
+        {
+            ReportOpenSSLErrorAndExit("RAND_bytes", res = false);
+        }
 
-    // Avoid negative numbers.
-    rnd &= 0x7FFFFFFFFFFFFFFF;
+        // Avoid negative numbers.
+        value = rnd & 0x7FFFFFFFFFFFFFFFULL;
+    }
 
     // Store the serial number as an ASN1 integer value within the certificate.
-    if (ASN1_INTEGER_set_uint64(snInt, rnd) == 0)
+    if (ASN1_INTEGER_set_uint64(snInt, value) == 0)
     {
         ReportOpenSSLErrorAndExit("ASN1_INTEGER_set_uint64", res = false);
     }
@@ -842,7 +860,7 @@ bool MakeCert(CertType certType, const ToolChipDN * subjectDN, X509 * caCert, EV
               EVP_PKEY * newKey, CertStructConfig & certConfig)
 {
     bool res  = true;
-    bool isCA = (certType != CertType::kNode);
+    bool isCA = (certType == CertType::kRoot || certType == CertType::kICA);
 
     VerifyOrExit(subjectDN != nullptr, res = false);
     VerifyOrExit(caCert != nullptr, res = false);
@@ -859,7 +877,7 @@ bool MakeCert(CertType certType, const ToolChipDN * subjectDN, X509 * caCert, EV
     // Generate a serial number for the cert.
     if (certConfig.IsSerialNumberPresent())
     {
-        res = SetCertSerialNumber(newCert);
+        res = SetCertSerialNumber(newCert, (certType == CertType::kNetworkIdentity ? 1 : kUseRandomSerialNumber));
         VerifyTrueOrExit(res);
     }
 
@@ -930,10 +948,15 @@ bool MakeCert(CertType certType, const ToolChipDN * subjectDN, X509 * caCert, EV
             res = AddExtension(newCert, NID_ext_key_usage, "critical,codeSigning");
             VerifyTrueOrExit(res);
         }
+        else if (certType == CertType::kNetworkIdentity)
+        {
+            res = AddExtension(newCert, NID_ext_key_usage, "critical,clientAuth,serverAuth");
+            VerifyTrueOrExit(res);
+        }
     }
 
     // Add a subject key id extension for the certificate.
-    if (certConfig.IsExtensionSKIDPresent())
+    if (certType != CertType::kNetworkIdentity && certConfig.IsExtensionSKIDPresent())
     {
         res = AddSubjectKeyId(newCert, certConfig.IsExtensionSKIDLengthValid());
         VerifyTrueOrExit(res);
@@ -941,7 +964,7 @@ bool MakeCert(CertType certType, const ToolChipDN * subjectDN, X509 * caCert, EV
 
     // Add the authority key id extension from the signing certificate. For self-signed cert's this will
     // be the same as new cert's subject key id extension.
-    if (certConfig.IsExtensionAKIDPresent())
+    if (certType != CertType::kNetworkIdentity && certConfig.IsExtensionAKIDPresent())
     {
         if ((certType == CertType::kRoot) && !certConfig.IsExtensionSKIDPresent())
         {
@@ -1012,6 +1035,10 @@ CHIP_ERROR MakeCertTLV(CertType certType, const ToolChipDN * subjectDN, X509 * c
 
     isCA = (certType == CertType::kICA || certType == CertType::kRoot);
 
+    // If error testing is enabled, let field inclusion be controlled that way,
+    // otherwise use compact identity format for Network (Client) Identities.
+    bool useCompactIdentityFormat = (!certConfig.IsErrorTestCaseEnabled() && certType == CertType::kNetworkIdentity);
+
     uint8_t * p = subjectPubkey;
     VerifyOrReturnError(i2o_ECPublicKey(EVP_PKEY_get0_EC_KEY(newKey), &p) == chip::Crypto::CHIP_CRYPTO_PUBLIC_KEY_SIZE_BYTES,
                         CHIP_ERROR_INVALID_ARGUMENT);
@@ -1024,85 +1051,90 @@ CHIP_ERROR MakeCertTLV(CertType certType, const ToolChipDN * subjectDN, X509 * c
 
     ReturnErrorOnFailure(writer.StartContainer(AnonymousTag(), kTLVType_Structure, containerType));
 
-    // serial number
-    if (certConfig.IsSerialNumberPresent())
+    if (!useCompactIdentityFormat)
     {
-        ASN1_INTEGER * asn1Integer = X509_get_serialNumber(x509Cert);
-        uint64_t serialNumber;
-        uint8_t serialNumberArray[sizeof(uint64_t)];
-        VerifyOrReturnError(1 == ASN1_INTEGER_get_uint64(&serialNumber, asn1Integer), CHIP_ERROR_INVALID_ARGUMENT);
-        Encoding::BigEndian::Put64(serialNumberArray, serialNumber);
-        ReturnErrorOnFailure(writer.PutBytes(ContextTag(kTag_SerialNumber), serialNumberArray, sizeof(serialNumberArray)));
-    }
+        // serial number
+        if (certConfig.IsSerialNumberPresent())
+        {
+            ASN1_INTEGER * asn1Integer = X509_get_serialNumber(x509Cert);
+            uint64_t serialNumber;
+            uint8_t serialNumberArray[sizeof(uint64_t)];
+            VerifyOrReturnError(1 == ASN1_INTEGER_get_uint64(&serialNumber, asn1Integer), CHIP_ERROR_INVALID_ARGUMENT);
+            Encoding::BigEndian::Put64(serialNumberArray, serialNumber);
+            ReturnErrorOnFailure(writer.PutBytes(ContextTag(kTag_SerialNumber), serialNumberArray, sizeof(serialNumberArray)));
+        }
 
-    // signature algorithm
-    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_SignatureAlgorithm), certConfig.GetSignatureAlgorithmTLVEnum()));
+        // signature algorithm
+        ReturnErrorOnFailure(writer.Put(ContextTag(kTag_SignatureAlgorithm), certConfig.GetSignatureAlgorithmTLVEnum()));
 
-    // issuer Name
-    if (certConfig.IsIssuerPresent())
-    {
-        if (certType == CertType::kRoot)
+        // issuer Name
+        if (certConfig.IsIssuerPresent())
+        {
+            if (certType == CertType::kRoot)
+            {
+                ReturnErrorOnFailure(subjectDN->EncodeToTLV(writer, ContextTag(kTag_Issuer)));
+            }
+            else
+            {
+                uint8_t caChipCertBuf[kMaxCHIPCertLength];
+                MutableByteSpan caChipCert(caChipCertBuf);
+                VerifyOrReturnError(true == X509ToChipCert(caCert, caChipCert), CHIP_ERROR_INVALID_ARGUMENT);
+                ChipDN issuerDN;
+                ReturnErrorOnFailure(ExtractSubjectDNFromChipCert(caChipCert, issuerDN));
+                ReturnErrorOnFailure(issuerDN.EncodeToTLV(writer, ContextTag(kTag_Issuer)));
+            }
+        }
+
+        // validity
+        uint32_t validFromChipEpoch;
+        uint32_t validToChipEpoch;
+
+        VerifyOrReturnError(
+            true ==
+                CalendarToChipEpochTime(static_cast<uint16_t>(validFrom.tm_year + 1900), static_cast<uint8_t>(validFrom.tm_mon + 1),
+                                        static_cast<uint8_t>(validFrom.tm_mday), static_cast<uint8_t>(validFrom.tm_hour),
+                                        static_cast<uint8_t>(validFrom.tm_min), static_cast<uint8_t>(validFrom.tm_sec),
+                                        validFromChipEpoch),
+            CHIP_ERROR_INVALID_ARGUMENT);
+        if (validDays == kCertValidDays_NoWellDefinedExpiration)
         {
-            ReturnErrorOnFailure(subjectDN->EncodeToTLV(writer, ContextTag(kTag_Issuer)));
+            validToChipEpoch = 0;
         }
         else
         {
-            uint8_t caChipCertBuf[kMaxCHIPCertLength];
-            MutableByteSpan caChipCert(caChipCertBuf);
-            VerifyOrReturnError(true == X509ToChipCert(caCert, caChipCert), CHIP_ERROR_INVALID_ARGUMENT);
-            ChipDN issuerDN;
-            ReturnErrorOnFailure(ExtractSubjectDNFromChipCert(caChipCert, issuerDN));
-            ReturnErrorOnFailure(issuerDN.EncodeToTLV(writer, ContextTag(kTag_Issuer)));
+            VerifyOrReturnError(CanCastTo<uint32_t>(validFromChipEpoch + validDays * kSecondsPerDay - 1),
+                                CHIP_ERROR_INVALID_ARGUMENT);
+            validToChipEpoch = validFromChipEpoch + validDays * kSecondsPerDay - 1;
+        }
+        if (!certConfig.IsValidityCorrect())
+        {
+            uint32_t validTemp = validFromChipEpoch;
+            validFromChipEpoch = validToChipEpoch;
+            validToChipEpoch   = validTemp;
+        }
+        if (certConfig.IsValidityNotBeforePresent())
+        {
+            ReturnErrorOnFailure(writer.Put(ContextTag(kTag_NotBefore), validFromChipEpoch));
+        }
+        if (certConfig.IsValidityNotAfterPresent())
+        {
+            ReturnErrorOnFailure(writer.Put(ContextTag(kTag_NotAfter), validToChipEpoch));
         }
-    }
 
-    // validity
-    uint32_t validFromChipEpoch;
-    uint32_t validToChipEpoch;
+        // subject Name
+        if (certConfig.IsSubjectPresent())
+        {
+            ReturnErrorOnFailure(subjectDN->EncodeToTLV(writer, ContextTag(kTag_Subject)));
+        }
 
-    VerifyOrReturnError(true ==
-                            CalendarToChipEpochTime(
-                                static_cast<uint16_t>(validFrom.tm_year + 1900), static_cast<uint8_t>(validFrom.tm_mon + 1),
-                                static_cast<uint8_t>(validFrom.tm_mday), static_cast<uint8_t>(validFrom.tm_hour),
-                                static_cast<uint8_t>(validFrom.tm_min), static_cast<uint8_t>(validFrom.tm_sec), validFromChipEpoch),
-                        CHIP_ERROR_INVALID_ARGUMENT);
-    if (validDays == kCertValidDays_NoWellDefinedExpiration)
-    {
-        validToChipEpoch = 0;
-    }
-    else
-    {
-        VerifyOrReturnError(CanCastTo<uint32_t>(validFromChipEpoch + validDays * kSecondsPerDay - 1), CHIP_ERROR_INVALID_ARGUMENT);
-        validToChipEpoch = validFromChipEpoch + validDays * kSecondsPerDay - 1;
-    }
-    if (!certConfig.IsValidityCorrect())
-    {
-        uint32_t validTemp = validFromChipEpoch;
-        validFromChipEpoch = validToChipEpoch;
-        validToChipEpoch   = validTemp;
-    }
-    if (certConfig.IsValidityNotBeforePresent())
-    {
-        ReturnErrorOnFailure(writer.Put(ContextTag(kTag_NotBefore), validFromChipEpoch));
-    }
-    if (certConfig.IsValidityNotAfterPresent())
-    {
-        ReturnErrorOnFailure(writer.Put(ContextTag(kTag_NotAfter), validToChipEpoch));
-    }
+        // public key algorithm
+        ReturnErrorOnFailure(writer.Put(ContextTag(kTag_PublicKeyAlgorithm), GetOIDEnum(kOID_PubKeyAlgo_ECPublicKey)));
 
-    // subject Name
-    if (certConfig.IsSubjectPresent())
-    {
-        ReturnErrorOnFailure(subjectDN->EncodeToTLV(writer, ContextTag(kTag_Subject)));
+        // public key curve Id
+        uint8_t ecCurveEnum = certConfig.IsSigCurveWrong() ? 0x02 : GetOIDEnum(kOID_EllipticCurve_prime256v1);
+        ReturnErrorOnFailure(writer.Put(ContextTag(kTag_EllipticCurveIdentifier), ecCurveEnum));
     }
 
-    // public key algorithm
-    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_PublicKeyAlgorithm), GetOIDEnum(kOID_PubKeyAlgo_ECPublicKey)));
-
-    // public key curve Id
-    uint8_t ecCurveEnum = certConfig.IsSigCurveWrong() ? 0x02 : GetOIDEnum(kOID_EllipticCurve_prime256v1);
-    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_EllipticCurveIdentifier), ecCurveEnum));
-
     // public key
     if (certConfig.IsPublicKeyError())
     {
@@ -1112,121 +1144,125 @@ CHIP_ERROR MakeCertTLV(CertType certType, const ToolChipDN * subjectDN, X509 * c
         writer.PutBytes(ContextTag(kTag_EllipticCurvePublicKey), subjectPubkey, chip::Crypto::CHIP_CRYPTO_PUBLIC_KEY_SIZE_BYTES));
 
     // extensions
-    ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_Extensions), kTLVType_List, containerType2));
+    if (!useCompactIdentityFormat)
     {
-        if (isCA)
+        ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_Extensions), kTLVType_List, containerType2));
         {
-            // basic constraints
-            if (certConfig.IsExtensionBasicPresent())
+            if (isCA)
             {
-                ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_BasicConstraints), kTLVType_Structure, containerType3));
-                if (certConfig.IsExtensionBasicCAPresent())
-                {
-                    ReturnErrorOnFailure(writer.PutBoolean(ContextTag(kTag_BasicConstraints_IsCA),
-                                                           certConfig.IsExtensionBasicCACorrect() ? isCA : !isCA));
-                }
-                // TODO
-                if (pathLen != kPathLength_NotSpecified)
+                // basic constraints
+                if (certConfig.IsExtensionBasicPresent())
                 {
                     ReturnErrorOnFailure(
-                        writer.Put(ContextTag(kTag_BasicConstraints_PathLenConstraint), static_cast<uint8_t>(pathLen)));
+                        writer.StartContainer(ContextTag(kTag_BasicConstraints), kTLVType_Structure, containerType3));
+                    if (certConfig.IsExtensionBasicCAPresent())
+                    {
+                        ReturnErrorOnFailure(writer.PutBoolean(ContextTag(kTag_BasicConstraints_IsCA),
+                                                               certConfig.IsExtensionBasicCACorrect() ? isCA : !isCA));
+                    }
+                    if (pathLen != kPathLength_NotSpecified)
+                    {
+                        ReturnErrorOnFailure(
+                            writer.Put(ContextTag(kTag_BasicConstraints_PathLenConstraint), static_cast<uint8_t>(pathLen)));
+                    }
+                    ReturnErrorOnFailure(writer.EndContainer(containerType3));
                 }
-                ReturnErrorOnFailure(writer.EndContainer(containerType3));
-            }
 
-            // key usage
-            if (certConfig.IsExtensionKeyUsagePresent())
-            {
-                BitFlags<KeyUsageFlags> keyUsage;
-                if (!certConfig.IsExtensionKeyUsageDigitalSigCorrect())
+                // key usage
+                if (certConfig.IsExtensionKeyUsagePresent())
                 {
-                    keyUsage.Set(KeyUsageFlags::kDigitalSignature);
+                    BitFlags<KeyUsageFlags> keyUsage;
+                    if (!certConfig.IsExtensionKeyUsageDigitalSigCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kDigitalSignature);
+                    }
+                    if (certConfig.IsExtensionKeyUsageKeyCertSignCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kKeyCertSign);
+                    }
+                    if (certConfig.IsExtensionKeyUsageCRLSignCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kCRLSign);
+                    }
+                    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_KeyUsage), keyUsage.Raw()));
                 }
-                if (certConfig.IsExtensionKeyUsageKeyCertSignCorrect())
-                {
-                    keyUsage.Set(KeyUsageFlags::kKeyCertSign);
-                }
-                if (certConfig.IsExtensionKeyUsageCRLSignCorrect())
-                {
-                    keyUsage.Set(KeyUsageFlags::kCRLSign);
-                }
-                ReturnErrorOnFailure(writer.Put(ContextTag(kTag_KeyUsage), keyUsage.Raw()));
             }
-        }
-        else
-        {
-            // basic constraints
-            if (certConfig.IsExtensionBasicPresent())
+            else
             {
-                ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_BasicConstraints), kTLVType_Structure, containerType3));
-                if (certConfig.IsExtensionBasicCAPresent())
+                // basic constraints
+                if (certConfig.IsExtensionBasicPresent())
                 {
-                    ReturnErrorOnFailure(writer.PutBoolean(ContextTag(kTag_BasicConstraints_IsCA),
-                                                           certConfig.IsExtensionBasicCACorrect() ? isCA : !isCA));
+                    ReturnErrorOnFailure(
+                        writer.StartContainer(ContextTag(kTag_BasicConstraints), kTLVType_Structure, containerType3));
+                    if (certConfig.IsExtensionBasicCAPresent())
+                    {
+                        ReturnErrorOnFailure(writer.PutBoolean(ContextTag(kTag_BasicConstraints_IsCA),
+                                                               certConfig.IsExtensionBasicCACorrect() ? isCA : !isCA));
+                    }
+                    ReturnErrorOnFailure(writer.EndContainer(containerType3));
                 }
-                ReturnErrorOnFailure(writer.EndContainer(containerType3));
-            }
 
-            // key usage
-            if (certConfig.IsExtensionKeyUsagePresent())
-            {
-                BitFlags<KeyUsageFlags> keyUsage;
-                if (certConfig.IsExtensionKeyUsageDigitalSigCorrect())
-                {
-                    keyUsage.Set(KeyUsageFlags::kDigitalSignature);
-                }
-                if (!certConfig.IsExtensionKeyUsageKeyCertSignCorrect())
+                // key usage
+                if (certConfig.IsExtensionKeyUsagePresent())
                 {
-                    keyUsage.Set(KeyUsageFlags::kKeyCertSign);
+                    BitFlags<KeyUsageFlags> keyUsage;
+                    if (certConfig.IsExtensionKeyUsageDigitalSigCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kDigitalSignature);
+                    }
+                    if (!certConfig.IsExtensionKeyUsageKeyCertSignCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kKeyCertSign);
+                    }
+                    if (!certConfig.IsExtensionKeyUsageCRLSignCorrect())
+                    {
+                        keyUsage.Set(KeyUsageFlags::kCRLSign);
+                    }
+                    ReturnErrorOnFailure(writer.Put(ContextTag(kTag_KeyUsage), keyUsage));
                 }
-                if (!certConfig.IsExtensionKeyUsageCRLSignCorrect())
+
+                // extended key usage
+                if (!certConfig.IsExtensionExtendedKeyUsageMissing() && (certType == CertType::kNode))
                 {
-                    keyUsage.Set(KeyUsageFlags::kCRLSign);
+                    ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_ExtendedKeyUsage), kTLVType_Array, containerType3));
+                    if (certType == CertType::kNode)
+                    {
+                        ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_ClientAuth)));
+                        ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_ServerAuth)));
+                    }
+                    else if (certType == CertType::kFirmwareSigning)
+                    {
+                        ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_CodeSigning)));
+                    }
+                    ReturnErrorOnFailure(writer.EndContainer(containerType3));
                 }
-                ReturnErrorOnFailure(writer.Put(ContextTag(kTag_KeyUsage), keyUsage));
             }
 
-            // extended key usage
-            if (!certConfig.IsExtensionExtendedKeyUsageMissing() && (certType == CertType::kNode))
+            // subject key identifier
+            if (certConfig.IsExtensionSKIDPresent())
             {
-                ReturnErrorOnFailure(writer.StartContainer(ContextTag(kTag_ExtendedKeyUsage), kTLVType_Array, containerType3));
-                if (certType == CertType::kNode)
-                {
-                    ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_ClientAuth)));
-                    ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_ServerAuth)));
-                }
-                else if (certType == CertType::kFirmwareSigning)
-                {
-                    ReturnErrorOnFailure(writer.Put(AnonymousTag(), GetOIDEnum(kOID_KeyPurpose_CodeSigning)));
-                }
-                ReturnErrorOnFailure(writer.EndContainer(containerType3));
+                ReturnErrorOnFailure(Crypto::Hash_SHA1(subjectPubkey, sizeof(subjectPubkey), keyid));
+                size_t keyIdLen = certConfig.IsExtensionSKIDLengthValid() ? sizeof(keyid) : sizeof(keyid) - 1;
+                ReturnErrorOnFailure(writer.Put(ContextTag(kTag_SubjectKeyIdentifier), ByteSpan(keyid, keyIdLen)));
             }
-        }
-
-        // subject key identifier
-        if (certConfig.IsExtensionSKIDPresent())
-        {
-            ReturnErrorOnFailure(Crypto::Hash_SHA1(subjectPubkey, sizeof(subjectPubkey), keyid));
-            size_t keyIdLen = certConfig.IsExtensionSKIDLengthValid() ? sizeof(keyid) : sizeof(keyid) - 1;
-            ReturnErrorOnFailure(writer.Put(ContextTag(kTag_SubjectKeyIdentifier), ByteSpan(keyid, keyIdLen)));
-        }
 
-        // authority key identifier
-        if (certConfig.IsExtensionAKIDPresent())
-        {
-            ReturnErrorOnFailure(Crypto::Hash_SHA1(issuerPubkey, sizeof(issuerPubkey), keyid));
-            size_t keyIdLen = certConfig.IsExtensionAKIDLengthValid() ? sizeof(keyid) : sizeof(keyid) - 1;
-            ReturnErrorOnFailure(writer.Put(ContextTag(kTag_AuthorityKeyIdentifier), ByteSpan(keyid, keyIdLen)));
-        }
+            // authority key identifier
+            if (certConfig.IsExtensionAKIDPresent())
+            {
+                ReturnErrorOnFailure(Crypto::Hash_SHA1(issuerPubkey, sizeof(issuerPubkey), keyid));
+                size_t keyIdLen = certConfig.IsExtensionAKIDLengthValid() ? sizeof(keyid) : sizeof(keyid) - 1;
+                ReturnErrorOnFailure(writer.Put(ContextTag(kTag_AuthorityKeyIdentifier), ByteSpan(keyid, keyIdLen)));
+            }
 
-        for (uint8_t i = 0; i < futureExtsCount; i++)
-        {
-            ReturnErrorOnFailure(
-                writer.Put(ContextTag(kTag_FutureExtension),
-                           ByteSpan(reinterpret_cast<const uint8_t *>(futureExts[i].info), strlen(futureExts[i].info))));
+            for (uint8_t i = 0; i < futureExtsCount; i++)
+            {
+                ReturnErrorOnFailure(
+                    writer.Put(ContextTag(kTag_FutureExtension),
+                               ByteSpan(reinterpret_cast<const uint8_t *>(futureExts[i].info), strlen(futureExts[i].info))));
+            }
         }
+        ReturnErrorOnFailure(writer.EndContainer(containerType2));
     }
-    ReturnErrorOnFailure(writer.EndContainer(containerType2));
 
     // signature
     const ASN1_BIT_STRING * asn1Signature = nullptr;
diff --git a/src/tools/chip-cert/Cmd_GenCert.cpp b/src/tools/chip-cert/Cmd_GenCert.cpp
index 7d8767e8c9d7ef..9bc74c9226e6f0 100644
--- a/src/tools/chip-cert/Cmd_GenCert.cpp
+++ b/src/tools/chip-cert/Cmd_GenCert.cpp
@@ -35,6 +35,7 @@ namespace {
 using namespace chip::ArgParser;
 using namespace chip::Credentials;
 using namespace chip::ASN1;
+using namespace chip::literals;
 
 #define CMD_NAME "chip-cert gen-cert"
 
@@ -104,6 +105,7 @@ const char * const gCmdOptionHelp =
     "           c - CA certificate\n"
     "           n - node certificate\n"
     "           f - firmware signing certificate\n"
+    "           p - Wi-Fi PDC identity\n"
     "\n"
     "   -i, --subject-chip-id <hex-digits>\n"
     "\n"
@@ -341,6 +343,19 @@ bool HandleOption(const char * progName, OptionSet * optSet, int id, const char
                 gCertType = CertType::kRoot;
                 gSelfSign = true;
             }
+            else if (*arg == 'p')
+            {
+                gCertType = CertType::kNetworkIdentity;
+                gSelfSign = true;
+                gSubjectDN.AddAttribute_CommonName("*"_span, false);
+                // Not Before Jan 1 00:00:01 2000 GMT
+                gValidFrom         = { 0 };
+                gValidFrom.tm_year = (2000 - 1900);
+                gValidFrom.tm_mday = 1;
+                gValidFrom.tm_sec  = 1;
+                // Not After Dec 31 23:59:59 9999 GMT
+                gValidDays = kCertValidDays_NoWellDefinedExpiration;
+            }
         }
 
         if (gCertType == CertType::kNotSpecified)
@@ -1176,7 +1191,9 @@ bool Cmd_GenCert(int argc, char * argv[])
                    gFutureExtensionsCount, newCert.get(), newKey.get(), gCertConfig);
     VerifyTrueOrExit(res);
 
-    if (gCertConfig.IsErrorTestCaseEnabled() && IsChipCertFormat(gOutCertFormat))
+    // Always use MakeCertTLV() instead of the standard WriteCert() / ConvertX509CertToChipCert() for
+    // Network (Client) Identities in CHIP format so that we can write it in the compact-pdc-identity format.
+    if (IsChipCertFormat(gOutCertFormat) && (gCertConfig.IsErrorTestCaseEnabled() || gCertType == CertType::kNetworkIdentity))
     {
         uint32_t chipCertBufLen                = kMaxCHIPCertLength + gCertConfig.GetExtraCertLength();
         std::unique_ptr<uint8_t[]> chipCertBuf = std::unique_ptr<uint8_t[]>(new uint8_t[chipCertBufLen]);
diff --git a/src/tools/chip-cert/chip-cert.h b/src/tools/chip-cert/chip-cert.h
index 81f5ab733133bb..182dfc47f80170 100644
--- a/src/tools/chip-cert/chip-cert.h
+++ b/src/tools/chip-cert/chip-cert.h
@@ -88,6 +88,8 @@ enum
     kPathLength_NotSpecified               = -1,
 };
 
+inline constexpr uint64_t kUseRandomSerialNumber = 0;
+
 enum CertFormat
 {
     kCertFormat_Unknown = 0,
diff --git a/src/tools/interop/idt/.gitignore b/src/tools/interop/idt/.gitignore
index d2216005c33dc3..55da2a806dd412 100644
--- a/src/tools/interop/idt/.gitignore
+++ b/src/tools/interop/idt/.gitignore
@@ -7,3 +7,4 @@ __pycache__/
 pycache/
 venv/
 .zip
+BUILD
diff --git a/src/tools/interop/idt/Dockerfile b/src/tools/interop/idt/Dockerfile
index 6eeea77ac808fb..29036c36bbabcf 100644
--- a/src/tools/interop/idt/Dockerfile
+++ b/src/tools/interop/idt/Dockerfile
@@ -21,6 +21,12 @@ RUN apt-get update && \
     adb \
     aircrack-ng \
     apt-utils \
+    bison \
+    byacc \
+    dnsutils \
+    flex \
+    gcc-aarch64-linux-gnu \
+    gcc-arm-linux-gnueabi \
     git \
     glib-2.0 \
     kmod \
diff --git a/src/tools/interop/idt/README.md b/src/tools/interop/idt/README.md
index dc60067fba6fe3..acc0c252fdbe39 100644
--- a/src/tools/interop/idt/README.md
+++ b/src/tools/interop/idt/README.md
@@ -29,7 +29,32 @@ issue uncovered via the manual test. Each ecosystem may implement an analysis
 that analyzes capture data, displays info to the user, probes the local
 environment and generates additional artifacts.
 
-## Getting started
+## Single host installation (no Raspberry Pi)
+
+All features of `idt` are available on macOS and Linux (tested with Debian based
+systems).  
+If you would prefer to execute capture and discovery from a Raspberry Pi, read
+the next section instead.
+
+The machine running `idt` should be connected to the same Wi-Fi network used for
+testing.  
+Follow the steps below to execute capture and discovery without a Raspberry Pi:
+
+-   From the parent directory of `idt`, run `source idt/scripts/alias.sh`.
+-   Optionally, run `source idt/scripts/setup_shell.sh` to install aliases
+    permanently.
+-   After `idt` aliases are available in your environment, calling any `idt`
+    command will automatically create a new virtual environment and install
+    python dependencies.
+    -   If you're missing non-Python dependencies, you'll be prompted to install
+        them until they're available.
+-   Bluetooth discovery on macOS will require granting the program where `idt`
+    is run, e.g. terminal emulator or IDE permission to access bluetooth in
+    macOS settings.
+    -   Failure to do so may result in any of the following:
+        -   A single `abort` message and no further output in the terminal.
+        -   Failure with a relevant stack trace in the terminal.
+        -   A prompt to allow the application access to bluetooth.
 
 ## Raspberry Pi installation
 
@@ -137,7 +162,7 @@ idt_clean
 ```
 
 NOTE the idt artifacts directory is contained in idt, so running this will
-delete any artifacts ([TODO] change).
+delete any artifacts.
 
 Then from the admin computer:
 
@@ -145,54 +170,13 @@ Then from the admin computer:
 idt_push
 ```
 
-## Single host installation (no Raspberry Pi)
-
-Follow the steps below to execute capture and discovery without a Raspberry Pi.
-
-### Linux installation
-
-#### Requirements
-
--   This package should work on most Debian (/based) systems.
--   `idt` is currently tested on `Python 3.11`.
--   `adb` and `tcpdump` are required.
--   The machine running `idt` should be connected to the same Wi-Fi network used
-    for testing.
-
-#### Setup
-
--   From the parent directory of `idt`, run `source idt/scripts/alias.sh`.
--   Optionally, run `source idt/scripts/setup_shell.sh` to install aliases
-    permanently.
-
-> You may use `idt` in a Python virtual environment OR using a container from
-> the idt image.
-
-#### Python virtual environment
-
--   After `idt` aliases are available in your environment, calling any `idt`
-    command will automatically create a new virtual environment and install
-    dependencies.
-
-#### Docker
-
--   Run `idt_build` and `idt_activate` to enter the `idt` container.
-
-[TODO] Podman
-
-### macOS installation
-
-Most features other than BLE should work on macOS.
-
-Follow the Linux installation steps above, but do not use Docker.
-
-[TODO] macOS BLE support
-
 ## User guide
 
 > **_IMPORTANT_**  
 > `idt_` commands are shell aliases helpful for administrative commands.  
-> `idt` invokes the `idt` python package.
+> `idt` invokes the `idt` python package.  
+> Output from `idt` will generally be colorized while output from sub processes
+> is generally not.
 
 RPi users, as needed:
 
@@ -208,45 +192,38 @@ RPi users, as needed:
 
 ### Capture
 
+> **_IMPORTANT_**  
+> Ensure you've made it to the log line "Starting real time analysis, press
+> enter to stop!" before launching the app under test.
+
 ```
 idt capture -h
 
-usage: idt capture [-h] [--platform {Android}]
-                   [--ecosystem {PlayServices,PlayServicesUser,ALL}]
-                   [--pcap {t,f}]
-                   [--interface {wlp0s20f3,docker0,lo}]
-                   [--additional {t,f}]
+usage: idt capture [-h] [--platform {Android}] [--ecosystem {PlayServicesUser,PlayServices,ALL}] [--pcap {t,f}] [--interface {wlp0s20f3,lo,docker0,any}]
 
 options:
   -h, --help            show this help message and exit
   --platform {Android}, -p {Android}
-                        Run capture for a particular platform
-                        (default Android)
-  --ecosystem {PlayServices,PlayServicesUser,ALL}, -e {PlayServices,PlayServicesUser,ALL}
-                        Run capture for a particular ecosystem or ALL
-                        ecosystems (default ALL)
+                        Run capture for a particular platform (default Android)
+  --ecosystem {PlayServicesUser,PlayServices,ALL}, -e {PlayServicesUser,PlayServices,ALL}
+                        Run capture for a particular ecosystem or ALL ecosystems (default ALL)
   --pcap {t,f}, -c {t,f}
                         Run packet capture (default t)
-  --interface {wlp0s20f3,docker0,lo}, -i {wlp0s20f3,docker0,lo}
-                        Run packet capture against a specified
-                        interface (default wlp0s20f3)
-  --additional {t,f}, -a {t,f}
-                        Run ble and mdns scanners in the background
-                        while capturing (default t)
+  --interface {wlp0s20f3,lo,docker0,any}, -i {wlp0s20f3,lo,docker0,any}
+                        Specify packet capture interface (default any)
 ```
 
+For packet capture interface (`-i`/`--interface`:
+
+-   On macOS, the only available interface is `any`.
+-   On Linux, `idt` checks available interfaces from `/sys/class/net/` as well
+    as allowing `any`.
+
 #### Artifacts
 
 Each ecosystem and platform involved in the capture will have their own
 subdirectory in the root artifact dir.
 
-To download your artifacts, run these commands from your admin computer:
-
-`idt_fetch_artifacts`
-
-On windows admin computers, you may use `FileZilla` to pull the archive listed
-at the end of output.
-
 ### Discovery
 
 ```
@@ -260,7 +237,7 @@ options:
                         Specify the type of discovery to execute
 ```
 
-#### ble
+#### BLE
 
 ```
 idt discover -t b
@@ -274,13 +251,90 @@ idt discover -t d
 
 #### Artifacts
 
-There is a per device log for ble scanning in `ble` subdirectory of the root
-artifact dir.
+There is a per device log in `ble` and `dnssd` subdirectory of the root artifact
+dir.
+
+### Probe
+
+```
+usage: idt probe [-h]
+
+options:
+  -h, --help  show this help message and exit
+```
 
-[TODO] dnssd per device log
+Collect contextually relevant networking info from the local environment and
+provide artifacts.
+
+## Troubleshooting
+
+-   Wireless `adb` may fail to connect indefinitely depending on network
+    configuration. Use a wired connection if wireless fails repeatedly.
+-   Change log level from `INFO` to `DEBUG` in root `config.py` for additional
+    logging.
+-   Compiling `tcpdump` for android may require additional dependencies.
+    -   If the build script fails for you, try
+        `idt_go && source idt/scripts/compilers.sh`.
+-   You may disable colors and splash by setting `enable_color` in `config.py`
+    to `False`.
+-   `idt_clean_child` will kill any stray `tcpdump` and `adb` commands.
+    -   `idt_check_child` will look for leftover processes.
+    -   Not expected to be needed outside of development scenarios.
+
+## Project overview
+
+-   The entry point is in `idt.py` which contains simple CLI parsing with
+    `argparse`.
+
+### `capture`
+
+-   `base` contains the base classes for ecosystems and platforms.
+-   `controller` contains the ecosystem and platform producer and controller
+-   `loader` is a generic class loader that dynamically imports classes matching
+    a given super class from a given directory.
+-   `/platform` and `/ecosystem` contain one package for each platform and
+    ecosystem, which should each contain one implementation of the respective
+    base class.
+
+### `discovery`
+
+-   `matter_ble` provides a simple ble scanner that shows matter devices being
+    discovered and lost, as well as their VID/PID, RSSI, etc.
+-   `matter_dnssd` provides a simple DNS-SD browser that searches for matter
+    devices and thread border routers.
+
+### `probe`
+
+-   `probe` contains the base class for (`idt`'s) host platform specific
+    implementation.
+    -   Reuses the dnssd discovery implementation to build probe targets.
+    -   Calls platform + addr type specific probe methods for each target.
+-   `linux` and `mac` contain `probe` implementations for each host platform.
+
+### `utils`
+
+-   `log` contains logging utilities used by everything in the project.
+-   `artifact` contains helper functions for managing artifacts.
+-   `shell` contains a simple helper class for background and foreground Bash
+    commands.
+-   `host_platform` contains helper functions for the interacting with the host
+    running `idt`.
+
+### Conventions
+
+-   `config.py` should be used to hold development configs within the directory
+    where they are needed.
+    -   It may also hold configs for flaky/cumbersome features that might need
+        to be disabled in an emergency.
+    -   `config.py` **should not** be used for everyday operation.
+-   When needed, execute builds in a folder called `BUILD` within the source
+    tree.
+    -   `idt_clean_all` deletes all `BUILD` dirs and `BUILD` is in `.gitignore`.
 
 ## Extending functionality
 
+### Capture
+
 Ecosystem and Platform implementations are dynamically loaded.
 
 For each package in `capture/ecosystem`, the ecosystem loader expects a module
@@ -299,14 +353,13 @@ $ idt capture -h
 usage: idt capture [-h] [--platform {Android}] [--ecosystem {DemoExtEcosystem...
 ```
 
+> **IMPORTANT:** Note the following runtime expectations of ecosystems:  
+> `analyze_capture()` must not block the async event loop excessively and must
+> not interact with standard in
+
 The platform loader functions the same as `capture/ecosystem`.
 
 For each package in `capture/platform`, the platform loader expects a module
 name matching the package name.  
 This module must contain a single class which is a subclass of
 `capture.base.PlatformLogStreamer`.
-
-Note the following runtime expectations of platforms:
-
--   Start should be able to be called repeatedly without restarting streaming.
--   Stop should not cause an error even if the stream is not running.
diff --git a/src/tools/interop/idt/__main__.py b/src/tools/interop/idt/__main__.py
index c354801687c553..b927d050b9a0a2 100644
--- a/src/tools/interop/idt/__main__.py
+++ b/src/tools/interop/idt/__main__.py
@@ -16,6 +16,8 @@
 #
 
 from idt import InteropDebuggingTool
+from utils.host_platform import verify_py_version
 
 if __name__ == "__main__":
+    verify_py_version()
     InteropDebuggingTool()
diff --git a/src/tools/interop/idt/capture/__init__.py b/src/tools/interop/idt/capture/__init__.py
index d4e9baedc1119d..18069e71ad7838 100644
--- a/src/tools/interop/idt/capture/__init__.py
+++ b/src/tools/interop/idt/capture/__init__.py
@@ -17,16 +17,14 @@
 
 from capture import ecosystem, platform
 
-from .factory import EcosystemCapture, EcosystemController, EcosystemFactory, PlatformFactory, PlatformLogStreamer
+from .controller import EcosystemCapture, PlatformLogStreamer
 from .pcap import PacketCaptureRunner
 
 __all__ = [
     'ecosystem',
     'platform',
+    'controller',
     'EcosystemCapture',
-    'EcosystemController',
-    'EcosystemFactory',
     'PacketCaptureRunner',
-    'PlatformFactory',
     'PlatformLogStreamer',
 ]
diff --git a/src/tools/interop/idt/capture/base.py b/src/tools/interop/idt/capture/base.py
index 6c1ab6fc8be8be..b90571020a071f 100644
--- a/src/tools/interop/idt/capture/base.py
+++ b/src/tools/interop/idt/capture/base.py
@@ -30,19 +30,33 @@ def __init__(self, artifact_dir: str) -> None:
         """
         raise NotImplementedError
 
+    @abstractmethod
+    async def connect(self) -> None:
+        """
+        Establish connections to log targets for this platform
+        """
+        raise NotImplementedError
+
     @abstractmethod
     async def start_streaming(self) -> None:
         """
         Begin streaming logs
-        Start should be able to be called repeatedly without restarting streaming
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def run_observers(self) -> None:
+        """
+        Observe log procs and restart as needed
+        Must be async aware and not interact with stdin
         """
         raise NotImplementedError
 
     @abstractmethod
     async def stop_streaming(self) -> None:
         """
-        Stop streaming logs
-        Stop should not cause an error even if the stream is not running
+        Stop the capture and pull any artifacts from remote devices
+        Write artifacts to artifact_dir passed on instantiation
         """
         raise NotImplementedError
 
@@ -71,13 +85,16 @@ def __init__(
     async def start_capture(self) -> None:
         """
         Start the capture
+        Platform is already started
         """
         raise NotImplementedError
 
     @abstractmethod
     async def stop_capture(self) -> None:
         """
-        Stop the capture
+        Stop the capture and pull any artifacts from remote devices
+        Write artifacts to artifact_dir passed on instantiation
+        Platform is already stopped
         """
         raise NotImplementedError
 
@@ -85,6 +102,13 @@ async def stop_capture(self) -> None:
     async def analyze_capture(self) -> None:
         """
         Parse the capture and create + display helpful analysis artifacts that are unique to the ecosystem
-        Write analysis artifacts to artifact_dir
+        Must be async aware and not interact with stdin
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def probe_capture(self) -> None:
+        """
+        Probe the local environment, e.g. ping relevant remote services and write respective artifacts
         """
         raise NotImplementedError
diff --git a/src/tools/interop/idt/capture/config.py b/src/tools/interop/idt/capture/config.py
new file mode 100644
index 00000000000000..12ce985eb4b3e4
--- /dev/null
+++ b/src/tools/interop/idt/capture/config.py
@@ -0,0 +1,50 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+"""
+The timeout time used by Orchestrator in capture/controller
+
+Used when calling:
+- Platform.connect() - if timeout, then halt
+- Ecosystem.start(), .stop(), .probe() - if timeout, then continue execution and log error
+
+This is an async timeout, so dependent on event loop being released to work.
+To illustrate, consider this example where no timeout is thrown despite the awaited task running for twice the timeout:
+----
+sleep_time = 2
+
+async def not_actually_async():
+    time.sleep(sleep_time * 2)  # Blocking the EL!
+
+async def try_timeout():
+    async with asyncio.timeout(sleep_time):
+        await not_actually_async()
+    print("Timeout was NOT thrown!")
+
+asyncio.run(try_timeout())
+----
+Result: Timeout was NOT thrown!
+
+Update the example
+----
+async def not_actually_async():  # Now it is_actually_async because we
+    await asyncio.sleep(sleep_time * 2)  # change to something that isn't blocking the EL
+----
+Result: The timeout error will be raised.
+
+"""
+orchestrator_async_step_timeout_seconds = 240
diff --git a/src/tools/interop/idt/capture/controller.py b/src/tools/interop/idt/capture/controller.py
new file mode 100644
index 00000000000000..624a6f292451d3
--- /dev/null
+++ b/src/tools/interop/idt/capture/controller.py
@@ -0,0 +1,183 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import copy
+import os
+import sys
+import traceback
+import typing
+from dataclasses import dataclass
+
+import capture
+from capture.base import EcosystemCapture, PlatformLogStreamer, UnsupportedCapturePlatformException
+from utils.artifact import create_standard_log_name, log, safe_mkdir
+from utils.log import add_border, border_print
+
+from . import config
+
+
+@dataclass(repr=True)
+class ErrorRecord:
+    ecosystem: str
+    help_message: str
+    stack_trace: str
+
+
+_PLATFORM_MAP: typing.Dict[str, PlatformLogStreamer] = {}
+_ECOSYSTEM_MAP: typing.Dict[str, PlatformLogStreamer] = {}
+_ERROR_REPORT: typing.Dict[str, ErrorRecord] = {}
+
+logger = log.get_logger(__file__)
+
+
+def track_error(ecosystem: str, help_message: str) -> None:
+    if ecosystem not in _ERROR_REPORT:
+        _ERROR_REPORT[ecosystem] = []
+    record = ErrorRecord(ecosystem, help_message, traceback.format_exc())
+    logger.error(record)
+    _ERROR_REPORT[ecosystem].append(record)
+
+
+def list_available_platforms() -> typing.List[str]:
+    return copy.deepcopy(capture.platform.__all__)
+
+
+async def get_platform_impl(
+        platform: str,
+        artifact_dir: str) -> PlatformLogStreamer:
+    if platform in _PLATFORM_MAP:
+        return _PLATFORM_MAP[platform]
+    border_print(f"Initializing platform {platform}")
+    platform_class = getattr(capture.platform, platform)
+    platform_artifact_dir = os.path.join(artifact_dir, platform)
+    safe_mkdir(platform_artifact_dir)
+    platform_inst = platform_class(platform_artifact_dir)
+    _PLATFORM_MAP[platform] = platform_inst
+    async with asyncio.timeout(config.orchestrator_async_step_timeout_seconds):
+        await platform_inst.connect()
+    return platform_inst
+
+
+def list_available_ecosystems() -> typing.List[str]:
+    return copy.deepcopy(capture.ecosystem.__all__)
+
+
+async def get_ecosystem_impl(
+        ecosystem: str,
+        platform: PlatformLogStreamer,
+        artifact_dir: str) -> EcosystemCapture:
+    if ecosystem in _ECOSYSTEM_MAP:
+        return _ECOSYSTEM_MAP[ecosystem]
+    ecosystem_class = getattr(capture.ecosystem, ecosystem)
+    ecosystem_artifact_dir = os.path.join(artifact_dir, ecosystem)
+    safe_mkdir(ecosystem_artifact_dir)
+    ecosystem_instance = ecosystem_class(platform, ecosystem_artifact_dir)
+    _ECOSYSTEM_MAP[ecosystem] = ecosystem_instance
+    return ecosystem_instance
+
+
+async def init_ecosystems(platform, ecosystem, artifact_dir):
+    platform = await get_platform_impl(platform, artifact_dir)
+    ecosystems_to_load = list_available_ecosystems() \
+        if ecosystem == 'ALL' \
+        else [ecosystem]
+    for ecosystem in ecosystems_to_load:
+        try:
+            await get_ecosystem_impl(
+                ecosystem, platform, artifact_dir)
+        except UnsupportedCapturePlatformException:
+            help_message = f"Unsupported platform {ecosystem} {platform}"
+            logger.error(help_message)
+            track_error(ecosystem, help_message)
+        except Exception:
+            help_message = f"Unknown error instantiating ecosystem {ecosystem} {platform}"
+            logger.error(help_message)
+            track_error(ecosystem, help_message)
+
+
+async def handle_capture(attr):
+    attr = f"{attr}_capture"
+    for ecosystem in _ECOSYSTEM_MAP:
+        try:
+            border_print(f"{attr} for {ecosystem}")
+            async with asyncio.timeout(config.orchestrator_async_step_timeout_seconds):
+                await getattr(_ECOSYSTEM_MAP[ecosystem], attr)()
+        except TimeoutError:
+            help_message = f"Timeout after {config.orchestrator_async_step_timeout_seconds} seconds {attr} {ecosystem}"
+            logger.error(help_message)
+            track_error(ecosystem, help_message)
+        except Exception:
+            help_message = f"Unexpected error {attr} {ecosystem}"
+            logger.error(help_message)
+            track_error(ecosystem, help_message)
+
+
+async def start():
+    for platform_name, platform, in _PLATFORM_MAP.items():
+        # TODO: Write error log if halt here
+        border_print(f"Starting streaming for platform {platform_name}")
+        await platform.start_streaming()
+    await handle_capture("start")
+
+
+async def stop():
+    for platform_name, platform, in _PLATFORM_MAP.items():
+        # TODO: Write error log if halt here
+        border_print(f"Stopping streaming for platform {platform_name}")
+        await platform.stop_streaming()
+    await handle_capture("stop")
+
+
+async def run_analyzers():
+    border_print("Starting real time analysis, press enter to stop!", important=True)
+    analysis_tasks = []
+    monitor_tasks = []
+    for platform_name, platform in _PLATFORM_MAP.items():
+        logger.info(f"Creating monitor task for {platform_name}")
+        monitor_tasks.append(asyncio.create_task(platform.run_observers()))
+    for ecosystem_name, ecosystem in _ECOSYSTEM_MAP.items():
+        logger.info(f"Creating analysis task for {ecosystem_name}")
+        analysis_tasks.append(asyncio.create_task(ecosystem.analyze_capture()))
+    logger.info("Done creating analysis tasks")
+    await asyncio.get_event_loop().run_in_executor(
+        None, sys.stdin.readline)
+    border_print("Cancelling monitor tasks")
+    for task in monitor_tasks:
+        task.cancel()
+    logger.info("Done cancelling monitor tasks")
+    border_print("Cancelling analysis tasks")
+    for task in analysis_tasks:
+        task.cancel()
+    logger.info("Done cancelling analysis tasks")
+
+
+async def probe():
+    await handle_capture("probe")
+
+
+def write_error_report(artifact_dir: str):
+    if _ERROR_REPORT:
+        logger.critical("DETECTED ERRORS THIS RUN!")
+        error_report_file_name = create_standard_log_name("error_report", "txt", parent=artifact_dir)
+        with open(error_report_file_name, "a+") as error_report_file:
+            for ecosystem in _ERROR_REPORT:
+                log.print_and_write(add_border(f"Errors for {ecosystem}"), error_report_file)
+                for record in _ERROR_REPORT[ecosystem]:
+                    log.print_and_write(str(record), error_report_file)
+    else:
+        logger.info("No errors seen this run!")
diff --git a/src/tools/interop/idt/capture/ecosystem/play_services/config.py b/src/tools/interop/idt/capture/ecosystem/play_services/config.py
new file mode 100644
index 00000000000000..2daacb38dcf909
--- /dev/null
+++ b/src/tools/interop/idt/capture/ecosystem/play_services/config.py
@@ -0,0 +1,19 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+enable_foyer_probers = True
+foyer_prober_traceroute_limit = 32
diff --git a/src/tools/interop/idt/capture/ecosystem/play_services/play_services.py b/src/tools/interop/idt/capture/ecosystem/play_services/play_services.py
index aa9276844471ea..e94a10f9260b94 100644
--- a/src/tools/interop/idt/capture/ecosystem/play_services/play_services.py
+++ b/src/tools/interop/idt/capture/ecosystem/play_services/play_services.py
@@ -15,16 +15,22 @@
 #    limitations under the License.
 #
 
+import asyncio
 import json
 import os
-from typing import Dict
+from typing import IO, Dict
 
 from capture.base import EcosystemCapture, UnsupportedCapturePlatformException
-from capture.file_utils import create_standard_log_name
 from capture.platform.android import Android
+from capture.platform.android.streams.logcat import LogcatStreamer
+from utils.artifact import create_standard_log_name, log
 
-from .analysis import PlayServicesAnalysis
+from . import config
 from .command_map import dumpsys, getprop
+from .play_services_analysis import PlayServicesAnalysis
+from .prober import PlayServicesProber
+
+logger = log.get_logger(__file__)
 
 
 class PlayServices(EcosystemCapture):
@@ -33,7 +39,6 @@ class PlayServices(EcosystemCapture):
     """
 
     def __init__(self, platform: Android, artifact_dir: str) -> None:
-
         self.artifact_dir = artifact_dir
 
         if not isinstance(platform, Android):
@@ -52,10 +57,12 @@ def __init__(self, platform: Android, artifact_dir: str) -> None:
                             '305',  # Thread
                             '168',  # mDNS
                             ]
+        self.logcat_stream: LogcatStreamer = self.platform.streams["LogcatStreamer"]
+        self.logcat_file: IO = None
 
     def _write_standard_info_file(self) -> None:
         for k, v in self.standard_info_data.items():
-            print(f"{k}: {v}")
+            logger.info(f"{k}: {v}")
         standard_info_data_json = json.dumps(self.standard_info_data, indent=2)
         with open(self.standard_info_file_path, mode='w+') as standard_info_file:
             standard_info_file.write(standard_info_data_json)
@@ -87,10 +94,24 @@ async def start_capture(self) -> None:
             verbose_command = f"shell setprop log.tag.gms_svc_id:{service_id} VERBOSE"
             self.platform.run_adb_command(verbose_command)
         self._get_standard_info()
-        await self.platform.start_streaming()
+
+    async def analyze_capture(self):
+        try:
+            self.logcat_file = open(self.logcat_stream.logcat_artifact, "r")
+            while True:
+                self.analysis.do_analysis(self.logcat_file.readlines())
+                # Releasing async event loop for other analysis / monitor topics
+                await asyncio.sleep(0.5)
+        except asyncio.CancelledError:
+            logger.info("Closing logcat stream")
+            if self.logcat_file:
+                self.logcat_file.close()
 
     async def stop_capture(self) -> None:
-        await self.platform.stop_streaming()
+        self.analysis.show_analysis()
 
-    async def analyze_capture(self) -> None:
-        self.analysis.do_analysis()
+    async def probe_capture(self) -> None:
+        if config.enable_foyer_probers:
+            await PlayServicesProber(self.platform, self.artifact_dir).probe_services()
+        else:
+            logger.critical("Foyer probers disabled in config!")
diff --git a/src/tools/interop/idt/capture/ecosystem/play_services/analysis.py b/src/tools/interop/idt/capture/ecosystem/play_services/play_services_analysis.py
similarity index 85%
rename from src/tools/interop/idt/capture/ecosystem/play_services/analysis.py
rename to src/tools/interop/idt/capture/ecosystem/play_services/play_services_analysis.py
index 46fcfc1c4d6734..e6ebb8f13075d8 100644
--- a/src/tools/interop/idt/capture/ecosystem/play_services/analysis.py
+++ b/src/tools/interop/idt/capture/ecosystem/play_services/play_services_analysis.py
@@ -17,13 +17,17 @@
 
 import os
 
-from capture.file_utils import add_border, create_standard_log_name, print_and_write
 from capture.platform.android import Android
+from utils.artifact import create_standard_log_name, log
+from utils.log import add_border, print_and_write
+
+logger = log.get_logger(__file__)
 
 
 class PlayServicesAnalysis:
 
     def __init__(self, platform: Android, artifact_dir: str) -> None:
+        self.logger = logger
         self.artifact_dir = artifact_dir
         self.analysis_file_name = os.path.join(
             self.artifact_dir, create_standard_log_name(
@@ -41,6 +45,7 @@ def __init__(self, platform: Android, artifact_dir: str) -> None:
     def _log_proc_matter_commissioner(self, line: str) -> None:
         """Core commissioning flow"""
         if 'MatterCommissioner' in line:
+            self.logger.info(line)
             self.matter_commissioner_logs += line
 
     def _log_proc_commissioning_failed(self, line: str) -> None:
@@ -51,24 +56,28 @@ def _log_proc_commissioning_failed(self, line: str) -> None:
             self.failure_stack_trace += line
             self.fail_trace_line_counter += 1
         if 'SetupDeviceView' and 'Commissioning failed' in line:
+            self.logger.info(line)
             self.fail_trace_line_counter = 0
             self.failure_stack_trace += line
 
     def _log_proc_pake(self, line: str) -> None:
         """Three logs for pake 1-3 expected"""
         if "Pake" in line and "chip_logging" in line:
+            self.logger.info(line)
             self.pake_logs += line
 
     def _log_proc_mdns(self, line: str) -> None:
         if "_matter" in line and "ServiceResolverAdapter" in line:
+            self.logger.info(line)
             self.resolver_logs += line
 
     def _log_proc_sigma(self, line: str) -> None:
         """Three logs expected for sigma 1-3"""
         if "Sigma" in line and "chip_logging" in line:
+            self.logger.info(line)
             self.sigma_logs += line
 
-    def _show_analysis(self) -> None:
+    def show_analysis(self) -> None:
         analysis_file = open(self.analysis_file_name, mode="w+")
         print_and_write(add_border('Matter commissioner logs'), analysis_file)
         print_and_write(self.matter_commissioner_logs, analysis_file)
@@ -85,11 +94,9 @@ def _show_analysis(self) -> None:
         analysis_file.close()
 
     def process_line(self, line: str) -> None:
-        for line_func in filter(lambda s: s.startswith('_log'), dir(self)):
+        for line_func in [s for s in dir(self) if s.startswith('_log')]:
             getattr(self, line_func)(line)
 
-    def do_analysis(self) -> None:
-        with open(self.platform.logcat_output_path, mode='r') as logcat_file:
-            for line in logcat_file:
-                self.process_line(line)
-        self._show_analysis()
+    def do_analysis(self, batch: [str]) -> None:
+        for line in batch:
+            self.process_line(line)
diff --git a/src/tools/interop/idt/capture/ecosystem/play_services/prober.py b/src/tools/interop/idt/capture/ecosystem/play_services/prober.py
new file mode 100644
index 00000000000000..8dcda80ddf3133
--- /dev/null
+++ b/src/tools/interop/idt/capture/ecosystem/play_services/prober.py
@@ -0,0 +1,71 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import os
+
+from utils.shell import Bash, log
+
+from . import config
+
+logger = log.get_logger(__file__)
+
+
+class PlayServicesProber:
+
+    def __init__(self, platform, artifact_dir):
+        # TODO: Handle all resolved addresses
+        self.platform = platform
+        self.artifact_dir = artifact_dir
+        self.logger = logger
+        self.probe_artifact = os.path.join(self.artifact_dir, "net_probes.txt")
+        self.command_suffix = f" 2>&1  | tee -a {self.probe_artifact}"
+        self.target = "googlehomefoyer-pa.googleapis.com"
+        self.tracert_limit = config.foyer_prober_traceroute_limit
+
+    def run_command(self, command):
+        Bash(f"{command} {self.command_suffix}", sync=True).start_command()
+
+    async def _probe_tracert_icmp_foyer(self) -> None:
+        self.logger.info(f"icmp traceroute to {self.target}")
+        self.run_command(f"traceroute -m {self.tracert_limit} {self.target}")
+
+    async def _probe_tracert_udp_foyer(self) -> None:
+        # TODO: Per-host-platform impl
+        self.logger.info(f"udp traceroute to {self.target}")
+        self.run_command(f"traceroute -m {self.tracert_limit} -U -p 443 {self.target}")
+
+    async def _probe_tracert_tcp_foyer(self) -> None:
+        # TODO: Per-host-platform impl
+        self.logger.info(f"tcp traceroute to {self.target}")
+        self.run_command(f"traceroute -m {self.tracert_limit} -T -p 443 {self.target}")
+
+    async def _probe_ping_foyer(self) -> None:
+        self.logger.info(f"ping {self.target}")
+        self.run_command(f"ping -c 4 {self.target}")
+
+    async def _probe_dns_foyer(self) -> None:
+        self.logger.info(f"dig {self.target}")
+        self.run_command(f"dig {self.target}")
+
+    async def _probe_from_phone_ping_foyer(self) -> None:
+        self.logger.info(f"ping {self.target} from phone")
+        self.platform.run_adb_command(f"shell ping -c 4 {self.target} {self.command_suffix}")
+
+    async def probe_services(self) -> None:
+        self.logger.info(f"Probing {self.target}")
+        for probe_func in [s for s in dir(self) if s.startswith('_probe')]:
+            await getattr(self, probe_func)()
diff --git a/src/tools/interop/idt/capture/ecosystem/play_services_user/play_services_user.py b/src/tools/interop/idt/capture/ecosystem/play_services_user/play_services_user.py
index 5044842e80eb28..2fdac62b8bbdb7 100644
--- a/src/tools/interop/idt/capture/ecosystem/play_services_user/play_services_user.py
+++ b/src/tools/interop/idt/capture/ecosystem/play_services_user/play_services_user.py
@@ -15,11 +15,16 @@
 #    limitations under the License.
 #
 
+import asyncio
 import os
 
 from capture.base import EcosystemCapture, UnsupportedCapturePlatformException
-from capture.file_utils import create_standard_log_name, print_and_write
 from capture.platform.android.android import Android
+from capture.platform.android.streams.logcat import LogcatStreamer
+from utils.artifact import create_standard_log_name
+from utils.log import get_logger, print_and_write
+
+logger = get_logger(__file__)
 
 
 class PlayServicesUser(EcosystemCapture):
@@ -28,7 +33,7 @@ class PlayServicesUser(EcosystemCapture):
     """
 
     def __init__(self, platform: Android, artifact_dir: str) -> None:
-
+        self.logger = logger
         self.artifact_dir = artifact_dir
         self.analysis_file = os.path.join(
             self.artifact_dir, create_standard_log_name(
@@ -39,28 +44,47 @@ def __init__(self, platform: Android, artifact_dir: str) -> None:
                 'only platform=android is supported for '
                 'ecosystem=PlayServicesUser')
         self.platform = platform
+        self.logcat_fd = None
+        self.output = ""
+        self.logcat_stream: LogcatStreamer = self.platform.streams["LogcatStreamer"]
 
     async def start_capture(self) -> None:
-        await self.platform.start_streaming()
+        pass
 
     async def stop_capture(self) -> None:
-        await self.platform.stop_streaming()
+        self.show_analysis()
+
+    def proc_line(self, line) -> None:
+        if "CommissioningServiceBin: Binding to service" in line:
+            s = f"3P commissioner initiated Play Services commissioning\n{line}"
+            logger.info(s)
+            self.output += f"{s}\n"
+        elif "CommissioningServiceBin: Sending commissioning request to bound service" in line:
+            s = f"Play Services commissioning complete; passing back to 3P\n{line}"
+            logger.info(s)
+            self.output += f"{s}\n"
+        elif "CommissioningServiceBin: Received commissioning complete from bound service" in line:
+            s = f"3P commissioning complete!\n{line}"
+            logger.info(s)
+            self.output += f"{s}\n"
 
     async def analyze_capture(self) -> None:
         """"Show the start and end times of commissioning boundaries"""
-        analysis_file = open(self.analysis_file, mode='w+')
-        with open(self.platform.logcat_output_path, mode='r') as logcat_file:
-            for line in logcat_file:
-                if "CommissioningServiceBin: Binding to service" in line:
-                    print_and_write(
-                        f"3P commissioner initiated Play Services commissioning\n{line}",
-                        analysis_file)
-                elif "CommissioningServiceBin: Sending commissioning request to bound service" in line:
-                    print_and_write(
-                        f"Play Services commissioning complete; passing back to 3P\n{line}",
-                        analysis_file)
-                elif "CommissioningServiceBin: Received commissioning complete from bound service" in line:
-                    print_and_write(
-                        f"3P commissioning complete!\n{line}",
-                        analysis_file)
-        analysis_file.close()
+        try:
+            self.logcat_fd = open(self.logcat_stream.logcat_artifact, "r")
+            while True:
+                for line in self.logcat_fd.readlines():
+                    self.proc_line(line)
+                # Releasing async event loop for other analysis / monitor tasks
+                await asyncio.sleep(0.5)
+        except asyncio.CancelledError:
+            self.logger.info("Closing logcat stream")
+            if self.logcat_fd is not None:
+                self.logcat_fd.close()
+
+    def show_analysis(self) -> None:
+        with open(self.analysis_file, "w") as analysis_file:
+            print_and_write(self.output, analysis_file)
+
+    async def probe_capture(self) -> None:
+        pass
diff --git a/src/tools/interop/idt/capture/factory.py b/src/tools/interop/idt/capture/factory.py
deleted file mode 100644
index 3c86045f146a0e..00000000000000
--- a/src/tools/interop/idt/capture/factory.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-#    Copyright (c) 2023 Project CHIP Authors
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-import asyncio
-import copy
-import os
-import traceback
-import typing
-
-import capture
-from capture.base import EcosystemCapture, PlatformLogStreamer, UnsupportedCapturePlatformException
-from capture.file_utils import border_print, safe_mkdir
-
-_CONFIG_TIMEOUT = 45.0
-_PLATFORM_MAP: typing.Dict[str, PlatformLogStreamer] = {}
-_ECOSYSTEM_MAP: typing.Dict[str, PlatformLogStreamer] = {}
-
-
-def _get_timeout():
-    return asyncio.get_running_loop().time() + _CONFIG_TIMEOUT
-
-
-class PlatformFactory:
-
-    @staticmethod
-    def list_available_platforms() -> typing.List[str]:
-        return copy.deepcopy(capture.platform.__all__)
-
-    @staticmethod
-    def get_platform_impl(
-            platform: str,
-            artifact_dir: str) -> PlatformLogStreamer:
-        if platform in _PLATFORM_MAP:
-            return _PLATFORM_MAP[platform]
-        platform_class = getattr(capture.platform, platform)
-        platform_artifact_dir = os.path.join(artifact_dir, platform)
-        safe_mkdir(platform_artifact_dir)
-        platform_inst = platform_class(platform_artifact_dir)
-        _PLATFORM_MAP[platform] = platform_inst
-        return platform_inst
-
-
-class EcosystemFactory:
-
-    @staticmethod
-    def list_available_ecosystems() -> typing.List[str]:
-        return copy.deepcopy(capture.ecosystem.__all__)
-
-    @staticmethod
-    async def get_ecosystem_impl(
-            ecosystem: str,
-            platform: str,
-            artifact_dir: str) -> EcosystemCapture:
-        if ecosystem in _ECOSYSTEM_MAP:
-            return _ECOSYSTEM_MAP[ecosystem]
-        ecosystem_class = getattr(capture.ecosystem, ecosystem)
-        ecosystem_artifact_dir = os.path.join(artifact_dir, ecosystem)
-        safe_mkdir(ecosystem_artifact_dir)
-        platform_instance = PlatformFactory.get_platform_impl(
-            platform, artifact_dir)
-        ecosystem_instance = ecosystem_class(platform_instance, ecosystem_artifact_dir)
-        _ECOSYSTEM_MAP[ecosystem] = ecosystem_instance
-        return ecosystem_instance
-
-    @staticmethod
-    async def init_ecosystems(platform, ecosystem, artifact_dir):
-        ecosystems_to_load = EcosystemFactory.list_available_ecosystems() \
-            if ecosystem == 'ALL' \
-            else [ecosystem]
-        for ecosystem in ecosystems_to_load:
-            try:
-                async with asyncio.timeout_at(_get_timeout()):
-                    await EcosystemFactory.get_ecosystem_impl(
-                        ecosystem, platform, artifact_dir)
-            except UnsupportedCapturePlatformException:
-                print(f"ERROR unsupported platform {ecosystem} {platform}")
-            except TimeoutError:
-                print(f"ERROR timeout starting ecosystem {ecosystem} {platform}")
-            except Exception:
-                print("ERROR unknown error instantiating ecosystem")
-                print(traceback.format_exc())
-
-
-class EcosystemController:
-
-    @staticmethod
-    async def handle_capture(attr):
-        attr = f"{attr}_capture"
-        for ecosystem in _ECOSYSTEM_MAP:
-            try:
-                border_print(f"{attr} capture for {ecosystem}")
-                async with asyncio.timeout_at(_get_timeout()):
-                    await getattr(_ECOSYSTEM_MAP[ecosystem], attr)()
-            except TimeoutError:
-                print(f"ERROR timeout {attr} {ecosystem}")
-            except Exception:
-                print(f"ERROR unexpected error {attr} {ecosystem}")
-                print(traceback.format_exc())
-
-    @staticmethod
-    async def start():
-        await EcosystemController.handle_capture("start")
-
-    @staticmethod
-    async def stop():
-        await EcosystemController.handle_capture("stop")
-
-    @staticmethod
-    async def analyze():
-        await EcosystemController.handle_capture("analyze")
diff --git a/src/tools/interop/idt/capture/loader.py b/src/tools/interop/idt/capture/loader.py
index 27fd7c19dd6560..8e02e9d492c2b5 100644
--- a/src/tools/interop/idt/capture/loader.py
+++ b/src/tools/interop/idt/capture/loader.py
@@ -18,12 +18,18 @@
 import importlib
 import inspect
 import os
+import traceback
 from typing import Any
 
+from utils import log
+
+logger = log.get_logger(__file__)
+
 
 class CaptureImplsLoader:
 
     def __init__(self, root_dir: str, root_package: str, search_type: type):
+        self.logger = logger
         self.root_dir = root_dir
         self.root_package = root_package
         self.search_type = search_type
@@ -38,25 +44,35 @@ def is_package(potential_package: str) -> bool:
         return os.path.exists(init_path)
 
     def verify_coroutines(self, subclass) -> bool:
+        # ABC does not verify coroutines on subclass instantiation, it merely checks the presence of methods
         for item in dir(self.search_type):
             item_attr = getattr(self.search_type, item)
             if inspect.iscoroutinefunction(item_attr):
                 if not hasattr(subclass, item):
+                    self.logger.warning(f"Missing coroutine in {subclass}")
                     return False
                 if not inspect.iscoroutinefunction(getattr(subclass, item)):
+                    self.logger.warning(f"Missing coroutine in {subclass}")
+                    return False
+        for item in dir(subclass):
+            item_attr = getattr(subclass, item)
+            if inspect.iscoroutinefunction(item_attr) and hasattr(self.search_type, item):
+                if not inspect.iscoroutinefunction(getattr(self.search_type, item)):
+                    self.logger.warning(f"Unexpected coroutine in {subclass}")
                     return False
         return True
 
     def is_type_match(self, potential_class_match: Any) -> bool:
         if inspect.isclass(potential_class_match):
+            self.logger.debug(f"Checking {self.search_type} match against {potential_class_match}")
             if issubclass(potential_class_match, self.search_type):
+                self.logger.debug(f"Found type match search: {self.search_type} match: {potential_class_match}")
                 if self.verify_coroutines(potential_class_match):
                     return True
-                else:
-                    print(f"WARNING missing coroutine {potential_class_match}")
         return False
 
     def load_module(self, to_load):
+        self.logger.debug(f"Loading module {to_load}")
         saw_more_than_one_impl = False
         saw_one_impl = False
         found_class = None
@@ -73,14 +89,16 @@ def load_module(self, to_load):
             self.impl_names.append(found_class)
             self.impls[found_class] = found_impl
         elif saw_more_than_one_impl:
-            print(f"WARNING more than one impl in {module_item}")
+            self.logger.warning(f"more than one impl in {module_item}")
 
     def fetch_impls(self):
+        self.logger.debug(f"Searching for implementations in {self.root_dir}")
         for item in os.listdir(self.root_dir):
             dir_content = os.path.join(self.root_dir, item)
             if self.is_package(dir_content):
+                self.logger.debug(f"Found package in {dir_content}")
                 try:
                     module = importlib.import_module("." + item, self.root_package)
                     self.load_module(module)
                 except ModuleNotFoundError:
-                    print(f"WARNING no module matching package name for {item}")
+                    self.logger.warning(f"No module matching package name for {item}\n{traceback.format_exc()}")
diff --git a/src/tools/interop/idt/capture/pcap/pcap.py b/src/tools/interop/idt/capture/pcap/pcap.py
index 8208d59f87d780..2cb2285908b066 100644
--- a/src/tools/interop/idt/capture/pcap/pcap.py
+++ b/src/tools/interop/idt/capture/pcap/pcap.py
@@ -18,21 +18,23 @@
 import os
 import time
 
-from capture.file_utils import create_standard_log_name
-from capture.shell_utils import Bash
+from utils.artifact import create_standard_log_name, log
+from utils.shell import Bash
+
+logger = log.get_logger(__file__)
 
 
 class PacketCaptureRunner:
 
     def __init__(self, artifact_dir: str, interface: str) -> None:
-
+        self.logger = logger
         self.artifact_dir = artifact_dir
         self.output_path = str(
             os.path.join(
                 self.artifact_dir,
                 create_standard_log_name(
                     "pcap",
-                    "cap")))
+                    "pcap")))
         self.start_delay_seconds = 2
         self.interface = interface
         self.pcap_command = f"tcpdump -i {self.interface} -n -w {self.output_path}"
@@ -40,22 +42,22 @@ def __init__(self, artifact_dir: str, interface: str) -> None:
 
     def start_pcap(self) -> None:
         self.pcap_proc.start_command()
-        print("Pausing to check if pcap started...")
+        self.logger.info("Pausing to check if pcap started...")
         time.sleep(self.start_delay_seconds)
         if not self.pcap_proc.command_is_running():
-            print(
+            self.logger.error(
                 "Pcap did not start, you might need root; please authorize if prompted.")
-            Bash("sudo echo \"\"", sync=True)
-            print("Retrying pcap with sudo...")
+            Bash("sudo echo \"\"", sync=True).start_command()
+            self.logger.warning("Retrying pcap with sudo...")
             self.pcap_command = f"sudo {self.pcap_command}"
             self.pcap_proc = Bash(self.pcap_command)
             self.pcap_proc.start_command()
             time.sleep(self.start_delay_seconds)
         if not self.pcap_proc.command_is_running():
-            print("WARNING Failed to start pcap!")
+            self.logger.error("Failed to start pcap!")
         else:
-            print(f"Pcap output path {self.output_path}")
+            self.logger.info(f"Pcap output path {self.output_path}")
 
     def stop_pcap(self) -> None:
-        self.pcap_proc.stop_command(soft=True)
-        print("Pcap stopped")
+        self.logger.info("Stopping pcap proc")
+        self.pcap_proc.stop_command()
diff --git a/src/tools/interop/idt/capture/platform/android/__init__.py b/src/tools/interop/idt/capture/platform/android/__init__.py
index 7ec319feb0e9a3..021ec15688c706 100644
--- a/src/tools/interop/idt/capture/platform/android/__init__.py
+++ b/src/tools/interop/idt/capture/platform/android/__init__.py
@@ -18,5 +18,5 @@
 from .android import Android
 
 __all__ = [
-    'Android'
+    'Android',
 ]
diff --git a/src/tools/interop/idt/capture/platform/android/android.py b/src/tools/interop/idt/capture/platform/android/android.py
index 2a394495835ef5..4ca8b26baeda6b 100644
--- a/src/tools/interop/idt/capture/platform/android/android.py
+++ b/src/tools/interop/idt/capture/platform/android/android.py
@@ -14,65 +14,60 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-
 import asyncio
 import ipaddress
 import os
+import traceback
 import typing
+from asyncio import Task
 
 from capture.base import PlatformLogStreamer
-from capture.file_utils import create_standard_log_name
-from capture.shell_utils import Bash
+from utils.shell import Bash, log
+
+from . import config, streams
+from .capabilities import Capabilities
+
+logger = log.get_logger(__file__)
 
 
 class Android(PlatformLogStreamer):
-    """
-    Class that supports:
-    - Running synchronous adb commands
-    - Maintaining a singleton logcat stream
-    - Maintaining a singleton screen recording
-    """
 
     def __init__(self, artifact_dir: str) -> None:
-
+        self.logger = logger
         self.artifact_dir = artifact_dir
-
         self.device_id: str | None = None
         self.adb_devices: typing.Dict[str, bool] = {}
-        self._authorize_adb()
-
-        self.logcat_output_path = os.path.join(
-            self.artifact_dir, create_standard_log_name(
-                'logcat', 'txt'))
-        self.logcat_command = f'adb -s {self.device_id} logcat -T 1 >> {self.logcat_output_path}'
-        self.logcat_proc = Bash(self.logcat_command)
-
-        screen_cast_name = create_standard_log_name('screencast', 'mp4')
-        self.screen_cap_output_path = os.path.join(
-            self.artifact_dir, screen_cast_name)
-        self.check_screen_command = "shell dumpsys deviceidle | grep mScreenOn"
-        self.screen_path = f'/sdcard/Movies/{screen_cast_name}'
-        self.screen_command = f'adb -s {self.device_id} shell screenrecord --bugreport {self.screen_path}'
-        self.screen_proc = Bash(self.screen_command)
-        self.pull_screen = False
-        self.screen_pull_command = f'pull {self.screen_path} {self.screen_cap_output_path}'
+        self.capabilities: None | Capabilities = None
+        self.streams = {}
+        self.connected = False
 
     def run_adb_command(
             self,
             command: str,
-            capture_output: bool = False) -> Bash:
+            capture_output: bool = False,
+            cwd=None) -> Bash:
         """
         Run an adb command synchronously
         Capture_output must be true to call get_captured_output() later
         """
-        return Bash(
+        bash_command = Bash(
             f'adb -s {self.device_id} {command}',
             sync=True,
-            capture_output=capture_output)
+            capture_output=capture_output,
+            cwd=cwd)
+        bash_command.start_command()
+        return bash_command
+
+    def get_adb_background_command(
+            self,
+            command: str,
+            cwd=None) -> Bash:
+        return Bash(f'adb -s {self.device_id} {command}', cwd=cwd)
 
     def get_adb_devices(self) -> typing.Dict[str, bool]:
         """Returns a dict of device ids and whether they are authorized"""
         adb_devices = Bash('adb devices', sync=True, capture_output=True)
+        adb_devices.start_command()
         adb_devices_output = adb_devices.get_captured_output().split('\n')
         devices_auth = {}
         header_done = False
@@ -83,11 +78,11 @@ def get_adb_devices(self) -> typing.Dict[str, bool]:
                 device_is_auth = line_parsed[1] == "device"
                 if line_parsed[1] == "offline":
                     disconnect_command = f"adb disconnect {device_id}"
-                    print(f"Device {device_id} is offline, trying disconnect!")
+                    self.logger.warning(f"Device {device_id} is offline, trying disconnect!")
                     Bash(
                         disconnect_command,
                         sync=True,
-                        capture_output=False)
+                        capture_output=False).start_command()
                 else:
                     devices_auth[device_id] = device_is_auth
             header_done = True
@@ -103,11 +98,11 @@ def _get_first_connected_device(self) -> str:
     def _set_device_if_only_one_connected(self) -> None:
         if self._only_one_device_connected():
             self.device_id = self._get_first_connected_device()
-            print(f'Only one device detected; using {self.device_id}')
+            self.logger.warning(f'Only one device detected; using {self.device_id}')
 
     def _log_adb_devices(self) -> None:
         for dev in self.adb_devices:
-            print(dev)
+            self.logger.info(dev)
 
     @staticmethod
     def _is_connection_str(adb_input_str: str) -> bool:
@@ -134,22 +129,23 @@ def _is_connection_str(adb_input_str: str) -> bool:
     def _check_connect_wireless_adb(self, temp_device_id: str) -> None:
         if Android._is_connection_str(temp_device_id):
             connect_command = f"adb connect {temp_device_id}"
-            print(
+            self.logger.warning(
                 f"Detected connection string; attempting to connect: {connect_command}")
-            Bash(connect_command, sync=True, capture_output=False)
+            Bash(connect_command, sync=True, capture_output=False).start_command()
             self.get_adb_devices()
 
     def _device_id_user_input(self) -> None:
-        print('If there is no output below, press enter after connecting your phone under test OR')
-        print('Enter (copy paste) the target device id from the list of available devices below OR')
-        print('Enter $IP4:$PORT to connect wireless debugging.')
+        self.logger.error('Connect additional android devices via USB and press enter OR')
+        self.logger.error('Enter (copy paste) the target device id from the list of available devices below OR')
+        self.logger.error('Enter $IP4:$PORT to connect wireless debugging.')
         self._log_adb_devices()
         temp_device_id = input('').strip()
         self._check_connect_wireless_adb(temp_device_id)
+        self.get_adb_devices()
         if self._only_one_device_connected():
             self._set_device_if_only_one_connected()
         elif temp_device_id not in self.adb_devices:
-            print('Entered device not in adb devices!')
+            self.logger.warning('Entered device not in adb devices!')
         else:
             self.device_id = temp_device_id
 
@@ -161,7 +157,7 @@ def _choose_device_id(self) -> None:
         self._set_device_if_only_one_connected()
         while self.device_id not in self.get_adb_devices():
             self._device_id_user_input()
-        print(f'Selected device {self.device_id}')
+        self.logger.info(f'Selected device {self.device_id}')
 
     def _authorize_adb(self) -> None:
         """
@@ -170,48 +166,61 @@ def _authorize_adb(self) -> None:
         self.get_adb_devices()
         self._choose_device_id()
         while not self.get_adb_devices()[self.device_id]:
-            print('Confirming authorization, press enter after auth')
+            self.logger.info('Confirming authorization, press enter after auth')
             input('')
-        print(f'Target android device ID is authorized: {self.device_id}')
+        self.logger.info(f'Target android device ID is authorized: {self.device_id}')
+
+    async def connect(self) -> None:
+        if not self.connected:
+            self._authorize_adb()
+            self.capabilities = Capabilities(self)
+            self.capabilities.check_capabilities()
+            for stream in streams.__all__:
+                self.streams[stream] = getattr(streams, stream)(self)
+            self.connected = True
+
+    async def handle_stream_action(self, action: str) -> None:
+        had_error = False
+        for stream_name, stream in self.streams.items():
+            self.logger.info(f"Doing {action} for {stream_name}!")
+            try:
+                await getattr(stream, action)()
+            except Exception:
+                self.logger.error(traceback.format_exc())
+                had_error = True
+        if had_error:
+            raise Exception("Propagating to controller!")
 
-    def check_screen(self) -> bool:
-        screen_cmd_output = self.run_adb_command(
-            self.check_screen_command, capture_output=True)
-        return "true" in screen_cmd_output.get_captured_output()
+    async def start_streaming(self) -> None:
+        await self.handle_stream_action("start")
 
-    async def prepare_screen_recording(self) -> None:
-        if self.screen_proc.command_is_running():
-            return
+    async def run_observers(self) -> None:
         try:
-            async with asyncio.timeout_at(asyncio.get_running_loop().time() + 20.0):
-                screen_on = self.check_screen()
-                print("Please turn the screen on so screen recording can start!")
-                while not screen_on:
-                    await asyncio.sleep(2)
-                    screen_on = self.check_screen()
-                    if not screen_on:
-                        print("Screen is still not on for recording!")
-        except TimeoutError:
-            print("WARNING screen recording timeout")
-            return
-
-    async def start_streaming(self) -> None:
-        await self.prepare_screen_recording()
-        if self.check_screen():
-            self.pull_screen = True
-            self.screen_proc.start_command()
-        self.logcat_proc.start_command()
-
-    async def pull_screen_recording(self) -> None:
-        if self.pull_screen:
-            self.screen_proc.stop_command()
-            print("screen proc stopped")
-            await asyncio.sleep(3)
-            self.run_adb_command(self.screen_pull_command)
-            print("screen recording pull attempted")
-            self.pull_screen = False
+            observer_tasks: [Task] = []
+            for stream_name, stream in self.streams.items():
+                observer_tasks.append(asyncio.create_task(stream.run_observer()))
+            while True:
+                self.logger.info("Android root observer task checking sub tasks")
+                for task in observer_tasks:
+                    if task.done() or task.cancelled():
+                        self.logger.error(f"An android monitoring task has died, consider restarting! {task.__str__()}")
+                await asyncio.sleep(30)
+        except asyncio.CancelledError:
+            self.logger.info("Cancelling observer tasks")
+            for observer_tasks in observer_tasks:
+                observer_tasks.cancel()
 
     async def stop_streaming(self) -> None:
-        await self.pull_screen_recording()
-        self.logcat_proc.stop_command()
-        print("logcat stopped")
+        await self.handle_stream_action("stop")
+        if config.enable_bug_report:
+            found = False
+            for item in os.listdir(self.artifact_dir):
+                if "bugreport" in item and ".zip" in item:
+                    found = True
+            if not found:
+                self.logger.info("Taking bugreport")
+                self.run_adb_command("bugreport", cwd=self.artifact_dir)
+            else:
+                self.logger.warning("bugreport already taken")
+        else:
+            self.logger.critical("bugreport disabled in settings!")
diff --git a/src/tools/interop/idt/capture/platform/android/capabilities.py b/src/tools/interop/idt/capture/platform/android/capabilities.py
new file mode 100644
index 00000000000000..cd2f7f62797074
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/capabilities.py
@@ -0,0 +1,60 @@
+from typing import TYPE_CHECKING
+
+from utils.artifact import create_standard_log_name, log
+from utils.shell import Bash
+
+if TYPE_CHECKING:
+    from capture.platform.android import Android
+
+from . import config
+
+logger = log.get_logger(__file__)
+
+
+class Capabilities:
+
+    def __init__(self, platform: "Android"):
+        self.logger = logger
+        self.platform = platform
+        self.c_has_tcpdump = False
+        self.c_has_root = False
+        self.c_is_64 = False
+        self.c_hci_snoop_enabled = False
+        self.artifact = create_standard_log_name("capabilities", "txt", parent=platform.artifact_dir)
+
+    def __repr__(self):
+        s = "Detected capabilities:\n"
+        for item in [x for x in dir(self) if x.startswith("c_")]:
+            s += f"{item}: {getattr(self, item)}\n"
+        return s
+
+    def check_snoop_log(self) -> bool:
+        return config.hci_log_level in self.platform.run_adb_command("shell getprop persist.bluetooth.btsnooplogmode",
+                                                                     capture_output=True).get_captured_output()
+
+    def check_capabilities(self):
+        self.logger.info("Checking if device has root")
+        self.c_has_root = self.platform.run_adb_command(
+            "shell which su", capture_output=True).finished_success()
+        if self.c_has_root:
+            self.logger.warning("adb root!")
+            Bash("adb root", sync=True).start_command()
+        self.logger.info("Checking if device has tcpdump")
+        self.c_has_tcpdump = self.platform.run_adb_command(
+            "shell which tcpdump", capture_output=True).finished_success()
+        self.logger.info("Checking device CPU arch")
+        self.c_is_64 = "8" in self.platform.run_adb_command("shell cat /proc/cpuinfo | grep rch",
+                                                            capture_output=True).get_captured_output()
+        self.c_hci_snoop_enabled = self.check_snoop_log()
+        if not self.c_hci_snoop_enabled:
+            self.logger.info("HCI not enabled, attempting to enable!")
+            self.platform.run_adb_command(
+                f"shell setprop persist.bluetooth.btsnooplogmode {config.hci_log_level}")
+            self.platform.run_adb_command("shell svc bluetooth disable")
+            self.platform.run_adb_command("shell svc bluetooth enable")
+            self.c_hci_snoop_enabled = self.check_snoop_log()
+            if not self.c_hci_snoop_enabled:
+                self.logger.error("Failed to enabled HCI snoop log")
+        self.logger.info(self)
+        with open(self.artifact, "w") as artifact:
+            artifact.write(str(self))
diff --git a/src/tools/interop/idt/capture/platform/android/config.py b/src/tools/interop/idt/capture/platform/android/config.py
new file mode 100644
index 00000000000000..a0b05cd57a68cd
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/config.py
@@ -0,0 +1,20 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+enable_build_push_tcpdump = True
+enable_bug_report = True
+hci_log_level = "full"
diff --git a/src/tools/interop/idt/capture/platform/android/streams/__init__.py b/src/tools/interop/idt/capture/platform/android/streams/__init__.py
new file mode 100644
index 00000000000000..9f48b1f043fcd4
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/__init__.py
@@ -0,0 +1,14 @@
+from capture.loader import CaptureImplsLoader
+
+from .base import AndroidStream
+
+impl_loader = CaptureImplsLoader(
+    __path__[0],
+    "capture.platform.android.streams",
+    AndroidStream
+)
+
+for impl_name, impl in impl_loader.impls.items():
+    globals()[impl_name] = impl
+
+__all__ = impl_loader.impl_names
diff --git a/src/tools/interop/idt/capture/platform/android/streams/base.py b/src/tools/interop/idt/capture/platform/android/streams/base.py
new file mode 100644
index 00000000000000..64681312a36a3b
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/base.py
@@ -0,0 +1,33 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from abc import ABC, abstractmethod
+
+
+class AndroidStream(ABC):
+
+    @abstractmethod
+    async def start(self) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    async def run_observer(self) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    async def stop(self) -> None:
+        raise NotImplementedError
diff --git a/examples/resource-monitoring-app/telink/Kconfig b/src/tools/interop/idt/capture/platform/android/streams/logcat/__init__.py
similarity index 80%
rename from examples/resource-monitoring-app/telink/Kconfig
rename to src/tools/interop/idt/capture/platform/android/streams/logcat/__init__.py
index c1e18dcb761bac..eebc071333d89e 100644
--- a/examples/resource-monitoring-app/telink/Kconfig
+++ b/src/tools/interop/idt/capture/platform/android/streams/logcat/__init__.py
@@ -1,5 +1,6 @@
 #
 #    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-mainmenu "Matter Telink Resource Monitoring Example Application"
 
-rsource "../../../config/telink/chip-module/Kconfig.defaults"
-source "Kconfig.zephyr"
+from .logcat import LogcatStreamer
+
+__all__ = ["LogcatStreamer"]
diff --git a/src/tools/interop/idt/capture/platform/android/streams/logcat/logcat.py b/src/tools/interop/idt/capture/platform/android/streams/logcat/logcat.py
new file mode 100644
index 00000000000000..78670bf6504df0
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/logcat/logcat.py
@@ -0,0 +1,65 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import os
+from typing import TYPE_CHECKING
+
+from utils.artifact import create_standard_log_name, log
+
+from ..base import AndroidStream
+
+logger = log.get_logger(__file__)
+
+if TYPE_CHECKING:
+    from capture.platform.android import Android
+
+
+class LogcatStreamer(AndroidStream):
+
+    def __init__(self, platform: "Android"):
+        self.logger = logger
+        self.platform = platform
+        self.logcat_artifact = create_standard_log_name("logcat", "txt", parent=platform.artifact_dir)
+        self.logcat_command = f"logcat -T 1 >> {self.logcat_artifact}"
+        self.logcat_proc = platform.get_adb_background_command(self.logcat_command)
+        self.was_ever_running = False
+
+    async def run_observer(self) -> None:
+        last_size = 0
+        if not os.path.exists(self.logcat_artifact):
+            self.logger.warning("Logcat artifact does not exist yes, this might be normal at the start of execution")
+            asyncio.sleep(15)
+        while True:
+            try:
+                new_size = os.path.getsize(self.logcat_artifact)
+                if not (new_size > last_size):
+                    self.logger.warning(f"Logcat file not growing for {self.platform.device_id}, check connection!")
+                last_size = new_size
+            except OSError:
+                self.logger.error(f"Logcat file does not exist for {self.platfrom.device_id}, check connection!")
+            if not self.logcat_proc.command_is_running():
+                self.logger.error("Logcat proc is not running, trying to restart!")
+                self.logcat_proc = self.platform.get_adb_background_command(self.logcat_command)
+                self.logcat_proc.start_command()
+            await asyncio.sleep(4)
+
+    async def start(self):
+        self.logcat_proc.start_command()
+
+    async def stop(self):
+        self.logcat_proc.stop_command()
diff --git a/src/tools/interop/idt/capture/platform/android/streams/pcap/__init__.py b/src/tools/interop/idt/capture/platform/android/streams/pcap/__init__.py
new file mode 100644
index 00000000000000..846210798129ff
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/pcap/__init__.py
@@ -0,0 +1,20 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from .pcap import AndroidPcap
+
+__all__ = ["AndroidPcap"]
diff --git a/src/tools/interop/idt/capture/platform/android/streams/pcap/linux_build_tcpdump_64.sh b/src/tools/interop/idt/capture/platform/android/streams/pcap/linux_build_tcpdump_64.sh
new file mode 100755
index 00000000000000..c82141b13ec207
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/pcap/linux_build_tcpdump_64.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+set -e
+export TCPDUMP=4.99.4
+export LIBPCAP=1.10.4
+
+wget https://www.tcpdump.org/release/tcpdump-"$TCPDUMP".tar.gz
+wget https://www.tcpdump.org/release/libpcap-"$LIBPCAP".tar.gz
+
+tar zxvf tcpdump-"$TCPDUMP".tar.gz
+tar zxvf libpcap-"$LIBPCAP".tar.gz
+export CC=aarch64-linux-gnu-gcc
+cd libpcap-"$LIBPCAP"
+./configure --host=arm-linux --with-pcap=linux
+make
+cd ..
+
+cd tcpdump-"$TCPDUMP"
+export ac_cv_linux_vers=2
+export CFLAGS=-static
+export CPPFLAGS=-static
+export LDFLAGS=-static
+
+./configure --host=arm-linux
+make
+
+aarch64-linux-gnu-strip tcpdump
+cp tcpdump ..
+cd ..
+rm -R libpcap-"$LIBPCAP"
+rm -R tcpdump-"$TCPDUMP"
+rm libpcap-"$LIBPCAP".tar.gz
+rm tcpdump-"$TCPDUMP".tar.gz
diff --git a/src/tools/interop/idt/capture/platform/android/streams/pcap/mac_build_tcpdump_64.sh b/src/tools/interop/idt/capture/platform/android/streams/pcap/mac_build_tcpdump_64.sh
new file mode 100644
index 00000000000000..15d911997b6d15
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/pcap/mac_build_tcpdump_64.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# This script cross-compiles libpcap and tcpdump for a specified architecture (default: ARM64)
+
+# Set bash script to exit immediately if any commands fail, any variables are unexpanded, or any commands in a pipeline fail.
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Check for optional target architecture argument, default to aarch64-linux-gnu if not provided
+TARGET_ARCH="${1:-aarch64-linux-gnu}"
+
+# Create a random temporary directory using mktemp
+TMP_DIR=$(mktemp -d)
+OUT_DIR=$TMP_DIR/out
+
+# Function to download and extract archives
+download_and_extract() {
+    local url="$1"
+    local filepath="$2"
+    local tar_dir="$3"
+
+    wget -O "$filepath" "$url"
+    tar -C "$tar_dir" -zxvf "$filepath"
+}
+
+# Function to clean up downloaded and extracted files
+cleanup() {
+    local filepath="$1"
+    local dirpath="$2"
+
+    rm -rf "$filepath" "$dirpath"
+}
+
+# Cross-compile libpcap
+LIBPCAP_VERSION=1.10.4
+LIBPCAP_DIR=$TMP_DIR/libpcap-$LIBPCAP_VERSION
+LIBPCAP_ARCHIVE=$TMP_DIR/libpcap-$LIBPCAP_VERSION.tar.gz
+
+download_and_extract "https://www.tcpdump.org/release/libpcap-$LIBPCAP_VERSION.tar.gz" "$LIBPCAP_ARCHIVE" "$TMP_DIR"
+(cd "$LIBPCAP_DIR" && ./configure --prefix="$OUT_DIR" --host="$TARGET_ARCH" --with-pcap=linux)
+make -C "$LIBPCAP_DIR" -j"$(nproc)"
+make -C "$LIBPCAP_DIR" install
+cleanup "$LIBPCAP_ARCHIVE" "$LIBPCAP_DIR"
+
+# Cross-compile tcpdump
+TCPDUMP_VERSION=4.99.4
+TCPDUMP_DIR=$TMP_DIR/tcpdump-$TCPDUMP_VERSION
+TCPDUMP_ARCHIVE=$TMP_DIR/tcpdump-$TCPDUMP_VERSION.tar.gz
+
+download_and_extract "https://www.tcpdump.org/release/tcpdump-$TCPDUMP_VERSION.tar.gz" "$TCPDUMP_ARCHIVE" "$TMP_DIR"
+(cd "$TCPDUMP_DIR" && CFLAGS="-static -I$OUT_DIR/include" CPPFLAGS="-static" LDFLAGS="-static -L$OUT_DIR/lib" ./configure --prefix="$OUT_DIR" --host="$TARGET_ARCH")
+make -C "$TCPDUMP_DIR"
+make -C "$TCPDUMP_DIR" install
+cleanup "$TCPDUMP_ARCHIVE" "$TCPDUMP_DIR"
+
+# Prepare the artifact
+strip "$OUT_DIR/bin/tcpdump"
+mv "$OUT_DIR/bin/tcpdump" .
+rm -rf "$TMP_DIR"
diff --git a/src/tools/interop/idt/capture/platform/android/streams/pcap/pcap.py b/src/tools/interop/idt/capture/platform/android/streams/pcap/pcap.py
new file mode 100644
index 00000000000000..8eab53b8ec0d03
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/pcap/pcap.py
@@ -0,0 +1,99 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import os
+from typing import TYPE_CHECKING
+
+from utils.artifact import create_standard_log_name, log, safe_mkdir
+from utils.host_platform import is_mac
+from utils.shell import Bash
+
+from ... import config
+from ..base import AndroidStream
+
+if TYPE_CHECKING:
+    from capture.platform.android import Android
+
+logger = log.get_logger(__file__)
+
+
+class AndroidPcap(AndroidStream):
+
+    def __init__(self, platform: "Android"):
+        self.logger = logger
+        self.platform = platform
+        self.target_dir = "/sdcard/Download"
+        self.pcap_artifact = create_standard_log_name("android_tcpdump", "pcap", parent=self.platform.artifact_dir)
+        self.pcap_phone_out_path = f"{self.target_dir}/{os.path.basename(self.pcap_artifact)}"
+        self.pcap_phone_bin_location = "tcpdump" if platform.capabilities.c_has_tcpdump \
+            else f"{self.target_dir}/tcpdump"
+        self.pcap_command = f"shell {self.pcap_phone_bin_location} -w {self.pcap_phone_out_path}"
+        self.pcap_proc = platform.get_adb_background_command(self.pcap_command)
+        self.pcap_pull = False
+        self.pcap_pull_command = f"pull {self.pcap_phone_out_path} {self.pcap_artifact}"
+        self.build_dir = os.path.join(os.path.dirname(__file__), "BUILD")
+
+    async def pull_packet_capture(self) -> None:
+        if self.pcap_pull:
+            self.logger.info("Attempting to pull android pcap")
+            await asyncio.sleep(3)
+            self.platform.run_adb_command(self.pcap_pull_command)
+            self.pcap_pull = False
+
+    async def start(self):
+        if not self.platform.capabilities.c_has_root:
+            self.logger.warning("Phone is not rooted, cannot take pcap!")
+            return
+        if self.platform.capabilities.c_has_tcpdump:
+            self.logger.info("tcpdump already available; using!")
+            self.pcap_proc.start_command()
+            self.pcap_pull = True
+            return
+        if not config.enable_build_push_tcpdump:
+            self.logger.critical("Android TCP Dump build and push disabled in configs!")
+            return
+        if not os.path.exists(os.path.join(self.build_dir, "tcpdump")):
+            self.logger.warning("tcpdump bin not found, attempting to build, please wait a few moments!")
+            safe_mkdir(self.build_dir)
+            if is_mac():
+                build_script = os.path.join(os.path.dirname(__file__), "mac_build_tcpdump_64.sh")
+                Bash(f"{build_script} 2>&1 >> BUILD_LOG.txt", sync=True, cwd=self.build_dir).start_command()
+            else:
+                build_script = os.path.join(os.path.dirname(__file__), "linux_build_tcpdump_64.sh")
+                Bash(f"{build_script} 2>&1 >> BUILD_LOG.txt", sync=True, cwd=self.build_dir).start_command()
+        else:
+            self.logger.warning("Reusing existing tcpdump build")
+        if not self.platform.run_adb_command(f"shell ls {self.target_dir}/tcpdump").finished_success():
+            self.logger.warning("Pushing tcpdump to device")
+            self.platform.run_adb_command(f"push {os.path.join(self.build_dir, 'tcpdump')} f{self.target_dir}")
+            self.platform.run_adb_command(f"chmod +x {self.target_dir}/tcpdump")
+        else:
+            self.logger.info("tcpdump already in the expected location, not pushing!")
+        self.logger.info("Starting Android pcap command")
+        self.pcap_proc.start_command()
+        self.pcap_pull = True
+
+    async def run_observer(self) -> None:
+        while True:
+            # TODO: Implement, need to restart w/ new out file (no append) and keep pull manifest, much like `screen`
+            await asyncio.sleep(120)
+
+    async def stop(self):
+        self.logger.info("Stopping android pcap proc")
+        self.pcap_proc.stop_command()
+        await self.pull_packet_capture()
diff --git a/src/tools/interop/idt/capture/platform/android/streams/screen/__init__.py b/src/tools/interop/idt/capture/platform/android/streams/screen/__init__.py
new file mode 100644
index 00000000000000..1170a57700a7f7
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/screen/__init__.py
@@ -0,0 +1,20 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from .screen import ScreenRecorder
+
+__all__ = ["ScreenRecorder"]
diff --git a/src/tools/interop/idt/capture/platform/android/streams/screen/screen.py b/src/tools/interop/idt/capture/platform/android/streams/screen/screen.py
new file mode 100644
index 00000000000000..e190e7cf212c27
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/screen/screen.py
@@ -0,0 +1,100 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import os
+from typing import TYPE_CHECKING
+
+from utils.artifact import create_standard_log_name, log
+
+from ..base import AndroidStream
+
+if TYPE_CHECKING:
+    from capture.platform.android import Android
+
+logger = log.get_logger(__file__)
+
+
+class ScreenRecorder(AndroidStream):
+
+    def __init__(self, platform: "Android"):
+        self.screen_artifact = None
+        self.screen_phone_out_path = None
+        self.screen_command = None
+        self.screen_proc = None
+        self.logger = logger
+        self.platform = platform
+        self.screen_check_command = "shell dumpsys deviceidle | grep mScreenOn"
+        self.screen_pull = False
+        self.file_counter = 0
+        self.pull_commands: [str] = []
+        self.manifest_file = os.path.join(platform.artifact_dir, "screen_manifest.txt")
+
+    def check_screen(self) -> bool:
+        screen_cmd_output = self.platform.run_adb_command(
+            self.screen_check_command, capture_output=True)
+        return "mScreenOn=true" == screen_cmd_output.get_captured_output().strip()
+
+    async def prepare_screen_recording(self) -> None:
+        screen_on = self.check_screen()
+        while not screen_on:
+            await asyncio.sleep(3)
+            screen_on = self.check_screen()
+            if not screen_on:
+                self.logger.error("Please turn the screen on so screen recording can start or check connection!")
+
+    def update_commands(self) -> None:
+        self.screen_artifact = create_standard_log_name("screencast" + str(self.file_counter),
+                                                        "mp4",
+                                                        parent=self.platform.artifact_dir)
+        self.screen_phone_out_path = f"/sdcard/Movies/{os.path.basename(self.screen_artifact)}"
+        self.screen_command = f"shell screenrecord --bugreport {self.screen_phone_out_path}"
+        screen_pull_command = f"pull {self.screen_phone_out_path} {self.screen_artifact}\n"
+        self.pull_commands.append(screen_pull_command)
+        with open(self.manifest_file, "a+") as manifest:
+            manifest.write(screen_pull_command)
+        self.file_counter += 1
+
+    async def start(self):
+        await self.prepare_screen_recording()
+        if self.check_screen():
+            self.screen_pull = True
+            self.update_commands()
+            self.screen_proc = self.platform.get_adb_background_command(self.screen_command)
+            self.screen_proc.start_command()
+            self.logger.info(f"New screen recording file started {self.screen_phone_out_path} {self.screen_artifact}")
+
+    async def run_observer(self) -> None:
+        while True:
+            if not self.screen_proc.command_is_running():
+                self.logger.warning(f"Screen recording proc needs restart (may be normal) {self.platform.device_id}")
+                await self.start()
+            await asyncio.sleep(4)
+
+    async def pull_screen_recording(self) -> None:
+        if self.screen_pull:
+            self.logger.info("Attempting to pull screen recording")
+            await asyncio.sleep(3)
+            with open(self.manifest_file) as manifest:
+                for line in manifest:
+                    self.platform.run_adb_command(line)
+            self.screen_pull = False
+
+    async def stop(self):
+        self.logger.info("Stopping screen proc")
+        self.screen_proc.stop_command()
+        await self.pull_screen_recording()
diff --git a/src/tools/interop/idt/capture/shell_utils.py b/src/tools/interop/idt/capture/shell_utils.py
deleted file mode 100644
index 92bb11cbc25a8f..00000000000000
--- a/src/tools/interop/idt/capture/shell_utils.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#    Copyright (c) 2023 Project CHIP Authors
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-import shlex
-import subprocess
-
-from mobly.utils import stop_standing_subprocess
-
-
-class Bash:
-    """
-    Uses subprocess to execute bash commands
-    Intended to be instantiated and then only interacted with through instance methods
-    """
-
-    def __init__(self, command: str, sync: bool = False,
-                 capture_output: bool = False) -> None:
-        """
-        Run a bash command as a sub process
-        :param command: Command to run
-        :param sync: If True, wait for command to terminate
-        :param capture_output: Only applies to sync; if True, store stdout and stderr
-        """
-        self.command: str = command
-        self.sync = sync
-        self.capture_output = capture_output
-
-        self.args: list[str] = []
-        self._init_args()
-        self.proc = subprocess.run(self.args, capture_output=capture_output) if self.sync else None
-
-    def _init_args(self) -> None:
-        """Escape quotes, call bash, and prep command for subprocess args"""
-        command_escaped = self.command.replace('"', '\"')
-        self.args = shlex.split(f'/bin/bash -c "{command_escaped}"')
-
-    def command_is_running(self) -> bool:
-        return self.proc is not None and self.proc.poll() is None
-
-    def get_captured_output(self) -> str:
-        """Return captured output when the relevant instance var is set"""
-        return "" if not self.capture_output or not self.sync \
-            else self.proc.stdout.decode().strip()
-
-    def start_command(self) -> None:
-        if not self.sync and not self.command_is_running():
-            self.proc = subprocess.Popen(self.args)
-        else:
-            print(f'INFO {self.command} start requested while running')
-
-    def stop_command(self, soft: bool = False) -> None:
-        if self.command_is_running():
-            if soft:
-                self.proc.terminate()
-                if self.proc.stdout:
-                    self.proc.stdout.close()
-                if self.proc.stderr:
-                    self.proc.stderr.close()
-                self.proc.wait()
-            else:
-                stop_standing_subprocess(self.proc)
-        else:
-            print(f'INFO {self.command} stop requested while not running')
-        self.proc = None
diff --git a/src/tools/interop/idt/config.py b/src/tools/interop/idt/config.py
new file mode 100644
index 00000000000000..f084d4918516c4
--- /dev/null
+++ b/src/tools/interop/idt/config.py
@@ -0,0 +1,22 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+import logging
+
+enable_color = True
+log_level = logging.INFO
+py_major_version = 3
+py_minor_version = 11
diff --git a/src/tools/interop/idt/discovery/__init__.py b/src/tools/interop/idt/discovery/__init__.py
index f9a1aa665a86d8..b83e5dfe0e1f50 100644
--- a/src/tools/interop/idt/discovery/__init__.py
+++ b/src/tools/interop/idt/discovery/__init__.py
@@ -14,8 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-from .matter_ble import MatterBleScanner
-from .matter_dnssd import MatterDnssdListener
+from .ble import MatterBleScanner
+from .dnssd import MatterDnssdListener
 
 __all__ = [
     'MatterBleScanner',
diff --git a/src/tools/interop/idt/discovery/matter_ble.py b/src/tools/interop/idt/discovery/ble.py
similarity index 72%
rename from src/tools/interop/idt/discovery/matter_ble.py
rename to src/tools/interop/idt/discovery/ble.py
index 737842bca70ab8..9549c74614de9a 100644
--- a/src/tools/interop/idt/discovery/matter_ble.py
+++ b/src/tools/interop/idt/discovery/ble.py
@@ -17,19 +17,23 @@
 
 import asyncio
 import datetime
-import logging
 import os
+import sys
 import time
 
 from bleak import AdvertisementData, BleakScanner, BLEDevice
 from bleak.exc import BleakDBusError
+from utils import log
+from utils.log import border_print
+
+logger = log.get_logger(__file__)
 
 
 class MatterBleScanner:
 
     def __init__(self, artifact_dir: str):
         self.artifact_dir = artifact_dir
-        self.logger = logging.getLogger(__file__)
+        self.logger = logger
         self.devices_seen_last_time: set[str] = set()
         self.devices_seen_this_time: set[str] = set()
         self.throttle_seconds = 1
@@ -50,7 +54,7 @@ def write_device_log(self, device_name: str, to_write: str) -> None:
             ts = datetime.datetime.now().isoformat(sep=' ', timespec='milliseconds')
             to_write = f"{ts}\n{to_write}\n\n"
             log_file.write(to_write)
-            print(to_write)
+            self.logger.info(to_write)
 
     @staticmethod
     def is_matter_device(service_uuid: str) -> bool:
@@ -59,7 +63,7 @@ def is_matter_device(service_uuid: str) -> bool:
 
     def handle_device_states(self) -> None:
         for device_id in self.devices_seen_last_time - self.devices_seen_this_time:
-            to_log = f"LOST {device_id}"
+            to_log = f"LOST {device_id}\n"
             self.write_device_log(device_id, to_log)
         self.devices_seen_last_time = self.devices_seen_this_time
         self.devices_seen_this_time = set()
@@ -67,18 +71,21 @@ def handle_device_states(self) -> None:
     def log_ble_discovery(
             self,
             name: str,
-            bin_data: bytes,
+            bin_service_data: bytes,
             ble_device: BLEDevice,
             rssi: int) -> None:
-        loggable_data = bin_data.hex()
+        hex_service_data = bin_service_data.hex()
         if self.is_matter_device(name):
             device_id = f"{ble_device.name}_{ble_device.address}"
             self.devices_seen_this_time.add(device_id)
             if device_id not in self.devices_seen_last_time:
-                to_log = f"DISCOVERED\n{ble_device.name} {ble_device.address}"
-                to_log += f"{name}\n{loggable_data}\n"
+                to_log = "DISCOVERED\n"
+                to_log += f"BLE DEVICE NAME: {ble_device.name}\n"
+                to_log += f"BLE ADDR: {ble_device.address}\n"
+                to_log += f"NAME: {name}\n"
+                to_log += f"HEX SERVICE DATA: {hex_service_data}\n"
                 to_log += f"RSSI {rssi}\n"
-                to_log += self.parse_vid_pid(loggable_data)
+                to_log += self.parse_vid_pid(hex_service_data)
                 self.write_device_log(device_id, to_log)
 
     async def browse(self, scanner: BleakScanner) -> None:
@@ -86,19 +93,26 @@ async def browse(self, scanner: BleakScanner) -> None:
         for device in devices.values():
             ble_device = device[0]
             ad_data = device[1]
-            for name, bin_data in ad_data.service_data.items():
+            for name, bin_service_data in ad_data.service_data.items():
                 self.log_ble_discovery(
-                    name, bin_data, ble_device, ad_data.rssi)
+                    name, bin_service_data, ble_device, ad_data.rssi)
         self.handle_device_states()
 
-    def browse_interactive(self) -> None:
-        scanner = BleakScanner()
-        self.logger.warning(
-            "Scanning BLE\nDCL Lookup: https://webui.dcl.csa-iot.org/")
+    async def browser_task(self, scanner) -> None:
         while True:
             try:
-                time.sleep(self.throttle_seconds)
-                asyncio.run(self.browse(scanner))
+                await asyncio.sleep(self.throttle_seconds)
+                await self.browse(scanner)
             except BleakDBusError as e:
-                self.logger.warning(e)
+                self.logger.critical(e)
                 time.sleep(self.error_seconds)
+
+    async def browse_interactive(self) -> None:
+        scanner = BleakScanner()
+        self.logger.warning(
+            "Scanning BLE\nDCL Lookup: https://webui.dcl.csa-iot.org/\n")
+        border_print("Press enter to stop!", important=True)
+        task = asyncio.create_task(self.browser_task(scanner))
+        await asyncio.get_event_loop().run_in_executor(
+            None, sys.stdin.readline)
+        task.cancel()
diff --git a/src/tools/interop/idt/discovery/dnssd.py b/src/tools/interop/idt/discovery/dnssd.py
new file mode 100644
index 00000000000000..04dd8de3494eda
--- /dev/null
+++ b/src/tools/interop/idt/discovery/dnssd.py
@@ -0,0 +1,354 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import os
+import traceback
+from dataclasses import dataclass
+from textwrap import dedent
+from typing import Callable
+
+from probe.ip_utils import get_addr_type
+from utils.artifact import create_standard_log_name, log
+from utils.log import add_border, border_print
+from zeroconf import ServiceBrowser, ServiceInfo, ServiceListener, Zeroconf
+
+logger = log.get_logger(__file__)
+
+
+@dataclass()
+class MdnsTypeInfo:
+    type: str
+    description: str
+
+
+commissioner = MdnsTypeInfo(
+    "COMMISSIONER",
+    "This is a service for a Matter commissioner aka. controller"
+)
+commissionable = MdnsTypeInfo(
+    "COMMISSIONABLE / EXTENDED DISCOVERY",
+    "This is a service to be used in the commissioning process and provides more info about the device."
+)
+operational = MdnsTypeInfo(
+    "OPERATIONAL",
+    "This is a service for a commissioned Matter device. It exposes limited info about the device."
+)
+border_router = MdnsTypeInfo(
+    "THREAD BORDER ROUTER",
+    "This is a service for a thread border router; may be used for thread+Matter devices."
+)
+
+_MDNS_TYPES = {
+    "_matterd._udp.local.": commissioner,
+    "_matterc._udp.local.": commissionable,
+    "_matter._tcp.local.": operational,
+    "_meshcop._udp.local.": border_router,
+}
+
+
+@dataclass()
+class RecordParser:
+    readable_name: str
+    explanation: str
+    parse: Callable[[str], str]
+
+
+# TODO: Meshcop parser
+
+class MatterTxtRecordParser:
+
+    def __init__(self):
+        self.parsers = {
+            "D": RecordParser("Discriminator",
+                              dedent("\
+                              Differentiates this instance of the device from others w/ same VID/PID that might be \n\
+                              in the environment."),
+                              MatterTxtRecordParser.parse_d),  # To hex
+            "VP": RecordParser("VID/PID",
+                               "The Vendor ID and Product ID (each are two bytes of hex) that identify this product.",
+                               MatterTxtRecordParser.parse_vp),  # Split + to hex
+            "CM": RecordParser("Commissioning mode",
+                               "Whether the device is in commissioning mode or not.",
+                               MatterTxtRecordParser.parse_cm),  # Decode
+            "DT": RecordParser("Device type",
+                               "Application type for this end device.",
+                               MatterTxtRecordParser.parse_dt),  # Decode
+            "DN": RecordParser("Device name",
+                               "Manufacturer provided device name. MAY match NodeLabel in Basic info cluster.",
+                               MatterTxtRecordParser.parse_pass_through),  # None
+            "RI": RecordParser("Rotating identifier",
+                               "Vendor specific, non-trackable per-device ID.",
+                               MatterTxtRecordParser.parse_pass_through),  # None
+            "PH": RecordParser("Pairing hint",
+                               dedent("\
+                               Given the current device state, follow these instructions to make the device \n\
+                               commissionable."),
+                               MatterTxtRecordParser.parse_ph),  # Decode
+            "PI": RecordParser("Pairing instructions",
+                               dedent("\
+                               Used with the Pairing hint. If the Pairing hint mentions N, this is the \n\
+                               value of N."),
+                               MatterTxtRecordParser.parse_pass_through),  # None
+            # General records
+            "SII": RecordParser("Session idle interval",
+                                "Message Reliability Protocol retry interval while the device is idle in milliseconds.",
+                                MatterTxtRecordParser.parse_pass_through),  # None
+            "SAI": RecordParser("Session active interval",
+                                dedent("\
+                                Message Reliability Protocol retry interval while the device is active \n\
+                                in milliseconds."),
+                                MatterTxtRecordParser.parse_pass_through),  # None
+            "SAT": RecordParser("Session active threshold",
+                                "Duration of time this device stays active after last activity in milliseconds.",
+                                MatterTxtRecordParser.parse_pass_through),  # None
+            "T": RecordParser("Supports TCP",
+                              "Whether this device supports TCP client and or Server.",
+                              MatterTxtRecordParser.parse_t),  # Decode
+        }
+        self.unparsed_records = ""
+        self.parsed_records = ""
+
+    def parse_single_record(self, key: str, value: str):
+        parser: RecordParser = self.parsers[key]
+        self.parsed_records += add_border(parser.readable_name + "\n")
+        self.parsed_records += parser.explanation + "\n\n"
+        try:
+            self.parsed_records += "PARSED VALUE: " + parser.parse(value) + "\n"
+        except Exception:
+            logger.error("Exception parsing TXT record, appending raw value")
+            logger.error(traceback.format_exc())
+            self.parsed_records += f"RAW VALUE: {value}\n"
+
+    def get_output(self) -> str:
+        unparsed_exp = "\nThe following TXT records were not parsed or explained:\n"
+        parsed_exp = "\nThe following was discovered about this device via TXT records:\n"
+        ret = ""
+        if self.unparsed_records:
+            ret += unparsed_exp + self.unparsed_records
+        if self.parsed_records:
+            ret += parsed_exp + self.parsed_records
+        return ret
+
+    def parse_records(self, info: ServiceInfo) -> str:
+        if info.properties is not None:
+            for name, value in info.properties.items():
+                try:
+                    name = name.decode("utf-8")
+                except UnicodeDecodeError:
+                    name = str(name)
+                try:
+                    value = value.decode("utf-8")
+                except UnicodeDecodeError:
+                    value = str(value)
+                if name not in self.parsers:
+                    self.unparsed_records += f"KEY: {name} VALUE: {value}\n"
+                else:
+                    self.parse_single_record(name, value)
+        return self.get_output()
+
+    @staticmethod
+    def parse_pass_through(txt_value: str) -> str:
+        return txt_value
+
+    @staticmethod
+    def parse_d(txt_value: str) -> str:
+        return hex(int(txt_value))
+
+    @staticmethod
+    def parse_vp(txt_value: str) -> str:
+        vid, pid = txt_value.split("+")
+        vid, pid = hex(int(vid)), hex(int(pid))
+        return f"VID: {vid}, PID: {pid}"
+
+    @staticmethod
+    def parse_cm(txt_value: str) -> str:
+        cm = int(txt_value)
+        mode_descriptions = [
+            "Not in commissioning mode",
+            "In passcode commissioning mode (standard mode)",
+            "In dynamic passcode commissioning mode",
+        ]
+        return mode_descriptions[cm]
+
+    @staticmethod
+    def parse_dt(txt_value: str) -> str:
+        application_device_types = {
+            # lighting
+            "0x100": "On/Off Light",
+            "0x101": "Dimmable Light",
+            "0x10C": "Color Temperature Light",
+            "0x10D": "Extended Color Light",
+            # smart plugs/outlets and other actuators
+            "0x10A": "On/Off Plug-in Unit",
+            "0x10B": "Dimmable Plug-In Unit",
+            "0x303": "Pump",
+            # switches and controls
+            "0x103": "On/Off Light Switch",
+            "0x104": "Dimmer Switch",
+            "0x105": "Color Dimmer Switch",
+            "0x840": "Control Bridge",
+            "0x304": "Pump Controller",
+            "0xF": "Generic Switch",
+            # sensors
+            "0x15": "Contact Sensor",
+            "0x106": "Light Sensor",
+            "0x107": "Occupancy Sensor",
+            "0x302": "Temperature Sensor",
+            "0x305": "Pressure Sensor",
+            "0x306": "Flow Sensor",
+            "0x307": "Humidity Sensor",
+            "0x850": "On/Off Sensor",
+            # closures
+            "0xA": "Door Lock",
+            "0xB": "Door Lock Controller",
+            "0x202": "Window Covering",
+            "0x203": "Window Covering Controller",
+            # HVAC
+            "0x300": "Heating/Cooling Unit",
+            "0x301": "Thermostat",
+            "0x2B": "Fan",
+            # media
+            "0x28": "Basic Video Player",
+            "0x23": "Casting Video Player",
+            "0x22": "Speaker",
+            "0x24": "Content App",
+            "0x29": "Casting Video Client",
+            "0x2A": "Video Remote Control",
+            # generic
+            "0x27": "Mode Select",
+        }
+        return application_device_types[hex((int(txt_value))).upper().replace("0X", "0x")]
+
+    @staticmethod
+    def parse_ph(txt_value: str) -> str:
+        pairing_hints = [
+            "Power Cycle",
+            "Custom commissioning flow",
+            "Use existing administrator (already commissioned)",
+            "Use settings menu on device",
+            "Use the PI TXT record hint",
+            "Read the manual",
+            "Press the reset button",
+            "Press Reset Button with application of power",
+            "Press Reset Button for N seconds",
+            "Press Reset Button until light blinks",
+            "Press Reset Button for N seconds with application of power",
+            "Press Reset Button until light blinks with application of power",
+            "Press Reset Button N times",
+            "Press Setup Button",
+            "Press Setup Button with application of power",
+            "Press Setup Button for N seconds",
+            "Press Setup Button until light blinks",
+            "Press Setup Button for N seconds with application of power",
+            "Press Setup Button until light blinks with application of power",
+            "Press Setup Button N times",
+        ]
+        ret = "\n"
+        b_arr = [int(b) for b in bin(int(txt_value))[2:]][::-1]
+        for i in range(0, len(b_arr)):
+            b = b_arr[i]
+            if b:
+                ret += pairing_hints[i] + "\n"
+        return ret
+
+    @staticmethod
+    def parse_t(txt_value: str) -> str:
+        return "TCP supported" if int(txt_value) else "TCP not supported"
+
+
+class MatterDnssdListener(ServiceListener):
+
+    def __init__(self, artifact_dir: str) -> None:
+        super().__init__()
+        self.artifact_dir = artifact_dir
+        self.logger = logger
+        self.discovered_matter_devices: [str, ServiceInfo] = {}
+
+    def write_log(self, line: str, log_name: str) -> None:
+        with open(self.create_device_log_name(log_name), "a+") as log_file:
+            log_file.write(line)
+
+    def create_device_log_name(self, device_name) -> str:
+        return os.path.join(
+            self.artifact_dir,
+            create_standard_log_name(f"{device_name}_dnssd", "txt"))
+
+    @staticmethod
+    def log_addr(info: ServiceInfo) -> str:
+        ret = add_border("This device has the following IP addresses\n")
+        for addr in info.parsed_scoped_addresses():
+            ret += f"{get_addr_type(addr)}: {addr}\n"
+        return ret
+
+    def handle_service_info(
+            self,
+            zc: Zeroconf,
+            type_: str,
+            name: str,
+            delta_type: str) -> None:
+        info = zc.get_service_info(type_, name)
+        self.discovered_matter_devices[name] = info
+        to_log = f"{name}\n"
+        update_str = f"\nSERVICE {delta_type}\n"
+        to_log += ("*" * (len(update_str) - 2)) + update_str
+        to_log += _MDNS_TYPES[type_].type + "\n"
+        to_log += _MDNS_TYPES[type_].description + "\n"
+        to_log += f"A/SRV TTL: {str(info.host_ttl)}\n"
+        to_log += f"PTR/TXT TTL: {str(info.other_ttl)}\n"
+        txt_parser = MatterTxtRecordParser()
+        to_log += txt_parser.parse_records(info)
+        to_log += self.log_addr(info)
+        self.logger.info(to_log)
+        self.write_log(to_log, name)
+
+    def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        self.handle_service_info(zc, type_, name, "ADDED")
+
+    def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        self.handle_service_info(zc, type_, name, "UPDATED")
+
+    def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        to_log = f"Service {name} removed\n"
+        to_log += _MDNS_TYPES[type_].type + "\n"
+        to_log += _MDNS_TYPES[type_].description
+        if name in self.discovered_matter_devices:
+            del self.discovered_matter_devices[name]
+        self.logger.warning(to_log)
+        self.write_log(to_log, name)
+
+    def browse_interactive(self) -> None:
+        zc = Zeroconf()
+        ServiceBrowser(zc, list(_MDNS_TYPES.keys()), self)
+        try:
+            self.logger.warning(
+                dedent("\
+                \n\
+                Browsing Matter DNS-SD\n\
+                DCL Lookup: https://webui.dcl.csa-iot.org/\n\
+                See spec section 4.3 for details of Matter TXT records.\n"))
+            border_print("Press enter to stop!", important=True)
+            input("")
+        finally:
+            zc.close()
+
+    async def browse_once(self, browse_time_seconds: int) -> Zeroconf:
+        zc = Zeroconf()
+        ServiceBrowser(zc, list(_MDNS_TYPES.keys()), self)
+        await asyncio.sleep(browse_time_seconds)
+        zc.close()
+        return zc
diff --git a/src/tools/interop/idt/discovery/matter_dnssd.py b/src/tools/interop/idt/discovery/matter_dnssd.py
deleted file mode 100644
index 7dfec195174313..00000000000000
--- a/src/tools/interop/idt/discovery/matter_dnssd.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-#    Copyright (c) 2023 Project CHIP Authors
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-import logging
-
-from zeroconf import ServiceBrowser, ServiceInfo, ServiceListener, Zeroconf
-
-_MDNS_TYPES = {
-    "_matterd._udp.local.": "COMMISSIONER",
-    "_matterc._udp.local.": "COMMISSIONABLE",
-    "_matter._tcp.local.": "OPERATIONAL",
-    "_meshcop._udp.local.": "THREAD_BORDER_ROUTER",
-}
-
-
-class MatterDnssdListener(ServiceListener):
-
-    def __init__(self, artifact_dir: str) -> None:
-        super().__init__()
-        self.artifact_dir = artifact_dir
-        self.logger = logging.getLogger(__file__)
-
-    @staticmethod
-    def log_addr(info: ServiceInfo) -> str:
-        ret = "\n"
-        for addr in info.parsed_scoped_addresses():
-            ret += f"{addr}\n"
-        return ret
-
-    @staticmethod
-    def log_vid_pid(info: ServiceInfo) -> str:
-        if info.properties is not None and b'VP' in info.properties:
-            vid_pid = str(info.properties[b'VP'])
-            vid_pid = vid_pid[2:len(vid_pid) - 1].split('+')
-            vid = hex(int(vid_pid[0]))
-            pid = hex(int(vid_pid[1]))
-            return f"\nVID: {vid} PID: {pid}\n"
-        return ""
-
-    def handle_service_info(
-            self,
-            zc: Zeroconf,
-            type_: str,
-            name: str,
-            delta_type: str) -> None:
-        info = zc.get_service_info(type_, name)
-        to_log = f"{name}\n"
-        if info.properties is not None:
-            for name, value in info.properties.items():
-                to_log += f"{name}:\t{value}\n"
-        update_str = f"\nSERVICE {delta_type}\n"
-        to_log += ("*" * (len(update_str) - 2)) + update_str
-        to_log += _MDNS_TYPES[type_]
-        to_log += self.log_vid_pid(info)
-        to_log += self.log_addr(info)
-        self.logger.info(to_log)
-
-    def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:
-        self.handle_service_info(zc, type_, name, "ADDED")
-
-    def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:
-        self.handle_service_info(zc, type_, name, "UPDATED")
-
-    def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:
-        to_log = f"Service {name} removed\n"
-        to_log += _MDNS_TYPES[type_]
-        self.logger.warning(to_log)
-
-    def browse_interactive(self) -> None:
-        zc = Zeroconf()
-        ServiceBrowser(zc, list(_MDNS_TYPES.keys()), self)
-        try:
-            input("Browsing Matter mDNS, press enter to stop\n")
-        finally:
-            zc.close()
diff --git a/src/tools/interop/idt/idt.py b/src/tools/interop/idt/idt.py
index b401f88dd8b231..9ddb1ddd90c37f 100644
--- a/src/tools/interop/idt/idt.py
+++ b/src/tools/interop/idt/idt.py
@@ -17,25 +17,38 @@
 
 import argparse
 import asyncio
-import logging
 import os
 import shutil
 import sys
 from pathlib import Path
 
-from capture import EcosystemController, EcosystemFactory, PacketCaptureRunner, PlatformFactory
-from capture.file_utils import border_print, create_file_timestamp, safe_mkdir
+import probe.runner as probe_runner
+from capture import PacketCaptureRunner, controller
 from discovery import MatterBleScanner, MatterDnssdListener
+from utils.artifact import create_file_timestamp, safe_mkdir
+from utils.host_platform import get_available_interfaces, verify_host_dependencies
+from utils.log import border_print
 
-logging.basicConfig(
-    format='%(asctime)s.%(msecs)03d %(levelname)s {%(module)s} [%(funcName)s]\n%(message)s \n',
-    level=logging.INFO)
+import config
+
+splash = '''\x1b[0m
+\x1b[32;1m┌────────┐\x1b[33;20m▪\x1b[32;1m \x1b[34;1m┌──────┐ \x1b[33;20m• \x1b[35;1m┌──────────┐ \x1b[33;20m●
+\x1b[32;1m│░░░░░░░░│  \x1b[34;1m│░░░░░░└┐ \x1b[33;20mﾟ\x1b[35;1m│░░░░░░░░░░│
+\x1b[32;1m└──┐░░┌──┘\x1b[33;20m۰\x1b[32;1m \x1b[34;1m│░░┌┐░░░│  \x1b[35;1m└───┐░░┌───┘
+\x1b[32;1m   │░░│     \x1b[34;1m│░░│└┐░░│\x1b[33;20m▫ \x1b[35;1m \x1b[33;20m۰\x1b[35;1m  │░░│  \x1b[33;20m｡
+\x1b[32;1m \x1b[33;20m•\x1b[32;1m │░░│  \x1b[33;20m●  \x1b[34;1m│░░│┌┘░░│  \x1b[35;1m    │░░│
+\x1b[32;1m┌──┘░░└──┐  \x1b[34;1m│░░└┘░░░│  \x1b[35;1m    │░░│ \x1b[33;20m•
+\x1b[32;1m│░░░░░░░░│  \x1b[34;1m│░░░░░░┌┘\x1b[33;20m۰ \x1b[35;1m \x1b[33;20m▪\x1b[35;1m  │░░│
+\x1b[32;1m└────────┘\x1b[33;20m•\x1b[32;1m \x1b[34;1m└──────┘\x1b[33;20m｡  \x1b[35;1m    └──┘ \x1b[33;20m▫
+\x1b[32;1m✰ Interop\x1b[34;1m  ✰ Debugging\x1b[35;1m   ✰ Tool
+\x1b[0m'''
 
 
 class InteropDebuggingTool:
 
     def __init__(self) -> None:
-
+        if config.enable_color:
+            print(splash)
         self.artifact_dir = None
         create_artifact_dir = True
         if len(sys.argv) == 1:
@@ -45,6 +58,8 @@ def __init__(self) -> None:
         elif len(sys.argv) >= 3 and (sys.argv[2] == "-h" or sys.argv[2] == "--help"):
             create_artifact_dir = False
 
+        verify_host_dependencies(["adb", "tcpdump"])
+
         if not os.environ['IDT_OUTPUT_DIR']:
             print('Missing required env vars! Use /scripts!!!')
             sys.exit(1)
@@ -60,25 +75,22 @@ def __init__(self) -> None:
             safe_mkdir(self.artifact_dir)
             border_print(f"Using artifact dir {self.artifact_dir}")
 
-        self.available_platforms = PlatformFactory.list_available_platforms()
+        self.available_platforms = controller.list_available_platforms()
         self.available_platforms_default = 'Android' if 'Android' in self.available_platforms else None
         self.platform_required = self.available_platforms_default is None
 
-        self.available_ecosystems = EcosystemFactory.list_available_ecosystems()
+        self.available_ecosystems = controller.list_available_ecosystems()
         self.available_ecosystems_default = 'ALL'
         self.available_ecosystems.append(self.available_ecosystems_default)
 
-        net_interface_path = "/sys/class/net/"
-        self.available_net_interfaces = os.listdir(net_interface_path) \
-            if os.path.exists(net_interface_path) \
-            else []
-        self.available_net_interfaces.append("any")
-        self.available_net_interfaces_default = "any"
+        self.available_net_interfaces = get_available_interfaces()
+        self.available_net_interfaces_default = "any" if "any" in self.available_net_interfaces else None
         self.pcap_artifact_dir = os.path.join(self.artifact_dir, "pcap")
         self.net_interface_required = self.available_net_interfaces_default is None
 
         self.ble_artifact_dir = os.path.join(self.artifact_dir, "ble")
         self.dnssd_artifact_dir = os.path.join(self.artifact_dir, "dnssd")
+        self.prober_dir = os.path.join(self.artifact_dir, "probes")
 
         self.process_args()
 
@@ -145,6 +157,10 @@ def process_args(self) -> None:
 
         capture_parser.set_defaults(func=self.command_capture)
 
+        prober_parser = subparsers.add_parser("probe",
+                                              help="Probe the environment for Matter and general networking info")
+        prober_parser.set_defaults(func=self.command_probe)
+
         args, unknown = parser.parse_known_args()
         if not hasattr(args, 'func'):
             parser.print_help()
@@ -154,10 +170,13 @@ def process_args(self) -> None:
     def command_discover(self, args: argparse.Namespace) -> None:
         if args.type[0] == "b":
             safe_mkdir(self.ble_artifact_dir)
-            MatterBleScanner(self.ble_artifact_dir).browse_interactive()
+            scanner = MatterBleScanner(self.ble_artifact_dir)
+            asyncio.run(scanner.browse_interactive())
+            self.zip_artifacts()
         else:
             safe_mkdir(self.dnssd_artifact_dir)
             MatterDnssdListener(self.dnssd_artifact_dir).browse_interactive()
+            self.zip_artifacts()
 
     def zip_artifacts(self) -> None:
         zip_basename = os.path.basename(self.artifact_dir)
@@ -165,10 +184,9 @@ def zip_artifacts(self) -> None:
                                            'zip',
                                            root_dir=self.artifact_dir)
         output_zip = shutil.move(archive_file, self.artifact_dir_parent)
-        print(f'Output zip: {output_zip}')
+        border_print(f'Output zip: {output_zip}')
 
     def command_capture(self, args: argparse.Namespace) -> None:
-
         pcap = args.pcap == 't'
         pcap_runner = None if not pcap else PacketCaptureRunner(
             self.pcap_artifact_dir, args.interface)
@@ -176,21 +194,24 @@ def command_capture(self, args: argparse.Namespace) -> None:
             border_print("Starting pcap")
             safe_mkdir(self.pcap_artifact_dir)
             pcap_runner.start_pcap()
-
-        asyncio.run(EcosystemFactory.init_ecosystems(args.platform,
-                                                     args.ecosystem,
-                                                     self.artifact_dir))
-        asyncio.run(EcosystemController.start())
-
-        border_print("Press enter twice to stop streaming", important=True)
-        input("")
-
+        asyncio.run(controller.init_ecosystems(args.platform,
+                                               args.ecosystem,
+                                               self.artifact_dir))
+        asyncio.run(controller.start())
+        asyncio.run(controller.run_analyzers())
         if pcap:
             border_print("Stopping pcap")
             pcap_runner.stop_pcap()
+        asyncio.run(controller.stop())
+        asyncio.run(controller.probe())
+        border_print("Checking error report")
+        controller.write_error_report(self.artifact_dir)
+        border_print("Compressing artifacts...")
+        self.zip_artifacts()
 
-        asyncio.run(EcosystemController.stop())
-        asyncio.run(EcosystemController.analyze())
-
-        border_print("Compressing artifacts, this may take some time!")
+    def command_probe(self, args: argparse.Namespace) -> None:
+        border_print("Starting generic Matter prober for local environment!")
+        safe_mkdir(self.dnssd_artifact_dir)
+        safe_mkdir(self.prober_dir)
+        probe_runner.run_probes(self.prober_dir, self.dnssd_artifact_dir)
         self.zip_artifacts()
diff --git a/src/tools/interop/idt/probe/__init__.py b/src/tools/interop/idt/probe/__init__.py
new file mode 100644
index 00000000000000..f44dcd97c812ad
--- /dev/null
+++ b/src/tools/interop/idt/probe/__init__.py
@@ -0,0 +1,25 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from dataclasses import dataclass
+
+
+@dataclass(repr=True)
+class ProbeTarget:
+    name: str
+    ip: str
+    port: str
diff --git a/src/tools/interop/idt/probe/config.py b/src/tools/interop/idt/probe/config.py
new file mode 100644
index 00000000000000..150e4079e23e31
--- /dev/null
+++ b/src/tools/interop/idt/probe/config.py
@@ -0,0 +1,19 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+ping_count = 4
+dnssd_browsing_time_seconds = 4
diff --git a/src/tools/interop/idt/probe/ip_utils.py b/src/tools/interop/idt/probe/ip_utils.py
new file mode 100644
index 00000000000000..ca1e39ebf75f91
--- /dev/null
+++ b/src/tools/interop/idt/probe/ip_utils.py
@@ -0,0 +1,50 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import ipaddress
+
+
+def is_ipv4(ip: str) -> bool:
+    try:
+        ipaddress.IPv4Address(ip)
+        return True
+    except ipaddress.AddressValueError:
+        return False
+
+
+def is_ipv6_ll(ip: str) -> bool:
+    try:
+        return ipaddress.IPv6Address(ip).is_link_local
+    except ipaddress.AddressValueError:
+        return False
+
+
+def is_ipv6(ip: str) -> bool:
+    try:
+        ipaddress.IPv6Address(ip)
+        return True
+    except ipaddress.AddressValueError:
+        return False
+
+
+def get_addr_type(ip: str) -> str:
+    if is_ipv4(ip):
+        return "V4"
+    elif is_ipv6_ll(ip):
+        return "V6 Link Local"
+    elif is_ipv6(ip):
+        return "V6"
diff --git a/src/tools/interop/idt/probe/linux.py b/src/tools/interop/idt/probe/linux.py
new file mode 100644
index 00000000000000..05a8adb4410e28
--- /dev/null
+++ b/src/tools/interop/idt/probe/linux.py
@@ -0,0 +1,48 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import probe.probe as p
+from utils.host_platform import get_ll_interface
+from utils.log import get_logger
+
+from . import config
+
+logger = get_logger(__file__)
+
+
+class ProberLinuxHost(p.GenericMatterProber):
+
+    def __init__(self, artifact_dir: str, dnssd_artifact_dir: str) -> None:
+        # TODO: Parity with macOS
+        super().__init__(artifact_dir, dnssd_artifact_dir)
+        self.logger = logger
+        self.ll_int = get_ll_interface()
+
+    def discover_targets_by_neighbor(self) -> None:
+        pass
+
+    def probe_v4(self, ipv4: str, port: str) -> None:
+        self.run_command(f"ping -c {config.ping_count} {ipv4}")
+
+    def probe_v6(self, ipv6: str, port: str) -> None:
+        self.run_command(f"ping -c {config.ping_count} -6 {ipv6}")
+
+    def probe_v6_ll(self, ipv6_ll: str, port: str) -> None:
+        self.run_command(f"ping -c {config.ping_count} -6 {ipv6_ll}%{self.ll_int}")
+
+    def get_general_details(self) -> None:
+        pass
diff --git a/src/tools/interop/idt/probe/mac.py b/src/tools/interop/idt/probe/mac.py
new file mode 100644
index 00000000000000..b13e5d50fa46ce
--- /dev/null
+++ b/src/tools/interop/idt/probe/mac.py
@@ -0,0 +1,56 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import probe.probe as p
+from utils.host_platform import get_ll_interface
+from utils.log import get_logger
+
+from . import ProbeTarget, config
+
+logger = get_logger(__file__)
+
+
+class ProberMacHost(p.GenericMatterProber):
+
+    def __init__(self, artifact_dir: str, dnssd_artifact_dir: str) -> None:
+        # TODO: Build out additional probes
+        super().__init__(artifact_dir, dnssd_artifact_dir)
+        self.logger = logger
+        self.ll_int = get_ll_interface()
+
+    def discover_targets_by_neighbor(self) -> None:
+        pass
+
+    def probe_v4(self, target: ProbeTarget) -> None:
+        self.logger.info("Ping IPv4")
+        self.run_command(f"ping -c {config.ping_count} {target.ip}")
+
+    def probe_v6(self, target: ProbeTarget) -> None:
+        self.logger.info("Ping IPv6")
+        self.run_command(f"ping6 -c {config.ping_count} {target.ip}")
+
+    def probe_v6_ll(self, target: ProbeTarget) -> None:
+        self.logger.info("Ping IPv6 Link Local")
+        self.run_command(f"ping6 -c {config.ping_count} -I {self.ll_int} {target.ip}")
+
+    def get_general_details(self) -> None:
+        self.logger.info("Host interfaces")
+        self.run_command("ifconfig")
+        self.logger.info("v4 routes from host")
+        self.run_command("netstat -r -f inet -n")
+        self.logger.info("v6 routes from host")
+        self.run_command("netstat -r -f inet6 -n")
diff --git a/src/tools/interop/idt/probe/probe.py b/src/tools/interop/idt/probe/probe.py
new file mode 100644
index 00000000000000..6fcc92ad0428fb
--- /dev/null
+++ b/src/tools/interop/idt/probe/probe.py
@@ -0,0 +1,100 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import asyncio
+import os.path
+from abc import ABC, abstractmethod
+
+from discovery import MatterDnssdListener
+from discovery.dnssd import ServiceInfo
+from utils.artifact import create_standard_log_name
+from utils.log import get_logger
+from utils.shell import Bash
+
+from . import ProbeTarget, config
+from .ip_utils import is_ipv4, is_ipv6, is_ipv6_ll
+
+logger = get_logger(__file__)
+
+
+class GenericMatterProber(ABC):
+
+    def __init__(self, artifact_dir: str, dnssd_artifact_dir: str) -> None:
+        self.artifact_dir = artifact_dir
+        self.dnssd_artifact_dir = dnssd_artifact_dir
+        self.logger = logger
+        self.targets: [GenericMatterProber.ProbeTarget] = []
+        self.output = os.path.join(self.artifact_dir,
+                                   create_standard_log_name("generic_probes", "txt"))
+        self.suffix = f"2>&1 | tee -a {self.output}"
+
+    def run_command(self, cmd: str, capture_output=False) -> Bash:
+        cmd = f"{cmd} {self.suffix}"
+        self.logger.debug(cmd)
+        bash = Bash(cmd, sync=True, capture_output=capture_output)
+        bash.start_command()
+        return bash
+
+    @abstractmethod
+    def probe_v4(self, target: ProbeTarget) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def probe_v6(self, target: ProbeTarget) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def probe_v6_ll(self, target: ProbeTarget) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def discover_targets_by_neighbor(self) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_general_details(self) -> None:
+        raise NotImplementedError
+
+    def discover_targets_by_browsing(self) -> None:
+        browser = MatterDnssdListener(self.dnssd_artifact_dir)
+        asyncio.run(browser.browse_once(config.dnssd_browsing_time_seconds))
+        for name in browser.discovered_matter_devices:
+            info: ServiceInfo = browser.discovered_matter_devices[name]
+            for addr in info.parsed_scoped_addresses():
+                self.targets.append(ProbeTarget(name, addr, info.port))
+
+    def probe_single_target(self, target: ProbeTarget) -> None:
+        if is_ipv4(target.ip):
+            self.logger.debug(f"Probing v4 {target.ip}")
+            self.probe_v4(target)
+        elif is_ipv6_ll(target.ip):
+            self.logger.debug(f"Probing v6 ll {target.ip}")
+            self.probe_v6_ll(target)
+        elif is_ipv6(target.ip):
+            self.logger.debug(f"Probing v6 {target.ip}")
+            self.probe_v6(target)
+
+    def probe_targets(self) -> None:
+        for target in self.targets:
+            self.logger.info(f"Probing target {target}")
+            self.probe_single_target(target)
+
+    def probe(self) -> None:
+        self.discover_targets_by_browsing()
+        self.discover_targets_by_neighbor()
+        self.probe_targets()
+        self.get_general_details()
diff --git a/src/tools/interop/idt/probe/runner.py b/src/tools/interop/idt/probe/runner.py
new file mode 100644
index 00000000000000..ac373178a0ef69
--- /dev/null
+++ b/src/tools/interop/idt/probe/runner.py
@@ -0,0 +1,28 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from utils.host_platform import is_mac
+
+from .linux import ProberLinuxHost
+from .mac import ProberMacHost
+
+
+def run_probes(artifact_dir: str, dnssd_dir: str) -> None:
+    if is_mac():
+        ProberMacHost(artifact_dir, dnssd_dir).probe()
+    else:
+        ProberLinuxHost(artifact_dir, dnssd_dir).probe()
diff --git a/src/tools/interop/idt/requirements.txt b/src/tools/interop/idt/requirements.txt
index fa7d89f7cd3206..dac2cdf0b7cae5 100644
--- a/src/tools/interop/idt/requirements.txt
+++ b/src/tools/interop/idt/requirements.txt
@@ -1,3 +1,4 @@
 zeroconf==0.74.0
 bleak==0.21.1
-mobly==1.12.2
+psutil==5.9.6
+termcolor==2.3.0
diff --git a/src/tools/interop/idt/scripts/alias.sh b/src/tools/interop/idt/scripts/alias.sh
index 9ecbc869e4ab78..e7b598bc3de5da 100644
--- a/src/tools/interop/idt/scripts/alias.sh
+++ b/src/tools/interop/idt/scripts/alias.sh
@@ -41,6 +41,8 @@ alias idt_vars="idt_go && source idt/scripts/vars.sh"
 alias idt_clean_artifacts="idt_go && source idt/scripts/clean_artifacts.sh"
 alias idt_clean_all="idt_go && source idt/scripts/clean_all.sh"
 alias idt_create_vars="idt_go && source idt/scripts/create_vars.sh"
+alias idt_check_child="idt_go && source idt/scripts/check_child.sh"
+alias idt_clean_child="idt_go && source idt/scripts/clean_child.sh"
 
 alias idt="idt_go && \
 if [ -z $PYTHONPYCACHEPREFIX ]; then export PYTHONPYCACHEPREFIX=$IDT_SRC_PARENT/idt/pycache; fi && \
diff --git a/src/tools/interop/idt/scripts/check_child.sh b/src/tools/interop/idt/scripts/check_child.sh
new file mode 100644
index 00000000000000..8a54cd2e65f6db
--- /dev/null
+++ b/src/tools/interop/idt/scripts/check_child.sh
@@ -0,0 +1,18 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+sudo ps -axf | grep -E "(tcpd|adb)"
diff --git a/src/tools/interop/idt/scripts/clean_all.sh b/src/tools/interop/idt/scripts/clean_all.sh
index 94b9521cfbc92a..d7703ab29d57cc 100644
--- a/src/tools/interop/idt/scripts/clean_all.sh
+++ b/src/tools/interop/idt/scripts/clean_all.sh
@@ -16,7 +16,8 @@
 #
 
 cd idt
-rm -R venv/
-rm -R pycache/
+sudo rm -R venv/
+sudo rm -R pycache/
 sudo rm -R IDT_ARTIFACTS/
+sudo find . -type d -name "BUILD" -delete
 cd ..
diff --git a/src/tools/interop/idt/scripts/clean_child.sh b/src/tools/interop/idt/scripts/clean_child.sh
new file mode 100644
index 00000000000000..fc4b2e21e438d0
--- /dev/null
+++ b/src/tools/interop/idt/scripts/clean_child.sh
@@ -0,0 +1,19 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+sudo killall tcpdump
+sudo killall adb
diff --git a/src/tools/interop/idt/scripts/compilers.sh b/src/tools/interop/idt/scripts/compilers.sh
new file mode 100644
index 00000000000000..ee50284fd6f489
--- /dev/null
+++ b/src/tools/interop/idt/scripts/compilers.sh
@@ -0,0 +1,21 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+sudo apt-get install gcc-arm-linux-gnueabi
+sudo apt-get install gcc-aarch64-linux-gnu
+sudo apt-get install byacc
+sudo apt-get install flex
diff --git a/src/tools/interop/idt/utils/__init__.py b/src/tools/interop/idt/utils/__init__.py
new file mode 100644
index 00000000000000..43ab9acb8a5558
--- /dev/null
+++ b/src/tools/interop/idt/utils/__init__.py
@@ -0,0 +1,25 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+from . import artifact, host_platform, log, shell
+
+__all__ = [
+    'artifact',
+    'host_platform',
+    'log',
+    'shell',
+]
diff --git a/src/tools/interop/idt/capture/file_utils.py b/src/tools/interop/idt/utils/artifact.py
similarity index 61%
rename from src/tools/interop/idt/capture/file_utils.py
rename to src/tools/interop/idt/utils/artifact.py
index 29aabfe6133193..8749b1ab84880b 100644
--- a/src/tools/interop/idt/capture/file_utils.py
+++ b/src/tools/interop/idt/utils/artifact.py
@@ -15,14 +15,13 @@
 #    limitations under the License.
 #
 
+import os
 import time
 from pathlib import Path
-from typing import TextIO
 
+from . import log
 
-def add_border(to_print: str) -> str:
-    """Add star borders to important strings"""
-    return '\n' + '*' * len(to_print) + '\n' + to_print
+logger = log.get_logger(__file__)
 
 
 def create_file_timestamp() -> str:
@@ -30,23 +29,11 @@ def create_file_timestamp() -> str:
     return time.strftime("%Y%m%d_%H%M%S")
 
 
-def create_standard_log_name(name: str, ext: str) -> str:
+def create_standard_log_name(name: str, ext: str, parent: str = "") -> str:
     """Returns the name argument wrapped as a standard log name"""
     ts = create_file_timestamp()
-    return f'idt_{ts}_{name}.{ext}'
+    return os.path.join(parent, f'idt_{ts}_{name}.{ext}')
 
 
 def safe_mkdir(dir_name: str) -> None:
     Path(dir_name).mkdir(parents=True, exist_ok=True)
-
-
-def print_and_write(to_print: str, file: TextIO) -> None:
-    print(to_print)
-    file.write(to_print)
-
-
-def border_print(to_print: str, important: bool = False) -> None:
-    len_borders = 64
-    border = f"\n{'_' * len_borders}\n"
-    i_border = f"\n{'!' * len_borders}\n" if important else ""
-    print(f"{border}{i_border}{to_print}{i_border}{border}")
diff --git a/src/tools/interop/idt/utils/host_platform.py b/src/tools/interop/idt/utils/host_platform.py
new file mode 100644
index 00000000000000..fd6425666104d9
--- /dev/null
+++ b/src/tools/interop/idt/utils/host_platform.py
@@ -0,0 +1,90 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import os
+import platform as host_platform
+import sys
+
+from utils import log
+from utils.log import border_print
+from utils.shell import Bash
+
+import config
+
+logger = log.get_logger(__file__)
+
+
+def is_mac():
+    p = host_platform.platform().lower()
+    return "darwin" in p or "mac" in p
+
+
+def get_ll_interface():
+    # TODO: Makes too many assumptions
+    if is_mac():
+        return "en0"
+    net_interface_path = "/sys/class/net/"
+    available_net_interfaces = os.listdir(net_interface_path) \
+        if os.path.exists(net_interface_path) \
+        else []
+    for interface in available_net_interfaces:
+        if "wl" in interface:
+            return interface
+
+
+def get_available_interfaces():
+    net_interface_path = "/sys/class/net/"
+    available_net_interfaces = os.listdir(net_interface_path) \
+        if os.path.exists(net_interface_path) \
+        else []
+    available_net_interfaces.append("any")
+    return available_net_interfaces
+
+
+def command_is_available(cmd_name) -> bool:
+    cmd = Bash(f"which {cmd_name}", sync=True, capture_output=True)
+    cmd.start_command()
+    return cmd.finished_success()
+
+
+def verify_host_dependencies(deps: [str]) -> None:
+    if not command_is_available("which"):
+        # TODO: Check $PATH explicitly as well
+        logger.critical("which is required to verify host dependencies, exiting as its not available!")
+        sys.exit(1)
+    missing_deps = []
+    for dep in deps:
+        logger.info(f"Verifying host dependency {dep}")
+        if not command_is_available(dep):
+            missing_deps.append(dep)
+    if missing_deps:
+        for missing_dep in missing_deps:
+            border_print(f"Missing dependency, please install {missing_dep}!", important=True)
+        sys.exit(1)
+
+
+def verify_py_version() -> None:
+    py_version_major = sys.version_info[0]
+    py_version_minor = sys.version_info[1]
+    have = f"{py_version_major}.{py_version_minor}"
+    need = f"{config.py_major_version}.{config.py_minor_version}"
+    if not (py_version_major == config.py_major_version
+            and py_version_minor >= config.py_minor_version):
+        logger.critical(
+            f"IDT requires python >= {need} but you have {have}")
+        logger.critical("Please install the correct version, delete idt/venv, and re-run!")
+        sys.exit(1)
diff --git a/src/tools/interop/idt/utils/log.py b/src/tools/interop/idt/utils/log.py
new file mode 100644
index 00000000000000..73dc4e0d876f65
--- /dev/null
+++ b/src/tools/interop/idt/utils/log.py
@@ -0,0 +1,79 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import logging
+from typing import TextIO
+
+from termcolor import colored
+
+import config
+
+_CONFIG_LEVEL = config.log_level
+
+_FORMAT_PRE_FSTRING = "%(asctime)s %(levelname)s {%(module)s} [%(funcName)s] "
+_FORMAT_PRE = colored(_FORMAT_PRE_FSTRING, "blue") if config.enable_color else _FORMAT_PRE_FSTRING
+_FORMAT_POST = "%(message)s"
+_FORMAT_NO_COLOR = _FORMAT_PRE_FSTRING+_FORMAT_POST
+
+FORMATS = {
+    logging.DEBUG: _FORMAT_PRE + colored(_FORMAT_POST, "blue"),
+    logging.INFO: _FORMAT_PRE + colored(_FORMAT_POST, "green"),
+    logging.WARNING: _FORMAT_PRE + colored(_FORMAT_POST, "yellow"),
+    logging.ERROR: _FORMAT_PRE + colored(_FORMAT_POST, "red", attrs=["bold"]),
+    logging.CRITICAL: _FORMAT_PRE + colored(_FORMAT_POST, "red",  "on_yellow", attrs=["bold"]),
+}
+
+
+class LoggingFormatter(logging.Formatter):
+
+    def format(self, record):
+        log_fmt = FORMATS.get(record.levelno) if config.enable_color else _FORMAT_NO_COLOR
+        formatter = logging.Formatter(log_fmt)
+        return formatter.format(record)
+
+
+def get_logger(logger_name) -> logging.Logger:
+    logger = logging.getLogger(logger_name)
+    logger.setLevel(_CONFIG_LEVEL)
+    ch = logging.StreamHandler()
+    ch.setLevel(_CONFIG_LEVEL)
+    ch.setFormatter(LoggingFormatter())
+    logger.addHandler(ch)
+    logger.propagate = False
+    return logger
+
+
+def border_print(to_print: str, important: bool = False) -> None:
+    len_borders = len(to_print)
+    border = f"\n{'_' * len_borders}\n"
+    i_border = f"\n{'!' * len_borders}\n" if important else ""
+    to_print = f"{border}{i_border}{to_print}{i_border}{border}"
+    if config.enable_color:
+        to_print = colored(to_print, "magenta")
+    print(to_print)
+
+
+def print_and_write(to_print: str, file: TextIO) -> None:
+    if config.enable_color:
+        print(colored(to_print, "green"))
+    else:
+        print(to_print)
+    file.write(to_print)
+
+
+def add_border(to_print: str) -> str:
+    return '\n' + '*' * len(to_print) + '\n' + to_print
diff --git a/src/tools/interop/idt/utils/shell.py b/src/tools/interop/idt/utils/shell.py
new file mode 100644
index 00000000000000..e2b0d27a58d800
--- /dev/null
+++ b/src/tools/interop/idt/utils/shell.py
@@ -0,0 +1,122 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import multiprocessing
+import shlex
+import subprocess
+
+import psutil
+
+from . import log
+
+logger = log.get_logger(__file__)
+
+
+class Bash:
+
+    def __init__(self, command: str, sync: bool = False,
+                 capture_output: bool = False,
+                 cwd: str = None) -> None:
+        """
+        Run a bash command as a sub process
+        :param command: Command to run
+        :param sync: If True, wait for command to terminate upon start_command()
+        :param capture_output: Only applies to sync; if True, store and suppress stdout and stderr
+        :param cwd: Set working directory of command
+        """
+        self.logger = logger
+        self.command: str = command
+        self.sync = sync
+        self.capture_output = capture_output
+        self.cwd = cwd
+
+        self.args: list[str] = []
+        self._init_args()
+        self.proc: None | subprocess.CompletedProcess | subprocess.Popen = None
+
+    def _init_args(self) -> None:
+        command_escaped = self.command.replace('"', '\"')
+        self.args = shlex.split(f'/bin/bash -c "{command_escaped}"')
+
+    def command_is_running(self) -> bool:
+        return self.proc is not None and self.proc.poll() is None
+
+    def get_captured_output(self) -> str:
+        return "" if not self.capture_output or not self.sync \
+            else self.proc.stdout.decode().strip()
+
+    def start_command(self) -> None:
+        if self.proc is None:
+            if self.sync:
+                self.proc = subprocess.run(self.args, capture_output=self.capture_output, cwd=self.cwd)
+            else:
+                self.proc = subprocess.Popen(self.args, cwd=self.cwd, stdin=subprocess.PIPE)
+        else:
+            self.logger.warning(f'"{self.command}" start requested more than once for same Bash instance!')
+
+    def term_with_sudo(self, proc: multiprocessing.Process) -> None:
+        self.logger.debug(f"SIGTERM {proc.pid} with sudo")
+        Bash(f"sudo kill {proc.pid}", sync=True).start_command()
+
+    def kill_with_sudo(self, proc: multiprocessing.Process) -> None:
+        self.logger.debug(f"SIGKILL {proc.pid} with sudo")
+        Bash(f"sudo kill -9 {proc.pid}", sync=True).start_command()
+
+    def term(self, proc: multiprocessing.Process) -> None:
+        if "sudo" in self.command:
+            self.term_with_sudo(proc)
+        else:
+            proc.terminate()
+
+    def kill(self, proc: multiprocessing.Process) -> None:
+        if "sudo" in self.command:
+            self.kill_with_sudo(proc)
+        else:
+            proc.kill()
+
+    def stop_single_proc(self, proc: multiprocessing.Process) -> None:
+        self.logger.debug(f"Killing process {proc.pid}")
+        try:
+            self.logger.debug("Sending SIGTERM")
+            self.term(proc)
+            proc.wait(3)
+        except psutil.TimeoutExpired:
+            self.logger.error("SIGTERM timeout expired")
+            try:
+                self.logger.debug("Sending SIGKILL")
+                self.kill(proc)
+                proc.wait(3)
+            except psutil.TimeoutExpired:
+                self.logger.critical(f"SIGKILL timeout expired, could not kill pid  {proc.pid}")
+
+    def stop_command(self) -> None:
+        if self.command_is_running():
+            psutil_proc = psutil.Process(self.proc.pid)
+            suffix = f"{psutil_proc.pid} for command {self.command}"
+            self.logger.debug(f"Stopping children of {suffix}")
+            for child_proc in psutil_proc.children(recursive=True):
+                self.stop_single_proc(child_proc)
+            self.logger.debug(f"Killing root proc {suffix}")
+            self.stop_single_proc(psutil_proc)
+        else:
+            self.logger.warning(f'{self.command} stop requested while not running')
+
+    def finished_success(self) -> bool:
+        if not self.sync:
+            return not self.command_is_running() and self.proc.returncode == 0
+        else:
+            return self.proc is not None and self.proc.returncode == 0
diff --git a/src/tracing/json/json_tracing.cpp b/src/tracing/json/json_tracing.cpp
index b85bb4545eb549..6c651b3190b485 100644
--- a/src/tracing/json/json_tracing.cpp
+++ b/src/tracing/json/json_tracing.cpp
@@ -376,6 +376,8 @@ void JsonBackend::LogNodeDiscovered(NodeDiscoveredInfo & info)
         result["mrp"]["active_retransmit_timeout_ms"] = info.result->mrpRemoteConfig.mActiveRetransTimeout.count();
         result["mrp"]["active_threshold_time_ms"]     = info.result->mrpRemoteConfig.mActiveThresholdTime.count();
 
+        result["isICDOperatingAsLIT"] = info.result->isICDOperatingAsLIT;
+
         value["result"] = result;
     }
 
diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn
index f1f7ef534322a7..33a8f05f8c64df 100644
--- a/src/transport/BUILD.gn
+++ b/src/transport/BUILD.gn
@@ -60,7 +60,6 @@ static_library("transport") {
     "${chip_root}/src/crypto",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/core",
-    "${chip_root}/src/lib/core:chip_buildconfig",
     "${chip_root}/src/lib/dnssd",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform",
diff --git a/src/transport/GroupSession.h b/src/transport/GroupSession.h
index bd3ab1931c2c7c..f20ff069ab029f 100644
--- a/src/transport/GroupSession.h
+++ b/src/transport/GroupSession.h
@@ -57,11 +57,12 @@ class IncomingGroupSession : public Session, public ReferenceCounted<IncomingGro
         return subjectDescriptor;
     }
 
-    bool RequireMRP() const override { return false; }
+    bool AllowsMRP() const override { return false; }
+    bool AllowsLargePayload() const override { return false; }
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const override
+    const SessionParameters & GetRemoteSessionParameters() const override
     {
-        static const ReliableMessageProtocolConfig cfg(GetDefaultMRPConfig());
+        static const SessionParameters cfg(GetDefaultMRPConfig());
         VerifyOrDie(false);
         return cfg;
     }
@@ -108,11 +109,12 @@ class OutgoingGroupSession : public Session, public ReferenceCounted<OutgoingGro
         return Access::SubjectDescriptor(); // no subject exists for outgoing group session.
     }
 
-    bool RequireMRP() const override { return false; }
+    bool AllowsMRP() const override { return false; }
+    bool AllowsLargePayload() const override { return false; }
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const override
+    const SessionParameters & GetRemoteSessionParameters() const override
     {
-        static const ReliableMessageProtocolConfig cfg(GetDefaultMRPConfig());
+        static const SessionParameters cfg(GetDefaultMRPConfig());
         VerifyOrDie(false);
         return cfg;
     }
diff --git a/src/transport/SecureSession.cpp b/src/transport/SecureSession.cpp
index 9748fdcbb1c839..c96f9cdf908756 100644
--- a/src/transport/SecureSession.cpp
+++ b/src/transport/SecureSession.cpp
@@ -27,7 +27,7 @@ void SecureSessionDeleter::Release(SecureSession * entry)
 }
 
 void SecureSession::Activate(const ScopedNodeId & localNode, const ScopedNodeId & peerNode, CATValues peerCATs,
-                             uint16_t peerSessionId, const ReliableMessageProtocolConfig & config)
+                             uint16_t peerSessionId, const SessionParameters & sessionParameters)
 {
     VerifyOrDie(mState == State::kEstablishing);
     VerifyOrDie(peerNode.GetFabricIndex() == localNode.GetFabricIndex());
@@ -40,11 +40,11 @@ void SecureSession::Activate(const ScopedNodeId & localNode, const ScopedNodeId
     VerifyOrDie(!((mSecureSessionType == Type::kCASE) &&
                   (!IsOperationalNodeId(peerNode.GetNodeId()) || !IsOperationalNodeId(localNode.GetNodeId()))));
 
-    mPeerNodeId      = peerNode.GetNodeId();
-    mLocalNodeId     = localNode.GetNodeId();
-    mPeerCATs        = peerCATs;
-    mPeerSessionId   = peerSessionId;
-    mRemoteMRPConfig = config;
+    mPeerNodeId          = peerNode.GetNodeId();
+    mLocalNodeId         = localNode.GetNodeId();
+    mPeerCATs            = peerCATs;
+    mPeerSessionId       = peerSessionId;
+    mRemoteSessionParams = sessionParameters;
     SetFabricIndex(peerNode.GetFabricIndex());
     MarkActiveRx(); // Initialize SessionTimestamp and ActiveTimestamp per spec.
 
diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h
index 185ba1f5e86275..b18cc05b4ce716 100644
--- a/src/transport/SecureSession.h
+++ b/src/transport/SecureSession.h
@@ -73,7 +73,7 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
                   const ReliableMessageProtocolConfig & config) :
         mTable(table),
         mState(State::kEstablishing), mSecureSessionType(secureSessionType), mLocalNodeId(localNodeId), mPeerNodeId(peerNodeId),
-        mPeerCATs(peerCATs), mLocalSessionId(localSessionId), mPeerSessionId(peerSessionId), mRemoteMRPConfig(config)
+        mPeerCATs(peerCATs), mLocalSessionId(localSessionId), mPeerSessionId(peerSessionId), mRemoteSessionParams(config)
     {
         MoveToState(State::kActive);
         Retain(); // Put the test session in Active state. This ref is released inside MarkForEviction
@@ -102,7 +102,7 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
      *   discovered during session establishment.
      */
     void Activate(const ScopedNodeId & localNode, const ScopedNodeId & peerNode, CATValues peerCATs, uint16_t peerSessionId,
-                  const ReliableMessageProtocolConfig & config);
+                  const SessionParameters & sessionParameters);
 
     ~SecureSession() override
     {
@@ -156,15 +156,19 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
 
     Access::SubjectDescriptor GetSubjectDescriptor() const override;
 
-    bool RequireMRP() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kUdp; }
+    bool AllowsMRP() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kUdp; }
+
+    bool AllowsLargePayload() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kTcp; }
 
     System::Clock::Milliseconds32 GetAckTimeout() const override
     {
         switch (mPeerAddress.GetTransportType())
         {
-        case Transport::Type::kUdp:
-            return GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout, mRemoteMRPConfig.mIdleRetransTimeout,
-                                            GetLastPeerActivityTime(), mRemoteMRPConfig.mActiveThresholdTime);
+        case Transport::Type::kUdp: {
+            const ReliableMessageProtocolConfig & remoteMRPConfig = mRemoteSessionParams.GetMRPConfig();
+            return GetRetransmissionTimeout(remoteMRPConfig.mActiveRetransTimeout, remoteMRPConfig.mIdleRetransTimeout,
+                                            GetLastPeerActivityTime(), remoteMRPConfig.mActiveThresholdTime);
+        }
         case Transport::Type::kTcp:
             return System::Clock::Seconds16(30);
         case Transport::Type::kBle:
@@ -186,9 +190,9 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
 
     const CATValues & GetPeerCATs() const { return mPeerCATs; }
 
-    void SetRemoteMRPConfig(const ReliableMessageProtocolConfig & config) { mRemoteMRPConfig = config; }
+    void SetRemoteSessionParameters(const SessionParameters & sessionParams) { mRemoteSessionParams = sessionParams; }
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const override { return mRemoteMRPConfig; }
+    const SessionParameters & GetRemoteSessionParameters() const override { return mRemoteSessionParams; }
 
     uint16_t GetLocalSessionId() const { return mLocalSessionId; }
     uint16_t GetPeerSessionId() const { return mPeerSessionId; }
@@ -312,7 +316,7 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
     /// Timestamp of last rx. @see ActiveTimestamp in the spec
     System::Clock::Timestamp mLastPeerActivityTime = System::SystemClock().GetMonotonicTimestamp();
 
-    ReliableMessageProtocolConfig mRemoteMRPConfig = GetDefaultMRPConfig();
+    SessionParameters mRemoteSessionParams;
     CryptoContext mCryptoContext;
     SessionMessageCounter mSessionMessageCounter;
 };
diff --git a/src/transport/Session.h b/src/transport/Session.h
index 2118b99f6f39d2..f211a610386bf2 100644
--- a/src/transport/Session.h
+++ b/src/transport/Session.h
@@ -26,6 +26,7 @@
 #include <lib/support/ReferenceCountedHandle.h>
 #include <messaging/ReliableMessageProtocolConfig.h>
 #include <platform/LockTracker.h>
+#include <protocols/secure_channel/SessionParameters.h>
 #include <transport/SessionDelegate.h>
 
 namespace chip {
@@ -191,13 +192,16 @@ class Session
 
     virtual bool IsActiveSession() const = 0;
 
-    virtual ScopedNodeId GetPeer() const                                     = 0;
-    virtual ScopedNodeId GetLocalScopedNodeId() const                        = 0;
-    virtual Access::SubjectDescriptor GetSubjectDescriptor() const           = 0;
-    virtual bool RequireMRP() const                                          = 0;
-    virtual const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const = 0;
-    virtual System::Clock::Timestamp GetMRPBaseTimeout() const               = 0;
-    virtual System::Clock::Milliseconds32 GetAckTimeout() const              = 0;
+    virtual ScopedNodeId GetPeer() const                                 = 0;
+    virtual ScopedNodeId GetLocalScopedNodeId() const                    = 0;
+    virtual Access::SubjectDescriptor GetSubjectDescriptor() const       = 0;
+    virtual bool AllowsMRP() const                                       = 0;
+    virtual bool AllowsLargePayload() const                              = 0;
+    virtual const SessionParameters & GetRemoteSessionParameters() const = 0;
+    virtual System::Clock::Timestamp GetMRPBaseTimeout() const           = 0;
+    virtual System::Clock::Milliseconds32 GetAckTimeout() const          = 0;
+
+    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return GetRemoteSessionParameters().GetMRPConfig(); }
 
     // Returns a suggested timeout value based on the round-trip time it takes for the peer at the other end of the session to
     // receive a message, process it and send it back. This is computed based on the session type, the type of transport, sleepy
diff --git a/src/transport/TraceMessage.h b/src/transport/TraceMessage.h
index d2be9478c53408..943c9c6d7de0c5 100644
--- a/src/transport/TraceMessage.h
+++ b/src/transport/TraceMessage.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <core/CHIPBuildConfig.h>
+#include <lib/core/CHIPConfig.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/Session.h>
 #include <transport/raw/MessageHeader.h>
diff --git a/src/transport/UnauthenticatedSessionTable.h b/src/transport/UnauthenticatedSessionTable.h
index 1a698db312d52e..48e2025d10a487 100644
--- a/src/transport/UnauthenticatedSessionTable.h
+++ b/src/transport/UnauthenticatedSessionTable.h
@@ -49,7 +49,7 @@ class UnauthenticatedSession : public Session, public ReferenceCounted<Unauthent
         mEphemeralInitiatorNodeId(ephemeralInitiatorNodeID), mSessionRole(sessionRole),
         mLastActivityTime(System::SystemClock().GetMonotonicTimestamp()),
         mLastPeerActivityTime(System::Clock::kZero), // Start at zero to default to IDLE state
-        mRemoteMRPConfig(config)
+        mRemoteSessionParams(config)
     {}
     ~UnauthenticatedSession() override { VerifyOrDie(GetReferenceCount() == 0); }
 
@@ -83,15 +83,19 @@ class UnauthenticatedSession : public Session, public ReferenceCounted<Unauthent
         return Access::SubjectDescriptor(); // return an empty ISD for unauthenticated session.
     }
 
-    bool RequireMRP() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kUdp; }
+    bool AllowsMRP() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kUdp; }
+
+    bool AllowsLargePayload() const override { return GetPeerAddress().GetTransportType() == Transport::Type::kTcp; }
 
     System::Clock::Milliseconds32 GetAckTimeout() const override
     {
         switch (mPeerAddress.GetTransportType())
         {
-        case Transport::Type::kUdp:
-            return GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout, mRemoteMRPConfig.mIdleRetransTimeout,
-                                            GetLastPeerActivityTime(), mRemoteMRPConfig.mActiveThresholdTime);
+        case Transport::Type::kUdp: {
+            const ReliableMessageProtocolConfig & remoteMRPConfig = mRemoteSessionParams.GetMRPConfig();
+            return GetRetransmissionTimeout(remoteMRPConfig.mActiveRetransTimeout, remoteMRPConfig.mIdleRetransTimeout,
+                                            GetLastPeerActivityTime(), remoteMRPConfig.mActiveThresholdTime);
+        }
         case Transport::Type::kTcp:
             return System::Clock::Seconds16(30);
         case Transport::Type::kBle:
@@ -128,9 +132,9 @@ class UnauthenticatedSession : public Session, public ReferenceCounted<Unauthent
         return IsPeerActive() ? GetRemoteMRPConfig().mActiveRetransTimeout : GetRemoteMRPConfig().mIdleRetransTimeout;
     }
 
-    void SetRemoteMRPConfig(const ReliableMessageProtocolConfig & config) { mRemoteMRPConfig = config; }
+    void SetRemoteSessionParameters(const SessionParameters & sessionParams) { mRemoteSessionParams = sessionParams; }
 
-    const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const override { return mRemoteMRPConfig; }
+    const SessionParameters & GetRemoteSessionParameters() const override { return mRemoteSessionParams; }
 
     PeerMessageCounter & GetPeerMessageCounter() { return mPeerMessageCounter; }
 
@@ -157,7 +161,7 @@ class UnauthenticatedSession : public Session, public ReferenceCounted<Unauthent
     PeerAddress mPeerAddress;
     System::Clock::Timestamp mLastActivityTime;     ///< Timestamp of last tx or rx
     System::Clock::Timestamp mLastPeerActivityTime; ///< Timestamp of last rx
-    ReliableMessageProtocolConfig mRemoteMRPConfig;
+    SessionParameters mRemoteSessionParams;
     PeerMessageCounter mPeerMessageCounter;
 };
 
diff --git a/third_party/asr/asr550x/BUILD.gn b/third_party/asr/asr550x/BUILD.gn
index 4f9364a80dc5b5..480935ea1eaa93 100755
--- a/third_party/asr/asr550x/BUILD.gn
+++ b/third_party/asr/asr550x/BUILD.gn
@@ -28,7 +28,6 @@ config("asr_sdk_config") {
   _include_dirs = [
     "${asr_sdk_build_root}/asr_sdk/config",
     "${asr_sdk_build_root}/asr_sdk/config/lwip_if",
-    "${asr_sdk_build_root}/asr_sdk/matter",
     "${asr_sdk_build_root}/asr_sdk/lib",
     "${asr_sdk_build_root}/asr_sdk/lib/security",
     "${asr_sdk_build_root}/asr_sdk/version",
diff --git a/third_party/asr/asr550x/asr_sdk b/third_party/asr/asr550x/asr_sdk
index 9a1bc5e475786a..f2c231f00f647d 160000
--- a/third_party/asr/asr550x/asr_sdk
+++ b/third_party/asr/asr550x/asr_sdk
@@ -1 +1 @@
-Subproject commit 9a1bc5e475786ad4f857924afe2b4c0d09fce5c3
+Subproject commit f2c231f00f647d35d484b0d16b29d4bbba7a97c3
diff --git a/third_party/asr/asr550x/asr_sdk.gni b/third_party/asr/asr550x/asr_sdk.gni
old mode 100644
new mode 100755
index d4e12c226871a8..cb2e18724b10e1
--- a/third_party/asr/asr550x/asr_sdk.gni
+++ b/third_party/asr/asr550x/asr_sdk.gni
@@ -92,9 +92,6 @@ template("asr_sdk_sources") {
       "../../components/freertos/Source/portable/MemMang/heap_4.c",
       "../../components/freertos/Source/portable/GCC/ARM_CM4F/port.c",
 
-      #matter
-      "matter/asr_factory_config.c",
-
       #elog
       "common/easylogger/elog_async.c",
       "common/easylogger/elog_buf.c",
diff --git a/third_party/asr/asr582x/BUILD.gn b/third_party/asr/asr582x/BUILD.gn
index 69b730218b87fa..b4ac418b3169f4 100755
--- a/third_party/asr/asr582x/BUILD.gn
+++ b/third_party/asr/asr582x/BUILD.gn
@@ -22,6 +22,8 @@ declare_args() {
 
   # Must be "4M" or "2M". For matter, ASR582X use 4M flash default.
   asr_flash_max_size = "4M"
+
+  asr_enable_secureboot = false
 }
 
 assert(asr_target_project != "", "asr_target_project must be specified")
@@ -31,7 +33,6 @@ config("asr_sdk_config") {
   _include_dirs = [
     "${asr_sdk_build_root}/asr_sdk/config",
     "${asr_sdk_build_root}/asr_sdk/config/lwip_if",
-    "${asr_sdk_build_root}/asr_sdk/matter",
     "${asr_sdk_build_root}/asr_sdk/lib/wifi",
     "${asr_sdk_build_root}/asr_sdk/lib/ble",
     "${asr_sdk_build_root}/asr_sdk/lib/sys",
@@ -141,6 +142,10 @@ config("asr_sdk_config") {
     defines += [ "CFG_DUET_5822T" ]
   }
 
+  if (asr_enable_secureboot) {
+    defines += [ "_CFG_SECUREBOOT_" ]
+  }
+
   cflags_c = [
     "-mcpu=cortex-m4",
     "-Os",
diff --git a/third_party/asr/asr582x/asr_sdk b/third_party/asr/asr582x/asr_sdk
index 8f79b90d61768f..54644715210812 160000
--- a/third_party/asr/asr582x/asr_sdk
+++ b/third_party/asr/asr582x/asr_sdk
@@ -1 +1 @@
-Subproject commit 8f79b90d61768f453877d588a1bc8951e81a6818
+Subproject commit 54644715210812fa6c1e6e9433b5b824ba735c67
diff --git a/third_party/asr/asr582x/asr_sdk.gni b/third_party/asr/asr582x/asr_sdk.gni
index 188a561856ed4c..f083f4cf9f3787 100755
--- a/third_party/asr/asr582x/asr_sdk.gni
+++ b/third_party/asr/asr582x/asr_sdk.gni
@@ -101,9 +101,6 @@ template("asr_sdk_sources") {
       "demo/matter_demo/app/ble_demo/duet_hl_matter/app.c",
       "demo/matter_demo/app/ble_demo/duet_hl_matter/user_platform.c",
 
-      #matter
-      "matter/asr_factory_config.c",
-
       #elog
       "common/duet/easylogger/elog_async.c",
       "common/duet/easylogger/elog_buf.c",
diff --git a/third_party/asr/asr595x/BUILD.gn b/third_party/asr/asr595x/BUILD.gn
index aecf90a3ae10d3..272075049ce06b 100755
--- a/third_party/asr/asr595x/BUILD.gn
+++ b/third_party/asr/asr595x/BUILD.gn
@@ -28,7 +28,6 @@ config("asr_sdk_config") {
   _include_dirs = [
     "${asr_sdk_build_root}/asr_sdk/config",
     "${asr_sdk_build_root}/asr_sdk/config/lwip_if",
-    "${asr_sdk_build_root}/asr_sdk/matter",
     "${asr_sdk_build_root}/asr_sdk/at_cmd",
     "${asr_sdk_build_root}/asr_sdk/common/alto/inc",
     "${asr_sdk_build_root}/asr_sdk/common/alto/easylogger",
diff --git a/third_party/asr/asr595x/asr_sdk b/third_party/asr/asr595x/asr_sdk
index 651085cd81a112..c0e661fe67c069 160000
--- a/third_party/asr/asr595x/asr_sdk
+++ b/third_party/asr/asr595x/asr_sdk
@@ -1 +1 @@
-Subproject commit 651085cd81a1127116a43b84a507301201ef4cf8
+Subproject commit c0e661fe67c06937870bb82e55b9eefa8a3dd6d7
diff --git a/third_party/asr/asr595x/asr_sdk.gni b/third_party/asr/asr595x/asr_sdk.gni
index 45a7913ba5074a..074ded5d604d32 100755
--- a/third_party/asr/asr595x/asr_sdk.gni
+++ b/third_party/asr/asr595x/asr_sdk.gni
@@ -123,9 +123,6 @@ template("asr_sdk_sources") {
       "projects/alto_demo/ble_demo/duet_hl_matter/app.c",
       "projects/alto_demo/ble_demo/duet_hl_matter/user_platform.c",
 
-      #matter
-      "matter/asr_factory_config.c",
-
       #lwip
       "../../components/lwip_2.1.2/netif/ethernet.c",
       "../../components/lwip_2.1.2/port/sys_arch.c",
diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
index 41f4c7fb7310a0..f7c26e44c0dbbc 100644
--- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
@@ -403,6 +403,10 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/stage/blfdt/inc",
       "${bl_iot_sdk_root}/components/stage/cli/cli/include",
     ]
+
+    if (defined(invoker.enable_cdc_module) && invoker.enable_cdc_module) {
+      cflags_cc = [ "-Wno-shadow" ]
+    }
   }
 
   source_set("${sdk_target_name}_stage") {
diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo
index a57482f469fe2b..07ac148f70e1e3 160000
--- a/third_party/bouffalolab/repo
+++ b/third_party/bouffalolab/repo
@@ -1 +1 @@
-Subproject commit a57482f469fe2bbe4ab96b5b6034550ab61a302e
+Subproject commit 07ac148f70e1e3773f0ba0fa5ccad00bdf40e4d9
diff --git a/third_party/imgui/repo b/third_party/imgui/repo
index 001f102f3871a1..bce4db00bcccef 160000
--- a/third_party/imgui/repo
+++ b/third_party/imgui/repo
@@ -1 +1 @@
-Subproject commit 001f102f3871a175a2b83b6ef99babab7d579a1d
+Subproject commit bce4db00bcccef072cd5a596b2f123395561e869
diff --git a/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json
index e96bb45ea363fe..d55c68af229eda 100644
--- a/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json
+++ b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json
@@ -186,8 +186,9 @@
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src",
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src/bus_protocols",
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src/include",
-        "-I./libs/wifi-mw-core",
-        "-I./libs/wifi-mw-core/lwip-whd-port",
+        "-I./libs/lwip-network-interface-integration",
+        "-I./libs/lwip-network-interface-integration/source",
+        "-I./libs/lwip-network-interface-integration/include",
         "-I./ota/config"
     ],
     "defines": [
@@ -557,8 +558,8 @@
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_api.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_p2p.c",
-        "./libs/wifi-mw-core/lwip-whd-port/cy_lwip.c",
-        "./libs/wifi-mw-core/lwip-whd-port/cy_lwip_dhcp_server.c",
+        "./libs/lwip-network-interface-integration/source/cy_network_mw_core.c",
+        "./libs/lwip-network-interface-integration/source/cy_lwip_dhcp_server.c",
         "./libs/clib-support/TOOLCHAIN_GCC_ARM/cy_clib_support_newlib.c",
         "./libs/TARGET_CY8CKIT-062S2-43012/bluetooth/cybsp_bt_config.c",
         "./libs/TARGET_CY8CKIT-062S2-43012/cybsp.c",
@@ -616,7 +617,7 @@
         "./libs/secure-sockets/source/COMPONENT_MBEDTLS/cy_tls.c",
         "./libs/secure-sockets/source/COMPONENT_MBEDTLS/iot_crypto.c",
         "./libs/whd-bsp-integration/COMPONENT_LWIP/cy_network_buffer_lwip.c",
-        "./libs/wifi-connection-manager/source/COMPONENT_LWIP/cy_wcm.c",
+        "./libs/wifi-connection-manager/source/cy_wcm.c",
         "./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_aes_ctr_ccm.c",
         "./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_crypto.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/resources/clm/COMPONENT_43012/43012C0-mfgtest_clm_blob.c",
diff --git a/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json
index f31178e379e213..d8859347f78d72 100644
--- a/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json
+++ b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json
@@ -186,8 +186,9 @@
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src",
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src/bus_protocols",
         "-I./libs/wifi-host-driver/WiFi_Host_Driver/src/include",
-        "-I./libs/wifi-mw-core",
-        "-I./libs/wifi-mw-core/lwip-whd-port",
+        "-I./libs/lwip-network-interface-integration",
+        "-I./libs/lwip-network-interface-integration/source",
+        "-I./libs/lwip-network-interface-integration/include",
         "-I./ota/config"
     ],
     "defines": [
@@ -557,8 +558,8 @@
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_api.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_p2p.c",
-        "./libs/wifi-mw-core/lwip-whd-port/cy_lwip.c",
-        "./libs/wifi-mw-core/lwip-whd-port/cy_lwip_dhcp_server.c",
+        "./libs/lwip-network-interface-integration/source/cy_network_mw_core.c",
+        "./libs/lwip-network-interface-integration/source/cy_lwip_dhcp_server.c",
         "./libs/clib-support/TOOLCHAIN_GCC_ARM/cy_clib_support_newlib.c",
         "./libs/TARGET_CY8CKIT-062S2-43012/bluetooth/cybsp_bt_config.c",
         "./libs/TARGET_CY8CKIT-062S2-43012/cybsp.c",
@@ -616,7 +617,7 @@
         "./libs/secure-sockets/source/COMPONENT_MBEDTLS/cy_tls.c",
         "./libs/secure-sockets/source/COMPONENT_MBEDTLS/iot_crypto.c",
         "./libs/whd-bsp-integration/COMPONENT_LWIP/cy_network_buffer_lwip.c",
-        "./libs/wifi-connection-manager/source/COMPONENT_LWIP/cy_wcm.c",
+        "./libs/wifi-connection-manager/source/cy_wcm.c",
         "./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_aes_ctr_ccm.c",
         "./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_crypto.c",
         "./libs/wifi-host-driver/WiFi_Host_Driver/resources/clm/COMPONENT_43012/43012C0-mfgtest_clm_blob.c",
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities b/third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities
index 7b2f441dce5b74..25d71a735e2165 160000
--- a/third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities
+++ b/third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities
@@ -1 +1 @@
-Subproject commit 7b2f441dce5b748173cdf2a2f3871d7f4562a6e5
+Subproject commit 25d71a735e2165e777948469cd68c419fd75b3a5
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration b/third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
new file mode 160000
index 00000000000000..9e1660130f6113
--- /dev/null
+++ b/third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
@@ -0,0 +1 @@
+Subproject commit 9e1660130f611364c8772bc01147ddb2916c8d8d
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets b/third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets
index afb9546877915d..f7508f942e1c25 160000
--- a/third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets
+++ b/third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets
@@ -1 +1 @@
-Subproject commit afb9546877915d22f226afd1ddb3b15a1df38bd3
+Subproject commit f7508f942e1c25f74f5317422ed8289b2b930cb1
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager
index 43a355a7c42349..2567493ff15459 160000
--- a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager
+++ b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager
@@ -1 +1 @@
-Subproject commit 43a355a7c4234953f35860e9bf52ad1376bd62ba
+Subproject commit 2567493ff1545989e24f6415254a70d24b7a76e6
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
index 40a7ec2273a950..919d9213128860 160000
--- a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
+++ b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
@@ -1 +1 @@
-Subproject commit 40a7ec2273a950fbf89353d3eac98c5c1c2fd8cd
+Subproject commit 919d921312886057411efcf2271c99296f87afb8
diff --git a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core
deleted file mode 160000
index 1024dbf4a0ff97..00000000000000
--- a/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1024dbf4a0ff979a233169558d9b8ca7e79b34ee
diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo
index a1cbc02aeb2830..a4a7e0a49b1e46 160000
--- a/third_party/libwebsockets/repo
+++ b/third_party/libwebsockets/repo
@@ -1 +1 @@
-Subproject commit a1cbc02aeb28303a22781f3a37730fefbf2d6fce
+Subproject commit a4a7e0a49b1e464e09caf78257df3be8ab92fc4a
diff --git a/third_party/lwip/README.md b/third_party/lwip/README.md
new file mode 100644
index 00000000000000..9810aa4fa7b550
--- /dev/null
+++ b/third_party/lwip/README.md
@@ -0,0 +1,5 @@
+# Responsibilities
+
+It is Vendors responsibility to choose a version of lwIP, patch and test it
+accordingly for their products. Matter SDK team does not assume responsibility
+for Vendors using lwip from `third_party`.
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
index da635ab65760bf..60dcdd1686dbde 160000
--- a/third_party/mbedtls/repo
+++ b/third_party/mbedtls/repo
@@ -1 +1 @@
-Subproject commit da635ab65760bf1d6fe4abf0121aab2b6d2a5bad
+Subproject commit 60dcdd1686dbde47f2a8dfbe177a372541c37111
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
index 9766c4589f61b7..5fd8f04a48be1a 160000
--- a/third_party/nanopb/repo
+++ b/third_party/nanopb/repo
@@ -1 +1 @@
-Subproject commit 9766c4589f61b76807a0a394040c15a2d23ef24c
+Subproject commit 5fd8f04a48be1a250c3bbdc9f7c782ef2c372e74
diff --git a/third_party/openthread/ot-ifx b/third_party/openthread/ot-ifx
index 6bf0fdbd389794..8da150a2ef425d 160000
--- a/third_party/openthread/ot-ifx
+++ b/third_party/openthread/ot-ifx
@@ -1 +1 @@
-Subproject commit 6bf0fdbd38979435f66667ac0113d4fcee972a32
+Subproject commit 8da150a2ef425dc06a02e56c5019a3b75ed627d1
diff --git a/third_party/openthread/platforms/efr32/BUILD.gn b/third_party/openthread/platforms/efr32/BUILD.gn
index e3862a465670c3..f8f2dd4ac6f072 100644
--- a/third_party/openthread/platforms/efr32/BUILD.gn
+++ b/third_party/openthread/platforms/efr32/BUILD.gn
@@ -62,6 +62,7 @@ source_set("libopenthread-efr32") {
     "${sl_ot_efr32_root}/misc.c",
     "${sl_ot_efr32_root}/radio.c",
     "${sl_ot_efr32_root}/sleep.c",
+    "${sl_ot_efr32_root}/soft_source_match_table.c",
     "${sl_ot_efr32_root}/system.c",
   ]
 
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
index 837c7fd357d354..a8afffbd2aee3c 160000
--- a/third_party/openthread/repo
+++ b/third_party/openthread/repo
@@ -1 +1 @@
-Subproject commit 837c7fd357d3546f96b9b1433d8f1348371b242e
+Subproject commit a8afffbd2aee3cf43846b37f6d457dc63bb69d15
diff --git a/third_party/ot-br-posix/repo b/third_party/ot-br-posix/repo
index 69ce2a57f59142..86cb36e8d5a20f 160000
--- a/third_party/ot-br-posix/repo
+++ b/third_party/ot-br-posix/repo
@@ -1 +1 @@
-Subproject commit 69ce2a57f59142d705f29757721653e0b32610db
+Subproject commit 86cb36e8d5a20fb20a23ab9857faae125efca11d
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 90d97fa3b4292c..8b5d45a34aa2d4 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 90d97fa3b4292c39074e6f2b94dbd1cffa6ee318
+Subproject commit 8b5d45a34aa2d4b30a8624a6df946077c879b892
diff --git a/third_party/qpg_sdk/qpg_executable.gni b/third_party/qpg_sdk/qpg_executable.gni
index adfb2550a695ed..f759eddcea21ad 100644
--- a/third_party/qpg_sdk/qpg_executable.gni
+++ b/third_party/qpg_sdk/qpg_executable.gni
@@ -19,13 +19,6 @@ import("${build_root}/toolchain/flashable_executable.gni")
 import("${chip_root}/src/platform/device.gni")
 import("qpg_sdk.gni")
 
-declare_args() {
-  matter_device_vid = ""
-  matter_device_pid = ""
-  matter_device_software_version = ""
-  matter_device_software_version_string = ""
-}
-
 # Run the generator script that takes a .HEX file and adds the OTA header to it.
 #
 # This requires a Python script, given by ota_header_generator,
@@ -78,20 +71,6 @@ template("qpg_executable") {
     defines += invoker.defines
   }
 
-  # Overrule CHIPProjectConfig.h settings
-  if (matter_device_vid != "") {
-    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID=${matter_device_vid}" ]
-  }
-  if (matter_device_pid != "") {
-    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${matter_device_pid}" ]
-  }
-  if (matter_device_software_version_string != "") {
-    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\"${matter_device_software_version_string}\"" ]
-  }
-  if (matter_device_software_version != "") {
-    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=${matter_device_software_version}" ]
-  }
-
   # Copy flashing dependencies to the output directory so that the output
   # is collectively self-contained; this allows flashing to work reliably
   # even if the build and flashing steps take place on different machines
diff --git a/third_party/qpg_sdk/qpg_sdk.gni b/third_party/qpg_sdk/qpg_sdk.gni
index 67b0780d8fe731..d8898c3dabcf72 100644
--- a/third_party/qpg_sdk/qpg_sdk.gni
+++ b/third_party/qpg_sdk/qpg_sdk.gni
@@ -38,6 +38,12 @@ declare_args() {
 
   # Enable mbedtls HW acceleration
   mbedtls_alt_enabled = true
+
+  # OTA parameters
+  matter_device_vid = ""
+  matter_device_pid = ""
+  matter_device_software_version = ""
+  matter_device_software_version_string = ""
 }
 
 assert(qpg_sdk_root != "", "qpg_sdk_root must be specified")
@@ -92,6 +98,26 @@ template("qpg_sdk") {
     #MBed TLS built from third_party/mbedtls tree - OT config not used
     defines = [ "MBEDTLS_CONFIG_FILE=\"${qpg_target_ic}-mbedtls-config.h\"" ]
 
+    # Overrule CHIPProjectConfig.h settings
+    if (matter_device_vid != "") {
+      defines += [ "CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID=${matter_device_vid}" ]
+    }
+    if (matter_device_pid != "") {
+      defines += [ "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${matter_device_pid}" ]
+    }
+    if (matter_device_software_version_string != "") {
+      defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\"${matter_device_software_version_string}\"" ]
+    }
+    if (matter_device_software_version != "") {
+      defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=${matter_device_software_version}" ]
+    }
+
+    if (qpg_target_ic == "qpg6200") {
+      defines += [ "QPG_6200" ]
+    } else {
+      include_dirs += [ "${qpg_sdk_root}/Components/ThirdParty/Silex/cryptosoc/mbedtls_alt_3.3.0" ]
+    }
+
     if (mbedtls_alt_enabled) {
       defines += [ "QORVO_CRYPTO_ENGINE" ]
     } else {
diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo
index 6c3303e5155912..4c62599844eed5 160000
--- a/third_party/qpg_sdk/repo
+++ b/third_party/qpg_sdk/repo
@@ -1 +1 @@
-Subproject commit 6c3303e51559123a76d9e93ef902d57fc8302c32
+Subproject commit 4c62599844eed5e956b32b8d5d5dfdab5a77778b
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
index eb9a35240833c4..932ccebe79904c 100644
--- a/third_party/silabs/SiWx917_sdk.gni
+++ b/third_party/silabs/SiWx917_sdk.gni
@@ -23,15 +23,13 @@ import("${chip_root}/src/lib/lib.gni")
 import("silabs_board.gni")
 
 declare_args() {
-  wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk"
-  examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
-
   if (silabs_board == "BRD4338A") {
     sdk_support_board = "BRD4338A"
   } else {
     sdk_support_board = "BRD4325x"
   }
 }
+examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
 
 # Defines an siwx917 SDK build target.
 #
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index e928870cc7fba6..00329d05e88a5f 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -21,16 +21,13 @@ import("${chip_root}/src/app/icd/icd.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("silabs_board.gni")
 
-if (use_rs9116) {
-  wifi_sapi_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
-} else if (use_SiWx917) {
-  wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk"
-}
-
 declare_args() {
   # Location of the efr32 SDK.
   efr32_sdk_root = "${chip_root}/third_party/silabs/gecko_sdk"
   sdk_support_root = "${chip_root}/third_party/silabs/matter_support"
+  wiseconnect_sdk_root =
+      "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
+  wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk"
 
   # Build openthread with prebuilt silabs lib
   use_silabs_thread_lib = false
@@ -72,9 +69,19 @@ declare_args() {
   # Use SLC generated files
   slc_reuse_files = false
 }
+examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
+silabs_plat_efr32_wifi_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
 
 assert(efr32_sdk_root != "", "efr32_sdk_root must be specified")
 
+if (use_rs9116) {
+  assert(wiseconnect_sdk_root != "", "wiseconnect_sdk_root must be specified")
+}
+
+if (use_SiWx917) {
+  assert(wifi_sdk_root != "", "wifi_sdk_root must be specified")
+}
+
 declare_args() {
   sl_ot_libs_path = "${efr32_sdk_root}/protocol/openthread"
   sl_ot_platform_abstraction =
@@ -228,7 +235,7 @@ template("efr32_sdk") {
 
     if (chip_enable_ble_rs911x) {
       if (use_rs9116) {
-        _include_dirs += [ "${wifi_sapi_root}/sapi/include" ]
+        _include_dirs += [ "${wiseconnect_sdk_root}/sapi/include" ]
       } else {
         _include_dirs += [ "${wifi_sdk_root}/components/si91x/ble/inc" ]
       }
@@ -750,10 +757,10 @@ template("efr32_sdk") {
     if (chip_enable_ble_rs911x) {
       if (use_rs9116) {
         sources += [
-          "${wifi_sapi_root}/sapi/bluetooth/rsi_ble_gap_apis.c",
-          "${wifi_sapi_root}/sapi/bluetooth/rsi_ble_gatt_apis.c",
-          "${wifi_sapi_root}/sapi/bluetooth/rsi_bt_common_apis.c",
-          "${wifi_sapi_root}/sapi/driver/rsi_bt_ble.c",
+          "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_ble_gap_apis.c",
+          "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_ble_gatt_apis.c",
+          "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_bt_common_apis.c",
+          "${wiseconnect_sdk_root}/sapi/driver/rsi_bt_ble.c",
         ]
       } else {
         sources += [
diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni
index cd433ed61da49c..dd34fc6e04ef9a 100644
--- a/third_party/silabs/silabs_board.gni
+++ b/third_party/silabs/silabs_board.gni
@@ -51,6 +51,9 @@ declare_args() {
 
   # Self-provision enabled
   use_provision_channel = false
+
+  # Board required .rps file to flash instead of .s37
+  use_rps_extension = false
 }
 
 declare_args() {
@@ -111,6 +114,7 @@ if (silabs_board == "BRD4304A") {
   show_qr_code = false
   wifi_soc = true
   silabs_board_lower = "brd4325b"
+  use_rps_extension = true
 } else if (silabs_board == "BRD4325C") {
   silabs_family = "SiWx917-common"
   silabs_mcu = "SiWG917M111MGTBA"
@@ -119,6 +123,7 @@ if (silabs_board == "BRD4304A") {
   wifi_soc = true
   wifi_soc_common_flash = true
   silabs_board_lower = "brd4325c"
+  use_rps_extension = true
 } else if (silabs_board == "BRD4325G") {
   silabs_family = "SiWx917-common"
   silabs_mcu = "SiWG917M111MGTBA"
@@ -127,6 +132,7 @@ if (silabs_board == "BRD4304A") {
   wifi_soc = true
   wifi_soc_common_flash = true
   silabs_board_lower = "brd4325g"
+  use_rps_extension = true
 } else if (silabs_board == "BRD4338A") {
   silabs_family = "SiWx917-common"
   silabs_mcu = "SiWG917M111MGTBA"
@@ -135,6 +141,7 @@ if (silabs_board == "BRD4304A") {
   wifi_soc = true
   wifi_soc_common_flash = true
   silabs_board_lower = "brd4338a"
+  use_rps_extension = true
 } else if (silabs_board == "BRD4180A") {
   assert(
       false,
diff --git a/third_party/silabs/silabs_executable.gni b/third_party/silabs/silabs_executable.gni
index 5d3c73c0998906..a639a4d19ae62d 100644
--- a/third_party/silabs/silabs_executable.gni
+++ b/third_party/silabs/silabs_executable.gni
@@ -14,12 +14,40 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-
 import("${build_root}/toolchain/flashable_executable.gni")
+import("silabs_board.gni")
+
+template("generate_rps_file") {
+  forward_variables_from(invoker,
+                         [
+                           "conversion_input",
+                           "conversion_output",
+                           "deps",
+                         ])
+  action(target_name) {
+    # Check if variables exist
+    commander_path = getenv("COMMANDER_PATH")
+    if (commander_path == "") {
+      commander_path = "commander"
+    }
+
+    inputs = [ conversion_input ]
+    outputs = [ conversion_output ]
+
+    args = [
+      commander_path,
+      "rps",
+      "create",
+      rebase_path(conversion_output, root_build_dir),
+      "--app",
+      rebase_path(conversion_input, root_build_dir),
+    ]
+    script = "${build_root}/gn_run_binary.py"
+  }
+}
 
 template("silabs_executable") {
   output_base_name = get_path_info(invoker.output_name, "name")
-
   objcopy_image_name = output_base_name + ".s37"
   objcopy_image_format = "srec"
   objcopy = "arm-none-eabi-objcopy"
@@ -29,9 +57,13 @@ template("silabs_executable") {
   # even if the build and flashing steps take place on different machines
   # or in different containers.
 
+  if (use_rps_extension) {
+    flashing_image_name = output_base_name + ".rps"
+  }
+
   flashing_runtime_target = target_name + ".flashing_runtime"
   flashing_script_inputs = [
-    "${chip_root}/scripts/flashing/efr32_firmware_utils.py",
+    "${chip_root}/scripts/flashing/silabs_firmware_utils.py",
     "${chip_root}/scripts/flashing/firmware_utils.py",
   ]
   copy(flashing_runtime_target) {
@@ -42,7 +74,7 @@ template("silabs_executable") {
   flashing_script_generator =
       "${chip_root}/scripts/flashing/gen_flashing_script.py"
   flashing_script_name = output_base_name + ".flash.py"
-  flashing_options = [ "efr32" ]
+  flashing_options = [ "silabs" ]
 
   flash_target_name = target_name + ".flash_executable"
   flashbundle_name = "${target_name}.flashbundle.txt"
@@ -62,10 +94,25 @@ template("silabs_executable") {
     deps = [ ":$executable_target" ]
   }
 
+  if (use_rps_extension) {
+    rps_target_name = target_name + ".rps"
+    generate_rps_file(rps_target_name) {
+      conversion_input = "${root_out_dir}/${objcopy_image_name}"
+      conversion_output = "${root_out_dir}/${flashing_image_name}"
+      deps = [
+        ":$executable_target",
+        ":$flash_target_name.image",
+      ]
+    }
+  }
   group(target_name) {
     deps = [
       ":$flash_target_name",
       ":$hex_target_name",
     ]
+
+    if (use_rps_extension) {
+      deps += [ ":$rps_target_name" ]
+    }
   }
 }
diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-size.h b/zzz_generated/app-common/app-common/zap-generated/attribute-size.h
deleted file mode 100644
index f4e3e5cac680b3..00000000000000
--- a/zzz_generated/app-common/app-common/zap-generated/attribute-size.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-// THIS FILE IS GENERATED BY ZAP
-
-// Prevent multiple inclusion
-#pragma once
-
-// ZCL attribute sizes
-ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2,
-    ZCL_INT24U_ATTRIBUTE_TYPE, 3, ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6,
-    ZCL_INT56U_ATTRIBUTE_TYPE, 7, ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2,
-    ZCL_INT24S_ATTRIBUTE_TYPE, 3, ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6,
-    ZCL_INT56S_ATTRIBUTE_TYPE, 7, ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
-    ZCL_PRIORITY_ATTRIBUTE_TYPE, 1, ZCL_STATUS_ATTRIBUTE_TYPE, 1, ZCL_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_DOUBLE_ATTRIBUTE_TYPE, 8,
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_ENDPOINT_NO_ATTRIBUTE_TYPE, 2, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, 2,
-    ZCL_DEVTYPE_ID_ATTRIBUTE_TYPE, 4, ZCL_FABRIC_ID_ATTRIBUTE_TYPE, 8, ZCL_FABRIC_IDX_ATTRIBUTE_TYPE, 1,
-    ZCL_ENTRY_IDX_ATTRIBUTE_TYPE, 2, ZCL_DATA_VER_ATTRIBUTE_TYPE, 4, ZCL_EVENT_NO_ATTRIBUTE_TYPE, 8, ZCL_SEMTAG_ATTRIBUTE_TYPE, 4,
-    ZCL_NAMESPACE_ATTRIBUTE_TYPE, 1, ZCL_TAG_ATTRIBUTE_TYPE, 1, ZCL_SYSTIME_US_ATTRIBUTE_TYPE, 8, ZCL_SYSTIME_MS_ATTRIBUTE_TYPE, 8,
-    ZCL_ELAPSED_S_ATTRIBUTE_TYPE, 4, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, 2, ZCL_TOD_ATTRIBUTE_TYPE, 4, ZCL_DATE_ATTRIBUTE_TYPE, 4,
-    ZCL_EPOCH_US_ATTRIBUTE_TYPE, 8, ZCL_EPOCH_S_ATTRIBUTE_TYPE, 4, ZCL_POSIX_MS_ATTRIBUTE_TYPE, 8, ZCL_PERCENT_ATTRIBUTE_TYPE, 1,
-    ZCL_PERCENT100THS_ATTRIBUTE_TYPE, 2, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 4, ZCL_ATTRIB_ID_ATTRIBUTE_TYPE, 4,
-    ZCL_FIELD_ID_ATTRIBUTE_TYPE, 4, ZCL_EVENT_ID_ATTRIBUTE_TYPE, 4, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 4, ZCL_ACTION_ID_ATTRIBUTE_TYPE,
-    1, ZCL_TRANS_ID_ATTRIBUTE_TYPE, 4, ZCL_NODE_ID_ATTRIBUTE_TYPE, 8, ZCL_IPV4ADR_ATTRIBUTE_TYPE, 4, ZCL_IPV6ADR_ATTRIBUTE_TYPE, 16,
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index de97d22f4d964e..1da947a4603420 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -268,6 +268,37 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 namespace Scenes {
 namespace Attributes {
 
+namespace SceneCount {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Scenes::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Scenes::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace SceneCount
+
 namespace CurrentScene {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
@@ -363,9 +394,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 
 namespace NameSupport {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap> * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Scenes::Id, Id, readable, sizeof(temp));
@@ -377,9 +408,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap> value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -1161,9 +1192,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 
 namespace Options {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LevelControl::Id, Id, readable, sizeof(temp));
@@ -1175,9 +1206,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -6604,92 +6635,237 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 } // namespace Attributes
 } // namespace IcdManagement
 
-namespace ModeSelect {
+namespace Timer {
 namespace Attributes {
 
-namespace Description {
+namespace SetTime {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    uint8_t zclString[64 + 1];
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Timer::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
 
-    VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 64);
-    value.reduce_size(length);
+} // namespace SetTime
+
+namespace TimeRemaining {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Timer::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[64 + 1];
-    auto length = static_cast<uint8_t>(value.size());
-    Encoding::Put8(zclString, length);
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Description
+} // namespace TimeRemaining
 
-namespace StandardNamespace {
+namespace TimerState {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Timer::TimerStatusEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Timer::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNull();
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    else
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Timer::TimerStatusEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace TimerState
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Timer::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::Timer::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Timer
+
+namespace OvenCavityOperationalState {
+namespace Attributes {
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
 
-    return Set(endpoint, value.Value());
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace StandardNamespace
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OvenCavityOperationalState
+
+namespace OvenMode {
+namespace Attributes {
 
 namespace CurrentMode {
 
@@ -6698,7 +6874,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -6717,7 +6893,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 } // namespace CurrentMode
@@ -6729,7 +6905,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & valu
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (Traits::IsNullValue(temp))
     {
@@ -6751,7 +6927,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -6760,7 +6936,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
@@ -6782,7 +6958,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & valu
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (Traits::IsNullValue(temp))
     {
@@ -6804,7 +6980,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -6813,7 +6989,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
@@ -6835,7 +7011,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -6854,7 +7030,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -6866,7 +7042,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OvenMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -6885,53 +7061,102 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ModeSelect
+} // namespace OvenMode
 
-namespace LaundryWasherMode {
+namespace LaundryDryerControls {
 namespace Attributes {
 
-namespace ClusterRevision {
+namespace SelectedDrynessLevel {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
     }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
 
-} // namespace Attributes
-} // namespace LaundryWasherMode
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
-namespace Attributes {
+    return Set(endpoint, value.Value());
+}
+
+} // namespace SelectedDrynessLevel
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
 
 namespace ClusterRevision {
 
@@ -6939,9 +7164,8 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status =
-        emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp));
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -6960,26 +7184,140 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable,
-                                 ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
+} // namespace LaundryDryerControls
 
-namespace LaundryWasherControls {
+namespace ModeSelect {
 namespace Attributes {
 
-namespace SpinSpeedCurrent {
+namespace Description {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
+{
+    uint8_t zclString[64 + 1];
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+
+    VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 64);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+{
+    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[64 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace Description
+
+namespace StandardNamespace {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace StandardNamespace
+
+namespace CurrentMode {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace CurrentMode
+
+namespace StartUpMode {
 
 EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (Traits::IsNullValue(temp))
     {
@@ -7001,7 +7339,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -7010,7 +7348,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
@@ -7023,38 +7361,60 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
     return Set(endpoint, value.Value());
 }
 
-} // namespace SpinSpeedCurrent
+} // namespace StartUpMode
 
-namespace NumberOfRinses {
+namespace OnMode {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NumberOfRinses
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace OnMode
 
 namespace FeatureMap {
 
@@ -7063,7 +7423,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -7082,7 +7442,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -7094,7 +7454,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -7113,15 +7473,15 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace LaundryWasherControls
+} // namespace ModeSelect
 
-namespace RvcRunMode {
+namespace LaundryWasherMode {
 namespace Attributes {
 
 namespace ClusterRevision {
@@ -7131,7 +7491,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -7150,13 +7510,241 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace RvcRunMode
+} // namespace LaundryWasherMode
+
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status =
+        emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace RefrigeratorAndTemperatureControlledCabinetMode
+
+namespace LaundryWasherControls {
+namespace Attributes {
+
+namespace SpinSpeedCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace SpinSpeedCurrent
+
+namespace NumberOfRinses {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum * value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfRinses
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace LaundryWasherControls
+
+namespace RvcRunMode {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace RvcRunMode
 
 namespace RvcCleanMode {
 namespace Attributes {
@@ -8255,109 +8843,2470 @@ namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace DishwasherAlarm
+
+namespace MicrowaveOvenMode {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenMode::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenMode
+
+namespace MicrowaveOvenControl {
+namespace Attributes {
+
+namespace CookTime {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+} // namespace CookTime
+
+namespace PowerSetting {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace PowerSetting
+
+namespace MinPower {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace MinPower
+
+namespace MaxPower {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace MaxPower
+
+namespace PowerStep {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace PowerStep
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenControl
+
+namespace OperationalState {
+namespace Attributes {
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OperationalState
+
+namespace RvcOperationalState {
+namespace Attributes {
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace RvcOperationalState
+
+namespace HepaFilterMonitoring {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::HepaFilterMonitoring::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::HepaFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace HepaFilterMonitoring
+
+namespace ActivatedCarbonFilterMonitoring {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status =
+        emberAfReadAttribute(endpoint, Clusters::ActivatedCarbonFilterMonitoring::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ActivatedCarbonFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace ActivatedCarbonFilterMonitoring
+
+namespace BooleanSensorConfiguration {
+namespace Attributes {
+
+namespace SensitivityLevel {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum * value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace SensitivityLevel
+
+namespace AlarmsActive {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+}
+
+} // namespace AlarmsActive
+
+namespace AlarmsSuppressed {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+}
+
+} // namespace AlarmsSuppressed
+
+namespace AlarmsEnabled {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+}
+
+} // namespace AlarmsEnabled
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanSensorConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+namespace Attributes {
+
+namespace OpenDuration {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace OpenDuration
+
+namespace AutoCloseTime {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace AutoCloseTime
+
+namespace RemainingDuration {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace RemainingDuration
+
+namespace CurrentState {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace CurrentState
+
+namespace TargetState {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace TargetState
+
+namespace StartUpState {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum * value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace StartUpState
+
+namespace CurrentLevel {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace CurrentLevel
+
+namespace TargetLevel {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace TargetLevel
+
+namespace OpenLevel {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace OpenLevel
+
+namespace ValveFault {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> * value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+}
+
+} // namespace ValveFault
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+namespace Attributes {
+
+namespace NumberOfLoadControlPrograms {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfLoadControlPrograms
+
+namespace NumberOfEventsPerProgram {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfEventsPerProgram
+
+namespace NumberOfTransitions {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfTransitions
+
+namespace DefaultRandomStart {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace DefaultRandomStart
+
+namespace DefaultRandomDuration {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace DefaultRandomDuration
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+namespace Attributes {
+
+namespace State {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> & value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::StateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::StateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::StateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::StateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace State
+
+namespace SupplyState {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::SupplyStateEnum * value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::SupplyStateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::SupplyStateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::SupplyStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace SupplyState
+
+namespace FaultState {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::FaultStateEnum * value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::FaultStateEnum>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::FaultStateEnum value)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EnergyEvse::FaultStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+}
+
+} // namespace FaultState
+
+namespace ChargingEnabledUntil {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace ChargingEnabledUntil
+
+namespace DischargingEnabledUntil {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace DischargingEnabledUntil
+
+namespace CircuitCapacity {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+} // namespace CircuitCapacity
+
+namespace MinimumChargeCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+} // namespace MinimumChargeCurrent
+
+namespace MaximumChargeCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+} // namespace MaximumChargeCurrent
+
+namespace MaximumDischargeCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+} // namespace MaximumDischargeCurrent
+
+namespace UserMaximumChargeCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+} // namespace UserMaximumChargeCurrent
+
+namespace RandomizationDelayWindow {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
+}
+
+} // namespace RandomizationDelayWindow
+
+namespace NumberOfWeeklyTargets {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfWeeklyTargets
+
+namespace NumberOfDailyTargets {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace NumberOfDailyTargets
+
+namespace NextChargeStartTime {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NextChargeStartTime
+
+namespace NextChargeTargetTime {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NextChargeTargetTime
+
+namespace NextChargeRequiredEnergy {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NextChargeRequiredEnergy
+
+namespace NextChargeTargetSoC {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NextChargeTargetSoC
+
+namespace ApproximateEVEfficiency {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace ApproximateEVEfficiency
+
+namespace StateOfCharge {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace StateOfCharge
+
+namespace BatteryCapacity {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
 
-namespace ClusterRevision {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace BatteryCapacity
+
+namespace VehicleID {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[32 + 1];
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+        return EMBER_ZCL_STATUS_SUCCESS;
     }
-    *value = Traits::StorageToWorking(temp);
+    auto & span = value.SetNonNull();
+
+    VerifyOrReturnError(span.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(span.data(), &zclString[1], 32);
+    span.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
 
-} // namespace Attributes
-} // namespace DishwasherAlarm
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-namespace OperationalState {
-namespace Attributes {
+    return Set(endpoint, value.Value());
+}
 
-namespace FeatureMap {
+} // namespace VehicleID
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+namespace SessionID {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OperationalState::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+}
 
-namespace ClusterRevision {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace SessionID
+
+namespace SessionDuration {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OperationalState::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8366,9 +11315,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8376,25 +11325,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace OperationalState
-
-namespace RvcOperationalState {
-namespace Attributes {
+} // namespace SessionDuration
 
-namespace FeatureMap {
+namespace SessionEnergyCharged {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8403,9 +11346,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8413,19 +11356,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace SessionEnergyCharged
 
-namespace ClusterRevision {
+namespace SessionEnergyDischarged {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8434,9 +11377,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8444,25 +11387,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace RvcOperationalState
-
-namespace HepaFilterMonitoring {
-namespace Attributes {
+} // namespace SessionEnergyDischarged
 
-namespace ClusterRevision {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::HepaFilterMonitoring::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8471,9 +11408,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8481,16 +11418,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::HepaFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace HepaFilterMonitoring
-
-namespace ActivatedCarbonFilterMonitoring {
-namespace Attributes {
+} // namespace FeatureMap
 
 namespace ClusterRevision {
 
@@ -8498,9 +11429,8 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status =
-        emberAfReadAttribute(endpoint, Clusters::ActivatedCarbonFilterMonitoring::Id, Id, readable, sizeof(temp));
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::EnergyEvse::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8519,13 +11449,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::ActivatedCarbonFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ActivatedCarbonFilterMonitoring
+} // namespace EnergyEvse
 
 namespace DoorLock {
 namespace Attributes {
@@ -14558,9 +17488,10 @@ namespace Attributes {
 
 namespace TemperatureDisplayMode {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -14573,9 +17504,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -14591,9 +17523,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 namespace KeypadLockout {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -14606,9 +17538,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -14624,9 +17556,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 namespace ScheduleProgrammingVisibility {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits =
+        NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -14639,9 +17573,11 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits =
+        NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -17603,7 +20539,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17612,7 +20548,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -17656,7 +20592,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17665,7 +20601,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -17709,7 +20645,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17718,7 +20654,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -19652,7 +22588,7 @@ namespace MACAddress {
 
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
 {
-    uint8_t zclString[32 + 1];
+    uint8_t zclString[12 + 1];
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     size_t length = emberAfStringLength(zclString);
@@ -19661,16 +22597,16 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
 
-    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 32);
+    VerifyOrReturnError(value.size() == 12, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 12);
     value.reduce_size(length);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[32 + 1];
+    static_assert(12 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 12, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[12 + 1];
     auto length = static_cast<uint8_t>(value.size());
     Encoding::Put8(zclString, length);
     memcpy(&zclString[1], value.data(), value.size());
@@ -19679,6 +22615,37 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 
 } // namespace MACAddress
 
+namespace LinkLocalAddress {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan & value)
+{
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+{
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace LinkLocalAddress
+
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -20493,9 +23460,9 @@ namespace Attributes {
 
 namespace SupportedStreamingProtocols {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
@@ -20507,9 +23474,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 4486856ee4a374..05505afea06d13 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -84,6 +84,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 namespace Scenes {
 namespace Attributes {
 
+namespace SceneCount {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace SceneCount
+
 namespace CurrentScene {
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
@@ -100,8 +105,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value);
 } // namespace SceneValid
 
 namespace NameSupport {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap> * value); // NameSupportBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap> value);
 } // namespace NameSupport
 
 namespace LastConfiguredBy {
@@ -242,8 +248,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 
 namespace Options {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> * value); // LevelControlOptions
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> value);
+                  chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> * value); // OptionsBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value);
 } // namespace Options
 
 namespace OnOffTransitionTime {
@@ -1281,6 +1287,113 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace Attributes
 } // namespace IcdManagement
 
+namespace Timer {
+namespace Attributes {
+
+namespace SetTime {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace SetTime
+
+namespace TimeRemaining {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace TimeRemaining
+
+namespace TimerState {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum * value); // TimerStatusEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value);
+} // namespace TimerState
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Timer
+
+namespace OvenCavityOperationalState {
+namespace Attributes {
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OvenCavityOperationalState
+
+namespace OvenMode {
+namespace Attributes {
+
+namespace CurrentMode {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace CurrentMode
+
+namespace StartUpMode {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+} // namespace StartUpMode
+
+namespace OnMode {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+} // namespace OnMode
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OvenMode
+
+namespace LaundryDryerControls {
+namespace Attributes {
+
+namespace SelectedDrynessLevel {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value); // DrynessLevelEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value);
+} // namespace SelectedDrynessLevel
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace LaundryDryerControls
+
 namespace ModeSelect {
 namespace Attributes {
 
@@ -1613,6 +1726,58 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace Attributes
 } // namespace DishwasherAlarm
 
+namespace MicrowaveOvenMode {
+namespace Attributes {
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenMode
+
+namespace MicrowaveOvenControl {
+namespace Attributes {
+
+namespace CookTime {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace CookTime
+
+namespace PowerSetting {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace PowerSetting
+
+namespace MinPower {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace MinPower
+
+namespace MaxPower {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace MaxPower
+
+namespace PowerStep {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace PowerStep
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenControl
+
 namespace OperationalState {
 namespace Attributes {
 
@@ -1667,6 +1832,342 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace Attributes
 } // namespace ActivatedCarbonFilterMonitoring
 
+namespace BooleanSensorConfiguration {
+namespace Attributes {
+
+namespace SensitivityLevel {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum * value); // SensitivityEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum value);
+} // namespace SensitivityLevel
+
+namespace AlarmsActive {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value);
+} // namespace AlarmsActive
+
+namespace AlarmsSuppressed {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value);
+} // namespace AlarmsSuppressed
+
+namespace AlarmsEnabled {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value);
+} // namespace AlarmsEnabled
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+namespace Attributes {
+
+namespace OpenDuration {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace OpenDuration
+
+namespace AutoCloseTime {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // epoch_us
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+} // namespace AutoCloseTime
+
+namespace RemainingDuration {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace RemainingDuration
+
+namespace CurrentState {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value); // ValveStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value);
+} // namespace CurrentState
+
+namespace TargetState {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value); // ValveStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value);
+} // namespace TargetState
+
+namespace StartUpState {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum * value); // ValveStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value);
+} // namespace StartUpState
+
+namespace CurrentLevel {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+} // namespace CurrentLevel
+
+namespace TargetLevel {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+} // namespace TargetLevel
+
+namespace OpenLevel {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+} // namespace OpenLevel
+
+namespace ValveFault {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> * value); // ValveFaultBitmap
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value);
+} // namespace ValveFault
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+namespace Attributes {
+
+namespace NumberOfLoadControlPrograms {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfLoadControlPrograms
+
+namespace NumberOfEventsPerProgram {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfEventsPerProgram
+
+namespace NumberOfTransitions {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfTransitions
+
+namespace DefaultRandomStart {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace DefaultRandomStart
+
+namespace DefaultRandomDuration {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace DefaultRandomDuration
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+namespace Attributes {
+
+namespace State {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> & value); // StateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::StateEnum value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> & value);
+} // namespace State
+
+namespace SupplyState {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::SupplyStateEnum * value); // SupplyStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::SupplyStateEnum value);
+} // namespace SupplyState
+
+namespace FaultState {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::FaultStateEnum * value); // FaultStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EnergyEvse::FaultStateEnum value);
+} // namespace FaultState
+
+namespace ChargingEnabledUntil {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // epoch_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace ChargingEnabledUntil
+
+namespace DischargingEnabledUntil {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // epoch_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace DischargingEnabledUntil
+
+namespace CircuitCapacity {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace CircuitCapacity
+
+namespace MinimumChargeCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace MinimumChargeCurrent
+
+namespace MaximumChargeCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace MaximumChargeCurrent
+
+namespace MaximumDischargeCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace MaximumDischargeCurrent
+
+namespace UserMaximumChargeCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace UserMaximumChargeCurrent
+
+namespace RandomizationDelayWindow {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace RandomizationDelayWindow
+
+namespace NumberOfWeeklyTargets {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfWeeklyTargets
+
+namespace NumberOfDailyTargets {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfDailyTargets
+
+namespace NextChargeStartTime {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // epoch_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace NextChargeStartTime
+
+namespace NextChargeTargetTime {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // epoch_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace NextChargeTargetTime
+
+namespace NextChargeRequiredEnergy {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace NextChargeRequiredEnergy
+
+namespace NextChargeTargetSoC {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+} // namespace NextChargeTargetSoC
+
+namespace ApproximateEVEfficiency {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+} // namespace ApproximateEVEfficiency
+
+namespace StateOfCharge {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+} // namespace StateOfCharge
+
+namespace BatteryCapacity {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace BatteryCapacity
+
+namespace VehicleID {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
+} // namespace VehicleID
+
+namespace SessionID {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace SessionID
+
+namespace SessionDuration {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace SessionDuration
+
+namespace SessionEnergyCharged {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace SessionEnergyCharged
+
+namespace SessionEnergyDischarged {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace SessionEnergyDischarged
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace EnergyEvse
+
 namespace DoorLock {
 namespace Attributes {
 
@@ -2628,18 +3129,25 @@ namespace ThermostatUserInterfaceConfiguration {
 namespace Attributes {
 
 namespace TemperatureDisplayMode {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus
+Get(chip::EndpointId endpoint,
+    chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum * value); // TemperatureDisplayModeEnum
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value);
 } // namespace TemperatureDisplayMode
 
 namespace KeypadLockout {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum * value); // KeypadLockoutEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value);
 } // namespace KeypadLockout
 
 namespace ScheduleProgrammingVisibility {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum *
+                      value); // ScheduleProgrammingVisibilityEnum
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value);
 } // namespace ScheduleProgrammingVisibility
 
 namespace FeatureMap {
@@ -3107,21 +3615,21 @@ namespace TemperatureMeasurement {
 namespace Attributes {
 
 namespace MeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
@@ -3500,6 +4008,11 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); //
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
 } // namespace MACAddress
 
+namespace LinkLocalAddress {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan & value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace LinkLocalAddress
+
 namespace FeatureMap {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
@@ -3661,8 +4174,10 @@ namespace ContentLauncher {
 namespace Attributes {
 
 namespace SupportedStreamingProtocols {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus
+Get(chip::EndpointId endpoint,
+    chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> * value); // SupportedProtocolsBitmap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value);
 } // namespace SupportedStreamingProtocols
 
 namespace FeatureMap {
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index 9b692fb362815b..e23e9d7be99783 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -361,6 +361,38 @@ void emberAfBooleanStateClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIcdManagementClusterInitCallback(chip::EndpointId endpoint);
 
+/** @brief Timer Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTimerClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Cavity Operational State Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOvenCavityOperationalStateClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Mode Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOvenModeClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Laundry Dryer Controls Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfLaundryDryerControlsClusterInitCallback(chip::EndpointId endpoint);
+
 /** @brief Mode Select Cluster Init
  *
  * Cluster Init
@@ -457,6 +489,22 @@ void emberAfSmokeCoAlarmClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfDishwasherAlarmClusterInitCallback(chip::EndpointId endpoint);
 
+/** @brief Microwave Oven Mode Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfMicrowaveOvenModeClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Microwave Oven Control Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfMicrowaveOvenControlClusterInitCallback(chip::EndpointId endpoint);
+
 /** @brief Operational State Cluster Init
  *
  * Cluster Init
@@ -489,6 +537,38 @@ void emberAfHepaFilterMonitoringClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfActivatedCarbonFilterMonitoringClusterInitCallback(chip::EndpointId endpoint);
 
+/** @brief Boolean Sensor Configuration Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfBooleanSensorConfigurationClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Valve Configuration and Control Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfValveConfigurationAndControlClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Demand Response Load Control Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDemandResponseLoadControlClusterInitCallback(chip::EndpointId endpoint);
+
+/** @brief Energy EVSE Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpoint);
+
 /** @brief Door Lock Cluster Init
  *
  * Cluster Init
@@ -3979,42 +4059,42 @@ void emberAfIcdManagementClusterServerTickCallback(chip::EndpointId endpoint);
 void emberAfIcdManagementClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Mode Select Cluster
+// Timer Cluster
 //
 
-/** @brief Mode Select Cluster Server Init
+/** @brief Timer Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfModeSelectClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfTimerClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Mode Select Cluster Server Shutdown
+/** @brief Timer Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterTimerClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Mode Select Cluster Client Init
+/** @brief Timer Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfModeSelectClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfTimerClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Mode Select Cluster Server Attribute Changed
+/** @brief Timer Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterTimerClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Mode Select Cluster Server Pre Attribute Changed
+/** @brief Timer Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4024,10 +4104,10 @@ void MatterModeSelectClusterServerAttributeChangedCallback(const chip::app::Conc
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterModeSelectClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterTimerClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Mode Select Cluster Client Pre Attribute Changed
+/** @brief Timer Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4037,62 +4117,62 @@ MatterModeSelectClusterServerPreAttributeChangedCallback(const chip::app::Concre
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterModeSelectClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterTimerClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Mode Select Cluster Server Tick
+/** @brief Timer Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfModeSelectClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfTimerClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Mode Select Cluster Client Tick
+/** @brief Timer Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfModeSelectClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfTimerClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Laundry Washer Mode Cluster
+// Oven Cavity Operational State Cluster
 //
 
-/** @brief Laundry Washer Mode Cluster Server Init
+/** @brief Oven Cavity Operational State Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfLaundryWasherModeClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfOvenCavityOperationalStateClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Mode Cluster Server Shutdown
+/** @brief Oven Cavity Operational State Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterLaundryWasherModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterOvenCavityOperationalStateClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Mode Cluster Client Init
+/** @brief Oven Cavity Operational State Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfLaundryWasherModeClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfOvenCavityOperationalStateClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Mode Cluster Server Attribute Changed
+/** @brief Oven Cavity Operational State Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterLaundryWasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterOvenCavityOperationalStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Laundry Washer Mode Cluster Server Pre Attribute Changed
+/** @brief Oven Cavity Operational State Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4101,11 +4181,10 @@ void MatterLaundryWasherModeClusterServerAttributeChangedCallback(const chip::ap
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterLaundryWasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterOvenCavityOperationalStateClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Laundry Washer Mode Cluster Client Pre Attribute Changed
+/** @brief Oven Cavity Operational State Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4114,64 +4193,62 @@ MatterLaundryWasherModeClusterServerPreAttributeChangedCallback(const chip::app:
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterLaundryWasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterOvenCavityOperationalStateClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Laundry Washer Mode Cluster Server Tick
+/** @brief Oven Cavity Operational State Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfLaundryWasherModeClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfOvenCavityOperationalStateClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Mode Cluster Client Tick
+/** @brief Oven Cavity Operational State Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfLaundryWasherModeClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfOvenCavityOperationalStateClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Refrigerator And Temperature Controlled Cabinet Mode Cluster
+// Oven Mode Cluster
 //
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Init
+/** @brief Oven Mode Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfOvenModeClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Shutdown
+/** @brief Oven Mode Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterOvenModeClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Init
+/** @brief Oven Mode Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfOvenModeClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Attribute Changed
+/** @brief Oven Mode Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath);
+void MatterOvenModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Pre Attribute Changed
+/** @brief Oven Mode Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4181,10 +4258,10 @@ void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerAttribute
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerPreAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterOvenModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Pre Attribute Changed
+/** @brief Oven Mode Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4194,62 +4271,62 @@ MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerPreAttributeCh
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRefrigeratorAndTemperatureControlledCabinetModeClusterClientPreAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterOvenModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Tick
+/** @brief Oven Mode Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfOvenModeClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Tick
+/** @brief Oven Mode Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfOvenModeClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Laundry Washer Controls Cluster
+// Laundry Dryer Controls Cluster
 //
 
-/** @brief Laundry Washer Controls Cluster Server Init
+/** @brief Laundry Dryer Controls Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfLaundryWasherControlsClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfLaundryDryerControlsClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Controls Cluster Server Shutdown
+/** @brief Laundry Dryer Controls Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterLaundryWasherControlsClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterLaundryDryerControlsClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Controls Cluster Client Init
+/** @brief Laundry Dryer Controls Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfLaundryWasherControlsClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfLaundryDryerControlsClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Controls Cluster Server Attribute Changed
+/** @brief Laundry Dryer Controls Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterLaundryWasherControlsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterLaundryDryerControlsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Laundry Washer Controls Cluster Server Pre Attribute Changed
+/** @brief Laundry Dryer Controls Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4258,10 +4335,10 @@ void MatterLaundryWasherControlsClusterServerAttributeChangedCallback(const chip
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterLaundryWasherControlsClusterServerPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterLaundryDryerControlsClusterServerPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Laundry Washer Controls Cluster Client Pre Attribute Changed
+/** @brief Laundry Dryer Controls Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4270,62 +4347,62 @@ chip::Protocols::InteractionModel::Status MatterLaundryWasherControlsClusterServ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterLaundryWasherControlsClusterClientPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterLaundryDryerControlsClusterClientPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Laundry Washer Controls Cluster Server Tick
+/** @brief Laundry Dryer Controls Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfLaundryWasherControlsClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfLaundryDryerControlsClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Laundry Washer Controls Cluster Client Tick
+/** @brief Laundry Dryer Controls Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfLaundryWasherControlsClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfLaundryDryerControlsClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// RVC Run Mode Cluster
+// Mode Select Cluster
 //
 
-/** @brief RVC Run Mode Cluster Server Init
+/** @brief Mode Select Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcRunModeClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfModeSelectClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Run Mode Cluster Server Shutdown
+/** @brief Mode Select Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterRvcRunModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Run Mode Cluster Client Init
+/** @brief Mode Select Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcRunModeClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfModeSelectClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Run Mode Cluster Server Attribute Changed
+/** @brief Mode Select Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterRvcRunModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief RVC Run Mode Cluster Server Pre Attribute Changed
+/** @brief Mode Select Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4335,10 +4412,10 @@ void MatterRvcRunModeClusterServerAttributeChangedCallback(const chip::app::Conc
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRvcRunModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+MatterModeSelectClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Run Mode Cluster Client Pre Attribute Changed
+/** @brief Mode Select Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4348,62 +4425,62 @@ MatterRvcRunModeClusterServerPreAttributeChangedCallback(const chip::app::Concre
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRvcRunModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+MatterModeSelectClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Run Mode Cluster Server Tick
+/** @brief Mode Select Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcRunModeClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfModeSelectClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Run Mode Cluster Client Tick
+/** @brief Mode Select Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcRunModeClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfModeSelectClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// RVC Clean Mode Cluster
+// Laundry Washer Mode Cluster
 //
 
-/** @brief RVC Clean Mode Cluster Server Init
+/** @brief Laundry Washer Mode Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcCleanModeClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfLaundryWasherModeClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Clean Mode Cluster Server Shutdown
+/** @brief Laundry Washer Mode Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterRvcCleanModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterLaundryWasherModeClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Clean Mode Cluster Client Init
+/** @brief Laundry Washer Mode Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcCleanModeClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfLaundryWasherModeClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Clean Mode Cluster Server Attribute Changed
+/** @brief Laundry Washer Mode Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterRvcCleanModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterLaundryWasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief RVC Clean Mode Cluster Server Pre Attribute Changed
+/** @brief Laundry Washer Mode Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4413,10 +4490,10 @@ void MatterRvcCleanModeClusterServerAttributeChangedCallback(const chip::app::Co
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRvcCleanModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterLaundryWasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Clean Mode Cluster Client Pre Attribute Changed
+/** @brief Laundry Washer Mode Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4426,62 +4503,63 @@ MatterRvcCleanModeClusterServerPreAttributeChangedCallback(const chip::app::Conc
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRvcCleanModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterLaundryWasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Clean Mode Cluster Server Tick
+/** @brief Laundry Washer Mode Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcCleanModeClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfLaundryWasherModeClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Clean Mode Cluster Client Tick
+/** @brief Laundry Washer Mode Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcCleanModeClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfLaundryWasherModeClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Temperature Control Cluster
+// Refrigerator And Temperature Controlled Cabinet Mode Cluster
 //
 
-/** @brief Temperature Control Cluster Server Init
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfTemperatureControlClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Temperature Control Cluster Server Shutdown
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterTemperatureControlClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Temperature Control Cluster Client Init
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfTemperatureControlClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Temperature Control Cluster Server Attribute Changed
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterTemperatureControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Temperature Control Cluster Server Pre Attribute Changed
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4490,10 +4568,11 @@ void MatterTemperatureControlClusterServerAttributeChangedCallback(const chip::a
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterTemperatureControlClusterServerPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status
+MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Temperature Control Cluster Client Pre Attribute Changed
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4502,30 +4581,339 @@ chip::Protocols::InteractionModel::Status MatterTemperatureControlClusterServerP
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterTemperatureControlClusterClientPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status
+MatterRefrigeratorAndTemperatureControlledCabinetModeClusterClientPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Temperature Control Cluster Server Tick
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfTemperatureControlClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Temperature Control Cluster Client Tick
+/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfTemperatureControlClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Refrigerator Alarm Cluster
+// Laundry Washer Controls Cluster
 //
 
-/** @brief Refrigerator Alarm Cluster Server Init
+/** @brief Laundry Washer Controls Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfLaundryWasherControlsClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Laundry Washer Controls Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterLaundryWasherControlsClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Laundry Washer Controls Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfLaundryWasherControlsClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Laundry Washer Controls Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterLaundryWasherControlsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Laundry Washer Controls Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterLaundryWasherControlsClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Laundry Washer Controls Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterLaundryWasherControlsClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Laundry Washer Controls Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfLaundryWasherControlsClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Laundry Washer Controls Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfLaundryWasherControlsClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// RVC Run Mode Cluster
+//
+
+/** @brief RVC Run Mode Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcRunModeClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Run Mode Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterRvcRunModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Run Mode Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcRunModeClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Run Mode Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterRvcRunModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief RVC Run Mode Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRvcRunModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief RVC Run Mode Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRvcRunModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief RVC Run Mode Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRvcRunModeClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Run Mode Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRvcRunModeClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// RVC Clean Mode Cluster
+//
+
+/** @brief RVC Clean Mode Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcCleanModeClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Clean Mode Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterRvcCleanModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Clean Mode Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcCleanModeClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Clean Mode Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterRvcCleanModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief RVC Clean Mode Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRvcCleanModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief RVC Clean Mode Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRvcCleanModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief RVC Clean Mode Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRvcCleanModeClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Clean Mode Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRvcCleanModeClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Temperature Control Cluster
+//
+
+/** @brief Temperature Control Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTemperatureControlClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Temperature Control Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterTemperatureControlClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Temperature Control Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTemperatureControlClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Temperature Control Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterTemperatureControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Temperature Control Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterTemperatureControlClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Temperature Control Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterTemperatureControlClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Temperature Control Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTemperatureControlClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Temperature Control Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTemperatureControlClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Refrigerator Alarm Cluster
+//
+
+/** @brief Refrigerator Alarm Cluster Server Init
  *
  * Server Init
  *
@@ -4533,31 +4921,343 @@ void emberAfTemperatureControlClusterClientTickCallback(chip::EndpointId endpoin
  */
 void emberAfRefrigeratorAlarmClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator Alarm Cluster Server Shutdown
+/** @brief Refrigerator Alarm Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterRefrigeratorAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Refrigerator Alarm Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRefrigeratorAlarmClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Refrigerator Alarm Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterRefrigeratorAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Refrigerator Alarm Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRefrigeratorAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Refrigerator Alarm Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterRefrigeratorAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Refrigerator Alarm Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRefrigeratorAlarmClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Refrigerator Alarm Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfRefrigeratorAlarmClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Dishwasher Mode Cluster
+//
+
+/** @brief Dishwasher Mode Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDishwasherModeClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Dishwasher Mode Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterDishwasherModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Dishwasher Mode Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDishwasherModeClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Dishwasher Mode Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterDishwasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Dishwasher Mode Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterDishwasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                             EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Dishwasher Mode Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterDishwasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                             EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Dishwasher Mode Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfDishwasherModeClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Dishwasher Mode Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfDishwasherModeClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Air Quality Cluster
+//
+
+/** @brief Air Quality Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfAirQualityClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Air Quality Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterAirQualityClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Air Quality Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfAirQualityClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Air Quality Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterAirQualityClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Air Quality Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterAirQualityClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Air Quality Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterAirQualityClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Air Quality Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfAirQualityClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Air Quality Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfAirQualityClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Smoke CO Alarm Cluster
+//
+
+/** @brief Smoke CO Alarm Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfSmokeCoAlarmClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Smoke CO Alarm Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterSmokeCoAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Smoke CO Alarm Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfSmokeCoAlarmClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Smoke CO Alarm Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterSmokeCoAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Smoke CO Alarm Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterSmokeCoAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Smoke CO Alarm Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterSmokeCoAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Smoke CO Alarm Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfSmokeCoAlarmClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Smoke CO Alarm Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfSmokeCoAlarmClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Dishwasher Alarm Cluster
+//
+
+/** @brief Dishwasher Alarm Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDishwasherAlarmClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Dishwasher Alarm Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterRefrigeratorAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterDishwasherAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator Alarm Cluster Client Init
+/** @brief Dishwasher Alarm Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRefrigeratorAlarmClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfDishwasherAlarmClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator Alarm Cluster Server Attribute Changed
+/** @brief Dishwasher Alarm Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterRefrigeratorAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterDishwasherAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Refrigerator Alarm Cluster Server Pre Attribute Changed
+/** @brief Dishwasher Alarm Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4567,10 +5267,10 @@ void MatterRefrigeratorAlarmClusterServerAttributeChangedCallback(const chip::ap
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRefrigeratorAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterDishwasherAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Refrigerator Alarm Cluster Client Pre Attribute Changed
+/** @brief Dishwasher Alarm Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4580,62 +5280,62 @@ MatterRefrigeratorAlarmClusterServerPreAttributeChangedCallback(const chip::app:
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterRefrigeratorAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterDishwasherAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Refrigerator Alarm Cluster Server Tick
+/** @brief Dishwasher Alarm Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRefrigeratorAlarmClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfDishwasherAlarmClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Refrigerator Alarm Cluster Client Tick
+/** @brief Dishwasher Alarm Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRefrigeratorAlarmClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfDishwasherAlarmClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Dishwasher Mode Cluster
+// Microwave Oven Mode Cluster
 //
 
-/** @brief Dishwasher Mode Cluster Server Init
+/** @brief Microwave Oven Mode Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfDishwasherModeClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenModeClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Mode Cluster Server Shutdown
+/** @brief Microwave Oven Mode Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterDishwasherModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterMicrowaveOvenModeClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Mode Cluster Client Init
+/** @brief Microwave Oven Mode Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfDishwasherModeClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenModeClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Mode Cluster Server Attribute Changed
+/** @brief Microwave Oven Mode Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterDishwasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterMicrowaveOvenModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Dishwasher Mode Cluster Server Pre Attribute Changed
+/** @brief Microwave Oven Mode Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4645,10 +5345,10 @@ void MatterDishwasherModeClusterServerAttributeChangedCallback(const chip::app::
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterDishwasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                             EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMicrowaveOvenModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Dishwasher Mode Cluster Client Pre Attribute Changed
+/** @brief Microwave Oven Mode Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4658,62 +5358,138 @@ MatterDishwasherModeClusterServerPreAttributeChangedCallback(const chip::app::Co
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterDishwasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                             EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMicrowaveOvenModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Dishwasher Mode Cluster Server Tick
+/** @brief Microwave Oven Mode Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfDishwasherModeClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenModeClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Mode Cluster Client Tick
+/** @brief Microwave Oven Mode Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfDishwasherModeClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenModeClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Air Quality Cluster
+// Microwave Oven Control Cluster
 //
 
-/** @brief Air Quality Cluster Server Init
+/** @brief Microwave Oven Control Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfAirQualityClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenControlClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Air Quality Cluster Server Shutdown
+/** @brief Microwave Oven Control Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterAirQualityClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterMicrowaveOvenControlClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Air Quality Cluster Client Init
+/** @brief Microwave Oven Control Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfAirQualityClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfMicrowaveOvenControlClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Air Quality Cluster Server Attribute Changed
+/** @brief Microwave Oven Control Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterAirQualityClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterMicrowaveOvenControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Air Quality Cluster Server Pre Attribute Changed
+/** @brief Microwave Oven Control Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterMicrowaveOvenControlClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Microwave Oven Control Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterMicrowaveOvenControlClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Microwave Oven Control Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfMicrowaveOvenControlClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Microwave Oven Control Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfMicrowaveOvenControlClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Operational State Cluster
+//
+
+/** @brief Operational State Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOperationalStateClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Operational State Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterOperationalStateClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Operational State Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOperationalStateClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Operational State Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterOperationalStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Operational State Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4723,10 +5499,10 @@ void MatterAirQualityClusterServerAttributeChangedCallback(const chip::app::Conc
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterAirQualityClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterOperationalStateClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                               EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Air Quality Cluster Client Pre Attribute Changed
+/** @brief Operational State Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4736,62 +5512,138 @@ MatterAirQualityClusterServerPreAttributeChangedCallback(const chip::app::Concre
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterAirQualityClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterOperationalStateClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                               EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Operational State Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfOperationalStateClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Operational State Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfOperationalStateClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// RVC Operational State Cluster
+//
+
+/** @brief RVC Operational State Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcOperationalStateClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Operational State Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterRvcOperationalStateClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Operational State Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfRvcOperationalStateClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief RVC Operational State Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterRvcOperationalStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief RVC Operational State Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterRvcOperationalStateClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief RVC Operational State Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status MatterRvcOperationalStateClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Air Quality Cluster Server Tick
+/** @brief RVC Operational State Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfAirQualityClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfRvcOperationalStateClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Air Quality Cluster Client Tick
+/** @brief RVC Operational State Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfAirQualityClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfRvcOperationalStateClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Smoke CO Alarm Cluster
+// HEPA Filter Monitoring Cluster
 //
 
-/** @brief Smoke CO Alarm Cluster Server Init
+/** @brief HEPA Filter Monitoring Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfSmokeCoAlarmClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfHepaFilterMonitoringClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Smoke CO Alarm Cluster Server Shutdown
+/** @brief HEPA Filter Monitoring Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterSmokeCoAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterHepaFilterMonitoringClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Smoke CO Alarm Cluster Client Init
+/** @brief HEPA Filter Monitoring Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfSmokeCoAlarmClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfHepaFilterMonitoringClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Smoke CO Alarm Cluster Server Attribute Changed
+/** @brief HEPA Filter Monitoring Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterSmokeCoAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterHepaFilterMonitoringClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Smoke CO Alarm Cluster Server Pre Attribute Changed
+/** @brief HEPA Filter Monitoring Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4800,11 +5652,10 @@ void MatterSmokeCoAlarmClusterServerAttributeChangedCallback(const chip::app::Co
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterSmokeCoAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterHepaFilterMonitoringClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Smoke CO Alarm Cluster Client Pre Attribute Changed
+/** @brief HEPA Filter Monitoring Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4813,63 +5664,63 @@ MatterSmokeCoAlarmClusterServerPreAttributeChangedCallback(const chip::app::Conc
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterSmokeCoAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterHepaFilterMonitoringClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Smoke CO Alarm Cluster Server Tick
+/** @brief HEPA Filter Monitoring Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfSmokeCoAlarmClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfHepaFilterMonitoringClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Smoke CO Alarm Cluster Client Tick
+/** @brief HEPA Filter Monitoring Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfSmokeCoAlarmClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfHepaFilterMonitoringClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Dishwasher Alarm Cluster
+// Activated Carbon Filter Monitoring Cluster
 //
 
-/** @brief Dishwasher Alarm Cluster Server Init
+/** @brief Activated Carbon Filter Monitoring Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfDishwasherAlarmClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfActivatedCarbonFilterMonitoringClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Alarm Cluster Server Shutdown
+/** @brief Activated Carbon Filter Monitoring Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterDishwasherAlarmClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterActivatedCarbonFilterMonitoringClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Alarm Cluster Client Init
+/** @brief Activated Carbon Filter Monitoring Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfDishwasherAlarmClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfActivatedCarbonFilterMonitoringClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Alarm Cluster Server Attribute Changed
+/** @brief Activated Carbon Filter Monitoring Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterDishwasherAlarmClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterActivatedCarbonFilterMonitoringClusterServerAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Dishwasher Alarm Cluster Server Pre Attribute Changed
+/** @brief Activated Carbon Filter Monitoring Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4878,11 +5729,10 @@ void MatterDishwasherAlarmClusterServerAttributeChangedCallback(const chip::app:
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterDishwasherAlarmClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterActivatedCarbonFilterMonitoringClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Dishwasher Alarm Cluster Client Pre Attribute Changed
+/** @brief Activated Carbon Filter Monitoring Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4891,63 +5741,62 @@ MatterDishwasherAlarmClusterServerPreAttributeChangedCallback(const chip::app::C
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterDishwasherAlarmClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterActivatedCarbonFilterMonitoringClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Dishwasher Alarm Cluster Server Tick
+/** @brief Activated Carbon Filter Monitoring Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfDishwasherAlarmClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfActivatedCarbonFilterMonitoringClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Dishwasher Alarm Cluster Client Tick
+/** @brief Activated Carbon Filter Monitoring Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfDishwasherAlarmClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfActivatedCarbonFilterMonitoringClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Operational State Cluster
+// Boolean Sensor Configuration Cluster
 //
 
-/** @brief Operational State Cluster Server Init
+/** @brief Boolean Sensor Configuration Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfOperationalStateClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfBooleanSensorConfigurationClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Operational State Cluster Server Shutdown
+/** @brief Boolean Sensor Configuration Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterOperationalStateClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterBooleanSensorConfigurationClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Operational State Cluster Client Init
+/** @brief Boolean Sensor Configuration Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfOperationalStateClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfBooleanSensorConfigurationClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Operational State Cluster Server Attribute Changed
+/** @brief Boolean Sensor Configuration Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterOperationalStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterBooleanSensorConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Operational State Cluster Server Pre Attribute Changed
+/** @brief Boolean Sensor Configuration Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -4956,11 +5805,10 @@ void MatterOperationalStateClusterServerAttributeChangedCallback(const chip::app
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterOperationalStateClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                               EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterBooleanSensorConfigurationClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Operational State Cluster Client Pre Attribute Changed
+/** @brief Boolean Sensor Configuration Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -4969,63 +5817,63 @@ MatterOperationalStateClusterServerPreAttributeChangedCallback(const chip::app::
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status
-MatterOperationalStateClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                               EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status MatterBooleanSensorConfigurationClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Operational State Cluster Server Tick
+/** @brief Boolean Sensor Configuration Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfOperationalStateClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfBooleanSensorConfigurationClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Operational State Cluster Client Tick
+/** @brief Boolean Sensor Configuration Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfOperationalStateClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfBooleanSensorConfigurationClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// RVC Operational State Cluster
+// Valve Configuration and Control Cluster
 //
 
-/** @brief RVC Operational State Cluster Server Init
+/** @brief Valve Configuration and Control Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcOperationalStateClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfValveConfigurationAndControlClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Operational State Cluster Server Shutdown
+/** @brief Valve Configuration and Control Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterRvcOperationalStateClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterValveConfigurationAndControlClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Operational State Cluster Client Init
+/** @brief Valve Configuration and Control Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfRvcOperationalStateClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfValveConfigurationAndControlClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Operational State Cluster Server Attribute Changed
+/** @brief Valve Configuration and Control Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterRvcOperationalStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterValveConfigurationAndControlClusterServerAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief RVC Operational State Cluster Server Pre Attribute Changed
+/** @brief Valve Configuration and Control Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -5034,10 +5882,10 @@ void MatterRvcOperationalStateClusterServerAttributeChangedCallback(const chip::
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterRvcOperationalStateClusterServerPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterValveConfigurationAndControlClusterServerPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Operational State Cluster Client Pre Attribute Changed
+/** @brief Valve Configuration and Control Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -5046,62 +5894,62 @@ chip::Protocols::InteractionModel::Status MatterRvcOperationalStateClusterServer
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterRvcOperationalStateClusterClientPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterValveConfigurationAndControlClusterClientPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief RVC Operational State Cluster Server Tick
+/** @brief Valve Configuration and Control Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcOperationalStateClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfValveConfigurationAndControlClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief RVC Operational State Cluster Client Tick
+/** @brief Valve Configuration and Control Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfRvcOperationalStateClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfValveConfigurationAndControlClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// HEPA Filter Monitoring Cluster
+// Demand Response Load Control Cluster
 //
 
-/** @brief HEPA Filter Monitoring Cluster Server Init
+/** @brief Demand Response Load Control Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfHepaFilterMonitoringClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfDemandResponseLoadControlClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief HEPA Filter Monitoring Cluster Server Shutdown
+/** @brief Demand Response Load Control Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterHepaFilterMonitoringClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterDemandResponseLoadControlClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief HEPA Filter Monitoring Cluster Client Init
+/** @brief Demand Response Load Control Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfHepaFilterMonitoringClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfDemandResponseLoadControlClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief HEPA Filter Monitoring Cluster Server Attribute Changed
+/** @brief Demand Response Load Control Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterHepaFilterMonitoringClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterDemandResponseLoadControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief HEPA Filter Monitoring Cluster Server Pre Attribute Changed
+/** @brief Demand Response Load Control Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -5110,10 +5958,10 @@ void MatterHepaFilterMonitoringClusterServerAttributeChangedCallback(const chip:
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterHepaFilterMonitoringClusterServerPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterDemandResponseLoadControlClusterServerPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief HEPA Filter Monitoring Cluster Client Pre Attribute Changed
+/** @brief Demand Response Load Control Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -5122,63 +5970,62 @@ chip::Protocols::InteractionModel::Status MatterHepaFilterMonitoringClusterServe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterHepaFilterMonitoringClusterClientPreAttributeChangedCallback(
+chip::Protocols::InteractionModel::Status MatterDemandResponseLoadControlClusterClientPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief HEPA Filter Monitoring Cluster Server Tick
+/** @brief Demand Response Load Control Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfHepaFilterMonitoringClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfDemandResponseLoadControlClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief HEPA Filter Monitoring Cluster Client Tick
+/** @brief Demand Response Load Control Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfHepaFilterMonitoringClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfDemandResponseLoadControlClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Activated Carbon Filter Monitoring Cluster
+// Energy EVSE Cluster
 //
 
-/** @brief Activated Carbon Filter Monitoring Cluster Server Init
+/** @brief Energy EVSE Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfActivatedCarbonFilterMonitoringClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfEnergyEvseClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Server Shutdown
+/** @brief Energy EVSE Cluster Server Shutdown
  *
  * Server Shutdown
  *
  * @param endpoint    Endpoint that is being shutdown
  */
-void MatterActivatedCarbonFilterMonitoringClusterServerShutdownCallback(chip::EndpointId endpoint);
+void MatterEnergyEvseClusterServerShutdownCallback(chip::EndpointId endpoint);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Client Init
+/** @brief Energy EVSE Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfActivatedCarbonFilterMonitoringClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfEnergyEvseClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Server Attribute Changed
+/** @brief Energy EVSE Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterActivatedCarbonFilterMonitoringClusterServerAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath);
+void MatterEnergyEvseClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Server Pre Attribute Changed
+/** @brief Energy EVSE Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -5187,10 +6034,11 @@ void MatterActivatedCarbonFilterMonitoringClusterServerAttributeChangedCallback(
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterActivatedCarbonFilterMonitoringClusterServerPreAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status
+MatterEnergyEvseClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Client Pre Attribute Changed
+/** @brief Energy EVSE Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -5199,24 +6047,25 @@ chip::Protocols::InteractionModel::Status MatterActivatedCarbonFilterMonitoringC
  * @param size          Attribute size
  * @param value         Attribute value
  */
-chip::Protocols::InteractionModel::Status MatterActivatedCarbonFilterMonitoringClusterClientPreAttributeChangedCallback(
-    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+chip::Protocols::InteractionModel::Status
+MatterEnergyEvseClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Server Tick
+/** @brief Energy EVSE Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfActivatedCarbonFilterMonitoringClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfEnergyEvseClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Activated Carbon Filter Monitoring Cluster Client Tick
+/** @brief Energy EVSE Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfActivatedCarbonFilterMonitoringClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfEnergyEvseClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
 // Door Lock Cluster
@@ -8659,6 +9508,12 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(
 bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::DecodableType & commandData);
+/**
+ * @brief General Diagnostics Cluster TimeSnapshot Command callback (from client)
+ */
+bool emberAfGeneralDiagnosticsClusterTimeSnapshotCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::DecodableType & commandData);
 /**
  * @brief Software Diagnostics Cluster ResetWatermarks Command callback (from client)
  */
@@ -8821,6 +9676,58 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(
 bool emberAfIcdManagementClusterStayActiveRequestCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::IcdManagement::Commands::StayActiveRequest::DecodableType & commandData);
+/**
+ * @brief Timer Cluster SetTimer Command callback (from client)
+ */
+bool emberAfTimerClusterSetTimerCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                         const chip::app::Clusters::Timer::Commands::SetTimer::DecodableType & commandData);
+/**
+ * @brief Timer Cluster ResetTimer Command callback (from client)
+ */
+bool emberAfTimerClusterResetTimerCallback(chip::app::CommandHandler * commandObj,
+                                           const chip::app::ConcreteCommandPath & commandPath,
+                                           const chip::app::Clusters::Timer::Commands::ResetTimer::DecodableType & commandData);
+/**
+ * @brief Timer Cluster AddTime Command callback (from client)
+ */
+bool emberAfTimerClusterAddTimeCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                        const chip::app::Clusters::Timer::Commands::AddTime::DecodableType & commandData);
+/**
+ * @brief Timer Cluster ReduceTime Command callback (from client)
+ */
+bool emberAfTimerClusterReduceTimeCallback(chip::app::CommandHandler * commandObj,
+                                           const chip::app::ConcreteCommandPath & commandPath,
+                                           const chip::app::Clusters::Timer::Commands::ReduceTime::DecodableType & commandData);
+/**
+ * @brief Oven Cavity Operational State Cluster Pause Command callback (from client)
+ */
+bool emberAfOvenCavityOperationalStateClusterPauseCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::DecodableType & commandData);
+/**
+ * @brief Oven Cavity Operational State Cluster Stop Command callback (from client)
+ */
+bool emberAfOvenCavityOperationalStateClusterStopCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::DecodableType & commandData);
+/**
+ * @brief Oven Cavity Operational State Cluster Start Command callback (from client)
+ */
+bool emberAfOvenCavityOperationalStateClusterStartCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::OvenCavityOperationalState::Commands::Start::DecodableType & commandData);
+/**
+ * @brief Oven Cavity Operational State Cluster Resume Command callback (from client)
+ */
+bool emberAfOvenCavityOperationalStateClusterResumeCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::DecodableType & commandData);
+/**
+ * @brief Oven Mode Cluster ChangeToMode Command callback (from client)
+ */
+bool emberAfOvenModeClusterChangeToModeCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::OvenMode::Commands::ChangeToMode::DecodableType & commandData);
 /**
  * @brief Mode Select Cluster ChangeToMode Command callback (from client)
  */
@@ -8851,6 +9758,115 @@ bool emberAfDishwasherAlarmClusterResetCallback(
 bool emberAfDishwasherAlarmClusterModifyEnabledAlarmsCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::DecodableType & commandData);
+/**
+ * @brief Microwave Oven Control Cluster SetCookingParameters Command callback (from client)
+ */
+bool emberAfMicrowaveOvenControlClusterSetCookingParametersCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::DecodableType & commandData);
+/**
+ * @brief Microwave Oven Control Cluster AddMoreTime Command callback (from client)
+ */
+bool emberAfMicrowaveOvenControlClusterAddMoreTimeCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::DecodableType & commandData);
+/**
+ * @brief Boolean Sensor Configuration Cluster SuppressRequest Command callback (from client)
+ */
+bool emberAfBooleanSensorConfigurationClusterSuppressRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::DecodableType & commandData);
+/**
+ * @brief Valve Configuration and Control Cluster Open Command callback (from client)
+ */
+bool emberAfValveConfigurationAndControlClusterOpenCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::DecodableType & commandData);
+/**
+ * @brief Valve Configuration and Control Cluster Close Command callback (from client)
+ */
+bool emberAfValveConfigurationAndControlClusterCloseCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::DecodableType & commandData);
+/**
+ * @brief Valve Configuration and Control Cluster SetLevel Command callback (from client)
+ */
+bool emberAfValveConfigurationAndControlClusterSetLevelCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::DecodableType & commandData);
+/**
+ * @brief Demand Response Load Control Cluster RegisterLoadControlProgramRequest Command callback (from client)
+ */
+bool emberAfDemandResponseLoadControlClusterRegisterLoadControlProgramRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::DecodableType & commandData);
+/**
+ * @brief Demand Response Load Control Cluster UnregisterLoadControlProgramRequest Command callback (from client)
+ */
+bool emberAfDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::DecodableType &
+        commandData);
+/**
+ * @brief Demand Response Load Control Cluster AddLoadControlEventRequest Command callback (from client)
+ */
+bool emberAfDemandResponseLoadControlClusterAddLoadControlEventRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::DecodableType & commandData);
+/**
+ * @brief Demand Response Load Control Cluster RemoveLoadControlEventRequest Command callback (from client)
+ */
+bool emberAfDemandResponseLoadControlClusterRemoveLoadControlEventRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::DecodableType & commandData);
+/**
+ * @brief Demand Response Load Control Cluster ClearLoadControlEventsRequest Command callback (from client)
+ */
+bool emberAfDemandResponseLoadControlClusterClearLoadControlEventsRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster Disable Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterDisableCallback(chip::app::CommandHandler * commandObj,
+                                             const chip::app::ConcreteCommandPath & commandPath,
+                                             const chip::app::Clusters::EnergyEvse::Commands::Disable::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster EnableCharging Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterEnableChargingCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::EnableCharging::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster EnableDischarging Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterEnableDischargingCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster StartDiagnostics Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterStartDiagnosticsCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster SetTargets Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterSetTargetsCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::SetTargets::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster GetTargets Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterGetTargetsCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::GetTargets::DecodableType & commandData);
+/**
+ * @brief Energy EVSE Cluster ClearTargets Command callback (from client)
+ */
+bool emberAfEnergyEvseClusterClearTargetsCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::EnergyEvse::Commands::ClearTargets::DecodableType & commandData);
 /**
  * @brief Door Lock Cluster LockDoor Command callback (from client)
  */
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
index c047b38ee99562..130e8f3fbc1b12 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
@@ -118,39 +118,25 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::StartUpOnOffEnum
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::MoveMode val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::MoveModeEnum val)
 {
-    using EnumType = LevelControl::MoveMode;
+    using EnumType = LevelControl::MoveModeEnum;
     switch (val)
     {
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
     case EnumType::kUp:
     case EnumType::kDown:
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_MOVE_MODE_UP:
-    case EMBER_ZCL_MOVE_MODE_DOWN:
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(2);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::StepMode val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::StepModeEnum val)
 {
-    using EnumType = LevelControl::StepMode;
+    using EnumType = LevelControl::StepModeEnum;
     switch (val)
     {
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
     case EnumType::kUp:
     case EnumType::kDown:
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_STEP_MODE_UP:
-    case EMBER_ZCL_STEP_MODE_DOWN:
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(2);
@@ -996,9 +982,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnost
     using EnumType = EthernetNetworkDiagnostics::PHYRateEnum;
     switch (val)
     {
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
     case EnumType::kRate10M:
     case EnumType::kRate100M:
     case EnumType::kRate1G:
@@ -1009,18 +992,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnost
     case EnumType::kRate100G:
     case EnumType::kRate200G:
     case EnumType::kRate400G:
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE10_M:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE100_M:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE1_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE5_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE10_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE40_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE100_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE200_G:
-    case EMBER_ZCL_PHY_RATE_ENUM_RATE400_G:
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(10);
@@ -1215,6 +1186,85 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::Gro
     }
 }
 
+static auto __attribute__((unused)) EnsureKnownEnumValue(Timer::TimerStatusEnum val)
+{
+    using EnumType = Timer::TimerStatusEnum;
+    switch (val)
+    {
+    case EnumType::kRunning:
+    case EnumType::kPaused:
+    case EnumType::kExpired:
+    case EnumType::kReady:
+        return val;
+    default:
+        return static_cast<EnumType>(4);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(OvenCavityOperationalState::ErrorStateEnum val)
+{
+    using EnumType = OvenCavityOperationalState::ErrorStateEnum;
+    switch (val)
+    {
+    case EnumType::kNoError:
+    case EnumType::kUnableToStartOrResume:
+    case EnumType::kUnableToCompleteOperation:
+    case EnumType::kCommandInvalidInState:
+        return val;
+    default:
+        return static_cast<EnumType>(4);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(OvenCavityOperationalState::OperationalStateEnum val)
+{
+    using EnumType = OvenCavityOperationalState::OperationalStateEnum;
+    switch (val)
+    {
+    case EnumType::kStopped:
+    case EnumType::kRunning:
+    case EnumType::kPaused:
+    case EnumType::kError:
+        return val;
+    default:
+        return static_cast<EnumType>(4);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(OvenMode::ModeTag val)
+{
+    using EnumType = OvenMode::ModeTag;
+    switch (val)
+    {
+    case EnumType::kBake:
+    case EnumType::kConvection:
+    case EnumType::kGrill:
+    case EnumType::kRoast:
+    case EnumType::kClean:
+    case EnumType::kConvectionBake:
+    case EnumType::kConvectionRoast:
+    case EnumType::kWarming:
+    case EnumType::kProofing:
+        return val;
+    default:
+        return static_cast<EnumType>(0);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryDryerControls::DrynessLevelEnum val)
+{
+    using EnumType = LaundryDryerControls::DrynessLevelEnum;
+    switch (val)
+    {
+    case EnumType::kLow:
+    case EnumType::kNormal:
+    case EnumType::kExtra:
+    case EnumType::kMax:
+        return val;
+    default:
+        return static_cast<EnumType>(4);
+    }
+}
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryWasherControls::NumberOfRinsesEnum val)
 {
     using EnumType = LaundryWasherControls::NumberOfRinsesEnum;
@@ -1332,6 +1382,19 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(SmokeCoAlarm::Sensitivi
     }
 }
 
+static auto __attribute__((unused)) EnsureKnownEnumValue(MicrowaveOvenMode::ModeTag val)
+{
+    using EnumType = MicrowaveOvenMode::ModeTag;
+    switch (val)
+    {
+    case EnumType::kNormal:
+    case EnumType::kDefrost:
+        return val;
+    default:
+        return static_cast<EnumType>(0);
+    }
+}
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(OperationalState::ErrorStateEnum val)
 {
     using EnumType = OperationalState::ErrorStateEnum;
@@ -1443,6 +1506,175 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ActivatedCarbonFilterMo
     }
 }
 
+static auto __attribute__((unused)) EnsureKnownEnumValue(BooleanSensorConfiguration::SensitivityEnum val)
+{
+    using EnumType = BooleanSensorConfiguration::SensitivityEnum;
+    switch (val)
+    {
+    case EnumType::kHigh:
+    case EnumType::kStandard:
+    case EnumType::kLow:
+        return val;
+    default:
+        return static_cast<EnumType>(3);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(ValveConfigurationAndControl::ValveStateEnum val)
+{
+    using EnumType = ValveConfigurationAndControl::ValveStateEnum;
+    switch (val)
+    {
+    case EnumType::kOpen:
+    case EnumType::kClosed:
+        return val;
+    default:
+        return static_cast<EnumType>(2);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(DemandResponseLoadControl::CriticalityLevelEnum val)
+{
+    using EnumType = DemandResponseLoadControl::CriticalityLevelEnum;
+    switch (val)
+    {
+    case EnumType::kUnknown:
+    case EnumType::kGreen:
+    case EnumType::kLevel1:
+    case EnumType::kLevel2:
+    case EnumType::kLevel3:
+    case EnumType::kLevel4:
+    case EnumType::kLevel5:
+    case EnumType::kEmergency:
+    case EnumType::kPlannedOutage:
+    case EnumType::kServiceDisconnect:
+        return val;
+    default:
+        return static_cast<EnumType>(10);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DemandResponseLoadControl::HeatingSourceEnum val)
+{
+    using EnumType = DemandResponseLoadControl::HeatingSourceEnum;
+    switch (val)
+    {
+    case EnumType::kAny:
+    case EnumType::kElectric:
+    case EnumType::kNonElectric:
+        return val;
+    default:
+        return static_cast<EnumType>(3);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DemandResponseLoadControl::LoadControlEventChangeSourceEnum val)
+{
+    using EnumType = DemandResponseLoadControl::LoadControlEventChangeSourceEnum;
+    switch (val)
+    {
+    case EnumType::kAutomatic:
+    case EnumType::kUserAction:
+        return val;
+    default:
+        return static_cast<EnumType>(2);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DemandResponseLoadControl::LoadControlEventStatusEnum val)
+{
+    using EnumType = DemandResponseLoadControl::LoadControlEventStatusEnum;
+    switch (val)
+    {
+    case EnumType::kUnknown:
+    case EnumType::kReceived:
+    case EnumType::kInProgress:
+    case EnumType::kCompleted:
+    case EnumType::kOptedOut:
+    case EnumType::kOptedIn:
+    case EnumType::kCanceled:
+    case EnumType::kSuperseded:
+    case EnumType::kPartialOptedOut:
+    case EnumType::kPartialOptedIn:
+    case EnumType::kNoParticipation:
+    case EnumType::kUnavailable:
+    case EnumType::kFailed:
+        return val;
+    default:
+        return static_cast<EnumType>(13);
+    }
+}
+
+static auto __attribute__((unused)) EnsureKnownEnumValue(EnergyEvse::EnergyTransferStoppedReasonEnum val)
+{
+    using EnumType = EnergyEvse::EnergyTransferStoppedReasonEnum;
+    switch (val)
+    {
+    case EnumType::kEVStopped:
+    case EnumType::kEVSEStopped:
+    case EnumType::kOther:
+        return val;
+    default:
+        return static_cast<EnumType>(3);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(EnergyEvse::FaultStateEnum val)
+{
+    using EnumType = EnergyEvse::FaultStateEnum;
+    switch (val)
+    {
+    case EnumType::kNoError:
+    case EnumType::kMeterFailure:
+    case EnumType::kOverVoltage:
+    case EnumType::kUnderVoltage:
+    case EnumType::kOverCurrent:
+    case EnumType::kContactWetFailure:
+    case EnumType::kContactDryFailure:
+    case EnumType::kGroundFault:
+    case EnumType::kPowerLoss:
+    case EnumType::kPowerQuality:
+    case EnumType::kPilotShortCircuit:
+    case EnumType::kEmergencyStop:
+    case EnumType::kEVDisconnected:
+    case EnumType::kWrongPowerSupply:
+    case EnumType::kLiveNeutralSwap:
+    case EnumType::kOverTemperature:
+    case EnumType::kOther:
+        return val;
+    default:
+        return static_cast<EnumType>(16);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(EnergyEvse::StateEnum val)
+{
+    using EnumType = EnergyEvse::StateEnum;
+    switch (val)
+    {
+    case EnumType::kNotPluggedIn:
+    case EnumType::kPluggedInNoDemand:
+    case EnumType::kPluggedInDemand:
+    case EnumType::kPluggedInCharging:
+    case EnumType::kPluggedInDischarging:
+    case EnumType::kSessionEnding:
+    case EnumType::kFault:
+        return val;
+    default:
+        return static_cast<EnumType>(7);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(EnergyEvse::SupplyStateEnum val)
+{
+    using EnumType = EnergyEvse::SupplyStateEnum;
+    switch (val)
+    {
+    case EnumType::kDisabled:
+    case EnumType::kChargingEnabled:
+    case EnumType::kDischargingEnabled:
+    case EnumType::kDisabledError:
+    case EnumType::kDisabledDiagnostics:
+        return val;
+    default:
+        return static_cast<EnumType>(5);
+    }
+}
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::AlarmCodeEnum val)
 {
     using EnumType = DoorLock::AlarmCodeEnum;
@@ -1966,8 +2198,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(FanControl::FanModeSequ
     case EnumType::kOffLowHigh:
     case EnumType::kOffLowMedHighAuto:
     case EnumType::kOffLowHighAuto:
-    case EnumType::kOffOnAuto:
-    case EnumType::kOffOn:
+    case EnumType::kOffHighAuto:
+    case EnumType::kOffHigh:
         return val;
     default:
         return static_cast<EnumType>(6);
@@ -1986,6 +2218,48 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(FanControl::StepDirecti
     }
 }
 
+static auto __attribute__((unused)) EnsureKnownEnumValue(ThermostatUserInterfaceConfiguration::KeypadLockoutEnum val)
+{
+    using EnumType = ThermostatUserInterfaceConfiguration::KeypadLockoutEnum;
+    switch (val)
+    {
+    case EnumType::kNoLockout:
+    case EnumType::kLockout1:
+    case EnumType::kLockout2:
+    case EnumType::kLockout3:
+    case EnumType::kLockout4:
+    case EnumType::kLockout5:
+        return val;
+    default:
+        return static_cast<EnumType>(6);
+    }
+}
+static auto __attribute__((unused))
+EnsureKnownEnumValue(ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum val)
+{
+    using EnumType = ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum;
+    switch (val)
+    {
+    case EnumType::kScheduleProgrammingPermitted:
+    case EnumType::kScheduleProgrammingDenied:
+        return val;
+    default:
+        return static_cast<EnumType>(2);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum val)
+{
+    using EnumType = ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum;
+    switch (val)
+    {
+    case EnumType::kCelsius:
+    case EnumType::kFahrenheit:
+        return val;
+    default:
+        return static_cast<EnumType>(2);
+    }
+}
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(ColorControl::ColorLoopAction val)
 {
     using EnumType = ColorControl::ColorLoopAction;
@@ -2016,17 +2290,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ColorControl::ColorMode
     using EnumType = ColorControl::ColorMode;
     switch (val)
     {
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
     case EnumType::kCurrentHueAndCurrentSaturation:
     case EnumType::kCurrentXAndCurrentY:
     case EnumType::kColorTemperature:
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION:
-    case EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y:
-    case EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE:
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(3);
@@ -2597,19 +2863,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RadonConcentrationMeasu
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(Channel::ChannelStatusEnum val)
-{
-    using EnumType = Channel::ChannelStatusEnum;
-    switch (val)
-    {
-    case EnumType::kSuccess:
-    case EnumType::kMultipleMatches:
-    case EnumType::kNoMatches:
-        return val;
-    default:
-        return static_cast<EnumType>(3);
-    }
-}
 static auto __attribute__((unused)) EnsureKnownEnumValue(Channel::LineupInfoTypeEnum val)
 {
     using EnumType = Channel::LineupInfoTypeEnum;
@@ -2621,37 +2874,34 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Channel::LineupInfoType
         return static_cast<EnumType>(1);
     }
 }
-
-static auto __attribute__((unused)) EnsureKnownEnumValue(TargetNavigator::TargetNavigatorStatusEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(Channel::StatusEnum val)
 {
-    using EnumType = TargetNavigator::TargetNavigatorStatusEnum;
+    using EnumType = Channel::StatusEnum;
     switch (val)
     {
     case EnumType::kSuccess:
-    case EnumType::kTargetNotFound:
-    case EnumType::kNotAllowed:
+    case EnumType::kMultipleMatches:
+    case EnumType::kNoMatches:
         return val;
     default:
         return static_cast<EnumType>(3);
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(MediaPlayback::MediaPlaybackStatusEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(TargetNavigator::StatusEnum val)
 {
-    using EnumType = MediaPlayback::MediaPlaybackStatusEnum;
+    using EnumType = TargetNavigator::StatusEnum;
     switch (val)
     {
     case EnumType::kSuccess:
-    case EnumType::kInvalidStateForCommand:
+    case EnumType::kTargetNotFound:
     case EnumType::kNotAllowed:
-    case EnumType::kNotActive:
-    case EnumType::kSpeedOutOfRange:
-    case EnumType::kSeekOutOfRange:
         return val;
     default:
-        return static_cast<EnumType>(6);
+        return static_cast<EnumType>(3);
     }
 }
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(MediaPlayback::PlaybackStateEnum val)
 {
     using EnumType = MediaPlayback::PlaybackStateEnum;
@@ -2666,6 +2916,22 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(MediaPlayback::Playback
         return static_cast<EnumType>(4);
     }
 }
+static auto __attribute__((unused)) EnsureKnownEnumValue(MediaPlayback::StatusEnum val)
+{
+    using EnumType = MediaPlayback::StatusEnum;
+    switch (val)
+    {
+    case EnumType::kSuccess:
+    case EnumType::kInvalidStateForCommand:
+    case EnumType::kNotAllowed:
+    case EnumType::kNotActive:
+    case EnumType::kSpeedOutOfRange:
+    case EnumType::kSeekOutOfRange:
+        return val;
+    default:
+        return static_cast<EnumType>(6);
+    }
+}
 
 static auto __attribute__((unused)) EnsureKnownEnumValue(MediaInput::InputTypeEnum val)
 {
@@ -2690,9 +2956,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(MediaInput::InputTypeEn
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::CecKeyCode val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::CECKeyCodeEnum val)
 {
-    using EnumType = KeypadInput::CecKeyCode;
+    using EnumType = KeypadInput::CECKeyCodeEnum;
     switch (val)
     {
     case EnumType::kSelect:
@@ -2786,9 +3052,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::CecKeyCode
         return static_cast<EnumType>(14);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::KeypadInputStatusEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::StatusEnum val)
 {
-    using EnumType = KeypadInput::KeypadInputStatusEnum;
+    using EnumType = KeypadInput::StatusEnum;
     switch (val)
     {
     case EnumType::kSuccess:
@@ -2800,19 +3066,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(KeypadInput::KeypadInpu
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::ContentLaunchStatusEnum val)
-{
-    using EnumType = ContentLauncher::ContentLaunchStatusEnum;
-    switch (val)
-    {
-    case EnumType::kSuccess:
-    case EnumType::kUrlNotAvailable:
-    case EnumType::kAuthFailed:
-        return val;
-    default:
-        return static_cast<EnumType>(3);
-    }
-}
 static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::MetricTypeEnum val)
 {
     using EnumType = ContentLauncher::MetricTypeEnum;
@@ -2849,6 +3102,19 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::Parame
         return static_cast<EnumType>(14);
     }
 }
+static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::StatusEnum val)
+{
+    using EnumType = ContentLauncher::StatusEnum;
+    switch (val)
+    {
+    case EnumType::kSuccess:
+    case EnumType::kURLNotAvailable:
+    case EnumType::kAuthFailed:
+        return val;
+    default:
+        return static_cast<EnumType>(3);
+    }
+}
 
 static auto __attribute__((unused)) EnsureKnownEnumValue(AudioOutput::OutputTypeEnum val)
 {
@@ -2867,9 +3133,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(AudioOutput::OutputType
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(ApplicationLauncher::ApplicationLauncherStatusEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(ApplicationLauncher::StatusEnum val)
 {
-    using EnumType = ApplicationLauncher::ApplicationLauncherStatusEnum;
+    using EnumType = ApplicationLauncher::StatusEnum;
     switch (val)
     {
     case EnumType::kSuccess:
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 3c99edccb8242c..1ef1207d3ca0e2 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -21,8 +21,6 @@
 
 #include <stdint.h>
 
-#include <app-common/zap-generated/enums.h>
-
 namespace chip {
 namespace app {
 namespace Clusters {
@@ -90,6 +88,12 @@ enum class NameSupportBitmap : uint8_t
 
 namespace Scenes {
 
+// Bitmap for CopyModeBitmap
+enum class CopyModeBitmap : uint8_t
+{
+    kCopyAllScenes = 0x1,
+};
+
 // Bitmap for Feature
 enum class Feature : uint32_t
 {
@@ -99,10 +103,10 @@ enum class Feature : uint32_t
     kFabricScenes = 0x8,
 };
 
-// Bitmap for ScenesCopyMode
-enum class ScenesCopyMode : uint8_t
+// Bitmap for NameSupportBitmap
+enum class NameSupportBitmap : uint8_t
 {
-    kCopyAllScenes = 0x1,
+    kSceneNames = 0x80,
 };
 } // namespace Scenes
 
@@ -162,6 +166,7 @@ enum class Feature : uint32_t
 {
     kLighting          = 0x1,
     kDeadFrontBehavior = 0x2,
+    kOffOnly           = 0x4,
 };
 
 // Bitmap for OnOffControlBitmap
@@ -175,11 +180,8 @@ namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration
 
 namespace LevelControl {
 
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for MoveMode
-enum class MoveMode : uint8_t
+// Enum for MoveModeEnum
+enum class MoveModeEnum : uint8_t
 {
     kUp   = 0x00,
     kDown = 0x01,
@@ -189,16 +191,9 @@ enum class MoveMode : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 2,
 };
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using MoveMode                                                     = EmberAfMoveMode;
-static MoveMode __attribute__((unused)) kMoveModekUnknownEnumValue = static_cast<MoveMode>(2);
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for StepMode
-enum class StepMode : uint8_t
+// Enum for StepModeEnum
+enum class StepModeEnum : uint8_t
 {
     kUp   = 0x00,
     kDown = 0x01,
@@ -208,10 +203,6 @@ enum class StepMode : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 2,
 };
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using StepMode                                                     = EmberAfStepMode;
-static StepMode __attribute__((unused)) kStepModekUnknownEnumValue = static_cast<StepMode>(2);
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Bitmap for Feature
 enum class Feature : uint32_t
@@ -221,8 +212,8 @@ enum class Feature : uint32_t
     kFrequency = 0x4,
 };
 
-// Bitmap for LevelControlOptions
-enum class LevelControlOptions : uint8_t
+// Bitmap for OptionsBitmap
+enum class OptionsBitmap : uint8_t
 {
     kExecuteIfOff           = 0x1,
     kCoupleColorTempToLevel = 0x2,
@@ -915,6 +906,7 @@ enum class Feature : uint32_t
     kWiFiNetworkInterface     = 0x1,
     kThreadNetworkInterface   = 0x2,
     kEthernetNetworkInterface = 0x4,
+    kPerDeviceCredentials     = 0x8,
 };
 
 // Bitmap for ThreadCapabilitiesBitmap
@@ -930,11 +922,12 @@ enum class ThreadCapabilitiesBitmap : uint16_t
 // Bitmap for WiFiSecurityBitmap
 enum class WiFiSecurityBitmap : uint8_t
 {
-    kUnencrypted  = 0x1,
-    kWep          = 0x2,
-    kWpaPersonal  = 0x4,
-    kWpa2Personal = 0x8,
-    kWpa3Personal = 0x10,
+    kUnencrypted   = 0x1,
+    kWep           = 0x2,
+    kWpaPersonal   = 0x4,
+    kWpa2Personal  = 0x8,
+    kWpa3Personal  = 0x10,
+    kWpa3MatterPdc = 0x20,
 };
 } // namespace NetworkCommissioning
 
@@ -1203,9 +1196,6 @@ enum class Feature : uint32_t
 
 namespace EthernetNetworkDiagnostics {
 
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 // Enum for PHYRateEnum
 enum class PHYRateEnum : uint8_t
 {
@@ -1225,10 +1215,6 @@ enum class PHYRateEnum : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 10,
 };
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using PHYRateEnum                                                        = EmberAfPHYRateEnum;
-static PHYRateEnum __attribute__((unused)) kPHYRateEnumkUnknownEnumValue = static_cast<PHYRateEnum>(10);
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Bitmap for Feature
 enum class Feature : uint32_t
@@ -1515,6 +1501,105 @@ enum class UserActiveModeTriggerBitmap : uint32_t
 };
 } // namespace IcdManagement
 
+namespace Timer {
+
+// Enum for TimerStatusEnum
+enum class TimerStatusEnum : uint8_t
+{
+    kRunning = 0x00,
+    kPaused  = 0x01,
+    kExpired = 0x02,
+    kReady   = 0x03,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 4,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kReset = 0x1,
+};
+} // namespace Timer
+
+namespace OvenCavityOperationalState {
+
+// Enum for ErrorStateEnum
+enum class ErrorStateEnum : uint8_t
+{
+    kNoError                   = 0x00,
+    kUnableToStartOrResume     = 0x01,
+    kUnableToCompleteOperation = 0x02,
+    kCommandInvalidInState     = 0x03,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 4,
+};
+
+// Enum for OperationalStateEnum
+enum class OperationalStateEnum : uint8_t
+{
+    kStopped = 0x00,
+    kRunning = 0x01,
+    kPaused  = 0x02,
+    kError   = 0x03,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 4,
+};
+} // namespace OvenCavityOperationalState
+
+namespace OvenMode {
+
+// Enum for ModeTag
+enum class ModeTag : uint16_t
+{
+    kBake            = 0x4000,
+    kConvection      = 0x4001,
+    kGrill           = 0x4002,
+    kRoast           = 0x4003,
+    kClean           = 0x4004,
+    kConvectionBake  = 0x4005,
+    kConvectionRoast = 0x4006,
+    kWarming         = 0x4007,
+    kProofing        = 0x4008,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 0,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kOnOff = 0x1,
+};
+} // namespace OvenMode
+
+namespace LaundryDryerControls {
+
+// Enum for DrynessLevelEnum
+enum class DrynessLevelEnum : uint8_t
+{
+    kLow    = 0x00,
+    kNormal = 0x01,
+    kExtra  = 0x02,
+    kMax    = 0x03,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 4,
+};
+} // namespace LaundryDryerControls
+
 namespace ModeSelect {
 
 // Bitmap for Feature
@@ -1848,6 +1933,29 @@ enum class Feature : uint32_t
 };
 } // namespace DishwasherAlarm
 
+namespace MicrowaveOvenMode {
+
+// Enum for ModeTag
+enum class ModeTag : uint16_t
+{
+    kNormal  = 0x4000,
+    kDefrost = 0x4001,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 0,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kOnOff = 0x1,
+};
+} // namespace MicrowaveOvenMode
+
+namespace MicrowaveOvenControl {} // namespace MicrowaveOvenControl
+
 namespace OperationalState {
 
 // Enum for ErrorStateEnum
@@ -2015,6 +2123,289 @@ enum class Feature : uint32_t
 };
 } // namespace ActivatedCarbonFilterMonitoring
 
+namespace BooleanSensorConfiguration {
+
+// Enum for SensitivityEnum
+enum class SensitivityEnum : uint8_t
+{
+    kHigh     = 0x00,
+    kStandard = 0x01,
+    kLow      = 0x02,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 3,
+};
+
+// Bitmap for AlarmModeBitmap
+enum class AlarmModeBitmap : uint8_t
+{
+    kVisual  = 0x1,
+    kAudible = 0x2,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kVisual           = 0x1,
+    kAudible          = 0x2,
+    kAlarmSuppress    = 0x4,
+    kSensitivityLevel = 0x8,
+};
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+
+// Enum for ValveStateEnum
+enum class ValveStateEnum : uint8_t
+{
+    kOpen   = 0x00,
+    kClosed = 0x01,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 2,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kTimeSync = 0x1,
+    kLevel    = 0x2,
+};
+
+// Bitmap for ValveFaultBitmap
+enum class ValveFaultBitmap : uint16_t
+{
+    kGeneralFault = 0x1,
+    kBlocked      = 0x2,
+    kLeaking      = 0x4,
+};
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+
+// Enum for CriticalityLevelEnum
+enum class CriticalityLevelEnum : uint8_t
+{
+    kUnknown           = 0x00,
+    kGreen             = 0x01,
+    kLevel1            = 0x02,
+    kLevel2            = 0x03,
+    kLevel3            = 0x04,
+    kLevel4            = 0x05,
+    kLevel5            = 0x06,
+    kEmergency         = 0x07,
+    kPlannedOutage     = 0x08,
+    kServiceDisconnect = 0x09,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 10,
+};
+
+// Enum for HeatingSourceEnum
+enum class HeatingSourceEnum : uint8_t
+{
+    kAny         = 0x00,
+    kElectric    = 0x01,
+    kNonElectric = 0x02,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 3,
+};
+
+// Enum for LoadControlEventChangeSourceEnum
+enum class LoadControlEventChangeSourceEnum : uint8_t
+{
+    kAutomatic  = 0x00,
+    kUserAction = 0x01,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 2,
+};
+
+// Enum for LoadControlEventStatusEnum
+enum class LoadControlEventStatusEnum : uint8_t
+{
+    kUnknown         = 0x00,
+    kReceived        = 0x01,
+    kInProgress      = 0x02,
+    kCompleted       = 0x03,
+    kOptedOut        = 0x04,
+    kOptedIn         = 0x05,
+    kCanceled        = 0x06,
+    kSuperseded      = 0x07,
+    kPartialOptedOut = 0x08,
+    kPartialOptedIn  = 0x09,
+    kNoParticipation = 0x0A,
+    kUnavailable     = 0x0B,
+    kFailed          = 0x0C,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 13,
+};
+
+// Bitmap for CancelControlBitmap
+enum class CancelControlBitmap : uint16_t
+{
+    kRandomEnd = 0x1,
+};
+
+// Bitmap for DeviceClassBitmap
+enum class DeviceClassBitmap : uint32_t
+{
+    kHvac             = 0x1,
+    kStripHeater      = 0x2,
+    kWaterHeater      = 0x4,
+    kPoolPump         = 0x8,
+    kSmartAppliance   = 0x10,
+    kIrrigationPump   = 0x20,
+    kCommercialLoad   = 0x40,
+    kResidentialLoad  = 0x80,
+    kExteriorLighting = 0x100,
+    kInteriorLighting = 0x200,
+    kEv               = 0x400,
+    kGenerationSystem = 0x800,
+    kSmartInverter    = 0x1000,
+    kEvse             = 0x2000,
+    kResu             = 0x4000,
+    kEms              = 0x8000,
+    kSem              = 0x10000,
+};
+
+// Bitmap for EventControlBitmap
+enum class EventControlBitmap : uint16_t
+{
+    kRandomStart = 0x1,
+};
+
+// Bitmap for EventTransitionControlBitmap
+enum class EventTransitionControlBitmap : uint16_t
+{
+    kRandomDuration = 0x1,
+    kIgnoreOptOut   = 0x2,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kEnrollmentGroups    = 0x1,
+    kTemperatureOffset   = 0x2,
+    kTemperatureSetpoint = 0x4,
+    kLoadAdjustment      = 0x8,
+    kDutyCycle           = 0x10,
+    kPowerSavings        = 0x20,
+    kHeatingSource       = 0x40,
+};
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+
+// Enum for EnergyTransferStoppedReasonEnum
+enum class EnergyTransferStoppedReasonEnum : uint8_t
+{
+    kEVStopped   = 0x00,
+    kEVSEStopped = 0x01,
+    kOther       = 0x02,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 3,
+};
+
+// Enum for FaultStateEnum
+enum class FaultStateEnum : uint8_t
+{
+    kNoError           = 0x00,
+    kMeterFailure      = 0x01,
+    kOverVoltage       = 0x02,
+    kUnderVoltage      = 0x03,
+    kOverCurrent       = 0x04,
+    kContactWetFailure = 0x05,
+    kContactDryFailure = 0x06,
+    kGroundFault       = 0x07,
+    kPowerLoss         = 0x08,
+    kPowerQuality      = 0x09,
+    kPilotShortCircuit = 0x0A,
+    kEmergencyStop     = 0x0B,
+    kEVDisconnected    = 0x0C,
+    kWrongPowerSupply  = 0x0D,
+    kLiveNeutralSwap   = 0x0E,
+    kOverTemperature   = 0x0F,
+    kOther             = 0xFF,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 16,
+};
+
+// Enum for StateEnum
+enum class StateEnum : uint8_t
+{
+    kNotPluggedIn         = 0x00,
+    kPluggedInNoDemand    = 0x01,
+    kPluggedInDemand      = 0x02,
+    kPluggedInCharging    = 0x03,
+    kPluggedInDischarging = 0x04,
+    kSessionEnding        = 0x05,
+    kFault                = 0x06,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 7,
+};
+
+// Enum for SupplyStateEnum
+enum class SupplyStateEnum : uint8_t
+{
+    kDisabled            = 0x00,
+    kChargingEnabled     = 0x01,
+    kDischargingEnabled  = 0x02,
+    kDisabledError       = 0x03,
+    kDisabledDiagnostics = 0x04,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 5,
+};
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kChargingPreferences = 0x1,
+    kSoCReporting        = 0x2,
+    kPlugAndCharge       = 0x4,
+    kRfid                = 0x8,
+    kV2x                 = 0x10,
+};
+
+// Bitmap for TargetDayOfWeekBitmap
+enum class TargetDayOfWeekBitmap : uint8_t
+{
+    kSunday    = 0x1,
+    kMonday    = 0x2,
+    kTuesday   = 0x4,
+    kWednesday = 0x8,
+    kThursday  = 0x10,
+    kFriday    = 0x20,
+    kSaturday  = 0x40,
+};
+} // namespace EnergyEvse
+
 namespace DoorLock {
 
 // Enum for AlarmCodeEnum
@@ -2849,8 +3240,8 @@ enum class FanModeSequenceEnum : uint8_t
     kOffLowHigh        = 0x01,
     kOffLowMedHighAuto = 0x02,
     kOffLowHighAuto    = 0x03,
-    kOffOnAuto         = 0x04,
-    kOffOn             = 0x05,
+    kOffHighAuto       = 0x04,
+    kOffHigh           = 0x05,
     // All received enum values that are not listed above will be mapped
     // to kUnknownEnumValue. This is a helper enum value that should only
     // be used by code to process how it handles receiving and unknown
@@ -2897,7 +3288,48 @@ enum class WindBitmap : uint8_t
 };
 } // namespace FanControl
 
-namespace ThermostatUserInterfaceConfiguration {} // namespace ThermostatUserInterfaceConfiguration
+namespace ThermostatUserInterfaceConfiguration {
+
+// Enum for KeypadLockoutEnum
+enum class KeypadLockoutEnum : uint8_t
+{
+    kNoLockout = 0x00,
+    kLockout1  = 0x01,
+    kLockout2  = 0x02,
+    kLockout3  = 0x03,
+    kLockout4  = 0x04,
+    kLockout5  = 0x05,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 6,
+};
+
+// Enum for ScheduleProgrammingVisibilityEnum
+enum class ScheduleProgrammingVisibilityEnum : uint8_t
+{
+    kScheduleProgrammingPermitted = 0x00,
+    kScheduleProgrammingDenied    = 0x01,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 2,
+};
+
+// Enum for TemperatureDisplayModeEnum
+enum class TemperatureDisplayModeEnum : uint8_t
+{
+    kCelsius    = 0x00,
+    kFahrenheit = 0x01,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 2,
+};
+} // namespace ThermostatUserInterfaceConfiguration
 
 namespace ColorControl {
 
@@ -2926,9 +3358,6 @@ enum class ColorLoopDirection : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 // Enum for ColorMode
 enum class ColorMode : uint8_t
 {
@@ -2941,10 +3370,6 @@ enum class ColorMode : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 3,
 };
-#else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using ColorMode                                                      = EmberAfColorMode;
-static ColorMode __attribute__((unused)) kColorModekUnknownEnumValue = static_cast<ColorMode>(3);
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Enum for HueDirection
 enum class HueDirection : uint8_t
@@ -3721,28 +4146,28 @@ namespace WakeOnLan {} // namespace WakeOnLan
 
 namespace Channel {
 
-// Enum for ChannelStatusEnum
-enum class ChannelStatusEnum : uint8_t
+// Enum for LineupInfoTypeEnum
+enum class LineupInfoTypeEnum : uint8_t
 {
-    kSuccess         = 0x00,
-    kMultipleMatches = 0x01,
-    kNoMatches       = 0x02,
+    kMso = 0x00,
     // All received enum values that are not listed above will be mapped
     // to kUnknownEnumValue. This is a helper enum value that should only
     // be used by code to process how it handles receiving and unknown
     // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 3,
+    kUnknownEnumValue = 1,
 };
 
-// Enum for LineupInfoTypeEnum
-enum class LineupInfoTypeEnum : uint8_t
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
 {
-    kMso = 0x00,
+    kSuccess         = 0x00,
+    kMultipleMatches = 0x01,
+    kNoMatches       = 0x02,
     // All received enum values that are not listed above will be mapped
     // to kUnknownEnumValue. This is a helper enum value that should only
     // be used by code to process how it handles receiving and unknown
     // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 1,
+    kUnknownEnumValue = 3,
 };
 
 // Bitmap for Feature
@@ -3755,8 +4180,8 @@ enum class Feature : uint32_t
 
 namespace TargetNavigator {
 
-// Enum for TargetNavigatorStatusEnum
-enum class TargetNavigatorStatusEnum : uint8_t
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
 {
     kSuccess        = 0x00,
     kTargetNotFound = 0x01,
@@ -3771,22 +4196,6 @@ enum class TargetNavigatorStatusEnum : uint8_t
 
 namespace MediaPlayback {
 
-// Enum for MediaPlaybackStatusEnum
-enum class MediaPlaybackStatusEnum : uint8_t
-{
-    kSuccess                = 0x00,
-    kInvalidStateForCommand = 0x01,
-    kNotAllowed             = 0x02,
-    kNotActive              = 0x03,
-    kSpeedOutOfRange        = 0x04,
-    kSeekOutOfRange         = 0x05,
-    // All received enum values that are not listed above will be mapped
-    // to kUnknownEnumValue. This is a helper enum value that should only
-    // be used by code to process how it handles receiving and unknown
-    // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 6,
-};
-
 // Enum for PlaybackStateEnum
 enum class PlaybackStateEnum : uint8_t
 {
@@ -3801,6 +4210,22 @@ enum class PlaybackStateEnum : uint8_t
     kUnknownEnumValue = 4,
 };
 
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
+{
+    kSuccess                = 0x00,
+    kInvalidStateForCommand = 0x01,
+    kNotAllowed             = 0x02,
+    kNotActive              = 0x03,
+    kSpeedOutOfRange        = 0x04,
+    kSeekOutOfRange         = 0x05,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 6,
+};
+
 // Bitmap for Feature
 enum class Feature : uint32_t
 {
@@ -3844,8 +4269,8 @@ namespace LowPower {} // namespace LowPower
 
 namespace KeypadInput {
 
-// Enum for CecKeyCode
-enum class CecKeyCode : uint8_t
+// Enum for CECKeyCodeEnum
+enum class CECKeyCodeEnum : uint8_t
 {
     kSelect                    = 0x00,
     kUp                        = 0x01,
@@ -3940,8 +4365,8 @@ enum class CecKeyCode : uint8_t
     kUnknownEnumValue = 14,
 };
 
-// Enum for KeypadInputStatusEnum
-enum class KeypadInputStatusEnum : uint8_t
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
 {
     kSuccess                  = 0x00,
     kUnsupportedKey           = 0x01,
@@ -3964,19 +4389,6 @@ enum class Feature : uint32_t
 
 namespace ContentLauncher {
 
-// Enum for ContentLaunchStatusEnum
-enum class ContentLaunchStatusEnum : uint8_t
-{
-    kSuccess         = 0x00,
-    kUrlNotAvailable = 0x01,
-    kAuthFailed      = 0x02,
-    // All received enum values that are not listed above will be mapped
-    // to kUnknownEnumValue. This is a helper enum value that should only
-    // be used by code to process how it handles receiving and unknown
-    // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 3,
-};
-
 // Enum for MetricTypeEnum
 enum class MetricTypeEnum : uint8_t
 {
@@ -4013,6 +4425,19 @@ enum class ParameterEnum : uint8_t
     kUnknownEnumValue = 14,
 };
 
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
+{
+    kSuccess         = 0x00,
+    kURLNotAvailable = 0x01,
+    kAuthFailed      = 0x02,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 3,
+};
+
 // Bitmap for Feature
 enum class Feature : uint32_t
 {
@@ -4020,8 +4445,8 @@ enum class Feature : uint32_t
     kURLPlayback   = 0x2,
 };
 
-// Bitmap for SupportedStreamingProtocol
-enum class SupportedStreamingProtocol : uint32_t
+// Bitmap for SupportedProtocolsBitmap
+enum class SupportedProtocolsBitmap : uint32_t
 {
     kDash = 0x1,
     kHls  = 0x2,
@@ -4055,8 +4480,8 @@ enum class Feature : uint32_t
 
 namespace ApplicationLauncher {
 
-// Enum for ApplicationLauncherStatusEnum
-enum class ApplicationLauncherStatusEnum : uint8_t
+// Enum for StatusEnum
+enum class StatusEnum : uint8_t
 {
     kSuccess         = 0x00,
     kAppNotAvailable = 0x01,
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index 139fc46ed756bf..795f65aee985f7 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -924,6 +924,93 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 }
 
 } // namespace ExtensionFieldSet
+
+namespace SceneInfoStruct {
+CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    return DoEncode(aWriter, aTag, NullOptional);
+}
+
+CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const
+{
+    return DoEncode(aWriter, aTag, MakeOptional(aAccessingFabricIndex));
+}
+
+CHIP_ERROR Type::DoEncode(TLV::TLVWriter & aWriter, TLV::Tag aTag, const Optional<FabricIndex> & aAccessingFabricIndex) const
+{
+    bool includeSensitive = !aAccessingFabricIndex.HasValue() || (aAccessingFabricIndex.Value() == fabricIndex);
+
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+
+    encoder.Encode(to_underlying(Fields::kSceneCount), sceneCount);
+    if (includeSensitive)
+    {
+        encoder.Encode(to_underlying(Fields::kCurrentScene), currentScene);
+    }
+    if (includeSensitive)
+    {
+        encoder.Encode(to_underlying(Fields::kCurrentGroup), currentGroup);
+    }
+    if (includeSensitive)
+    {
+        encoder.Encode(to_underlying(Fields::kSceneValid), sceneValid);
+    }
+    encoder.Encode(to_underlying(Fields::kRemainingCapacity), remainingCapacity);
+    if (aAccessingFabricIndex.HasValue())
+    {
+        encoder.Encode(to_underlying(Fields::kFabricIndex), fabricIndex);
+    }
+
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kSceneCount))
+        {
+            err = DataModel::Decode(reader, sceneCount);
+        }
+        else if (__context_tag == to_underlying(Fields::kCurrentScene))
+        {
+            err = DataModel::Decode(reader, currentScene);
+        }
+        else if (__context_tag == to_underlying(Fields::kCurrentGroup))
+        {
+            err = DataModel::Decode(reader, currentGroup);
+        }
+        else if (__context_tag == to_underlying(Fields::kSceneValid))
+        {
+            err = DataModel::Decode(reader, sceneValid);
+        }
+        else if (__context_tag == to_underlying(Fields::kRemainingCapacity))
+        {
+            err = DataModel::Decode(reader, remainingCapacity);
+        }
+        else if (__context_tag == to_underlying(Fields::kFabricIndex))
+        {
+            err = DataModel::Decode(reader, fabricIndex);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+
+} // namespace SceneInfoStruct
 } // namespace Structs
 
 namespace Commands {
@@ -1804,8 +1891,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, lastConfiguredBy);
     case Attributes::SceneTableSize::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, sceneTableSize);
-    case Attributes::RemainingCapacity::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, remainingCapacity);
+    case Attributes::FabricSceneInfo::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, fabricSceneInfo);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -4099,6 +4186,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, capabilityMinima);
     case Attributes::ProductAppearance::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, productAppearance);
+    case Attributes::SpecificationVersion::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, specificationVersion);
+    case Attributes::MaxPathsPerInvoke::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, maxPathsPerInvoke);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -5618,6 +5709,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNetworkID), networkID);
     encoder.Encode(to_underlying(Fields::kConnected), connected);
+    encoder.Encode(to_underlying(Fields::kNetworkIdentifier), networkIdentifier);
+    encoder.Encode(to_underlying(Fields::kClientIdentifier), clientIdentifier);
     return encoder.Finalize();
 }
 
@@ -5643,6 +5736,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, connected);
         }
+        else if (__context_tag == to_underlying(Fields::kNetworkIdentifier))
+        {
+            err = DataModel::Decode(reader, networkIdentifier);
+        }
+        else if (__context_tag == to_underlying(Fields::kClientIdentifier))
+        {
+            err = DataModel::Decode(reader, clientIdentifier);
+        }
         else
         {
         }
@@ -5882,6 +5983,9 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     encoder.Encode(to_underlying(Fields::kSsid), ssid);
     encoder.Encode(to_underlying(Fields::kCredentials), credentials);
     encoder.Encode(to_underlying(Fields::kBreadcrumb), breadcrumb);
+    encoder.Encode(to_underlying(Fields::kNetworkIdentity), networkIdentity);
+    encoder.Encode(to_underlying(Fields::kClientIdentifier), clientIdentifier);
+    encoder.Encode(to_underlying(Fields::kPossessionNonce), possessionNonce);
     return encoder.Finalize();
 }
 
@@ -5911,6 +6015,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, breadcrumb);
         }
+        else if (__context_tag == to_underlying(Fields::kNetworkIdentity))
+        {
+            err = DataModel::Decode(reader, networkIdentity);
+        }
+        else if (__context_tag == to_underlying(Fields::kClientIdentifier))
+        {
+            err = DataModel::Decode(reader, clientIdentifier);
+        }
+        else if (__context_tag == to_underlying(Fields::kPossessionNonce))
+        {
+            err = DataModel::Decode(reader, possessionNonce);
+        }
         else
         {
         }
@@ -6004,6 +6120,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     encoder.Encode(to_underlying(Fields::kNetworkingStatus), networkingStatus);
     encoder.Encode(to_underlying(Fields::kDebugText), debugText);
     encoder.Encode(to_underlying(Fields::kNetworkIndex), networkIndex);
+    encoder.Encode(to_underlying(Fields::kClientIdentity), clientIdentity);
+    encoder.Encode(to_underlying(Fields::kPossessionSignature), possessionSignature);
     return encoder.Finalize();
 }
 
@@ -6033,6 +6151,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, networkIndex);
         }
+        else if (__context_tag == to_underlying(Fields::kClientIdentity))
+        {
+            err = DataModel::Decode(reader, clientIdentity);
+        }
+        else if (__context_tag == to_underlying(Fields::kPossessionSignature))
+        {
+            err = DataModel::Decode(reader, possessionSignature);
+        }
         else
         {
         }
@@ -6168,6 +6294,84 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     }
 }
 } // namespace ReorderNetwork.
+namespace QueryIdentity {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kKeyIdentifier), keyIdentifier);
+    encoder.Encode(to_underlying(Fields::kPossessionNonce), possessionNonce);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kKeyIdentifier))
+        {
+            err = DataModel::Decode(reader, keyIdentifier);
+        }
+        else if (__context_tag == to_underlying(Fields::kPossessionNonce))
+        {
+            err = DataModel::Decode(reader, possessionNonce);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace QueryIdentity.
+namespace QueryIdentityResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kIdentity), identity);
+    encoder.Encode(to_underlying(Fields::kPossessionSignature), possessionSignature);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kIdentity))
+        {
+            err = DataModel::Decode(reader, identity);
+        }
+        else if (__context_tag == to_underlying(Fields::kPossessionSignature))
+        {
+            err = DataModel::Decode(reader, possessionSignature);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace QueryIdentityResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -6457,6 +6661,65 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     }
 }
 } // namespace TestEventTrigger.
+namespace TimeSnapshot {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace TimeSnapshot.
+namespace TimeSnapshotResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kSystemTimeUs), systemTimeUs);
+    encoder.Encode(to_underlying(Fields::kUTCTimeUs), UTCTimeUs);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kSystemTimeUs))
+        {
+            err = DataModel::Decode(reader, systemTimeUs);
+        }
+        else if (__context_tag == to_underlying(Fields::kUTCTimeUs))
+        {
+            err = DataModel::Decode(reader, UTCTimeUs);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace TimeSnapshotResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -6482,8 +6745,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, activeNetworkFaults);
     case Attributes::TestEventTriggersEnabled::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, testEventTriggersEnabled);
-    case Attributes::AverageWearCount::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, averageWearCount);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -7508,7 +7769,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAssociationFailure), associationFailure));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAssociationFailureCause), associationFailureCause));
     ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kStatus), status));
     return aWriter.EndContainer(outer);
 }
@@ -7527,9 +7788,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAssociationFailure))
+        if (__context_tag == to_underlying(Fields::kAssociationFailureCause))
         {
-            err = DataModel::Decode(reader, associationFailure);
+            err = DataModel::Decode(reader, associationFailureCause);
         }
         else if (__context_tag == to_underlying(Fields::kStatus))
         {
@@ -10418,6 +10679,40 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     }
 }
 } // namespace StayActiveRequest.
+namespace StayActiveResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kPromisedActiveDuration), promisedActiveDuration);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kPromisedActiveDuration))
+        {
+            err = DataModel::Decode(reader, promisedActiveDuration);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace StayActiveResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -10462,15 +10757,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {} // namespace Events
 
 } // namespace IcdManagement
-namespace ModeSelect {
-namespace Structs {
+namespace Timer {
 
-namespace SemanticTagStruct {
+namespace Commands {
+namespace SetTimer {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kMfgCode), mfgCode);
-    encoder.Encode(to_underlying(Fields::kValue), value);
+    encoder.Encode(to_underlying(Fields::kNewTime), newTime);
     return encoder.Finalize();
 }
 
@@ -10488,13 +10782,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kMfgCode))
-        {
-            err = DataModel::Decode(reader, mfgCode);
-        }
-        else if (__context_tag == to_underlying(Fields::kValue))
+        if (__context_tag == to_underlying(Fields::kNewTime))
         {
-            err = DataModel::Decode(reader, value);
+            err = DataModel::Decode(reader, newTime);
         }
         else
         {
@@ -10503,16 +10793,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-
-} // namespace SemanticTagStruct
-
-namespace ModeOptionStruct {
+} // namespace SetTimer.
+namespace ResetTimer {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kLabel), label);
-    encoder.Encode(to_underlying(Fields::kMode), mode);
-    encoder.Encode(to_underlying(Fields::kSemanticTags), semanticTags);
     return encoder.Finalize();
 }
 
@@ -10526,21 +10811,34 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+    }
+}
+} // namespace ResetTimer.
+namespace AddTime {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kAdditionalTime), additionalTime);
+    return encoder.Finalize();
+}
 
-        CHIP_ERROR err              = CHIP_NO_ERROR;
-        const uint8_t __context_tag = std::get<uint8_t>(__element);
-
-        if (__context_tag == to_underlying(Fields::kLabel))
-        {
-            err = DataModel::Decode(reader, label);
-        }
-        else if (__context_tag == to_underlying(Fields::kMode))
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
         {
-            err = DataModel::Decode(reader, mode);
+            return std::get<CHIP_ERROR>(__element);
         }
-        else if (__context_tag == to_underlying(Fields::kSemanticTags))
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAdditionalTime))
         {
-            err = DataModel::Decode(reader, semanticTags);
+            err = DataModel::Decode(reader, additionalTime);
         }
         else
         {
@@ -10549,16 +10847,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-
-} // namespace ModeOptionStruct
-} // namespace Structs
-
-namespace Commands {
-namespace ChangeToMode {
+} // namespace AddTime.
+namespace ReduceTime {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
+    encoder.Encode(to_underlying(Fields::kTimeReduction), timeReduction);
     return encoder.Finalize();
 }
 
@@ -10576,9 +10870,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kNewMode))
+        if (__context_tag == to_underlying(Fields::kTimeReduction))
         {
-            err = DataModel::Decode(reader, newMode);
+            err = DataModel::Decode(reader, timeReduction);
         }
         else
         {
@@ -10587,7 +10881,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ChangeToMode.
+} // namespace ReduceTime.
 } // namespace Commands
 
 namespace Attributes {
@@ -10595,18 +10889,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::Description::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, description);
-    case Attributes::StandardNamespace::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, standardNamespace);
-    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supportedModes);
-    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, currentMode);
-    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, startUpMode);
-    case Attributes::OnMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, onMode);
+    case Attributes::SetTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, setTime);
+    case Attributes::TimeRemaining::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, timeRemaining);
+    case Attributes::TimerState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, timerState);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -10627,16 +10915,15 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace ModeSelect
-namespace LaundryWasherMode {
+} // namespace Timer
+namespace OvenCavityOperationalState {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
-namespace ChangeToMode {
+namespace Pause {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
     return encoder.Finalize();
 }
 
@@ -10650,28 +10937,74 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+    }
+}
+} // namespace Pause.
+namespace Stop {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
 
-        CHIP_ERROR err              = CHIP_NO_ERROR;
-        const uint8_t __context_tag = std::get<uint8_t>(__element);
-
-        if (__context_tag == to_underlying(Fields::kNewMode))
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
         {
-            err = DataModel::Decode(reader, newMode);
+            return std::get<CHIP_ERROR>(__element);
         }
-        else
+    }
+}
+} // namespace Stop.
+namespace Start {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
         {
+            return std::get<CHIP_ERROR>(__element);
         }
+    }
+}
+} // namespace Start.
+namespace Resume {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
 
-        ReturnErrorOnFailure(err);
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
     }
 }
-} // namespace ChangeToMode.
-namespace ChangeToModeResponse {
+} // namespace Resume.
+namespace OperationalCommandResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kStatus), status);
-    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
     return encoder.Finalize();
 }
 
@@ -10689,13 +11022,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kStatus))
-        {
-            err = DataModel::Decode(reader, status);
-        }
-        else if (__context_tag == to_underlying(Fields::kStatusText))
+        if (__context_tag == to_underlying(Fields::kCommandResponseState))
         {
-            err = DataModel::Decode(reader, statusText);
+            err = DataModel::Decode(reader, commandResponseState);
         }
         else
         {
@@ -10704,7 +11033,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ChangeToModeResponse.
+} // namespace OperationalCommandResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -10712,14 +11041,18 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supportedModes);
-    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, currentMode);
-    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, startUpMode);
-    case Attributes::OnMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, onMode);
+    case Attributes::PhaseList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, phaseList);
+    case Attributes::CurrentPhase::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentPhase);
+    case Attributes::CountdownTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, countdownTime);
+    case Attributes::OperationalStateList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalStateList);
+    case Attributes::OperationalState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalState);
+    case Attributes::OperationalError::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalError);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -10738,10 +11071,91 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 }
 } // namespace Attributes
 
-namespace Events {} // namespace Events
+namespace Events {
+namespace OperationalError {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kErrorState), errorState));
+    return aWriter.EndContainer(outer);
+}
 
-} // namespace LaundryWasherMode
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kErrorState))
+        {
+            err = DataModel::Decode(reader, errorState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationalError.
+namespace OperationCompletion {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCompletionErrorCode), completionErrorCode));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTotalOperationalTime), totalOperationalTime));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPausedTime), pausedTime));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCompletionErrorCode))
+        {
+            err = DataModel::Decode(reader, completionErrorCode);
+        }
+        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        {
+            err = DataModel::Decode(reader, totalOperationalTime);
+        }
+        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        {
+            err = DataModel::Decode(reader, pausedTime);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationCompletion.
+} // namespace Events
+
+} // namespace OvenCavityOperationalState
+namespace OvenMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -10853,8 +11267,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
-namespace LaundryWasherControls {
+} // namespace OvenMode
+namespace LaundryDryerControls {
 
 namespace Commands {} // namespace Commands
 
@@ -10863,14 +11277,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::SpinSpeeds::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, spinSpeeds);
-    case Attributes::SpinSpeedCurrent::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, spinSpeedCurrent);
-    case Attributes::NumberOfRinses::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, numberOfRinses);
-    case Attributes::SupportedRinses::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supportedRinses);
+    case Attributes::SupportedDrynessLevels::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedDrynessLevels);
+    case Attributes::SelectedDrynessLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, selectedDrynessLevel);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -10891,16 +11301,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace LaundryWasherControls
-namespace RvcRunMode {
-namespace Structs {} // namespace Structs
+} // namespace LaundryDryerControls
+namespace ModeSelect {
+namespace Structs {
 
-namespace Commands {
-namespace ChangeToMode {
+namespace SemanticTagStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
+    encoder.Encode(to_underlying(Fields::kMfgCode), mfgCode);
+    encoder.Encode(to_underlying(Fields::kValue), value);
     return encoder.Finalize();
 }
 
@@ -10918,9 +11328,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kNewMode))
+        if (__context_tag == to_underlying(Fields::kMfgCode))
         {
-            err = DataModel::Decode(reader, newMode);
+            err = DataModel::Decode(reader, mfgCode);
+        }
+        else if (__context_tag == to_underlying(Fields::kValue))
+        {
+            err = DataModel::Decode(reader, value);
         }
         else
         {
@@ -10929,13 +11343,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ChangeToMode.
-namespace ChangeToModeResponse {
+
+} // namespace SemanticTagStruct
+
+namespace ModeOptionStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kStatus), status);
-    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    encoder.Encode(to_underlying(Fields::kLabel), label);
+    encoder.Encode(to_underlying(Fields::kMode), mode);
+    encoder.Encode(to_underlying(Fields::kSemanticTags), semanticTags);
     return encoder.Finalize();
 }
 
@@ -10953,13 +11370,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kStatus))
+        if (__context_tag == to_underlying(Fields::kLabel))
         {
-            err = DataModel::Decode(reader, status);
+            err = DataModel::Decode(reader, label);
         }
-        else if (__context_tag == to_underlying(Fields::kStatusText))
+        else if (__context_tag == to_underlying(Fields::kMode))
         {
-            err = DataModel::Decode(reader, statusText);
+            err = DataModel::Decode(reader, mode);
+        }
+        else if (__context_tag == to_underlying(Fields::kSemanticTags))
+        {
+            err = DataModel::Decode(reader, semanticTags);
         }
         else
         {
@@ -10968,7 +11389,45 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ChangeToModeResponse.
+
+} // namespace ModeOptionStruct
+} // namespace Structs
+
+namespace Commands {
+namespace ChangeToMode {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kNewMode))
+        {
+            err = DataModel::Decode(reader, newMode);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToMode.
 } // namespace Commands
 
 namespace Attributes {
@@ -10976,10 +11435,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
+    case Attributes::Description::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, description);
+    case Attributes::StandardNamespace::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, standardNamespace);
     case Attributes::SupportedModes::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, supportedModes);
     case Attributes::CurrentMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, currentMode);
+    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, startUpMode);
     case Attributes::OnMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, onMode);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
@@ -11002,8 +11467,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace RvcRunMode
-namespace RvcCleanMode {
+} // namespace ModeSelect
+namespace LaundryWasherMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -11091,6 +11556,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, supportedModes);
     case Attributes::CurrentMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, currentMode);
+    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, startUpMode);
     case Attributes::OnMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, onMode);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
@@ -11113,16 +11580,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace RvcCleanMode
-namespace TemperatureControl {
+} // namespace LaundryWasherMode
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
+namespace Structs {} // namespace Structs
 
 namespace Commands {
-namespace SetTemperature {
+namespace ChangeToMode {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kTargetTemperature), targetTemperature);
-    encoder.Encode(to_underlying(Fields::kTargetTemperatureLevel), targetTemperatureLevel);
+    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
     return encoder.Finalize();
 }
 
@@ -11140,13 +11607,48 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kTargetTemperature))
+        if (__context_tag == to_underlying(Fields::kNewMode))
         {
-            err = DataModel::Decode(reader, targetTemperature);
+            err = DataModel::Decode(reader, newMode);
         }
-        else if (__context_tag == to_underlying(Fields::kTargetTemperatureLevel))
+        else
         {
-            err = DataModel::Decode(reader, targetTemperatureLevel);
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToMode.
+namespace ChangeToModeResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kStatus), status);
+    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kStatus))
+        {
+            err = DataModel::Decode(reader, status);
+        }
+        else if (__context_tag == to_underlying(Fields::kStatusText))
+        {
+            err = DataModel::Decode(reader, statusText);
         }
         else
         {
@@ -11155,7 +11657,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace SetTemperature.
+} // namespace ChangeToModeResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -11163,18 +11665,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::TemperatureSetpoint::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, temperatureSetpoint);
-    case Attributes::MinTemperature::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, minTemperature);
-    case Attributes::MaxTemperature::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, maxTemperature);
-    case Attributes::Step::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, step);
-    case Attributes::SelectedTemperatureLevel::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, selectedTemperatureLevel);
-    case Attributes::SupportedTemperatureLevels::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supportedTemperatureLevels);
+    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedModes);
+    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentMode);
+    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, startUpMode);
+    case Attributes::OnMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, onMode);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -11195,8 +11693,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace TemperatureControl
-namespace RefrigeratorAlarm {
+} // namespace RefrigeratorAndTemperatureControlledCabinetMode
+namespace LaundryWasherControls {
 
 namespace Commands {} // namespace Commands
 
@@ -11205,12 +11703,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::Mask::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, mask);
-    case Attributes::State::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, state);
-    case Attributes::Supported::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supported);
+    case Attributes::SpinSpeeds::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, spinSpeeds);
+    case Attributes::SpinSpeedCurrent::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, spinSpeedCurrent);
+    case Attributes::NumberOfRinses::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfRinses);
+    case Attributes::SupportedRinses::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedRinses);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -11229,61 +11729,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 }
 } // namespace Attributes
 
-namespace Events {
-namespace Notify {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActive), active));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kInactive), inactive));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMask), mask));
-    return aWriter.EndContainer(outer);
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    detail::StructDecodeIterator __iterator(reader);
-    while (true)
-    {
-        auto __element = __iterator.Next();
-        if (std::holds_alternative<CHIP_ERROR>(__element))
-        {
-            return std::get<CHIP_ERROR>(__element);
-        }
-
-        CHIP_ERROR err              = CHIP_NO_ERROR;
-        const uint8_t __context_tag = std::get<uint8_t>(__element);
-
-        if (__context_tag == to_underlying(Fields::kActive))
-        {
-            err = DataModel::Decode(reader, active);
-        }
-        else if (__context_tag == to_underlying(Fields::kInactive))
-        {
-            err = DataModel::Decode(reader, inactive);
-        }
-        else if (__context_tag == to_underlying(Fields::kState))
-        {
-            err = DataModel::Decode(reader, state);
-        }
-        else if (__context_tag == to_underlying(Fields::kMask))
-        {
-            err = DataModel::Decode(reader, mask);
-        }
-        else
-        {
-        }
-
-        ReturnErrorOnFailure(err);
-    }
-}
-} // namespace Notify.
-} // namespace Events
+namespace Events {} // namespace Events
 
-} // namespace RefrigeratorAlarm
-namespace DishwasherMode {
+} // namespace LaundryWasherControls
+namespace RvcRunMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -11371,8 +11820,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, supportedModes);
     case Attributes::CurrentMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, currentMode);
-    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, startUpMode);
     case Attributes::OnMode::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, onMode);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
@@ -11395,25 +11842,1693 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace DishwasherMode
-namespace AirQuality {
+} // namespace RvcRunMode
+namespace RvcCleanMode {
+namespace Structs {} // namespace Structs
 
-namespace Commands {} // namespace Commands
+namespace Commands {
+namespace ChangeToMode {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
+    return encoder.Finalize();
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
     {
-    case Attributes::AirQuality::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, airQuality);
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, generatedCommandList);
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, acceptedCommandList);
-    case Attributes::EventList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, eventList);
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kNewMode))
+        {
+            err = DataModel::Decode(reader, newMode);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToMode.
+namespace ChangeToModeResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kStatus), status);
+    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kStatus))
+        {
+            err = DataModel::Decode(reader, status);
+        }
+        else if (__context_tag == to_underlying(Fields::kStatusText))
+        {
+            err = DataModel::Decode(reader, statusText);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToModeResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedModes);
+    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentMode);
+    case Attributes::OnMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, onMode);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace RvcCleanMode
+namespace TemperatureControl {
+
+namespace Commands {
+namespace SetTemperature {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kTargetTemperature), targetTemperature);
+    encoder.Encode(to_underlying(Fields::kTargetTemperatureLevel), targetTemperatureLevel);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kTargetTemperature))
+        {
+            err = DataModel::Decode(reader, targetTemperature);
+        }
+        else if (__context_tag == to_underlying(Fields::kTargetTemperatureLevel))
+        {
+            err = DataModel::Decode(reader, targetTemperatureLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace SetTemperature.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::TemperatureSetpoint::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, temperatureSetpoint);
+    case Attributes::MinTemperature::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, minTemperature);
+    case Attributes::MaxTemperature::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, maxTemperature);
+    case Attributes::Step::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, step);
+    case Attributes::SelectedTemperatureLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, selectedTemperatureLevel);
+    case Attributes::SupportedTemperatureLevels::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedTemperatureLevels);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace TemperatureControl
+namespace RefrigeratorAlarm {
+
+namespace Commands {} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::Mask::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, mask);
+    case Attributes::State::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, state);
+    case Attributes::Supported::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supported);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace Notify {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActive), active));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kInactive), inactive));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMask), mask));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kActive))
+        {
+            err = DataModel::Decode(reader, active);
+        }
+        else if (__context_tag == to_underlying(Fields::kInactive))
+        {
+            err = DataModel::Decode(reader, inactive);
+        }
+        else if (__context_tag == to_underlying(Fields::kState))
+        {
+            err = DataModel::Decode(reader, state);
+        }
+        else if (__context_tag == to_underlying(Fields::kMask))
+        {
+            err = DataModel::Decode(reader, mask);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace Notify.
+} // namespace Events
+
+} // namespace RefrigeratorAlarm
+namespace DishwasherMode {
+namespace Structs {} // namespace Structs
+
+namespace Commands {
+namespace ChangeToMode {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kNewMode), newMode);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kNewMode))
+        {
+            err = DataModel::Decode(reader, newMode);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToMode.
+namespace ChangeToModeResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kStatus), status);
+    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kStatus))
+        {
+            err = DataModel::Decode(reader, status);
+        }
+        else if (__context_tag == to_underlying(Fields::kStatusText))
+        {
+            err = DataModel::Decode(reader, statusText);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ChangeToModeResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedModes);
+    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentMode);
+    case Attributes::StartUpMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, startUpMode);
+    case Attributes::OnMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, onMode);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace DishwasherMode
+namespace AirQuality {
+
+namespace Commands {} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::AirQuality::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, airQuality);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace AirQuality
+namespace SmokeCoAlarm {
+
+namespace Commands {
+namespace SelfTestRequest {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace SelfTestRequest.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::ExpressedState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, expressedState);
+    case Attributes::SmokeState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, smokeState);
+    case Attributes::COState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, COState);
+    case Attributes::BatteryAlert::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, batteryAlert);
+    case Attributes::DeviceMuted::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, deviceMuted);
+    case Attributes::TestInProgress::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, testInProgress);
+    case Attributes::HardwareFaultAlert::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, hardwareFaultAlert);
+    case Attributes::EndOfServiceAlert::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, endOfServiceAlert);
+    case Attributes::InterconnectSmokeAlarm::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, interconnectSmokeAlarm);
+    case Attributes::InterconnectCOAlarm::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, interconnectCOAlarm);
+    case Attributes::ContaminationState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, contaminationState);
+    case Attributes::SmokeSensitivityLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, smokeSensitivityLevel);
+    case Attributes::ExpiryDate::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, expiryDate);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace SmokeAlarm {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        {
+            err = DataModel::Decode(reader, alarmSeverityLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace SmokeAlarm.
+namespace COAlarm {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        {
+            err = DataModel::Decode(reader, alarmSeverityLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace COAlarm.
+namespace LowBattery {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        {
+            err = DataModel::Decode(reader, alarmSeverityLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace LowBattery.
+namespace HardwareFault {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace HardwareFault.
+namespace EndOfService {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace EndOfService.
+namespace SelfTestComplete {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace SelfTestComplete.
+namespace AlarmMuted {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace AlarmMuted.
+namespace MuteEnded {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace MuteEnded.
+namespace InterconnectSmokeAlarm {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        {
+            err = DataModel::Decode(reader, alarmSeverityLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace InterconnectSmokeAlarm.
+namespace InterconnectCOAlarm {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        {
+            err = DataModel::Decode(reader, alarmSeverityLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace InterconnectCOAlarm.
+namespace AllClear {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace AllClear.
+} // namespace Events
+
+} // namespace SmokeCoAlarm
+namespace DishwasherAlarm {
+
+namespace Commands {
+namespace Reset {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kAlarms), alarms);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kAlarms))
+        {
+            err = DataModel::Decode(reader, alarms);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace Reset.
+namespace ModifyEnabledAlarms {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kMask), mask);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kMask))
+        {
+            err = DataModel::Decode(reader, mask);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace ModifyEnabledAlarms.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::Mask::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, mask);
+    case Attributes::Latch::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, latch);
+    case Attributes::State::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, state);
+    case Attributes::Supported::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supported);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace Notify {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActive), active));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kInactive), inactive));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMask), mask));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kActive))
+        {
+            err = DataModel::Decode(reader, active);
+        }
+        else if (__context_tag == to_underlying(Fields::kInactive))
+        {
+            err = DataModel::Decode(reader, inactive);
+        }
+        else if (__context_tag == to_underlying(Fields::kState))
+        {
+            err = DataModel::Decode(reader, state);
+        }
+        else if (__context_tag == to_underlying(Fields::kMask))
+        {
+            err = DataModel::Decode(reader, mask);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace Notify.
+} // namespace Events
+
+} // namespace DishwasherAlarm
+namespace MicrowaveOvenMode {
+namespace Structs {} // namespace Structs
+
+namespace Commands {} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::SupportedModes::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedModes);
+    case Attributes::CurrentMode::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentMode);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace MicrowaveOvenMode
+namespace MicrowaveOvenControl {
+
+namespace Commands {
+namespace SetCookingParameters {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kCookMode), cookMode);
+    encoder.Encode(to_underlying(Fields::kCookTime), cookTime);
+    encoder.Encode(to_underlying(Fields::kPowerSetting), powerSetting);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCookMode))
+        {
+            err = DataModel::Decode(reader, cookMode);
+        }
+        else if (__context_tag == to_underlying(Fields::kCookTime))
+        {
+            err = DataModel::Decode(reader, cookTime);
+        }
+        else if (__context_tag == to_underlying(Fields::kPowerSetting))
+        {
+            err = DataModel::Decode(reader, powerSetting);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace SetCookingParameters.
+namespace AddMoreTime {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kTimeToAdd), timeToAdd);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kTimeToAdd))
+        {
+            err = DataModel::Decode(reader, timeToAdd);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace AddMoreTime.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::CookTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, cookTime);
+    case Attributes::PowerSetting::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, powerSetting);
+    case Attributes::MinPower::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, minPower);
+    case Attributes::MaxPower::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, maxPower);
+    case Attributes::PowerStep::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, powerStep);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace MicrowaveOvenControl
+namespace OperationalState {
+namespace Structs {} // namespace Structs
+
+namespace Commands {
+namespace Pause {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Pause.
+namespace Stop {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Stop.
+namespace Start {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Start.
+namespace Resume {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Resume.
+namespace OperationalCommandResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCommandResponseState))
+        {
+            err = DataModel::Decode(reader, commandResponseState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationalCommandResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::PhaseList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, phaseList);
+    case Attributes::CurrentPhase::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentPhase);
+    case Attributes::CountdownTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, countdownTime);
+    case Attributes::OperationalStateList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalStateList);
+    case Attributes::OperationalState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalState);
+    case Attributes::OperationalError::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalError);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace OperationalError {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kErrorState), errorState));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kErrorState))
+        {
+            err = DataModel::Decode(reader, errorState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationalError.
+namespace OperationCompletion {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCompletionErrorCode), completionErrorCode));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTotalOperationalTime), totalOperationalTime));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPausedTime), pausedTime));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCompletionErrorCode))
+        {
+            err = DataModel::Decode(reader, completionErrorCode);
+        }
+        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        {
+            err = DataModel::Decode(reader, totalOperationalTime);
+        }
+        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        {
+            err = DataModel::Decode(reader, pausedTime);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationCompletion.
+} // namespace Events
+
+} // namespace OperationalState
+namespace RvcOperationalState {
+namespace Structs {} // namespace Structs
+
+namespace Commands {
+namespace Pause {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Pause.
+namespace Stop {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Stop.
+namespace Start {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Start.
+namespace Resume {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace Resume.
+namespace OperationalCommandResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCommandResponseState))
+        {
+            err = DataModel::Decode(reader, commandResponseState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationalCommandResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::PhaseList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, phaseList);
+    case Attributes::CurrentPhase::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentPhase);
+    case Attributes::CountdownTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, countdownTime);
+    case Attributes::OperationalStateList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalStateList);
+    case Attributes::OperationalState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalState);
+    case Attributes::OperationalError::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, operationalError);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace OperationalError {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kErrorState), errorState));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kErrorState))
+        {
+            err = DataModel::Decode(reader, errorState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationalError.
+namespace OperationCompletion {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCompletionErrorCode), completionErrorCode));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTotalOperationalTime), totalOperationalTime));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPausedTime), pausedTime));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCompletionErrorCode))
+        {
+            err = DataModel::Decode(reader, completionErrorCode);
+        }
+        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        {
+            err = DataModel::Decode(reader, totalOperationalTime);
+        }
+        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        {
+            err = DataModel::Decode(reader, pausedTime);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace OperationCompletion.
+} // namespace Events
+
+} // namespace RvcOperationalState
+namespace HepaFilterMonitoring {
+namespace Structs {
+
+namespace ReplacementProductStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kProductIdentifierType), productIdentifierType);
+    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kProductIdentifierType))
+        {
+            err = DataModel::Decode(reader, productIdentifierType);
+        }
+        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        {
+            err = DataModel::Decode(reader, productIdentifierValue);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+
+} // namespace ReplacementProductStruct
+} // namespace Structs
+
+namespace Commands {
+namespace ResetCondition {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace ResetCondition.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::Condition::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, condition);
+    case Attributes::DegradationDirection::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, degradationDirection);
+    case Attributes::ChangeIndication::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, changeIndication);
+    case Attributes::InPlaceIndicator::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, inPlaceIndicator);
+    case Attributes::LastChangedTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, lastChangedTime);
+    case Attributes::ReplacementProductList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, replacementProductList);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, attributeList);
     case Attributes::FeatureMap::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, featureMap);
@@ -11427,11 +13542,54 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace AirQuality
-namespace SmokeCoAlarm {
+} // namespace HepaFilterMonitoring
+namespace ActivatedCarbonFilterMonitoring {
+namespace Structs {
+
+namespace ReplacementProductStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kProductIdentifierType), productIdentifierType);
+    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kProductIdentifierType))
+        {
+            err = DataModel::Decode(reader, productIdentifierType);
+        }
+        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        {
+            err = DataModel::Decode(reader, productIdentifierValue);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+
+} // namespace ReplacementProductStruct
+} // namespace Structs
 
 namespace Commands {
-namespace SelfTestRequest {
+namespace ResetCondition {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
@@ -11450,7 +13608,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
     }
 }
-} // namespace SelfTestRequest.
+} // namespace ResetCondition.
 } // namespace Commands
 
 namespace Attributes {
@@ -11458,32 +13616,18 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::ExpressedState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, expressedState);
-    case Attributes::SmokeState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, smokeState);
-    case Attributes::COState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, COState);
-    case Attributes::BatteryAlert::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, batteryAlert);
-    case Attributes::DeviceMuted::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, deviceMuted);
-    case Attributes::TestInProgress::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, testInProgress);
-    case Attributes::HardwareFaultAlert::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, hardwareFaultAlert);
-    case Attributes::EndOfServiceAlert::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, endOfServiceAlert);
-    case Attributes::InterconnectSmokeAlarm::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, interconnectSmokeAlarm);
-    case Attributes::InterconnectCOAlarm::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, interconnectCOAlarm);
-    case Attributes::ContaminationState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, contaminationState);
-    case Attributes::SmokeSensitivityLevel::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, smokeSensitivityLevel);
-    case Attributes::ExpiryDate::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, expiryDate);
+    case Attributes::Condition::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, condition);
+    case Attributes::DegradationDirection::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, degradationDirection);
+    case Attributes::ChangeIndication::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, changeIndication);
+    case Attributes::InPlaceIndicator::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, inPlaceIndicator);
+    case Attributes::LastChangedTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, lastChangedTime);
+    case Attributes::ReplacementProductList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, replacementProductList);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -11502,14 +13646,18 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 }
 } // namespace Attributes
 
-namespace Events {
-namespace SmokeAlarm {
+namespace Events {} // namespace Events
+
+} // namespace ActivatedCarbonFilterMonitoring
+namespace BooleanSensorConfiguration {
+
+namespace Commands {
+namespace SuppressRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kAlarmsToSuppress), alarmsToSuppress);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11526,9 +13674,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kAlarmsToSuppress))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, alarmsToSuppress);
         }
         else
         {
@@ -11537,13 +13685,48 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace SmokeAlarm.
-namespace COAlarm {
+} // namespace SuppressRequest.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::SensitivityLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, sensitivityLevel);
+    case Attributes::AlarmsActive::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, alarmsActive);
+    case Attributes::AlarmsSuppressed::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, alarmsSuppressed);
+    case Attributes::AlarmsEnabled::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, alarmsEnabled);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace AlarmsStateChanged {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmsActive), alarmsActive));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmsSuppressed), alarmsSuppressed));
     return aWriter.EndContainer(outer);
 }
 
@@ -11561,9 +13744,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kAlarmsActive))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, alarmsActive);
+        }
+        else if (__context_tag == to_underlying(Fields::kAlarmsSuppressed))
+        {
+            err = DataModel::Decode(reader, alarmsSuppressed);
         }
         else
         {
@@ -11572,16 +13759,42 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace COAlarm.
-namespace LowBattery {
+} // namespace AlarmsStateChanged.
+namespace SensorFault {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
     return aWriter.EndContainer(outer);
 }
 
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace SensorFault.
+} // namespace Events
+
+} // namespace BooleanSensorConfiguration
+namespace ValveConfigurationAndControl {
+
+namespace Commands {
+namespace Open {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kOpenDuration), openDuration);
+    return encoder.Finalize();
+}
+
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
     detail::StructDecodeIterator __iterator(reader);
@@ -11596,9 +13809,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kOpenDuration))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, openDuration);
         }
         else
         {
@@ -11607,13 +13820,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace LowBattery.
-namespace HardwareFault {
+} // namespace Open.
+namespace Close {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11628,12 +13840,98 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
     }
 }
-} // namespace HardwareFault.
-namespace EndOfService {
+} // namespace Close.
+namespace SetLevel {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kLevel), level);
+    encoder.Encode(to_underlying(Fields::kOpenDuration), openDuration);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kLevel))
+        {
+            err = DataModel::Decode(reader, level);
+        }
+        else if (__context_tag == to_underlying(Fields::kOpenDuration))
+        {
+            err = DataModel::Decode(reader, openDuration);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace SetLevel.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::OpenDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, openDuration);
+    case Attributes::AutoCloseTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, autoCloseTime);
+    case Attributes::RemainingDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, remainingDuration);
+    case Attributes::CurrentState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentState);
+    case Attributes::TargetState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, targetState);
+    case Attributes::StartUpState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, startUpState);
+    case Attributes::CurrentLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, currentLevel);
+    case Attributes::TargetLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, targetLevel);
+    case Attributes::OpenLevel::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, openLevel);
+    case Attributes::ValveFault::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, valveFault);
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, generatedCommandList);
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, acceptedCommandList);
+    case Attributes::EventList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, eventList);
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, attributeList);
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, featureMap);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {
+namespace ValveStateChanged {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kValveState), valveState));
     return aWriter.EndContainer(outer);
 }
 
@@ -11647,14 +13945,28 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kValveState))
+        {
+            err = DataModel::Decode(reader, valveState);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace EndOfService.
-namespace SelfTestComplete {
+} // namespace ValveStateChanged.
+namespace ValveFault {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kValveFault), valveFault));
     return aWriter.EndContainer(outer);
 }
 
@@ -11668,15 +13980,34 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kValveFault))
+        {
+            err = DataModel::Decode(reader, valveFault);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace SelfTestComplete.
-namespace AlarmMuted {
+} // namespace ValveFault.
+} // namespace Events
+
+} // namespace ValveConfigurationAndControl
+namespace DemandResponseLoadControl {
+namespace Structs {
+
+namespace HeatingSourceControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kHeatingSource), heatingSource);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11689,15 +14020,30 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kHeatingSource))
+        {
+            err = DataModel::Decode(reader, heatingSource);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace AlarmMuted.
-namespace MuteEnded {
+
+} // namespace HeatingSourceControlStruct
+
+namespace PowerSavingsControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kPowerSavings), powerSavings);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11710,16 +14056,30 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kPowerSavings))
+        {
+            err = DataModel::Decode(reader, powerSavings);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace MuteEnded.
-namespace InterconnectSmokeAlarm {
+
+} // namespace PowerSavingsControlStruct
+
+namespace DutyCycleControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kDutyCycle), dutyCycle);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11736,9 +14096,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kDutyCycle))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, dutyCycle);
         }
         else
         {
@@ -11747,14 +14107,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace InterconnectSmokeAlarm.
-namespace InterconnectCOAlarm {
+
+} // namespace DutyCycleControlStruct
+
+namespace AverageLoadControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmSeverityLevel), alarmSeverityLevel));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kLoadAdjustment), loadAdjustment);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11771,9 +14132,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kLoadAdjustment))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, loadAdjustment);
         }
         else
         {
@@ -11782,13 +14143,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace InterconnectCOAlarm.
-namespace AllClear {
+
+} // namespace AverageLoadControlStruct
+
+namespace TemperatureControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kCoolingTempOffset), coolingTempOffset);
+    encoder.Encode(to_underlying(Fields::kHeatingtTempOffset), heatingtTempOffset);
+    encoder.Encode(to_underlying(Fields::kCoolingTempSetpoint), coolingTempSetpoint);
+    encoder.Encode(to_underlying(Fields::kHeatingTempSetpoint), heatingTempSetpoint);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11801,20 +14167,47 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kCoolingTempOffset))
+        {
+            err = DataModel::Decode(reader, coolingTempOffset);
+        }
+        else if (__context_tag == to_underlying(Fields::kHeatingtTempOffset))
+        {
+            err = DataModel::Decode(reader, heatingtTempOffset);
+        }
+        else if (__context_tag == to_underlying(Fields::kCoolingTempSetpoint))
+        {
+            err = DataModel::Decode(reader, coolingTempSetpoint);
+        }
+        else if (__context_tag == to_underlying(Fields::kHeatingTempSetpoint))
+        {
+            err = DataModel::Decode(reader, heatingTempSetpoint);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace AllClear.
-} // namespace Events
 
-} // namespace SmokeCoAlarm
-namespace DishwasherAlarm {
+} // namespace TemperatureControlStruct
 
-namespace Commands {
-namespace Reset {
+namespace LoadControlEventTransitionStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kAlarms), alarms);
+    encoder.Encode(to_underlying(Fields::kDuration), duration);
+    encoder.Encode(to_underlying(Fields::kControl), control);
+    encoder.Encode(to_underlying(Fields::kTemperatureControl), temperatureControl);
+    encoder.Encode(to_underlying(Fields::kAverageLoadControl), averageLoadControl);
+    encoder.Encode(to_underlying(Fields::kDutyCycleControl), dutyCycleControl);
+    encoder.Encode(to_underlying(Fields::kPowerSavingsControl), powerSavingsControl);
+    encoder.Encode(to_underlying(Fields::kHeatingSourceControl), heatingSourceControl);
     return encoder.Finalize();
 }
 
@@ -11832,9 +14225,33 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kAlarms))
+        if (__context_tag == to_underlying(Fields::kDuration))
         {
-            err = DataModel::Decode(reader, alarms);
+            err = DataModel::Decode(reader, duration);
+        }
+        else if (__context_tag == to_underlying(Fields::kControl))
+        {
+            err = DataModel::Decode(reader, control);
+        }
+        else if (__context_tag == to_underlying(Fields::kTemperatureControl))
+        {
+            err = DataModel::Decode(reader, temperatureControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kAverageLoadControl))
+        {
+            err = DataModel::Decode(reader, averageLoadControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kDutyCycleControl))
+        {
+            err = DataModel::Decode(reader, dutyCycleControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kPowerSavingsControl))
+        {
+            err = DataModel::Decode(reader, powerSavingsControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kHeatingSourceControl))
+        {
+            err = DataModel::Decode(reader, heatingSourceControl);
         }
         else
         {
@@ -11843,12 +14260,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace Reset.
-namespace ModifyEnabledAlarms {
+
+} // namespace LoadControlEventTransitionStruct
+
+namespace LoadControlEventStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kMask), mask);
+    encoder.Encode(to_underlying(Fields::kEventID), eventID);
+    encoder.Encode(to_underlying(Fields::kProgramID), programID);
+    encoder.Encode(to_underlying(Fields::kControl), control);
+    encoder.Encode(to_underlying(Fields::kDeviceClass), deviceClass);
+    encoder.Encode(to_underlying(Fields::kEnrollmentGroup), enrollmentGroup);
+    encoder.Encode(to_underlying(Fields::kCriticality), criticality);
+    encoder.Encode(to_underlying(Fields::kStartTime), startTime);
+    encoder.Encode(to_underlying(Fields::kTransitions), transitions);
     return encoder.Finalize();
 }
 
@@ -11866,9 +14292,37 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kMask))
+        if (__context_tag == to_underlying(Fields::kEventID))
         {
-            err = DataModel::Decode(reader, mask);
+            err = DataModel::Decode(reader, eventID);
+        }
+        else if (__context_tag == to_underlying(Fields::kProgramID))
+        {
+            err = DataModel::Decode(reader, programID);
+        }
+        else if (__context_tag == to_underlying(Fields::kControl))
+        {
+            err = DataModel::Decode(reader, control);
+        }
+        else if (__context_tag == to_underlying(Fields::kDeviceClass))
+        {
+            err = DataModel::Decode(reader, deviceClass);
+        }
+        else if (__context_tag == to_underlying(Fields::kEnrollmentGroup))
+        {
+            err = DataModel::Decode(reader, enrollmentGroup);
+        }
+        else if (__context_tag == to_underlying(Fields::kCriticality))
+        {
+            err = DataModel::Decode(reader, criticality);
+        }
+        else if (__context_tag == to_underlying(Fields::kStartTime))
+        {
+            err = DataModel::Decode(reader, startTime);
+        }
+        else if (__context_tag == to_underlying(Fields::kTransitions))
+        {
+            err = DataModel::Decode(reader, transitions);
         }
         else
         {
@@ -11877,51 +14331,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ModifyEnabledAlarms.
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::Mask::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, mask);
-    case Attributes::Latch::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, latch);
-    case Attributes::State::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, state);
-    case Attributes::Supported::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, supported);
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, generatedCommandList);
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, acceptedCommandList);
-    case Attributes::EventList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, eventList);
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, attributeList);
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, featureMap);
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, clusterRevision);
-    default:
-        return CHIP_NO_ERROR;
-    }
-}
-} // namespace Attributes
+} // namespace LoadControlEventStruct
 
-namespace Events {
-namespace Notify {
+namespace LoadControlProgramStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActive), active));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kInactive), inactive));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMask), mask));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kProgramID), programID);
+    encoder.Encode(to_underlying(Fields::kName), name);
+    encoder.Encode(to_underlying(Fields::kEnrollmentGroup), enrollmentGroup);
+    encoder.Encode(to_underlying(Fields::kRandomStartMinutes), randomStartMinutes);
+    encoder.Encode(to_underlying(Fields::kRandomDurationMinutes), randomDurationMinutes);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11938,21 +14360,25 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kActive))
+        if (__context_tag == to_underlying(Fields::kProgramID))
         {
-            err = DataModel::Decode(reader, active);
+            err = DataModel::Decode(reader, programID);
         }
-        else if (__context_tag == to_underlying(Fields::kInactive))
+        else if (__context_tag == to_underlying(Fields::kName))
         {
-            err = DataModel::Decode(reader, inactive);
+            err = DataModel::Decode(reader, name);
         }
-        else if (__context_tag == to_underlying(Fields::kState))
+        else if (__context_tag == to_underlying(Fields::kEnrollmentGroup))
         {
-            err = DataModel::Decode(reader, state);
+            err = DataModel::Decode(reader, enrollmentGroup);
         }
-        else if (__context_tag == to_underlying(Fields::kMask))
+        else if (__context_tag == to_underlying(Fields::kRandomStartMinutes))
         {
-            err = DataModel::Decode(reader, mask);
+            err = DataModel::Decode(reader, randomStartMinutes);
+        }
+        else if (__context_tag == to_underlying(Fields::kRandomDurationMinutes))
+        {
+            err = DataModel::Decode(reader, randomDurationMinutes);
         }
         else
         {
@@ -11961,18 +14387,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace Notify.
-} // namespace Events
 
-} // namespace DishwasherAlarm
-namespace OperationalState {
-namespace Structs {} // namespace Structs
+} // namespace LoadControlProgramStruct
+} // namespace Structs
 
 namespace Commands {
-namespace Pause {
+namespace RegisterLoadControlProgramRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kLoadControlProgram), loadControlProgram);
     return encoder.Finalize();
 }
 
@@ -11986,13 +14410,27 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kLoadControlProgram))
+        {
+            err = DataModel::Decode(reader, loadControlProgram);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Pause.
-namespace Stop {
+} // namespace RegisterLoadControlProgramRequest.
+namespace UnregisterLoadControlProgramRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kLoadControlProgramID), loadControlProgramID);
     return encoder.Finalize();
 }
 
@@ -12006,13 +14444,27 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kLoadControlProgramID))
+        {
+            err = DataModel::Decode(reader, loadControlProgramID);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
-}
-} // namespace Stop.
-namespace Start {
+}
+} // namespace UnregisterLoadControlProgramRequest.
+namespace AddLoadControlEventRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kEvent), event);
     return encoder.Finalize();
 }
 
@@ -12026,13 +14478,28 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kEvent))
+        {
+            err = DataModel::Decode(reader, event);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Start.
-namespace Resume {
+} // namespace AddLoadControlEventRequest.
+namespace RemoveLoadControlEventRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kEventID), eventID);
+    encoder.Encode(to_underlying(Fields::kCancelControl), cancelControl);
     return encoder.Finalize();
 }
 
@@ -12046,14 +14513,30 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kEventID))
+        {
+            err = DataModel::Decode(reader, eventID);
+        }
+        else if (__context_tag == to_underlying(Fields::kCancelControl))
+        {
+            err = DataModel::Decode(reader, cancelControl);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Resume.
-namespace OperationalCommandResponse {
+} // namespace RemoveLoadControlEventRequest.
+namespace ClearLoadControlEventsRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
     return encoder.Finalize();
 }
 
@@ -12067,22 +14550,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
-
-        CHIP_ERROR err              = CHIP_NO_ERROR;
-        const uint8_t __context_tag = std::get<uint8_t>(__element);
-
-        if (__context_tag == to_underlying(Fields::kCommandResponseState))
-        {
-            err = DataModel::Decode(reader, commandResponseState);
-        }
-        else
-        {
-        }
-
-        ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalCommandResponse.
+} // namespace ClearLoadControlEventsRequest.
 } // namespace Commands
 
 namespace Attributes {
@@ -12090,18 +14560,22 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::PhaseList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, phaseList);
-    case Attributes::CurrentPhase::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, currentPhase);
-    case Attributes::CountdownTime::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, countdownTime);
-    case Attributes::OperationalStateList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalStateList);
-    case Attributes::OperationalState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalState);
-    case Attributes::OperationalError::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalError);
+    case Attributes::LoadControlPrograms::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, loadControlPrograms);
+    case Attributes::NumberOfLoadControlPrograms::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfLoadControlPrograms);
+    case Attributes::Events::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, events);
+    case Attributes::ActiveEvents::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, activeEvents);
+    case Attributes::NumberOfEventsPerProgram::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfEventsPerProgram);
+    case Attributes::NumberOfTransitions::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfTransitions);
+    case Attributes::DefaultRandomStart::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, defaultRandomStart);
+    case Attributes::DefaultRandomDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, defaultRandomDuration);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -12121,12 +14595,21 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
-namespace OperationalError {
+namespace LoadControlEventStatusChange {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kErrorState), errorState));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kEventID), eventID));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTransitionIndex), transitionIndex));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kStatus), status));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCriticality), criticality));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kControl), control));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTemperatureControl), temperatureControl));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAverageLoadControl), averageLoadControl));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kDutyCycleControl), dutyCycleControl));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPowerSavingsControl), powerSavingsControl));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kHeatingSourceControl), heatingSourceControl));
     return aWriter.EndContainer(outer);
 }
 
@@ -12144,9 +14627,45 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kErrorState))
+        if (__context_tag == to_underlying(Fields::kEventID))
         {
-            err = DataModel::Decode(reader, errorState);
+            err = DataModel::Decode(reader, eventID);
+        }
+        else if (__context_tag == to_underlying(Fields::kTransitionIndex))
+        {
+            err = DataModel::Decode(reader, transitionIndex);
+        }
+        else if (__context_tag == to_underlying(Fields::kStatus))
+        {
+            err = DataModel::Decode(reader, status);
+        }
+        else if (__context_tag == to_underlying(Fields::kCriticality))
+        {
+            err = DataModel::Decode(reader, criticality);
+        }
+        else if (__context_tag == to_underlying(Fields::kControl))
+        {
+            err = DataModel::Decode(reader, control);
+        }
+        else if (__context_tag == to_underlying(Fields::kTemperatureControl))
+        {
+            err = DataModel::Decode(reader, temperatureControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kAverageLoadControl))
+        {
+            err = DataModel::Decode(reader, averageLoadControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kDutyCycleControl))
+        {
+            err = DataModel::Decode(reader, dutyCycleControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kPowerSavingsControl))
+        {
+            err = DataModel::Decode(reader, powerSavingsControl);
+        }
+        else if (__context_tag == to_underlying(Fields::kHeatingSourceControl))
+        {
+            err = DataModel::Decode(reader, heatingSourceControl);
         }
         else
         {
@@ -12155,16 +14674,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalError.
-namespace OperationCompletion {
+} // namespace LoadControlEventStatusChange.
+} // namespace Events
+
+} // namespace DemandResponseLoadControl
+namespace EnergyEvse {
+namespace Structs {
+
+namespace ChargingTargetStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCompletionErrorCode), completionErrorCode));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTotalOperationalTime), totalOperationalTime));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPausedTime), pausedTime));
-    return aWriter.EndContainer(outer);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kTargetTime), targetTime);
+    encoder.Encode(to_underlying(Fields::kTargetSoC), targetSoC);
+    encoder.Encode(to_underlying(Fields::kAddedEnergy), addedEnergy);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12181,17 +14705,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kCompletionErrorCode))
+        if (__context_tag == to_underlying(Fields::kTargetTime))
         {
-            err = DataModel::Decode(reader, completionErrorCode);
+            err = DataModel::Decode(reader, targetTime);
         }
-        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        else if (__context_tag == to_underlying(Fields::kTargetSoC))
         {
-            err = DataModel::Decode(reader, totalOperationalTime);
+            err = DataModel::Decode(reader, targetSoC);
         }
-        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        else if (__context_tag == to_underlying(Fields::kAddedEnergy))
         {
-            err = DataModel::Decode(reader, pausedTime);
+            err = DataModel::Decode(reader, addedEnergy);
         }
         else
         {
@@ -12200,18 +14724,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationCompletion.
-} // namespace Events
 
-} // namespace OperationalState
-namespace RvcOperationalState {
-namespace Structs {} // namespace Structs
+} // namespace ChargingTargetStruct
+} // namespace Structs
 
 namespace Commands {
-namespace Pause {
+namespace GetTargetsResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kDayOfWeekforSequence), dayOfWeekforSequence);
+    encoder.Encode(to_underlying(Fields::kChargingTargets), chargingTargets);
     return encoder.Finalize();
 }
 
@@ -12225,10 +14748,27 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kDayOfWeekforSequence))
+        {
+            err = DataModel::Decode(reader, dayOfWeekforSequence);
+        }
+        else if (__context_tag == to_underlying(Fields::kChargingTargets))
+        {
+            err = DataModel::Decode(reader, chargingTargets);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Pause.
-namespace Stop {
+} // namespace GetTargetsResponse.
+namespace Disable {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
@@ -12247,11 +14787,57 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
     }
 }
-} // namespace Stop.
-namespace Start {
+} // namespace Disable.
+namespace EnableCharging {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kChargingEnabledUntil), chargingEnabledUntil);
+    encoder.Encode(to_underlying(Fields::kMinimumChargeCurrent), minimumChargeCurrent);
+    encoder.Encode(to_underlying(Fields::kMaximumChargeCurrent), maximumChargeCurrent);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kChargingEnabledUntil))
+        {
+            err = DataModel::Decode(reader, chargingEnabledUntil);
+        }
+        else if (__context_tag == to_underlying(Fields::kMinimumChargeCurrent))
+        {
+            err = DataModel::Decode(reader, minimumChargeCurrent);
+        }
+        else if (__context_tag == to_underlying(Fields::kMaximumChargeCurrent))
+        {
+            err = DataModel::Decode(reader, maximumChargeCurrent);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace EnableCharging.
+namespace EnableDischarging {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kDischargingEnabledUntil), dischargingEnabledUntil);
+    encoder.Encode(to_underlying(Fields::kMaximumDischargeCurrent), maximumDischargeCurrent);
     return encoder.Finalize();
 }
 
@@ -12265,10 +14851,27 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kDischargingEnabledUntil))
+        {
+            err = DataModel::Decode(reader, dischargingEnabledUntil);
+        }
+        else if (__context_tag == to_underlying(Fields::kMaximumDischargeCurrent))
+        {
+            err = DataModel::Decode(reader, maximumDischargeCurrent);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Start.
-namespace Resume {
+} // namespace EnableDischarging.
+namespace StartDiagnostics {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
@@ -12287,12 +14890,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
     }
 }
-} // namespace Resume.
-namespace OperationalCommandResponse {
+} // namespace StartDiagnostics.
+namespace SetTargets {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
+    encoder.Encode(to_underlying(Fields::kDayOfWeekforSequence), dayOfWeekforSequence);
+    encoder.Encode(to_underlying(Fields::kChargingTargets), chargingTargets);
     return encoder.Finalize();
 }
 
@@ -12310,9 +14914,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kCommandResponseState))
+        if (__context_tag == to_underlying(Fields::kDayOfWeekforSequence))
         {
-            err = DataModel::Decode(reader, commandResponseState);
+            err = DataModel::Decode(reader, dayOfWeekforSequence);
+        }
+        else if (__context_tag == to_underlying(Fields::kChargingTargets))
+        {
+            err = DataModel::Decode(reader, chargingTargets);
         }
         else
         {
@@ -12321,7 +14929,61 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalCommandResponse.
+} // namespace SetTargets.
+namespace GetTargets {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kDaysToReturn), daysToReturn);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kDaysToReturn))
+        {
+            err = DataModel::Decode(reader, daysToReturn);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace GetTargets.
+namespace ClearTargets {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
+    }
+}
+} // namespace ClearTargets.
 } // namespace Commands
 
 namespace Attributes {
@@ -12329,18 +14991,56 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::PhaseList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, phaseList);
-    case Attributes::CurrentPhase::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, currentPhase);
-    case Attributes::CountdownTime::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, countdownTime);
-    case Attributes::OperationalStateList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalStateList);
-    case Attributes::OperationalState::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalState);
-    case Attributes::OperationalError::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, operationalError);
+    case Attributes::State::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, state);
+    case Attributes::SupplyState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supplyState);
+    case Attributes::FaultState::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, faultState);
+    case Attributes::ChargingEnabledUntil::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, chargingEnabledUntil);
+    case Attributes::DischargingEnabledUntil::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, dischargingEnabledUntil);
+    case Attributes::CircuitCapacity::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, circuitCapacity);
+    case Attributes::MinimumChargeCurrent::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, minimumChargeCurrent);
+    case Attributes::MaximumChargeCurrent::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, maximumChargeCurrent);
+    case Attributes::MaximumDischargeCurrent::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, maximumDischargeCurrent);
+    case Attributes::UserMaximumChargeCurrent::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, userMaximumChargeCurrent);
+    case Attributes::RandomizationDelayWindow::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, randomizationDelayWindow);
+    case Attributes::NumberOfWeeklyTargets::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfWeeklyTargets);
+    case Attributes::NumberOfDailyTargets::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfDailyTargets);
+    case Attributes::NextChargeStartTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, nextChargeStartTime);
+    case Attributes::NextChargeTargetTime::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, nextChargeTargetTime);
+    case Attributes::NextChargeRequiredEnergy::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, nextChargeRequiredEnergy);
+    case Attributes::NextChargeTargetSoC::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, nextChargeTargetSoC);
+    case Attributes::ApproximateEVEfficiency::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, approximateEVEfficiency);
+    case Attributes::StateOfCharge::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, stateOfCharge);
+    case Attributes::BatteryCapacity::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, batteryCapacity);
+    case Attributes::VehicleID::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, vehicleID);
+    case Attributes::SessionID::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, sessionID);
+    case Attributes::SessionDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, sessionDuration);
+    case Attributes::SessionEnergyCharged::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, sessionEnergyCharged);
+    case Attributes::SessionEnergyDischarged::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, sessionEnergyDischarged);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -12360,12 +15060,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
-namespace OperationalError {
+namespace EVConnected {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kErrorState), errorState));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionID), sessionID));
     return aWriter.EndContainer(outer);
 }
 
@@ -12383,9 +15083,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kErrorState))
+        if (__context_tag == to_underlying(Fields::kSessionID))
         {
-            err = DataModel::Decode(reader, errorState);
+            err = DataModel::Decode(reader, sessionID);
         }
         else
         {
@@ -12394,15 +15094,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalError.
-namespace OperationCompletion {
+} // namespace EVConnected.
+namespace EVNotDetected {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCompletionErrorCode), completionErrorCode));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTotalOperationalTime), totalOperationalTime));
-    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kPausedTime), pausedTime));
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionID), sessionID));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionDuration), sessionDuration));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionEnergyCharged), sessionEnergyCharged));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionEnergyDischarged), sessionEnergyDischarged));
     return aWriter.EndContainer(outer);
 }
 
@@ -12420,17 +15122,25 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kCompletionErrorCode))
+        if (__context_tag == to_underlying(Fields::kSessionID))
         {
-            err = DataModel::Decode(reader, completionErrorCode);
+            err = DataModel::Decode(reader, sessionID);
         }
-        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        else if (__context_tag == to_underlying(Fields::kState))
         {
-            err = DataModel::Decode(reader, totalOperationalTime);
+            err = DataModel::Decode(reader, state);
         }
-        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        else if (__context_tag == to_underlying(Fields::kSessionDuration))
         {
-            err = DataModel::Decode(reader, pausedTime);
+            err = DataModel::Decode(reader, sessionDuration);
+        }
+        else if (__context_tag == to_underlying(Fields::kSessionEnergyCharged))
+        {
+            err = DataModel::Decode(reader, sessionEnergyCharged);
+        }
+        else if (__context_tag == to_underlying(Fields::kSessionEnergyDischarged))
+        {
+            err = DataModel::Decode(reader, sessionEnergyDischarged);
         }
         else
         {
@@ -12439,20 +15149,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationCompletion.
-} // namespace Events
-
-} // namespace RvcOperationalState
-namespace HepaFilterMonitoring {
-namespace Structs {
-
-namespace ReplacementProductStruct {
+} // namespace EVNotDetected.
+namespace EnergyTransferStarted {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kProductIdentifierType), productIdentifierType);
-    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
-    return encoder.Finalize();
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionID), sessionID));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMaximumCurrent), maximumCurrent));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12469,13 +15175,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kProductIdentifierType))
+        if (__context_tag == to_underlying(Fields::kSessionID))
         {
-            err = DataModel::Decode(reader, productIdentifierType);
+            err = DataModel::Decode(reader, sessionID);
         }
-        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        else if (__context_tag == to_underlying(Fields::kState))
         {
-            err = DataModel::Decode(reader, productIdentifierValue);
+            err = DataModel::Decode(reader, state);
+        }
+        else if (__context_tag == to_underlying(Fields::kMaximumCurrent))
+        {
+            err = DataModel::Decode(reader, maximumCurrent);
         }
         else
         {
@@ -12484,16 +15194,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-
-} // namespace ReplacementProductStruct
-} // namespace Structs
-
-namespace Commands {
-namespace ResetCondition {
+} // namespace EnergyTransferStarted.
+namespace EnergyTransferStopped {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    return encoder.Finalize();
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionID), sessionID));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kReason), reason));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kEnergyTransferred), energyTransferred));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12506,59 +15217,44 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
-    }
-}
-} // namespace ResetCondition.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::Condition::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, condition);
-    case Attributes::DegradationDirection::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, degradationDirection);
-    case Attributes::ChangeIndication::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, changeIndication);
-    case Attributes::InPlaceIndicator::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, inPlaceIndicator);
-    case Attributes::LastChangedTime::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, lastChangedTime);
-    case Attributes::ReplacementProductList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, replacementProductList);
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, generatedCommandList);
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, acceptedCommandList);
-    case Attributes::EventList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, eventList);
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, attributeList);
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, featureMap);
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, clusterRevision);
-    default:
-        return CHIP_NO_ERROR;
-    }
-}
-} // namespace Attributes
 
-namespace Events {} // namespace Events
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-} // namespace HepaFilterMonitoring
-namespace ActivatedCarbonFilterMonitoring {
-namespace Structs {
+        if (__context_tag == to_underlying(Fields::kSessionID))
+        {
+            err = DataModel::Decode(reader, sessionID);
+        }
+        else if (__context_tag == to_underlying(Fields::kState))
+        {
+            err = DataModel::Decode(reader, state);
+        }
+        else if (__context_tag == to_underlying(Fields::kReason))
+        {
+            err = DataModel::Decode(reader, reason);
+        }
+        else if (__context_tag == to_underlying(Fields::kEnergyTransferred))
+        {
+            err = DataModel::Decode(reader, energyTransferred);
+        }
+        else
+        {
+        }
 
-namespace ReplacementProductStruct {
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace EnergyTransferStopped.
+namespace Fault {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.Encode(to_underlying(Fields::kProductIdentifierType), productIdentifierType);
-    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
-    return encoder.Finalize();
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kSessionID), sessionID));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kState), state));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFaultStatePreviousState), faultStatePreviousState));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFaultStateCurrentState), faultStateCurrentState));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12575,13 +15271,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         CHIP_ERROR err              = CHIP_NO_ERROR;
         const uint8_t __context_tag = std::get<uint8_t>(__element);
 
-        if (__context_tag == to_underlying(Fields::kProductIdentifierType))
+        if (__context_tag == to_underlying(Fields::kSessionID))
         {
-            err = DataModel::Decode(reader, productIdentifierType);
+            err = DataModel::Decode(reader, sessionID);
         }
-        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        else if (__context_tag == to_underlying(Fields::kState))
         {
-            err = DataModel::Decode(reader, productIdentifierValue);
+            err = DataModel::Decode(reader, state);
+        }
+        else if (__context_tag == to_underlying(Fields::kFaultStatePreviousState))
+        {
+            err = DataModel::Decode(reader, faultStatePreviousState);
+        }
+        else if (__context_tag == to_underlying(Fields::kFaultStateCurrentState))
+        {
+            err = DataModel::Decode(reader, faultStateCurrentState);
         }
         else
         {
@@ -12590,16 +15294,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-
-} // namespace ReplacementProductStruct
-} // namespace Structs
-
-namespace Commands {
-namespace ResetCondition {
+} // namespace Fault.
+namespace Rfid {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    return encoder.Finalize();
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kUid), uid));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12612,49 +15314,25 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
-    }
-}
-} // namespace ResetCondition.
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::Condition::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, condition);
-    case Attributes::DegradationDirection::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, degradationDirection);
-    case Attributes::ChangeIndication::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, changeIndication);
-    case Attributes::InPlaceIndicator::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, inPlaceIndicator);
-    case Attributes::LastChangedTime::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, lastChangedTime);
-    case Attributes::ReplacementProductList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, replacementProductList);
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, generatedCommandList);
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, acceptedCommandList);
-    case Attributes::EventList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, eventList);
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, attributeList);
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, featureMap);
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, clusterRevision);
-    default:
-        return CHIP_NO_ERROR;
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kUid))
+        {
+            err = DataModel::Decode(reader, uid);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Attributes
-
-namespace Events {} // namespace Events
+} // namespace Rfid.
+} // namespace Events
 
-} // namespace ActivatedCarbonFilterMonitoring
+} // namespace EnergyEvse
 namespace DoorLock {
 namespace Structs {
 
@@ -17506,6 +20184,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
     {
     case Attributes::MACAddress::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, MACAddress);
+    case Attributes::LinkLocalAddress::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, linkLocalAddress);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -22593,6 +25273,21 @@ bool CommandNeedsTimedInvoke(ClusterId aCluster, CommandId aCommand)
             return false;
         }
     }
+    case Clusters::EnergyEvse::Id: {
+        switch (aCommand)
+        {
+        case Clusters::EnergyEvse::Commands::Disable::Id:
+        case Clusters::EnergyEvse::Commands::EnableCharging::Id:
+        case Clusters::EnergyEvse::Commands::EnableDischarging::Id:
+        case Clusters::EnergyEvse::Commands::StartDiagnostics::Id:
+        case Clusters::EnergyEvse::Commands::SetTargets::Id:
+        case Clusters::EnergyEvse::Commands::GetTargets::Id:
+        case Clusters::EnergyEvse::Commands::ClearTargets::Id:
+            return true;
+        default:
+            return false;
+        }
+    }
     case Clusters::DoorLock::Id: {
         switch (aCommand)
         {
@@ -22848,6 +25543,27 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand)
             return false;
         }
     }
+    case Clusters::Timer::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::OvenCavityOperationalState::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::OvenMode::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
     case Clusters::ModeSelect::Id: {
         switch (aCommand)
         {
@@ -22911,6 +25627,13 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand)
             return false;
         }
     }
+    case Clusters::MicrowaveOvenControl::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
     case Clusters::OperationalState::Id: {
         switch (aCommand)
         {
@@ -22939,6 +25662,34 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand)
             return false;
         }
     }
+    case Clusters::BooleanSensorConfiguration::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::ValveConfigurationAndControl::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::DemandResponseLoadControl::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::EnergyEvse::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
     case Clusters::DoorLock::Id: {
         switch (aCommand)
         {
@@ -23047,6 +25798,12 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand)
     case Clusters::AccountLogin::Id: {
         switch (aCommand)
         {
+        case Clusters::AccountLogin::Commands::GetSetupPIN::Id:
+            return true;
+        case Clusters::AccountLogin::Commands::Login::Id:
+            return true;
+        case Clusters::AccountLogin::Commands::Logout::Id:
+            return true;
         default:
             return false;
         }
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index e0ded3fa26632b..3a3ebd1e3c0295 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
@@ -967,6 +966,45 @@ struct DecodableType
 };
 
 } // namespace ExtensionFieldSet
+namespace SceneInfoStruct {
+enum class Fields : uint8_t
+{
+    kSceneCount        = 0,
+    kCurrentScene      = 1,
+    kCurrentGroup      = 2,
+    kSceneValid        = 3,
+    kRemainingCapacity = 4,
+    kFabricIndex       = 254,
+};
+
+struct Type
+{
+public:
+    uint8_t sceneCount            = static_cast<uint8_t>(0);
+    uint8_t currentScene          = static_cast<uint8_t>(0);
+    chip::GroupId currentGroup    = static_cast<chip::GroupId>(0);
+    bool sceneValid               = static_cast<bool>(0);
+    uint8_t remainingCapacity     = static_cast<uint8_t>(0);
+    chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = true;
+
+    auto GetFabricIndex() const { return fabricIndex; }
+
+    void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; }
+
+    CHIP_ERROR EncodeForWrite(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR EncodeForRead(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
+
+private:
+    CHIP_ERROR DoEncode(TLV::TLVWriter & aWriter, TLV::Tag aTag, const Optional<FabricIndex> & aAccessingFabricIndex) const;
+};
+
+using DecodableType = Type;
+
+} // namespace SceneInfoStruct
 } // namespace Structs
 
 namespace Commands {
@@ -1739,7 +1777,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::CopyScene::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
 
-    chip::BitMask<ScenesCopyMode> mode = static_cast<chip::BitMask<ScenesCopyMode>>(0);
+    chip::BitMask<CopyModeBitmap> mode = static_cast<chip::BitMask<CopyModeBitmap>>(0);
     chip::GroupId groupIdentifierFrom  = static_cast<chip::GroupId>(0);
     uint8_t sceneIdentifierFrom        = static_cast<uint8_t>(0);
     chip::GroupId groupIdentifierTo    = static_cast<chip::GroupId>(0);
@@ -1758,7 +1796,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::CopyScene::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
 
-    chip::BitMask<ScenesCopyMode> mode = static_cast<chip::BitMask<ScenesCopyMode>>(0);
+    chip::BitMask<CopyModeBitmap> mode = static_cast<chip::BitMask<CopyModeBitmap>>(0);
     chip::GroupId groupIdentifierFrom  = static_cast<chip::GroupId>(0);
     uint8_t sceneIdentifierFrom        = static_cast<uint8_t>(0);
     chip::GroupId groupIdentifierTo    = static_cast<chip::GroupId>(0);
@@ -1859,9 +1897,9 @@ struct TypeInfo
 namespace NameSupport {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::NameSupport::Id; }
@@ -1892,18 +1930,19 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace SceneTableSize
-namespace RemainingCapacity {
+namespace FabricSceneInfo {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RemainingCapacity::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::FabricSceneInfo::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RemainingCapacity
+} // namespace FabricSceneInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -1953,10 +1992,11 @@ struct TypeInfo
         Attributes::CurrentScene::TypeInfo::DecodableType currentScene = static_cast<uint8_t>(0);
         Attributes::CurrentGroup::TypeInfo::DecodableType currentGroup = static_cast<chip::GroupId>(0);
         Attributes::SceneValid::TypeInfo::DecodableType sceneValid     = static_cast<bool>(0);
-        Attributes::NameSupport::TypeInfo::DecodableType nameSupport   = static_cast<uint8_t>(0);
+        Attributes::NameSupport::TypeInfo::DecodableType nameSupport =
+            static_cast<chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>>(0);
         Attributes::LastConfiguredBy::TypeInfo::DecodableType lastConfiguredBy;
-        Attributes::SceneTableSize::TypeInfo::DecodableType sceneTableSize       = static_cast<uint16_t>(0);
-        Attributes::RemainingCapacity::TypeInfo::DecodableType remainingCapacity = static_cast<uint8_t>(0);
+        Attributes::SceneTableSize::TypeInfo::DecodableType sceneTableSize = static_cast<uint16_t>(0);
+        Attributes::FabricSceneInfo::TypeInfo::DecodableType fabricSceneInfo;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -2470,8 +2510,8 @@ struct Type
 
     uint8_t level = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2488,8 +2528,8 @@ struct DecodableType
 
     uint8_t level = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace MoveToLevel
@@ -2509,10 +2549,10 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::Move::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    MoveMode moveMode = static_cast<MoveMode>(0);
+    MoveModeEnum moveMode = static_cast<MoveModeEnum>(0);
     DataModel::Nullable<uint8_t> rate;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2527,10 +2567,10 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::Move::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    MoveMode moveMode = static_cast<MoveMode>(0);
+    MoveModeEnum moveMode = static_cast<MoveModeEnum>(0);
     DataModel::Nullable<uint8_t> rate;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace Move
@@ -2551,11 +2591,11 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::Step::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    StepMode stepMode = static_cast<StepMode>(0);
-    uint8_t stepSize  = static_cast<uint8_t>(0);
+    StepModeEnum stepMode = static_cast<StepModeEnum>(0);
+    uint8_t stepSize      = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2570,11 +2610,11 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::Step::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    StepMode stepMode = static_cast<StepMode>(0);
-    uint8_t stepSize  = static_cast<uint8_t>(0);
+    StepModeEnum stepMode = static_cast<StepModeEnum>(0);
+    uint8_t stepSize      = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace Step
@@ -2592,8 +2632,8 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2608,8 +2648,8 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace Stop
@@ -2631,8 +2671,8 @@ struct Type
 
     uint8_t level = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2649,8 +2689,8 @@ struct DecodableType
 
     uint8_t level = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace MoveToLevelWithOnOff
@@ -2670,10 +2710,10 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    MoveMode moveMode = static_cast<MoveMode>(0);
+    MoveModeEnum moveMode = static_cast<MoveModeEnum>(0);
     DataModel::Nullable<uint8_t> rate;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2688,10 +2728,10 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    MoveMode moveMode = static_cast<MoveMode>(0);
+    MoveModeEnum moveMode = static_cast<MoveModeEnum>(0);
     DataModel::Nullable<uint8_t> rate;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace MoveWithOnOff
@@ -2712,11 +2752,11 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::StepWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    StepMode stepMode = static_cast<StepMode>(0);
-    uint8_t stepSize  = static_cast<uint8_t>(0);
+    StepModeEnum stepMode = static_cast<StepModeEnum>(0);
+    uint8_t stepSize      = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2731,11 +2771,11 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::StepWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    StepMode stepMode = static_cast<StepMode>(0);
-    uint8_t stepSize  = static_cast<uint8_t>(0);
+    StepModeEnum stepMode = static_cast<StepModeEnum>(0);
+    uint8_t stepSize      = static_cast<uint8_t>(0);
     DataModel::Nullable<uint16_t> transitionTime;
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace StepWithOnOff
@@ -2753,8 +2793,8 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -2769,8 +2809,8 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
 
-    chip::BitMask<LevelControlOptions> optionsMask     = static_cast<chip::BitMask<LevelControlOptions>>(0);
-    chip::BitMask<LevelControlOptions> optionsOverride = static_cast<chip::BitMask<LevelControlOptions>>(0);
+    chip::BitMask<OptionsBitmap> optionsMask     = static_cast<chip::BitMask<OptionsBitmap>>(0);
+    chip::BitMask<OptionsBitmap> optionsOverride = static_cast<chip::BitMask<OptionsBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace StopWithOnOff
@@ -2897,9 +2937,9 @@ struct TypeInfo
 namespace Options {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>;
+    using Type             = chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Options::Id; }
@@ -3031,7 +3071,7 @@ struct TypeInfo
         Attributes::MinFrequency::TypeInfo::DecodableType minFrequency         = static_cast<uint16_t>(0);
         Attributes::MaxFrequency::TypeInfo::DecodableType maxFrequency         = static_cast<uint16_t>(0);
         Attributes::Options::TypeInfo::DecodableType options =
-            static_cast<chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>>(0);
         Attributes::OnOffTransitionTime::TypeInfo::DecodableType onOffTransitionTime = static_cast<uint16_t>(0);
         Attributes::OnLevel::TypeInfo::DecodableType onLevel;
         Attributes::OnTransitionTime::TypeInfo::DecodableType onTransitionTime;
@@ -5025,6 +5065,30 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ProductAppearance
+namespace SpecificationVersion {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::BasicInformation::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SpecificationVersion::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SpecificationVersion
+namespace MaxPathsPerInvoke {
+struct TypeInfo
+{
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::BasicInformation::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaxPathsPerInvoke::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MaxPathsPerInvoke
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -5091,6 +5155,8 @@ struct TypeInfo
         Attributes::UniqueID::TypeInfo::DecodableType uniqueID;
         Attributes::CapabilityMinima::TypeInfo::DecodableType capabilityMinima;
         Attributes::ProductAppearance::TypeInfo::DecodableType productAppearance;
+        Attributes::SpecificationVersion::TypeInfo::DecodableType specificationVersion = static_cast<uint32_t>(0);
+        Attributes::MaxPathsPerInvoke::TypeInfo::DecodableType maxPathsPerInvoke       = static_cast<uint16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -6128,9 +6194,9 @@ namespace Attributes {
 namespace Sources {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const uint8_t>;
-    using DecodableType    = chip::app::DataModel::DecodableList<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<uint8_t> &;
+    using Type             = chip::app::DataModel::List<const chip::EndpointId>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::EndpointId>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::EndpointId> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Sources::Id; }
@@ -7281,8 +7347,10 @@ namespace Structs {
 namespace NetworkInfoStruct {
 enum class Fields : uint8_t
 {
-    kNetworkID = 0,
-    kConnected = 1,
+    kNetworkID         = 0,
+    kConnected         = 1,
+    kNetworkIdentifier = 2,
+    kClientIdentifier  = 3,
 };
 
 struct Type
@@ -7290,6 +7358,8 @@ struct Type
 public:
     chip::ByteSpan networkID;
     bool connected = static_cast<bool>(0);
+    Optional<DataModel::Nullable<chip::ByteSpan>> networkIdentifier;
+    Optional<DataModel::Nullable<chip::ByteSpan>> clientIdentifier;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -7417,6 +7487,16 @@ struct Type;
 struct DecodableType;
 } // namespace ReorderNetwork
 
+namespace QueryIdentity {
+struct Type;
+struct DecodableType;
+} // namespace QueryIdentity
+
+namespace QueryIdentityResponse {
+struct Type;
+struct DecodableType;
+} // namespace QueryIdentityResponse
+
 } // namespace Commands
 
 namespace Commands {
@@ -7499,9 +7579,12 @@ struct DecodableType
 namespace AddOrUpdateWiFiNetwork {
 enum class Fields : uint8_t
 {
-    kSsid        = 0,
-    kCredentials = 1,
-    kBreadcrumb  = 2,
+    kSsid             = 0,
+    kCredentials      = 1,
+    kBreadcrumb       = 2,
+    kNetworkIdentity  = 3,
+    kClientIdentifier = 4,
+    kPossessionNonce  = 5,
 };
 
 struct Type
@@ -7514,6 +7597,9 @@ struct Type
     chip::ByteSpan ssid;
     chip::ByteSpan credentials;
     Optional<uint64_t> breadcrumb;
+    Optional<chip::ByteSpan> networkIdentity;
+    Optional<chip::ByteSpan> clientIdentifier;
+    Optional<chip::ByteSpan> possessionNonce;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -7531,6 +7617,9 @@ struct DecodableType
     chip::ByteSpan ssid;
     chip::ByteSpan credentials;
     Optional<uint64_t> breadcrumb;
+    Optional<chip::ByteSpan> networkIdentity;
+    Optional<chip::ByteSpan> clientIdentifier;
+    Optional<chip::ByteSpan> possessionNonce;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace AddOrUpdateWiFiNetwork
@@ -7607,9 +7696,11 @@ struct DecodableType
 namespace NetworkConfigResponse {
 enum class Fields : uint8_t
 {
-    kNetworkingStatus = 0,
-    kDebugText        = 1,
-    kNetworkIndex     = 2,
+    kNetworkingStatus    = 0,
+    kDebugText           = 1,
+    kNetworkIndex        = 2,
+    kClientIdentity      = 3,
+    kPossessionSignature = 4,
 };
 
 struct Type
@@ -7622,6 +7713,8 @@ struct Type
     NetworkCommissioningStatusEnum networkingStatus = static_cast<NetworkCommissioningStatusEnum>(0);
     Optional<chip::CharSpan> debugText;
     Optional<uint8_t> networkIndex;
+    Optional<chip::ByteSpan> clientIdentity;
+    Optional<chip::ByteSpan> possessionSignature;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -7639,6 +7732,8 @@ struct DecodableType
     NetworkCommissioningStatusEnum networkingStatus = static_cast<NetworkCommissioningStatusEnum>(0);
     Optional<chip::CharSpan> debugText;
     Optional<uint8_t> networkIndex;
+    Optional<chip::ByteSpan> clientIdentity;
+    Optional<chip::ByteSpan> possessionSignature;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace NetworkConfigResponse
@@ -7753,6 +7848,76 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ReorderNetwork
+namespace QueryIdentity {
+enum class Fields : uint8_t
+{
+    kKeyIdentifier   = 0,
+    kPossessionNonce = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::QueryIdentity::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+
+    chip::ByteSpan keyIdentifier;
+    Optional<chip::ByteSpan> possessionNonce;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::QueryIdentity::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+
+    chip::ByteSpan keyIdentifier;
+    Optional<chip::ByteSpan> possessionNonce;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace QueryIdentity
+namespace QueryIdentityResponse {
+enum class Fields : uint8_t
+{
+    kIdentity            = 0,
+    kPossessionSignature = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::QueryIdentityResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+
+    chip::ByteSpan identity;
+    Optional<chip::ByteSpan> possessionSignature;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::QueryIdentityResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+
+    chip::ByteSpan identity;
+    Optional<chip::ByteSpan> possessionSignature;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace QueryIdentityResponse
 } // namespace Commands
 
 namespace Attributes {
@@ -8176,6 +8341,16 @@ struct Type;
 struct DecodableType;
 } // namespace TestEventTrigger
 
+namespace TimeSnapshot {
+struct Type;
+struct DecodableType;
+} // namespace TimeSnapshot
+
+namespace TimeSnapshotResponse {
+struct Type;
+struct DecodableType;
+} // namespace TimeSnapshotResponse
+
 } // namespace Commands
 
 namespace Commands {
@@ -8214,6 +8389,69 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace TestEventTrigger
+namespace TimeSnapshot {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TimeSnapshot::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TimeSnapshot::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TimeSnapshot
+namespace TimeSnapshotResponse {
+enum class Fields : uint8_t
+{
+    kSystemTimeUs = 0,
+    kUTCTimeUs    = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    uint64_t systemTimeUs = static_cast<uint64_t>(0);
+    DataModel::Nullable<uint64_t> UTCTimeUs;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    uint64_t systemTimeUs = static_cast<uint64_t>(0);
+    DataModel::Nullable<uint64_t> UTCTimeUs;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TimeSnapshotResponse
 } // namespace Commands
 
 namespace Attributes {
@@ -8329,18 +8567,6 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace TestEventTriggersEnabled
-namespace AverageWearCount {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageWearCount::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AverageWearCount
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -8396,7 +8622,6 @@ struct TypeInfo
         Attributes::ActiveRadioFaults::TypeInfo::DecodableType activeRadioFaults;
         Attributes::ActiveNetworkFaults::TypeInfo::DecodableType activeNetworkFaults;
         Attributes::TestEventTriggersEnabled::TypeInfo::DecodableType testEventTriggersEnabled = static_cast<bool>(0);
-        Attributes::AverageWearCount::TypeInfo::DecodableType averageWearCount                 = static_cast<uint32_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -9105,9 +9330,9 @@ struct TypeInfo
 namespace Weighting {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Weighting::Id; }
@@ -9117,9 +9342,9 @@ struct TypeInfo
 namespace DataVersion {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::DataVersion::Id; }
@@ -9129,9 +9354,9 @@ struct TypeInfo
 namespace StableDataVersion {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::StableDataVersion::Id; }
@@ -10243,8 +10468,8 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kAssociationFailure = 0,
-    kStatus             = 1,
+    kAssociationFailureCause = 0,
+    kStatus                  = 1,
 };
 
 struct Type
@@ -10255,8 +10480,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    AssociationFailureCauseEnum associationFailure = static_cast<AssociationFailureCauseEnum>(0);
-    uint16_t status                                = static_cast<uint16_t>(0);
+    AssociationFailureCauseEnum associationFailureCause = static_cast<AssociationFailureCauseEnum>(0);
+    uint16_t status                                     = static_cast<uint16_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -10268,8 +10493,8 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::AssociationFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
-    AssociationFailureCauseEnum associationFailure = static_cast<AssociationFailureCauseEnum>(0);
-    uint16_t status                                = static_cast<uint16_t>(0);
+    AssociationFailureCauseEnum associationFailureCause = static_cast<AssociationFailureCauseEnum>(0);
+    uint16_t status                                     = static_cast<uint16_t>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -13899,6 +14124,11 @@ struct Type;
 struct DecodableType;
 } // namespace StayActiveRequest
 
+namespace StayActiveResponse {
+struct Type;
+struct DecodableType;
+} // namespace StayActiveResponse
+
 } // namespace Commands
 
 namespace Commands {
@@ -14024,7 +14254,7 @@ struct Type
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -14038,6 +14268,38 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace StayActiveRequest
+namespace StayActiveResponse {
+enum class Fields : uint8_t
+{
+    kPromisedActiveDuration = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::StayActiveResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
+
+    uint32_t promisedActiveDuration = static_cast<uint32_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::StayActiveResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
+
+    uint32_t promisedActiveDuration = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace StayActiveResponse
 } // namespace Commands
 
 namespace Attributes {
@@ -14205,91 +14467,140 @@ struct TypeInfo
 };
 } // namespace Attributes
 } // namespace IcdManagement
-namespace ModeSelect {
-namespace Structs {
-namespace SemanticTagStruct {
+namespace Timer {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace SetTimer {
+struct Type;
+struct DecodableType;
+} // namespace SetTimer
+
+namespace ResetTimer {
+struct Type;
+struct DecodableType;
+} // namespace ResetTimer
+
+namespace AddTime {
+struct Type;
+struct DecodableType;
+} // namespace AddTime
+
+namespace ReduceTime {
+struct Type;
+struct DecodableType;
+} // namespace ReduceTime
+
+} // namespace Commands
+
+namespace Commands {
+namespace SetTimer {
 enum class Fields : uint8_t
 {
-    kMfgCode = 0,
-    kValue   = 1,
+    kNewTime = 0,
 };
 
 struct Type
 {
 public:
-    chip::VendorId mfgCode = static_cast<chip::VendorId>(0);
-    uint16_t value         = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::SetTimer::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
-    static constexpr bool kIsFabricScoped = false;
+    uint32_t newTime = static_cast<uint32_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
 
-using DecodableType = Type;
+    using ResponseType = DataModel::NullObjectType;
 
-} // namespace SemanticTagStruct
-namespace ModeOptionStruct {
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SetTimer::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+
+    uint32_t newTime = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace SetTimer
+namespace ResetTimer {
 enum class Fields : uint8_t
 {
-    kLabel        = 0,
-    kMode         = 1,
-    kSemanticTags = 2,
 };
 
 struct Type
 {
 public:
-    chip::CharSpan label;
-    uint8_t mode = static_cast<uint8_t>(0);
-    DataModel::List<const Structs::SemanticTagStruct::Type> semanticTags;
-
-    static constexpr bool kIsFabricScoped = false;
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ResetTimer::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    chip::CharSpan label;
-    uint8_t mode = static_cast<uint8_t>(0);
-    DataModel::DecodableList<Structs::SemanticTagStruct::DecodableType> semanticTags;
+    static constexpr CommandId GetCommandId() { return Commands::ResetTimer::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+};
+}; // namespace ResetTimer
+namespace AddTime {
+enum class Fields : uint8_t
+{
+    kAdditionalTime = 0,
 };
 
-} // namespace ModeOptionStruct
-} // namespace Structs
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::AddTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+    uint32_t additionalTime = static_cast<uint32_t>(0);
 
-namespace ChangeToMode {
-struct Type;
-struct DecodableType;
-} // namespace ChangeToMode
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-} // namespace Commands
+    using ResponseType = DataModel::NullObjectType;
 
-namespace Commands {
-namespace ChangeToMode {
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::AddTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+
+    uint32_t additionalTime = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace AddTime
+namespace ReduceTime {
 enum class Fields : uint8_t
 {
-    kNewMode = 0,
+    kTimeReduction = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ReduceTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
-    uint8_t newMode = static_cast<uint8_t>(0);
+    uint32_t timeReduction = static_cast<uint32_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -14301,126 +14612,87 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ReduceTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
-    uint8_t newMode = static_cast<uint8_t>(0);
+    uint32_t timeReduction = static_cast<uint32_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeToMode
+}; // namespace ReduceTime
 } // namespace Commands
 
 namespace Attributes {
 
-namespace Description {
-struct TypeInfo
-{
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 64; }
-};
-} // namespace Description
-namespace StandardNamespace {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StandardNamespace::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace StandardNamespace
-namespace SupportedModes {
-struct TypeInfo
-{
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SupportedModes
-namespace CurrentMode {
+namespace SetTime {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SetTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentMode
-namespace StartUpMode {
+} // namespace SetTime
+namespace TimeRemaining {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TimeRemaining::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace StartUpMode
-namespace OnMode {
+} // namespace TimeRemaining
+namespace TimerState {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::Clusters::Timer::TimerStatusEnum;
+    using DecodableType    = chip::app::Clusters::Timer::TimerStatusEnum;
+    using DecodableArgType = chip::app::Clusters::Timer::TimerStatusEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TimerState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OnMode
+} // namespace TimerState
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14428,16 +14700,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::Description::TypeInfo::DecodableType description;
-        Attributes::StandardNamespace::TypeInfo::DecodableType standardNamespace;
-        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
-        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
-        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
-        Attributes::OnMode::TypeInfo::DecodableType onMode;
+        Attributes::SetTime::TypeInfo::DecodableType setTime             = static_cast<uint32_t>(0);
+        Attributes::TimeRemaining::TypeInfo::DecodableType timeRemaining = static_cast<uint32_t>(0);
+        Attributes::TimerState::TypeInfo::DecodableType timerState = static_cast<chip::app::Clusters::Timer::TimerStatusEnum>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -14447,47 +14716,59 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ModeSelect
-namespace LaundryWasherMode {
+} // namespace Timer
+namespace OvenCavityOperationalState {
 namespace Structs {
-namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
-namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
+namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
 } // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace ChangeToMode {
+namespace Pause {
 struct Type;
 struct DecodableType;
-} // namespace ChangeToMode
+} // namespace Pause
 
-namespace ChangeToModeResponse {
+namespace Stop {
 struct Type;
 struct DecodableType;
-} // namespace ChangeToModeResponse
+} // namespace Stop
+
+namespace Start {
+struct Type;
+struct DecodableType;
+} // namespace Start
+
+namespace Resume {
+struct Type;
+struct DecodableType;
+} // namespace Resume
+
+namespace OperationalCommandResponse {
+struct Type;
+struct DecodableType;
+} // namespace OperationalCommandResponse
 
 } // namespace Commands
 
 namespace Commands {
-namespace ChangeToMode {
+namespace Pause {
 enum class Fields : uint8_t
 {
-    kNewMode = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-
-    uint8_t newMode = static_cast<uint8_t>(0);
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -14495,33 +14776,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
-    uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeToMode
-namespace ChangeToModeResponse {
+}; // namespace Pause
+namespace Stop {
 enum class Fields : uint8_t
 {
-    kStatus     = 0,
-    kStatusText = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-
-    uint8_t status = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> statusText;
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -14529,102 +14804,213 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
-    uint8_t status = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> statusText;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeToModeResponse
-} // namespace Commands
-
-namespace Attributes {
+}; // namespace Stop
+namespace Start {
+enum class Fields : uint8_t
+{
+};
 
-namespace SupportedModes {
-struct TypeInfo
+struct Type
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace SupportedModes
-namespace CurrentMode {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace CurrentMode
-namespace StartUpMode {
-struct TypeInfo
+}; // namespace Start
+namespace Resume {
+enum class Fields : uint8_t
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+};
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Resume
+namespace OperationalCommandResponse {
+enum class Fields : uint8_t
+{
+    kCommandResponseState = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    Structs::ErrorStateStruct::Type commandResponseState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType commandResponseState;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace OperationalCommandResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace PhaseList {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace StartUpMode
-namespace OnMode {
+} // namespace PhaseList
+namespace CurrentPhase {
 struct TypeInfo
 {
     using Type             = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OnMode
+} // namespace CurrentPhase
+namespace CountdownTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CountdownTime
+namespace OperationalStateList {
+struct TypeInfo
+{
+    using Type =
+        chip::app::DataModel::List<const chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalStateList
+namespace OperationalState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum;
+    using DecodableType    = chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum;
+    using DecodableArgType = chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalState
+namespace OperationalError {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::OvenCavityOperationalState::Structs::ErrorStateStruct::Type;
+    using DecodableType    = chip::app::Clusters::OvenCavityOperationalState::Structs::ErrorStateStruct::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::OvenCavityOperationalState::Structs::ErrorStateStruct::DecodableType &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalError
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14632,14 +15018,17 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
-        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
-        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
-        Attributes::OnMode::TypeInfo::DecodableType onMode;
+        Attributes::PhaseList::TypeInfo::DecodableType phaseList;
+        Attributes::CurrentPhase::TypeInfo::DecodableType currentPhase;
+        Attributes::CountdownTime::TypeInfo::DecodableType countdownTime;
+        Attributes::OperationalStateList::TypeInfo::DecodableType operationalStateList;
+        Attributes::OperationalState::TypeInfo::DecodableType operationalState =
+            static_cast<chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum>(0);
+        Attributes::OperationalError::TypeInfo::DecodableType operationalError;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -14649,8 +15038,82 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace LaundryWasherMode
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
+namespace Events {
+namespace OperationalError {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kErrorState = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    Structs::ErrorStateStruct::Type errorState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType errorState;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationalError
+namespace OperationCompletion {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kCompletionErrorCode  = 0,
+    kTotalOperationalTime = 1,
+    kPausedTime           = 2,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenCavityOperationalState::Id; }
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationCompletion
+} // namespace Events
+} // namespace OvenCavityOperationalState
+namespace OvenMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -14683,13 +15146,13 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -14698,7 +15161,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -14716,7 +15179,7 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -14732,7 +15195,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -14746,14 +15209,13 @@ namespace Attributes {
 namespace SupportedModes {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<
-        const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> &;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14765,7 +15227,7 @@ struct TypeInfo
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14777,7 +15239,7 @@ struct TypeInfo
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14789,7 +15251,7 @@ struct TypeInfo
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14797,37 +15259,37 @@ struct TypeInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14835,7 +15297,7 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
@@ -14852,94 +15314,70 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
-namespace LaundryWasherControls {
+} // namespace OvenMode
+namespace LaundryDryerControls {
 
 namespace Attributes {
 
-namespace SpinSpeeds {
+namespace SupportedDrynessLevels {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeeds::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedDrynessLevels::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SpinSpeeds
-namespace SpinSpeedCurrent {
+} // namespace SupportedDrynessLevels
+namespace SelectedDrynessLevel {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeedCurrent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SelectedDrynessLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SpinSpeedCurrent
-namespace NumberOfRinses {
-struct TypeInfo
+} // namespace SelectedDrynessLevel
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
-    using DecodableType    = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
-    using DecodableArgType = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfRinses::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace NumberOfRinses
-namespace SupportedRinses {
-struct TypeInfo
-{
-    using Type          = chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
-    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedRinses::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SupportedRinses
-namespace GeneratedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
-{
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14947,15 +15385,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::LaundryDryerControls::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::SpinSpeeds::TypeInfo::DecodableType spinSpeeds;
-        Attributes::SpinSpeedCurrent::TypeInfo::DecodableType spinSpeedCurrent;
-        Attributes::NumberOfRinses::TypeInfo::DecodableType numberOfRinses =
-            static_cast<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>(0);
-        Attributes::SupportedRinses::TypeInfo::DecodableType supportedRinses;
+        Attributes::SupportedDrynessLevels::TypeInfo::DecodableType supportedDrynessLevels;
+        Attributes::SelectedDrynessLevel::TypeInfo::DecodableType selectedDrynessLevel;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -14965,77 +15400,92 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace LaundryWasherControls
-namespace RvcRunMode {
+} // namespace LaundryDryerControls
+namespace ModeSelect {
 namespace Structs {
-namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
-namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
-} // namespace Structs
+namespace SemanticTagStruct {
+enum class Fields : uint8_t
+{
+    kMfgCode = 0,
+    kValue   = 1,
+};
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+struct Type
+{
+public:
+    chip::VendorId mfgCode = static_cast<chip::VendorId>(0);
+    uint16_t value         = static_cast<uint16_t>(0);
 
-namespace ChangeToMode {
-struct Type;
-struct DecodableType;
-} // namespace ChangeToMode
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-namespace ChangeToModeResponse {
-struct Type;
-struct DecodableType;
-} // namespace ChangeToModeResponse
+    static constexpr bool kIsFabricScoped = false;
 
-} // namespace Commands
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
 
-namespace Commands {
-namespace ChangeToMode {
+using DecodableType = Type;
+
+} // namespace SemanticTagStruct
+namespace ModeOptionStruct {
 enum class Fields : uint8_t
 {
-    kNewMode = 0,
+    kLabel        = 0,
+    kMode         = 1,
+    kSemanticTags = 2,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    chip::CharSpan label;
+    uint8_t mode = static_cast<uint8_t>(0);
+    DataModel::List<const Structs::SemanticTagStruct::Type> semanticTags;
 
-    uint8_t newMode = static_cast<uint8_t>(0);
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
-    using ResponseType = Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    chip::CharSpan label;
+    uint8_t mode = static_cast<uint8_t>(0);
+    DataModel::DecodableList<Structs::SemanticTagStruct::DecodableType> semanticTags;
 
-    uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-}; // namespace ChangeToMode
-namespace ChangeToModeResponse {
+
+} // namespace ModeOptionStruct
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace ChangeToMode {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToMode
+
+} // namespace Commands
+
+namespace Commands {
+namespace ChangeToMode {
 enum class Fields : uint8_t
 {
-    kStatus     = 0,
-    kStatusText = 1,
+    kNewMode = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 
-    uint8_t status = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> statusText;
+    uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -15047,28 +15497,52 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 
-    uint8_t status = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> statusText;
+    uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeToModeResponse
+}; // namespace ChangeToMode
 } // namespace Commands
 
 namespace Attributes {
 
+namespace Description {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 64; }
+};
+} // namespace Description
+namespace StandardNamespace {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StandardNamespace::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StandardNamespace
 namespace SupportedModes {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::Type>;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType>;
+        chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType>;
     using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> &;
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15080,11 +15554,23 @@ struct TypeInfo
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace CurrentMode
+namespace StartUpMode {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15092,7 +15578,7 @@ struct TypeInfo
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15100,37 +15586,37 @@ struct TypeInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15138,12 +15624,15 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
+        Attributes::Description::TypeInfo::DecodableType description;
+        Attributes::StandardNamespace::TypeInfo::DecodableType standardNamespace;
         Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
         Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
         Attributes::OnMode::TypeInfo::DecodableType onMode;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
@@ -15154,8 +15643,8 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RvcRunMode
-namespace RvcCleanMode {
+} // namespace ModeSelect
+namespace LaundryWasherMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -15188,13 +15677,13 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15203,7 +15692,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -15221,7 +15710,7 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15237,7 +15726,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15251,13 +15740,13 @@ namespace Attributes {
 namespace SupportedModes {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::Type>;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> &;
+        chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15269,11 +15758,23 @@ struct TypeInfo
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace CurrentMode
+namespace StartUpMode {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15281,7 +15782,7 @@ struct TypeInfo
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15289,37 +15790,37 @@ struct TypeInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15327,12 +15828,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
         Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
         Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
         Attributes::OnMode::TypeInfo::DecodableType onMode;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
@@ -15343,40 +15845,47 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RvcCleanMode
-namespace TemperatureControl {
+} // namespace LaundryWasherMode
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
+namespace Structs {
+namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
+namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+} // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace SetTemperature {
+namespace ChangeToMode {
 struct Type;
 struct DecodableType;
-} // namespace SetTemperature
+} // namespace ChangeToMode
+
+namespace ChangeToModeResponse {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToModeResponse
 
 } // namespace Commands
 
 namespace Commands {
-namespace SetTemperature {
+namespace ChangeToMode {
 enum class Fields : uint8_t
 {
-    kTargetTemperature      = 0,
-    kTargetTemperatureLevel = 1,
+    kNewMode = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetTemperature::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
-    Optional<int16_t> targetTemperature;
-    Optional<uint8_t> targetTemperatureLevel;
+    uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15384,124 +15893,137 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::SetTemperature::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
-    Optional<int16_t> targetTemperature;
-    Optional<uint8_t> targetTemperatureLevel;
+    uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace SetTemperature
-} // namespace Commands
-
-namespace Attributes {
+}; // namespace ChangeToMode
+namespace ChangeToModeResponse {
+enum class Fields : uint8_t
+{
+    kStatus     = 0,
+    kStatusText = 1,
+};
 
-namespace TemperatureSetpoint {
-struct TypeInfo
+struct Type
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureSetpoint::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace TemperatureSetpoint
-namespace MinTemperature {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MinTemperature::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace MinTemperature
-namespace MaxTemperature {
+}; // namespace ChangeToModeResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace SupportedModes {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type = chip::app::DataModel::List<
+        const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MaxTemperature::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace MaxTemperature
-namespace Step {
+} // namespace SupportedModes
+namespace CurrentMode {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Step::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Step
-namespace SelectedTemperatureLevel {
+} // namespace CurrentMode
+namespace StartUpMode {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SelectedTemperatureLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SelectedTemperatureLevel
-namespace SupportedTemperatureLevels {
+} // namespace StartUpMode
+namespace OnMode {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedTemperatureLevels::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SupportedTemperatureLevels
+} // namespace OnMode
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15509,16 +16031,14 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::TemperatureSetpoint::TypeInfo::DecodableType temperatureSetpoint           = static_cast<int16_t>(0);
-        Attributes::MinTemperature::TypeInfo::DecodableType minTemperature                     = static_cast<int16_t>(0);
-        Attributes::MaxTemperature::TypeInfo::DecodableType maxTemperature                     = static_cast<int16_t>(0);
-        Attributes::Step::TypeInfo::DecodableType step                                         = static_cast<int16_t>(0);
-        Attributes::SelectedTemperatureLevel::TypeInfo::DecodableType selectedTemperatureLevel = static_cast<uint8_t>(0);
-        Attributes::SupportedTemperatureLevels::TypeInfo::DecodableType supportedTemperatureLevels;
+        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
+        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
+        Attributes::OnMode::TypeInfo::DecodableType onMode;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -15528,81 +16048,94 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace TemperatureControl
-namespace RefrigeratorAlarm {
+} // namespace RefrigeratorAndTemperatureControlledCabinetMode
+namespace LaundryWasherControls {
 
 namespace Attributes {
 
-namespace Mask {
+namespace SpinSpeeds {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeeds::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Mask
-namespace State {
+} // namespace SpinSpeeds
+namespace SpinSpeedCurrent {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeedCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace State
-namespace Supported {
+} // namespace SpinSpeedCurrent
+namespace NumberOfRinses {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using Type             = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
+    using DecodableType    = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
+    using DecodableArgType = chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Supported::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfRinses::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Supported
+} // namespace NumberOfRinses
+namespace SupportedRinses {
+struct TypeInfo
+{
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedRinses::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SupportedRinses
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15610,16 +16143,15 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::Mask::TypeInfo::DecodableType mask =
-            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
-        Attributes::State::TypeInfo::DecodableType state =
-            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
-        Attributes::Supported::TypeInfo::DecodableType supported =
-            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
+        Attributes::SpinSpeeds::TypeInfo::DecodableType spinSpeeds;
+        Attributes::SpinSpeedCurrent::TypeInfo::DecodableType spinSpeedCurrent;
+        Attributes::NumberOfRinses::TypeInfo::DecodableType numberOfRinses =
+            static_cast<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>(0);
+        Attributes::SupportedRinses::TypeInfo::DecodableType supportedRinses;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -15629,52 +16161,8 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-namespace Events {
-namespace Notify {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
-enum class Fields : uint8_t
-{
-    kActive   = 0,
-    kInactive = 1,
-    kState    = 2,
-    kMask     = 3,
-};
-
-struct Type
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::Notify::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
-
-struct DecodableType
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::Notify::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-
-    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace Notify
-} // namespace Events
-} // namespace RefrigeratorAlarm
-namespace DishwasherMode {
+} // namespace LaundryWasherControls
+namespace RvcRunMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -15707,13 +16195,13 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15722,7 +16210,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -15740,7 +16228,7 @@ struct Type
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15756,7 +16244,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15770,13 +16258,13 @@ namespace Attributes {
 namespace SupportedModes {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::Type>;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType>;
+        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType>;
     using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType> &;
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15788,23 +16276,11 @@ struct TypeInfo
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace CurrentMode
-namespace StartUpMode {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15812,7 +16288,7 @@ struct TypeInfo
     using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15820,37 +16296,37 @@ struct TypeInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15858,13 +16334,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
         Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
         Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
-        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
         Attributes::OnMode::TypeInfo::DecodableType onMode;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
@@ -15875,57 +16350,172 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace DishwasherMode
-namespace AirQuality {
+} // namespace RvcRunMode
+namespace RvcCleanMode {
+namespace Structs {
+namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
+namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace ChangeToMode {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToMode
+
+namespace ChangeToModeResponse {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToModeResponse
+
+} // namespace Commands
+
+namespace Commands {
+namespace ChangeToMode {
+enum class Fields : uint8_t
+{
+    kNewMode = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+
+    uint8_t newMode = static_cast<uint8_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+
+    uint8_t newMode = static_cast<uint8_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace ChangeToMode
+namespace ChangeToModeResponse {
+enum class Fields : uint8_t
+{
+    kStatus     = 0,
+    kStatusText = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace ChangeToModeResponse
+} // namespace Commands
 
 namespace Attributes {
 
-namespace AirQuality {
+namespace SupportedModes {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::AirQuality::AirQualityEnum;
-    using DecodableType    = chip::app::Clusters::AirQuality::AirQualityEnum;
-    using DecodableArgType = chip::app::Clusters::AirQuality::AirQualityEnum;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AirQuality
+} // namespace SupportedModes
+namespace CurrentMode {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentMode
+namespace OnMode {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OnMode
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15933,12 +16523,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::AirQuality::TypeInfo::DecodableType airQuality =
-            static_cast<chip::app::Clusters::AirQuality::AirQualityEnum>(0);
+        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
+        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::OnMode::TypeInfo::DecodableType onMode;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -15948,31 +16539,36 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace AirQuality
-namespace SmokeCoAlarm {
+} // namespace RvcCleanMode
+namespace TemperatureControl {
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace SelfTestRequest {
+namespace SetTemperature {
 struct Type;
 struct DecodableType;
-} // namespace SelfTestRequest
+} // namespace SetTemperature
 
 } // namespace Commands
 
 namespace Commands {
-namespace SelfTestRequest {
+namespace SetTemperature {
 enum class Fields : uint8_t
 {
-};
+    kTargetTemperature      = 0,
+    kTargetTemperatureLevel = 1,
+};
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SelfTestRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SetTemperature::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+
+    Optional<int16_t> targetTemperature;
+    Optional<uint8_t> targetTemperatureLevel;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -15984,206 +16580,225 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::SelfTestRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SetTemperature::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
 
+    Optional<int16_t> targetTemperature;
+    Optional<uint8_t> targetTemperatureLevel;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace SelfTestRequest
+}; // namespace SetTemperature
 } // namespace Commands
 
 namespace Attributes {
 
-namespace ExpressedState {
+namespace TemperatureSetpoint {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ExpressedState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureSetpoint::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ExpressedState
-namespace SmokeState {
+} // namespace TemperatureSetpoint
+namespace MinTemperature {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MinTemperature::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SmokeState
-namespace COState {
+} // namespace MinTemperature
+namespace MaxTemperature {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::COState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaxTemperature::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace COState
-namespace BatteryAlert {
+} // namespace MaxTemperature
+namespace Step {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::BatteryAlert::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Step::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace BatteryAlert
-namespace DeviceMuted {
+} // namespace Step
+namespace SelectedTemperatureLevel {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DeviceMuted::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SelectedTemperatureLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace DeviceMuted
-namespace TestInProgress {
+} // namespace SelectedTemperatureLevel
+namespace SupportedTemperatureLevels {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TestInProgress::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedTemperatureLevels::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace TestInProgress
-namespace HardwareFaultAlert {
-struct TypeInfo
+} // namespace SupportedTemperatureLevels
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::HardwareFaultAlert::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
 };
-} // namespace HardwareFaultAlert
-namespace EndOfServiceAlert {
-struct TypeInfo
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EndOfServiceAlert::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
 };
-} // namespace EndOfServiceAlert
-namespace InterconnectSmokeAlarm {
-struct TypeInfo
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectSmokeAlarm::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
 };
-} // namespace InterconnectSmokeAlarm
-namespace InterconnectCOAlarm {
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // namespace ClusterRevision
+
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectCOAlarm::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::TemperatureSetpoint::TypeInfo::DecodableType temperatureSetpoint           = static_cast<int16_t>(0);
+        Attributes::MinTemperature::TypeInfo::DecodableType minTemperature                     = static_cast<int16_t>(0);
+        Attributes::MaxTemperature::TypeInfo::DecodableType maxTemperature                     = static_cast<int16_t>(0);
+        Attributes::Step::TypeInfo::DecodableType step                                         = static_cast<int16_t>(0);
+        Attributes::SelectedTemperatureLevel::TypeInfo::DecodableType selectedTemperatureLevel = static_cast<uint8_t>(0);
+        Attributes::SupportedTemperatureLevels::TypeInfo::DecodableType supportedTemperatureLevels;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
 };
-} // namespace InterconnectCOAlarm
-namespace ContaminationState {
+} // namespace Attributes
+} // namespace TemperatureControl
+namespace RefrigeratorAlarm {
+
+namespace Attributes {
+
+namespace Mask {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
+    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ContaminationState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ContaminationState
-namespace SmokeSensitivityLevel {
+} // namespace Mask
+namespace State {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
+    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeSensitivityLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SmokeSensitivityLevel
-namespace ExpiryDate {
+} // namespace State
+namespace Supported {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ExpiryDate::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Supported::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ExpiryDate
+} // namespace Supported
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 };
 } // namespace ClusterRevision
 
@@ -16191,32 +16806,16 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::ExpressedState::TypeInfo::DecodableType expressedState =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>(0);
-        Attributes::SmokeState::TypeInfo::DecodableType smokeState =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
-        Attributes::COState::TypeInfo::DecodableType COState = static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
-        Attributes::BatteryAlert::TypeInfo::DecodableType batteryAlert =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
-        Attributes::DeviceMuted::TypeInfo::DecodableType deviceMuted =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>(0);
-        Attributes::TestInProgress::TypeInfo::DecodableType testInProgress         = static_cast<bool>(0);
-        Attributes::HardwareFaultAlert::TypeInfo::DecodableType hardwareFaultAlert = static_cast<bool>(0);
-        Attributes::EndOfServiceAlert::TypeInfo::DecodableType endOfServiceAlert =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>(0);
-        Attributes::InterconnectSmokeAlarm::TypeInfo::DecodableType interconnectSmokeAlarm =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
-        Attributes::InterconnectCOAlarm::TypeInfo::DecodableType interconnectCOAlarm =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
-        Attributes::ContaminationState::TypeInfo::DecodableType contaminationState =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>(0);
-        Attributes::SmokeSensitivityLevel::TypeInfo::DecodableType smokeSensitivityLevel =
-            static_cast<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>(0);
-        Attributes::ExpiryDate::TypeInfo::DecodableType expiryDate = static_cast<uint32_t>(0);
+        Attributes::Mask::TypeInfo::DecodableType mask =
+            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
+        Attributes::State::TypeInfo::DecodableType state =
+            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
+        Attributes::Supported::TypeInfo::DecodableType supported =
+            static_cast<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -16227,23 +16826,29 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace SmokeAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+namespace Notify {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kAlarmSeverityLevel = 0,
+    kActive   = 0,
+    kInactive = 1,
+    kState    = 2,
+    kMask     = 3,
 };
 
 struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::SmokeAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr EventId GetEventId() { return Events::Notify::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -16252,380 +16857,2683 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::SmokeAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr EventId GetEventId() { return Events::Notify::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
 
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace SmokeAlarm
-namespace COAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-
-enum class Fields : uint8_t
-{
-    kAlarmSeverityLevel = 0,
-};
-
-struct Type
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::COAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+} // namespace Notify
+} // namespace Events
+} // namespace RefrigeratorAlarm
+namespace DishwasherMode {
+namespace Structs {
+namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
+namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+} // namespace Structs
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-struct DecodableType
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::COAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+namespace ChangeToMode {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToMode
 
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+namespace ChangeToModeResponse {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToModeResponse
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace COAlarm
-namespace LowBattery {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+} // namespace Commands
 
+namespace Commands {
+namespace ChangeToMode {
 enum class Fields : uint8_t
 {
-    kAlarmSeverityLevel = 0,
+    kNewMode = 0,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::LowBattery::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
 
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    uint8_t newMode = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::LowBattery::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
 
+    uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace LowBattery
-namespace HardwareFault {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+}; // namespace ChangeToMode
+namespace ChangeToModeResponse {
 enum class Fields : uint8_t
 {
+    kStatus     = 0,
+    kStatusText = 1,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::HardwareFault::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::HardwareFault::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
 
+    uint8_t status = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> statusText;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace HardwareFault
-namespace EndOfService {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+}; // namespace ChangeToModeResponse
+} // namespace Commands
 
-enum class Fields : uint8_t
-{
-};
+namespace Attributes {
 
-struct Type
+namespace SupportedModes {
+struct TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::EndOfService::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace SupportedModes
+namespace CurrentMode {
+struct TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::EndOfService::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace EndOfService
-namespace SelfTestComplete {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
-enum class Fields : uint8_t
+} // namespace CurrentMode
+namespace StartUpMode {
+struct TypeInfo
 {
-};
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StartUpMode
+namespace OnMode {
+struct TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::SelfTestComplete::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace OnMode
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::SelfTestComplete::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
 };
-} // namespace SelfTestComplete
-namespace AlarmMuted {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
-enum class Fields : uint8_t
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
 };
-
-struct Type
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-public:
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
+        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::StartUpMode::TypeInfo::DecodableType startUpMode;
+        Attributes::OnMode::TypeInfo::DecodableType onMode;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace DishwasherMode
+namespace AirQuality {
+
+namespace Attributes {
+
+namespace AirQuality {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::AirQuality::AirQualityEnum;
+    using DecodableType    = chip::app::Clusters::AirQuality::AirQualityEnum;
+    using DecodableArgType = chip::app::Clusters::AirQuality::AirQualityEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AirQuality::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AirQuality
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::AirQuality::TypeInfo::DecodableType airQuality =
+            static_cast<chip::app::Clusters::AirQuality::AirQualityEnum>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace AirQuality
+namespace SmokeCoAlarm {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace SelfTestRequest {
+struct Type;
+struct DecodableType;
+} // namespace SelfTestRequest
+
+} // namespace Commands
+
+namespace Commands {
+namespace SelfTestRequest {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::SelfTestRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SelfTestRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace SelfTestRequest
+} // namespace Commands
+
+namespace Attributes {
+
+namespace ExpressedState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ExpressedState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ExpressedState
+namespace SmokeState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SmokeState
+namespace COState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::COState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace COState
+namespace BatteryAlert {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::BatteryAlert::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace BatteryAlert
+namespace DeviceMuted {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DeviceMuted::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace DeviceMuted
+namespace TestInProgress {
+struct TypeInfo
+{
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TestInProgress::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace TestInProgress
+namespace HardwareFaultAlert {
+struct TypeInfo
+{
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::HardwareFaultAlert::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace HardwareFaultAlert
+namespace EndOfServiceAlert {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::EndOfServiceAlert::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace EndOfServiceAlert
+namespace InterconnectSmokeAlarm {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectSmokeAlarm::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace InterconnectSmokeAlarm
+namespace InterconnectCOAlarm {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectCOAlarm::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace InterconnectCOAlarm
+namespace ContaminationState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ContaminationState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ContaminationState
+namespace SmokeSensitivityLevel {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
+    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
+    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeSensitivityLevel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SmokeSensitivityLevel
+namespace ExpiryDate {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ExpiryDate::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ExpiryDate
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::ExpressedState::TypeInfo::DecodableType expressedState =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>(0);
+        Attributes::SmokeState::TypeInfo::DecodableType smokeState =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
+        Attributes::COState::TypeInfo::DecodableType COState = static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
+        Attributes::BatteryAlert::TypeInfo::DecodableType batteryAlert =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
+        Attributes::DeviceMuted::TypeInfo::DecodableType deviceMuted =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>(0);
+        Attributes::TestInProgress::TypeInfo::DecodableType testInProgress         = static_cast<bool>(0);
+        Attributes::HardwareFaultAlert::TypeInfo::DecodableType hardwareFaultAlert = static_cast<bool>(0);
+        Attributes::EndOfServiceAlert::TypeInfo::DecodableType endOfServiceAlert =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>(0);
+        Attributes::InterconnectSmokeAlarm::TypeInfo::DecodableType interconnectSmokeAlarm =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
+        Attributes::InterconnectCOAlarm::TypeInfo::DecodableType interconnectCOAlarm =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>(0);
+        Attributes::ContaminationState::TypeInfo::DecodableType contaminationState =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>(0);
+        Attributes::SmokeSensitivityLevel::TypeInfo::DecodableType smokeSensitivityLevel =
+            static_cast<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>(0);
+        Attributes::ExpiryDate::TypeInfo::DecodableType expiryDate = static_cast<uint32_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+namespace Events {
+namespace SmokeAlarm {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kAlarmSeverityLevel = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SmokeAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SmokeAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace SmokeAlarm
+namespace COAlarm {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kAlarmSeverityLevel = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::COAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::COAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace COAlarm
+namespace LowBattery {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kAlarmSeverityLevel = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::LowBattery::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::LowBattery::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace LowBattery
+namespace HardwareFault {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::HardwareFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::HardwareFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace HardwareFault
+namespace EndOfService {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EndOfService::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EndOfService::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace EndOfService
+namespace SelfTestComplete {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SelfTestComplete::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SelfTestComplete::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace SelfTestComplete
+namespace AlarmMuted {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AlarmMuted::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AlarmMuted::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace AlarmMuted
+namespace MuteEnded {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::MuteEnded::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::MuteEnded::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace MuteEnded
+namespace InterconnectSmokeAlarm {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kAlarmSeverityLevel = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::InterconnectSmokeAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::InterconnectSmokeAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace InterconnectSmokeAlarm
+namespace InterconnectCOAlarm {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kAlarmSeverityLevel = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::InterconnectCOAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::InterconnectCOAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace InterconnectCOAlarm
+namespace AllClear {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AllClear::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AllClear::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace AllClear
+} // namespace Events
+} // namespace SmokeCoAlarm
+namespace DishwasherAlarm {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace Reset {
+struct Type;
+struct DecodableType;
+} // namespace Reset
+
+namespace ModifyEnabledAlarms {
+struct Type;
+struct DecodableType;
+} // namespace ModifyEnabledAlarms
+
+} // namespace Commands
+
+namespace Commands {
+namespace Reset {
+enum class Fields : uint8_t
+{
+    kAlarms = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Reset::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+    chip::BitMask<AlarmMap> alarms = static_cast<chip::BitMask<AlarmMap>>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Reset::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+    chip::BitMask<AlarmMap> alarms = static_cast<chip::BitMask<AlarmMap>>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Reset
+namespace ModifyEnabledAlarms {
+enum class Fields : uint8_t
+{
+    kMask = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ModifyEnabledAlarms::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::ModifyEnabledAlarms::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace ModifyEnabledAlarms
+} // namespace Commands
+
+namespace Attributes {
+
+namespace Mask {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Mask
+namespace Latch {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Latch::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Latch
+namespace State {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace State
+namespace Supported {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Supported::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Supported
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::Mask::TypeInfo::DecodableType mask =
+            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
+        Attributes::Latch::TypeInfo::DecodableType latch =
+            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
+        Attributes::State::TypeInfo::DecodableType state =
+            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
+        Attributes::Supported::TypeInfo::DecodableType supported =
+            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+namespace Events {
+namespace Notify {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kActive   = 0,
+    kInactive = 1,
+    kState    = 2,
+    kMask     = 3,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Notify::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Notify::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+
+    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace Notify
+} // namespace Events
+} // namespace DishwasherAlarm
+namespace MicrowaveOvenMode {
+namespace Structs {
+namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
+namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+} // namespace Structs
+
+namespace Attributes {
+
+namespace SupportedModes {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SupportedModes
+namespace CurrentMode {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentMode
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::SupportedModes::TypeInfo::DecodableType supportedModes;
+        Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast<uint8_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace MicrowaveOvenMode
+namespace MicrowaveOvenControl {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace SetCookingParameters {
+struct Type;
+struct DecodableType;
+} // namespace SetCookingParameters
+
+namespace AddMoreTime {
+struct Type;
+struct DecodableType;
+} // namespace AddMoreTime
+
+} // namespace Commands
+
+namespace Commands {
+namespace SetCookingParameters {
+enum class Fields : uint8_t
+{
+    kCookMode     = 0,
+    kCookTime     = 1,
+    kPowerSetting = 2,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::SetCookingParameters::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+
+    Optional<uint8_t> cookMode;
+    Optional<uint32_t> cookTime;
+    Optional<uint8_t> powerSetting;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SetCookingParameters::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+
+    Optional<uint8_t> cookMode;
+    Optional<uint32_t> cookTime;
+    Optional<uint8_t> powerSetting;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace SetCookingParameters
+namespace AddMoreTime {
+enum class Fields : uint8_t
+{
+    kTimeToAdd = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::AddMoreTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+
+    uint32_t timeToAdd = static_cast<uint32_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::AddMoreTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+
+    uint32_t timeToAdd = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace AddMoreTime
+} // namespace Commands
+
+namespace Attributes {
+
+namespace CookTime {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CookTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CookTime
+namespace PowerSetting {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerSetting::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PowerSetting
+namespace MinPower {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MinPower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MinPower
+namespace MaxPower {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaxPower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MaxPower
+namespace PowerStep {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerStep::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PowerStep
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::CookTime::TypeInfo::DecodableType cookTime         = static_cast<uint32_t>(0);
+        Attributes::PowerSetting::TypeInfo::DecodableType powerSetting = static_cast<uint8_t>(0);
+        Attributes::MinPower::TypeInfo::DecodableType minPower         = static_cast<uint8_t>(0);
+        Attributes::MaxPower::TypeInfo::DecodableType maxPower         = static_cast<uint8_t>(0);
+        Attributes::PowerStep::TypeInfo::DecodableType powerStep       = static_cast<uint8_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace MicrowaveOvenControl
+namespace OperationalState {
+namespace Structs {
+namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
+namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace Pause {
+struct Type;
+struct DecodableType;
+} // namespace Pause
+
+namespace Stop {
+struct Type;
+struct DecodableType;
+} // namespace Stop
+
+namespace Start {
+struct Type;
+struct DecodableType;
+} // namespace Start
+
+namespace Resume {
+struct Type;
+struct DecodableType;
+} // namespace Resume
+
+namespace OperationalCommandResponse {
+struct Type;
+struct DecodableType;
+} // namespace OperationalCommandResponse
+
+} // namespace Commands
+
+namespace Commands {
+namespace Pause {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Pause
+namespace Stop {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Stop
+namespace Start {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Start
+namespace Resume {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Resume
+namespace OperationalCommandResponse {
+enum class Fields : uint8_t
+{
+    kCommandResponseState = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    Structs::ErrorStateStruct::Type commandResponseState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType commandResponseState;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace OperationalCommandResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace PhaseList {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PhaseList
+namespace CurrentPhase {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentPhase
+namespace CountdownTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CountdownTime
+namespace OperationalStateList {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalStateList
+namespace OperationalState {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::OperationalState::OperationalStateEnum;
+    using DecodableType    = chip::app::Clusters::OperationalState::OperationalStateEnum;
+    using DecodableArgType = chip::app::Clusters::OperationalState::OperationalStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalState
+namespace OperationalError {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::Type;
+    using DecodableType    = chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalError
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::PhaseList::TypeInfo::DecodableType phaseList;
+        Attributes::CurrentPhase::TypeInfo::DecodableType currentPhase;
+        Attributes::CountdownTime::TypeInfo::DecodableType countdownTime;
+        Attributes::OperationalStateList::TypeInfo::DecodableType operationalStateList;
+        Attributes::OperationalState::TypeInfo::DecodableType operationalState =
+            static_cast<chip::app::Clusters::OperationalState::OperationalStateEnum>(0);
+        Attributes::OperationalError::TypeInfo::DecodableType operationalError;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+namespace Events {
+namespace OperationalError {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kErrorState = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    Structs::ErrorStateStruct::Type errorState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType errorState;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationalError
+namespace OperationCompletion {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kCompletionErrorCode  = 0,
+    kTotalOperationalTime = 1,
+    kPausedTime           = 2,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationCompletion
+} // namespace Events
+} // namespace OperationalState
+namespace RvcOperationalState {
+namespace Structs {
+namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
+namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace Pause {
+struct Type;
+struct DecodableType;
+} // namespace Pause
+
+namespace Stop {
+struct Type;
+struct DecodableType;
+} // namespace Stop
+
+namespace Start {
+struct Type;
+struct DecodableType;
+} // namespace Start
+
+namespace Resume {
+struct Type;
+struct DecodableType;
+} // namespace Resume
+
+namespace OperationalCommandResponse {
+struct Type;
+struct DecodableType;
+} // namespace OperationalCommandResponse
+
+} // namespace Commands
+
+namespace Commands {
+namespace Pause {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Pause
+namespace Stop {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Stop
+namespace Start {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Start
+namespace Resume {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace Resume
+namespace OperationalCommandResponse {
+enum class Fields : uint8_t
+{
+    kCommandResponseState = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    Structs::ErrorStateStruct::Type commandResponseState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType commandResponseState;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace OperationalCommandResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace PhaseList {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PhaseList
+namespace CurrentPhase {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentPhase
+namespace CountdownTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CountdownTime
+namespace OperationalStateList {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalStateList
+namespace OperationalState {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalState
+namespace OperationalError {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::Type;
+    using DecodableType    = chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OperationalError
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::PhaseList::TypeInfo::DecodableType phaseList;
+        Attributes::CurrentPhase::TypeInfo::DecodableType currentPhase;
+        Attributes::CountdownTime::TypeInfo::DecodableType countdownTime;
+        Attributes::OperationalStateList::TypeInfo::DecodableType operationalStateList;
+        Attributes::OperationalState::TypeInfo::DecodableType operationalState = static_cast<uint8_t>(0);
+        Attributes::OperationalError::TypeInfo::DecodableType operationalError;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+namespace Events {
+namespace OperationalError {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kErrorState = 0,
+};
+
+struct Type
+{
+public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AlarmMuted::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    Structs::ErrorStateStruct::Type errorState;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    Structs::ErrorStateStruct::DecodableType errorState;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationalError
+namespace OperationCompletion {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kCompletionErrorCode  = 0,
+    kTotalOperationalTime = 1,
+    kPausedTime           = 2,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+
+    uint8_t completionErrorCode = static_cast<uint8_t>(0);
+    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
+    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace OperationCompletion
+} // namespace Events
+} // namespace RvcOperationalState
+namespace HepaFilterMonitoring {
+namespace Structs {
+namespace ReplacementProductStruct {
+enum class Fields : uint8_t
+{
+    kProductIdentifierType  = 0,
+    kProductIdentifierValue = 1,
+};
+
+struct Type
+{
+public:
+    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
+    chip::CharSpan productIdentifierValue;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
     static constexpr bool kIsFabricScoped = false;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace ReplacementProductStruct
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace ResetCondition {
+struct Type;
+struct DecodableType;
+} // namespace ResetCondition
+
+} // namespace Commands
+
+namespace Commands {
+namespace ResetCondition {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace ResetCondition
+} // namespace Commands
+
+namespace Attributes {
+
+namespace Condition {
+struct TypeInfo
+{
+    using Type             = chip::Percent;
+    using DecodableType    = chip::Percent;
+    using DecodableArgType = chip::Percent;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Condition
+namespace DegradationDirection {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
+    using DecodableType    = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
+    using DecodableArgType = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace DegradationDirection
+namespace ChangeIndication {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
+    using DecodableType    = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
+    using DecodableArgType = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ChangeIndication::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ChangeIndication
+namespace InPlaceIndicator {
+struct TypeInfo
+{
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace InPlaceIndicator
+namespace LastChangedTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-struct DecodableType
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace LastChangedTime
+namespace ReplacementProductList {
+struct TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AlarmMuted::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    using Type =
+        chip::app::DataModel::List<const chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> &;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AlarmMuted
-namespace MuteEnded {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+} // namespace ReplacementProductList
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
+        Attributes::Condition::TypeInfo::DecodableType condition = static_cast<chip::Percent>(0);
+        Attributes::DegradationDirection::TypeInfo::DecodableType degradationDirection =
+            static_cast<chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum>(0);
+        Attributes::ChangeIndication::TypeInfo::DecodableType changeIndication =
+            static_cast<chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum>(0);
+        Attributes::InPlaceIndicator::TypeInfo::DecodableType inPlaceIndicator = static_cast<bool>(0);
+        Attributes::LastChangedTime::TypeInfo::DecodableType lastChangedTime;
+        Attributes::ReplacementProductList::TypeInfo::DecodableType replacementProductList;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace HepaFilterMonitoring
+namespace ActivatedCarbonFilterMonitoring {
+namespace Structs {
+namespace ReplacementProductStruct {
 enum class Fields : uint8_t
 {
+    kProductIdentifierType  = 0,
+    kProductIdentifierValue = 1,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::MuteEnded::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
+    chip::CharSpan productIdentifierValue;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
     static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
 
-struct DecodableType
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::MuteEnded::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+using DecodableType = Type;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace MuteEnded
-namespace InterconnectSmokeAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+} // namespace ReplacementProductStruct
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace ResetCondition {
+struct Type;
+struct DecodableType;
+} // namespace ResetCondition
+
+} // namespace Commands
 
+namespace Commands {
+namespace ResetCondition {
 enum class Fields : uint8_t
 {
-    kAlarmSeverityLevel = 0,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::InterconnectSmokeAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::InterconnectSmokeAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace InterconnectSmokeAlarm
-namespace InterconnectCOAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+}; // namespace ResetCondition
+} // namespace Commands
 
-enum class Fields : uint8_t
+namespace Attributes {
+
+namespace Condition {
+struct TypeInfo
 {
-    kAlarmSeverityLevel = 0,
+    using Type             = chip::Percent;
+    using DecodableType    = chip::Percent;
+    using DecodableArgType = chip::Percent;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace Condition
+namespace DegradationDirection {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
+    using DecodableType    = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
+    using DecodableArgType = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace DegradationDirection
+namespace ChangeIndication {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
+    using DecodableType    = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
+    using DecodableArgType = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ChangeIndication::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ChangeIndication
+namespace InPlaceIndicator {
+struct TypeInfo
+{
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace InPlaceIndicator
+namespace LastChangedTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace LastChangedTime
+namespace ReplacementProductList {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::List<
+        const chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ReplacementProductList
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::InterconnectCOAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
-
-struct DecodableType
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::InterconnectCOAlarm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-
-    AlarmStateEnum alarmSeverityLevel = static_cast<AlarmStateEnum>(0);
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
-} // namespace InterconnectCOAlarm
-namespace AllClear {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
-enum class Fields : uint8_t
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
-
-struct Type
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AllClear::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
+} // namespace ClusterRevision
 
-struct DecodableType
+struct TypeInfo
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AllClear::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::Condition::TypeInfo::DecodableType condition = static_cast<chip::Percent>(0);
+        Attributes::DegradationDirection::TypeInfo::DecodableType degradationDirection =
+            static_cast<chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum>(0);
+        Attributes::ChangeIndication::TypeInfo::DecodableType changeIndication =
+            static_cast<chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum>(0);
+        Attributes::InPlaceIndicator::TypeInfo::DecodableType inPlaceIndicator = static_cast<bool>(0);
+        Attributes::LastChangedTime::TypeInfo::DecodableType lastChangedTime;
+        Attributes::ReplacementProductList::TypeInfo::DecodableType replacementProductList;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
 };
-} // namespace AllClear
-} // namespace Events
-} // namespace SmokeCoAlarm
-namespace DishwasherAlarm {
+} // namespace Attributes
+} // namespace ActivatedCarbonFilterMonitoring
+namespace BooleanSensorConfiguration {
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace Reset {
-struct Type;
-struct DecodableType;
-} // namespace Reset
-
-namespace ModifyEnabledAlarms {
+namespace SuppressRequest {
 struct Type;
 struct DecodableType;
-} // namespace ModifyEnabledAlarms
+} // namespace SuppressRequest
 
 } // namespace Commands
 
 namespace Commands {
-namespace Reset {
-enum class Fields : uint8_t
-{
-    kAlarms = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Reset::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-
-    chip::BitMask<AlarmMap> alarms = static_cast<chip::BitMask<AlarmMap>>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Reset::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-
-    chip::BitMask<AlarmMap> alarms = static_cast<chip::BitMask<AlarmMap>>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace Reset
-namespace ModifyEnabledAlarms {
+namespace SuppressRequest {
 enum class Fields : uint8_t
 {
-    kMask = 0,
+    kAlarmsToSuppress = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ModifyEnabledAlarms::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SuppressRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
-    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmModeBitmap> alarmsToSuppress = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -16637,99 +19545,99 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ModifyEnabledAlarms::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SuppressRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
-    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+    chip::BitMask<AlarmModeBitmap> alarmsToSuppress = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ModifyEnabledAlarms
+}; // namespace SuppressRequest
 } // namespace Commands
 
 namespace Attributes {
 
-namespace Mask {
+namespace SensitivityLevel {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using Type             = chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum;
+    using DecodableType    = chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum;
+    using DecodableArgType = chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SensitivityLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Mask
-namespace Latch {
+} // namespace SensitivityLevel
+namespace AlarmsActive {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using Type             = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Latch::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsActive::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Latch
-namespace State {
+} // namespace AlarmsActive
+namespace AlarmsSuppressed {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using Type             = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsSuppressed::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace State
-namespace Supported {
+} // namespace AlarmsSuppressed
+namespace AlarmsEnabled {
 struct TypeInfo
 {
-    using Type             = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableType    = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
-    using DecodableArgType = chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>;
+    using Type             = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Supported::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsEnabled::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Supported
+} // namespace AlarmsEnabled
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace ClusterRevision
 
@@ -16737,18 +19645,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::Mask::TypeInfo::DecodableType mask =
-            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
-        Attributes::Latch::TypeInfo::DecodableType latch =
-            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
-        Attributes::State::TypeInfo::DecodableType state =
-            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
-        Attributes::Supported::TypeInfo::DecodableType supported =
-            static_cast<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>(0);
+        Attributes::SensitivityLevel::TypeInfo::DecodableType sensitivityLevel =
+            static_cast<chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum>(0);
+        Attributes::AlarmsActive::TypeInfo::DecodableType alarmsActive =
+            static_cast<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>(0);
+        Attributes::AlarmsSuppressed::TypeInfo::DecodableType alarmsSuppressed =
+            static_cast<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>(0);
+        Attributes::AlarmsEnabled::TypeInfo::DecodableType alarmsEnabled =
+            static_cast<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -16759,116 +19667,45 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace Notify {
+namespace AlarmsStateChanged {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kActive   = 0,
-    kInactive = 1,
-    kState    = 2,
-    kMask     = 3,
+    kAlarmsActive     = 0,
+    kAlarmsSuppressed = 1,
 };
 
 struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::Notify::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr EventId GetEventId() { return Events::AlarmsStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
-
-struct DecodableType
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::Notify::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
-
-    chip::BitMask<AlarmMap> active   = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> inactive = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> state    = static_cast<chip::BitMask<AlarmMap>>(0);
-    chip::BitMask<AlarmMap> mask     = static_cast<chip::BitMask<AlarmMap>>(0);
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace Notify
-} // namespace Events
-} // namespace DishwasherAlarm
-namespace OperationalState {
-namespace Structs {
-namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
-namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
-} // namespace Structs
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace Pause {
-struct Type;
-struct DecodableType;
-} // namespace Pause
-
-namespace Stop {
-struct Type;
-struct DecodableType;
-} // namespace Stop
-
-namespace Start {
-struct Type;
-struct DecodableType;
-} // namespace Start
-
-namespace Resume {
-struct Type;
-struct DecodableType;
-} // namespace Resume
-
-namespace OperationalCommandResponse {
-struct Type;
-struct DecodableType;
-} // namespace OperationalCommandResponse
-
-} // namespace Commands
-
-namespace Commands {
-namespace Pause {
-enum class Fields : uint8_t
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
-    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+    chip::BitMask<AlarmModeBitmap> alarmsActive = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
+    Optional<chip::BitMask<AlarmModeBitmap>> alarmsSuppressed;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AlarmsStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+
+    chip::BitMask<AlarmModeBitmap> alarmsActive = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
+    Optional<chip::BitMask<AlarmModeBitmap>> alarmsSuppressed;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Pause
-namespace Stop {
+} // namespace AlarmsStateChanged
+namespace SensorFault {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
 enum class Fields : uint8_t
 {
 };
@@ -16876,41 +19713,67 @@ enum class Fields : uint8_t
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SensorFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
-    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::SensorFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Stop
-namespace Start {
+} // namespace SensorFault
+} // namespace Events
+} // namespace BooleanSensorConfiguration
+namespace ValveConfigurationAndControl {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace Open {
+struct Type;
+struct DecodableType;
+} // namespace Open
+
+namespace Close {
+struct Type;
+struct DecodableType;
+} // namespace Close
+
+namespace SetLevel {
+struct Type;
+struct DecodableType;
+} // namespace SetLevel
+
+} // namespace Commands
+
+namespace Commands {
+namespace Open {
 enum class Fields : uint8_t
 {
+    kOpenDuration = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Open::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+
+    Optional<uint32_t> openDuration;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -16918,13 +19781,14 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Open::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
+    Optional<uint32_t> openDuration;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Start
-namespace Resume {
+}; // namespace Open
+namespace Close {
 enum class Fields : uint8_t
 {
 };
@@ -16933,12 +19797,12 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Close::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -16946,26 +19810,28 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Close::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Resume
-namespace OperationalCommandResponse {
+}; // namespace Close
+namespace SetLevel {
 enum class Fields : uint8_t
 {
-    kCommandResponseState = 0,
+    kLevel        = 0,
+    kOpenDuration = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SetLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
-    Structs::ErrorStateStruct::Type commandResponseState;
+    chip::Percent level = static_cast<chip::Percent>(0);
+    Optional<uint32_t> openDuration;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -16977,207 +19843,447 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SetLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
-    Structs::ErrorStateStruct::DecodableType commandResponseState;
+    chip::Percent level = static_cast<chip::Percent>(0);
+    Optional<uint32_t> openDuration;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace OperationalCommandResponse
+}; // namespace SetLevel
 } // namespace Commands
 
 namespace Attributes {
 
-namespace PhaseList {
+namespace OpenDuration {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> &;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OpenDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PhaseList
-namespace CurrentPhase {
+} // namespace OpenDuration
+namespace AutoCloseTime {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AutoCloseTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentPhase
-namespace CountdownTime {
+} // namespace AutoCloseTime
+namespace RemainingDuration {
 struct TypeInfo
 {
     using Type             = chip::app::DataModel::Nullable<uint32_t>;
     using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RemainingDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CountdownTime
-namespace OperationalStateList {
+} // namespace RemainingDuration
+namespace CurrentState {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType> &;
+    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalStateList
-namespace OperationalState {
+} // namespace CurrentState
+namespace TargetState {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::OperationalState::OperationalStateEnum;
-    using DecodableType    = chip::app::Clusters::OperationalState::OperationalStateEnum;
-    using DecodableArgType = chip::app::Clusters::OperationalState::OperationalStateEnum;
+    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TargetState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalState
-namespace OperationalError {
+} // namespace TargetState
+namespace StartUpState {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::Type;
-    using DecodableType    = chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType;
-    using DecodableArgType = const chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType &;
+    using Type             = chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum;
+    using DecodableType    = chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum;
+    using DecodableArgType = chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalError
+} // namespace StartUpState
+namespace CurrentLevel {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::Percent> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentLevel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentLevel
+namespace TargetLevel {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::Percent> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TargetLevel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace TargetLevel
+namespace OpenLevel {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::Percent> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OpenLevel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace OpenLevel
+namespace ValveFault {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ValveFault::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ValveFault
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::OpenDuration::TypeInfo::DecodableType openDuration;
+        Attributes::AutoCloseTime::TypeInfo::DecodableType autoCloseTime;
+        Attributes::RemainingDuration::TypeInfo::DecodableType remainingDuration;
+        Attributes::CurrentState::TypeInfo::DecodableType currentState;
+        Attributes::TargetState::TypeInfo::DecodableType targetState;
+        Attributes::StartUpState::TypeInfo::DecodableType startUpState =
+            static_cast<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>(0);
+        Attributes::CurrentLevel::TypeInfo::DecodableType currentLevel;
+        Attributes::TargetLevel::TypeInfo::DecodableType targetLevel;
+        Attributes::OpenLevel::TypeInfo::DecodableType openLevel;
+        Attributes::ValveFault::TypeInfo::DecodableType valveFault =
+            static_cast<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::EventList::TypeInfo::DecodableType eventList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+namespace Events {
+namespace ValveStateChanged {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kValveState = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::ValveStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    ValveStateEnum valveState = static_cast<ValveStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::ValveStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+
+    ValveStateEnum valveState = static_cast<ValveStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace ValveStateChanged
+namespace ValveFault {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kValveFault = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::ValveFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    chip::BitMask<ValveFaultBitmap> valveFault = static_cast<chip::BitMask<ValveFaultBitmap>>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::ValveFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+
+    chip::BitMask<ValveFaultBitmap> valveFault = static_cast<chip::BitMask<ValveFaultBitmap>>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace ValveFault
+} // namespace Events
+} // namespace ValveConfigurationAndControl
+namespace DemandResponseLoadControl {
+namespace Structs {
+namespace HeatingSourceControlStruct {
+enum class Fields : uint8_t
+{
+    kHeatingSource = 0,
+};
+
+struct Type
+{
+public:
+    HeatingSourceEnum heatingSource = static_cast<HeatingSourceEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+
+using DecodableType = Type;
+
+} // namespace HeatingSourceControlStruct
+namespace PowerSavingsControlStruct {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    kPowerSavings = 0,
 };
-} // namespace AcceptedCommandList
-namespace EventList {
-struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+
+struct Type
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+public:
+    chip::Percent powerSavings = static_cast<chip::Percent>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace EventList
-namespace AttributeList {
-struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+
+using DecodableType = Type;
+
+} // namespace PowerSavingsControlStruct
+namespace DutyCycleControlStruct {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    kDutyCycle = 0,
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+
+struct Type
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+public:
+    chip::Percent dutyCycle = static_cast<chip::Percent>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+
+using DecodableType = Type;
+
+} // namespace DutyCycleControlStruct
+namespace AverageLoadControlStruct {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    kLoadAdjustment = 0,
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct Type
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+public:
+    int8_t loadAdjustment = static_cast<int8_t>(0);
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-        Attributes::PhaseList::TypeInfo::DecodableType phaseList;
-        Attributes::CurrentPhase::TypeInfo::DecodableType currentPhase;
-        Attributes::CountdownTime::TypeInfo::DecodableType countdownTime;
-        Attributes::OperationalStateList::TypeInfo::DecodableType operationalStateList;
-        Attributes::OperationalState::TypeInfo::DecodableType operationalState =
-            static_cast<chip::app::Clusters::OperationalState::OperationalStateEnum>(0);
-        Attributes::OperationalError::TypeInfo::DecodableType operationalError;
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::EventList::TypeInfo::DecodableType eventList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace Attributes
-namespace Events {
-namespace OperationalError {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
 
+using DecodableType = Type;
+
+} // namespace AverageLoadControlStruct
+namespace TemperatureControlStruct {
 enum class Fields : uint8_t
 {
-    kErrorState = 0,
+    kCoolingTempOffset   = 0,
+    kHeatingtTempOffset  = 1,
+    kCoolingTempSetpoint = 2,
+    kHeatingTempSetpoint = 3,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    Optional<DataModel::Nullable<uint16_t>> coolingTempOffset;
+    Optional<DataModel::Nullable<uint16_t>> heatingtTempOffset;
+    Optional<DataModel::Nullable<int16_t>> coolingTempSetpoint;
+    Optional<DataModel::Nullable<int16_t>> heatingTempSetpoint;
 
-    Structs::ErrorStateStruct::Type errorState;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
 
-struct DecodableType
+using DecodableType = Type;
+
+} // namespace TemperatureControlStruct
+namespace LoadControlEventTransitionStruct {
+enum class Fields : uint8_t
 {
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    kDuration             = 0,
+    kControl              = 1,
+    kTemperatureControl   = 2,
+    kAverageLoadControl   = 3,
+    kDutyCycleControl     = 4,
+    kPowerSavingsControl  = 5,
+    kHeatingSourceControl = 6,
+};
 
-    Structs::ErrorStateStruct::DecodableType errorState;
+struct Type
+{
+public:
+    uint16_t duration                                   = static_cast<uint16_t>(0);
+    chip::BitMask<EventTransitionControlBitmap> control = static_cast<chip::BitMask<EventTransitionControlBitmap>>(0);
+    Optional<Structs::TemperatureControlStruct::Type> temperatureControl;
+    Optional<Structs::AverageLoadControlStruct::Type> averageLoadControl;
+    Optional<Structs::DutyCycleControlStruct::Type> dutyCycleControl;
+    Optional<Structs::PowerSavingsControlStruct::Type> powerSavingsControl;
+    Optional<Structs::HeatingSourceControlStruct::Type> heatingSourceControl;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace OperationalError
-namespace OperationCompletion {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
+using DecodableType = Type;
+
+} // namespace LoadControlEventTransitionStruct
+namespace LoadControlEventStruct {
 enum class Fields : uint8_t
 {
-    kCompletionErrorCode  = 0,
-    kTotalOperationalTime = 1,
-    kPausedTime           = 2,
+    kEventID         = 0,
+    kProgramID       = 1,
+    kControl         = 2,
+    kDeviceClass     = 3,
+    kEnrollmentGroup = 4,
+    kCriticality     = 5,
+    kStartTime       = 6,
+    kTransitions     = 7,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
-    static constexpr bool kIsFabricScoped = false;
+    chip::ByteSpan eventID;
+    DataModel::Nullable<chip::ByteSpan> programID;
+    chip::BitMask<EventControlBitmap> control    = static_cast<chip::BitMask<EventControlBitmap>>(0);
+    chip::BitMask<DeviceClassBitmap> deviceClass = static_cast<chip::BitMask<DeviceClassBitmap>>(0);
+    Optional<uint8_t> enrollmentGroup;
+    CriticalityLevelEnum criticality = static_cast<CriticalityLevelEnum>(0);
+    DataModel::Nullable<uint32_t> startTime;
+    DataModel::List<const Structs::LoadControlEventTransitionStruct::Type> transitions;
 
-    uint8_t completionErrorCode = static_cast<uint8_t>(0);
-    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
-    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -17185,71 +20291,101 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    chip::ByteSpan eventID;
+    DataModel::Nullable<chip::ByteSpan> programID;
+    chip::BitMask<EventControlBitmap> control    = static_cast<chip::BitMask<EventControlBitmap>>(0);
+    chip::BitMask<DeviceClassBitmap> deviceClass = static_cast<chip::BitMask<DeviceClassBitmap>>(0);
+    Optional<uint8_t> enrollmentGroup;
+    CriticalityLevelEnum criticality = static_cast<CriticalityLevelEnum>(0);
+    DataModel::Nullable<uint32_t> startTime;
+    DataModel::DecodableList<Structs::LoadControlEventTransitionStruct::DecodableType> transitions;
 
-    uint8_t completionErrorCode = static_cast<uint8_t>(0);
-    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
-    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+};
+
+} // namespace LoadControlEventStruct
+namespace LoadControlProgramStruct {
+enum class Fields : uint8_t
+{
+    kProgramID             = 0,
+    kName                  = 1,
+    kEnrollmentGroup       = 2,
+    kRandomStartMinutes    = 3,
+    kRandomDurationMinutes = 4,
+};
+
+struct Type
+{
+public:
+    chip::ByteSpan programID;
+    chip::CharSpan name;
+    DataModel::Nullable<uint8_t> enrollmentGroup;
+    DataModel::Nullable<uint8_t> randomStartMinutes;
+    DataModel::Nullable<uint8_t> randomDurationMinutes;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace OperationCompletion
-} // namespace Events
-} // namespace OperationalState
-namespace RvcOperationalState {
-namespace Structs {
-namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
-namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
+
+using DecodableType = Type;
+
+} // namespace LoadControlProgramStruct
 } // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace Pause {
+namespace RegisterLoadControlProgramRequest {
 struct Type;
 struct DecodableType;
-} // namespace Pause
+} // namespace RegisterLoadControlProgramRequest
 
-namespace Stop {
+namespace UnregisterLoadControlProgramRequest {
 struct Type;
 struct DecodableType;
-} // namespace Stop
+} // namespace UnregisterLoadControlProgramRequest
 
-namespace Start {
+namespace AddLoadControlEventRequest {
 struct Type;
 struct DecodableType;
-} // namespace Start
+} // namespace AddLoadControlEventRequest
 
-namespace Resume {
+namespace RemoveLoadControlEventRequest {
 struct Type;
 struct DecodableType;
-} // namespace Resume
+} // namespace RemoveLoadControlEventRequest
 
-namespace OperationalCommandResponse {
+namespace ClearLoadControlEventsRequest {
 struct Type;
 struct DecodableType;
-} // namespace OperationalCommandResponse
+} // namespace ClearLoadControlEventsRequest
 
 } // namespace Commands
 
 namespace Commands {
-namespace Pause {
+namespace RegisterLoadControlProgramRequest {
 enum class Fields : uint8_t
 {
+    kLoadControlProgram = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RegisterLoadControlProgramRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+
+    Structs::LoadControlProgramStruct::Type loadControlProgram;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -17257,27 +20393,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RegisterLoadControlProgramRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
+    Structs::LoadControlProgramStruct::DecodableType loadControlProgram;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Pause
-namespace Stop {
+}; // namespace RegisterLoadControlProgramRequest
+namespace UnregisterLoadControlProgramRequest {
 enum class Fields : uint8_t
 {
+    kLoadControlProgramID = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::UnregisterLoadControlProgramRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+
+    chip::ByteSpan loadControlProgramID;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -17285,27 +20425,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::UnregisterLoadControlProgramRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
+    chip::ByteSpan loadControlProgramID;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Stop
-namespace Start {
+}; // namespace UnregisterLoadControlProgramRequest
+namespace AddLoadControlEventRequest {
 enum class Fields : uint8_t
 {
+    kEvent = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::AddLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+
+    Structs::LoadControlEventStruct::Type event;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -17313,27 +20457,33 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::AddLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
+    Structs::LoadControlEventStruct::DecodableType event;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Start
-namespace Resume {
+}; // namespace AddLoadControlEventRequest
+namespace RemoveLoadControlEventRequest {
 enum class Fields : uint8_t
 {
+    kEventID       = 0,
+    kCancelControl = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RemoveLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+
+    chip::ByteSpan eventID;
+    chip::BitMask<CancelControlBitmap> cancelControl = static_cast<chip::BitMask<CancelControlBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -17341,26 +20491,25 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RemoveLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
+    chip::ByteSpan eventID;
+    chip::BitMask<CancelControlBitmap> cancelControl = static_cast<chip::BitMask<CancelControlBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Resume
-namespace OperationalCommandResponse {
+}; // namespace RemoveLoadControlEventRequest
+namespace ClearLoadControlEventsRequest {
 enum class Fields : uint8_t
 {
-    kCommandResponseState = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-
-    Structs::ErrorStateStruct::Type commandResponseState;
+    static constexpr CommandId GetCommandId() { return Commands::ClearLoadControlEventsRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -17372,125 +20521,155 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ClearLoadControlEventsRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-    Structs::ErrorStateStruct::DecodableType commandResponseState;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace OperationalCommandResponse
+}; // namespace ClearLoadControlEventsRequest
 } // namespace Commands
 
 namespace Attributes {
 
-namespace PhaseList {
+namespace LoadControlPrograms {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> &;
+    using Type =
+        chip::app::DataModel::List<const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LoadControlPrograms::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PhaseList
-namespace CurrentPhase {
+} // namespace LoadControlPrograms
+namespace NumberOfLoadControlPrograms {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfLoadControlPrograms::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentPhase
-namespace CountdownTime {
+} // namespace NumberOfLoadControlPrograms
+namespace Events {
+struct TypeInfo
+{
+    using Type =
+        chip::app::DataModel::List<const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Events::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Events
+namespace ActiveEvents {
+struct TypeInfo
+{
+    using Type =
+        chip::app::DataModel::List<const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveEvents::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ActiveEvents
+namespace NumberOfEventsPerProgram {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfEventsPerProgram::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CountdownTime
-namespace OperationalStateList {
+} // namespace NumberOfEventsPerProgram
+namespace NumberOfTransitions {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType> &;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfTransitions::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalStateList
-namespace OperationalState {
+} // namespace NumberOfTransitions
+namespace DefaultRandomStart {
 struct TypeInfo
 {
     using Type             = uint8_t;
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DefaultRandomStart::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalState
-namespace OperationalError {
+} // namespace DefaultRandomStart
+namespace DefaultRandomDuration {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::Type;
-    using DecodableType    = chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType;
-    using DecodableArgType = const chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType &;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DefaultRandomDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalError
+} // namespace DefaultRandomDuration
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace ClusterRevision
 
@@ -17498,16 +20677,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::PhaseList::TypeInfo::DecodableType phaseList;
-        Attributes::CurrentPhase::TypeInfo::DecodableType currentPhase;
-        Attributes::CountdownTime::TypeInfo::DecodableType countdownTime;
-        Attributes::OperationalStateList::TypeInfo::DecodableType operationalStateList;
-        Attributes::OperationalState::TypeInfo::DecodableType operationalState = static_cast<uint8_t>(0);
-        Attributes::OperationalError::TypeInfo::DecodableType operationalError;
+        Attributes::LoadControlPrograms::TypeInfo::DecodableType loadControlPrograms;
+        Attributes::NumberOfLoadControlPrograms::TypeInfo::DecodableType numberOfLoadControlPrograms = static_cast<uint8_t>(0);
+        Attributes::Events::TypeInfo::DecodableType events;
+        Attributes::ActiveEvents::TypeInfo::DecodableType activeEvents;
+        Attributes::NumberOfEventsPerProgram::TypeInfo::DecodableType numberOfEventsPerProgram = static_cast<uint8_t>(0);
+        Attributes::NumberOfTransitions::TypeInfo::DecodableType numberOfTransitions           = static_cast<uint8_t>(0);
+        Attributes::DefaultRandomStart::TypeInfo::DecodableType defaultRandomStart             = static_cast<uint8_t>(0);
+        Attributes::DefaultRandomDuration::TypeInfo::DecodableType defaultRandomDuration       = static_cast<uint8_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -17518,23 +20699,41 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace OperationalError {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+namespace LoadControlEventStatusChange {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kErrorState = 0,
+    kEventID              = 0,
+    kTransitionIndex      = 1,
+    kStatus               = 2,
+    kCriticality          = 3,
+    kControl              = 4,
+    kTemperatureControl   = 5,
+    kAverageLoadControl   = 6,
+    kDutyCycleControl     = 7,
+    kPowerSavingsControl  = 8,
+    kHeatingSourceControl = 9,
 };
 
 struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr EventId GetEventId() { return Events::LoadControlEventStatusChange::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    Structs::ErrorStateStruct::Type errorState;
+    chip::ByteSpan eventID;
+    DataModel::Nullable<uint8_t> transitionIndex;
+    LoadControlEventStatusEnum status         = static_cast<LoadControlEventStatusEnum>(0);
+    CriticalityLevelEnum criticality          = static_cast<CriticalityLevelEnum>(0);
+    chip::BitMask<EventControlBitmap> control = static_cast<chip::BitMask<EventControlBitmap>>(0);
+    Optional<DataModel::Nullable<Structs::TemperatureControlStruct::Type>> temperatureControl;
+    Optional<DataModel::Nullable<Structs::AverageLoadControlStruct::Type>> averageLoadControl;
+    Optional<DataModel::Nullable<Structs::DutyCycleControlStruct::Type>> dutyCycleControl;
+    Optional<DataModel::Nullable<Structs::PowerSavingsControlStruct::Type>> powerSavingsControl;
+    Optional<DataModel::Nullable<Structs::HeatingSourceControlStruct::Type>> heatingSourceControl;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -17543,94 +20742,332 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationalError::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr EventId GetEventId() { return Events::LoadControlEventStatusChange::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-    Structs::ErrorStateStruct::DecodableType errorState;
+    chip::ByteSpan eventID;
+    DataModel::Nullable<uint8_t> transitionIndex;
+    LoadControlEventStatusEnum status         = static_cast<LoadControlEventStatusEnum>(0);
+    CriticalityLevelEnum criticality          = static_cast<CriticalityLevelEnum>(0);
+    chip::BitMask<EventControlBitmap> control = static_cast<chip::BitMask<EventControlBitmap>>(0);
+    Optional<DataModel::Nullable<Structs::TemperatureControlStruct::DecodableType>> temperatureControl;
+    Optional<DataModel::Nullable<Structs::AverageLoadControlStruct::DecodableType>> averageLoadControl;
+    Optional<DataModel::Nullable<Structs::DutyCycleControlStruct::DecodableType>> dutyCycleControl;
+    Optional<DataModel::Nullable<Structs::PowerSavingsControlStruct::DecodableType>> powerSavingsControl;
+    Optional<DataModel::Nullable<Structs::HeatingSourceControlStruct::DecodableType>> heatingSourceControl;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationalError
-namespace OperationCompletion {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+} // namespace LoadControlEventStatusChange
+} // namespace Events
+} // namespace DemandResponseLoadControl
+namespace EnergyEvse {
+namespace Structs {
+namespace ChargingTargetStruct {
 enum class Fields : uint8_t
 {
-    kCompletionErrorCode  = 0,
-    kTotalOperationalTime = 1,
-    kPausedTime           = 2,
+    kTargetTime  = 0,
+    kTargetSoC   = 1,
+    kAddedEnergy = 2,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    uint16_t targetTime = static_cast<uint16_t>(0);
+    Optional<chip::Percent> targetSoC;
+    Optional<int64_t> addedEnergy;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
     static constexpr bool kIsFabricScoped = false;
 
-    uint8_t completionErrorCode = static_cast<uint8_t>(0);
-    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
-    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace ChargingTargetStruct
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace GetTargetsResponse {
+struct Type;
+struct DecodableType;
+} // namespace GetTargetsResponse
+
+namespace Disable {
+struct Type;
+struct DecodableType;
+} // namespace Disable
+
+namespace EnableCharging {
+struct Type;
+struct DecodableType;
+} // namespace EnableCharging
+
+namespace EnableDischarging {
+struct Type;
+struct DecodableType;
+} // namespace EnableDischarging
+
+namespace StartDiagnostics {
+struct Type;
+struct DecodableType;
+} // namespace StartDiagnostics
+
+namespace SetTargets {
+struct Type;
+struct DecodableType;
+} // namespace SetTargets
+
+namespace GetTargets {
+struct Type;
+struct DecodableType;
+} // namespace GetTargets
+
+namespace ClearTargets {
+struct Type;
+struct DecodableType;
+} // namespace ClearTargets
+
+} // namespace Commands
+
+namespace Commands {
+namespace GetTargetsResponse {
+enum class Fields : uint8_t
+{
+    kDayOfWeekforSequence = 0,
+    kChargingTargets      = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::GetTargetsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    chip::BitMask<TargetDayOfWeekBitmap> dayOfWeekforSequence = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+    DataModel::List<const Structs::ChargingTargetStruct::Type> chargingTargets;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::OperationCompletion::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetTargetsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
-    uint8_t completionErrorCode = static_cast<uint8_t>(0);
-    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
-    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+    chip::BitMask<TargetDayOfWeekBitmap> dayOfWeekforSequence = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+    DataModel::DecodableList<Structs::ChargingTargetStruct::DecodableType> chargingTargets;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace GetTargetsResponse
+namespace Disable {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Disable::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Disable::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationCompletion
-} // namespace Events
-} // namespace RvcOperationalState
-namespace HepaFilterMonitoring {
-namespace Structs {
-namespace ReplacementProductStruct {
+}; // namespace Disable
+namespace EnableCharging {
 enum class Fields : uint8_t
 {
-    kProductIdentifierType  = 0,
-    kProductIdentifierValue = 1,
+    kChargingEnabledUntil = 0,
+    kMinimumChargeCurrent = 1,
+    kMaximumChargeCurrent = 2,
 };
 
 struct Type
 {
 public:
-    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
-    chip::CharSpan productIdentifierValue;
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::EnableCharging::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    DataModel::Nullable<uint32_t> chargingEnabledUntil;
+    int64_t minimumChargeCurrent = static_cast<int64_t>(0);
+    int64_t maximumChargeCurrent = static_cast<int64_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::EnableCharging::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
+    DataModel::Nullable<uint32_t> chargingEnabledUntil;
+    int64_t minimumChargeCurrent = static_cast<int64_t>(0);
+    int64_t maximumChargeCurrent = static_cast<int64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace EnableCharging
+namespace EnableDischarging {
+enum class Fields : uint8_t
+{
+    kDischargingEnabledUntil = 0,
+    kMaximumDischargeCurrent = 1,
+};
 
-    static constexpr bool kIsFabricScoped = false;
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::EnableDischarging::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    DataModel::Nullable<uint32_t> dischargingEnabledUntil;
+    int64_t maximumDischargeCurrent = static_cast<int64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
 
-using DecodableType = Type;
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::EnableDischarging::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
-} // namespace ReplacementProductStruct
-} // namespace Structs
+    DataModel::Nullable<uint32_t> dischargingEnabledUntil;
+    int64_t maximumDischargeCurrent = static_cast<int64_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace EnableDischarging
+namespace StartDiagnostics {
+enum class Fields : uint8_t
+{
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::StartDiagnostics::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::StartDiagnostics::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace StartDiagnostics
+namespace SetTargets {
+enum class Fields : uint8_t
+{
+    kDayOfWeekforSequence = 0,
+    kChargingTargets      = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::SetTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    chip::BitMask<TargetDayOfWeekBitmap> dayOfWeekforSequence = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+    DataModel::List<const Structs::ChargingTargetStruct::Type> chargingTargets;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SetTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    chip::BitMask<TargetDayOfWeekBitmap> dayOfWeekforSequence = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+    DataModel::DecodableList<Structs::ChargingTargetStruct::DecodableType> chargingTargets;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace SetTargets
+namespace GetTargets {
+enum class Fields : uint8_t
+{
+    kDaysToReturn = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::GetTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    chip::BitMask<TargetDayOfWeekBitmap> daysToReturn = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+    using ResponseType = Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType;
 
-namespace ResetCondition {
-struct Type;
-struct DecodableType;
-} // namespace ResetCondition
+    static constexpr bool MustUseTimedInvoke() { return true; }
+};
 
-} // namespace Commands
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::GetTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
-namespace Commands {
-namespace ResetCondition {
+    chip::BitMask<TargetDayOfWeekBitmap> daysToReturn = static_cast<chip::BitMask<TargetDayOfWeekBitmap>>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace GetTargets
+namespace ClearTargets {
 enum class Fields : uint8_t
 {
 };
@@ -17639,346 +21076,364 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ClearTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ClearTargets::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ResetCondition
+}; // namespace ClearTargets
 } // namespace Commands
 
 namespace Attributes {
 
-namespace Condition {
+namespace State {
 struct TypeInfo
 {
-    using Type             = chip::Percent;
-    using DecodableType    = chip::Percent;
-    using DecodableArgType = chip::Percent;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Condition
-namespace DegradationDirection {
+} // namespace State
+namespace SupplyState {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
-    using DecodableType    = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
-    using DecodableArgType = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
+    using Type             = chip::app::Clusters::EnergyEvse::SupplyStateEnum;
+    using DecodableType    = chip::app::Clusters::EnergyEvse::SupplyStateEnum;
+    using DecodableArgType = chip::app::Clusters::EnergyEvse::SupplyStateEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupplyState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace DegradationDirection
-namespace ChangeIndication {
+} // namespace SupplyState
+namespace FaultState {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
-    using DecodableType    = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
-    using DecodableArgType = chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum;
+    using Type             = chip::app::Clusters::EnergyEvse::FaultStateEnum;
+    using DecodableType    = chip::app::Clusters::EnergyEvse::FaultStateEnum;
+    using DecodableArgType = chip::app::Clusters::EnergyEvse::FaultStateEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ChangeIndication::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::FaultState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ChangeIndication
-namespace InPlaceIndicator {
+} // namespace FaultState
+namespace ChargingEnabledUntil {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ChargingEnabledUntil::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InPlaceIndicator
-namespace LastChangedTime {
+} // namespace ChargingEnabledUntil
+namespace DischargingEnabledUntil {
 struct TypeInfo
 {
     using Type             = chip::app::DataModel::Nullable<uint32_t>;
     using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
     using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DischargingEnabledUntil::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace LastChangedTime
-namespace ReplacementProductList {
+} // namespace DischargingEnabledUntil
+namespace CircuitCapacity {
 struct TypeInfo
 {
-    using Type =
-        chip::app::DataModel::List<const chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<
-        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> &;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CircuitCapacity::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReplacementProductList
-namespace GeneratedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+} // namespace CircuitCapacity
+namespace MinimumChargeCurrent {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MinimumChargeCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+} // namespace MinimumChargeCurrent
+namespace MaximumChargeCurrent {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaximumChargeCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcceptedCommandList
-namespace EventList {
-struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+} // namespace MaximumChargeCurrent
+namespace MaximumDischargeCurrent {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaximumDischargeCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace EventList
-namespace AttributeList {
-struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+} // namespace MaximumDischargeCurrent
+namespace UserMaximumChargeCurrent {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::UserMaximumChargeCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+} // namespace UserMaximumChargeCurrent
+namespace RandomizationDelayWindow {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RandomizationDelayWindow::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+} // namespace RandomizationDelayWindow
+namespace NumberOfWeeklyTargets {
+struct TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-};
-} // namespace ClusterRevision
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfWeeklyTargets::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace NumberOfWeeklyTargets
+namespace NumberOfDailyTargets {
 struct TypeInfo
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-        Attributes::Condition::TypeInfo::DecodableType condition = static_cast<chip::Percent>(0);
-        Attributes::DegradationDirection::TypeInfo::DecodableType degradationDirection =
-            static_cast<chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum>(0);
-        Attributes::ChangeIndication::TypeInfo::DecodableType changeIndication =
-            static_cast<chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum>(0);
-        Attributes::InPlaceIndicator::TypeInfo::DecodableType inPlaceIndicator = static_cast<bool>(0);
-        Attributes::LastChangedTime::TypeInfo::DecodableType lastChangedTime;
-        Attributes::ReplacementProductList::TypeInfo::DecodableType replacementProductList;
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::EventList::TypeInfo::DecodableType eventList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfDailyTargets::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Attributes
-} // namespace HepaFilterMonitoring
-namespace ActivatedCarbonFilterMonitoring {
-namespace Structs {
-namespace ReplacementProductStruct {
-enum class Fields : uint8_t
+} // namespace NumberOfDailyTargets
+namespace NextChargeStartTime {
+struct TypeInfo
 {
-    kProductIdentifierType  = 0,
-    kProductIdentifierValue = 1,
-};
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NextChargeStartTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace NextChargeStartTime
+namespace NextChargeTargetTime {
+struct TypeInfo
 {
-public:
-    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
-    chip::CharSpan productIdentifierValue;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NextChargeTargetTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-using DecodableType = Type;
-
-} // namespace ReplacementProductStruct
-} // namespace Structs
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace ResetCondition {
-struct Type;
-struct DecodableType;
-} // namespace ResetCondition
-
-} // namespace Commands
-
-namespace Commands {
-namespace ResetCondition {
-enum class Fields : uint8_t
+} // namespace NextChargeTargetTime
+namespace NextChargeRequiredEnergy {
+struct TypeInfo
 {
-};
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NextChargeRequiredEnergy::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace NextChargeRequiredEnergy
+namespace NextChargeTargetSoC {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
-    using ResponseType = DataModel::NullObjectType;
+    using Type             = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::Percent> &;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NextChargeTargetSoC::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace NextChargeTargetSoC
+namespace ApproximateEVEfficiency {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApproximateEVEfficiency::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace ResetCondition
-} // namespace Commands
-
-namespace Attributes {
+} // namespace ApproximateEVEfficiency
+namespace StateOfCharge {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::Percent>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::Percent> &;
 
-namespace Condition {
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StateOfCharge::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StateOfCharge
+namespace BatteryCapacity {
 struct TypeInfo
 {
-    using Type             = chip::Percent;
-    using DecodableType    = chip::Percent;
-    using DecodableArgType = chip::Percent;
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::BatteryCapacity::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Condition
-namespace DegradationDirection {
+} // namespace BatteryCapacity
+namespace VehicleID {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
-    using DecodableType    = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
-    using DecodableArgType = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
+    using Type             = chip::app::DataModel::Nullable<chip::CharSpan>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::CharSpan>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::CharSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::VehicleID::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 32; }
 };
-} // namespace DegradationDirection
-namespace ChangeIndication {
+} // namespace VehicleID
+namespace SessionID {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
-    using DecodableType    = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
-    using DecodableArgType = chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ChangeIndication::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SessionID::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ChangeIndication
-namespace InPlaceIndicator {
+} // namespace SessionID
+namespace SessionDuration {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SessionDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InPlaceIndicator
-namespace LastChangedTime {
+} // namespace SessionDuration
+namespace SessionEnergyCharged {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SessionEnergyCharged::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace LastChangedTime
-namespace ReplacementProductList {
+} // namespace SessionEnergyCharged
+namespace SessionEnergyDischarged {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<
-        const chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> &;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SessionEnergyDischarged::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReplacementProductList
+} // namespace SessionEnergyDischarged
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 };
 } // namespace ClusterRevision
 
@@ -17986,18 +21441,37 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::Condition::TypeInfo::DecodableType condition = static_cast<chip::Percent>(0);
-        Attributes::DegradationDirection::TypeInfo::DecodableType degradationDirection =
-            static_cast<chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum>(0);
-        Attributes::ChangeIndication::TypeInfo::DecodableType changeIndication =
-            static_cast<chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum>(0);
-        Attributes::InPlaceIndicator::TypeInfo::DecodableType inPlaceIndicator = static_cast<bool>(0);
-        Attributes::LastChangedTime::TypeInfo::DecodableType lastChangedTime;
-        Attributes::ReplacementProductList::TypeInfo::DecodableType replacementProductList;
+        Attributes::State::TypeInfo::DecodableType state;
+        Attributes::SupplyState::TypeInfo::DecodableType supplyState =
+            static_cast<chip::app::Clusters::EnergyEvse::SupplyStateEnum>(0);
+        Attributes::FaultState::TypeInfo::DecodableType faultState =
+            static_cast<chip::app::Clusters::EnergyEvse::FaultStateEnum>(0);
+        Attributes::ChargingEnabledUntil::TypeInfo::DecodableType chargingEnabledUntil;
+        Attributes::DischargingEnabledUntil::TypeInfo::DecodableType dischargingEnabledUntil;
+        Attributes::CircuitCapacity::TypeInfo::DecodableType circuitCapacity                   = static_cast<int64_t>(0);
+        Attributes::MinimumChargeCurrent::TypeInfo::DecodableType minimumChargeCurrent         = static_cast<int64_t>(0);
+        Attributes::MaximumChargeCurrent::TypeInfo::DecodableType maximumChargeCurrent         = static_cast<int64_t>(0);
+        Attributes::MaximumDischargeCurrent::TypeInfo::DecodableType maximumDischargeCurrent   = static_cast<int64_t>(0);
+        Attributes::UserMaximumChargeCurrent::TypeInfo::DecodableType userMaximumChargeCurrent = static_cast<int64_t>(0);
+        Attributes::RandomizationDelayWindow::TypeInfo::DecodableType randomizationDelayWindow = static_cast<uint32_t>(0);
+        Attributes::NumberOfWeeklyTargets::TypeInfo::DecodableType numberOfWeeklyTargets       = static_cast<uint8_t>(0);
+        Attributes::NumberOfDailyTargets::TypeInfo::DecodableType numberOfDailyTargets         = static_cast<uint8_t>(0);
+        Attributes::NextChargeStartTime::TypeInfo::DecodableType nextChargeStartTime;
+        Attributes::NextChargeTargetTime::TypeInfo::DecodableType nextChargeTargetTime;
+        Attributes::NextChargeRequiredEnergy::TypeInfo::DecodableType nextChargeRequiredEnergy;
+        Attributes::NextChargeTargetSoC::TypeInfo::DecodableType nextChargeTargetSoC;
+        Attributes::ApproximateEVEfficiency::TypeInfo::DecodableType approximateEVEfficiency;
+        Attributes::StateOfCharge::TypeInfo::DecodableType stateOfCharge;
+        Attributes::BatteryCapacity::TypeInfo::DecodableType batteryCapacity;
+        Attributes::VehicleID::TypeInfo::DecodableType vehicleID;
+        Attributes::SessionID::TypeInfo::DecodableType sessionID;
+        Attributes::SessionDuration::TypeInfo::DecodableType sessionDuration                 = static_cast<uint32_t>(0);
+        Attributes::SessionEnergyCharged::TypeInfo::DecodableType sessionEnergyCharged       = static_cast<int64_t>(0);
+        Attributes::SessionEnergyDischarged::TypeInfo::DecodableType sessionEnergyDischarged = static_cast<int64_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -18007,7 +21481,243 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ActivatedCarbonFilterMonitoring
+namespace Events {
+namespace EVConnected {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kSessionID = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EVConnected::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint32_t sessionID = static_cast<uint32_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EVConnected::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    uint32_t sessionID = static_cast<uint32_t>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace EVConnected
+namespace EVNotDetected {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kSessionID               = 0,
+    kState                   = 1,
+    kSessionDuration         = 2,
+    kSessionEnergyCharged    = 3,
+    kSessionEnergyDischarged = 4,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EVNotDetected::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint32_t sessionID           = static_cast<uint32_t>(0);
+    StateEnum state              = static_cast<StateEnum>(0);
+    uint32_t sessionDuration     = static_cast<uint32_t>(0);
+    int64_t sessionEnergyCharged = static_cast<int64_t>(0);
+    Optional<int64_t> sessionEnergyDischarged;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EVNotDetected::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    uint32_t sessionID           = static_cast<uint32_t>(0);
+    StateEnum state              = static_cast<StateEnum>(0);
+    uint32_t sessionDuration     = static_cast<uint32_t>(0);
+    int64_t sessionEnergyCharged = static_cast<int64_t>(0);
+    Optional<int64_t> sessionEnergyDischarged;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace EVNotDetected
+namespace EnergyTransferStarted {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kSessionID      = 0,
+    kState          = 1,
+    kMaximumCurrent = 2,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EnergyTransferStarted::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint32_t sessionID     = static_cast<uint32_t>(0);
+    StateEnum state        = static_cast<StateEnum>(0);
+    int64_t maximumCurrent = static_cast<int64_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EnergyTransferStarted::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    uint32_t sessionID     = static_cast<uint32_t>(0);
+    StateEnum state        = static_cast<StateEnum>(0);
+    int64_t maximumCurrent = static_cast<int64_t>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace EnergyTransferStarted
+namespace EnergyTransferStopped {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kSessionID         = 0,
+    kState             = 1,
+    kReason            = 2,
+    kEnergyTransferred = 4,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EnergyTransferStopped::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint32_t sessionID                     = static_cast<uint32_t>(0);
+    StateEnum state                        = static_cast<StateEnum>(0);
+    EnergyTransferStoppedReasonEnum reason = static_cast<EnergyTransferStoppedReasonEnum>(0);
+    int64_t energyTransferred              = static_cast<int64_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::EnergyTransferStopped::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    uint32_t sessionID                     = static_cast<uint32_t>(0);
+    StateEnum state                        = static_cast<StateEnum>(0);
+    EnergyTransferStoppedReasonEnum reason = static_cast<EnergyTransferStoppedReasonEnum>(0);
+    int64_t energyTransferred              = static_cast<int64_t>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace EnergyTransferStopped
+namespace Fault {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+
+enum class Fields : uint8_t
+{
+    kSessionID               = 0,
+    kState                   = 1,
+    kFaultStatePreviousState = 2,
+    kFaultStateCurrentState  = 4,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Fault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint32_t sessionID                     = static_cast<uint32_t>(0);
+    StateEnum state                        = static_cast<StateEnum>(0);
+    FaultStateEnum faultStatePreviousState = static_cast<FaultStateEnum>(0);
+    FaultStateEnum faultStateCurrentState  = static_cast<FaultStateEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Fault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    uint32_t sessionID                     = static_cast<uint32_t>(0);
+    StateEnum state                        = static_cast<StateEnum>(0);
+    FaultStateEnum faultStatePreviousState = static_cast<FaultStateEnum>(0);
+    FaultStateEnum faultStateCurrentState  = static_cast<FaultStateEnum>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace Fault
+namespace Rfid {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kUid = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Rfid::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    chip::ByteSpan uid;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::Rfid::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::EnergyEvse::Id; }
+
+    chip::ByteSpan uid;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace Rfid
+} // namespace Events
+} // namespace EnergyEvse
 namespace DoorLock {
 namespace Structs {
 namespace CredentialStruct {
@@ -22824,9 +26534,9 @@ namespace Attributes {
 namespace TemperatureDisplayMode {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum;
+    using DecodableType    = chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum;
+    using DecodableArgType = chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureDisplayMode::Id; }
@@ -22836,9 +26546,9 @@ struct TypeInfo
 namespace KeypadLockout {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum;
+    using DecodableType    = chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum;
+    using DecodableArgType = chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::KeypadLockout::Id; }
@@ -22848,9 +26558,9 @@ struct TypeInfo
 namespace ScheduleProgrammingVisibility {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum;
+    using DecodableType    = chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum;
+    using DecodableArgType = chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ScheduleProgrammingVisibility::Id; }
@@ -22902,9 +26612,12 @@ struct TypeInfo
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::TemperatureDisplayMode::TypeInfo::DecodableType temperatureDisplayMode               = static_cast<uint8_t>(0);
-        Attributes::KeypadLockout::TypeInfo::DecodableType keypadLockout                                 = static_cast<uint8_t>(0);
-        Attributes::ScheduleProgrammingVisibility::TypeInfo::DecodableType scheduleProgrammingVisibility = static_cast<uint8_t>(0);
+        Attributes::TemperatureDisplayMode::TypeInfo::DecodableType temperatureDisplayMode =
+            static_cast<chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum>(0);
+        Attributes::KeypadLockout::TypeInfo::DecodableType keypadLockout =
+            static_cast<chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum>(0);
+        Attributes::ScheduleProgrammingVisibility::TypeInfo::DecodableType scheduleProgrammingVisibility =
+            static_cast<chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -27747,9 +31460,22 @@ struct TypeInfo
     static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::MACAddress::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
+    static constexpr size_t MaxLength() { return 12; }
 };
 } // namespace MACAddress
+namespace LinkLocalAddress {
+struct TypeInfo
+{
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LinkLocalAddress::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
+};
+} // namespace LinkLocalAddress
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -27796,6 +31522,7 @@ struct TypeInfo
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
         Attributes::MACAddress::TypeInfo::DecodableType MACAddress;
+        Attributes::LinkLocalAddress::TypeInfo::DecodableType linkLocalAddress;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -27938,7 +31665,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -27954,7 +31681,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -28220,7 +31947,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 
-    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -28236,7 +31963,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 
-    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -28723,7 +32450,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -28739,7 +32466,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -29327,7 +33054,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
+    CECKeyCodeEnum keyCode = static_cast<CECKeyCodeEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -29342,7 +33069,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
+    CECKeyCodeEnum keyCode = static_cast<CECKeyCodeEnum>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SendKey
@@ -29359,7 +33086,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -29374,7 +33101,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SendKeyResponse
@@ -29716,7 +33443,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -29732,7 +33459,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -29756,9 +33483,9 @@ struct TypeInfo
 namespace SupportedStreamingProtocols {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedStreamingProtocols::Id; }
@@ -29811,7 +33538,8 @@ struct TypeInfo
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
         Attributes::AcceptHeader::TypeInfo::DecodableType acceptHeader;
-        Attributes::SupportedStreamingProtocols::TypeInfo::DecodableType supportedStreamingProtocols = static_cast<uint32_t>(0);
+        Attributes::SupportedStreamingProtocols::TypeInfo::DecodableType supportedStreamingProtocols =
+            static_cast<chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -30188,7 +33916,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
-    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::ByteSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -30204,7 +33932,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
-    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
+    StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::ByteSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
deleted file mode 100644
index c5f97b46c44f83..00000000000000
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-// THIS FILE IS GENERATED BY ZAP
-
-// Prevent multiple inclusion
-#pragma once
-
-#include <stdint.h>
-
-// ZCL enums
-
-// Enum for BarrierControlBarrierPosition
-enum EmberAfBarrierControlBarrierPosition : uint8_t
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
-};
-
-// Enum for BarrierControlMovingState
-enum EmberAfBarrierControlMovingState : uint8_t
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
-};
-
-// Enum for ColorControlOptions
-enum EmberAfColorControlOptions : uint8_t
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
-};
-
-// Enum for ColorMode
-enum EmberAfColorMode : uint8_t
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
-};
-
-// Enum for EnhancedColorMode
-enum EmberAfEnhancedColorMode : uint8_t
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
-};
-
-// Enum for MoveMode
-enum EmberAfMoveMode : uint8_t
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
-};
-
-// Enum for PHYRateEnum
-enum EmberAfPHYRateEnum : uint8_t
-{
-    EMBER_ZCL_PHY_RATE_ENUM_RATE10_M  = 0,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE100_M = 1,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE1_G   = 2,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G = 3,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE5_G   = 4,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE10_G  = 5,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE40_G  = 6,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE100_G = 7,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE200_G = 8,
-    EMBER_ZCL_PHY_RATE_ENUM_RATE400_G = 9,
-};
-
-// Enum for StepMode
-enum EmberAfStepMode : uint8_t
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
-};
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index d58e6eb18dd62a..4999209762972f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -158,9 +158,9 @@ namespace SceneTableSize {
 static constexpr AttributeId Id = 0x00000006;
 } // namespace SceneTableSize
 
-namespace RemainingCapacity {
+namespace FabricSceneInfo {
 static constexpr AttributeId Id = 0x00000007;
-} // namespace RemainingCapacity
+} // namespace FabricSceneInfo
 
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
@@ -722,6 +722,14 @@ namespace ProductAppearance {
 static constexpr AttributeId Id = 0x00000014;
 } // namespace ProductAppearance
 
+namespace SpecificationVersion {
+static constexpr AttributeId Id = 0x00000015;
+} // namespace SpecificationVersion
+
+namespace MaxPathsPerInvoke {
+static constexpr AttributeId Id = 0x00000016;
+} // namespace MaxPathsPerInvoke
+
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -1324,10 +1332,6 @@ namespace TestEventTriggersEnabled {
 static constexpr AttributeId Id = 0x00000008;
 } // namespace TestEventTriggersEnabled
 
-namespace AverageWearCount {
-static constexpr AttributeId Id = 0x00000009;
-} // namespace AverageWearCount
-
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -2445,6 +2449,186 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace IcdManagement
 
+namespace Timer {
+namespace Attributes {
+
+namespace SetTime {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace SetTime
+
+namespace TimeRemaining {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace TimeRemaining
+
+namespace TimerState {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace TimerState
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Timer
+
+namespace OvenCavityOperationalState {
+namespace Attributes {
+
+namespace PhaseList {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace PhaseList
+
+namespace CurrentPhase {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace CurrentPhase
+
+namespace CountdownTime {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace CountdownTime
+
+namespace OperationalStateList {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace OperationalStateList
+
+namespace OperationalState {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace OperationalState
+
+namespace OperationalError {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace OperationalError
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OvenCavityOperationalState
+
+namespace OvenMode {
+namespace Attributes {
+
+namespace SupportedModes {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace SupportedModes
+
+namespace CurrentMode {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace CurrentMode
+
+namespace StartUpMode {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace StartUpMode
+
+namespace OnMode {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace OnMode
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace OvenMode
+
+namespace LaundryDryerControls {
+namespace Attributes {
+
+namespace SupportedDrynessLevels {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace SupportedDrynessLevels
+
+namespace SelectedDrynessLevel {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace SelectedDrynessLevel
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace LaundryDryerControls
+
 namespace ModeSelect {
 namespace Attributes {
 
@@ -3025,6 +3209,94 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace DishwasherAlarm
 
+namespace MicrowaveOvenMode {
+namespace Attributes {
+
+namespace SupportedModes {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace SupportedModes
+
+namespace CurrentMode {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace CurrentMode
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenMode
+
+namespace MicrowaveOvenControl {
+namespace Attributes {
+
+namespace CookTime {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace CookTime
+
+namespace PowerSetting {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace PowerSetting
+
+namespace MinPower {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace MinPower
+
+namespace MaxPower {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace MaxPower
+
+namespace PowerStep {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace PowerStep
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace MicrowaveOvenControl
+
 namespace OperationalState {
 namespace Attributes {
 
@@ -3241,6 +3513,314 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace ActivatedCarbonFilterMonitoring
 
+namespace BooleanSensorConfiguration {
+namespace Attributes {
+
+namespace SensitivityLevel {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace SensitivityLevel
+
+namespace AlarmsActive {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace AlarmsActive
+
+namespace AlarmsSuppressed {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace AlarmsSuppressed
+
+namespace AlarmsEnabled {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace AlarmsEnabled
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+namespace Attributes {
+
+namespace OpenDuration {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace OpenDuration
+
+namespace AutoCloseTime {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace AutoCloseTime
+
+namespace RemainingDuration {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace RemainingDuration
+
+namespace CurrentState {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace CurrentState
+
+namespace TargetState {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace TargetState
+
+namespace StartUpState {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace StartUpState
+
+namespace CurrentLevel {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace CurrentLevel
+
+namespace TargetLevel {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace TargetLevel
+
+namespace OpenLevel {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace OpenLevel
+
+namespace ValveFault {
+static constexpr AttributeId Id = 0x00000009;
+} // namespace ValveFault
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+namespace Attributes {
+
+namespace LoadControlPrograms {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace LoadControlPrograms
+
+namespace NumberOfLoadControlPrograms {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace NumberOfLoadControlPrograms
+
+namespace Events {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace Events
+
+namespace ActiveEvents {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace ActiveEvents
+
+namespace NumberOfEventsPerProgram {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace NumberOfEventsPerProgram
+
+namespace NumberOfTransitions {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace NumberOfTransitions
+
+namespace DefaultRandomStart {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace DefaultRandomStart
+
+namespace DefaultRandomDuration {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace DefaultRandomDuration
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+namespace Attributes {
+
+namespace State {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace State
+
+namespace SupplyState {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace SupplyState
+
+namespace FaultState {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace FaultState
+
+namespace ChargingEnabledUntil {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace ChargingEnabledUntil
+
+namespace DischargingEnabledUntil {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace DischargingEnabledUntil
+
+namespace CircuitCapacity {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace CircuitCapacity
+
+namespace MinimumChargeCurrent {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace MinimumChargeCurrent
+
+namespace MaximumChargeCurrent {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace MaximumChargeCurrent
+
+namespace MaximumDischargeCurrent {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace MaximumDischargeCurrent
+
+namespace UserMaximumChargeCurrent {
+static constexpr AttributeId Id = 0x00000009;
+} // namespace UserMaximumChargeCurrent
+
+namespace RandomizationDelayWindow {
+static constexpr AttributeId Id = 0x0000000A;
+} // namespace RandomizationDelayWindow
+
+namespace NumberOfWeeklyTargets {
+static constexpr AttributeId Id = 0x00000021;
+} // namespace NumberOfWeeklyTargets
+
+namespace NumberOfDailyTargets {
+static constexpr AttributeId Id = 0x00000022;
+} // namespace NumberOfDailyTargets
+
+namespace NextChargeStartTime {
+static constexpr AttributeId Id = 0x00000023;
+} // namespace NextChargeStartTime
+
+namespace NextChargeTargetTime {
+static constexpr AttributeId Id = 0x00000024;
+} // namespace NextChargeTargetTime
+
+namespace NextChargeRequiredEnergy {
+static constexpr AttributeId Id = 0x00000025;
+} // namespace NextChargeRequiredEnergy
+
+namespace NextChargeTargetSoC {
+static constexpr AttributeId Id = 0x00000026;
+} // namespace NextChargeTargetSoC
+
+namespace ApproximateEVEfficiency {
+static constexpr AttributeId Id = 0x00000027;
+} // namespace ApproximateEVEfficiency
+
+namespace StateOfCharge {
+static constexpr AttributeId Id = 0x00000030;
+} // namespace StateOfCharge
+
+namespace BatteryCapacity {
+static constexpr AttributeId Id = 0x00000031;
+} // namespace BatteryCapacity
+
+namespace VehicleID {
+static constexpr AttributeId Id = 0x00000032;
+} // namespace VehicleID
+
+namespace SessionID {
+static constexpr AttributeId Id = 0x00000040;
+} // namespace SessionID
+
+namespace SessionDuration {
+static constexpr AttributeId Id = 0x00000041;
+} // namespace SessionDuration
+
+namespace SessionEnergyCharged {
+static constexpr AttributeId Id = 0x00000042;
+} // namespace SessionEnergyCharged
+
+namespace SessionEnergyDischarged {
+static constexpr AttributeId Id = 0x00000043;
+} // namespace SessionEnergyDischarged
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace EventList {
+static constexpr AttributeId Id = Globals::Attributes::EventList::Id;
+} // namespace EventList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace EnergyEvse
+
 namespace DoorLock {
 namespace Attributes {
 
@@ -5474,6 +6054,10 @@ namespace MACAddress {
 static constexpr AttributeId Id = 0x00000000;
 } // namespace MACAddress
 
+namespace LinkLocalAddress {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace LinkLocalAddress
+
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
index 903a673b79e570..9a1d55e2371d81 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
@@ -148,6 +148,18 @@ static constexpr ClusterId Id = 0x00000045;
 namespace IcdManagement {
 static constexpr ClusterId Id = 0x00000046;
 } // namespace IcdManagement
+namespace Timer {
+static constexpr ClusterId Id = 0x00000047;
+} // namespace Timer
+namespace OvenCavityOperationalState {
+static constexpr ClusterId Id = 0x00000048;
+} // namespace OvenCavityOperationalState
+namespace OvenMode {
+static constexpr ClusterId Id = 0x00000049;
+} // namespace OvenMode
+namespace LaundryDryerControls {
+static constexpr ClusterId Id = 0x0000004A;
+} // namespace LaundryDryerControls
 namespace ModeSelect {
 static constexpr ClusterId Id = 0x00000050;
 } // namespace ModeSelect
@@ -184,6 +196,12 @@ static constexpr ClusterId Id = 0x0000005C;
 namespace DishwasherAlarm {
 static constexpr ClusterId Id = 0x0000005D;
 } // namespace DishwasherAlarm
+namespace MicrowaveOvenMode {
+static constexpr ClusterId Id = 0x0000005E;
+} // namespace MicrowaveOvenMode
+namespace MicrowaveOvenControl {
+static constexpr ClusterId Id = 0x0000005F;
+} // namespace MicrowaveOvenControl
 namespace OperationalState {
 static constexpr ClusterId Id = 0x00000060;
 } // namespace OperationalState
@@ -196,6 +214,18 @@ static constexpr ClusterId Id = 0x00000071;
 namespace ActivatedCarbonFilterMonitoring {
 static constexpr ClusterId Id = 0x00000072;
 } // namespace ActivatedCarbonFilterMonitoring
+namespace BooleanSensorConfiguration {
+static constexpr ClusterId Id = 0x00000080;
+} // namespace BooleanSensorConfiguration
+namespace ValveConfigurationAndControl {
+static constexpr ClusterId Id = 0x00000081;
+} // namespace ValveConfigurationAndControl
+namespace DemandResponseLoadControl {
+static constexpr ClusterId Id = 0x00000096;
+} // namespace DemandResponseLoadControl
+namespace EnergyEvse {
+static constexpr ClusterId Id = 0x00000099;
+} // namespace EnergyEvse
 namespace DoorLock {
 static constexpr ClusterId Id = 0x00000101;
 } // namespace DoorLock
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
index 2b957cf72375ed..2f01ca9dd5b428 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
@@ -410,6 +410,14 @@ namespace ReorderNetwork {
 static constexpr CommandId Id = 0x00000008;
 } // namespace ReorderNetwork
 
+namespace QueryIdentity {
+static constexpr CommandId Id = 0x00000009;
+} // namespace QueryIdentity
+
+namespace QueryIdentityResponse {
+static constexpr CommandId Id = 0x0000000A;
+} // namespace QueryIdentityResponse
+
 } // namespace Commands
 } // namespace NetworkCommissioning
 
@@ -434,6 +442,14 @@ namespace TestEventTrigger {
 static constexpr CommandId Id = 0x00000000;
 } // namespace TestEventTrigger
 
+namespace TimeSnapshot {
+static constexpr CommandId Id = 0x00000001;
+} // namespace TimeSnapshot
+
+namespace TimeSnapshotResponse {
+static constexpr CommandId Id = 0x00000002;
+} // namespace TimeSnapshotResponse
+
 } // namespace Commands
 } // namespace GeneralDiagnostics
 
@@ -628,9 +644,75 @@ namespace StayActiveRequest {
 static constexpr CommandId Id = 0x00000003;
 } // namespace StayActiveRequest
 
+namespace StayActiveResponse {
+static constexpr CommandId Id = 0x00000004;
+} // namespace StayActiveResponse
+
 } // namespace Commands
 } // namespace IcdManagement
 
+namespace Timer {
+namespace Commands {
+
+namespace SetTimer {
+static constexpr CommandId Id = 0x00000000;
+} // namespace SetTimer
+
+namespace ResetTimer {
+static constexpr CommandId Id = 0x00000001;
+} // namespace ResetTimer
+
+namespace AddTime {
+static constexpr CommandId Id = 0x00000002;
+} // namespace AddTime
+
+namespace ReduceTime {
+static constexpr CommandId Id = 0x00000003;
+} // namespace ReduceTime
+
+} // namespace Commands
+} // namespace Timer
+
+namespace OvenCavityOperationalState {
+namespace Commands {
+
+namespace Pause {
+static constexpr CommandId Id = 0x00000000;
+} // namespace Pause
+
+namespace Stop {
+static constexpr CommandId Id = 0x00000001;
+} // namespace Stop
+
+namespace Start {
+static constexpr CommandId Id = 0x00000002;
+} // namespace Start
+
+namespace Resume {
+static constexpr CommandId Id = 0x00000003;
+} // namespace Resume
+
+namespace OperationalCommandResponse {
+static constexpr CommandId Id = 0x00000004;
+} // namespace OperationalCommandResponse
+
+} // namespace Commands
+} // namespace OvenCavityOperationalState
+
+namespace OvenMode {
+namespace Commands {
+
+namespace ChangeToMode {
+static constexpr CommandId Id = 0x00000000;
+} // namespace ChangeToMode
+
+namespace ChangeToModeResponse {
+static constexpr CommandId Id = 0x00000001;
+} // namespace ChangeToModeResponse
+
+} // namespace Commands
+} // namespace OvenMode
+
 namespace ModeSelect {
 namespace Commands {
 
@@ -745,6 +827,20 @@ static constexpr CommandId Id = 0x00000001;
 } // namespace Commands
 } // namespace DishwasherAlarm
 
+namespace MicrowaveOvenControl {
+namespace Commands {
+
+namespace SetCookingParameters {
+static constexpr CommandId Id = 0x00000000;
+} // namespace SetCookingParameters
+
+namespace AddMoreTime {
+static constexpr CommandId Id = 0x00000001;
+} // namespace AddMoreTime
+
+} // namespace Commands
+} // namespace MicrowaveOvenControl
+
 namespace OperationalState {
 namespace Commands {
 
@@ -817,6 +913,98 @@ static constexpr CommandId Id = 0x00000000;
 } // namespace Commands
 } // namespace ActivatedCarbonFilterMonitoring
 
+namespace BooleanSensorConfiguration {
+namespace Commands {
+
+namespace SuppressRequest {
+static constexpr CommandId Id = 0x00000000;
+} // namespace SuppressRequest
+
+} // namespace Commands
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+namespace Commands {
+
+namespace Open {
+static constexpr CommandId Id = 0x00000000;
+} // namespace Open
+
+namespace Close {
+static constexpr CommandId Id = 0x00000001;
+} // namespace Close
+
+namespace SetLevel {
+static constexpr CommandId Id = 0x00000002;
+} // namespace SetLevel
+
+} // namespace Commands
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+namespace Commands {
+
+namespace RegisterLoadControlProgramRequest {
+static constexpr CommandId Id = 0x00000000;
+} // namespace RegisterLoadControlProgramRequest
+
+namespace UnregisterLoadControlProgramRequest {
+static constexpr CommandId Id = 0x00000001;
+} // namespace UnregisterLoadControlProgramRequest
+
+namespace AddLoadControlEventRequest {
+static constexpr CommandId Id = 0x00000002;
+} // namespace AddLoadControlEventRequest
+
+namespace RemoveLoadControlEventRequest {
+static constexpr CommandId Id = 0x00000003;
+} // namespace RemoveLoadControlEventRequest
+
+namespace ClearLoadControlEventsRequest {
+static constexpr CommandId Id = 0x00000004;
+} // namespace ClearLoadControlEventsRequest
+
+} // namespace Commands
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+namespace Commands {
+
+namespace GetTargetsResponse {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetTargetsResponse
+
+namespace Disable {
+static constexpr CommandId Id = 0x00000001;
+} // namespace Disable
+
+namespace EnableCharging {
+static constexpr CommandId Id = 0x00000002;
+} // namespace EnableCharging
+
+namespace EnableDischarging {
+static constexpr CommandId Id = 0x00000003;
+} // namespace EnableDischarging
+
+namespace StartDiagnostics {
+static constexpr CommandId Id = 0x00000004;
+} // namespace StartDiagnostics
+
+namespace SetTargets {
+static constexpr CommandId Id = 0x00000005;
+} // namespace SetTargets
+
+namespace GetTargets {
+static constexpr CommandId Id = 0x00000006;
+} // namespace GetTargets
+
+namespace ClearTargets {
+static constexpr CommandId Id = 0x00000007;
+} // namespace ClearTargets
+
+} // namespace Commands
+} // namespace EnergyEvse
+
 namespace DoorLock {
 namespace Commands {
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
index 4f8f77d84168e8..e598cd11e55bc7 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
@@ -267,6 +267,20 @@ static constexpr EventId Id = 0x00000000;
 } // namespace Events
 } // namespace BooleanState
 
+namespace OvenCavityOperationalState {
+namespace Events {
+
+namespace OperationalError {
+static constexpr EventId Id = 0x00000000;
+} // namespace OperationalError
+
+namespace OperationCompletion {
+static constexpr EventId Id = 0x00000001;
+} // namespace OperationCompletion
+
+} // namespace Events
+} // namespace OvenCavityOperationalState
+
 namespace RefrigeratorAlarm {
 namespace Events {
 
@@ -365,6 +379,74 @@ static constexpr EventId Id = 0x00000001;
 } // namespace Events
 } // namespace RvcOperationalState
 
+namespace BooleanSensorConfiguration {
+namespace Events {
+
+namespace AlarmsStateChanged {
+static constexpr EventId Id = 0x00000000;
+} // namespace AlarmsStateChanged
+
+namespace SensorFault {
+static constexpr EventId Id = 0x00000001;
+} // namespace SensorFault
+
+} // namespace Events
+} // namespace BooleanSensorConfiguration
+
+namespace ValveConfigurationAndControl {
+namespace Events {
+
+namespace ValveStateChanged {
+static constexpr EventId Id = 0x00000000;
+} // namespace ValveStateChanged
+
+namespace ValveFault {
+static constexpr EventId Id = 0x00000001;
+} // namespace ValveFault
+
+} // namespace Events
+} // namespace ValveConfigurationAndControl
+
+namespace DemandResponseLoadControl {
+namespace Events {
+
+namespace LoadControlEventStatusChange {
+static constexpr EventId Id = 0x00000000;
+} // namespace LoadControlEventStatusChange
+
+} // namespace Events
+} // namespace DemandResponseLoadControl
+
+namespace EnergyEvse {
+namespace Events {
+
+namespace EVConnected {
+static constexpr EventId Id = 0x00000000;
+} // namespace EVConnected
+
+namespace EVNotDetected {
+static constexpr EventId Id = 0x00000001;
+} // namespace EVNotDetected
+
+namespace EnergyTransferStarted {
+static constexpr EventId Id = 0x00000002;
+} // namespace EnergyTransferStarted
+
+namespace EnergyTransferStopped {
+static constexpr EventId Id = 0x00000003;
+} // namespace EnergyTransferStopped
+
+namespace Fault {
+static constexpr EventId Id = 0x00000004;
+} // namespace Fault
+
+namespace Rfid {
+static constexpr EventId Id = 0x00000005;
+} // namespace Rfid
+
+} // namespace Events
+} // namespace EnergyEvse
+
 namespace DoorLock {
 namespace Events {
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
index f3dbf7e60bc35d..8e3daedd46a4cb 100644
--- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
+++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
@@ -286,6 +286,32 @@
 #define CHIP_PRINTCLUSTER_ICD_MANAGEMENT_CLUSTER
 #endif
 
+#if defined(ZCL_USING_TIMER_CLUSTER_SERVER) || defined(ZCL_USING_TIMER_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_TIMER_CLUSTER { chip::app::Clusters::Timer::Id, "Timer" },
+#else
+#define CHIP_PRINTCLUSTER_TIMER_CLUSTER
+#endif
+
+#if defined(ZCL_USING_OPERATIONAL_STATE_OVEN_CLUSTER_SERVER) || defined(ZCL_USING_OPERATIONAL_STATE_OVEN_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_OPERATIONAL_STATE_OVEN_CLUSTER                                                                           \
+    { chip::app::Clusters::OvenCavityOperationalState::Id, "Oven Cavity Operational State" },
+#else
+#define CHIP_PRINTCLUSTER_OPERATIONAL_STATE_OVEN_CLUSTER
+#endif
+
+#if defined(ZCL_USING_OVEN_MODE_CLUSTER_SERVER) || defined(ZCL_USING_OVEN_MODE_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_OVEN_MODE_CLUSTER { chip::app::Clusters::OvenMode::Id, "Oven Mode" },
+#else
+#define CHIP_PRINTCLUSTER_OVEN_MODE_CLUSTER
+#endif
+
+#if defined(ZCL_USING_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER) || defined(ZCL_USING_LAUNDRY_DRYER_CONTROLS_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_LAUNDRY_DRYER_CONTROLS_CLUSTER                                                                           \
+    { chip::app::Clusters::LaundryDryerControls::Id, "Laundry Dryer Controls" },
+#else
+#define CHIP_PRINTCLUSTER_LAUNDRY_DRYER_CONTROLS_CLUSTER
+#endif
+
 #if defined(ZCL_USING_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_MODE_SELECT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER { chip::app::Clusters::ModeSelect::Id, "Mode Select" },
 #else
@@ -362,6 +388,19 @@
 #define CHIP_PRINTCLUSTER_DISHWASHER_ALARM_CLUSTER
 #endif
 
+#if defined(ZCL_USING_MICROWAVE_OVEN_MODE_CLUSTER_SERVER) || defined(ZCL_USING_MICROWAVE_OVEN_MODE_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_MICROWAVE_OVEN_MODE_CLUSTER { chip::app::Clusters::MicrowaveOvenMode::Id, "Microwave Oven Mode" },
+#else
+#define CHIP_PRINTCLUSTER_MICROWAVE_OVEN_MODE_CLUSTER
+#endif
+
+#if defined(ZCL_USING_MICROWAVE_OVEN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_MICROWAVE_OVEN_CONTROL_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_MICROWAVE_OVEN_CONTROL_CLUSTER                                                                           \
+    { chip::app::Clusters::MicrowaveOvenControl::Id, "Microwave Oven Control" },
+#else
+#define CHIP_PRINTCLUSTER_MICROWAVE_OVEN_CONTROL_CLUSTER
+#endif
+
 #if defined(ZCL_USING_OPERATIONAL_STATE_CLUSTER_SERVER) || defined(ZCL_USING_OPERATIONAL_STATE_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_OPERATIONAL_STATE_CLUSTER { chip::app::Clusters::OperationalState::Id, "Operational State" },
 #else
@@ -389,6 +428,34 @@
 #define CHIP_PRINTCLUSTER_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER
 #endif
 
+#if defined(ZCL_USING_BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_BOOLEAN_SENSOR_CONFIGURATION_CLUSTER                                                                     \
+    { chip::app::Clusters::BooleanSensorConfiguration::Id, "Boolean Sensor Configuration" },
+#else
+#define CHIP_PRINTCLUSTER_BOOLEAN_SENSOR_CONFIGURATION_CLUSTER
+#endif
+
+#if defined(ZCL_USING_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER) ||                                                           \
+    defined(ZCL_USING_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER                                                                  \
+    { chip::app::Clusters::ValveConfigurationAndControl::Id, "Valve Configuration and Control" },
+#else
+#define CHIP_PRINTCLUSTER_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER
+#endif
+
+#if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
+    { chip::app::Clusters::DemandResponseLoadControl::Id, "Demand Response Load Control" },
+#else
+#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+#endif
+
+#if defined(ZCL_USING_ENERGY_EVSE_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_EVSE_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_ENERGY_EVSE_CLUSTER { chip::app::Clusters::EnergyEvse::Id, "Energy EVSE" },
+#else
+#define CHIP_PRINTCLUSTER_ENERGY_EVSE_CLUSTER
+#endif
+
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { chip::app::Clusters::DoorLock::Id, "Door Lock" },
 #else
@@ -707,6 +774,10 @@
     CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER                                                                                        \
     CHIP_PRINTCLUSTER_ICD_MANAGEMENT_CLUSTER                                                                                       \
+    CHIP_PRINTCLUSTER_TIMER_CLUSTER                                                                                                \
+    CHIP_PRINTCLUSTER_OPERATIONAL_STATE_OVEN_CLUSTER                                                                               \
+    CHIP_PRINTCLUSTER_OVEN_MODE_CLUSTER                                                                                            \
+    CHIP_PRINTCLUSTER_LAUNDRY_DRYER_CONTROLS_CLUSTER                                                                               \
     CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_CLUSTER                                                                                  \
     CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER                                                 \
@@ -719,10 +790,16 @@
     CHIP_PRINTCLUSTER_AIR_QUALITY_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_SMOKE_CO_ALARM_CLUSTER                                                                                       \
     CHIP_PRINTCLUSTER_DISHWASHER_ALARM_CLUSTER                                                                                     \
+    CHIP_PRINTCLUSTER_MICROWAVE_OVEN_MODE_CLUSTER                                                                                  \
+    CHIP_PRINTCLUSTER_MICROWAVE_OVEN_CONTROL_CLUSTER                                                                               \
     CHIP_PRINTCLUSTER_OPERATIONAL_STATE_CLUSTER                                                                                    \
     CHIP_PRINTCLUSTER_OPERATIONAL_STATE_RVC_CLUSTER                                                                                \
     CHIP_PRINTCLUSTER_HEPA_FILTER_MONITORING_CLUSTER                                                                               \
     CHIP_PRINTCLUSTER_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER                                                                   \
+    CHIP_PRINTCLUSTER_BOOLEAN_SENSOR_CONFIGURATION_CLUSTER                                                                         \
+    CHIP_PRINTCLUSTER_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER                                                                      \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
+    CHIP_PRINTCLUSTER_ENERGY_EVSE_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
     CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
     CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
diff --git a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h
index dcb93f3806b370..e75d11598b9b0b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h
@@ -759,6 +759,8 @@ struct DiscoveryCommandResponse
     uint16_t port;
     Optional<uint32_t> mrpRetryIntervalIdle;
     Optional<uint32_t> mrpRetryIntervalActive;
+    Optional<uint16_t> mrpRetryActiveThreshold;
+    Optional<bool> isICDOperatingAsLIT;
 
     CHIP_ERROR Encode(chip::TLV::TLVWriter & writer, chip::TLV::Tag tag) const
     {
@@ -782,6 +784,8 @@ struct DiscoveryCommandResponse
         ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(15), port));
         ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(16), mrpRetryIntervalIdle));
         ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(17), mrpRetryIntervalActive));
+        ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(18), mrpRetryActiveThreshold));
+        ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(19), isICDOperatingAsLIT));
         ReturnErrorOnFailure(writer.EndContainer(outer));
         return CHIP_NO_ERROR;
     }
@@ -852,6 +856,12 @@ struct DiscoveryCommandResponse
             case 17:
                 ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, mrpRetryIntervalActive));
                 break;
+            case 18:
+                ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, mrpRetryActiveThreshold));
+                break;
+            case 19:
+                ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, isICDOperatingAsLIT));
+                break;
             default:
                 break;
             }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 8b0b717eb30aae..610e325a4e7dfa 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -75,6 +75,10 @@
 | ProxyValid                                                          | 0x0044 |
 | BooleanState                                                        | 0x0045 |
 | IcdManagement                                                       | 0x0046 |
+| Timer                                                               | 0x0047 |
+| OvenCavityOperationalState                                          | 0x0048 |
+| OvenMode                                                            | 0x0049 |
+| LaundryDryerControls                                                | 0x004A |
 | ModeSelect                                                          | 0x0050 |
 | LaundryWasherMode                                                   | 0x0051 |
 | RefrigeratorAndTemperatureControlledCabinetMode                     | 0x0052 |
@@ -87,10 +91,16 @@
 | AirQuality                                                          | 0x005B |
 | SmokeCoAlarm                                                        | 0x005C |
 | DishwasherAlarm                                                     | 0x005D |
+| MicrowaveOvenMode                                                   | 0x005E |
+| MicrowaveOvenControl                                                | 0x005F |
 | OperationalState                                                    | 0x0060 |
 | RvcOperationalState                                                 | 0x0061 |
 | HepaFilterMonitoring                                                | 0x0071 |
 | ActivatedCarbonFilterMonitoring                                     | 0x0072 |
+| BooleanSensorConfiguration                                          | 0x0080 |
+| ValveConfigurationAndControl                                        | 0x0081 |
+| DemandResponseLoadControl                                           | 0x0096 |
+| EnergyEvse                                                          | 0x0099 |
 | DoorLock                                                            | 0x0101 |
 | WindowCovering                                                      | 0x0102 |
 | BarrierControl                                                      | 0x0103 |
@@ -501,7 +511,7 @@ class GroupsAddGroupIfIdentifying : public ClusterCommand
 | * NameSupport                                                       | 0x0004 |
 | * LastConfiguredBy                                                  | 0x0005 |
 | * SceneTableSize                                                    | 0x0006 |
-| * RemainingCapacity                                                 | 0x0007 |
+| * FabricSceneInfo                                                   | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -2199,6 +2209,8 @@ class ActionsDisableActionWithDuration : public ClusterCommand
 | * UniqueID                                                          | 0x0012 |
 | * CapabilityMinima                                                  | 0x0013 |
 | * ProductAppearance                                                 | 0x0014 |
+| * SpecificationVersion                                              | 0x0015 |
+| * MaxPathsPerInvoke                                                 | 0x0016 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -2732,6 +2744,7 @@ class GeneralCommissioningCommissioningComplete : public ClusterCommand
 | * RemoveNetwork                                                     |   0x04 |
 | * ConnectNetwork                                                    |   0x06 |
 | * ReorderNetwork                                                    |   0x08 |
+| * QueryIdentity                                                     |   0x09 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MaxNetworks                                                       | 0x0000 |
@@ -2806,6 +2819,9 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand
         AddArgument("Ssid", &mRequest.ssid);
         AddArgument("Credentials", &mRequest.credentials);
         AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        AddArgument("NetworkIdentity", &mRequest.networkIdentity);
+        AddArgument("ClientIdentifier", &mRequest.clientIdentifier);
+        AddArgument("PossessionNonce", &mRequest.possessionNonce);
         ClusterCommand::AddArguments();
     }
 
@@ -2991,6 +3007,45 @@ class NetworkCommissioningReorderNetwork : public ClusterCommand
     chip::app::Clusters::NetworkCommissioning::Commands::ReorderNetwork::Type mRequest;
 };
 
+/*
+ * Command QueryIdentity
+ */
+class NetworkCommissioningQueryIdentity : public ClusterCommand
+{
+public:
+    NetworkCommissioningQueryIdentity(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("query-identity", credsIssuerConfig)
+    {
+        AddArgument("KeyIdentifier", &mRequest.keyIdentifier);
+        AddArgument("PossessionNonce", &mRequest.possessionNonce);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Type mRequest;
+};
+
 /*----------------------------------------------------------------------------*\
 | Cluster DiagnosticLogs                                              | 0x0032 |
 |------------------------------------------------------------------------------|
@@ -3053,6 +3108,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * TestEventTrigger                                                  |   0x00 |
+| * TimeSnapshot                                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NetworkInterfaces                                                 | 0x0000 |
@@ -3064,7 +3120,6 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand
 | * ActiveRadioFaults                                                 | 0x0006 |
 | * ActiveNetworkFaults                                               | 0x0007 |
 | * TestEventTriggersEnabled                                          | 0x0008 |
-| * AverageWearCount                                                  | 0x0009 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -3118,6 +3173,43 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand
     chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
 };
 
+/*
+ * Command TimeSnapshot
+ */
+class GeneralDiagnosticsTimeSnapshot : public ClusterCommand
+{
+public:
+    GeneralDiagnosticsTimeSnapshot(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("time-snapshot", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Type mRequest;
+};
+
 /*----------------------------------------------------------------------------*\
 | Cluster SoftwareDiagnostics                                         | 0x0034 |
 |------------------------------------------------------------------------------|
@@ -4627,18 +4719,18 @@ class IcdManagementStayActiveRequest : public ClusterCommand
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster ModeSelect                                                  | 0x0050 |
+| Cluster Timer                                                       | 0x0047 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * SetTimer                                                          |   0x00 |
+| * ResetTimer                                                        |   0x01 |
+| * AddTime                                                           |   0x02 |
+| * ReduceTime                                                        |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Description                                                       | 0x0000 |
-| * StandardNamespace                                                 | 0x0001 |
-| * SupportedModes                                                    | 0x0002 |
-| * CurrentMode                                                       | 0x0003 |
-| * StartUpMode                                                       | 0x0004 |
-| * OnMode                                                            | 0x0005 |
+| * SetTime                                                           | 0x0000 |
+| * TimeRemaining                                                     | 0x0001 |
+| * TimerState                                                        | 0x0002 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -4650,21 +4742,21 @@ class IcdManagementStayActiveRequest : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ChangeToMode
+ * Command SetTimer
  */
-class ModeSelectChangeToMode : public ClusterCommand
+class TimerSetTimer : public ClusterCommand
 {
 public:
-    ModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
+    TimerSetTimer(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-timer", credsIssuerConfig)
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        AddArgument("NewTime", 0, UINT32_MAX, &mRequest.newTime);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::SetTimer::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4673,8 +4765,8 @@ class ModeSelectChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::SetTimer::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4683,47 +4775,24 @@ class ModeSelectChangeToMode : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Timer::Commands::SetTimer::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherMode                                           | 0x0051 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
-| * OnMode                                                            | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ChangeToMode
+ * Command ResetTimer
  */
-class LaundryWasherModeChangeToMode : public ClusterCommand
+class TimerResetTimer : public ClusterCommand
 {
 public:
-    LaundryWasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("change-to-mode", credsIssuerConfig)
+    TimerResetTimer(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reset-timer", credsIssuerConfig)
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ResetTimer::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4732,8 +4801,8 @@ class LaundryWasherModeChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ResetTimer::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4742,48 +4811,25 @@ class LaundryWasherModeChangeToMode : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Timer::Commands::ResetTimer::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
-| * OnMode                                                            | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ChangeToMode
+ * Command AddTime
  */
-class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand
+class TimerAddTime : public ClusterCommand
 {
 public:
-    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("change-to-mode", credsIssuerConfig)
+    TimerAddTime(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-time", credsIssuerConfig)
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        AddArgument("AdditionalTime", 0, UINT32_MAX, &mRequest.additionalTime);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::AddTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4792,9 +4838,8 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::AddTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4803,65 +4848,25 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
     }
 
 private:
-    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Timer::Commands::AddTime::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherControls                                       | 0x0053 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SpinSpeeds                                                        | 0x0000 |
-| * SpinSpeedCurrent                                                  | 0x0001 |
-| * NumberOfRinses                                                    | 0x0002 |
-| * SupportedRinses                                                   | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster RvcRunMode                                                  | 0x0054 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * OnMode                                                            | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ChangeToMode
+ * Command ReduceTime
  */
-class RvcRunModeChangeToMode : public ClusterCommand
+class TimerReduceTime : public ClusterCommand
 {
 public:
-    RvcRunModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
+    TimerReduceTime(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reduce-time", credsIssuerConfig)
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        AddArgument("TimeReduction", 0, UINT32_MAX, &mRequest.timeReduction);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ReduceTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4870,8 +4875,8 @@ class RvcRunModeChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ReduceTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4880,19 +4885,25 @@ class RvcRunModeChangeToMode : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Timer::Commands::ReduceTime::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster RvcCleanMode                                                | 0x0055 |
+| Cluster OvenCavityOperationalState                                  | 0x0048 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * OnMode                                                            | 0x0003 |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -4901,24 +4912,25 @@ class RvcRunModeChangeToMode : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ChangeToMode
+ * Command Pause
  */
-class RvcCleanModeChangeToMode : public ClusterCommand
+class OvenCavityOperationalStatePause : public ClusterCommand
 {
 public:
-    RvcCleanModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
+    OvenCavityOperationalStatePause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4927,8 +4939,8 @@ class RvcCleanModeChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4937,50 +4949,24 @@ class RvcCleanModeChangeToMode : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster TemperatureControl                                          | 0x0056 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SetTemperature                                                    |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * TemperatureSetpoint                                               | 0x0000 |
-| * MinTemperature                                                    | 0x0001 |
-| * MaxTemperature                                                    | 0x0002 |
-| * Step                                                              | 0x0003 |
-| * SelectedTemperatureLevel                                          | 0x0004 |
-| * SupportedTemperatureLevels                                        | 0x0005 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SetTemperature
+ * Command Stop
  */
-class TemperatureControlSetTemperature : public ClusterCommand
+class OvenCavityOperationalStateStop : public ClusterCommand
 {
 public:
-    TemperatureControlSetTemperature(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-temperature", credsIssuerConfig)
+    OvenCavityOperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
     {
-        AddArgument("TargetTemperature", INT16_MIN, INT16_MAX, &mRequest.targetTemperature);
-        AddArgument("TargetTemperatureLevel", 0, UINT8_MAX, &mRequest.targetTemperatureLevel);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -4989,8 +4975,8 @@ class TemperatureControlSetTemperature : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -4999,31 +4985,83 @@ class TemperatureControlSetTemperature : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type mRequest;
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAlarm                                           | 0x0057 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
-\*----------------------------------------------------------------------------*/
+/*
+ * Command Start
+ */
+class OvenCavityOperationalStateStart : public ClusterCommand
+{
+public:
+    OvenCavityOperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Start::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Start::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Start::Type mRequest;
+};
+
+/*
+ * Command Resume
+ */
+class OvenCavityOperationalStateResume : public ClusterCommand
+{
+public:
+    OvenCavityOperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::Type mRequest;
+};
 
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherMode                                              | 0x0059 |
+| Cluster OvenMode                                                    | 0x0049 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -5046,10 +5084,10 @@ class TemperatureControlSetTemperature : public ClusterCommand
 /*
  * Command ChangeToMode
  */
-class DishwasherModeChangeToMode : public ClusterCommand
+class OvenModeChangeToMode : public ClusterCommand
 {
 public:
-    DishwasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
+    OvenModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
     {
         AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
@@ -5057,8 +5095,8 @@ class DishwasherModeChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5067,8 +5105,8 @@ class DishwasherModeChangeToMode : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5077,16 +5115,17 @@ class DishwasherModeChangeToMode : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster AirQuality                                                  | 0x005B |
+| Cluster LaundryDryerControls                                        | 0x004A |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * AirQuality                                                        | 0x0000 |
+| * SupportedDrynessLevels                                            | 0x0000 |
+| * SelectedDrynessLevel                                              | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5098,25 +5137,18 @@ class DishwasherModeChangeToMode : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster SmokeCoAlarm                                                | 0x005C |
+| Cluster ModeSelect                                                  | 0x0050 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SelfTestRequest                                                   |   0x00 |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ExpressedState                                                    | 0x0000 |
-| * SmokeState                                                        | 0x0001 |
-| * COState                                                           | 0x0002 |
-| * BatteryAlert                                                      | 0x0003 |
-| * DeviceMuted                                                       | 0x0004 |
-| * TestInProgress                                                    | 0x0005 |
-| * HardwareFaultAlert                                                | 0x0006 |
-| * EndOfServiceAlert                                                 | 0x0007 |
-| * InterconnectSmokeAlarm                                            | 0x0008 |
-| * InterconnectCOAlarm                                               | 0x0009 |
-| * ContaminationState                                                | 0x000A |
-| * SmokeSensitivityLevel                                             | 0x000B |
-| * ExpiryDate                                                        | 0x000C |
+| * Description                                                       | 0x0000 |
+| * StandardNamespace                                                 | 0x0001 |
+| * SupportedModes                                                    | 0x0002 |
+| * CurrentMode                                                       | 0x0003 |
+| * StartUpMode                                                       | 0x0004 |
+| * OnMode                                                            | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5125,35 +5157,24 @@ class DishwasherModeChangeToMode : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * SmokeAlarm                                                        | 0x0000 |
-| * COAlarm                                                           | 0x0001 |
-| * LowBattery                                                        | 0x0002 |
-| * HardwareFault                                                     | 0x0003 |
-| * EndOfService                                                      | 0x0004 |
-| * SelfTestComplete                                                  | 0x0005 |
-| * AlarmMuted                                                        | 0x0006 |
-| * MuteEnded                                                         | 0x0007 |
-| * InterconnectSmokeAlarm                                            | 0x0008 |
-| * InterconnectCOAlarm                                               | 0x0009 |
-| * AllClear                                                          | 0x000A |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command SelfTestRequest
+ * Command ChangeToMode
  */
-class SmokeCoAlarmSelfTestRequest : public ClusterCommand
+class ModeSelectChangeToMode : public ClusterCommand
 {
 public:
-    SmokeCoAlarmSelfTestRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("self-test-request", credsIssuerConfig)
+    ModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
     {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5162,8 +5183,8 @@ class SmokeCoAlarmSelfTestRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5172,21 +5193,20 @@ class SmokeCoAlarmSelfTestRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Type mRequest;
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherAlarm                                             | 0x005D |
+| Cluster LaundryWasherMode                                           | 0x0051 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Reset                                                             |   0x00 |
-| * ModifyEnabledAlarms                                               |   0x01 |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * Latch                                                             | 0x0001 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5195,25 +5215,25 @@ class SmokeCoAlarmSelfTestRequest : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Reset
+ * Command ChangeToMode
  */
-class DishwasherAlarmReset : public ClusterCommand
+class LaundryWasherModeChangeToMode : public ClusterCommand
 {
 public:
-    DishwasherAlarmReset(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reset", credsIssuerConfig)
+    LaundryWasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("change-to-mode", credsIssuerConfig)
     {
-        AddArgument("Alarms", 0, UINT32_MAX, &mRequest.alarms);
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5222,8 +5242,8 @@ class DishwasherAlarmReset : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5232,26 +5252,48 @@ class DishwasherAlarmReset : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type mRequest;
+    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command ModifyEnabledAlarms
+ * Command ChangeToMode
  */
-class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand
+class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand
 {
 public:
-    DishwasherAlarmModifyEnabledAlarms(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("modify-enabled-alarms", credsIssuerConfig)
+    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("change-to-mode", credsIssuerConfig)
     {
-        AddArgument("Mask", 0, UINT32_MAX, &mRequest.mask);
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5260,8 +5302,9 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5270,25 +5313,39 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
+    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster OperationalState                                            | 0x0060 |
+| Cluster LaundryWasherControls                                       | 0x0053 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Pause                                                             |   0x00 |
-| * Stop                                                              |   0x01 |
-| * Start                                                             |   0x02 |
-| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * PhaseList                                                         | 0x0000 |
-| * CurrentPhase                                                      | 0x0001 |
-| * CountdownTime                                                     | 0x0002 |
-| * OperationalStateList                                              | 0x0003 |
-| * OperationalState                                                  | 0x0004 |
-| * OperationalError                                                  | 0x0005 |
+| * SpinSpeeds                                                        | 0x0000 |
+| * SpinSpeedCurrent                                                  | 0x0001 |
+| * NumberOfRinses                                                    | 0x0002 |
+| * SupportedRinses                                                   | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster RvcRunMode                                                  | 0x0054 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5297,25 +5354,24 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * OperationalError                                                  | 0x0000 |
-| * OperationCompletion                                               | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Pause
+ * Command ChangeToMode
  */
-class OperationalStatePause : public ClusterCommand
+class RvcRunModeChangeToMode : public ClusterCommand
 {
 public:
-    OperationalStatePause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
+    RvcRunModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
     {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5324,8 +5380,8 @@ class OperationalStatePause : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5334,24 +5390,45 @@ class OperationalStatePause : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::OperationalState::Commands::Pause::Type mRequest;
+    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster RvcCleanMode                                                | 0x0055 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * OnMode                                                            | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command Stop
+ * Command ChangeToMode
  */
-class OperationalStateStop : public ClusterCommand
+class RvcCleanModeChangeToMode : public ClusterCommand
 {
 public:
-    OperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
+    RvcCleanModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
     {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5360,8 +5437,8 @@ class OperationalStateStop : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5370,24 +5447,50 @@ class OperationalStateStop : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::OperationalState::Commands::Stop::Type mRequest;
+    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster TemperatureControl                                          | 0x0056 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SetTemperature                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * TemperatureSetpoint                                               | 0x0000 |
+| * MinTemperature                                                    | 0x0001 |
+| * MaxTemperature                                                    | 0x0002 |
+| * Step                                                              | 0x0003 |
+| * SelectedTemperatureLevel                                          | 0x0004 |
+| * SupportedTemperatureLevels                                        | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command Start
+ * Command SetTemperature
  */
-class OperationalStateStart : public ClusterCommand
+class TemperatureControlSetTemperature : public ClusterCommand
 {
 public:
-    OperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
+    TemperatureControlSetTemperature(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-temperature", credsIssuerConfig)
     {
+        AddArgument("TargetTemperature", INT16_MIN, INT16_MAX, &mRequest.targetTemperature);
+        AddArgument("TargetTemperatureLevel", 0, UINT8_MAX, &mRequest.targetTemperatureLevel);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5396,8 +5499,8 @@ class OperationalStateStart : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5406,24 +5509,66 @@ class OperationalStateStart : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::OperationalState::Commands::Start::Type mRequest;
+    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster RefrigeratorAlarm                                           | 0x0057 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Mask                                                              | 0x0000 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster DishwasherMode                                              | 0x0059 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command Resume
+ * Command ChangeToMode
  */
-class OperationalStateResume : public ClusterCommand
+class DishwasherModeChangeToMode : public ClusterCommand
 {
 public:
-    OperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
+    DishwasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig)
     {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5432,8 +5577,8 @@ class OperationalStateResume : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5442,25 +5587,16 @@ class OperationalStateResume : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::OperationalState::Commands::Resume::Type mRequest;
+    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster RvcOperationalState                                         | 0x0061 |
+| Cluster AirQuality                                                  | 0x005B |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Pause                                                             |   0x00 |
-| * Stop                                                              |   0x01 |
-| * Start                                                             |   0x02 |
-| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * PhaseList                                                         | 0x0000 |
-| * CurrentPhase                                                      | 0x0001 |
-| * CountdownTime                                                     | 0x0002 |
-| * OperationalStateList                                              | 0x0003 |
-| * OperationalState                                                  | 0x0004 |
-| * OperationalError                                                  | 0x0005 |
+| * AirQuality                                                        | 0x0000 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5469,25 +5605,65 @@ class OperationalStateResume : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * OperationalError                                                  | 0x0000 |
-| * OperationCompletion                                               | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster SmokeCoAlarm                                                | 0x005C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelfTestRequest                                                   |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ExpressedState                                                    | 0x0000 |
+| * SmokeState                                                        | 0x0001 |
+| * COState                                                           | 0x0002 |
+| * BatteryAlert                                                      | 0x0003 |
+| * DeviceMuted                                                       | 0x0004 |
+| * TestInProgress                                                    | 0x0005 |
+| * HardwareFaultAlert                                                | 0x0006 |
+| * EndOfServiceAlert                                                 | 0x0007 |
+| * InterconnectSmokeAlarm                                            | 0x0008 |
+| * InterconnectCOAlarm                                               | 0x0009 |
+| * ContaminationState                                                | 0x000A |
+| * SmokeSensitivityLevel                                             | 0x000B |
+| * ExpiryDate                                                        | 0x000C |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * SmokeAlarm                                                        | 0x0000 |
+| * COAlarm                                                           | 0x0001 |
+| * LowBattery                                                        | 0x0002 |
+| * HardwareFault                                                     | 0x0003 |
+| * EndOfService                                                      | 0x0004 |
+| * SelfTestComplete                                                  | 0x0005 |
+| * AlarmMuted                                                        | 0x0006 |
+| * MuteEnded                                                         | 0x0007 |
+| * InterconnectSmokeAlarm                                            | 0x0008 |
+| * InterconnectCOAlarm                                               | 0x0009 |
+| * AllClear                                                          | 0x000A |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Pause
+ * Command SelfTestRequest
  */
-class RvcOperationalStatePause : public ClusterCommand
+class SmokeCoAlarmSelfTestRequest : public ClusterCommand
 {
 public:
-    RvcOperationalStatePause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
+    SmokeCoAlarmSelfTestRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("self-test-request", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5496,8 +5672,8 @@ class RvcOperationalStatePause : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5506,24 +5682,48 @@ class RvcOperationalStatePause : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Pause::Type mRequest;
+    chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster DishwasherAlarm                                             | 0x005D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Reset                                                             |   0x00 |
+| * ModifyEnabledAlarms                                               |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Mask                                                              | 0x0000 |
+| * Latch                                                             | 0x0001 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command Stop
+ * Command Reset
  */
-class RvcOperationalStateStop : public ClusterCommand
+class DishwasherAlarmReset : public ClusterCommand
 {
 public:
-    RvcOperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
+    DishwasherAlarmReset(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reset", credsIssuerConfig)
     {
+        AddArgument("Alarms", 0, UINT32_MAX, &mRequest.alarms);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5532,44 +5732,8 @@ class RvcOperationalStateStop : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type mRequest;
-};
-
-/*
- * Command Start
- */
-class RvcOperationalStateStart : public ClusterCommand
-{
-public:
-    RvcOperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5578,24 +5742,26 @@ class RvcOperationalStateStart : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Start::Type mRequest;
+    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type mRequest;
 };
 
 /*
- * Command Resume
+ * Command ModifyEnabledAlarms
  */
-class RvcOperationalStateResume : public ClusterCommand
+class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand
 {
 public:
-    RvcOperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
+    DishwasherAlarmModifyEnabledAlarms(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("modify-enabled-alarms", credsIssuerConfig)
     {
+        AddArgument("Mask", 0, UINT32_MAX, &mRequest.mask);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5604,8 +5770,8 @@ class RvcOperationalStateResume : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5614,22 +5780,40 @@ class RvcOperationalStateResume : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type mRequest;
+    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster HepaFilterMonitoring                                        | 0x0071 |
+| Cluster MicrowaveOvenMode                                           | 0x005E |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ResetCondition                                                    |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Condition                                                         | 0x0000 |
-| * DegradationDirection                                              | 0x0001 |
-| * ChangeIndication                                                  | 0x0002 |
-| * InPlaceIndicator                                                  | 0x0003 |
-| * LastChangedTime                                                   | 0x0004 |
-| * ReplacementProductList                                            | 0x0005 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster MicrowaveOvenControl                                        | 0x005F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SetCookingParameters                                              |   0x00 |
+| * AddMoreTime                                                       |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CookTime                                                          | 0x0001 |
+| * PowerSetting                                                      | 0x0002 |
+| * MinPower                                                          | 0x0003 |
+| * MaxPower                                                          | 0x0004 |
+| * PowerStep                                                         | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5641,21 +5825,24 @@ class RvcOperationalStateResume : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ResetCondition
+ * Command SetCookingParameters
  */
-class HepaFilterMonitoringResetCondition : public ClusterCommand
+class MicrowaveOvenControlSetCookingParameters : public ClusterCommand
 {
 public:
-    HepaFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("reset-condition", credsIssuerConfig)
+    MicrowaveOvenControlSetCookingParameters(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-cooking-parameters", credsIssuerConfig)
     {
+        AddArgument("CookMode", 0, UINT8_MAX, &mRequest.cookMode);
+        AddArgument("CookTime", 0, UINT32_MAX, &mRequest.cookTime);
+        AddArgument("PowerSetting", 0, UINT8_MAX, &mRequest.powerSetting);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5664,8 +5851,8 @@ class HepaFilterMonitoringResetCondition : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5674,48 +5861,26 @@ class HepaFilterMonitoringResetCondition : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type mRequest;
+    chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ActivatedCarbonFilterMonitoring                             | 0x0072 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ResetCondition                                                    |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Condition                                                         | 0x0000 |
-| * DegradationDirection                                              | 0x0001 |
-| * ChangeIndication                                                  | 0x0002 |
-| * InPlaceIndicator                                                  | 0x0003 |
-| * LastChangedTime                                                   | 0x0004 |
-| * ReplacementProductList                                            | 0x0005 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ResetCondition
+ * Command AddMoreTime
  */
-class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
+class MicrowaveOvenControlAddMoreTime : public ClusterCommand
 {
 public:
-    ActivatedCarbonFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("reset-condition", credsIssuerConfig)
+    MicrowaveOvenControlAddMoreTime(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("add-more-time", credsIssuerConfig)
     {
+        AddArgument("TimeToAdd", 0, UINT32_MAX, &mRequest.timeToAdd);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5724,8 +5889,8 @@ class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5734,70 +5899,25 @@ class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type mRequest;
+    chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster DoorLock                                                    | 0x0101 |
+| Cluster OperationalState                                            | 0x0060 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * LockDoor                                                          |   0x00 |
-| * UnlockDoor                                                        |   0x01 |
-| * UnlockWithTimeout                                                 |   0x03 |
-| * SetWeekDaySchedule                                                |   0x0B |
-| * GetWeekDaySchedule                                                |   0x0C |
-| * ClearWeekDaySchedule                                              |   0x0D |
-| * SetYearDaySchedule                                                |   0x0E |
-| * GetYearDaySchedule                                                |   0x0F |
-| * ClearYearDaySchedule                                              |   0x10 |
-| * SetHolidaySchedule                                                |   0x11 |
-| * GetHolidaySchedule                                                |   0x12 |
-| * ClearHolidaySchedule                                              |   0x13 |
-| * SetUser                                                           |   0x1A |
-| * GetUser                                                           |   0x1B |
-| * ClearUser                                                         |   0x1D |
-| * SetCredential                                                     |   0x22 |
-| * GetCredentialStatus                                               |   0x24 |
-| * ClearCredential                                                   |   0x26 |
-| * UnboltDoor                                                        |   0x27 |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * LockState                                                         | 0x0000 |
-| * LockType                                                          | 0x0001 |
-| * ActuatorEnabled                                                   | 0x0002 |
-| * DoorState                                                         | 0x0003 |
-| * DoorOpenEvents                                                    | 0x0004 |
-| * DoorClosedEvents                                                  | 0x0005 |
-| * OpenPeriod                                                        | 0x0006 |
-| * NumberOfTotalUsersSupported                                       | 0x0011 |
-| * NumberOfPINUsersSupported                                         | 0x0012 |
-| * NumberOfRFIDUsersSupported                                        | 0x0013 |
-| * NumberOfWeekDaySchedulesSupportedPerUser                          | 0x0014 |
-| * NumberOfYearDaySchedulesSupportedPerUser                          | 0x0015 |
-| * NumberOfHolidaySchedulesSupported                                 | 0x0016 |
-| * MaxPINCodeLength                                                  | 0x0017 |
-| * MinPINCodeLength                                                  | 0x0018 |
-| * MaxRFIDCodeLength                                                 | 0x0019 |
-| * MinRFIDCodeLength                                                 | 0x001A |
-| * CredentialRulesSupport                                            | 0x001B |
-| * NumberOfCredentialsSupportedPerUser                               | 0x001C |
-| * Language                                                          | 0x0021 |
-| * LEDSettings                                                       | 0x0022 |
-| * AutoRelockTime                                                    | 0x0023 |
-| * SoundVolume                                                       | 0x0024 |
-| * OperatingMode                                                     | 0x0025 |
-| * SupportedOperatingModes                                           | 0x0026 |
-| * DefaultConfigurationRegister                                      | 0x0027 |
-| * EnableLocalProgramming                                            | 0x0028 |
-| * EnableOneTouchLocking                                             | 0x0029 |
-| * EnableInsideStatusLED                                             | 0x002A |
-| * EnablePrivacyModeButton                                           | 0x002B |
-| * LocalProgrammingFeatures                                          | 0x002C |
-| * WrongCodeEntryLimit                                               | 0x0030 |
-| * UserCodeTemporaryDisableTime                                      | 0x0031 |
-| * SendPINOverTheAir                                                 | 0x0032 |
-| * RequirePINforRemoteOperation                                      | 0x0033 |
-| * ExpiringUserTimeout                                               | 0x0035 |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -5806,29 +5926,25 @@ class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * DoorLockAlarm                                                     | 0x0000 |
-| * DoorStateChange                                                   | 0x0001 |
-| * LockOperation                                                     | 0x0002 |
-| * LockOperationError                                                | 0x0003 |
-| * LockUserChange                                                    | 0x0004 |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command LockDoor
+ * Command Pause
  */
-class DoorLockLockDoor : public ClusterCommand
+class OperationalStatePause : public ClusterCommand
 {
 public:
-    DoorLockLockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("lock-door", credsIssuerConfig)
+    OperationalStatePause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
     {
-        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::LockDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5837,8 +5953,8 @@ class DoorLockLockDoor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::LockDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5847,25 +5963,24 @@ class DoorLockLockDoor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::LockDoor::Type mRequest;
+    chip::app::Clusters::OperationalState::Commands::Pause::Type mRequest;
 };
 
 /*
- * Command UnlockDoor
+ * Command Stop
  */
-class DoorLockUnlockDoor : public ClusterCommand
+class OperationalStateStop : public ClusterCommand
 {
 public:
-    DoorLockUnlockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unlock-door", credsIssuerConfig)
+    OperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
     {
-        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5874,8 +5989,8 @@ class DoorLockUnlockDoor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5884,27 +5999,24 @@ class DoorLockUnlockDoor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type mRequest;
+    chip::app::Clusters::OperationalState::Commands::Stop::Type mRequest;
 };
 
 /*
- * Command UnlockWithTimeout
+ * Command Start
  */
-class DoorLockUnlockWithTimeout : public ClusterCommand
+class OperationalStateStart : public ClusterCommand
 {
 public:
-    DoorLockUnlockWithTimeout(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("unlock-with-timeout", credsIssuerConfig)
+    OperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
     {
-        AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
-        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5913,8 +6025,8 @@ class DoorLockUnlockWithTimeout : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5923,32 +6035,24 @@ class DoorLockUnlockWithTimeout : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
+    chip::app::Clusters::OperationalState::Commands::Start::Type mRequest;
 };
 
 /*
- * Command SetWeekDaySchedule
+ * Command Resume
  */
-class DoorLockSetWeekDaySchedule : public ClusterCommand
+class OperationalStateResume : public ClusterCommand
 {
 public:
-    DoorLockSetWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-week-day-schedule", credsIssuerConfig)
+    OperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("DaysMask", 0, UINT8_MAX, &mRequest.daysMask);
-        AddArgument("StartHour", 0, UINT8_MAX, &mRequest.startHour);
-        AddArgument("StartMinute", 0, UINT8_MAX, &mRequest.startMinute);
-        AddArgument("EndHour", 0, UINT8_MAX, &mRequest.endHour);
-        AddArgument("EndMinute", 0, UINT8_MAX, &mRequest.endMinute);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5957,8 +6061,8 @@ class DoorLockSetWeekDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -5967,27 +6071,52 @@ class DoorLockSetWeekDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type mRequest;
+    chip::app::Clusters::OperationalState::Commands::Resume::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster RvcOperationalState                                         | 0x0061 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command GetWeekDaySchedule
+ * Command Pause
  */
-class DoorLockGetWeekDaySchedule : public ClusterCommand
+class RvcOperationalStatePause : public ClusterCommand
 {
 public:
-    DoorLockGetWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-week-day-schedule", credsIssuerConfig)
+    RvcOperationalStatePause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -5996,8 +6125,8 @@ class DoorLockGetWeekDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6006,27 +6135,24 @@ class DoorLockGetWeekDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type mRequest;
+    chip::app::Clusters::RvcOperationalState::Commands::Pause::Type mRequest;
 };
 
 /*
- * Command ClearWeekDaySchedule
+ * Command Stop
  */
-class DoorLockClearWeekDaySchedule : public ClusterCommand
+class RvcOperationalStateStop : public ClusterCommand
 {
 public:
-    DoorLockClearWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-week-day-schedule", credsIssuerConfig)
+    RvcOperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6035,8 +6161,8 @@ class DoorLockClearWeekDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6045,29 +6171,24 @@ class DoorLockClearWeekDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type mRequest;
+    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type mRequest;
 };
 
 /*
- * Command SetYearDaySchedule
+ * Command Start
  */
-class DoorLockSetYearDaySchedule : public ClusterCommand
+class RvcOperationalStateStart : public ClusterCommand
 {
 public:
-    DoorLockSetYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-year-day-schedule", credsIssuerConfig)
+    RvcOperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
-        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6076,8 +6197,8 @@ class DoorLockSetYearDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6086,27 +6207,24 @@ class DoorLockSetYearDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type mRequest;
+    chip::app::Clusters::RvcOperationalState::Commands::Start::Type mRequest;
 };
 
 /*
- * Command GetYearDaySchedule
+ * Command Resume
  */
-class DoorLockGetYearDaySchedule : public ClusterCommand
+class RvcOperationalStateResume : public ClusterCommand
 {
 public:
-    DoorLockGetYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-year-day-schedule", credsIssuerConfig)
+    RvcOperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6115,8 +6233,8 @@ class DoorLockGetYearDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6125,27 +6243,48 @@ class DoorLockGetYearDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type mRequest;
+    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster HepaFilterMonitoring                                        | 0x0071 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCondition                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Condition                                                         | 0x0000 |
+| * DegradationDirection                                              | 0x0001 |
+| * ChangeIndication                                                  | 0x0002 |
+| * InPlaceIndicator                                                  | 0x0003 |
+| * LastChangedTime                                                   | 0x0004 |
+| * ReplacementProductList                                            | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command ClearYearDaySchedule
+ * Command ResetCondition
  */
-class DoorLockClearYearDaySchedule : public ClusterCommand
+class HepaFilterMonitoringResetCondition : public ClusterCommand
 {
 public:
-    DoorLockClearYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-year-day-schedule", credsIssuerConfig)
+    HepaFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("reset-condition", credsIssuerConfig)
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6154,8 +6293,8 @@ class DoorLockClearYearDaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6164,29 +6303,48 @@ class DoorLockClearYearDaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type mRequest;
+    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ActivatedCarbonFilterMonitoring                             | 0x0072 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCondition                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Condition                                                         | 0x0000 |
+| * DegradationDirection                                              | 0x0001 |
+| * ChangeIndication                                                  | 0x0002 |
+| * InPlaceIndicator                                                  | 0x0003 |
+| * LastChangedTime                                                   | 0x0004 |
+| * ReplacementProductList                                            | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command SetHolidaySchedule
+ * Command ResetCondition
  */
-class DoorLockSetHolidaySchedule : public ClusterCommand
+class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
 {
 public:
-    DoorLockSetHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-holiday-schedule", credsIssuerConfig)
+    ActivatedCarbonFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("reset-condition", credsIssuerConfig)
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
-        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
-        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
-        AddArgument("OperatingMode", 0, UINT8_MAX, &mRequest.operatingMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6195,8 +6353,8 @@ class DoorLockSetHolidaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6205,26 +6363,49 @@ class DoorLockSetHolidaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type mRequest;
+    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster BooleanSensorConfiguration                                  | 0x0080 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SuppressRequest                                                   |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SensitivityLevel                                                  | 0x0000 |
+| * AlarmsActive                                                      | 0x0001 |
+| * AlarmsSuppressed                                                  | 0x0002 |
+| * AlarmsEnabled                                                     | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * AlarmsStateChanged                                                | 0x0000 |
+| * SensorFault                                                       | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command GetHolidaySchedule
+ * Command SuppressRequest
  */
-class DoorLockGetHolidaySchedule : public ClusterCommand
+class BooleanSensorConfigurationSuppressRequest : public ClusterCommand
 {
 public:
-    DoorLockGetHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-holiday-schedule", credsIssuerConfig)
+    BooleanSensorConfigurationSuppressRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("suppress-request", credsIssuerConfig)
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        AddArgument("AlarmsToSuppress", 0, UINT8_MAX, &mRequest.alarmsToSuppress);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6233,8 +6414,8 @@ class DoorLockGetHolidaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6243,26 +6424,56 @@ class DoorLockGetHolidaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type mRequest;
+    chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ValveConfigurationAndControl                                | 0x0081 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Open                                                              |   0x00 |
+| * Close                                                             |   0x01 |
+| * SetLevel                                                          |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * OpenDuration                                                      | 0x0000 |
+| * AutoCloseTime                                                     | 0x0001 |
+| * RemainingDuration                                                 | 0x0002 |
+| * CurrentState                                                      | 0x0003 |
+| * TargetState                                                       | 0x0004 |
+| * StartUpState                                                      | 0x0005 |
+| * CurrentLevel                                                      | 0x0006 |
+| * TargetLevel                                                       | 0x0007 |
+| * OpenLevel                                                         | 0x0008 |
+| * ValveFault                                                        | 0x0009 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * ValveStateChanged                                                 | 0x0000 |
+| * ValveFault                                                        | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command ClearHolidaySchedule
+ * Command Open
  */
-class DoorLockClearHolidaySchedule : public ClusterCommand
+class ValveConfigurationAndControlOpen : public ClusterCommand
 {
 public:
-    DoorLockClearHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-holiday-schedule", credsIssuerConfig)
+    ValveConfigurationAndControlOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("open", credsIssuerConfig)
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        AddArgument("OpenDuration", 0, UINT32_MAX, &mRequest.openDuration);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6271,8 +6482,8 @@ class DoorLockClearHolidaySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6281,31 +6492,24 @@ class DoorLockClearHolidaySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type mRequest;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Type mRequest;
 };
 
 /*
- * Command SetUser
+ * Command Close
  */
-class DoorLockSetUser : public ClusterCommand
+class ValveConfigurationAndControlClose : public ClusterCommand
 {
 public:
-    DoorLockSetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user", credsIssuerConfig)
+    ValveConfigurationAndControlClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("close", credsIssuerConfig)
     {
-        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("UserName", &mRequest.userName);
-        AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6314,8 +6518,8 @@ class DoorLockSetUser : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6324,25 +6528,27 @@ class DoorLockSetUser : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Type mRequest;
 };
 
 /*
- * Command GetUser
+ * Command SetLevel
  */
-class DoorLockGetUser : public ClusterCommand
+class ValveConfigurationAndControlSetLevel : public ClusterCommand
 {
 public:
-    DoorLockGetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user", credsIssuerConfig)
+    ValveConfigurationAndControlSetLevel(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-level", credsIssuerConfig)
     {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
+        AddArgument("OpenDuration", 0, UINT32_MAX, &mRequest.openDuration);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6351,8 +6557,8 @@ class DoorLockGetUser : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6361,25 +6567,58 @@ class DoorLockGetUser : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster DemandResponseLoadControl                                   | 0x0096 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * RegisterLoadControlProgramRequest                                 |   0x00 |
+| * UnregisterLoadControlProgramRequest                               |   0x01 |
+| * AddLoadControlEventRequest                                        |   0x02 |
+| * RemoveLoadControlEventRequest                                     |   0x03 |
+| * ClearLoadControlEventsRequest                                     |   0x04 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * LoadControlPrograms                                               | 0x0000 |
+| * NumberOfLoadControlPrograms                                       | 0x0001 |
+| * Events                                                            | 0x0002 |
+| * ActiveEvents                                                      | 0x0003 |
+| * NumberOfEventsPerProgram                                          | 0x0004 |
+| * NumberOfTransitions                                               | 0x0005 |
+| * DefaultRandomStart                                                | 0x0006 |
+| * DefaultRandomDuration                                             | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * LoadControlEventStatusChange                                      | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command ClearUser
+ * Command RegisterLoadControlProgramRequest
  */
-class DoorLockClearUser : public ClusterCommand
+class DemandResponseLoadControlRegisterLoadControlProgramRequest : public ClusterCommand
 {
 public:
-    DoorLockClearUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-user", credsIssuerConfig)
+    DemandResponseLoadControlRegisterLoadControlProgramRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("register-load-control-program-request", credsIssuerConfig),
+        mComplex_LoadControlProgram(&mRequest.loadControlProgram)
     {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("LoadControlProgram", &mComplex_LoadControlProgram);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6388,8 +6627,9 @@ class DoorLockClearUser : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearUser::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6398,31 +6638,29 @@ class DoorLockClearUser : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type>
+        mComplex_LoadControlProgram;
 };
 
 /*
- * Command SetCredential
+ * Command UnregisterLoadControlProgramRequest
  */
-class DoorLockSetCredential : public ClusterCommand
+class DemandResponseLoadControlUnregisterLoadControlProgramRequest : public ClusterCommand
 {
 public:
-    DoorLockSetCredential(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
+    DemandResponseLoadControlUnregisterLoadControlProgramRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("unregister-load-control-program-request", credsIssuerConfig)
     {
-        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
-        AddArgument("Credential", &mComplex_Credential);
-        AddArgument("CredentialData", &mRequest.credentialData);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
+        AddArgument("LoadControlProgramID", &mRequest.loadControlProgramID);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetCredential::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6431,8 +6669,9 @@ class DoorLockSetCredential : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetCredential::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6441,27 +6680,27 @@ class DoorLockSetCredential : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type mRequest;
 };
 
 /*
- * Command GetCredentialStatus
+ * Command AddLoadControlEventRequest
  */
-class DoorLockGetCredentialStatus : public ClusterCommand
+class DemandResponseLoadControlAddLoadControlEventRequest : public ClusterCommand
 {
 public:
-    DoorLockGetCredentialStatus(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-credential-status", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
+    DemandResponseLoadControlAddLoadControlEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("add-load-control-event-request", credsIssuerConfig), mComplex_Event(&mRequest.event)
     {
-        AddArgument("Credential", &mComplex_Credential);
+        AddArgument("Event", &mComplex_Event);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6470,8 +6709,9 @@ class DoorLockGetCredentialStatus : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6480,27 +6720,29 @@ class DoorLockGetCredentialStatus : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type> mComplex_Event;
 };
 
 /*
- * Command ClearCredential
+ * Command RemoveLoadControlEventRequest
  */
-class DoorLockClearCredential : public ClusterCommand
+class DemandResponseLoadControlRemoveLoadControlEventRequest : public ClusterCommand
 {
 public:
-    DoorLockClearCredential(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
+    DemandResponseLoadControlRemoveLoadControlEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("remove-load-control-event-request", credsIssuerConfig)
     {
-        AddArgument("Credential", &mComplex_Credential);
+        AddArgument("EventID", &mRequest.eventID);
+        AddArgument("CancelControl", 0, UINT16_MAX, &mRequest.cancelControl);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearCredential::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6509,8 +6751,9 @@ class DoorLockClearCredential : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearCredential::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6519,27 +6762,26 @@ class DoorLockClearCredential : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type>>
-        mComplex_Credential;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Type mRequest;
 };
 
 /*
- * Command UnboltDoor
+ * Command ClearLoadControlEventsRequest
  */
-class DoorLockUnboltDoor : public ClusterCommand
+class DemandResponseLoadControlClearLoadControlEventsRequest : public ClusterCommand
 {
 public:
-    DoorLockUnboltDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unbolt-door", credsIssuerConfig)
+    DemandResponseLoadControlClearLoadControlEventsRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-load-control-events-request", credsIssuerConfig)
     {
-        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnboltDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6548,8 +6790,9 @@ class DoorLockUnboltDoor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnboltDoor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6558,44 +6801,47 @@ class DoorLockUnboltDoor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster WindowCovering                                              | 0x0102 |
+| Cluster EnergyEvse                                                  | 0x0099 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * UpOrOpen                                                          |   0x00 |
-| * DownOrClose                                                       |   0x01 |
-| * StopMotion                                                        |   0x02 |
-| * GoToLiftValue                                                     |   0x04 |
-| * GoToLiftPercentage                                                |   0x05 |
-| * GoToTiltValue                                                     |   0x07 |
-| * GoToTiltPercentage                                                |   0x08 |
+| * Disable                                                           |   0x01 |
+| * EnableCharging                                                    |   0x02 |
+| * EnableDischarging                                                 |   0x03 |
+| * StartDiagnostics                                                  |   0x04 |
+| * SetTargets                                                        |   0x05 |
+| * GetTargets                                                        |   0x06 |
+| * ClearTargets                                                      |   0x07 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Type                                                              | 0x0000 |
-| * PhysicalClosedLimitLift                                           | 0x0001 |
-| * PhysicalClosedLimitTilt                                           | 0x0002 |
-| * CurrentPositionLift                                               | 0x0003 |
-| * CurrentPositionTilt                                               | 0x0004 |
-| * NumberOfActuationsLift                                            | 0x0005 |
-| * NumberOfActuationsTilt                                            | 0x0006 |
-| * ConfigStatus                                                      | 0x0007 |
-| * CurrentPositionLiftPercentage                                     | 0x0008 |
-| * CurrentPositionTiltPercentage                                     | 0x0009 |
-| * OperationalStatus                                                 | 0x000A |
-| * TargetPositionLiftPercent100ths                                   | 0x000B |
-| * TargetPositionTiltPercent100ths                                   | 0x000C |
-| * EndProductType                                                    | 0x000D |
-| * CurrentPositionLiftPercent100ths                                  | 0x000E |
-| * CurrentPositionTiltPercent100ths                                  | 0x000F |
-| * InstalledOpenLimitLift                                            | 0x0010 |
-| * InstalledClosedLimitLift                                          | 0x0011 |
-| * InstalledOpenLimitTilt                                            | 0x0012 |
-| * InstalledClosedLimitTilt                                          | 0x0013 |
-| * Mode                                                              | 0x0017 |
-| * SafetyStatus                                                      | 0x001A |
+| * State                                                             | 0x0000 |
+| * SupplyState                                                       | 0x0001 |
+| * FaultState                                                        | 0x0002 |
+| * ChargingEnabledUntil                                              | 0x0003 |
+| * DischargingEnabledUntil                                           | 0x0004 |
+| * CircuitCapacity                                                   | 0x0005 |
+| * MinimumChargeCurrent                                              | 0x0006 |
+| * MaximumChargeCurrent                                              | 0x0007 |
+| * MaximumDischargeCurrent                                           | 0x0008 |
+| * UserMaximumChargeCurrent                                          | 0x0009 |
+| * RandomizationDelayWindow                                          | 0x000A |
+| * NumberOfWeeklyTargets                                             | 0x0021 |
+| * NumberOfDailyTargets                                              | 0x0022 |
+| * NextChargeStartTime                                               | 0x0023 |
+| * NextChargeTargetTime                                              | 0x0024 |
+| * NextChargeRequiredEnergy                                          | 0x0025 |
+| * NextChargeTargetSoC                                               | 0x0026 |
+| * ApproximateEVEfficiency                                           | 0x0027 |
+| * StateOfCharge                                                     | 0x0030 |
+| * BatteryCapacity                                                   | 0x0031 |
+| * VehicleID                                                         | 0x0032 |
+| * SessionID                                                         | 0x0040 |
+| * SessionDuration                                                   | 0x0041 |
+| * SessionEnergyCharged                                              | 0x0042 |
+| * SessionEnergyDischarged                                           | 0x0043 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -6604,23 +6850,29 @@ class DoorLockUnboltDoor : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * EVConnected                                                       | 0x0000 |
+| * EVNotDetected                                                     | 0x0001 |
+| * EnergyTransferStarted                                             | 0x0002 |
+| * EnergyTransferStopped                                             | 0x0003 |
+| * Fault                                                             | 0x0004 |
+| * Rfid                                                              | 0x0005 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command UpOrOpen
+ * Command Disable
  */
-class WindowCoveringUpOrOpen : public ClusterCommand
+class EnergyEvseDisable : public ClusterCommand
 {
 public:
-    WindowCoveringUpOrOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("up-or-open", credsIssuerConfig)
+    EnergyEvseDisable(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("disable", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::Disable::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6629,8 +6881,8 @@ class WindowCoveringUpOrOpen : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::Disable::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6639,24 +6891,27 @@ class WindowCoveringUpOrOpen : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::Disable::Type mRequest;
 };
 
 /*
- * Command DownOrClose
+ * Command EnableCharging
  */
-class WindowCoveringDownOrClose : public ClusterCommand
+class EnergyEvseEnableCharging : public ClusterCommand
 {
 public:
-    WindowCoveringDownOrClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("down-or-close", credsIssuerConfig)
+    EnergyEvseEnableCharging(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("enable-charging", credsIssuerConfig)
     {
+        AddArgument("ChargingEnabledUntil", 0, UINT32_MAX, &mRequest.chargingEnabledUntil);
+        AddArgument("MinimumChargeCurrent", INT64_MIN, INT64_MAX, &mRequest.minimumChargeCurrent);
+        AddArgument("MaximumChargeCurrent", INT64_MIN, INT64_MAX, &mRequest.maximumChargeCurrent);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::DownOrClose::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6665,8 +6920,8 @@ class WindowCoveringDownOrClose : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::DownOrClose::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6675,24 +6930,27 @@ class WindowCoveringDownOrClose : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Type mRequest;
 };
 
 /*
- * Command StopMotion
+ * Command EnableDischarging
  */
-class WindowCoveringStopMotion : public ClusterCommand
+class EnergyEvseEnableDischarging : public ClusterCommand
 {
 public:
-    WindowCoveringStopMotion(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-motion", credsIssuerConfig)
+    EnergyEvseEnableDischarging(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("enable-discharging", credsIssuerConfig)
     {
+        AddArgument("DischargingEnabledUntil", 0, UINT32_MAX, &mRequest.dischargingEnabledUntil);
+        AddArgument("MaximumDischargeCurrent", INT64_MIN, INT64_MAX, &mRequest.maximumDischargeCurrent);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::StopMotion::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6701,8 +6959,8 @@ class WindowCoveringStopMotion : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::StopMotion::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6711,26 +6969,25 @@ class WindowCoveringStopMotion : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::StopMotion::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Type mRequest;
 };
 
 /*
- * Command GoToLiftValue
+ * Command StartDiagnostics
  */
-class WindowCoveringGoToLiftValue : public ClusterCommand
+class EnergyEvseStartDiagnostics : public ClusterCommand
 {
 public:
-    WindowCoveringGoToLiftValue(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("go-to-lift-value", credsIssuerConfig)
+    EnergyEvseStartDiagnostics(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("start-diagnostics", credsIssuerConfig)
     {
-        AddArgument("LiftValue", 0, UINT16_MAX, &mRequest.liftValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6739,8 +6996,8 @@ class WindowCoveringGoToLiftValue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6749,26 +7006,27 @@ class WindowCoveringGoToLiftValue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::Type mRequest;
 };
 
 /*
- * Command GoToLiftPercentage
+ * Command SetTargets
  */
-class WindowCoveringGoToLiftPercentage : public ClusterCommand
+class EnergyEvseSetTargets : public ClusterCommand
 {
 public:
-    WindowCoveringGoToLiftPercentage(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("go-to-lift-percentage", credsIssuerConfig)
+    EnergyEvseSetTargets(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-targets", credsIssuerConfig), mComplex_ChargingTargets(&mRequest.chargingTargets)
     {
-        AddArgument("LiftPercent100thsValue", 0, UINT16_MAX, &mRequest.liftPercent100thsValue);
+        AddArgument("DayOfWeekforSequence", 0, UINT8_MAX, &mRequest.dayOfWeekforSequence);
+        AddArgument("ChargingTargets", &mComplex_ChargingTargets);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::SetTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6777,8 +7035,8 @@ class WindowCoveringGoToLiftPercentage : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::SetTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6787,26 +7045,27 @@ class WindowCoveringGoToLiftPercentage : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::SetTargets::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type>>
+        mComplex_ChargingTargets;
 };
 
 /*
- * Command GoToTiltValue
+ * Command GetTargets
  */
-class WindowCoveringGoToTiltValue : public ClusterCommand
+class EnergyEvseGetTargets : public ClusterCommand
 {
 public:
-    WindowCoveringGoToTiltValue(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("go-to-tilt-value", credsIssuerConfig)
+    EnergyEvseGetTargets(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-targets", credsIssuerConfig)
     {
-        AddArgument("TiltValue", 0, UINT16_MAX, &mRequest.tiltValue);
+        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::GetTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6815,8 +7074,8 @@ class WindowCoveringGoToTiltValue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::GetTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6825,26 +7084,24 @@ class WindowCoveringGoToTiltValue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::GetTargets::Type mRequest;
 };
 
 /*
- * Command GoToTiltPercentage
+ * Command ClearTargets
  */
-class WindowCoveringGoToTiltPercentage : public ClusterCommand
+class EnergyEvseClearTargets : public ClusterCommand
 {
 public:
-    WindowCoveringGoToTiltPercentage(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("go-to-tilt-percentage", credsIssuerConfig)
+    EnergyEvseClearTargets(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-targets", credsIssuerConfig)
     {
-        AddArgument("TiltPercent100thsValue", 0, UINT16_MAX, &mRequest.tiltPercent100thsValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::ClearTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6853,8 +7110,8 @@ class WindowCoveringGoToTiltPercentage : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::ClearTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6863,54 +7120,101 @@ class WindowCoveringGoToTiltPercentage : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Type mRequest;
+    chip::app::Clusters::EnergyEvse::Commands::ClearTargets::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster BarrierControl                                              | 0x0103 |
+| Cluster DoorLock                                                    | 0x0101 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * BarrierControlGoToPercent                                         |   0x00 |
-| * BarrierControlStop                                                |   0x01 |
+| * LockDoor                                                          |   0x00 |
+| * UnlockDoor                                                        |   0x01 |
+| * UnlockWithTimeout                                                 |   0x03 |
+| * SetWeekDaySchedule                                                |   0x0B |
+| * GetWeekDaySchedule                                                |   0x0C |
+| * ClearWeekDaySchedule                                              |   0x0D |
+| * SetYearDaySchedule                                                |   0x0E |
+| * GetYearDaySchedule                                                |   0x0F |
+| * ClearYearDaySchedule                                              |   0x10 |
+| * SetHolidaySchedule                                                |   0x11 |
+| * GetHolidaySchedule                                                |   0x12 |
+| * ClearHolidaySchedule                                              |   0x13 |
+| * SetUser                                                           |   0x1A |
+| * GetUser                                                           |   0x1B |
+| * ClearUser                                                         |   0x1D |
+| * SetCredential                                                     |   0x22 |
+| * GetCredentialStatus                                               |   0x24 |
+| * ClearCredential                                                   |   0x26 |
+| * UnboltDoor                                                        |   0x27 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * BarrierMovingState                                                | 0x0001 |
-| * BarrierSafetyStatus                                               | 0x0002 |
-| * BarrierCapabilities                                               | 0x0003 |
-| * BarrierOpenEvents                                                 | 0x0004 |
-| * BarrierCloseEvents                                                | 0x0005 |
-| * BarrierCommandOpenEvents                                          | 0x0006 |
-| * BarrierCommandCloseEvents                                         | 0x0007 |
-| * BarrierOpenPeriod                                                 | 0x0008 |
-| * BarrierClosePeriod                                                | 0x0009 |
-| * BarrierPosition                                                   | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command BarrierControlGoToPercent
- */
-class BarrierControlBarrierControlGoToPercent : public ClusterCommand
-{
+| * LockState                                                         | 0x0000 |
+| * LockType                                                          | 0x0001 |
+| * ActuatorEnabled                                                   | 0x0002 |
+| * DoorState                                                         | 0x0003 |
+| * DoorOpenEvents                                                    | 0x0004 |
+| * DoorClosedEvents                                                  | 0x0005 |
+| * OpenPeriod                                                        | 0x0006 |
+| * NumberOfTotalUsersSupported                                       | 0x0011 |
+| * NumberOfPINUsersSupported                                         | 0x0012 |
+| * NumberOfRFIDUsersSupported                                        | 0x0013 |
+| * NumberOfWeekDaySchedulesSupportedPerUser                          | 0x0014 |
+| * NumberOfYearDaySchedulesSupportedPerUser                          | 0x0015 |
+| * NumberOfHolidaySchedulesSupported                                 | 0x0016 |
+| * MaxPINCodeLength                                                  | 0x0017 |
+| * MinPINCodeLength                                                  | 0x0018 |
+| * MaxRFIDCodeLength                                                 | 0x0019 |
+| * MinRFIDCodeLength                                                 | 0x001A |
+| * CredentialRulesSupport                                            | 0x001B |
+| * NumberOfCredentialsSupportedPerUser                               | 0x001C |
+| * Language                                                          | 0x0021 |
+| * LEDSettings                                                       | 0x0022 |
+| * AutoRelockTime                                                    | 0x0023 |
+| * SoundVolume                                                       | 0x0024 |
+| * OperatingMode                                                     | 0x0025 |
+| * SupportedOperatingModes                                           | 0x0026 |
+| * DefaultConfigurationRegister                                      | 0x0027 |
+| * EnableLocalProgramming                                            | 0x0028 |
+| * EnableOneTouchLocking                                             | 0x0029 |
+| * EnableInsideStatusLED                                             | 0x002A |
+| * EnablePrivacyModeButton                                           | 0x002B |
+| * LocalProgrammingFeatures                                          | 0x002C |
+| * WrongCodeEntryLimit                                               | 0x0030 |
+| * UserCodeTemporaryDisableTime                                      | 0x0031 |
+| * SendPINOverTheAir                                                 | 0x0032 |
+| * RequirePINforRemoteOperation                                      | 0x0033 |
+| * ExpiringUserTimeout                                               | 0x0035 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * DoorLockAlarm                                                     | 0x0000 |
+| * DoorStateChange                                                   | 0x0001 |
+| * LockOperation                                                     | 0x0002 |
+| * LockOperationError                                                | 0x0003 |
+| * LockUserChange                                                    | 0x0004 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command LockDoor
+ */
+class DoorLockLockDoor : public ClusterCommand
+{
 public:
-    BarrierControlBarrierControlGoToPercent(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("barrier-control-go-to-percent", credsIssuerConfig)
+    DoorLockLockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("lock-door", credsIssuerConfig)
     {
-        AddArgument("PercentOpen", 0, UINT8_MAX, &mRequest.percentOpen);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::LockDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6919,8 +7223,8 @@ class BarrierControlBarrierControlGoToPercent : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::LockDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6929,25 +7233,25 @@ class BarrierControlBarrierControlGoToPercent : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::LockDoor::Type mRequest;
 };
 
 /*
- * Command BarrierControlStop
+ * Command UnlockDoor
  */
-class BarrierControlBarrierControlStop : public ClusterCommand
+class DoorLockUnlockDoor : public ClusterCommand
 {
 public:
-    BarrierControlBarrierControlStop(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("barrier-control-stop", credsIssuerConfig)
+    DoorLockUnlockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unlock-door", credsIssuerConfig)
     {
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -6956,8 +7260,8 @@ class BarrierControlBarrierControlStop : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -6966,152 +7270,27 @@ class BarrierControlBarrierControlStop : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster PumpConfigurationAndControl                                 | 0x0200 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MaxPressure                                                       | 0x0000 |
-| * MaxSpeed                                                          | 0x0001 |
-| * MaxFlow                                                           | 0x0002 |
-| * MinConstPressure                                                  | 0x0003 |
-| * MaxConstPressure                                                  | 0x0004 |
-| * MinCompPressure                                                   | 0x0005 |
-| * MaxCompPressure                                                   | 0x0006 |
-| * MinConstSpeed                                                     | 0x0007 |
-| * MaxConstSpeed                                                     | 0x0008 |
-| * MinConstFlow                                                      | 0x0009 |
-| * MaxConstFlow                                                      | 0x000A |
-| * MinConstTemp                                                      | 0x000B |
-| * MaxConstTemp                                                      | 0x000C |
-| * PumpStatus                                                        | 0x0010 |
-| * EffectiveOperationMode                                            | 0x0011 |
-| * EffectiveControlMode                                              | 0x0012 |
-| * Capacity                                                          | 0x0013 |
-| * Speed                                                             | 0x0014 |
-| * LifetimeRunningHours                                              | 0x0015 |
-| * Power                                                             | 0x0016 |
-| * LifetimeEnergyConsumed                                            | 0x0017 |
-| * OperationMode                                                     | 0x0020 |
-| * ControlMode                                                       | 0x0021 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * SupplyVoltageLow                                                  | 0x0000 |
-| * SupplyVoltageHigh                                                 | 0x0001 |
-| * PowerMissingPhase                                                 | 0x0002 |
-| * SystemPressureLow                                                 | 0x0003 |
-| * SystemPressureHigh                                                | 0x0004 |
-| * DryRunning                                                        | 0x0005 |
-| * MotorTemperatureHigh                                              | 0x0006 |
-| * PumpMotorFatalFailure                                             | 0x0007 |
-| * ElectronicTemperatureHigh                                         | 0x0008 |
-| * PumpBlocked                                                       | 0x0009 |
-| * SensorFailure                                                     | 0x000A |
-| * ElectronicNonFatalFailure                                         | 0x000B |
-| * ElectronicFatalFailure                                            | 0x000C |
-| * GeneralFault                                                      | 0x000D |
-| * Leakage                                                           | 0x000E |
-| * AirDetection                                                      | 0x000F |
-| * TurbineOperation                                                  | 0x0010 |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster Thermostat                                                  | 0x0201 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SetpointRaiseLower                                                |   0x00 |
-| * SetWeeklySchedule                                                 |   0x01 |
-| * GetWeeklySchedule                                                 |   0x02 |
-| * ClearWeeklySchedule                                               |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * LocalTemperature                                                  | 0x0000 |
-| * OutdoorTemperature                                                | 0x0001 |
-| * Occupancy                                                         | 0x0002 |
-| * AbsMinHeatSetpointLimit                                           | 0x0003 |
-| * AbsMaxHeatSetpointLimit                                           | 0x0004 |
-| * AbsMinCoolSetpointLimit                                           | 0x0005 |
-| * AbsMaxCoolSetpointLimit                                           | 0x0006 |
-| * PICoolingDemand                                                   | 0x0007 |
-| * PIHeatingDemand                                                   | 0x0008 |
-| * HVACSystemTypeConfiguration                                       | 0x0009 |
-| * LocalTemperatureCalibration                                       | 0x0010 |
-| * OccupiedCoolingSetpoint                                           | 0x0011 |
-| * OccupiedHeatingSetpoint                                           | 0x0012 |
-| * UnoccupiedCoolingSetpoint                                         | 0x0013 |
-| * UnoccupiedHeatingSetpoint                                         | 0x0014 |
-| * MinHeatSetpointLimit                                              | 0x0015 |
-| * MaxHeatSetpointLimit                                              | 0x0016 |
-| * MinCoolSetpointLimit                                              | 0x0017 |
-| * MaxCoolSetpointLimit                                              | 0x0018 |
-| * MinSetpointDeadBand                                               | 0x0019 |
-| * RemoteSensing                                                     | 0x001A |
-| * ControlSequenceOfOperation                                        | 0x001B |
-| * SystemMode                                                        | 0x001C |
-| * ThermostatRunningMode                                             | 0x001E |
-| * StartOfWeek                                                       | 0x0020 |
-| * NumberOfWeeklyTransitions                                         | 0x0021 |
-| * NumberOfDailyTransitions                                          | 0x0022 |
-| * TemperatureSetpointHold                                           | 0x0023 |
-| * TemperatureSetpointHoldDuration                                   | 0x0024 |
-| * ThermostatProgrammingOperationMode                                | 0x0025 |
-| * ThermostatRunningState                                            | 0x0029 |
-| * SetpointChangeSource                                              | 0x0030 |
-| * SetpointChangeAmount                                              | 0x0031 |
-| * SetpointChangeSourceTimestamp                                     | 0x0032 |
-| * OccupiedSetback                                                   | 0x0034 |
-| * OccupiedSetbackMin                                                | 0x0035 |
-| * OccupiedSetbackMax                                                | 0x0036 |
-| * UnoccupiedSetback                                                 | 0x0037 |
-| * UnoccupiedSetbackMin                                              | 0x0038 |
-| * UnoccupiedSetbackMax                                              | 0x0039 |
-| * EmergencyHeatDelta                                                | 0x003A |
-| * ACType                                                            | 0x0040 |
-| * ACCapacity                                                        | 0x0041 |
-| * ACRefrigerantType                                                 | 0x0042 |
-| * ACCompressorType                                                  | 0x0043 |
-| * ACErrorCode                                                       | 0x0044 |
-| * ACLouverPosition                                                  | 0x0045 |
-| * ACCoilTemperature                                                 | 0x0046 |
-| * ACCapacityformat                                                  | 0x0047 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SetpointRaiseLower
+ * Command UnlockWithTimeout
  */
-class ThermostatSetpointRaiseLower : public ClusterCommand
+class DoorLockUnlockWithTimeout : public ClusterCommand
 {
 public:
-    ThermostatSetpointRaiseLower(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("setpoint-raise-lower", credsIssuerConfig)
+    DoorLockUnlockWithTimeout(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("unlock-with-timeout", credsIssuerConfig)
     {
-        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
-        AddArgument("Amount", INT8_MIN, INT8_MAX, &mRequest.amount);
+        AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7120,8 +7299,8 @@ class ThermostatSetpointRaiseLower : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7130,29 +7309,32 @@ class ThermostatSetpointRaiseLower : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
 };
 
 /*
- * Command SetWeeklySchedule
+ * Command SetWeekDaySchedule
  */
-class ThermostatSetWeeklySchedule : public ClusterCommand
+class DoorLockSetWeekDaySchedule : public ClusterCommand
 {
 public:
-    ThermostatSetWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-weekly-schedule", credsIssuerConfig), mComplex_Transitions(&mRequest.transitions)
+    DoorLockSetWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-week-day-schedule", credsIssuerConfig)
     {
-        AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence);
-        AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence);
-        AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence);
-        AddArgument("Transitions", &mComplex_Transitions);
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("DaysMask", 0, UINT8_MAX, &mRequest.daysMask);
+        AddArgument("StartHour", 0, UINT8_MAX, &mRequest.startHour);
+        AddArgument("StartMinute", 0, UINT8_MAX, &mRequest.startMinute);
+        AddArgument("EndHour", 0, UINT8_MAX, &mRequest.endHour);
+        AddArgument("EndMinute", 0, UINT8_MAX, &mRequest.endMinute);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7161,8 +7343,8 @@ class ThermostatSetWeeklySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7171,30 +7353,27 @@ class ThermostatSetWeeklySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest;
-    TypedComplexArgument<
-        chip::app::DataModel::List<const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type>>
-        mComplex_Transitions;
+    chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type mRequest;
 };
 
 /*
- * Command GetWeeklySchedule
+ * Command GetWeekDaySchedule
  */
-class ThermostatGetWeeklySchedule : public ClusterCommand
+class DoorLockGetWeekDaySchedule : public ClusterCommand
 {
 public:
-    ThermostatGetWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-weekly-schedule", credsIssuerConfig)
+    DoorLockGetWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-week-day-schedule", credsIssuerConfig)
     {
-        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
-        AddArgument("ModeToReturn", 0, UINT8_MAX, &mRequest.modeToReturn);
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7203,8 +7382,8 @@ class ThermostatGetWeeklySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7213,25 +7392,27 @@ class ThermostatGetWeeklySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type mRequest;
 };
 
 /*
- * Command ClearWeeklySchedule
+ * Command ClearWeekDaySchedule
  */
-class ThermostatClearWeeklySchedule : public ClusterCommand
+class DoorLockClearWeekDaySchedule : public ClusterCommand
 {
 public:
-    ThermostatClearWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-weekly-schedule", credsIssuerConfig)
+    DoorLockClearWeekDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-week-day-schedule", credsIssuerConfig)
     {
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7240,8 +7421,8 @@ class ThermostatClearWeeklySchedule : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7250,56 +7431,29 @@ class ThermostatClearWeeklySchedule : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster FanControl                                                  | 0x0202 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * Step                                                              |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * FanMode                                                           | 0x0000 |
-| * FanModeSequence                                                   | 0x0001 |
-| * PercentSetting                                                    | 0x0002 |
-| * PercentCurrent                                                    | 0x0003 |
-| * SpeedMax                                                          | 0x0004 |
-| * SpeedSetting                                                      | 0x0005 |
-| * SpeedCurrent                                                      | 0x0006 |
-| * RockSupport                                                       | 0x0007 |
-| * RockSetting                                                       | 0x0008 |
-| * WindSupport                                                       | 0x0009 |
-| * WindSetting                                                       | 0x000A |
-| * AirflowDirection                                                  | 0x000B |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command Step
+ * Command SetYearDaySchedule
  */
-class FanControlStep : public ClusterCommand
+class DoorLockSetYearDaySchedule : public ClusterCommand
 {
 public:
-    FanControlStep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step", credsIssuerConfig)
+    DoorLockSetYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-year-day-schedule", credsIssuerConfig)
     {
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("Wrap", 0, 1, &mRequest.wrap);
-        AddArgument("LowestOff", 0, 1, &mRequest.lowestOff);
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
+        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FanControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FanControl::Commands::Step::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7308,8 +7462,8 @@ class FanControlStep : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FanControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FanControl::Commands::Step::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7318,135 +7472,27 @@ class FanControlStep : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::FanControl::Commands::Step::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ThermostatUserInterfaceConfiguration                        | 0x0204 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * TemperatureDisplayMode                                            | 0x0000 |
-| * KeypadLockout                                                     | 0x0001 |
-| * ScheduleProgrammingVisibility                                     | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster ColorControl                                                | 0x0300 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * MoveToHue                                                         |   0x00 |
-| * MoveHue                                                           |   0x01 |
-| * StepHue                                                           |   0x02 |
-| * MoveToSaturation                                                  |   0x03 |
-| * MoveSaturation                                                    |   0x04 |
-| * StepSaturation                                                    |   0x05 |
-| * MoveToHueAndSaturation                                            |   0x06 |
-| * MoveToColor                                                       |   0x07 |
-| * MoveColor                                                         |   0x08 |
-| * StepColor                                                         |   0x09 |
-| * MoveToColorTemperature                                            |   0x0A |
-| * EnhancedMoveToHue                                                 |   0x40 |
-| * EnhancedMoveHue                                                   |   0x41 |
-| * EnhancedStepHue                                                   |   0x42 |
-| * EnhancedMoveToHueAndSaturation                                    |   0x43 |
-| * ColorLoopSet                                                      |   0x44 |
-| * StopMoveStep                                                      |   0x47 |
-| * MoveColorTemperature                                              |   0x4B |
-| * StepColorTemperature                                              |   0x4C |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CurrentHue                                                        | 0x0000 |
-| * CurrentSaturation                                                 | 0x0001 |
-| * RemainingTime                                                     | 0x0002 |
-| * CurrentX                                                          | 0x0003 |
-| * CurrentY                                                          | 0x0004 |
-| * DriftCompensation                                                 | 0x0005 |
-| * CompensationText                                                  | 0x0006 |
-| * ColorTemperatureMireds                                            | 0x0007 |
-| * ColorMode                                                         | 0x0008 |
-| * Options                                                           | 0x000F |
-| * NumberOfPrimaries                                                 | 0x0010 |
-| * Primary1X                                                         | 0x0011 |
-| * Primary1Y                                                         | 0x0012 |
-| * Primary1Intensity                                                 | 0x0013 |
-| * Primary2X                                                         | 0x0015 |
-| * Primary2Y                                                         | 0x0016 |
-| * Primary2Intensity                                                 | 0x0017 |
-| * Primary3X                                                         | 0x0019 |
-| * Primary3Y                                                         | 0x001A |
-| * Primary3Intensity                                                 | 0x001B |
-| * Primary4X                                                         | 0x0020 |
-| * Primary4Y                                                         | 0x0021 |
-| * Primary4Intensity                                                 | 0x0022 |
-| * Primary5X                                                         | 0x0024 |
-| * Primary5Y                                                         | 0x0025 |
-| * Primary5Intensity                                                 | 0x0026 |
-| * Primary6X                                                         | 0x0028 |
-| * Primary6Y                                                         | 0x0029 |
-| * Primary6Intensity                                                 | 0x002A |
-| * WhitePointX                                                       | 0x0030 |
-| * WhitePointY                                                       | 0x0031 |
-| * ColorPointRX                                                      | 0x0032 |
-| * ColorPointRY                                                      | 0x0033 |
-| * ColorPointRIntensity                                              | 0x0034 |
-| * ColorPointGX                                                      | 0x0036 |
-| * ColorPointGY                                                      | 0x0037 |
-| * ColorPointGIntensity                                              | 0x0038 |
-| * ColorPointBX                                                      | 0x003A |
-| * ColorPointBY                                                      | 0x003B |
-| * ColorPointBIntensity                                              | 0x003C |
-| * EnhancedCurrentHue                                                | 0x4000 |
-| * EnhancedColorMode                                                 | 0x4001 |
-| * ColorLoopActive                                                   | 0x4002 |
-| * ColorLoopDirection                                                | 0x4003 |
-| * ColorLoopTime                                                     | 0x4004 |
-| * ColorLoopStartEnhancedHue                                         | 0x4005 |
-| * ColorLoopStoredEnhancedHue                                        | 0x4006 |
-| * ColorCapabilities                                                 | 0x400A |
-| * ColorTempPhysicalMinMireds                                        | 0x400B |
-| * ColorTempPhysicalMaxMireds                                        | 0x400C |
-| * CoupleColorTempToLevelMinMireds                                   | 0x400D |
-| * StartUpColorTemperatureMireds                                     | 0x4010 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command MoveToHue
+ * Command GetYearDaySchedule
  */
-class ColorControlMoveToHue : public ClusterCommand
+class DoorLockGetYearDaySchedule : public ClusterCommand
 {
 public:
-    ColorControlMoveToHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-to-hue", credsIssuerConfig)
+    DoorLockGetYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-year-day-schedule", credsIssuerConfig)
     {
-        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7455,8 +7501,8 @@ class ColorControlMoveToHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7465,28 +7511,27 @@ class ColorControlMoveToHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveToHue::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type mRequest;
 };
 
 /*
- * Command MoveHue
+ * Command ClearYearDaySchedule
  */
-class ColorControlMoveHue : public ClusterCommand
+class DoorLockClearYearDaySchedule : public ClusterCommand
 {
 public:
-    ColorControlMoveHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-hue", credsIssuerConfig)
+    DoorLockClearYearDaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-year-day-schedule", credsIssuerConfig)
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7495,8 +7540,8 @@ class ColorControlMoveHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7505,29 +7550,29 @@ class ColorControlMoveHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveHue::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type mRequest;
 };
 
 /*
- * Command StepHue
+ * Command SetHolidaySchedule
  */
-class ColorControlStepHue : public ClusterCommand
+class DoorLockSetHolidaySchedule : public ClusterCommand
 {
 public:
-    ColorControlStepHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-hue", credsIssuerConfig)
+    DoorLockSetHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-holiday-schedule", credsIssuerConfig)
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
+        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
+        AddArgument("OperatingMode", 0, UINT8_MAX, &mRequest.operatingMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7536,8 +7581,8 @@ class ColorControlStepHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7546,29 +7591,26 @@ class ColorControlStepHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StepHue::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type mRequest;
 };
 
 /*
- * Command MoveToSaturation
+ * Command GetHolidaySchedule
  */
-class ColorControlMoveToSaturation : public ClusterCommand
+class DoorLockGetHolidaySchedule : public ClusterCommand
 {
 public:
-    ColorControlMoveToSaturation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("move-to-saturation", credsIssuerConfig)
+    DoorLockGetHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-holiday-schedule", credsIssuerConfig)
     {
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7577,8 +7619,8 @@ class ColorControlMoveToSaturation : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7587,28 +7629,26 @@ class ColorControlMoveToSaturation : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type mRequest;
 };
 
 /*
- * Command MoveSaturation
+ * Command ClearHolidaySchedule
  */
-class ColorControlMoveSaturation : public ClusterCommand
+class DoorLockClearHolidaySchedule : public ClusterCommand
 {
 public:
-    ColorControlMoveSaturation(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-saturation", credsIssuerConfig)
+    DoorLockClearHolidaySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-holiday-schedule", credsIssuerConfig)
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7617,8 +7657,8 @@ class ColorControlMoveSaturation : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7627,29 +7667,31 @@ class ColorControlMoveSaturation : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveSaturation::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type mRequest;
 };
 
 /*
- * Command StepSaturation
+ * Command SetUser
  */
-class ColorControlStepSaturation : public ClusterCommand
+class DoorLockSetUser : public ClusterCommand
 {
 public:
-    ColorControlStepSaturation(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-saturation", credsIssuerConfig)
+    DoorLockSetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user", credsIssuerConfig)
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("UserName", &mRequest.userName);
+        AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID);
+        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
+        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
+        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7658,8 +7700,8 @@ class ColorControlStepSaturation : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7668,30 +7710,25 @@ class ColorControlStepSaturation : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StepSaturation::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
 };
 
 /*
- * Command MoveToHueAndSaturation
+ * Command GetUser
  */
-class ColorControlMoveToHueAndSaturation : public ClusterCommand
+class DoorLockGetUser : public ClusterCommand
 {
 public:
-    ColorControlMoveToHueAndSaturation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("move-to-hue-and-saturation", credsIssuerConfig)
+    DoorLockGetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user", credsIssuerConfig)
     {
-        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7700,8 +7737,8 @@ class ColorControlMoveToHueAndSaturation : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7710,29 +7747,25 @@ class ColorControlMoveToHueAndSaturation : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
 };
 
 /*
- * Command MoveToColor
+ * Command ClearUser
  */
-class ColorControlMoveToColor : public ClusterCommand
+class DoorLockClearUser : public ClusterCommand
 {
 public:
-    ColorControlMoveToColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-to-color", credsIssuerConfig)
+    DoorLockClearUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-user", credsIssuerConfig)
     {
-        AddArgument("ColorX", 0, UINT16_MAX, &mRequest.colorX);
-        AddArgument("ColorY", 0, UINT16_MAX, &mRequest.colorY);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7741,8 +7774,8 @@ class ColorControlMoveToColor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearUser::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7751,28 +7784,31 @@ class ColorControlMoveToColor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveToColor::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
 };
 
 /*
- * Command MoveColor
+ * Command SetCredential
  */
-class ColorControlMoveColor : public ClusterCommand
+class DoorLockSetCredential : public ClusterCommand
 {
 public:
-    ColorControlMoveColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-color", credsIssuerConfig)
+    DoorLockSetCredential(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
     {
-        AddArgument("RateX", INT16_MIN, INT16_MAX, &mRequest.rateX);
-        AddArgument("RateY", INT16_MIN, INT16_MAX, &mRequest.rateY);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
+        AddArgument("Credential", &mComplex_Credential);
+        AddArgument("CredentialData", &mRequest.credentialData);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
+        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetCredential::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7781,8 +7817,8 @@ class ColorControlMoveColor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::SetCredential::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7791,29 +7827,27 @@ class ColorControlMoveColor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveColor::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
- * Command StepColor
+ * Command GetCredentialStatus
  */
-class ColorControlStepColor : public ClusterCommand
+class DoorLockGetCredentialStatus : public ClusterCommand
 {
 public:
-    ColorControlStepColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-color", credsIssuerConfig)
+    DoorLockGetCredentialStatus(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-credential-status", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
     {
-        AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX);
-        AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("Credential", &mComplex_Credential);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7822,8 +7856,8 @@ class ColorControlStepColor : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColor::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7832,29 +7866,27 @@ class ColorControlStepColor : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StepColor::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
- * Command MoveToColorTemperature
+ * Command ClearCredential
  */
-class ColorControlMoveToColorTemperature : public ClusterCommand
+class DoorLockClearCredential : public ClusterCommand
 {
 public:
-    ColorControlMoveToColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("move-to-color-temperature", credsIssuerConfig)
+    DoorLockClearCredential(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
     {
-        AddArgument("ColorTemperatureMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMireds);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("Credential", &mComplex_Credential);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearCredential::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7863,8 +7895,8 @@ class ColorControlMoveToColorTemperature : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::ClearCredential::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7873,30 +7905,27 @@ class ColorControlMoveToColorTemperature : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type>>
+        mComplex_Credential;
 };
 
 /*
- * Command EnhancedMoveToHue
+ * Command UnboltDoor
  */
-class ColorControlEnhancedMoveToHue : public ClusterCommand
+class DoorLockUnboltDoor : public ClusterCommand
 {
 public:
-    ColorControlEnhancedMoveToHue(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("enhanced-move-to-hue", credsIssuerConfig)
+    DoorLockUnboltDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unbolt-door", credsIssuerConfig)
     {
-        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnboltDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7905,8 +7934,8 @@ class ColorControlEnhancedMoveToHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DoorLock::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DoorLock::Commands::UnboltDoor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7915,29 +7944,69 @@ class ColorControlEnhancedMoveToHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type mRequest;
 };
 
-/*
- * Command EnhancedMoveHue
- */
-class ColorControlEnhancedMoveHue : public ClusterCommand
-{
-public:
-    ColorControlEnhancedMoveHue(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("enhanced-move-hue", credsIssuerConfig)
+/*----------------------------------------------------------------------------*\
+| Cluster WindowCovering                                              | 0x0102 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * UpOrOpen                                                          |   0x00 |
+| * DownOrClose                                                       |   0x01 |
+| * StopMotion                                                        |   0x02 |
+| * GoToLiftValue                                                     |   0x04 |
+| * GoToLiftPercentage                                                |   0x05 |
+| * GoToTiltValue                                                     |   0x07 |
+| * GoToTiltPercentage                                                |   0x08 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Type                                                              | 0x0000 |
+| * PhysicalClosedLimitLift                                           | 0x0001 |
+| * PhysicalClosedLimitTilt                                           | 0x0002 |
+| * CurrentPositionLift                                               | 0x0003 |
+| * CurrentPositionTilt                                               | 0x0004 |
+| * NumberOfActuationsLift                                            | 0x0005 |
+| * NumberOfActuationsTilt                                            | 0x0006 |
+| * ConfigStatus                                                      | 0x0007 |
+| * CurrentPositionLiftPercentage                                     | 0x0008 |
+| * CurrentPositionTiltPercentage                                     | 0x0009 |
+| * OperationalStatus                                                 | 0x000A |
+| * TargetPositionLiftPercent100ths                                   | 0x000B |
+| * TargetPositionTiltPercent100ths                                   | 0x000C |
+| * EndProductType                                                    | 0x000D |
+| * CurrentPositionLiftPercent100ths                                  | 0x000E |
+| * CurrentPositionTiltPercent100ths                                  | 0x000F |
+| * InstalledOpenLimitLift                                            | 0x0010 |
+| * InstalledClosedLimitLift                                          | 0x0011 |
+| * InstalledOpenLimitTilt                                            | 0x0012 |
+| * InstalledClosedLimitTilt                                          | 0x0013 |
+| * Mode                                                              | 0x0017 |
+| * SafetyStatus                                                      | 0x001A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command UpOrOpen
+ */
+class WindowCoveringUpOrOpen : public ClusterCommand
+{
+public:
+    WindowCoveringUpOrOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("up-or-open", credsIssuerConfig)
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7946,8 +8015,8 @@ class ColorControlEnhancedMoveHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7956,30 +8025,24 @@ class ColorControlEnhancedMoveHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type mRequest;
 };
 
 /*
- * Command EnhancedStepHue
+ * Command DownOrClose
  */
-class ColorControlEnhancedStepHue : public ClusterCommand
+class WindowCoveringDownOrClose : public ClusterCommand
 {
 public:
-    ColorControlEnhancedStepHue(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("enhanced-step-hue", credsIssuerConfig)
+    WindowCoveringDownOrClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("down-or-close", credsIssuerConfig)
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::DownOrClose::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -7988,8 +8051,8 @@ class ColorControlEnhancedStepHue : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::DownOrClose::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -7998,30 +8061,24 @@ class ColorControlEnhancedStepHue : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type mRequest;
 };
 
 /*
- * Command EnhancedMoveToHueAndSaturation
+ * Command StopMotion
  */
-class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand
+class WindowCoveringStopMotion : public ClusterCommand
 {
 public:
-    ColorControlEnhancedMoveToHueAndSaturation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("enhanced-move-to-hue-and-saturation", credsIssuerConfig)
+    WindowCoveringStopMotion(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-motion", credsIssuerConfig)
     {
-        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::StopMotion::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8030,8 +8087,8 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::StopMotion::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8040,31 +8097,26 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::StopMotion::Type mRequest;
 };
 
 /*
- * Command ColorLoopSet
+ * Command GoToLiftValue
  */
-class ColorControlColorLoopSet : public ClusterCommand
+class WindowCoveringGoToLiftValue : public ClusterCommand
 {
 public:
-    ColorControlColorLoopSet(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("color-loop-set", credsIssuerConfig)
+    WindowCoveringGoToLiftValue(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("go-to-lift-value", credsIssuerConfig)
     {
-        AddArgument("UpdateFlags", 0, UINT8_MAX, &mRequest.updateFlags);
-        AddArgument("Action", 0, UINT8_MAX, &mRequest.action);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("Time", 0, UINT16_MAX, &mRequest.time);
-        AddArgument("StartHue", 0, UINT16_MAX, &mRequest.startHue);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("LiftValue", 0, UINT16_MAX, &mRequest.liftValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8073,8 +8125,8 @@ class ColorControlColorLoopSet : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8083,26 +8135,26 @@ class ColorControlColorLoopSet : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Type mRequest;
 };
 
 /*
- * Command StopMoveStep
+ * Command GoToLiftPercentage
  */
-class ColorControlStopMoveStep : public ClusterCommand
+class WindowCoveringGoToLiftPercentage : public ClusterCommand
 {
 public:
-    ColorControlStopMoveStep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-move-step", credsIssuerConfig)
+    WindowCoveringGoToLiftPercentage(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("go-to-lift-percentage", credsIssuerConfig)
     {
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("LiftPercent100thsValue", 0, UINT16_MAX, &mRequest.liftPercent100thsValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StopMoveStep::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8111,8 +8163,8 @@ class ColorControlStopMoveStep : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StopMoveStep::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8121,31 +8173,26 @@ class ColorControlStopMoveStep : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StopMoveStep::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Type mRequest;
 };
 
 /*
- * Command MoveColorTemperature
+ * Command GoToTiltValue
  */
-class ColorControlMoveColorTemperature : public ClusterCommand
+class WindowCoveringGoToTiltValue : public ClusterCommand
 {
 public:
-    ColorControlMoveColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("move-color-temperature", credsIssuerConfig)
+    WindowCoveringGoToTiltValue(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("go-to-tilt-value", credsIssuerConfig)
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
-        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
-        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("TiltValue", 0, UINT16_MAX, &mRequest.tiltValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8154,8 +8201,8 @@ class ColorControlMoveColorTemperature : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8164,32 +8211,26 @@ class ColorControlMoveColorTemperature : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Type mRequest;
 };
 
 /*
- * Command StepColorTemperature
+ * Command GoToTiltPercentage
  */
-class ColorControlStepColorTemperature : public ClusterCommand
+class WindowCoveringGoToTiltPercentage : public ClusterCommand
 {
 public:
-    ColorControlStepColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("step-color-temperature", credsIssuerConfig)
+    WindowCoveringGoToTiltPercentage(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("go-to-tilt-percentage", credsIssuerConfig)
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
-        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        AddArgument("TiltPercent100thsValue", 0, UINT16_MAX, &mRequest.tiltPercent100thsValue);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8198,8 +8239,8 @@ class ColorControlStepColorTemperature : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WindowCovering::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8208,50 +8249,27 @@ class ColorControlStepColorTemperature : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster BallastConfiguration                                        | 0x0301 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * PhysicalMinLevel                                                  | 0x0000 |
-| * PhysicalMaxLevel                                                  | 0x0001 |
-| * BallastStatus                                                     | 0x0002 |
-| * MinLevel                                                          | 0x0010 |
-| * MaxLevel                                                          | 0x0011 |
-| * IntrinsicBallastFactor                                            | 0x0014 |
-| * BallastFactorAdjustment                                           | 0x0015 |
-| * LampQuantity                                                      | 0x0020 |
-| * LampType                                                          | 0x0030 |
-| * LampManufacturer                                                  | 0x0031 |
-| * LampRatedHours                                                    | 0x0032 |
-| * LampBurnHours                                                     | 0x0033 |
-| * LampAlarmMode                                                     | 0x0034 |
-| * LampBurnHoursTripPoint                                            | 0x0035 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster IlluminanceMeasurement                                      | 0x0400 |
+| Cluster BarrierControl                                              | 0x0103 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * BarrierControlGoToPercent                                         |   0x00 |
+| * BarrierControlStop                                                |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * LightSensorType                                                   | 0x0004 |
+| * BarrierMovingState                                                | 0x0001 |
+| * BarrierSafetyStatus                                               | 0x0002 |
+| * BarrierCapabilities                                               | 0x0003 |
+| * BarrierOpenEvents                                                 | 0x0004 |
+| * BarrierCloseEvents                                                | 0x0005 |
+| * BarrierCommandOpenEvents                                          | 0x0006 |
+| * BarrierCommandCloseEvents                                         | 0x0007 |
+| * BarrierOpenPeriod                                                 | 0x0008 |
+| * BarrierClosePeriod                                                | 0x0009 |
+| * BarrierPosition                                                   | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8262,81 +8280,110 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*----------------------------------------------------------------------------*\
-| Cluster TemperatureMeasurement                                      | 0x0402 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+/*
+ * Command BarrierControlGoToPercent
+ */
+class BarrierControlBarrierControlGoToPercent : public ClusterCommand
+{
+public:
+    BarrierControlBarrierControlGoToPercent(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("barrier-control-go-to-percent", credsIssuerConfig)
+    {
+        AddArgument("PercentOpen", 0, UINT8_MAX, &mRequest.percentOpen);
+        ClusterCommand::AddArguments();
+    }
 
-/*----------------------------------------------------------------------------*\
-| Cluster PressureMeasurement                                         | 0x0403 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * ScaledValue                                                       | 0x0010 |
-| * MinScaledValue                                                    | 0x0011 |
-| * MaxScaledValue                                                    | 0x0012 |
-| * ScaledTolerance                                                   | 0x0013 |
-| * Scale                                                             | 0x0014 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id;
 
-/*----------------------------------------------------------------------------*\
-| Cluster FlowMeasurement                                             | 0x0404 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Type mRequest;
+};
+
+/*
+ * Command BarrierControlStop
+ */
+class BarrierControlBarrierControlStop : public ClusterCommand
+{
+public:
+    BarrierControlBarrierControlStop(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("barrier-control-stop", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BarrierControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::BarrierControl::Commands::BarrierControlStop::Type mRequest;
+};
 
 /*----------------------------------------------------------------------------*\
-| Cluster RelativeHumidityMeasurement                                 | 0x0405 |
+| Cluster PumpConfigurationAndControl                                 | 0x0200 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
+| * MaxPressure                                                       | 0x0000 |
+| * MaxSpeed                                                          | 0x0001 |
+| * MaxFlow                                                           | 0x0002 |
+| * MinConstPressure                                                  | 0x0003 |
+| * MaxConstPressure                                                  | 0x0004 |
+| * MinCompPressure                                                   | 0x0005 |
+| * MaxCompPressure                                                   | 0x0006 |
+| * MinConstSpeed                                                     | 0x0007 |
+| * MaxConstSpeed                                                     | 0x0008 |
+| * MinConstFlow                                                      | 0x0009 |
+| * MaxConstFlow                                                      | 0x000A |
+| * MinConstTemp                                                      | 0x000B |
+| * MaxConstTemp                                                      | 0x000C |
+| * PumpStatus                                                        | 0x0010 |
+| * EffectiveOperationMode                                            | 0x0011 |
+| * EffectiveControlMode                                              | 0x0012 |
+| * Capacity                                                          | 0x0013 |
+| * Speed                                                             | 0x0014 |
+| * LifetimeRunningHours                                              | 0x0015 |
+| * Power                                                             | 0x0016 |
+| * LifetimeEnergyConsumed                                            | 0x0017 |
+| * OperationMode                                                     | 0x0020 |
+| * ControlMode                                                       | 0x0021 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8345,26 +8392,84 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * SupplyVoltageLow                                                  | 0x0000 |
+| * SupplyVoltageHigh                                                 | 0x0001 |
+| * PowerMissingPhase                                                 | 0x0002 |
+| * SystemPressureLow                                                 | 0x0003 |
+| * SystemPressureHigh                                                | 0x0004 |
+| * DryRunning                                                        | 0x0005 |
+| * MotorTemperatureHigh                                              | 0x0006 |
+| * PumpMotorFatalFailure                                             | 0x0007 |
+| * ElectronicTemperatureHigh                                         | 0x0008 |
+| * PumpBlocked                                                       | 0x0009 |
+| * SensorFailure                                                     | 0x000A |
+| * ElectronicNonFatalFailure                                         | 0x000B |
+| * ElectronicFatalFailure                                            | 0x000C |
+| * GeneralFault                                                      | 0x000D |
+| * Leakage                                                           | 0x000E |
+| * AirDetection                                                      | 0x000F |
+| * TurbineOperation                                                  | 0x0010 |
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster OccupancySensing                                            | 0x0406 |
+| Cluster Thermostat                                                  | 0x0201 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * SetpointRaiseLower                                                |   0x00 |
+| * SetWeeklySchedule                                                 |   0x01 |
+| * GetWeeklySchedule                                                 |   0x02 |
+| * ClearWeeklySchedule                                               |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Occupancy                                                         | 0x0000 |
-| * OccupancySensorType                                               | 0x0001 |
-| * OccupancySensorTypeBitmap                                         | 0x0002 |
-| * PIROccupiedToUnoccupiedDelay                                      | 0x0010 |
-| * PIRUnoccupiedToOccupiedDelay                                      | 0x0011 |
-| * PIRUnoccupiedToOccupiedThreshold                                  | 0x0012 |
-| * UltrasonicOccupiedToUnoccupiedDelay                               | 0x0020 |
-| * UltrasonicUnoccupiedToOccupiedDelay                               | 0x0021 |
-| * UltrasonicUnoccupiedToOccupiedThreshold                           | 0x0022 |
-| * PhysicalContactOccupiedToUnoccupiedDelay                          | 0x0030 |
-| * PhysicalContactUnoccupiedToOccupiedDelay                          | 0x0031 |
-| * PhysicalContactUnoccupiedToOccupiedThreshold                      | 0x0032 |
+| * LocalTemperature                                                  | 0x0000 |
+| * OutdoorTemperature                                                | 0x0001 |
+| * Occupancy                                                         | 0x0002 |
+| * AbsMinHeatSetpointLimit                                           | 0x0003 |
+| * AbsMaxHeatSetpointLimit                                           | 0x0004 |
+| * AbsMinCoolSetpointLimit                                           | 0x0005 |
+| * AbsMaxCoolSetpointLimit                                           | 0x0006 |
+| * PICoolingDemand                                                   | 0x0007 |
+| * PIHeatingDemand                                                   | 0x0008 |
+| * HVACSystemTypeConfiguration                                       | 0x0009 |
+| * LocalTemperatureCalibration                                       | 0x0010 |
+| * OccupiedCoolingSetpoint                                           | 0x0011 |
+| * OccupiedHeatingSetpoint                                           | 0x0012 |
+| * UnoccupiedCoolingSetpoint                                         | 0x0013 |
+| * UnoccupiedHeatingSetpoint                                         | 0x0014 |
+| * MinHeatSetpointLimit                                              | 0x0015 |
+| * MaxHeatSetpointLimit                                              | 0x0016 |
+| * MinCoolSetpointLimit                                              | 0x0017 |
+| * MaxCoolSetpointLimit                                              | 0x0018 |
+| * MinSetpointDeadBand                                               | 0x0019 |
+| * RemoteSensing                                                     | 0x001A |
+| * ControlSequenceOfOperation                                        | 0x001B |
+| * SystemMode                                                        | 0x001C |
+| * ThermostatRunningMode                                             | 0x001E |
+| * StartOfWeek                                                       | 0x0020 |
+| * NumberOfWeeklyTransitions                                         | 0x0021 |
+| * NumberOfDailyTransitions                                          | 0x0022 |
+| * TemperatureSetpointHold                                           | 0x0023 |
+| * TemperatureSetpointHoldDuration                                   | 0x0024 |
+| * ThermostatProgrammingOperationMode                                | 0x0025 |
+| * ThermostatRunningState                                            | 0x0029 |
+| * SetpointChangeSource                                              | 0x0030 |
+| * SetpointChangeAmount                                              | 0x0031 |
+| * SetpointChangeSourceTimestamp                                     | 0x0032 |
+| * OccupiedSetback                                                   | 0x0034 |
+| * OccupiedSetbackMin                                                | 0x0035 |
+| * OccupiedSetbackMax                                                | 0x0036 |
+| * UnoccupiedSetback                                                 | 0x0037 |
+| * UnoccupiedSetbackMin                                              | 0x0038 |
+| * UnoccupiedSetbackMax                                              | 0x0039 |
+| * EmergencyHeatDelta                                                | 0x003A |
+| * ACType                                                            | 0x0040 |
+| * ACCapacity                                                        | 0x0041 |
+| * ACRefrigerantType                                                 | 0x0042 |
+| * ACCompressorType                                                  | 0x0043 |
+| * ACErrorCode                                                       | 0x0044 |
+| * ACLouverPosition                                                  | 0x0045 |
+| * ACCoilTemperature                                                 | 0x0046 |
+| * ACCapacityformat                                                  | 0x0047 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8375,50 +8480,184 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*----------------------------------------------------------------------------*\
-| Cluster CarbonMonoxideConcentrationMeasurement                      | 0x040C |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+/*
+ * Command SetpointRaiseLower
+ */
+class ThermostatSetpointRaiseLower : public ClusterCommand
+{
+public:
+    ThermostatSetpointRaiseLower(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("setpoint-raise-lower", credsIssuerConfig)
+    {
+        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
+        AddArgument("Amount", INT8_MIN, INT8_MAX, &mRequest.amount);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type mRequest;
+};
+
+/*
+ * Command SetWeeklySchedule
+ */
+class ThermostatSetWeeklySchedule : public ClusterCommand
+{
+public:
+    ThermostatSetWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-weekly-schedule", credsIssuerConfig), mComplex_Transitions(&mRequest.transitions)
+    {
+        AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence);
+        AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence);
+        AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence);
+        AddArgument("Transitions", &mComplex_Transitions);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest;
+    TypedComplexArgument<
+        chip::app::DataModel::List<const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type>>
+        mComplex_Transitions;
+};
+
+/*
+ * Command GetWeeklySchedule
+ */
+class ThermostatGetWeeklySchedule : public ClusterCommand
+{
+public:
+    ThermostatGetWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-weekly-schedule", credsIssuerConfig)
+    {
+        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
+        AddArgument("ModeToReturn", 0, UINT8_MAX, &mRequest.modeToReturn);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Type mRequest;
+};
+
+/*
+ * Command ClearWeeklySchedule
+ */
+class ThermostatClearWeeklySchedule : public ClusterCommand
+{
+public:
+    ThermostatClearWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-weekly-schedule", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Type mRequest;
+};
 
 /*----------------------------------------------------------------------------*\
-| Cluster CarbonDioxideConcentrationMeasurement                       | 0x040D |
+| Cluster FanControl                                                  | 0x0202 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * Step                                                              |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
+| * FanMode                                                           | 0x0000 |
+| * FanModeSequence                                                   | 0x0001 |
+| * PercentSetting                                                    | 0x0002 |
+| * PercentCurrent                                                    | 0x0003 |
+| * SpeedMax                                                          | 0x0004 |
+| * SpeedSetting                                                      | 0x0005 |
+| * SpeedCurrent                                                      | 0x0006 |
+| * RockSupport                                                       | 0x0007 |
+| * RockSetting                                                       | 0x0008 |
+| * WindSupport                                                       | 0x0009 |
+| * WindSetting                                                       | 0x000A |
+| * AirflowDirection                                                  | 0x000B |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8429,23 +8668,54 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
+/*
+ * Command Step
+ */
+class FanControlStep : public ClusterCommand
+{
+public:
+    FanControlStep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step", credsIssuerConfig)
+    {
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("Wrap", 0, 1, &mRequest.wrap);
+        AddArgument("LowestOff", 0, 1, &mRequest.lowestOff);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FanControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FanControl::Commands::Step::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FanControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FanControl::Commands::Step::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::FanControl::Commands::Step::Type mRequest;
+};
+
 /*----------------------------------------------------------------------------*\
-| Cluster NitrogenDioxideConcentrationMeasurement                     | 0x0413 |
+| Cluster ThermostatUserInterfaceConfiguration                        | 0x0204 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
+| * TemperatureDisplayMode                                            | 0x0000 |
+| * KeypadLockout                                                     | 0x0001 |
+| * ScheduleProgrammingVisibility                                     | 0x0002 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8457,22 +8727,82 @@ class ColorControlStepColorTemperature : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster OzoneConcentrationMeasurement                               | 0x0415 |
+| Cluster ColorControl                                                | 0x0300 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * MoveToHue                                                         |   0x00 |
+| * MoveHue                                                           |   0x01 |
+| * StepHue                                                           |   0x02 |
+| * MoveToSaturation                                                  |   0x03 |
+| * MoveSaturation                                                    |   0x04 |
+| * StepSaturation                                                    |   0x05 |
+| * MoveToHueAndSaturation                                            |   0x06 |
+| * MoveToColor                                                       |   0x07 |
+| * MoveColor                                                         |   0x08 |
+| * StepColor                                                         |   0x09 |
+| * MoveToColorTemperature                                            |   0x0A |
+| * EnhancedMoveToHue                                                 |   0x40 |
+| * EnhancedMoveHue                                                   |   0x41 |
+| * EnhancedStepHue                                                   |   0x42 |
+| * EnhancedMoveToHueAndSaturation                                    |   0x43 |
+| * ColorLoopSet                                                      |   0x44 |
+| * StopMoveStep                                                      |   0x47 |
+| * MoveColorTemperature                                              |   0x4B |
+| * StepColorTemperature                                              |   0x4C |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
+| * CurrentHue                                                        | 0x0000 |
+| * CurrentSaturation                                                 | 0x0001 |
+| * RemainingTime                                                     | 0x0002 |
+| * CurrentX                                                          | 0x0003 |
+| * CurrentY                                                          | 0x0004 |
+| * DriftCompensation                                                 | 0x0005 |
+| * CompensationText                                                  | 0x0006 |
+| * ColorTemperatureMireds                                            | 0x0007 |
+| * ColorMode                                                         | 0x0008 |
+| * Options                                                           | 0x000F |
+| * NumberOfPrimaries                                                 | 0x0010 |
+| * Primary1X                                                         | 0x0011 |
+| * Primary1Y                                                         | 0x0012 |
+| * Primary1Intensity                                                 | 0x0013 |
+| * Primary2X                                                         | 0x0015 |
+| * Primary2Y                                                         | 0x0016 |
+| * Primary2Intensity                                                 | 0x0017 |
+| * Primary3X                                                         | 0x0019 |
+| * Primary3Y                                                         | 0x001A |
+| * Primary3Intensity                                                 | 0x001B |
+| * Primary4X                                                         | 0x0020 |
+| * Primary4Y                                                         | 0x0021 |
+| * Primary4Intensity                                                 | 0x0022 |
+| * Primary5X                                                         | 0x0024 |
+| * Primary5Y                                                         | 0x0025 |
+| * Primary5Intensity                                                 | 0x0026 |
+| * Primary6X                                                         | 0x0028 |
+| * Primary6Y                                                         | 0x0029 |
+| * Primary6Intensity                                                 | 0x002A |
+| * WhitePointX                                                       | 0x0030 |
+| * WhitePointY                                                       | 0x0031 |
+| * ColorPointRX                                                      | 0x0032 |
+| * ColorPointRY                                                      | 0x0033 |
+| * ColorPointRIntensity                                              | 0x0034 |
+| * ColorPointGX                                                      | 0x0036 |
+| * ColorPointGY                                                      | 0x0037 |
+| * ColorPointGIntensity                                              | 0x0038 |
+| * ColorPointBX                                                      | 0x003A |
+| * ColorPointBY                                                      | 0x003B |
+| * ColorPointBIntensity                                              | 0x003C |
+| * EnhancedCurrentHue                                                | 0x4000 |
+| * EnhancedColorMode                                                 | 0x4001 |
+| * ColorLoopActive                                                   | 0x4002 |
+| * ColorLoopDirection                                                | 0x4003 |
+| * ColorLoopTime                                                     | 0x4004 |
+| * ColorLoopStartEnhancedHue                                         | 0x4005 |
+| * ColorLoopStoredEnhancedHue                                        | 0x4006 |
+| * ColorCapabilities                                                 | 0x400A |
+| * ColorTempPhysicalMinMireds                                        | 0x400B |
+| * ColorTempPhysicalMaxMireds                                        | 0x400C |
+| * CoupleColorTempToLevelMinMireds                                   | 0x400D |
+| * StartUpColorTemperatureMireds                                     | 0x4010 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -8483,223 +8813,66 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*----------------------------------------------------------------------------*\
-| Cluster Pm25ConcentrationMeasurement                                | 0x042A |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+/*
+ * Command MoveToHue
+ */
+class ColorControlMoveToHue : public ClusterCommand
+{
+public:
+    ColorControlMoveToHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-to-hue", credsIssuerConfig)
+    {
+        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
+    }
 
-/*----------------------------------------------------------------------------*\
-| Cluster FormaldehydeConcentrationMeasurement                        | 0x042B |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHue::Id;
 
-/*----------------------------------------------------------------------------*\
-| Cluster Pm1ConcentrationMeasurement                                 | 0x042C |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
 
-/*----------------------------------------------------------------------------*\
-| Cluster Pm10ConcentrationMeasurement                                | 0x042D |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHue::Id;
 
-/*----------------------------------------------------------------------------*\
-| Cluster TotalVolatileOrganicCompoundsConcentrationMeasurement       | 0x042E |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
 
-/*----------------------------------------------------------------------------*\
-| Cluster RadonConcentrationMeasurement                               | 0x042F |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * PeakMeasuredValue                                                 | 0x0003 |
-| * PeakMeasuredValueWindow                                           | 0x0004 |
-| * AverageMeasuredValue                                              | 0x0005 |
-| * AverageMeasuredValueWindow                                        | 0x0006 |
-| * Uncertainty                                                       | 0x0007 |
-| * MeasurementUnit                                                   | 0x0008 |
-| * MeasurementMedium                                                 | 0x0009 |
-| * LevelValue                                                        | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster WakeOnLan                                                   | 0x0503 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MACAddress                                                        | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
 
-/*----------------------------------------------------------------------------*\
-| Cluster Channel                                                     | 0x0504 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeChannel                                                     |   0x00 |
-| * ChangeChannelByNumber                                             |   0x02 |
-| * SkipChannel                                                       |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * ChannelList                                                       | 0x0000 |
-| * Lineup                                                            | 0x0001 |
-| * CurrentChannel                                                    | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToHue::Type mRequest;
+};
 
 /*
- * Command ChangeChannel
+ * Command MoveHue
  */
-class ChannelChangeChannel : public ClusterCommand
+class ColorControlMoveHue : public ClusterCommand
 {
 public:
-    ChannelChangeChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-channel", credsIssuerConfig)
+    ColorControlMoveHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-hue", credsIssuerConfig)
     {
-        AddArgument("Match", &mRequest.match);
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8708,8 +8881,8 @@ class ChannelChangeChannel : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8718,27 +8891,29 @@ class ChannelChangeChannel : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveHue::Type mRequest;
 };
 
 /*
- * Command ChangeChannelByNumber
+ * Command StepHue
  */
-class ChannelChangeChannelByNumber : public ClusterCommand
+class ColorControlStepHue : public ClusterCommand
 {
 public:
-    ChannelChangeChannelByNumber(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("change-channel-by-number", credsIssuerConfig)
+    ColorControlStepHue(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-hue", credsIssuerConfig)
     {
-        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
-        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8747,8 +8922,8 @@ class ChannelChangeChannelByNumber : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8757,25 +8932,29 @@ class ChannelChangeChannelByNumber : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::StepHue::Type mRequest;
 };
 
 /*
- * Command SkipChannel
+ * Command MoveToSaturation
  */
-class ChannelSkipChannel : public ClusterCommand
+class ColorControlMoveToSaturation : public ClusterCommand
 {
 public:
-    ChannelSkipChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-channel", credsIssuerConfig)
+    ColorControlMoveToSaturation(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("move-to-saturation", credsIssuerConfig)
     {
-        AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count);
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::SkipChannel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8784,8 +8963,8 @@ class ChannelSkipChannel : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::SkipChannel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8794,46 +8973,28 @@ class ChannelSkipChannel : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster TargetNavigator                                             | 0x0505 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * NavigateTarget                                                    |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * TargetList                                                        | 0x0000 |
-| * CurrentTarget                                                     | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command NavigateTarget
+ * Command MoveSaturation
  */
-class TargetNavigatorNavigateTarget : public ClusterCommand
+class ColorControlMoveSaturation : public ClusterCommand
 {
 public:
-    TargetNavigatorNavigateTarget(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("navigate-target", credsIssuerConfig)
+    ColorControlMoveSaturation(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-saturation", credsIssuerConfig)
     {
-        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
-        AddArgument("Data", &mRequest.data);
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TargetNavigator::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8842,8 +9003,8 @@ class TargetNavigatorNavigateTarget : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TargetNavigator::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8852,58 +9013,29 @@ class TargetNavigatorNavigateTarget : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveSaturation::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster MediaPlayback                                               | 0x0506 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * Play                                                              |   0x00 |
-| * Pause                                                             |   0x01 |
-| * Stop                                                              |   0x02 |
-| * StartOver                                                         |   0x03 |
-| * Previous                                                          |   0x04 |
-| * Next                                                              |   0x05 |
-| * Rewind                                                            |   0x06 |
-| * FastForward                                                       |   0x07 |
-| * SkipForward                                                       |   0x08 |
-| * SkipBackward                                                      |   0x09 |
-| * Seek                                                              |   0x0B |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CurrentState                                                      | 0x0000 |
-| * StartTime                                                         | 0x0001 |
-| * Duration                                                          | 0x0002 |
-| * SampledPosition                                                   | 0x0003 |
-| * PlaybackSpeed                                                     | 0x0004 |
-| * SeekRangeEnd                                                      | 0x0005 |
-| * SeekRangeStart                                                    | 0x0006 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command Play
+ * Command StepSaturation
  */
-class MediaPlaybackPlay : public ClusterCommand
+class ColorControlStepSaturation : public ClusterCommand
 {
 public:
-    MediaPlaybackPlay(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("play", credsIssuerConfig)
+    ColorControlStepSaturation(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-saturation", credsIssuerConfig)
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Play::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8912,8 +9044,8 @@ class MediaPlaybackPlay : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Play::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8922,24 +9054,30 @@ class MediaPlaybackPlay : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Play::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::StepSaturation::Type mRequest;
 };
 
 /*
- * Command Pause
+ * Command MoveToHueAndSaturation
  */
-class MediaPlaybackPause : public ClusterCommand
+class ColorControlMoveToHueAndSaturation : public ClusterCommand
 {
 public:
-    MediaPlaybackPause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
+    ColorControlMoveToHueAndSaturation(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("move-to-hue-and-saturation", credsIssuerConfig)
     {
+        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8948,8 +9086,8 @@ class MediaPlaybackPause : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8958,24 +9096,29 @@ class MediaPlaybackPause : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Pause::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Type mRequest;
 };
 
 /*
- * Command Stop
+ * Command MoveToColor
  */
-class MediaPlaybackStop : public ClusterCommand
+class ColorControlMoveToColor : public ClusterCommand
 {
 public:
-    MediaPlaybackStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
+    ColorControlMoveToColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-to-color", credsIssuerConfig)
     {
+        AddArgument("ColorX", 0, UINT16_MAX, &mRequest.colorX);
+        AddArgument("ColorY", 0, UINT16_MAX, &mRequest.colorY);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -8984,8 +9127,8 @@ class MediaPlaybackStop : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -8994,24 +9137,28 @@ class MediaPlaybackStop : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Stop::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveToColor::Type mRequest;
 };
 
 /*
- * Command StartOver
+ * Command MoveColor
  */
-class MediaPlaybackStartOver : public ClusterCommand
+class ColorControlMoveColor : public ClusterCommand
 {
 public:
-    MediaPlaybackStartOver(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-over", credsIssuerConfig)
+    ColorControlMoveColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("move-color", credsIssuerConfig)
     {
+        AddArgument("RateX", INT16_MIN, INT16_MAX, &mRequest.rateX);
+        AddArgument("RateY", INT16_MIN, INT16_MAX, &mRequest.rateY);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::StartOver::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9020,8 +9167,8 @@ class MediaPlaybackStartOver : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::StartOver::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9030,24 +9177,29 @@ class MediaPlaybackStartOver : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::StartOver::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveColor::Type mRequest;
 };
 
 /*
- * Command Previous
+ * Command StepColor
  */
-class MediaPlaybackPrevious : public ClusterCommand
+class ColorControlStepColor : public ClusterCommand
 {
 public:
-    MediaPlaybackPrevious(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("previous", credsIssuerConfig)
+    ColorControlStepColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-color", credsIssuerConfig)
     {
+        AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX);
+        AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Previous::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9056,8 +9208,8 @@ class MediaPlaybackPrevious : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Previous::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColor::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9066,24 +9218,29 @@ class MediaPlaybackPrevious : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Previous::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::StepColor::Type mRequest;
 };
 
 /*
- * Command Next
+ * Command MoveToColorTemperature
  */
-class MediaPlaybackNext : public ClusterCommand
+class ColorControlMoveToColorTemperature : public ClusterCommand
 {
 public:
-    MediaPlaybackNext(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("next", credsIssuerConfig)
+    ColorControlMoveToColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("move-to-color-temperature", credsIssuerConfig)
     {
+        AddArgument("ColorTemperatureMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMireds);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Next::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9092,8 +9249,8 @@ class MediaPlaybackNext : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Next::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9102,24 +9259,30 @@ class MediaPlaybackNext : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Next::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type mRequest;
 };
 
 /*
- * Command Rewind
+ * Command EnhancedMoveToHue
  */
-class MediaPlaybackRewind : public ClusterCommand
+class ColorControlEnhancedMoveToHue : public ClusterCommand
 {
 public:
-    MediaPlaybackRewind(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rewind", credsIssuerConfig)
+    ColorControlEnhancedMoveToHue(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("enhanced-move-to-hue", credsIssuerConfig)
     {
+        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Rewind::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9128,8 +9291,8 @@ class MediaPlaybackRewind : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Rewind::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9138,24 +9301,29 @@ class MediaPlaybackRewind : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Rewind::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Type mRequest;
 };
 
 /*
- * Command FastForward
+ * Command EnhancedMoveHue
  */
-class MediaPlaybackFastForward : public ClusterCommand
+class ColorControlEnhancedMoveHue : public ClusterCommand
 {
 public:
-    MediaPlaybackFastForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fast-forward", credsIssuerConfig)
+    ColorControlEnhancedMoveHue(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("enhanced-move-hue", credsIssuerConfig)
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::FastForward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9164,8 +9332,8 @@ class MediaPlaybackFastForward : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::FastForward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9174,25 +9342,30 @@ class MediaPlaybackFastForward : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::FastForward::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Type mRequest;
 };
 
 /*
- * Command SkipForward
+ * Command EnhancedStepHue
  */
-class MediaPlaybackSkipForward : public ClusterCommand
+class ColorControlEnhancedStepHue : public ClusterCommand
 {
 public:
-    MediaPlaybackSkipForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-forward", credsIssuerConfig)
+    ColorControlEnhancedStepHue(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("enhanced-step-hue", credsIssuerConfig)
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipForward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9201,8 +9374,8 @@ class MediaPlaybackSkipForward : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipForward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9211,25 +9384,30 @@ class MediaPlaybackSkipForward : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Type mRequest;
 };
 
 /*
- * Command SkipBackward
+ * Command EnhancedMoveToHueAndSaturation
  */
-class MediaPlaybackSkipBackward : public ClusterCommand
+class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand
 {
 public:
-    MediaPlaybackSkipBackward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-backward", credsIssuerConfig)
+    ColorControlEnhancedMoveToHueAndSaturation(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("enhanced-move-to-hue-and-saturation", credsIssuerConfig)
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9238,8 +9416,8 @@ class MediaPlaybackSkipBackward : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9248,25 +9426,31 @@ class MediaPlaybackSkipBackward : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type mRequest;
 };
 
 /*
- * Command Seek
+ * Command ColorLoopSet
  */
-class MediaPlaybackSeek : public ClusterCommand
+class ColorControlColorLoopSet : public ClusterCommand
 {
 public:
-    MediaPlaybackSeek(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("seek", credsIssuerConfig)
+    ColorControlColorLoopSet(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("color-loop-set", credsIssuerConfig)
     {
-        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
+        AddArgument("UpdateFlags", 0, UINT8_MAX, &mRequest.updateFlags);
+        AddArgument("Action", 0, UINT8_MAX, &mRequest.action);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("Time", 0, UINT16_MAX, &mRequest.time);
+        AddArgument("StartHue", 0, UINT16_MAX, &mRequest.startHue);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Seek::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9275,8 +9459,8 @@ class MediaPlaybackSeek : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Seek::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9285,47 +9469,26 @@ class MediaPlaybackSeek : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster MediaInput                                                  | 0x0507 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SelectInput                                                       |   0x00 |
-| * ShowInputStatus                                                   |   0x01 |
-| * HideInputStatus                                                   |   0x02 |
-| * RenameInput                                                       |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * InputList                                                         | 0x0000 |
-| * CurrentInput                                                      | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SelectInput
+ * Command StopMoveStep
  */
-class MediaInputSelectInput : public ClusterCommand
+class ColorControlStopMoveStep : public ClusterCommand
 {
 public:
-    MediaInputSelectInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-input", credsIssuerConfig)
+    ColorControlStopMoveStep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-move-step", credsIssuerConfig)
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::SelectInput::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StopMoveStep::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9334,8 +9497,8 @@ class MediaInputSelectInput : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::SelectInput::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StopMoveStep::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9344,24 +9507,31 @@ class MediaInputSelectInput : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::StopMoveStep::Type mRequest;
 };
 
 /*
- * Command ShowInputStatus
+ * Command MoveColorTemperature
  */
-class MediaInputShowInputStatus : public ClusterCommand
+class ColorControlMoveColorTemperature : public ClusterCommand
 {
 public:
-    MediaInputShowInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("show-input-status", credsIssuerConfig)
+    ColorControlMoveColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("move-color-temperature", credsIssuerConfig)
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
+        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
+        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9370,8 +9540,8 @@ class MediaInputShowInputStatus : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9380,62 +9550,32 @@ class MediaInputShowInputStatus : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Type mRequest;
 };
 
 /*
- * Command HideInputStatus
+ * Command StepColorTemperature
  */
-class MediaInputHideInputStatus : public ClusterCommand
+class ColorControlStepColorTemperature : public ClusterCommand
 {
 public:
-    MediaInputHideInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("hide-input-status", credsIssuerConfig)
+    ColorControlStepColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("step-color-temperature", credsIssuerConfig)
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
+        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::HideInputStatus::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::HideInputStatus::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type mRequest;
-};
-
-/*
- * Command RenameInput
- */
-class MediaInputRenameInput : public ClusterCommand
-{
-public:
-    MediaInputRenameInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-input", credsIssuerConfig)
-    {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::RenameInput::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -9444,8 +9584,8 @@ class MediaInputRenameInput : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::RenameInput::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ColorControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -9454,16 +9594,29 @@ class MediaInputRenameInput : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
+    chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster LowPower                                                    | 0x0508 |
+| Cluster BallastConfiguration                                        | 0x0301 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Sleep                                                             |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * PhysicalMinLevel                                                  | 0x0000 |
+| * PhysicalMaxLevel                                                  | 0x0001 |
+| * BallastStatus                                                     | 0x0002 |
+| * MinLevel                                                          | 0x0010 |
+| * MaxLevel                                                          | 0x0011 |
+| * IntrinsicBallastFactor                                            | 0x0014 |
+| * BallastFactorAdjustment                                           | 0x0015 |
+| * LampQuantity                                                      | 0x0020 |
+| * LampType                                                          | 0x0030 |
+| * LampManufacturer                                                  | 0x0031 |
+| * LampRatedHours                                                    | 0x0032 |
+| * LampBurnHours                                                     | 0x0033 |
+| * LampAlarmMode                                                     | 0x0034 |
+| * LampBurnHoursTripPoint                                            | 0x0035 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9474,49 +9627,17 @@ class MediaInputRenameInput : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command Sleep
- */
-class LowPowerSleep : public ClusterCommand
-{
-public:
-    LowPowerSleep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("sleep", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LowPower::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LowPower::Commands::Sleep::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LowPower::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LowPower::Commands::Sleep::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::LowPower::Commands::Sleep::Type mRequest;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster KeypadInput                                                 | 0x0509 |
+| Cluster IlluminanceMeasurement                                      | 0x0400 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SendKey                                                           |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * LightSensorType                                                   | 0x0004 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9527,53 +9648,16 @@ class LowPowerSleep : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command SendKey
- */
-class KeypadInputSendKey : public ClusterCommand
-{
-public:
-    KeypadInputSendKey(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("send-key", credsIssuerConfig)
-    {
-        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::KeypadInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::KeypadInput::Commands::SendKey::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::KeypadInput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::KeypadInput::Commands::SendKey::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster ContentLauncher                                             | 0x050A |
+| Cluster TemperatureMeasurement                                      | 0x0402 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * LaunchContent                                                     |   0x00 |
-| * LaunchURL                                                         |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * AcceptHeader                                                      | 0x0000 |
-| * SupportedStreamingProtocols                                       | 0x0001 |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9584,195 +9668,41 @@ class KeypadInputSendKey : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command LaunchContent
- */
-class ContentLauncherLaunchContent : public ClusterCommand
-{
-public:
-    ContentLauncherLaunchContent(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-content", credsIssuerConfig), mComplex_Search(&mRequest.search)
-    {
-        AddArgument("Search", &mComplex_Search);
-        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type> mComplex_Search;
-};
-
-/*
- * Command LaunchURL
- */
-class ContentLauncherLaunchURL : public ClusterCommand
-{
-public:
-    ContentLauncherLaunchURL(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-url", credsIssuerConfig), mComplex_BrandingInformation(&mRequest.brandingInformation)
-    {
-        AddArgument("ContentURL", &mRequest.contentURL);
-        AddArgument("DisplayString", &mRequest.displayString);
-        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type>>
-        mComplex_BrandingInformation;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster AudioOutput                                                 | 0x050B |
+| Cluster PressureMeasurement                                         | 0x0403 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SelectOutput                                                      |   0x00 |
-| * RenameOutput                                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * OutputList                                                        | 0x0000 |
-| * CurrentOutput                                                     | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * ScaledValue                                                       | 0x0010 |
+| * MinScaledValue                                                    | 0x0011 |
+| * MaxScaledValue                                                    | 0x0012 |
+| * ScaledTolerance                                                   | 0x0013 |
+| * Scale                                                             | 0x0014 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command SelectOutput
- */
-class AudioOutputSelectOutput : public ClusterCommand
-{
-public:
-    AudioOutputSelectOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-output", credsIssuerConfig)
-    {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::SelectOutput::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::SelectOutput::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
-};
-
-/*
- * Command RenameOutput
- */
-class AudioOutputRenameOutput : public ClusterCommand
-{
-public:
-    AudioOutputRenameOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-output", credsIssuerConfig)
-    {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::RenameOutput::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::RenameOutput::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster ApplicationLauncher                                         | 0x050C |
+| Cluster FlowMeasurement                                             | 0x0404 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * LaunchApp                                                         |   0x00 |
-| * StopApp                                                           |   0x01 |
-| * HideApp                                                           |   0x02 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * CatalogList                                                       | 0x0000 |
-| * CurrentApp                                                        | 0x0001 |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9783,141 +9713,16 @@ class AudioOutputRenameOutput : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command LaunchApp
- */
-class ApplicationLauncherLaunchApp : public ClusterCommand
-{
-public:
-    ApplicationLauncherLaunchApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
-    {
-        AddArgument("Application", &mComplex_Application);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
-        mComplex_Application;
-};
-
-/*
- * Command StopApp
- */
-class ApplicationLauncherStopApp : public ClusterCommand
-{
-public:
-    ApplicationLauncherStopApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("stop-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
-    {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
-        mComplex_Application;
-};
-
-/*
- * Command HideApp
- */
-class ApplicationLauncherHideApp : public ClusterCommand
-{
-public:
-    ApplicationLauncherHideApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("hide-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
-    {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
-        mComplex_Application;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster ApplicationBasic                                            | 0x050D |
+| Cluster RelativeHumidityMeasurement                                 | 0x0405 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * VendorName                                                        | 0x0000 |
-| * VendorID                                                          | 0x0001 |
-| * ApplicationName                                                   | 0x0002 |
-| * ProductID                                                         | 0x0003 |
-| * Application                                                       | 0x0004 |
-| * Status                                                            | 0x0005 |
-| * ApplicationVersion                                                | 0x0006 |
-| * AllowedVendorList                                                 | 0x0007 |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9929,14 +9734,23 @@ class ApplicationLauncherHideApp : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster AccountLogin                                                | 0x050E |
+| Cluster OccupancySensing                                            | 0x0406 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * GetSetupPIN                                                       |   0x00 |
-| * Login                                                             |   0x02 |
-| * Logout                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * Occupancy                                                         | 0x0000 |
+| * OccupancySensorType                                               | 0x0001 |
+| * OccupancySensorTypeBitmap                                         | 0x0002 |
+| * PIROccupiedToUnoccupiedDelay                                      | 0x0010 |
+| * PIRUnoccupiedToOccupiedDelay                                      | 0x0011 |
+| * PIRUnoccupiedToOccupiedThreshold                                  | 0x0012 |
+| * UltrasonicOccupiedToUnoccupiedDelay                               | 0x0020 |
+| * UltrasonicUnoccupiedToOccupiedDelay                               | 0x0021 |
+| * UltrasonicUnoccupiedToOccupiedThreshold                           | 0x0022 |
+| * PhysicalContactOccupiedToUnoccupiedDelay                          | 0x0030 |
+| * PhysicalContactUnoccupiedToOccupiedDelay                          | 0x0031 |
+| * PhysicalContactUnoccupiedToOccupiedThreshold                      | 0x0032 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -9947,253 +9761,23 @@ class ApplicationLauncherHideApp : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command GetSetupPIN
- */
-class AccountLoginGetSetupPIN : public ClusterCommand
-{
-public:
-    AccountLoginGetSetupPIN(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-setup-pin", credsIssuerConfig)
-    {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
-};
-
-/*
- * Command Login
- */
-class AccountLoginLogin : public ClusterCommand
-{
-public:
-    AccountLoginLogin(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("login", credsIssuerConfig)
-    {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
-        AddArgument("SetupPIN", &mRequest.setupPIN);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Login::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Login::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
-};
-
-/*
- * Command Logout
- */
-class AccountLoginLogout : public ClusterCommand
-{
-public:
-    AccountLoginLogout(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("logout", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Logout::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Logout::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest;
-};
-
 /*----------------------------------------------------------------------------*\
-| Cluster ElectricalMeasurement                                       | 0x0B04 |
+| Cluster CarbonMonoxideConcentrationMeasurement                      | 0x040C |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * GetProfileInfoCommand                                             |   0x00 |
-| * GetMeasurementProfileCommand                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasurementType                                                   | 0x0000 |
-| * DcVoltage                                                         | 0x0100 |
-| * DcVoltageMin                                                      | 0x0101 |
-| * DcVoltageMax                                                      | 0x0102 |
-| * DcCurrent                                                         | 0x0103 |
-| * DcCurrentMin                                                      | 0x0104 |
-| * DcCurrentMax                                                      | 0x0105 |
-| * DcPower                                                           | 0x0106 |
-| * DcPowerMin                                                        | 0x0107 |
-| * DcPowerMax                                                        | 0x0108 |
-| * DcVoltageMultiplier                                               | 0x0200 |
-| * DcVoltageDivisor                                                  | 0x0201 |
-| * DcCurrentMultiplier                                               | 0x0202 |
-| * DcCurrentDivisor                                                  | 0x0203 |
-| * DcPowerMultiplier                                                 | 0x0204 |
-| * DcPowerDivisor                                                    | 0x0205 |
-| * AcFrequency                                                       | 0x0300 |
-| * AcFrequencyMin                                                    | 0x0301 |
-| * AcFrequencyMax                                                    | 0x0302 |
-| * NeutralCurrent                                                    | 0x0303 |
-| * TotalActivePower                                                  | 0x0304 |
-| * TotalReactivePower                                                | 0x0305 |
-| * TotalApparentPower                                                | 0x0306 |
-| * Measured1stHarmonicCurrent                                        | 0x0307 |
-| * Measured3rdHarmonicCurrent                                        | 0x0308 |
-| * Measured5thHarmonicCurrent                                        | 0x0309 |
-| * Measured7thHarmonicCurrent                                        | 0x030A |
-| * Measured9thHarmonicCurrent                                        | 0x030B |
-| * Measured11thHarmonicCurrent                                       | 0x030C |
-| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
-| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
-| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
-| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
-| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
-| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
-| * AcFrequencyMultiplier                                             | 0x0400 |
-| * AcFrequencyDivisor                                                | 0x0401 |
-| * PowerMultiplier                                                   | 0x0402 |
-| * PowerDivisor                                                      | 0x0403 |
-| * HarmonicCurrentMultiplier                                         | 0x0404 |
-| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
-| * InstantaneousVoltage                                              | 0x0500 |
-| * InstantaneousLineCurrent                                          | 0x0501 |
-| * InstantaneousActiveCurrent                                        | 0x0502 |
-| * InstantaneousReactiveCurrent                                      | 0x0503 |
-| * InstantaneousPower                                                | 0x0504 |
-| * RmsVoltage                                                        | 0x0505 |
-| * RmsVoltageMin                                                     | 0x0506 |
-| * RmsVoltageMax                                                     | 0x0507 |
-| * RmsCurrent                                                        | 0x0508 |
-| * RmsCurrentMin                                                     | 0x0509 |
-| * RmsCurrentMax                                                     | 0x050A |
-| * ActivePower                                                       | 0x050B |
-| * ActivePowerMin                                                    | 0x050C |
-| * ActivePowerMax                                                    | 0x050D |
-| * ReactivePower                                                     | 0x050E |
-| * ApparentPower                                                     | 0x050F |
-| * PowerFactor                                                       | 0x0510 |
-| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
-| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
-| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
-| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
-| * RmsVoltageSagPeriod                                               | 0x0516 |
-| * RmsVoltageSwellPeriod                                             | 0x0517 |
-| * AcVoltageMultiplier                                               | 0x0600 |
-| * AcVoltageDivisor                                                  | 0x0601 |
-| * AcCurrentMultiplier                                               | 0x0602 |
-| * AcCurrentDivisor                                                  | 0x0603 |
-| * AcPowerMultiplier                                                 | 0x0604 |
-| * AcPowerDivisor                                                    | 0x0605 |
-| * OverloadAlarmsMask                                                | 0x0700 |
-| * VoltageOverload                                                   | 0x0701 |
-| * CurrentOverload                                                   | 0x0702 |
-| * AcOverloadAlarmsMask                                              | 0x0800 |
-| * AcVoltageOverload                                                 | 0x0801 |
-| * AcCurrentOverload                                                 | 0x0802 |
-| * AcActivePowerOverload                                             | 0x0803 |
-| * AcReactivePowerOverload                                           | 0x0804 |
-| * AverageRmsOverVoltage                                             | 0x0805 |
-| * AverageRmsUnderVoltage                                            | 0x0806 |
-| * RmsExtremeOverVoltage                                             | 0x0807 |
-| * RmsExtremeUnderVoltage                                            | 0x0808 |
-| * RmsVoltageSag                                                     | 0x0809 |
-| * RmsVoltageSwell                                                   | 0x080A |
-| * LineCurrentPhaseB                                                 | 0x0901 |
-| * ActiveCurrentPhaseB                                               | 0x0902 |
-| * ReactiveCurrentPhaseB                                             | 0x0903 |
-| * RmsVoltagePhaseB                                                  | 0x0905 |
-| * RmsVoltageMinPhaseB                                               | 0x0906 |
-| * RmsVoltageMaxPhaseB                                               | 0x0907 |
-| * RmsCurrentPhaseB                                                  | 0x0908 |
-| * RmsCurrentMinPhaseB                                               | 0x0909 |
-| * RmsCurrentMaxPhaseB                                               | 0x090A |
-| * ActivePowerPhaseB                                                 | 0x090B |
-| * ActivePowerMinPhaseB                                              | 0x090C |
-| * ActivePowerMaxPhaseB                                              | 0x090D |
-| * ReactivePowerPhaseB                                               | 0x090E |
-| * ApparentPowerPhaseB                                               | 0x090F |
-| * PowerFactorPhaseB                                                 | 0x0910 |
-| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
-| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
-| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
-| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
-| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
-| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
-| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
-| * LineCurrentPhaseC                                                 | 0x0A01 |
-| * ActiveCurrentPhaseC                                               | 0x0A02 |
-| * ReactiveCurrentPhaseC                                             | 0x0A03 |
-| * RmsVoltagePhaseC                                                  | 0x0A05 |
-| * RmsVoltageMinPhaseC                                               | 0x0A06 |
-| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
-| * RmsCurrentPhaseC                                                  | 0x0A08 |
-| * RmsCurrentMinPhaseC                                               | 0x0A09 |
-| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
-| * ActivePowerPhaseC                                                 | 0x0A0B |
-| * ActivePowerMinPhaseC                                              | 0x0A0C |
-| * ActivePowerMaxPhaseC                                              | 0x0A0D |
-| * ReactivePowerPhaseC                                               | 0x0A0E |
-| * ApparentPowerPhaseC                                               | 0x0A0F |
-| * PowerFactorPhaseC                                                 | 0x0A10 |
-| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
-| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
-| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
-| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
-| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
-| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
-| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -10204,195 +9788,50 @@ class AccountLoginLogout : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command GetProfileInfoCommand
- */
-class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand
-{
-public:
-    ElectricalMeasurementGetProfileInfoCommand(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-profile-info-command", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Type mRequest;
-};
-
-/*
- * Command GetMeasurementProfileCommand
- */
-class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand
-{
-public:
-    ElectricalMeasurementGetMeasurementProfileCommand(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-measurement-profile-command", credsIssuerConfig)
-    {
-        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
-        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
-        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
-};
+/*----------------------------------------------------------------------------*\
+| Cluster CarbonDioxideConcentrationMeasurement                       | 0x040D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster UnitTesting                                                 | 0xFFF1FC05 |
+| Cluster NitrogenDioxideConcentrationMeasurement                     | 0x0413 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Test                                                              |   0x00 |
-| * TestNotHandled                                                    |   0x01 |
-| * TestSpecific                                                      |   0x02 |
-| * TestUnknownCommand                                                |   0x03 |
-| * TestAddArguments                                                  |   0x04 |
-| * TestSimpleArgumentRequest                                         |   0x05 |
-| * TestStructArrayArgumentRequest                                    |   0x06 |
-| * TestStructArgumentRequest                                         |   0x07 |
-| * TestNestedStructArgumentRequest                                   |   0x08 |
-| * TestListStructArgumentRequest                                     |   0x09 |
-| * TestListInt8UArgumentRequest                                      |   0x0A |
-| * TestNestedStructListArgumentRequest                               |   0x0B |
-| * TestListNestedStructListArgumentRequest                           |   0x0C |
-| * TestListInt8UReverseRequest                                       |   0x0D |
-| * TestEnumsRequest                                                  |   0x0E |
-| * TestNullableOptionalRequest                                       |   0x0F |
-| * TestComplexNullableOptionalRequest                                |   0x10 |
-| * SimpleStructEchoRequest                                           |   0x11 |
-| * TimedInvokeRequest                                                |   0x12 |
-| * TestSimpleOptionalArgumentRequest                                 |   0x13 |
-| * TestEmitTestEventRequest                                          |   0x14 |
-| * TestEmitTestFabricScopedEventRequest                              |   0x15 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Boolean                                                           | 0x0000 |
-| * Bitmap8                                                           | 0x0001 |
-| * Bitmap16                                                          | 0x0002 |
-| * Bitmap32                                                          | 0x0003 |
-| * Bitmap64                                                          | 0x0004 |
-| * Int8u                                                             | 0x0005 |
-| * Int16u                                                            | 0x0006 |
-| * Int24u                                                            | 0x0007 |
-| * Int32u                                                            | 0x0008 |
-| * Int40u                                                            | 0x0009 |
-| * Int48u                                                            | 0x000A |
-| * Int56u                                                            | 0x000B |
-| * Int64u                                                            | 0x000C |
-| * Int8s                                                             | 0x000D |
-| * Int16s                                                            | 0x000E |
-| * Int24s                                                            | 0x000F |
-| * Int32s                                                            | 0x0010 |
-| * Int40s                                                            | 0x0011 |
-| * Int48s                                                            | 0x0012 |
-| * Int56s                                                            | 0x0013 |
-| * Int64s                                                            | 0x0014 |
-| * Enum8                                                             | 0x0015 |
-| * Enum16                                                            | 0x0016 |
-| * FloatSingle                                                       | 0x0017 |
-| * FloatDouble                                                       | 0x0018 |
-| * OctetString                                                       | 0x0019 |
-| * ListInt8u                                                         | 0x001A |
-| * ListOctetString                                                   | 0x001B |
-| * ListStructOctetString                                             | 0x001C |
-| * LongOctetString                                                   | 0x001D |
-| * CharString                                                        | 0x001E |
-| * LongCharString                                                    | 0x001F |
-| * EpochUs                                                           | 0x0020 |
-| * EpochS                                                            | 0x0021 |
-| * VendorId                                                          | 0x0022 |
-| * ListNullablesAndOptionalsStruct                                   | 0x0023 |
-| * EnumAttr                                                          | 0x0024 |
-| * StructAttr                                                        | 0x0025 |
-| * RangeRestrictedInt8u                                              | 0x0026 |
-| * RangeRestrictedInt8s                                              | 0x0027 |
-| * RangeRestrictedInt16u                                             | 0x0028 |
-| * RangeRestrictedInt16s                                             | 0x0029 |
-| * ListLongOctetString                                               | 0x002A |
-| * ListFabricScoped                                                  | 0x002B |
-| * TimedWriteBoolean                                                 | 0x0030 |
-| * GeneralErrorBoolean                                               | 0x0031 |
-| * ClusterErrorBoolean                                               | 0x0032 |
-| * Unsupported                                                       | 0x00FF |
-| * NullableBoolean                                                   | 0x4000 |
-| * NullableBitmap8                                                   | 0x4001 |
-| * NullableBitmap16                                                  | 0x4002 |
-| * NullableBitmap32                                                  | 0x4003 |
-| * NullableBitmap64                                                  | 0x4004 |
-| * NullableInt8u                                                     | 0x4005 |
-| * NullableInt16u                                                    | 0x4006 |
-| * NullableInt24u                                                    | 0x4007 |
-| * NullableInt32u                                                    | 0x4008 |
-| * NullableInt40u                                                    | 0x4009 |
-| * NullableInt48u                                                    | 0x400A |
-| * NullableInt56u                                                    | 0x400B |
-| * NullableInt64u                                                    | 0x400C |
-| * NullableInt8s                                                     | 0x400D |
-| * NullableInt16s                                                    | 0x400E |
-| * NullableInt24s                                                    | 0x400F |
-| * NullableInt32s                                                    | 0x4010 |
-| * NullableInt40s                                                    | 0x4011 |
-| * NullableInt48s                                                    | 0x4012 |
-| * NullableInt56s                                                    | 0x4013 |
-| * NullableInt64s                                                    | 0x4014 |
-| * NullableEnum8                                                     | 0x4015 |
-| * NullableEnum16                                                    | 0x4016 |
-| * NullableFloatSingle                                               | 0x4017 |
-| * NullableFloatDouble                                               | 0x4018 |
-| * NullableOctetString                                               | 0x4019 |
-| * NullableCharString                                                | 0x401E |
-| * NullableEnumAttr                                                  | 0x4024 |
-| * NullableStruct                                                    | 0x4025 |
-| * NullableRangeRestrictedInt8u                                      | 0x4026 |
-| * NullableRangeRestrictedInt8s                                      | 0x4027 |
-| * NullableRangeRestrictedInt16u                                     | 0x4028 |
-| * NullableRangeRestrictedInt16s                                     | 0x4029 |
-| * WriteOnlyInt8u                                                    | 0x402A |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -10401,61 +9840,253 @@ class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * TestEvent                                                         | 0x0001 |
-| * TestFabricScopedEvent                                             | 0x0002 |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command Test
- */
-class UnitTestingTest : public ClusterCommand
-{
-public:
-    UnitTestingTest(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
+/*----------------------------------------------------------------------------*\
+| Cluster OzoneConcentrationMeasurement                               | 0x0415 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::Test::Id;
+/*----------------------------------------------------------------------------*\
+| Cluster Pm25ConcentrationMeasurement                                | 0x042A |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
-                        commandId, endpointIds.at(0));
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
-    }
+/*----------------------------------------------------------------------------*\
+| Cluster FormaldehydeConcentrationMeasurement                        | 0x042B |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::Test::Id;
+/*----------------------------------------------------------------------------*\
+| Cluster Pm1ConcentrationMeasurement                                 | 0x042C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
-                        groupId);
+/*----------------------------------------------------------------------------*\
+| Cluster Pm10ConcentrationMeasurement                                | 0x042D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
-    }
+/*----------------------------------------------------------------------------*\
+| Cluster TotalVolatileOrganicCompoundsConcentrationMeasurement       | 0x042E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-private:
-    chip::app::Clusters::UnitTesting::Commands::Test::Type mRequest;
-};
+/*----------------------------------------------------------------------------*\
+| Cluster RadonConcentrationMeasurement                               | 0x042F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * PeakMeasuredValue                                                 | 0x0003 |
+| * PeakMeasuredValueWindow                                           | 0x0004 |
+| * AverageMeasuredValue                                              | 0x0005 |
+| * AverageMeasuredValueWindow                                        | 0x0006 |
+| * Uncertainty                                                       | 0x0007 |
+| * MeasurementUnit                                                   | 0x0008 |
+| * MeasurementMedium                                                 | 0x0009 |
+| * LevelValue                                                        | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster WakeOnLan                                                   | 0x0503 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MACAddress                                                        | 0x0000 |
+| * LinkLocalAddress                                                  | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster Channel                                                     | 0x0504 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeChannel                                                     |   0x00 |
+| * ChangeChannelByNumber                                             |   0x02 |
+| * SkipChannel                                                       |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ChannelList                                                       | 0x0000 |
+| * Lineup                                                            | 0x0001 |
+| * CurrentChannel                                                    | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*
- * Command TestNotHandled
+ * Command ChangeChannel
  */
-class UnitTestingTestNotHandled : public ClusterCommand
+class ChannelChangeChannel : public ClusterCommand
 {
 public:
-    UnitTestingTestNotHandled(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test-not-handled", credsIssuerConfig)
+    ChannelChangeChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-channel", credsIssuerConfig)
     {
+        AddArgument("Match", &mRequest.match);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10464,8 +10095,8 @@ class UnitTestingTestNotHandled : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10474,24 +10105,27 @@ class UnitTestingTestNotHandled : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Type mRequest;
+    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
 };
 
 /*
- * Command TestSpecific
+ * Command ChangeChannelByNumber
  */
-class UnitTestingTestSpecific : public ClusterCommand
+class ChannelChangeChannelByNumber : public ClusterCommand
 {
 public:
-    UnitTestingTestSpecific(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test-specific", credsIssuerConfig)
+    ChannelChangeChannelByNumber(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("change-channel-by-number", credsIssuerConfig)
     {
+        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
+        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSpecific::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10500,8 +10134,8 @@ class UnitTestingTestSpecific : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSpecific::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10510,25 +10144,25 @@ class UnitTestingTestSpecific : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestSpecific::Type mRequest;
+    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
 };
 
 /*
- * Command TestUnknownCommand
+ * Command SkipChannel
  */
-class UnitTestingTestUnknownCommand : public ClusterCommand
+class ChannelSkipChannel : public ClusterCommand
 {
 public:
-    UnitTestingTestUnknownCommand(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-unknown-command", credsIssuerConfig)
+    ChannelSkipChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-channel", credsIssuerConfig)
     {
+        AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::SkipChannel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10537,8 +10171,8 @@ class UnitTestingTestUnknownCommand : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Channel::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Channel::Commands::SkipChannel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10547,27 +10181,46 @@ class UnitTestingTestUnknownCommand : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Type mRequest;
+    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster TargetNavigator                                             | 0x0505 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * NavigateTarget                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * TargetList                                                        | 0x0000 |
+| * CurrentTarget                                                     | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestAddArguments
+ * Command NavigateTarget
  */
-class UnitTestingTestAddArguments : public ClusterCommand
+class TargetNavigatorNavigateTarget : public ClusterCommand
 {
 public:
-    UnitTestingTestAddArguments(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-add-arguments", credsIssuerConfig)
+    TargetNavigatorNavigateTarget(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("navigate-target", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
+        AddArgument("Data", &mRequest.data);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TargetNavigator::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10576,8 +10229,8 @@ class UnitTestingTestAddArguments : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TargetNavigator::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10586,26 +10239,58 @@ class UnitTestingTestAddArguments : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Type mRequest;
+    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster MediaPlayback                                               | 0x0506 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Play                                                              |   0x00 |
+| * Pause                                                             |   0x01 |
+| * Stop                                                              |   0x02 |
+| * StartOver                                                         |   0x03 |
+| * Previous                                                          |   0x04 |
+| * Next                                                              |   0x05 |
+| * Rewind                                                            |   0x06 |
+| * FastForward                                                       |   0x07 |
+| * SkipForward                                                       |   0x08 |
+| * SkipBackward                                                      |   0x09 |
+| * Seek                                                              |   0x0B |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CurrentState                                                      | 0x0000 |
+| * StartTime                                                         | 0x0001 |
+| * Duration                                                          | 0x0002 |
+| * SampledPosition                                                   | 0x0003 |
+| * PlaybackSpeed                                                     | 0x0004 |
+| * SeekRangeEnd                                                      | 0x0005 |
+| * SeekRangeStart                                                    | 0x0006 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestSimpleArgumentRequest
+ * Command Play
  */
-class UnitTestingTestSimpleArgumentRequest : public ClusterCommand
+class MediaPlaybackPlay : public ClusterCommand
 {
 public:
-    UnitTestingTestSimpleArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-simple-argument-request", credsIssuerConfig)
+    MediaPlaybackPlay(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("play", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, 1, &mRequest.arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Play::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10614,8 +10299,8 @@ class UnitTestingTestSimpleArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Play::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10624,32 +10309,24 @@ class UnitTestingTestSimpleArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Play::Type mRequest;
 };
 
 /*
- * Command TestStructArrayArgumentRequest
+ * Command Pause
  */
-class UnitTestingTestStructArrayArgumentRequest : public ClusterCommand
+class MediaPlaybackPause : public ClusterCommand
 {
 public:
-    UnitTestingTestStructArrayArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-struct-array-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1),
-        mComplex_Arg2(&mRequest.arg2), mComplex_Arg3(&mRequest.arg3), mComplex_Arg4(&mRequest.arg4)
+    MediaPlaybackPause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        AddArgument("Arg2", &mComplex_Arg2);
-        AddArgument("Arg3", &mComplex_Arg3);
-        AddArgument("Arg4", &mComplex_Arg4);
-        AddArgument("Arg5", 0, UINT8_MAX, &mRequest.arg5);
-        AddArgument("Arg6", 0, 1, &mRequest.arg6);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10658,8 +10335,8 @@ class UnitTestingTestStructArrayArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10668,32 +10345,24 @@ class UnitTestingTestStructArrayArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type>>
-        mComplex_Arg1;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
-        mComplex_Arg2;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>> mComplex_Arg3;
-    TypedComplexArgument<chip::app::DataModel::List<const bool>> mComplex_Arg4;
+    chip::app::Clusters::MediaPlayback::Commands::Pause::Type mRequest;
 };
 
 /*
- * Command TestStructArgumentRequest
+ * Command Stop
  */
-class UnitTestingTestStructArgumentRequest : public ClusterCommand
+class MediaPlaybackStop : public ClusterCommand
 {
 public:
-    UnitTestingTestStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10702,8 +10371,8 @@ class UnitTestingTestStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Stop::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10712,27 +10381,24 @@ class UnitTestingTestStructArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type> mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::Stop::Type mRequest;
 };
 
 /*
- * Command TestNestedStructArgumentRequest
+ * Command StartOver
  */
-class UnitTestingTestNestedStructArgumentRequest : public ClusterCommand
+class MediaPlaybackStartOver : public ClusterCommand
 {
 public:
-    UnitTestingTestNestedStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-nested-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackStartOver(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-over", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::StartOver::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10741,8 +10407,8 @@ class UnitTestingTestNestedStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::StartOver::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10751,27 +10417,24 @@ class UnitTestingTestNestedStructArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::NestedStruct::Type> mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::StartOver::Type mRequest;
 };
 
 /*
- * Command TestListStructArgumentRequest
+ * Command Previous
  */
-class UnitTestingTestListStructArgumentRequest : public ClusterCommand
+class MediaPlaybackPrevious : public ClusterCommand
 {
 public:
-    UnitTestingTestListStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-list-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackPrevious(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("previous", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Previous::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10780,8 +10443,8 @@ class UnitTestingTestListStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Previous::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10790,28 +10453,24 @@ class UnitTestingTestListStructArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
-        mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::Previous::Type mRequest;
 };
 
 /*
- * Command TestListInt8UArgumentRequest
+ * Command Next
  */
-class UnitTestingTestListInt8UArgumentRequest : public ClusterCommand
+class MediaPlaybackNext : public ClusterCommand
 {
 public:
-    UnitTestingTestListInt8UArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-list-int8uargument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackNext(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("next", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Next::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10820,8 +10479,8 @@ class UnitTestingTestListInt8UArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Next::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10830,27 +10489,24 @@ class UnitTestingTestListInt8UArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::Next::Type mRequest;
 };
 
 /*
- * Command TestNestedStructListArgumentRequest
+ * Command Rewind
  */
-class UnitTestingTestNestedStructListArgumentRequest : public ClusterCommand
+class MediaPlaybackRewind : public ClusterCommand
 {
 public:
-    UnitTestingTestNestedStructListArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-nested-struct-list-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackRewind(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rewind", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Rewind::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10859,8 +10515,8 @@ class UnitTestingTestNestedStructListArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Rewind::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10869,28 +10525,24 @@ class UnitTestingTestNestedStructListArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type> mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::Rewind::Type mRequest;
 };
 
 /*
- * Command TestListNestedStructListArgumentRequest
+ * Command FastForward
  */
-class UnitTestingTestListNestedStructListArgumentRequest : public ClusterCommand
+class MediaPlaybackFastForward : public ClusterCommand
 {
 public:
-    UnitTestingTestListNestedStructListArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-list-nested-struct-list-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackFastForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fast-forward", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::FastForward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10899,9 +10551,8 @@ class UnitTestingTestListNestedStructListArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId =
-            chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::FastForward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10910,28 +10561,25 @@ class UnitTestingTestListNestedStructListArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type>>
-        mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::FastForward::Type mRequest;
 };
 
 /*
- * Command TestListInt8UReverseRequest
+ * Command SkipForward
  */
-class UnitTestingTestListInt8UReverseRequest : public ClusterCommand
+class MediaPlaybackSkipForward : public ClusterCommand
 {
 public:
-    UnitTestingTestListInt8UReverseRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-list-int8ureverse-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackSkipForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-forward", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipForward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10940,8 +10588,8 @@ class UnitTestingTestListInt8UReverseRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipForward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10950,28 +10598,25 @@ class UnitTestingTestListInt8UReverseRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
+    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
 };
 
 /*
- * Command TestEnumsRequest
+ * Command SkipBackward
  */
-class UnitTestingTestEnumsRequest : public ClusterCommand
+class MediaPlaybackSkipBackward : public ClusterCommand
 {
 public:
-    UnitTestingTestEnumsRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-enums-request", credsIssuerConfig)
+    MediaPlaybackSkipBackward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-backward", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT16_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -10980,8 +10625,8 @@ class UnitTestingTestEnumsRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -10990,26 +10635,25 @@ class UnitTestingTestEnumsRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
 };
 
 /*
- * Command TestNullableOptionalRequest
+ * Command Seek
  */
-class UnitTestingTestNullableOptionalRequest : public ClusterCommand
+class MediaPlaybackSeek : public ClusterCommand
 {
 public:
-    UnitTestingTestNullableOptionalRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-nullable-optional-request", credsIssuerConfig)
+    MediaPlaybackSeek(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("seek", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Seek::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11018,8 +10662,8 @@ class UnitTestingTestNullableOptionalRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaPlayback::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaPlayback::Commands::Seek::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11028,40 +10672,47 @@ class UnitTestingTestNullableOptionalRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster MediaInput                                                  | 0x0507 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelectInput                                                       |   0x00 |
+| * ShowInputStatus                                                   |   0x01 |
+| * HideInputStatus                                                   |   0x02 |
+| * RenameInput                                                       |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * InputList                                                         | 0x0000 |
+| * CurrentInput                                                      | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestComplexNullableOptionalRequest
+ * Command SelectInput
  */
-class UnitTestingTestComplexNullableOptionalRequest : public ClusterCommand
+class MediaInputSelectInput : public ClusterCommand
 {
 public:
-    UnitTestingTestComplexNullableOptionalRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-complex-nullable-optional-request", credsIssuerConfig),
-        mComplex_NullableStruct(&mRequest.nullableStruct), mComplex_OptionalStruct(&mRequest.optionalStruct),
-        mComplex_NullableOptionalStruct(&mRequest.nullableOptionalStruct), mComplex_NullableList(&mRequest.nullableList),
-        mComplex_OptionalList(&mRequest.optionalList), mComplex_NullableOptionalList(&mRequest.nullableOptionalList)
+    MediaInputSelectInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-input", credsIssuerConfig)
     {
-        AddArgument("NullableInt", 0, UINT16_MAX, &mRequest.nullableInt);
-        AddArgument("OptionalInt", 0, UINT16_MAX, &mRequest.optionalInt);
-        AddArgument("NullableOptionalInt", 0, UINT16_MAX, &mRequest.nullableOptionalInt);
-        AddArgument("NullableString", &mRequest.nullableString);
-        AddArgument("OptionalString", &mRequest.optionalString);
-        AddArgument("NullableOptionalString", &mRequest.nullableOptionalString);
-        AddArgument("NullableStruct", &mComplex_NullableStruct);
-        AddArgument("OptionalStruct", &mComplex_OptionalStruct);
-        AddArgument("NullableOptionalStruct", &mComplex_NullableOptionalStruct);
-        AddArgument("NullableList", &mComplex_NullableList);
-        AddArgument("OptionalList", &mComplex_OptionalList);
-        AddArgument("NullableOptionalList", &mComplex_NullableOptionalList);
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::SelectInput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11070,8 +10721,8 @@ class UnitTestingTestComplexNullableOptionalRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::SelectInput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11080,40 +10731,24 @@ class UnitTestingTestComplexNullableOptionalRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
-        mComplex_NullableStruct;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>> mComplex_OptionalStruct;
-    TypedComplexArgument<
-        chip::Optional<chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>>
-        mComplex_NullableOptionalStruct;
-    TypedComplexArgument<
-        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>
-        mComplex_NullableList;
-    TypedComplexArgument<chip::Optional<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>
-        mComplex_OptionalList;
-    TypedComplexArgument<chip::Optional<
-        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>>
-        mComplex_NullableOptionalList;
+    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
 };
 
 /*
- * Command SimpleStructEchoRequest
+ * Command ShowInputStatus
  */
-class UnitTestingSimpleStructEchoRequest : public ClusterCommand
+class MediaInputShowInputStatus : public ClusterCommand
 {
 public:
-    UnitTestingSimpleStructEchoRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("simple-struct-echo-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    MediaInputShowInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("show-input-status", credsIssuerConfig)
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11122,8 +10757,8 @@ class UnitTestingSimpleStructEchoRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11132,26 +10767,24 @@ class UnitTestingSimpleStructEchoRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type> mComplex_Arg1;
+    chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type mRequest;
 };
 
 /*
- * Command TimedInvokeRequest
+ * Command HideInputStatus
  */
-class UnitTestingTimedInvokeRequest : public ClusterCommand
+class MediaInputHideInputStatus : public ClusterCommand
 {
 public:
-    UnitTestingTimedInvokeRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("timed-invoke-request", credsIssuerConfig)
+    MediaInputHideInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("hide-input-status", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::HideInputStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11160,8 +10793,8 @@ class UnitTestingTimedInvokeRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::HideInputStatus::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11170,26 +10803,26 @@ class UnitTestingTimedInvokeRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type mRequest;
 };
 
 /*
- * Command TestSimpleOptionalArgumentRequest
+ * Command RenameInput
  */
-class UnitTestingTestSimpleOptionalArgumentRequest : public ClusterCommand
+class MediaInputRenameInput : public ClusterCommand
 {
 public:
-    UnitTestingTestSimpleOptionalArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-simple-optional-argument-request", credsIssuerConfig)
+    MediaInputRenameInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-input", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, 1, &mRequest.arg1);
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::RenameInput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11198,8 +10831,8 @@ class UnitTestingTestSimpleOptionalArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MediaInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MediaInput::Commands::RenameInput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11208,28 +10841,41 @@ class UnitTestingTestSimpleOptionalArgumentRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster LowPower                                                    | 0x0508 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Sleep                                                             |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestEmitTestEventRequest
+ * Command Sleep
  */
-class UnitTestingTestEmitTestEventRequest : public ClusterCommand
+class LowPowerSleep : public ClusterCommand
 {
 public:
-    UnitTestingTestEmitTestEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-emit-test-event-request", credsIssuerConfig)
+    LowPowerSleep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("sleep", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
-        AddArgument("Arg3", 0, 1, &mRequest.arg3);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LowPower::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::LowPower::Commands::Sleep::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11238,8 +10884,8 @@ class UnitTestingTestEmitTestEventRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LowPower::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::LowPower::Commands::Sleep::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11248,26 +10894,42 @@ class UnitTestingTestEmitTestEventRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Type mRequest;
+    chip::app::Clusters::LowPower::Commands::Sleep::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster KeypadInput                                                 | 0x0509 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SendKey                                                           |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestEmitTestFabricScopedEventRequest
+ * Command SendKey
  */
-class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand
+class KeypadInputSendKey : public ClusterCommand
 {
 public:
-    UnitTestingTestEmitTestFabricScopedEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("test-emit-test-fabric-scoped-event-request", credsIssuerConfig)
+    KeypadInputSendKey(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("send-key", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::KeypadInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::KeypadInput::Commands::SendKey::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11276,8 +10938,8 @@ class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::KeypadInput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::KeypadInput::Commands::SendKey::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11286,17 +10948,19 @@ class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Type mRequest;
+    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster FaultInjection                                              | 0xFFF1FC06 |
+| Cluster ContentLauncher                                             | 0x050A |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * FailAtFault                                                       |   0x00 |
-| * FailRandomlyAtFault                                               |   0x01 |
+| * LaunchContent                                                     |   0x00 |
+| * LaunchURL                                                         |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * AcceptHeader                                                      | 0x0000 |
+| * SupportedStreamingProtocols                                       | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -11308,25 +10972,24 @@ class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command FailAtFault
+ * Command LaunchContent
  */
-class FaultInjectionFailAtFault : public ClusterCommand
+class ContentLauncherLaunchContent : public ClusterCommand
 {
 public:
-    FaultInjectionFailAtFault(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fail-at-fault", credsIssuerConfig)
+    ContentLauncherLaunchContent(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-content", credsIssuerConfig), mComplex_Search(&mRequest.search)
     {
-        AddArgument("Type", 0, UINT8_MAX, &mRequest.type);
-        AddArgument("Id", 0, UINT32_MAX, &mRequest.id);
-        AddArgument("NumCallsToSkip", 0, UINT32_MAX, &mRequest.numCallsToSkip);
-        AddArgument("NumCallsToFail", 0, UINT32_MAX, &mRequest.numCallsToFail);
-        AddArgument("TakeMutex", 0, 1, &mRequest.takeMutex);
+        AddArgument("Search", &mComplex_Search);
+        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
+        AddArgument("Data", &mRequest.data);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailAtFault::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11335,8 +10998,8 @@ class FaultInjectionFailAtFault : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailAtFault::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11345,28 +11008,29 @@ class FaultInjectionFailAtFault : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::FaultInjection::Commands::FailAtFault::Type mRequest;
+    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type> mComplex_Search;
 };
 
 /*
- * Command FailRandomlyAtFault
+ * Command LaunchURL
  */
-class FaultInjectionFailRandomlyAtFault : public ClusterCommand
+class ContentLauncherLaunchURL : public ClusterCommand
 {
 public:
-    FaultInjectionFailRandomlyAtFault(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("fail-randomly-at-fault", credsIssuerConfig)
+    ContentLauncherLaunchURL(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-url", credsIssuerConfig), mComplex_BrandingInformation(&mRequest.brandingInformation)
     {
-        AddArgument("Type", 0, UINT8_MAX, &mRequest.type);
-        AddArgument("Id", 0, UINT32_MAX, &mRequest.id);
-        AddArgument("Percentage", 0, UINT8_MAX, &mRequest.percentage);
+        AddArgument("ContentURL", &mRequest.contentURL);
+        AddArgument("DisplayString", &mRequest.displayString);
+        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11375,8 +11039,8 @@ class FaultInjectionFailRandomlyAtFault : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11385,18 +11049,21 @@ class FaultInjectionFailRandomlyAtFault : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Type mRequest;
+    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type>>
+        mComplex_BrandingInformation;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster SampleMei                                                   | 0xFFF1FC20 |
+| Cluster AudioOutput                                                 | 0x050B |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Ping                                                              |   0x00 |
-| * AddArguments                                                      |   0x02 |
+| * SelectOutput                                                      |   0x00 |
+| * RenameOutput                                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * FlipFlop                                                          | 0x0000 |
+| * OutputList                                                        | 0x0000 |
+| * CurrentOutput                                                     | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -11408,20 +11075,21 @@ class FaultInjectionFailRandomlyAtFault : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Ping
+ * Command SelectOutput
  */
-class SampleMeiPing : public ClusterCommand
+class AudioOutputSelectOutput : public ClusterCommand
 {
 public:
-    SampleMeiPing(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("ping", credsIssuerConfig)
+    AudioOutputSelectOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-output", credsIssuerConfig)
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::Ping::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::SelectOutput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11430,8 +11098,8 @@ class SampleMeiPing : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::Ping::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::SelectOutput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11440,26 +11108,26 @@ class SampleMeiPing : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::SampleMei::Commands::Ping::Type mRequest;
+    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
 };
 
 /*
- * Command AddArguments
+ * Command RenameOutput
  */
-class SampleMeiAddArguments : public ClusterCommand
+class AudioOutputRenameOutput : public ClusterCommand
 {
 public:
-    SampleMeiAddArguments(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-arguments", credsIssuerConfig)
+    AudioOutputRenameOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-output", credsIssuerConfig)
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::AddArguments::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::RenameOutput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
                         commandId, endpointIds.at(0));
@@ -11468,8 +11136,8 @@ class SampleMeiAddArguments : public ClusterCommand
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::AddArguments::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AudioOutput::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AudioOutput::Commands::RenameOutput::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
                         groupId);
@@ -11478,31 +11146,2430 @@ class SampleMeiAddArguments : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::SampleMei::Commands::AddArguments::Type mRequest;
+    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster ApplicationLauncher                                         | 0x050C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * LaunchApp                                                         |   0x00 |
+| * StopApp                                                           |   0x01 |
+| * HideApp                                                           |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CatalogList                                                       | 0x0000 |
+| * CurrentApp                                                        | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command LaunchApp
+ */
+class ApplicationLauncherLaunchApp : public ClusterCommand
+{
+public:
+    ApplicationLauncherLaunchApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    {
+        AddArgument("Application", &mComplex_Application);
+        AddArgument("Data", &mRequest.data);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
+        mComplex_Application;
+};
+
+/*
+ * Command StopApp
+ */
+class ApplicationLauncherStopApp : public ClusterCommand
+{
+public:
+    ApplicationLauncherStopApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("stop-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    {
+        AddArgument("Application", &mComplex_Application);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
+        mComplex_Application;
+};
+
+/*
+ * Command HideApp
+ */
+class ApplicationLauncherHideApp : public ClusterCommand
+{
+public:
+    ApplicationLauncherHideApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("hide-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    {
+        AddArgument("Application", &mComplex_Application);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationStruct::Type>>
+        mComplex_Application;
 };
 
-/*----------------------------------------------------------------------------*\
-| Register all Clusters commands                                               |
-\*----------------------------------------------------------------------------*/
-void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+/*----------------------------------------------------------------------------*\
+| Cluster ApplicationBasic                                            | 0x050D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * VendorName                                                        | 0x0000 |
+| * VendorID                                                          | 0x0001 |
+| * ApplicationName                                                   | 0x0002 |
+| * ProductID                                                         | 0x0003 |
+| * Application                                                       | 0x0004 |
+| * Status                                                            | 0x0005 |
+| * ApplicationVersion                                                | 0x0006 |
+| * AllowedVendorList                                                 | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster AccountLogin                                                | 0x050E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetSetupPIN                                                       |   0x00 |
+| * Login                                                             |   0x02 |
+| * Logout                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command GetSetupPIN
+ */
+class AccountLoginGetSetupPIN : public ClusterCommand
+{
+public:
+    AccountLoginGetSetupPIN(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-setup-pin", credsIssuerConfig)
+    {
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
+};
+
+/*
+ * Command Login
+ */
+class AccountLoginLogin : public ClusterCommand
+{
+public:
+    AccountLoginLogin(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("login", credsIssuerConfig)
+    {
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        AddArgument("SetupPIN", &mRequest.setupPIN);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Login::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Login::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
+};
+
+/*
+ * Command Logout
+ */
+class AccountLoginLogout : public ClusterCommand
+{
+public:
+    AccountLoginLogout(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("logout", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Logout::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AccountLogin::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::AccountLogin::Commands::Logout::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster ElectricalMeasurement                                       | 0x0B04 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetProfileInfoCommand                                             |   0x00 |
+| * GetMeasurementProfileCommand                                      |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasurementType                                                   | 0x0000 |
+| * DcVoltage                                                         | 0x0100 |
+| * DcVoltageMin                                                      | 0x0101 |
+| * DcVoltageMax                                                      | 0x0102 |
+| * DcCurrent                                                         | 0x0103 |
+| * DcCurrentMin                                                      | 0x0104 |
+| * DcCurrentMax                                                      | 0x0105 |
+| * DcPower                                                           | 0x0106 |
+| * DcPowerMin                                                        | 0x0107 |
+| * DcPowerMax                                                        | 0x0108 |
+| * DcVoltageMultiplier                                               | 0x0200 |
+| * DcVoltageDivisor                                                  | 0x0201 |
+| * DcCurrentMultiplier                                               | 0x0202 |
+| * DcCurrentDivisor                                                  | 0x0203 |
+| * DcPowerMultiplier                                                 | 0x0204 |
+| * DcPowerDivisor                                                    | 0x0205 |
+| * AcFrequency                                                       | 0x0300 |
+| * AcFrequencyMin                                                    | 0x0301 |
+| * AcFrequencyMax                                                    | 0x0302 |
+| * NeutralCurrent                                                    | 0x0303 |
+| * TotalActivePower                                                  | 0x0304 |
+| * TotalReactivePower                                                | 0x0305 |
+| * TotalApparentPower                                                | 0x0306 |
+| * Measured1stHarmonicCurrent                                        | 0x0307 |
+| * Measured3rdHarmonicCurrent                                        | 0x0308 |
+| * Measured5thHarmonicCurrent                                        | 0x0309 |
+| * Measured7thHarmonicCurrent                                        | 0x030A |
+| * Measured9thHarmonicCurrent                                        | 0x030B |
+| * Measured11thHarmonicCurrent                                       | 0x030C |
+| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
+| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
+| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
+| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
+| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
+| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
+| * AcFrequencyMultiplier                                             | 0x0400 |
+| * AcFrequencyDivisor                                                | 0x0401 |
+| * PowerMultiplier                                                   | 0x0402 |
+| * PowerDivisor                                                      | 0x0403 |
+| * HarmonicCurrentMultiplier                                         | 0x0404 |
+| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
+| * InstantaneousVoltage                                              | 0x0500 |
+| * InstantaneousLineCurrent                                          | 0x0501 |
+| * InstantaneousActiveCurrent                                        | 0x0502 |
+| * InstantaneousReactiveCurrent                                      | 0x0503 |
+| * InstantaneousPower                                                | 0x0504 |
+| * RmsVoltage                                                        | 0x0505 |
+| * RmsVoltageMin                                                     | 0x0506 |
+| * RmsVoltageMax                                                     | 0x0507 |
+| * RmsCurrent                                                        | 0x0508 |
+| * RmsCurrentMin                                                     | 0x0509 |
+| * RmsCurrentMax                                                     | 0x050A |
+| * ActivePower                                                       | 0x050B |
+| * ActivePowerMin                                                    | 0x050C |
+| * ActivePowerMax                                                    | 0x050D |
+| * ReactivePower                                                     | 0x050E |
+| * ApparentPower                                                     | 0x050F |
+| * PowerFactor                                                       | 0x0510 |
+| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
+| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
+| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
+| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
+| * RmsVoltageSagPeriod                                               | 0x0516 |
+| * RmsVoltageSwellPeriod                                             | 0x0517 |
+| * AcVoltageMultiplier                                               | 0x0600 |
+| * AcVoltageDivisor                                                  | 0x0601 |
+| * AcCurrentMultiplier                                               | 0x0602 |
+| * AcCurrentDivisor                                                  | 0x0603 |
+| * AcPowerMultiplier                                                 | 0x0604 |
+| * AcPowerDivisor                                                    | 0x0605 |
+| * OverloadAlarmsMask                                                | 0x0700 |
+| * VoltageOverload                                                   | 0x0701 |
+| * CurrentOverload                                                   | 0x0702 |
+| * AcOverloadAlarmsMask                                              | 0x0800 |
+| * AcVoltageOverload                                                 | 0x0801 |
+| * AcCurrentOverload                                                 | 0x0802 |
+| * AcActivePowerOverload                                             | 0x0803 |
+| * AcReactivePowerOverload                                           | 0x0804 |
+| * AverageRmsOverVoltage                                             | 0x0805 |
+| * AverageRmsUnderVoltage                                            | 0x0806 |
+| * RmsExtremeOverVoltage                                             | 0x0807 |
+| * RmsExtremeUnderVoltage                                            | 0x0808 |
+| * RmsVoltageSag                                                     | 0x0809 |
+| * RmsVoltageSwell                                                   | 0x080A |
+| * LineCurrentPhaseB                                                 | 0x0901 |
+| * ActiveCurrentPhaseB                                               | 0x0902 |
+| * ReactiveCurrentPhaseB                                             | 0x0903 |
+| * RmsVoltagePhaseB                                                  | 0x0905 |
+| * RmsVoltageMinPhaseB                                               | 0x0906 |
+| * RmsVoltageMaxPhaseB                                               | 0x0907 |
+| * RmsCurrentPhaseB                                                  | 0x0908 |
+| * RmsCurrentMinPhaseB                                               | 0x0909 |
+| * RmsCurrentMaxPhaseB                                               | 0x090A |
+| * ActivePowerPhaseB                                                 | 0x090B |
+| * ActivePowerMinPhaseB                                              | 0x090C |
+| * ActivePowerMaxPhaseB                                              | 0x090D |
+| * ReactivePowerPhaseB                                               | 0x090E |
+| * ApparentPowerPhaseB                                               | 0x090F |
+| * PowerFactorPhaseB                                                 | 0x0910 |
+| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
+| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
+| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
+| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
+| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
+| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
+| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
+| * LineCurrentPhaseC                                                 | 0x0A01 |
+| * ActiveCurrentPhaseC                                               | 0x0A02 |
+| * ReactiveCurrentPhaseC                                             | 0x0A03 |
+| * RmsVoltagePhaseC                                                  | 0x0A05 |
+| * RmsVoltageMinPhaseC                                               | 0x0A06 |
+| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
+| * RmsCurrentPhaseC                                                  | 0x0A08 |
+| * RmsCurrentMinPhaseC                                               | 0x0A09 |
+| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
+| * ActivePowerPhaseC                                                 | 0x0A0B |
+| * ActivePowerMinPhaseC                                              | 0x0A0C |
+| * ActivePowerMaxPhaseC                                              | 0x0A0D |
+| * ReactivePowerPhaseC                                               | 0x0A0E |
+| * ApparentPowerPhaseC                                               | 0x0A0F |
+| * PowerFactorPhaseC                                                 | 0x0A10 |
+| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
+| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
+| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
+| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
+| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
+| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
+| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command GetProfileInfoCommand
+ */
+class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand
+{
+public:
+    ElectricalMeasurementGetProfileInfoCommand(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-profile-info-command", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Type mRequest;
+};
+
+/*
+ * Command GetMeasurementProfileCommand
+ */
+class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand
+{
+public:
+    ElectricalMeasurementGetMeasurementProfileCommand(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-measurement-profile-command", credsIssuerConfig)
+    {
+        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
+        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
+        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ElectricalMeasurement::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster UnitTesting                                                 | 0xFFF1FC05 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Test                                                              |   0x00 |
+| * TestNotHandled                                                    |   0x01 |
+| * TestSpecific                                                      |   0x02 |
+| * TestUnknownCommand                                                |   0x03 |
+| * TestAddArguments                                                  |   0x04 |
+| * TestSimpleArgumentRequest                                         |   0x05 |
+| * TestStructArrayArgumentRequest                                    |   0x06 |
+| * TestStructArgumentRequest                                         |   0x07 |
+| * TestNestedStructArgumentRequest                                   |   0x08 |
+| * TestListStructArgumentRequest                                     |   0x09 |
+| * TestListInt8UArgumentRequest                                      |   0x0A |
+| * TestNestedStructListArgumentRequest                               |   0x0B |
+| * TestListNestedStructListArgumentRequest                           |   0x0C |
+| * TestListInt8UReverseRequest                                       |   0x0D |
+| * TestEnumsRequest                                                  |   0x0E |
+| * TestNullableOptionalRequest                                       |   0x0F |
+| * TestComplexNullableOptionalRequest                                |   0x10 |
+| * SimpleStructEchoRequest                                           |   0x11 |
+| * TimedInvokeRequest                                                |   0x12 |
+| * TestSimpleOptionalArgumentRequest                                 |   0x13 |
+| * TestEmitTestEventRequest                                          |   0x14 |
+| * TestEmitTestFabricScopedEventRequest                              |   0x15 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Boolean                                                           | 0x0000 |
+| * Bitmap8                                                           | 0x0001 |
+| * Bitmap16                                                          | 0x0002 |
+| * Bitmap32                                                          | 0x0003 |
+| * Bitmap64                                                          | 0x0004 |
+| * Int8u                                                             | 0x0005 |
+| * Int16u                                                            | 0x0006 |
+| * Int24u                                                            | 0x0007 |
+| * Int32u                                                            | 0x0008 |
+| * Int40u                                                            | 0x0009 |
+| * Int48u                                                            | 0x000A |
+| * Int56u                                                            | 0x000B |
+| * Int64u                                                            | 0x000C |
+| * Int8s                                                             | 0x000D |
+| * Int16s                                                            | 0x000E |
+| * Int24s                                                            | 0x000F |
+| * Int32s                                                            | 0x0010 |
+| * Int40s                                                            | 0x0011 |
+| * Int48s                                                            | 0x0012 |
+| * Int56s                                                            | 0x0013 |
+| * Int64s                                                            | 0x0014 |
+| * Enum8                                                             | 0x0015 |
+| * Enum16                                                            | 0x0016 |
+| * FloatSingle                                                       | 0x0017 |
+| * FloatDouble                                                       | 0x0018 |
+| * OctetString                                                       | 0x0019 |
+| * ListInt8u                                                         | 0x001A |
+| * ListOctetString                                                   | 0x001B |
+| * ListStructOctetString                                             | 0x001C |
+| * LongOctetString                                                   | 0x001D |
+| * CharString                                                        | 0x001E |
+| * LongCharString                                                    | 0x001F |
+| * EpochUs                                                           | 0x0020 |
+| * EpochS                                                            | 0x0021 |
+| * VendorId                                                          | 0x0022 |
+| * ListNullablesAndOptionalsStruct                                   | 0x0023 |
+| * EnumAttr                                                          | 0x0024 |
+| * StructAttr                                                        | 0x0025 |
+| * RangeRestrictedInt8u                                              | 0x0026 |
+| * RangeRestrictedInt8s                                              | 0x0027 |
+| * RangeRestrictedInt16u                                             | 0x0028 |
+| * RangeRestrictedInt16s                                             | 0x0029 |
+| * ListLongOctetString                                               | 0x002A |
+| * ListFabricScoped                                                  | 0x002B |
+| * TimedWriteBoolean                                                 | 0x0030 |
+| * GeneralErrorBoolean                                               | 0x0031 |
+| * ClusterErrorBoolean                                               | 0x0032 |
+| * Unsupported                                                       | 0x00FF |
+| * NullableBoolean                                                   | 0x4000 |
+| * NullableBitmap8                                                   | 0x4001 |
+| * NullableBitmap16                                                  | 0x4002 |
+| * NullableBitmap32                                                  | 0x4003 |
+| * NullableBitmap64                                                  | 0x4004 |
+| * NullableInt8u                                                     | 0x4005 |
+| * NullableInt16u                                                    | 0x4006 |
+| * NullableInt24u                                                    | 0x4007 |
+| * NullableInt32u                                                    | 0x4008 |
+| * NullableInt40u                                                    | 0x4009 |
+| * NullableInt48u                                                    | 0x400A |
+| * NullableInt56u                                                    | 0x400B |
+| * NullableInt64u                                                    | 0x400C |
+| * NullableInt8s                                                     | 0x400D |
+| * NullableInt16s                                                    | 0x400E |
+| * NullableInt24s                                                    | 0x400F |
+| * NullableInt32s                                                    | 0x4010 |
+| * NullableInt40s                                                    | 0x4011 |
+| * NullableInt48s                                                    | 0x4012 |
+| * NullableInt56s                                                    | 0x4013 |
+| * NullableInt64s                                                    | 0x4014 |
+| * NullableEnum8                                                     | 0x4015 |
+| * NullableEnum16                                                    | 0x4016 |
+| * NullableFloatSingle                                               | 0x4017 |
+| * NullableFloatDouble                                               | 0x4018 |
+| * NullableOctetString                                               | 0x4019 |
+| * NullableCharString                                                | 0x401E |
+| * NullableEnumAttr                                                  | 0x4024 |
+| * NullableStruct                                                    | 0x4025 |
+| * NullableRangeRestrictedInt8u                                      | 0x4026 |
+| * NullableRangeRestrictedInt8s                                      | 0x4027 |
+| * NullableRangeRestrictedInt16u                                     | 0x4028 |
+| * NullableRangeRestrictedInt16s                                     | 0x4029 |
+| * WriteOnlyInt8u                                                    | 0x402A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * TestEvent                                                         | 0x0001 |
+| * TestFabricScopedEvent                                             | 0x0002 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command Test
+ */
+class UnitTestingTest : public ClusterCommand
+{
+public:
+    UnitTestingTest(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::Test::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::Test::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::Test::Type mRequest;
+};
+
+/*
+ * Command TestNotHandled
+ */
+class UnitTestingTestNotHandled : public ClusterCommand
+{
+public:
+    UnitTestingTestNotHandled(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test-not-handled", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestNotHandled::Type mRequest;
+};
+
+/*
+ * Command TestSpecific
+ */
+class UnitTestingTestSpecific : public ClusterCommand
+{
+public:
+    UnitTestingTestSpecific(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("test-specific", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSpecific::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSpecific::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestSpecific::Type mRequest;
+};
+
+/*
+ * Command TestUnknownCommand
+ */
+class UnitTestingTestUnknownCommand : public ClusterCommand
+{
+public:
+    UnitTestingTestUnknownCommand(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-unknown-command", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestUnknownCommand::Type mRequest;
+};
+
+/*
+ * Command TestAddArguments
+ */
+class UnitTestingTestAddArguments : public ClusterCommand
+{
+public:
+    UnitTestingTestAddArguments(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-add-arguments", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestAddArguments::Type mRequest;
+};
+
+/*
+ * Command TestSimpleArgumentRequest
+ */
+class UnitTestingTestSimpleArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestSimpleArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-simple-argument-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, 1, &mRequest.arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Type mRequest;
+};
+
+/*
+ * Command TestStructArrayArgumentRequest
+ */
+class UnitTestingTestStructArrayArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestStructArrayArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-struct-array-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1),
+        mComplex_Arg2(&mRequest.arg2), mComplex_Arg3(&mRequest.arg3), mComplex_Arg4(&mRequest.arg4)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        AddArgument("Arg2", &mComplex_Arg2);
+        AddArgument("Arg3", &mComplex_Arg3);
+        AddArgument("Arg4", &mComplex_Arg4);
+        AddArgument("Arg5", 0, UINT8_MAX, &mRequest.arg5);
+        AddArgument("Arg6", 0, 1, &mRequest.arg6);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type>>
+        mComplex_Arg1;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
+        mComplex_Arg2;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>> mComplex_Arg3;
+    TypedComplexArgument<chip::app::DataModel::List<const bool>> mComplex_Arg4;
+};
+
+/*
+ * Command TestStructArgumentRequest
+ */
+class UnitTestingTestStructArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type> mComplex_Arg1;
+};
+
+/*
+ * Command TestNestedStructArgumentRequest
+ */
+class UnitTestingTestNestedStructArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestNestedStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-nested-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::NestedStruct::Type> mComplex_Arg1;
+};
+
+/*
+ * Command TestListStructArgumentRequest
+ */
+class UnitTestingTestListStructArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestListStructArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-list-struct-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
+        mComplex_Arg1;
+};
+
+/*
+ * Command TestListInt8UArgumentRequest
+ */
+class UnitTestingTestListInt8UArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestListInt8UArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-list-int8uargument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
+};
+
+/*
+ * Command TestNestedStructListArgumentRequest
+ */
+class UnitTestingTestNestedStructListArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestNestedStructListArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-nested-struct-list-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type> mComplex_Arg1;
+};
+
+/*
+ * Command TestListNestedStructListArgumentRequest
+ */
+class UnitTestingTestListNestedStructListArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestListNestedStructListArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-list-nested-struct-list-argument-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId =
+            chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::NestedStructList::Type>>
+        mComplex_Arg1;
+};
+
+/*
+ * Command TestListInt8UReverseRequest
+ */
+class UnitTestingTestListInt8UReverseRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestListInt8UReverseRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-list-int8ureverse-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
+};
+
+/*
+ * Command TestEnumsRequest
+ */
+class UnitTestingTestEnumsRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestEnumsRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-enums-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT16_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Type mRequest;
+};
+
+/*
+ * Command TestNullableOptionalRequest
+ */
+class UnitTestingTestNullableOptionalRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestNullableOptionalRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-nullable-optional-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Type mRequest;
+};
+
+/*
+ * Command TestComplexNullableOptionalRequest
+ */
+class UnitTestingTestComplexNullableOptionalRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestComplexNullableOptionalRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-complex-nullable-optional-request", credsIssuerConfig),
+        mComplex_NullableStruct(&mRequest.nullableStruct), mComplex_OptionalStruct(&mRequest.optionalStruct),
+        mComplex_NullableOptionalStruct(&mRequest.nullableOptionalStruct), mComplex_NullableList(&mRequest.nullableList),
+        mComplex_OptionalList(&mRequest.optionalList), mComplex_NullableOptionalList(&mRequest.nullableOptionalList)
+    {
+        AddArgument("NullableInt", 0, UINT16_MAX, &mRequest.nullableInt);
+        AddArgument("OptionalInt", 0, UINT16_MAX, &mRequest.optionalInt);
+        AddArgument("NullableOptionalInt", 0, UINT16_MAX, &mRequest.nullableOptionalInt);
+        AddArgument("NullableString", &mRequest.nullableString);
+        AddArgument("OptionalString", &mRequest.optionalString);
+        AddArgument("NullableOptionalString", &mRequest.nullableOptionalString);
+        AddArgument("NullableStruct", &mComplex_NullableStruct);
+        AddArgument("OptionalStruct", &mComplex_OptionalStruct);
+        AddArgument("NullableOptionalStruct", &mComplex_NullableOptionalStruct);
+        AddArgument("NullableList", &mComplex_NullableList);
+        AddArgument("OptionalList", &mComplex_OptionalList);
+        AddArgument("NullableOptionalList", &mComplex_NullableOptionalList);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>
+        mComplex_NullableStruct;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>> mComplex_OptionalStruct;
+    TypedComplexArgument<
+        chip::Optional<chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type>>>
+        mComplex_NullableOptionalStruct;
+    TypedComplexArgument<
+        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>
+        mComplex_NullableList;
+    TypedComplexArgument<chip::Optional<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>
+        mComplex_OptionalList;
+    TypedComplexArgument<chip::Optional<
+        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::SimpleEnum>>>>
+        mComplex_NullableOptionalList;
+};
+
+/*
+ * Command SimpleStructEchoRequest
+ */
+class UnitTestingSimpleStructEchoRequest : public ClusterCommand
+{
+public:
+    UnitTestingSimpleStructEchoRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("simple-struct-echo-request", credsIssuerConfig), mComplex_Arg1(&mRequest.arg1)
+    {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type> mComplex_Arg1;
+};
+
+/*
+ * Command TimedInvokeRequest
+ */
+class UnitTestingTimedInvokeRequest : public ClusterCommand
+{
+public:
+    UnitTestingTimedInvokeRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("timed-invoke-request", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TimedInvokeRequest::Type mRequest;
+};
+
+/*
+ * Command TestSimpleOptionalArgumentRequest
+ */
+class UnitTestingTestSimpleOptionalArgumentRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestSimpleOptionalArgumentRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-simple-optional-argument-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, 1, &mRequest.arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Type mRequest;
+};
+
+/*
+ * Command TestEmitTestEventRequest
+ */
+class UnitTestingTestEmitTestEventRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestEmitTestEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-emit-test-event-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        AddArgument("Arg3", 0, 1, &mRequest.arg3);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventRequest::Type mRequest;
+};
+
+/*
+ * Command TestEmitTestFabricScopedEventRequest
+ */
+class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand
+{
+public:
+    UnitTestingTestEmitTestFabricScopedEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-emit-test-fabric-scoped-event-request", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::UnitTesting::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventRequest::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster FaultInjection                                              | 0xFFF1FC06 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * FailAtFault                                                       |   0x00 |
+| * FailRandomlyAtFault                                               |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command FailAtFault
+ */
+class FaultInjectionFailAtFault : public ClusterCommand
+{
+public:
+    FaultInjectionFailAtFault(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fail-at-fault", credsIssuerConfig)
+    {
+        AddArgument("Type", 0, UINT8_MAX, &mRequest.type);
+        AddArgument("Id", 0, UINT32_MAX, &mRequest.id);
+        AddArgument("NumCallsToSkip", 0, UINT32_MAX, &mRequest.numCallsToSkip);
+        AddArgument("NumCallsToFail", 0, UINT32_MAX, &mRequest.numCallsToFail);
+        AddArgument("TakeMutex", 0, 1, &mRequest.takeMutex);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailAtFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailAtFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::FaultInjection::Commands::FailAtFault::Type mRequest;
+};
+
+/*
+ * Command FailRandomlyAtFault
+ */
+class FaultInjectionFailRandomlyAtFault : public ClusterCommand
+{
+public:
+    FaultInjectionFailRandomlyAtFault(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("fail-randomly-at-fault", credsIssuerConfig)
+    {
+        AddArgument("Type", 0, UINT8_MAX, &mRequest.type);
+        AddArgument("Id", 0, UINT32_MAX, &mRequest.id);
+        AddArgument("Percentage", 0, UINT8_MAX, &mRequest.percentage);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::FaultInjection::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster SampleMei                                                   | 0xFFF1FC20 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Ping                                                              |   0x00 |
+| * AddArguments                                                      |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * FlipFlop                                                          | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command Ping
+ */
+class SampleMeiPing : public ClusterCommand
+{
+public:
+    SampleMeiPing(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("ping", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::Ping::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::Ping::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::SampleMei::Commands::Ping::Type mRequest;
+};
+
+/*
+ * Command AddArguments
+ */
+class SampleMeiAddArguments : public ClusterCommand
+{
+public:
+    SampleMeiAddArguments(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-arguments", credsIssuerConfig)
+    {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::AddArguments::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
+                        commandId, endpointIds.at(0));
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SampleMei::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SampleMei::Commands::AddArguments::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
+                        groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::SampleMei::Commands::AddArguments::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Register all Clusters commands                                               |
+\*----------------------------------------------------------------------------*/
+void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Identify;
+
+    const char * clusterName = "Identify";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),    //
+        make_unique<IdentifyIdentify>(credsIssuerConfig),      //
+        make_unique<IdentifyTriggerEffect>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "identify-type", Attributes::IdentifyType::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<uint16_t>>(Id, "identify-time", 0, UINT16_MAX, Attributes::IdentifyTime::Id,
+                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::Identify::IdentifyTypeEnum>>(
+            Id, "identify-type", 0, UINT8_MAX, Attributes::IdentifyType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "identify-type", Attributes::IdentifyType::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Groups;
+
+    const char * clusterName = "Groups";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
+        make_unique<GroupsAddGroup>(credsIssuerConfig),              //
+        make_unique<GroupsViewGroup>(credsIssuerConfig),             //
+        make_unique<GroupsGetGroupMembership>(credsIssuerConfig),    //
+        make_unique<GroupsRemoveGroup>(credsIssuerConfig),           //
+        make_unique<GroupsRemoveAllGroups>(credsIssuerConfig),       //
+        make_unique<GroupsAddGroupIfIdentifying>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap>>>(
+            Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Scenes;
+
+    const char * clusterName = "Scenes";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
+        make_unique<ScenesAddScene>(credsIssuerConfig),           //
+        make_unique<ScenesViewScene>(credsIssuerConfig),          //
+        make_unique<ScenesRemoveScene>(credsIssuerConfig),        //
+        make_unique<ScenesRemoveAllScenes>(credsIssuerConfig),    //
+        make_unique<ScenesStoreScene>(credsIssuerConfig),         //
+        make_unique<ScenesRecallScene>(credsIssuerConfig),        //
+        make_unique<ScenesGetSceneMembership>(credsIssuerConfig), //
+        make_unique<ScenesEnhancedAddScene>(credsIssuerConfig),   //
+        make_unique<ScenesEnhancedViewScene>(credsIssuerConfig),  //
+        make_unique<ScenesCopyScene>(credsIssuerConfig),          //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "scene-table-size", Attributes::SceneTableSize::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "fabric-scene-info", Attributes::FabricSceneInfo::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<uint8_t>>(Id, "scene-count", 0, UINT8_MAX, Attributes::SceneCount::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-scene", 0, UINT8_MAX, Attributes::CurrentScene::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::GroupId>>(Id, "current-group", 0, UINT16_MAX, Attributes::CurrentGroup::Id,
+                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "scene-valid", 0, 1, Attributes::SceneValid::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap>>>(
+            Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::NodeId>>>(
+            Id, "last-configured-by", 0, UINT64_MAX, Attributes::LastConfiguredBy::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "scene-table-size", 0, UINT16_MAX, Attributes::SceneTableSize::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type>>>(
+            Id, "fabric-scene-info", Attributes::FabricSceneInfo::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "scene-table-size", Attributes::SceneTableSize::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "fabric-scene-info", Attributes::FabricSceneInfo::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::OnOff;
+
+    const char * clusterName = "OnOff";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
+        make_unique<OnOffOff>(credsIssuerConfig),                     //
+        make_unique<OnOffOn>(credsIssuerConfig),                      //
+        make_unique<OnOffToggle>(credsIssuerConfig),                  //
+        make_unique<OnOffOffWithEffect>(credsIssuerConfig),           //
+        make_unique<OnOffOnWithRecallGlobalScene>(credsIssuerConfig), //
+        make_unique<OnOffOnWithTimedOff>(credsIssuerConfig),          //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<bool>>(Id, "on-off", 0, 1, Attributes::OnOff::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "global-scene-control", 0, 1, Attributes::GlobalSceneControl::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "on-time", 0, UINT16_MAX, Attributes::OnTime::Id, WriteCommandType::kWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "off-wait-time", 0, UINT16_MAX, Attributes::OffWaitTime::Id,
+                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum>>>(
+            Id, "start-up-on-off", 0, UINT8_MAX, Attributes::StartUpOnOff::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
+
+    const char * clusterName = "OnOffSwitchConfiguration";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "switch-actions", Attributes::SwitchActions::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<uint8_t>>(Id, "switch-type", 0, UINT8_MAX, Attributes::SwitchType::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "switch-actions", 0, UINT8_MAX, Attributes::SwitchActions::Id,
+                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "switch-actions", Attributes::SwitchActions::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::LevelControl;
+
+    const char * clusterName = "LevelControl";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<LevelControlMoveToLevel>(credsIssuerConfig),            //
+        make_unique<LevelControlMove>(credsIssuerConfig),                   //
+        make_unique<LevelControlStep>(credsIssuerConfig),                   //
+        make_unique<LevelControlStop>(credsIssuerConfig),                   //
+        make_unique<LevelControlMoveToLevelWithOnOff>(credsIssuerConfig),   //
+        make_unique<LevelControlMoveWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlStepWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlStopWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlMoveToClosestFrequency>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "current-level", 0, UINT8_MAX, Attributes::CurrentLevel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "remaining-time", 0, UINT16_MAX, Attributes::RemainingTime::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "current-frequency", 0, UINT16_MAX, Attributes::CurrentFrequency::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "min-frequency", 0, UINT16_MAX, Attributes::MinFrequency::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "max-frequency", 0, UINT16_MAX, Attributes::MaxFrequency::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>>>(
+            Id, "options", 0, UINT8_MAX, Attributes::Options::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "on-off-transition-time", 0, UINT16_MAX, Attributes::OnOffTransitionTime::Id,
+                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-level", 0, UINT8_MAX, Attributes::OnLevel::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "on-transition-time", 0, UINT16_MAX,
+                                                                              Attributes::OnTransitionTime::Id,
+                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "off-transition-time", 0, UINT16_MAX,
+                                                                              Attributes::OffTransitionTime::Id,
+                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "default-move-rate", 0, UINT8_MAX, Attributes::DefaultMoveRate::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "start-up-current-level", 0, UINT8_MAX,
+                                                                             Attributes::StartUpCurrentLevel::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::BinaryInputBasic;
+
+    const char * clusterName = "BinaryInputBasic";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "active-text", Attributes::ActiveText::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "inactive-text", Attributes::InactiveText::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "out-of-service", 0, 1, Attributes::OutOfService::Id, WriteCommandType::kWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "polarity", 0, UINT8_MAX, Attributes::Polarity::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "present-value", 0, 1, Attributes::PresentValue::Id, WriteCommandType::kWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "reliability", 0, UINT8_MAX, Attributes::Reliability::Id, WriteCommandType::kWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "status-flags", 0, UINT8_MAX, Attributes::StatusFlags::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "application-type", 0, UINT32_MAX, Attributes::ApplicationType::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::PulseWidthModulation;
+
+    const char * clusterName = "PulseWidthModulation";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Descriptor;
+
+    const char * clusterName = "Descriptor";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "tag-list", Attributes::TagList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type>>>(
+            Id, "device-type-list", Attributes::DeviceTypeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ClusterId>>>(
+            Id, "server-list", Attributes::ServerList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ClusterId>>>(
+            Id, "client-list", Attributes::ClientList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
+            Id, "parts-list", Attributes::PartsList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::Type>>>(
+            Id, "tag-list", Attributes::TagList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "tag-list", Attributes::TagList::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Identify;
+    using namespace chip::app::Clusters::Binding;
 
-    const char * clusterName = "Identify";
+    const char * clusterName = "Binding";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),    //
-        make_unique<IdentifyIdentify>(credsIssuerConfig),      //
-        make_unique<IdentifyTriggerEffect>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "identify-type", Attributes::IdentifyType::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "binding", Attributes::Binding::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11510,10 +13577,9 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint16_t>>(Id, "identify-time", 0, UINT16_MAX, Attributes::IdentifyTime::Id,
-                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::Identify::IdentifyTypeEnum>>(
-            Id, "identify-type", 0, UINT8_MAX, Attributes::IdentifyType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type>>>(
+            Id, "binding", Attributes::Binding::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11528,8 +13594,7 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "identify-type", Attributes::IdentifyType::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "binding", Attributes::Binding::Id, credsIssuerConfig),                             //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11545,28 +13610,29 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Groups;
+    using namespace chip::app::Clusters::AccessControl;
 
-    const char * clusterName = "Groups";
+    const char * clusterName = "AccessControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
-        make_unique<GroupsAddGroup>(credsIssuerConfig),              //
-        make_unique<GroupsViewGroup>(credsIssuerConfig),             //
-        make_unique<GroupsGetGroupMembership>(credsIssuerConfig),    //
-        make_unique<GroupsRemoveGroup>(credsIssuerConfig),           //
-        make_unique<GroupsRemoveAllGroups>(credsIssuerConfig),       //
-        make_unique<GroupsAddGroupIfIdentifying>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                         //
+        make_unique<ReadAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::Id,
+                                   credsIssuerConfig),                                                                     //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11574,8 +13640,21 @@ void registerClusterGroups(Commands & commands, CredentialIssuerCommands * creds
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap>>>(
-            Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::Type>>>(
+            Id, "acl", Attributes::Acl::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlExtensionStruct::Type>>>(
+            Id, "extension", Attributes::Extension::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "subjects-per-access-control-entry", 0, UINT16_MAX,
+                                              Attributes::SubjectsPerAccessControlEntry::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "targets-per-access-control-entry", 0, UINT16_MAX,
+                                              Attributes::TargetsPerAccessControlEntry::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "access-control-entries-per-fabric", 0, UINT16_MAX,
+                                              Attributes::AccessControlEntriesPerFabric::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11588,9 +13667,16 @@ void registerClusterGroups(Commands & commands, CredentialIssuerCommands * creds
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                         //
+        make_unique<SubscribeAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11600,45 +13686,49 @@ void registerClusterGroups(Commands & commands, CredentialIssuerCommands * creds
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                        //
+        make_unique<ReadEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
+                               credsIssuerConfig),          //
         make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id,
+                                    credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
+                                    credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Scenes;
+    using namespace chip::app::Clusters::Actions;
 
-    const char * clusterName = "Scenes";
+    const char * clusterName = "Actions";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
-        make_unique<ScenesAddScene>(credsIssuerConfig),           //
-        make_unique<ScenesViewScene>(credsIssuerConfig),          //
-        make_unique<ScenesRemoveScene>(credsIssuerConfig),        //
-        make_unique<ScenesRemoveAllScenes>(credsIssuerConfig),    //
-        make_unique<ScenesStoreScene>(credsIssuerConfig),         //
-        make_unique<ScenesRecallScene>(credsIssuerConfig),        //
-        make_unique<ScenesGetSceneMembership>(credsIssuerConfig), //
-        make_unique<ScenesEnhancedAddScene>(credsIssuerConfig),   //
-        make_unique<ScenesEnhancedViewScene>(credsIssuerConfig),  //
-        make_unique<ScenesCopyScene>(credsIssuerConfig),          //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<ActionsInstantAction>(credsIssuerConfig),               //
+        make_unique<ActionsInstantActionWithTransition>(credsIssuerConfig), //
+        make_unique<ActionsStartAction>(credsIssuerConfig),                 //
+        make_unique<ActionsStartActionWithDuration>(credsIssuerConfig),     //
+        make_unique<ActionsStopAction>(credsIssuerConfig),                  //
+        make_unique<ActionsPauseAction>(credsIssuerConfig),                 //
+        make_unique<ActionsPauseActionWithDuration>(credsIssuerConfig),     //
+        make_unique<ActionsResumeAction>(credsIssuerConfig),                //
+        make_unique<ActionsEnableAction>(credsIssuerConfig),                //
+        make_unique<ActionsEnableActionWithDuration>(credsIssuerConfig),    //
+        make_unique<ActionsDisableAction>(credsIssuerConfig),               //
+        make_unique<ActionsDisableActionWithDuration>(credsIssuerConfig),   //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "scene-table-size", Attributes::SceneTableSize::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "remaining-capacity", Attributes::RemainingCapacity::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11646,23 +13736,14 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint8_t>>(Id, "scene-count", 0, UINT8_MAX, Attributes::SceneCount::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-scene", 0, UINT8_MAX, Attributes::CurrentScene::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::GroupId>>(Id, "current-group", 0, UINT16_MAX, Attributes::CurrentGroup::Id,
-                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "scene-valid", 0, 1, Attributes::SceneValid::Id, WriteCommandType::kForceWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::NodeId>>>(
-            Id, "last-configured-by", 0, UINT64_MAX, Attributes::LastConfiguredBy::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "scene-table-size", 0, UINT16_MAX, Attributes::SceneTableSize::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "remaining-capacity", 0, UINT8_MAX, Attributes::RemainingCapacity::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::ActionStruct::Type>>>(
+            Id, "action-list", Attributes::ActionList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::EndpointListStruct::Type>>>(
+            Id, "endpoint-lists", Attributes::EndpointLists::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "setup-url", Attributes::SetupURL::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11677,14 +13758,9 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "scene-table-size", Attributes::SceneTableSize::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "remaining-capacity", Attributes::RemainingCapacity::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig),                          //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11694,55 +13770,108 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                 //
+        make_unique<ReadEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                            //
+        make_unique<SubscribeEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OnOff;
+    using namespace chip::app::Clusters::BasicInformation;
 
-    const char * clusterName = "OnOff";
+    const char * clusterName = "BasicInformation";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<OnOffOff>(credsIssuerConfig),                     //
-        make_unique<OnOffOn>(credsIssuerConfig),                      //
-        make_unique<OnOffToggle>(credsIssuerConfig),                  //
-        make_unique<OnOffOffWithEffect>(credsIssuerConfig),           //
-        make_unique<OnOffOnWithRecallGlobalScene>(credsIssuerConfig), //
-        make_unique<OnOffOnWithTimedOff>(credsIssuerConfig),          //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),              //
+        make_unique<BasicInformationMfgSpecificPing>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<bool>>(Id, "on-off", 0, 1, Attributes::OnOff::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<ReadAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "specification-version", Attributes::SpecificationVersion::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "max-paths-per-invoke", Attributes::MaxPathsPerInvoke::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteAttribute<uint16_t>>(Id, "data-model-revision", 0, UINT16_MAX, Attributes::DataModelRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::VendorId>>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "product-id", 0, UINT16_MAX, Attributes::ProductID::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "location", Attributes::Location::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "software-version-string", Attributes::SoftwareVersionString::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-label", Attributes::ProductLabel::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "serial-number", Attributes::SerialNumber::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "local-config-disabled", 0, 1, Attributes::LocalConfigDisabled::Id,
+                                          WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite,
                                           credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "global-scene-control", 0, 1, Attributes::GlobalSceneControl::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "on-time", 0, UINT16_MAX, Attributes::OnTime::Id, WriteCommandType::kWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "off-wait-time", 0, UINT16_MAX, Attributes::OffWaitTime::Id,
-                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum>>>(
-            Id, "start-up-on-off", 0, UINT8_MAX, Attributes::StartUpOnOff::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::Type>>(
+            Id, "capability-minima", Attributes::CapabilityMinima::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type>>(
+            Id, "product-appearance", Attributes::ProductAppearance::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "specification-version", 0, UINT32_MAX, Attributes::SpecificationVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "max-paths-per-invoke", 0, UINT16_MAX, Attributes::MaxPathsPerInvoke::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11755,45 +13884,72 @@ void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsI
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "specification-version", Attributes::SpecificationVersion::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "max-paths-per-invoke", Attributes::MaxPathsPerInvoke::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
+        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
+        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
+        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
+    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
 
-    const char * clusterName = "OnOffSwitchConfiguration";
+    const char * clusterName = "OtaSoftwareUpdateProvider";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
+        make_unique<OtaSoftwareUpdateProviderQueryImage>(credsIssuerConfig),          //
+        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(credsIssuerConfig),  //
+        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "switch-actions", Attributes::SwitchActions::Id, credsIssuerConfig),                //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11801,10 +13957,6 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssu
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint8_t>>(Id, "switch-type", 0, UINT8_MAX, Attributes::SwitchType::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "switch-actions", 0, UINT8_MAX, Attributes::SwitchActions::Id,
-                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11819,8 +13971,6 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssu
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "switch-actions", Attributes::SwitchActions::Id, credsIssuerConfig),                //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11836,44 +13986,26 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssu
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LevelControl;
+    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
 
-    const char * clusterName = "LevelControl";
+    const char * clusterName = "OtaSoftwareUpdateRequestor";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<LevelControlMoveToLevel>(credsIssuerConfig),            //
-        make_unique<LevelControlMove>(credsIssuerConfig),                   //
-        make_unique<LevelControlStep>(credsIssuerConfig),                   //
-        make_unique<LevelControlStop>(credsIssuerConfig),                   //
-        make_unique<LevelControlMoveToLevelWithOnOff>(credsIssuerConfig),   //
-        make_unique<LevelControlMoveWithOnOff>(credsIssuerConfig),          //
-        make_unique<LevelControlStepWithOnOff>(credsIssuerConfig),          //
-        make_unique<LevelControlStopWithOnOff>(credsIssuerConfig),          //
-        make_unique<LevelControlMoveToClosestFrequency>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
+        make_unique<OtaSoftwareUpdateRequestorAnnounceOTAProvider>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11881,37 +14013,16 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "current-level", 0, UINT8_MAX, Attributes::CurrentLevel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "remaining-time", 0, UINT16_MAX, Attributes::RemainingTime::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "current-frequency", 0, UINT16_MAX, Attributes::CurrentFrequency::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "min-frequency", 0, UINT16_MAX, Attributes::MinFrequency::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "max-frequency", 0, UINT16_MAX, Attributes::MaxFrequency::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions>>>(
-            Id, "options", 0, UINT8_MAX, Attributes::Options::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "on-off-transition-time", 0, UINT16_MAX, Attributes::OnOffTransitionTime::Id,
-                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-level", 0, UINT8_MAX, Attributes::OnLevel::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "on-transition-time", 0, UINT16_MAX,
-                                                                              Attributes::OnTransitionTime::Id,
-                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "off-transition-time", 0, UINT16_MAX,
-                                                                              Attributes::OffTransitionTime::Id,
-                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "default-move-rate", 0, UINT8_MAX, Attributes::DefaultMoveRate::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "start-up-current-level", 0, UINT8_MAX,
-                                                                             Attributes::StartUpCurrentLevel::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type>>>(
+            Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "update-possible", 0, 1, Attributes::UpdatePossible::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum>>(
+            Id, "update-state", 0, UINT8_MAX, Attributes::UpdateState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "update-state-progress", 0, UINT8_MAX,
+                                                                             Attributes::UpdateStateProgress::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -11926,20 +14037,10 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands *
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -11949,17 +14050,23 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands *
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                       //
+        make_unique<ReadEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                  //
+        make_unique<SubscribeEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),     //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLocalizationConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BinaryInputBasic;
+    using namespace chip::app::Clusters::LocalizationConfiguration;
 
-    const char * clusterName = "BinaryInputBasic";
+    const char * clusterName = "LocalizationConfiguration";
 
     commands_list clusterCommands = {
         //
@@ -11970,40 +14077,19 @@ void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerComman
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig),          //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "active-text", Attributes::ActiveText::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "inactive-text", Attributes::InactiveText::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "out-of-service", 0, 1, Attributes::OutOfService::Id, WriteCommandType::kWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "polarity", 0, UINT8_MAX, Attributes::Polarity::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "present-value", 0, 1, Attributes::PresentValue::Id, WriteCommandType::kWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "reliability", 0, UINT8_MAX, Attributes::Reliability::Id, WriteCommandType::kWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "status-flags", 0, UINT8_MAX, Attributes::StatusFlags::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "application-type", 0, UINT32_MAX, Attributes::ApplicationType::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "active-locale", Attributes::ActiveLocale::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
+            Id, "supported-locales", Attributes::SupportedLocales::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12018,15 +14104,8 @@ void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerComman
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig),          //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12042,11 +14121,11 @@ void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerComman
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PulseWidthModulation;
+    using namespace chip::app::Clusters::TimeFormatLocalization;
 
-    const char * clusterName = "PulseWidthModulation";
+    const char * clusterName = "TimeFormatLocalization";
 
     commands_list clusterCommands = {
         //
@@ -12056,14 +14135,26 @@ void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCo
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
+        make_unique<WriteAttribute<chip::app::Clusters::TimeFormatLocalization::HourFormatEnum>>(
+            Id, "hour-format", 0, UINT8_MAX, Attributes::HourFormat::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum>>(
+            Id, "active-calendar-type", 0, UINT8_MAX, Attributes::ActiveCalendarType::Id, WriteCommandType::kWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum>>>(
+            Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12076,8 +14167,12 @@ void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCo
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
+        make_unique<SubscribeAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12093,11 +14188,11 @@ void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCo
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Descriptor;
+    using namespace chip::app::Clusters::UnitLocalization;
 
-    const char * clusterName = "Descriptor";
+    const char * clusterName = "UnitLocalization";
 
     commands_list clusterCommands = {
         //
@@ -12108,11 +14203,7 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "tag-list", Attributes::TagList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),            //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12120,18 +14211,8 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type>>>(
-            Id, "device-type-list", Attributes::DeviceTypeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ClusterId>>>(
-            Id, "server-list", Attributes::ServerList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ClusterId>>>(
-            Id, "client-list", Attributes::ClientList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
-            Id, "parts-list", Attributes::PartsList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::Type>>>(
-            Id, "tag-list", Attributes::TagList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::UnitLocalization::TempUnitEnum>>(
+            Id, "temperature-unit", 0, UINT8_MAX, Attributes::TemperatureUnit::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12146,11 +14227,7 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "tag-list", Attributes::TagList::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),            //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12166,11 +14243,11 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Binding;
+    using namespace chip::app::Clusters::PowerSourceConfiguration;
 
-    const char * clusterName = "Binding";
+    const char * clusterName = "PowerSourceConfiguration";
 
     commands_list clusterCommands = {
         //
@@ -12181,7 +14258,7 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "binding", Attributes::Binding::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12189,9 +14266,8 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type>>>(
-            Id, "binding", Attributes::Binding::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
+            Id, "sources", Attributes::Sources::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12206,7 +14282,7 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "binding", Attributes::Binding::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                             //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12222,11 +14298,11 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AccessControl;
+    using namespace chip::app::Clusters::PowerSource;
 
-    const char * clusterName = "AccessControl";
+    const char * clusterName = "PowerSource";
 
     commands_list clusterCommands = {
         //
@@ -12236,37 +14312,129 @@ void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                         //
-        make_unique<ReadAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                             //
+        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
                                    credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::Id,
+        make_unique<ReadAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
                                    credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::Type>>>(
-            Id, "acl", Attributes::Acl::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlExtensionStruct::Type>>>(
-            Id, "extension", Attributes::Extension::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "subjects-per-access-control-entry", 0, UINT16_MAX,
-                                              Attributes::SubjectsPerAccessControlEntry::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "targets-per-access-control-entry", 0, UINT16_MAX,
-                                              Attributes::TargetsPerAccessControlEntry::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "access-control-entries-per-fabric", 0, UINT16_MAX,
-                                              Attributes::AccessControlEntriesPerFabric::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "bat-voltage", Attributes::BatVoltage::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "bat-percent-remaining", Attributes::BatPercentRemaining::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "bat-time-remaining", Attributes::BatTimeRemaining::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "bat-charge-level", Attributes::BatChargeLevel::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "bat-replacement-needed", Attributes::BatReplacementNeeded::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "bat-replaceability", Attributes::BatReplaceability::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "bat-present", Attributes::BatPresent::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "bat-common-designation", Attributes::BatCommonDesignation::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "bat-approved-chemistry", Attributes::BatApprovedChemistry::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "bat-capacity", Attributes::BatCapacity::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "bat-quantity", Attributes::BatQuantity::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "bat-charge-state", Attributes::BatChargeState::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "bat-time-to-full-charge", Attributes::BatTimeToFullCharge::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "bat-functional-while-charging", Attributes::BatFunctionalWhileCharging::Id,
+                                   credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "bat-charging-current", Attributes::BatChargingCurrent::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                 //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::PowerSourceStatusEnum>>(
+            Id, "status", 0, UINT8_MAX, Attributes::Status::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "order", 0, UINT8_MAX, Attributes::Order::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "wired-assessed-input-voltage", 0, UINT32_MAX,
+                                                                              Attributes::WiredAssessedInputVoltage::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "wired-assessed-input-frequency", 0, UINT16_MAX,
+                                                                              Attributes::WiredAssessedInputFrequency::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::WiredCurrentTypeEnum>>(
+            Id, "wired-current-type", 0, UINT8_MAX, Attributes::WiredCurrentType::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "wired-assessed-current", 0, UINT32_MAX,
+                                                                              Attributes::WiredAssessedCurrent::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "wired-nominal-voltage", 0, UINT32_MAX, Attributes::WiredNominalVoltage::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "wired-maximum-current", 0, UINT32_MAX, Attributes::WiredMaximumCurrent::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "wired-present", 0, 1, Attributes::WiredPresent::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::WiredFaultEnum>>>(
+            Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
+            Id, "bat-voltage", 0, UINT32_MAX, Attributes::BatVoltage::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "bat-percent-remaining", 0, UINT8_MAX,
+                                                                             Attributes::BatPercentRemaining::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-time-remaining", 0, UINT32_MAX,
+                                                                              Attributes::BatTimeRemaining::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatChargeLevelEnum>>(
+            Id, "bat-charge-level", 0, UINT8_MAX, Attributes::BatChargeLevel::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "bat-replacement-needed", 0, 1, Attributes::BatReplacementNeeded::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatReplaceabilityEnum>>(
+            Id, "bat-replaceability", 0, UINT8_MAX, Attributes::BatReplaceability::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "bat-present", 0, 1, Attributes::BatPresent::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::BatFaultEnum>>>(
+            Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatCommonDesignationEnum>>(
+            Id, "bat-common-designation", 0, UINT16_MAX, Attributes::BatCommonDesignation::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatApprovedChemistryEnum>>(
+            Id, "bat-approved-chemistry", 0, UINT16_MAX, Attributes::BatApprovedChemistry::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "bat-capacity", 0, UINT32_MAX, Attributes::BatCapacity::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "bat-quantity", 0, UINT8_MAX, Attributes::BatQuantity::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatChargeStateEnum>>(
+            Id, "bat-charge-state", 0, UINT8_MAX, Attributes::BatChargeState::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-time-to-full-charge", 0, UINT32_MAX,
+                                                                              Attributes::BatTimeToFullCharge::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "bat-functional-while-charging", 0, 1, Attributes::BatFunctionalWhileCharging::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-charging-current", 0, UINT32_MAX,
+                                                                              Attributes::BatChargingCurrent::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::BatChargeFaultEnum>>>(
+            Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
+            Id, "endpoint-list", Attributes::EndpointList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12279,16 +14447,45 @@ void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                         //
-        make_unique<SubscribeAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                             //
+        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::Id,
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "bat-voltage", Attributes::BatVoltage::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "bat-percent-remaining", Attributes::BatPercentRemaining::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "bat-time-remaining", Attributes::BatTimeRemaining::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "bat-charge-level", Attributes::BatChargeLevel::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "bat-replacement-needed", Attributes::BatReplacementNeeded::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "bat-replaceability", Attributes::BatReplaceability::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "bat-present", Attributes::BatPresent::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "bat-common-designation", Attributes::BatCommonDesignation::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "bat-approved-chemistry", Attributes::BatApprovedChemistry::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "bat-capacity", Attributes::BatCapacity::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "bat-quantity", Attributes::BatQuantity::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "bat-charge-state", Attributes::BatChargeState::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "bat-time-to-full-charge", Attributes::BatTimeToFullCharge::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "bat-functional-while-charging", Attributes::BatFunctionalWhileCharging::Id,
+                                        credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "bat-charging-current", Attributes::BatChargingCurrent::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id,
                                         credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                  //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12298,49 +14495,42 @@ void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                        //
-        make_unique<ReadEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id, credsIssuerConfig), //
-        make_unique<ReadEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
-                               credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id,
-                                    credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
-                                    credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                   //
+        make_unique<ReadEvent>(Id, "wired-fault-change", Events::WiredFaultChange::Id, credsIssuerConfig),               //
+        make_unique<ReadEvent>(Id, "bat-fault-change", Events::BatFaultChange::Id, credsIssuerConfig),                   //
+        make_unique<ReadEvent>(Id, "bat-charge-fault-change", Events::BatChargeFaultChange::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<SubscribeEvent>(Id, "wired-fault-change", Events::WiredFaultChange::Id, credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, "bat-fault-change", Events::BatFaultChange::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, "bat-charge-fault-change", Events::BatChargeFaultChange::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Actions;
+    using namespace chip::app::Clusters::GeneralCommissioning;
 
-    const char * clusterName = "Actions";
+    const char * clusterName = "GeneralCommissioning";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<ActionsInstantAction>(credsIssuerConfig),               //
-        make_unique<ActionsInstantActionWithTransition>(credsIssuerConfig), //
-        make_unique<ActionsStartAction>(credsIssuerConfig),                 //
-        make_unique<ActionsStartActionWithDuration>(credsIssuerConfig),     //
-        make_unique<ActionsStopAction>(credsIssuerConfig),                  //
-        make_unique<ActionsPauseAction>(credsIssuerConfig),                 //
-        make_unique<ActionsPauseActionWithDuration>(credsIssuerConfig),     //
-        make_unique<ActionsResumeAction>(credsIssuerConfig),                //
-        make_unique<ActionsEnableAction>(credsIssuerConfig),                //
-        make_unique<ActionsEnableActionWithDuration>(credsIssuerConfig),    //
-        make_unique<ActionsDisableAction>(credsIssuerConfig),               //
-        make_unique<ActionsDisableActionWithDuration>(credsIssuerConfig),   //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
+        make_unique<GeneralCommissioningArmFailSafe>(credsIssuerConfig),           //
+        make_unique<GeneralCommissioningSetRegulatoryConfig>(credsIssuerConfig),   //
+        make_unique<GeneralCommissioningCommissioningComplete>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id,
+                                   credsIssuerConfig),                                                                     //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12348,14 +14538,19 @@ void registerClusterActions(Commands & commands, CredentialIssuerCommands * cred
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::ActionStruct::Type>>>(
-            Id, "action-list", Attributes::ActionList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::EndpointListStruct::Type>>>(
-            Id, "endpoint-lists", Attributes::EndpointLists::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "setup-url", Attributes::SetupURL::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "breadcrumb", 0, UINT64_MAX, Attributes::Breadcrumb::Id, WriteCommandType::kWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::Type>>(
+            Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum>>(
+            Id, "regulatory-config", 0, UINT8_MAX, Attributes::RegulatoryConfig::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum>>(
+            Id, "location-capability", 0, UINT8_MAX, Attributes::LocationCapability::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "supports-concurrent-connection", 0, 1, Attributes::SupportsConcurrentConnection::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12368,11 +14563,15 @@ void registerClusterActions(Commands & commands, CredentialIssuerCommands * cred
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig),                          //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                           //
+        make_unique<SubscribeAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id,
+                                        credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12382,102 +14581,80 @@ void registerClusterActions(Commands & commands, CredentialIssuerCommands * cred
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                 //
-        make_unique<ReadEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                            //
-        make_unique<SubscribeEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BasicInformation;
+    using namespace chip::app::Clusters::NetworkCommissioning;
 
-    const char * clusterName = "BasicInformation";
+    const char * clusterName = "NetworkCommissioning";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),              //
-        make_unique<BasicInformationMfgSpecificPing>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
+        make_unique<NetworkCommissioningScanNetworks>(credsIssuerConfig),             //
+        make_unique<NetworkCommissioningAddOrUpdateWiFiNetwork>(credsIssuerConfig),   //
+        make_unique<NetworkCommissioningAddOrUpdateThreadNetwork>(credsIssuerConfig), //
+        make_unique<NetworkCommissioningRemoveNetwork>(credsIssuerConfig),            //
+        make_unique<NetworkCommissioningConnectNetwork>(credsIssuerConfig),           //
+        make_unique<NetworkCommissioningReorderNetwork>(credsIssuerConfig),           //
+        make_unique<NetworkCommissioningQueryIdentity>(credsIssuerConfig),            //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<ReadAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteAttribute<uint16_t>>(Id, "data-model-revision", 0, UINT16_MAX, Attributes::DataModelRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::VendorId>>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "product-id", 0, UINT16_MAX, Attributes::ProductID::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "location", Attributes::Location::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "software-version-string", Attributes::SoftwareVersionString::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-label", Attributes::ProductLabel::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "serial-number", Attributes::SerialNumber::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "local-config-disabled", 0, 1, Attributes::LocalConfigDisabled::Id,
-                                          WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
+        make_unique<WriteAttribute<uint8_t>>(Id, "max-networks", 0, UINT8_MAX, Attributes::MaxNetworks::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type>>>(
+            Id, "networks", Attributes::Networks::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "scan-max-time-seconds", 0, UINT8_MAX, Attributes::ScanMaxTimeSeconds::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "connect-max-time-seconds", 0, UINT8_MAX, Attributes::ConnectMaxTimeSeconds::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "interface-enabled", 0, 1, Attributes::InterfaceEnabled::Id, WriteCommandType::kWrite,
                                           credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::Type>>(
-            Id, "capability-minima", Attributes::CapabilityMinima::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type>>(
-            Id, "product-appearance", Attributes::ProductAppearance::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<
+            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum>>>(
+            Id, "last-networking-status", 0, UINT8_MAX, Attributes::LastNetworkingStatus::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
+            Id, "last-network-id", Attributes::LastNetworkID::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int32_t>>>(Id, "last-connect-error-value", INT32_MIN, INT32_MAX,
+                                                                             Attributes::LastConnectErrorValue::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::WiFiBandEnum>>>(
+            Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>>(
+            Id, "supported-thread-features", 0, UINT16_MAX, Attributes::SupportedThreadFeatures::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "thread-version", 0, UINT16_MAX, Attributes::ThreadVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12490,66 +14667,49 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id,
+                                        credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
-        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
-        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
-        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
+    using namespace chip::app::Clusters::DiagnosticLogs;
 
-    const char * clusterName = "OtaSoftwareUpdateProvider";
+    const char * clusterName = "DiagnosticLogs";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
-        make_unique<OtaSoftwareUpdateProviderQueryImage>(credsIssuerConfig),          //
-        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(credsIssuerConfig),  //
-        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
+        make_unique<DiagnosticLogsRetrieveLogsRequest>(credsIssuerConfig), //
         //
         // Attributes
         //
@@ -12590,26 +14750,33 @@ void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIss
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
+    using namespace chip::app::Clusters::GeneralDiagnostics;
 
-    const char * clusterName = "OtaSoftwareUpdateRequestor";
+    const char * clusterName = "GeneralDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
-        make_unique<OtaSoftwareUpdateRequestorAnnounceOTAProvider>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<GeneralDiagnosticsTestEventTrigger>(credsIssuerConfig), //
+        make_unique<GeneralDiagnosticsTimeSnapshot>(credsIssuerConfig),     //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<ReadAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::Id,
+                                   credsIssuerConfig),                                                                     //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12618,15 +14785,28 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type>>>(
-            Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "update-possible", 0, 1, Attributes::UpdatePossible::Id,
+            chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type>>>(
+            Id, "network-interfaces", Attributes::NetworkInterfaces::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "reboot-count", 0, UINT16_MAX, Attributes::RebootCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "up-time", 0, UINT64_MAX, Attributes::UpTime::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "total-operational-hours", 0, UINT32_MAX, Attributes::TotalOperationalHours::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::GeneralDiagnostics::BootReasonEnum>>(
+            Id, "boot-reason", 0, UINT8_MAX, Attributes::BootReason::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>>>(
+            Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>>>(
+            Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>>>(
+            Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "test-event-triggers-enabled", 0, 1, Attributes::TestEventTriggersEnabled::Id,
                                           WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum>>(
-            Id, "update-state", 0, UINT8_MAX, Attributes::UpdateState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "update-state-progress", 0, UINT8_MAX,
-                                                                             Attributes::UpdateStateProgress::Id,
-                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12639,12 +14819,18 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig),   //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12654,46 +14840,333 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                       //
-        make_unique<ReadEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                  //
-        make_unique<SubscribeEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),     //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                //
+        make_unique<ReadEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                           //
+        make_unique<SubscribeEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                    //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+}
+void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::SoftwareDiagnostics;
+
+    const char * clusterName = "SoftwareDiagnostics";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<SoftwareDiagnosticsResetWatermarks>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                       //
+        make_unique<ReadAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type>>>(
+            Id, "thread-metrics", Attributes::ThreadMetrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-free", 0, UINT64_MAX, Attributes::CurrentHeapFree::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-used", 0, UINT64_MAX, Attributes::CurrentHeapUsed::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-high-watermark", 0, UINT64_MAX,
+                                              Attributes::CurrentHeapHighWatermark::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
+            Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EventId>>>(
+            Id, "event-list", Attributes::EventList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::AttributeId>>>(
+            Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                       //
+        make_unique<SubscribeAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                   //
+        make_unique<ReadEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                              //
+        make_unique<SubscribeEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterLocalizationConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LocalizationConfiguration;
+    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
 
-    const char * clusterName = "LocalizationConfiguration";
+    const char * clusterName = "ThreadNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                  //
+        make_unique<ThreadNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "active-locale", Attributes::ActiveLocale::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
-            Id, "supported-locales", Attributes::SupportedLocales::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                     //
+        make_unique<ReadAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "better-partition-attach-attempt-count", Attributes::BetterPartitionAttachAttemptCount::Id,
+                                   credsIssuerConfig),                                                                         //
+        make_unique<ReadAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
+                                   credsIssuerConfig),                                                                          //
+        make_unique<ReadAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
+                                   credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
+                                   credsIssuerConfig),                                                            //
+        make_unique<ReadAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
+                                   credsIssuerConfig),                                                                            //
+        make_unique<ReadAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "channel", 0, UINT16_MAX, Attributes::Channel::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum>>>(
+            Id, "routing-role", 0, UINT8_MAX, Attributes::RoutingRole::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
+            Id, "network-name", Attributes::NetworkName::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "pan-id", 0, UINT16_MAX, Attributes::PanId::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "extended-pan-id", 0, UINT64_MAX,
+                                                                              Attributes::ExtendedPanId::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
+            Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type>>>(
+            Id, "neighbor-table", Attributes::NeighborTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type>>>(
+            Id, "route-table", Attributes::RouteTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
+            Id, "partition-id", 0, UINT32_MAX, Attributes::PartitionId::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(
+            Id, "weighting", 0, UINT16_MAX, Attributes::Weighting::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(
+            Id, "data-version", 0, UINT16_MAX, Attributes::DataVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "stable-data-version", 0, UINT16_MAX,
+                                                                              Attributes::StableDataVersion::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "leader-router-id", 0, UINT8_MAX,
+                                                                             Attributes::LeaderRouterId::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "detached-role-count", 0, UINT16_MAX, Attributes::DetachedRoleCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "child-role-count", 0, UINT16_MAX, Attributes::ChildRoleCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "router-role-count", 0, UINT16_MAX, Attributes::RouterRoleCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "leader-role-count", 0, UINT16_MAX, Attributes::LeaderRoleCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "attach-attempt-count", 0, UINT16_MAX, Attributes::AttachAttemptCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "partition-id-change-count", 0, UINT16_MAX,
+                                              Attributes::PartitionIdChangeCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "better-partition-attach-attempt-count", 0, UINT16_MAX,
+                                              Attributes::BetterPartitionAttachAttemptCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "parent-change-count", 0, UINT16_MAX, Attributes::ParentChangeCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-total-count", 0, UINT32_MAX, Attributes::TxTotalCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-unicast-count", 0, UINT32_MAX, Attributes::TxUnicastCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-broadcast-count", 0, UINT32_MAX, Attributes::TxBroadcastCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-ack-requested-count", 0, UINT32_MAX, Attributes::TxAckRequestedCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-acked-count", 0, UINT32_MAX, Attributes::TxAckedCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-no-ack-requested-count", 0, UINT32_MAX, Attributes::TxNoAckRequestedCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-data-count", 0, UINT32_MAX, Attributes::TxDataCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-data-poll-count", 0, UINT32_MAX, Attributes::TxDataPollCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-beacon-count", 0, UINT32_MAX, Attributes::TxBeaconCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-beacon-request-count", 0, UINT32_MAX, Attributes::TxBeaconRequestCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-other-count", 0, UINT32_MAX, Attributes::TxOtherCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-retry-count", 0, UINT32_MAX, Attributes::TxRetryCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-direct-max-retry-expiry-count", 0, UINT32_MAX,
+                                              Attributes::TxDirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-indirect-max-retry-expiry-count", 0, UINT32_MAX,
+                                              Attributes::TxIndirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-cca-count", 0, UINT32_MAX, Attributes::TxErrCcaCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-abort-count", 0, UINT32_MAX, Attributes::TxErrAbortCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-busy-channel-count", 0, UINT32_MAX, Attributes::TxErrBusyChannelCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-total-count", 0, UINT32_MAX, Attributes::RxTotalCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-unicast-count", 0, UINT32_MAX, Attributes::RxUnicastCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-broadcast-count", 0, UINT32_MAX, Attributes::RxBroadcastCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-data-count", 0, UINT32_MAX, Attributes::RxDataCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-data-poll-count", 0, UINT32_MAX, Attributes::RxDataPollCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-beacon-count", 0, UINT32_MAX, Attributes::RxBeaconCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-beacon-request-count", 0, UINT32_MAX, Attributes::RxBeaconRequestCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-other-count", 0, UINT32_MAX, Attributes::RxOtherCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-address-filtered-count", 0, UINT32_MAX,
+                                              Attributes::RxAddressFilteredCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-dest-addr-filtered-count", 0, UINT32_MAX,
+                                              Attributes::RxDestAddrFilteredCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-duplicated-count", 0, UINT32_MAX, Attributes::RxDuplicatedCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-no-frame-count", 0, UINT32_MAX, Attributes::RxErrNoFrameCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-unknown-neighbor-count", 0, UINT32_MAX,
+                                              Attributes::RxErrUnknownNeighborCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-invalid-src-addr-count", 0, UINT32_MAX,
+                                              Attributes::RxErrInvalidSrcAddrCount::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-sec-count", 0, UINT32_MAX, Attributes::RxErrSecCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-fcs-count", 0, UINT32_MAX, Attributes::RxErrFcsCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-other-count", 0, UINT32_MAX, Attributes::RxErrOtherCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "active-timestamp", 0, UINT64_MAX,
+                                                                              Attributes::ActiveTimestamp::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "pending-timestamp", 0, UINT64_MAX,
+                                                                              Attributes::PendingTimestamp::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "delay", 0, UINT32_MAX, Attributes::Delay::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type>>>(
+            Id, "security-policy", Attributes::SecurityPolicy::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
+            Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<
+            chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>>>(
+            Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum>>>(
+            Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12705,11 +15178,84 @@ void registerClusterLocalizationConfiguration(Commands & commands, CredentialIss
             Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig),          //
+        make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
+        make_unique<SubscribeAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "better-partition-attach-attempt-count",
+                                        Attributes::BetterPartitionAttachAttemptCount::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
+                                        credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
+                                        credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
+                                        credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12719,46 +15265,86 @@ void registerClusterLocalizationConfiguration(Commands & commands, CredentialIss
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),           //
+        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TimeFormatLocalization;
+    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
 
-    const char * clusterName = "TimeFormatLocalization";
+    const char * clusterName = "WiFiNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
+        make_unique<WiFiNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
-        make_unique<WriteAttribute<chip::app::Clusters::TimeFormatLocalization::HourFormatEnum>>(
-            Id, "hour-format", 0, UINT8_MAX, Attributes::HourFormat::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum>>(
-            Id, "active-calendar-type", 0, UINT8_MAX, Attributes::ActiveCalendarType::Id, WriteCommandType::kWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum>>>(
-            Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                      //
+        make_unique<ReadAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                        //
+        make_unique<ReadAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                   //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
+            Id, "bssid", Attributes::Bssid::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum>>>(
+            Id, "security-type", 0, UINT8_MAX, Attributes::SecurityType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum>>>(
+            Id, "wi-fi-version", 0, UINT8_MAX, Attributes::WiFiVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "channel-number", 0, UINT16_MAX,
+                                                                              Attributes::ChannelNumber::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int8_t>>>(Id, "rssi", INT8_MIN, INT8_MAX, Attributes::Rssi::Id,
+                                                                            WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "beacon-lost-count", 0, UINT32_MAX,
+                                                                              Attributes::BeaconLostCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "beacon-rx-count", 0, UINT32_MAX,
+                                                                              Attributes::BeaconRxCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-multicast-rx-count", 0, UINT32_MAX,
+                                                                              Attributes::PacketMulticastRxCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-multicast-tx-count", 0, UINT32_MAX,
+                                                                              Attributes::PacketMulticastTxCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-unicast-rx-count", 0, UINT32_MAX,
+                                                                              Attributes::PacketUnicastRxCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-unicast-tx-count", 0, UINT32_MAX,
+                                                                              Attributes::PacketUnicastTxCount::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "current-max-rate", 0, UINT64_MAX,
+                                                                              Attributes::CurrentMaxRate::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(
+            Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12771,43 +15357,69 @@ void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuer
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
-        make_unique<SubscribeAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                       //
+        make_unique<SubscribeAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                             //
+        make_unique<ReadEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),                 //
+        make_unique<ReadEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                        //
+        make_unique<SubscribeEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),            //
+        make_unique<SubscribeEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),     //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::UnitLocalization;
+    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
 
-    const char * clusterName = "UnitLocalization";
+    const char * clusterName = "EthernetNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                    //
+        make_unique<EthernetNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),             //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12815,8 +15427,24 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::app::Clusters::UnitLocalization::TempUnitEnum>>(
-            Id, "temperature-unit", 0, UINT8_MAX, Attributes::TemperatureUnit::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>>>(
+            Id, "phyrate", 0, UINT8_MAX, Attributes::PHYRate::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<bool>>>(Id, "full-duplex", 0, 1, Attributes::FullDuplex::Id,
+                                                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "packet-rx-count", 0, UINT64_MAX, Attributes::PacketRxCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "packet-tx-count", 0, UINT64_MAX, Attributes::PacketTxCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "tx-err-count", 0, UINT64_MAX, Attributes::TxErrCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "collision-count", 0, UINT64_MAX, Attributes::CollisionCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<bool>>>(Id, "carrier-detect", 0, 1, Attributes::CarrierDetect::Id,
+                                                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint64_t>>(Id, "time-since-reset", 0, UINT64_MAX, Attributes::TimeSinceReset::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12831,7 +15459,15 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),             //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -12847,31 +15483,76 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PowerSourceConfiguration;
+    using namespace chip::app::Clusters::TimeSynchronization;
 
-    const char * clusterName = "PowerSourceConfiguration";
+    const char * clusterName = "TimeSynchronization";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                      //
+        make_unique<TimeSynchronizationSetUTCTime>(credsIssuerConfig),           //
+        make_unique<TimeSynchronizationSetTrustedTimeSource>(credsIssuerConfig), //
+        make_unique<TimeSynchronizationSetTimeZone>(credsIssuerConfig),          //
+        make_unique<TimeSynchronizationSetDSTOffset>(credsIssuerConfig),         //
+        make_unique<TimeSynchronizationSetDefaultNTP>(credsIssuerConfig),        //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const uint8_t>>>(
-            Id, "sources", Attributes::Sources::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<ReadAttribute>(Id, "utctime", Attributes::UTCTime::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "granularity", Attributes::Granularity::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "time-source", Attributes::TimeSource::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "default-ntp", Attributes::DefaultNTP::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "dstoffset", Attributes::DSTOffset::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "time-zone-database", Attributes::TimeZoneDatabase::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "ntpserver-available", Attributes::NTPServerAvailable::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "time-zone-list-max-size", Attributes::TimeZoneListMaxSize::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "dstoffset-list-max-size", Attributes::DSTOffsetListMaxSize::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "supports-dnsresolve", Attributes::SupportsDNSResolve::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                               //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "utctime", 0, UINT64_MAX, Attributes::UTCTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::GranularityEnum>>(
+            Id, "granularity", 0, UINT8_MAX, Attributes::Granularity::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::TimeSourceEnum>>(
+            Id, "time-source", 0, UINT8_MAX, Attributes::TimeSource::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::Nullable<chip::app::Clusters::TimeSynchronization::Structs::TrustedTimeSourceStruct::Type>>>(
+            Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
+            Id, "default-ntp", Attributes::DefaultNTP::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>>>(
+            Id, "time-zone", Attributes::TimeZone::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type>>>(
+            Id, "dstoffset", Attributes::DSTOffset::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(
+            Id, "local-time", 0, UINT64_MAX, Attributes::LocalTime::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum>>(
+            Id, "time-zone-database", 0, UINT8_MAX, Attributes::TimeZoneDatabase::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "ntpserver-available", 0, 1, Attributes::NTPServerAvailable::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "time-zone-list-max-size", 0, UINT8_MAX, Attributes::TimeZoneListMaxSize::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "dstoffset-list-max-size", 0, UINT8_MAX, Attributes::DSTOffsetListMaxSize::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "supports-dnsresolve", 0, 1, Attributes::SupportsDNSResolve::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -12884,29 +15565,51 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "utctime", Attributes::UTCTime::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "granularity", Attributes::Granularity::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "time-source", Attributes::TimeSource::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "default-ntp", Attributes::DefaultNTP::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "dstoffset", Attributes::DSTOffset::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "time-zone-database", Attributes::TimeZoneDatabase::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "ntpserver-available", Attributes::NTPServerAvailable::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "time-zone-list-max-size", Attributes::TimeZoneListMaxSize::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "dstoffset-list-max-size", Attributes::DSTOffsetListMaxSize::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supports-dnsresolve", Attributes::SupportsDNSResolve::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                           //
+        make_unique<ReadEvent>(Id, "dsttable-empty", Events::DSTTableEmpty::Id, credsIssuerConfig),                              //
+        make_unique<ReadEvent>(Id, "dststatus", Events::DSTStatus::Id, credsIssuerConfig),                                       //
+        make_unique<ReadEvent>(Id, "time-zone-status", Events::TimeZoneStatus::Id, credsIssuerConfig),                           //
+        make_unique<ReadEvent>(Id, "time-failure", Events::TimeFailure::Id, credsIssuerConfig),                                  //
+        make_unique<ReadEvent>(Id, "missing-trusted-time-source", Events::MissingTrustedTimeSource::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                      //
+        make_unique<SubscribeEvent>(Id, "dsttable-empty", Events::DSTTableEmpty::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeEvent>(Id, "dststatus", Events::DSTStatus::Id, credsIssuerConfig),                                  //
+        make_unique<SubscribeEvent>(Id, "time-zone-status", Events::TimeZoneStatus::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeEvent>(Id, "time-failure", Events::TimeFailure::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeEvent>(Id, "missing-trusted-time-source", Events::MissingTrustedTimeSource::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBridgedDeviceBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PowerSource;
+    using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
 
-    const char * clusterName = "PowerSource";
+    const char * clusterName = "BridgedDeviceBasicInformation";
 
     commands_list clusterCommands = {
         //
@@ -12916,129 +15619,63 @@ void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands *
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                             //
-        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "bat-voltage", Attributes::BatVoltage::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "bat-percent-remaining", Attributes::BatPercentRemaining::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "bat-time-remaining", Attributes::BatTimeRemaining::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "bat-charge-level", Attributes::BatChargeLevel::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "bat-replacement-needed", Attributes::BatReplacementNeeded::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "bat-replaceability", Attributes::BatReplaceability::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "bat-present", Attributes::BatPresent::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "bat-common-designation", Attributes::BatCommonDesignation::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "bat-approved-chemistry", Attributes::BatApprovedChemistry::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "bat-capacity", Attributes::BatCapacity::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "bat-quantity", Attributes::BatQuantity::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "bat-charge-state", Attributes::BatChargeState::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "bat-time-to-full-charge", Attributes::BatTimeToFullCharge::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "bat-functional-while-charging", Attributes::BatFunctionalWhileCharging::Id,
-                                   credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "bat-charging-current", Attributes::BatChargingCurrent::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                 //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::PowerSourceStatusEnum>>(
-            Id, "status", 0, UINT8_MAX, Attributes::Status::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "order", 0, UINT8_MAX, Attributes::Order::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite,
                                                     credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "wired-assessed-input-voltage", 0, UINT32_MAX,
-                                                                              Attributes::WiredAssessedInputVoltage::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "wired-assessed-input-frequency", 0, UINT16_MAX,
-                                                                              Attributes::WiredAssessedInputFrequency::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::WiredCurrentTypeEnum>>(
-            Id, "wired-current-type", 0, UINT8_MAX, Attributes::WiredCurrentType::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "wired-assessed-current", 0, UINT32_MAX,
-                                                                              Attributes::WiredAssessedCurrent::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "wired-nominal-voltage", 0, UINT32_MAX, Attributes::WiredNominalVoltage::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "wired-maximum-current", 0, UINT32_MAX, Attributes::WiredMaximumCurrent::Id,
+        make_unique<WriteAttribute<chip::VendorId>>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "wired-present", 0, 1, Attributes::WiredPresent::Id, WriteCommandType::kForceWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::WiredFaultEnum>>>(
-            Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
-            Id, "bat-voltage", 0, UINT32_MAX, Attributes::BatVoltage::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "bat-percent-remaining", 0, UINT8_MAX,
-                                                                             Attributes::BatPercentRemaining::Id,
-                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-time-remaining", 0, UINT32_MAX,
-                                                                              Attributes::BatTimeRemaining::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatChargeLevelEnum>>(
-            Id, "bat-charge-level", 0, UINT8_MAX, Attributes::BatChargeLevel::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "bat-replacement-needed", 0, 1, Attributes::BatReplacementNeeded::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatReplaceabilityEnum>>(
-            Id, "bat-replaceability", 0, UINT8_MAX, Attributes::BatReplaceability::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "bat-present", 0, 1, Attributes::BatPresent::Id, WriteCommandType::kForceWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::BatFaultEnum>>>(
-            Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "software-version-string", Attributes::SoftwareVersionString::Id,
                                                     WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatCommonDesignationEnum>>(
-            Id, "bat-common-designation", 0, UINT16_MAX, Attributes::BatCommonDesignation::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id,
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id,
                                                     WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id,
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-label", Attributes::ProductLabel::Id,
                                                     WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatApprovedChemistryEnum>>(
-            Id, "bat-approved-chemistry", 0, UINT16_MAX, Attributes::BatApprovedChemistry::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "bat-capacity", 0, UINT32_MAX, Attributes::BatCapacity::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "bat-quantity", 0, UINT8_MAX, Attributes::BatQuantity::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::PowerSource::BatChargeStateEnum>>(
-            Id, "bat-charge-state", 0, UINT8_MAX, Attributes::BatChargeState::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-time-to-full-charge", 0, UINT32_MAX,
-                                                                              Attributes::BatTimeToFullCharge::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "bat-functional-while-charging", 0, 1, Attributes::BatFunctionalWhileCharging::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "bat-charging-current", 0, UINT32_MAX,
-                                                                              Attributes::BatChargingCurrent::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "serial-number", Attributes::SerialNumber::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
         make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::PowerSource::BatChargeFaultEnum>>>(
-            Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
-            Id, "endpoint-list", Attributes::EndpointList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+            WriteAttributeAsComplex<chip::app::Clusters::BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::Type>>(
+            Id, "product-appearance", Attributes::ProductAppearance::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13051,90 +15688,65 @@ void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands *
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                             //
-        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "bat-voltage", Attributes::BatVoltage::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "bat-percent-remaining", Attributes::BatPercentRemaining::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "bat-time-remaining", Attributes::BatTimeRemaining::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "bat-charge-level", Attributes::BatChargeLevel::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "bat-replacement-needed", Attributes::BatReplacementNeeded::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "bat-replaceability", Attributes::BatReplaceability::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "bat-present", Attributes::BatPresent::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "bat-common-designation", Attributes::BatCommonDesignation::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "bat-approved-chemistry", Attributes::BatApprovedChemistry::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "bat-capacity", Attributes::BatCapacity::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "bat-quantity", Attributes::BatQuantity::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "bat-charge-state", Attributes::BatChargeState::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "bat-time-to-full-charge", Attributes::BatTimeToFullCharge::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "bat-functional-while-charging", Attributes::BatFunctionalWhileCharging::Id,
-                                        credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "bat-charging-current", Attributes::BatChargingCurrent::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                   //
-        make_unique<ReadEvent>(Id, "wired-fault-change", Events::WiredFaultChange::Id, credsIssuerConfig),               //
-        make_unique<ReadEvent>(Id, "bat-fault-change", Events::BatFaultChange::Id, credsIssuerConfig),                   //
-        make_unique<ReadEvent>(Id, "bat-charge-fault-change", Events::BatChargeFaultChange::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                              //
-        make_unique<SubscribeEvent>(Id, "wired-fault-change", Events::WiredFaultChange::Id, credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, "bat-fault-change", Events::BatFaultChange::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, "bat-charge-fault-change", Events::BatChargeFaultChange::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
+        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
+        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
+        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GeneralCommissioning;
+    using namespace chip::app::Clusters::Switch;
 
-    const char * clusterName = "GeneralCommissioning";
+    const char * clusterName = "Switch";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
-        make_unique<GeneralCommissioningArmFailSafe>(credsIssuerConfig),           //
-        make_unique<GeneralCommissioningSetRegulatoryConfig>(credsIssuerConfig),   //
-        make_unique<GeneralCommissioningCommissioningComplete>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id,
-                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig),               //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13142,19 +15754,12 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint64_t>>(Id, "breadcrumb", 0, UINT64_MAX, Attributes::Breadcrumb::Id, WriteCommandType::kWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::Type>>(
-            Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum>>(
-            Id, "regulatory-config", 0, UINT8_MAX, Attributes::RegulatoryConfig::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum>>(
-            Id, "location-capability", 0, UINT8_MAX, Attributes::LocationCapability::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "supports-concurrent-connection", 0, 1, Attributes::SupportsConcurrentConnection::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-positions", 0, UINT8_MAX, Attributes::NumberOfPositions::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-position", 0, UINT8_MAX, Attributes::CurrentPosition::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "multi-press-max", 0, UINT8_MAX, Attributes::MultiPressMax::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13167,15 +15772,11 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                           //
-        make_unique<SubscribeAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id,
-                                        credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id,
-                                        credsIssuerConfig),                                                                     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig),               //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13185,79 +15786,62 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),                 //
+        make_unique<ReadEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),                   //
+        make_unique<ReadEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                         //
+        make_unique<ReadEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),                   //
+        make_unique<ReadEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                     //
+        make_unique<ReadEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<SubscribeEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),            //
+        make_unique<SubscribeEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                //
+        make_unique<SubscribeEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterAdministratorCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::NetworkCommissioning;
+    using namespace chip::app::Clusters::AdministratorCommissioning;
 
-    const char * clusterName = "NetworkCommissioning";
+    const char * clusterName = "AdministratorCommissioning";
 
     commands_list clusterCommands = {
         //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
-        make_unique<NetworkCommissioningScanNetworks>(credsIssuerConfig),             //
-        make_unique<NetworkCommissioningAddOrUpdateWiFiNetwork>(credsIssuerConfig),   //
-        make_unique<NetworkCommissioningAddOrUpdateThreadNetwork>(credsIssuerConfig), //
-        make_unique<NetworkCommissioningRemoveNetwork>(credsIssuerConfig),            //
-        make_unique<NetworkCommissioningConnectNetwork>(credsIssuerConfig),           //
-        make_unique<NetworkCommissioningReorderNetwork>(credsIssuerConfig),           //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
-        make_unique<WriteAttribute<uint8_t>>(Id, "max-networks", 0, UINT8_MAX, Attributes::MaxNetworks::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type>>>(
-            Id, "networks", Attributes::Networks::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "scan-max-time-seconds", 0, UINT8_MAX, Attributes::ScanMaxTimeSeconds::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "connect-max-time-seconds", 0, UINT8_MAX, Attributes::ConnectMaxTimeSeconds::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "interface-enabled", 0, 1, Attributes::InterfaceEnabled::Id, WriteCommandType::kWrite,
-                                          credsIssuerConfig), //
-        make_unique<WriteAttribute<
-            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum>>>(
-            Id, "last-networking-status", 0, UINT8_MAX, Attributes::LastNetworkingStatus::Id, WriteCommandType::kForceWrite,
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                     //
+        make_unique<AdministratorCommissioningOpenCommissioningWindow>(credsIssuerConfig),      //
+        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(credsIssuerConfig), //
+        make_unique<AdministratorCommissioningRevokeCommissioning>(credsIssuerConfig),          //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>>(
+            Id, "window-status", 0, UINT8_MAX, Attributes::WindowStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::FabricIndex>>>(
+            Id, "admin-fabric-index", 0, UINT8_MAX, Attributes::AdminFabricIndex::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
-            Id, "last-network-id", Attributes::LastNetworkID::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int32_t>>>(Id, "last-connect-error-value", INT32_MIN, INT32_MAX,
-                                                                             Attributes::LastConnectErrorValue::Id,
-                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::WiFiBandEnum>>>(
-            Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>>(
-            Id, "supported-thread-features", 0, UINT16_MAX, Attributes::SupportedThreadFeatures::Id, WriteCommandType::kForceWrite,
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::VendorId>>>(
+            Id, "admin-vendor-id", 0, UINT16_MAX, Attributes::AdminVendorId::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "thread-version", 0, UINT16_MAX, Attributes::ThreadVersion::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13270,22 +15854,11 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id,
-                                        credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),               //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13301,29 +15874,57 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DiagnosticLogs;
+    using namespace chip::app::Clusters::OperationalCredentials;
 
-    const char * clusterName = "DiagnosticLogs";
+    const char * clusterName = "OperationalCredentials";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
-        make_unique<DiagnosticLogsRetrieveLogsRequest>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                              //
+        make_unique<OperationalCredentialsAttestationRequest>(credsIssuerConfig),        //
+        make_unique<OperationalCredentialsCertificateChainRequest>(credsIssuerConfig),   //
+        make_unique<OperationalCredentialsCSRRequest>(credsIssuerConfig),                //
+        make_unique<OperationalCredentialsAddNOC>(credsIssuerConfig),                    //
+        make_unique<OperationalCredentialsUpdateNOC>(credsIssuerConfig),                 //
+        make_unique<OperationalCredentialsUpdateFabricLabel>(credsIssuerConfig),         //
+        make_unique<OperationalCredentialsRemoveFabric>(credsIssuerConfig),              //
+        make_unique<OperationalCredentialsAddTrustedRootCertificate>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                         //
+        make_unique<ReadAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::Type>>>(
+            Id, "nocs", Attributes::NOCs::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptorStruct::Type>>>(
+            Id, "fabrics", Attributes::Fabrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "supported-fabrics", 0, UINT8_MAX, Attributes::SupportedFabrics::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "commissioned-fabrics", 0, UINT8_MAX, Attributes::CommissionedFabrics::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ByteSpan>>>(
+            Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-fabric-index", 0, UINT8_MAX, Attributes::CurrentFabricIndex::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13336,8 +15937,15 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig),     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13353,64 +15961,45 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GeneralDiagnostics;
+    using namespace chip::app::Clusters::GroupKeyManagement;
 
-    const char * clusterName = "GeneralDiagnostics";
+    const char * clusterName = "GroupKeyManagement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<GeneralDiagnosticsTestEventTrigger>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                     //
+        make_unique<GroupKeyManagementKeySetWrite>(credsIssuerConfig),          //
+        make_unique<GroupKeyManagementKeySetRead>(credsIssuerConfig),           //
+        make_unique<GroupKeyManagementKeySetRemove>(credsIssuerConfig),         //
+        make_unique<GroupKeyManagementKeySetReadAllIndices>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<ReadAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "average-wear-count", Attributes::AverageWearCount::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
         make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type>>>(
-            Id, "network-interfaces", Attributes::NetworkInterfaces::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "reboot-count", 0, UINT16_MAX, Attributes::RebootCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "up-time", 0, UINT64_MAX, Attributes::UpTime::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "total-operational-hours", 0, UINT32_MAX, Attributes::TotalOperationalHours::Id,
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>>>(
+            Id, "group-key-map", Attributes::GroupKeyMap::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::Type>>>(
+            Id, "group-table", Attributes::GroupTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "max-groups-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupsPerFabric::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::GeneralDiagnostics::BootReasonEnum>>(
-            Id, "boot-reason", 0, UINT8_MAX, Attributes::BootReason::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>>>(
-            Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>>>(
-            Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>>>(
-            Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "test-event-triggers-enabled", 0, 1, Attributes::TestEventTriggersEnabled::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "average-wear-count", 0, UINT32_MAX, Attributes::AverageWearCount::Id,
+        make_unique<WriteAttribute<uint16_t>>(Id, "max-group-keys-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupKeysPerFabric::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
@@ -13424,19 +16013,13 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id,
                                         credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "average-wear-count", Attributes::AverageWearCount::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13446,58 +16029,38 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                //
-        make_unique<ReadEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                           //
-        make_unique<SubscribeEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),       //
-        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                    //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SoftwareDiagnostics;
+    using namespace chip::app::Clusters::FixedLabel;
 
-    const char * clusterName = "SoftwareDiagnostics";
+    const char * clusterName = "FixedLabel";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<SoftwareDiagnosticsResetWatermarks>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                       //
-        make_unique<ReadAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id,
-                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type>>>(
-            Id, "thread-metrics", Attributes::ThreadMetrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-free", 0, UINT64_MAX, Attributes::CurrentHeapFree::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-used", 0, UINT64_MAX, Attributes::CurrentHeapUsed::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "current-heap-high-watermark", 0, UINT64_MAX,
-                                              Attributes::CurrentHeapHighWatermark::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::FixedLabel::Structs::LabelStruct::Type>>>(
+            Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13510,13 +16073,9 @@ void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCom
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                       //
-        make_unique<SubscribeAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id,
-                                        credsIssuerConfig),                                                                     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13526,253 +16085,38 @@ void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCom
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                   //
-        make_unique<ReadEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                              //
-        make_unique<SubscribeEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
+    using namespace chip::app::Clusters::UserLabel;
 
-    const char * clusterName = "ThreadNetworkDiagnostics";
+    const char * clusterName = "UserLabel";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                  //
-        make_unique<ThreadNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "better-partition-attach-attempt-count", Attributes::BetterPartitionAttachAttemptCount::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
-                                   credsIssuerConfig),                                                                          //
-        make_unique<ReadAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
-                                   credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
-                                   credsIssuerConfig),                                                            //
-        make_unique<ReadAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
-                                   credsIssuerConfig),                                                                            //
-        make_unique<ReadAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "channel", 0, UINT16_MAX, Attributes::Channel::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum>>>(
-            Id, "routing-role", 0, UINT8_MAX, Attributes::RoutingRole::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
-            Id, "network-name", Attributes::NetworkName::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "pan-id", 0, UINT16_MAX, Attributes::PanId::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "extended-pan-id", 0, UINT64_MAX,
-                                                                              Attributes::ExtendedPanId::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
-            Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type>>>(
-            Id, "neighbor-table", Attributes::NeighborTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type>>>(
-            Id, "route-table", Attributes::RouteTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
-            Id, "partition-id", 0, UINT32_MAX, Attributes::PartitionId::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "weighting", 0, UINT8_MAX, Attributes::Weighting::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "data-version", 0, UINT8_MAX, Attributes::DataVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "stable-data-version", 0, UINT8_MAX,
-                                                                             Attributes::StableDataVersion::Id,
-                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "leader-router-id", 0, UINT8_MAX,
-                                                                             Attributes::LeaderRouterId::Id,
-                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "detached-role-count", 0, UINT16_MAX, Attributes::DetachedRoleCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "child-role-count", 0, UINT16_MAX, Attributes::ChildRoleCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "router-role-count", 0, UINT16_MAX, Attributes::RouterRoleCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "leader-role-count", 0, UINT16_MAX, Attributes::LeaderRoleCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "attach-attempt-count", 0, UINT16_MAX, Attributes::AttachAttemptCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "partition-id-change-count", 0, UINT16_MAX,
-                                              Attributes::PartitionIdChangeCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "better-partition-attach-attempt-count", 0, UINT16_MAX,
-                                              Attributes::BetterPartitionAttachAttemptCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "parent-change-count", 0, UINT16_MAX, Attributes::ParentChangeCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-total-count", 0, UINT32_MAX, Attributes::TxTotalCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-unicast-count", 0, UINT32_MAX, Attributes::TxUnicastCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-broadcast-count", 0, UINT32_MAX, Attributes::TxBroadcastCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-ack-requested-count", 0, UINT32_MAX, Attributes::TxAckRequestedCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-acked-count", 0, UINT32_MAX, Attributes::TxAckedCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-no-ack-requested-count", 0, UINT32_MAX, Attributes::TxNoAckRequestedCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-data-count", 0, UINT32_MAX, Attributes::TxDataCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-data-poll-count", 0, UINT32_MAX, Attributes::TxDataPollCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-beacon-count", 0, UINT32_MAX, Attributes::TxBeaconCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-beacon-request-count", 0, UINT32_MAX, Attributes::TxBeaconRequestCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-other-count", 0, UINT32_MAX, Attributes::TxOtherCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-retry-count", 0, UINT32_MAX, Attributes::TxRetryCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-direct-max-retry-expiry-count", 0, UINT32_MAX,
-                                              Attributes::TxDirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-indirect-max-retry-expiry-count", 0, UINT32_MAX,
-                                              Attributes::TxIndirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-cca-count", 0, UINT32_MAX, Attributes::TxErrCcaCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-abort-count", 0, UINT32_MAX, Attributes::TxErrAbortCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "tx-err-busy-channel-count", 0, UINT32_MAX, Attributes::TxErrBusyChannelCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-total-count", 0, UINT32_MAX, Attributes::RxTotalCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-unicast-count", 0, UINT32_MAX, Attributes::RxUnicastCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-broadcast-count", 0, UINT32_MAX, Attributes::RxBroadcastCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-data-count", 0, UINT32_MAX, Attributes::RxDataCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-data-poll-count", 0, UINT32_MAX, Attributes::RxDataPollCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-beacon-count", 0, UINT32_MAX, Attributes::RxBeaconCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-beacon-request-count", 0, UINT32_MAX, Attributes::RxBeaconRequestCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-other-count", 0, UINT32_MAX, Attributes::RxOtherCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-address-filtered-count", 0, UINT32_MAX,
-                                              Attributes::RxAddressFilteredCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-dest-addr-filtered-count", 0, UINT32_MAX,
-                                              Attributes::RxDestAddrFilteredCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-duplicated-count", 0, UINT32_MAX, Attributes::RxDuplicatedCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-no-frame-count", 0, UINT32_MAX, Attributes::RxErrNoFrameCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-unknown-neighbor-count", 0, UINT32_MAX,
-                                              Attributes::RxErrUnknownNeighborCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-invalid-src-addr-count", 0, UINT32_MAX,
-                                              Attributes::RxErrInvalidSrcAddrCount::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-sec-count", 0, UINT32_MAX, Attributes::RxErrSecCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-fcs-count", 0, UINT32_MAX, Attributes::RxErrFcsCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "rx-err-other-count", 0, UINT32_MAX, Attributes::RxErrOtherCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "active-timestamp", 0, UINT64_MAX,
-                                                                              Attributes::ActiveTimestamp::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "pending-timestamp", 0, UINT64_MAX,
-                                                                              Attributes::PendingTimestamp::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "delay", 0, UINT32_MAX, Attributes::Delay::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type>>>(
-            Id, "security-policy", Attributes::SecurityPolicy::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
-            Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<
-            chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>>>(
-            Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum>>>(
-            Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type>>>(
+            Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13785,83 +16129,9 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
-        make_unique<SubscribeAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "better-partition-attach-attempt-count",
-                                        Attributes::BetterPartitionAttachAttemptCount::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
-                                        credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
-                                        credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
-                                        credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id,
-                                        credsIssuerConfig),                                                                     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -13871,86 +16141,34 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
-        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),           //
-        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
+    using namespace chip::app::Clusters::ProxyConfiguration;
 
-    const char * clusterName = "WiFiNetworkDiagnostics";
+    const char * clusterName = "ProxyConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
-        make_unique<WiFiNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                      //
-        make_unique<ReadAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                        //
-        make_unique<ReadAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                   //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::ByteSpan>>>(
-            Id, "bssid", Attributes::Bssid::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum>>>(
-            Id, "security-type", 0, UINT8_MAX, Attributes::SecurityType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum>>>(
-            Id, "wi-fi-version", 0, UINT8_MAX, Attributes::WiFiVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "channel-number", 0, UINT16_MAX,
-                                                                              Attributes::ChannelNumber::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int8_t>>>(Id, "rssi", INT8_MIN, INT8_MAX, Attributes::Rssi::Id,
-                                                                            WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "beacon-lost-count", 0, UINT32_MAX,
-                                                                              Attributes::BeaconLostCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "beacon-rx-count", 0, UINT32_MAX,
-                                                                              Attributes::BeaconRxCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-multicast-rx-count", 0, UINT32_MAX,
-                                                                              Attributes::PacketMulticastRxCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-multicast-tx-count", 0, UINT32_MAX,
-                                                                              Attributes::PacketMulticastTxCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-unicast-rx-count", 0, UINT32_MAX,
-                                                                              Attributes::PacketUnicastRxCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "packet-unicast-tx-count", 0, UINT32_MAX,
-                                                                              Attributes::PacketUnicastTxCount::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "current-max-rate", 0, UINT64_MAX,
-                                                                              Attributes::CurrentMaxRate::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(
-            Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13963,69 +16181,38 @@ void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuer
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                       //
-        make_unique<SubscribeAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                             //
-        make_unique<ReadEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),                 //
-        make_unique<ReadEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                        //
-        make_unique<SubscribeEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),            //
-        make_unique<SubscribeEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),     //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
+    using namespace chip::app::Clusters::ProxyDiscovery;
 
-    const char * clusterName = "EthernetNetworkDiagnostics";
+    const char * clusterName = "ProxyDiscovery";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                    //
-        make_unique<EthernetNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),             //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14033,24 +16220,6 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>>>(
-            Id, "phyrate", 0, UINT8_MAX, Attributes::PHYRate::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<bool>>>(Id, "full-duplex", 0, 1, Attributes::FullDuplex::Id,
-                                                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "packet-rx-count", 0, UINT64_MAX, Attributes::PacketRxCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "packet-tx-count", 0, UINT64_MAX, Attributes::PacketTxCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "tx-err-count", 0, UINT64_MAX, Attributes::TxErrCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "collision-count", 0, UINT64_MAX, Attributes::CollisionCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<bool>>>(Id, "carrier-detect", 0, 1, Attributes::CarrierDetect::Id,
-                                                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint64_t>>(Id, "time-since-reset", 0, UINT64_MAX, Attributes::TimeSinceReset::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14065,15 +16234,6 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),             //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14089,76 +16249,28 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TimeSynchronization;
+    using namespace chip::app::Clusters::ProxyValid;
 
-    const char * clusterName = "TimeSynchronization";
+    const char * clusterName = "ProxyValid";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                      //
-        make_unique<TimeSynchronizationSetUTCTime>(credsIssuerConfig),           //
-        make_unique<TimeSynchronizationSetTrustedTimeSource>(credsIssuerConfig), //
-        make_unique<TimeSynchronizationSetTimeZone>(credsIssuerConfig),          //
-        make_unique<TimeSynchronizationSetDSTOffset>(credsIssuerConfig),         //
-        make_unique<TimeSynchronizationSetDefaultNTP>(credsIssuerConfig),        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<ReadAttribute>(Id, "utctime", Attributes::UTCTime::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "granularity", Attributes::Granularity::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "time-source", Attributes::TimeSource::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "default-ntp", Attributes::DefaultNTP::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "dstoffset", Attributes::DSTOffset::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "time-zone-database", Attributes::TimeZoneDatabase::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "ntpserver-available", Attributes::NTPServerAvailable::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "time-zone-list-max-size", Attributes::TimeZoneListMaxSize::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "dstoffset-list-max-size", Attributes::DSTOffsetListMaxSize::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "supports-dnsresolve", Attributes::SupportsDNSResolve::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                               //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "utctime", 0, UINT64_MAX, Attributes::UTCTime::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::GranularityEnum>>(
-            Id, "granularity", 0, UINT8_MAX, Attributes::Granularity::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::TimeSourceEnum>>(
-            Id, "time-source", 0, UINT8_MAX, Attributes::TimeSource::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::Nullable<chip::app::Clusters::TimeSynchronization::Structs::TrustedTimeSourceStruct::Type>>>(
-            Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
-            Id, "default-ntp", Attributes::DefaultNTP::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>>>(
-            Id, "time-zone", Attributes::TimeZone::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type>>>(
-            Id, "dstoffset", Attributes::DSTOffset::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(
-            Id, "local-time", 0, UINT64_MAX, Attributes::LocalTime::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum>>(
-            Id, "time-zone-database", 0, UINT8_MAX, Attributes::TimeZoneDatabase::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "ntpserver-available", 0, 1, Attributes::NTPServerAvailable::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "time-zone-list-max-size", 0, UINT8_MAX, Attributes::TimeZoneListMaxSize::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "dstoffset-list-max-size", 0, UINT8_MAX, Attributes::DSTOffsetListMaxSize::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "supports-dnsresolve", 0, 1, Attributes::SupportsDNSResolve::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14171,51 +16283,28 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "utctime", Attributes::UTCTime::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "granularity", Attributes::Granularity::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "time-source", Attributes::TimeSource::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "trusted-time-source", Attributes::TrustedTimeSource::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "default-ntp", Attributes::DefaultNTP::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "dstoffset", Attributes::DSTOffset::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "time-zone-database", Attributes::TimeZoneDatabase::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "ntpserver-available", Attributes::NTPServerAvailable::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "time-zone-list-max-size", Attributes::TimeZoneListMaxSize::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "dstoffset-list-max-size", Attributes::DSTOffsetListMaxSize::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supports-dnsresolve", Attributes::SupportsDNSResolve::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                           //
-        make_unique<ReadEvent>(Id, "dsttable-empty", Events::DSTTableEmpty::Id, credsIssuerConfig),                              //
-        make_unique<ReadEvent>(Id, "dststatus", Events::DSTStatus::Id, credsIssuerConfig),                                       //
-        make_unique<ReadEvent>(Id, "time-zone-status", Events::TimeZoneStatus::Id, credsIssuerConfig),                           //
-        make_unique<ReadEvent>(Id, "time-failure", Events::TimeFailure::Id, credsIssuerConfig),                                  //
-        make_unique<ReadEvent>(Id, "missing-trusted-time-source", Events::MissingTrustedTimeSource::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                      //
-        make_unique<SubscribeEvent>(Id, "dsttable-empty", Events::DSTTableEmpty::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeEvent>(Id, "dststatus", Events::DSTStatus::Id, credsIssuerConfig),                                  //
-        make_unique<SubscribeEvent>(Id, "time-zone-status", Events::TimeZoneStatus::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeEvent>(Id, "time-failure", Events::TimeFailure::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeEvent>(Id, "missing-trusted-time-source", Events::MissingTrustedTimeSource::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterBridgedDeviceBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
+    using namespace chip::app::Clusters::BooleanState;
 
-    const char * clusterName = "BridgedDeviceBasicInformation";
+    const char * clusterName = "BooleanState";
 
     commands_list clusterCommands = {
         //
@@ -14225,63 +16314,17 @@ void registerClusterBridgedDeviceBasicInformation(Commands & commands, Credentia
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::VendorId>>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "software-version-string", Attributes::SoftwareVersionString::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "product-label", Attributes::ProductLabel::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "serial-number", Attributes::SerialNumber::Id,
-                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<bool>>(Id, "state-value", 0, 1, Attributes::StateValue::Id, WriteCommandType::kForceWrite,
                                           credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::Clusters::BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::Type>>(
-            Id, "product-appearance", Attributes::ProductAppearance::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14294,65 +16337,55 @@ void registerClusterBridgedDeviceBasicInformation(Commands & commands, Credentia
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                  //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
-        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
-        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
-        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                               //
+        make_unique<ReadEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                          //
+        make_unique<SubscribeEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Switch;
+    using namespace chip::app::Clusters::IcdManagement;
 
-    const char * clusterName = "Switch";
+    const char * clusterName = "IcdManagement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),             //
+        make_unique<IcdManagementRegisterClient>(credsIssuerConfig),    //
+        make_unique<IcdManagementUnregisterClient>(credsIssuerConfig),  //
+        make_unique<IcdManagementStayActiveRequest>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadAttribute>(Id, "idle-mode-duration", Attributes::IdleModeDuration::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "active-mode-duration", Attributes::ActiveModeDuration::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "user-active-mode-trigger-instruction", Attributes::UserActiveModeTriggerInstruction::Id,
+                                   credsIssuerConfig),                                                                     //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14360,12 +16393,26 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-positions", 0, UINT8_MAX, Attributes::NumberOfPositions::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-position", 0, UINT8_MAX, Attributes::CurrentPosition::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "multi-press-max", 0, UINT8_MAX, Attributes::MultiPressMax::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "idle-mode-duration", 0, UINT32_MAX, Attributes::IdleModeDuration::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "active-mode-duration", 0, UINT32_MAX, Attributes::ActiveModeDuration::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "active-mode-threshold", 0, UINT16_MAX, Attributes::ActiveModeThreshold::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::Type>>>(
+            Id, "registered-clients", Attributes::RegisteredClients::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "icdcounter", 0, UINT32_MAX, Attributes::ICDCounter::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "clients-supported-per-fabric", 0, UINT16_MAX,
+                                              Attributes::ClientsSupportedPerFabric::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>>>(
+            Id, "user-active-mode-trigger-hint", 0, UINT32_MAX, Attributes::UserActiveModeTriggerHint::Id,
+            WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "user-active-mode-trigger-instruction",
+                                                    Attributes::UserActiveModeTriggerInstruction::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14378,11 +16425,19 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig),               //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "idle-mode-duration", Attributes::IdleModeDuration::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "active-mode-duration", Attributes::ActiveModeDuration::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "user-active-mode-trigger-instruction",
+                                        Attributes::UserActiveModeTriggerInstruction::Id, credsIssuerConfig),                   //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14392,47 +16447,34 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
-        make_unique<ReadEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),                 //
-        make_unique<ReadEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),                   //
-        make_unique<ReadEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                         //
-        make_unique<ReadEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),                   //
-        make_unique<ReadEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                     //
-        make_unique<ReadEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<SubscribeEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),            //
-        make_unique<SubscribeEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                //
-        make_unique<SubscribeEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterAdministratorCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTimer(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AdministratorCommissioning;
+    using namespace chip::app::Clusters::Timer;
 
-    const char * clusterName = "AdministratorCommissioning";
+    const char * clusterName = "Timer";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                     //
-        make_unique<AdministratorCommissioningOpenCommissioningWindow>(credsIssuerConfig),      //
-        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(credsIssuerConfig), //
-        make_unique<AdministratorCommissioningRevokeCommissioning>(credsIssuerConfig),          //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<TimerSetTimer>(credsIssuerConfig),      //
+        make_unique<TimerResetTimer>(credsIssuerConfig),    //
+        make_unique<TimerAddTime>(credsIssuerConfig),       //
+        make_unique<TimerReduceTime>(credsIssuerConfig),    //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "set-time", Attributes::SetTime::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "time-remaining", Attributes::TimeRemaining::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "timer-state", Attributes::TimerState::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14440,14 +16482,12 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>>(
-            Id, "window-status", 0, UINT8_MAX, Attributes::WindowStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::FabricIndex>>>(
-            Id, "admin-fabric-index", 0, UINT8_MAX, Attributes::AdminFabricIndex::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::VendorId>>>(
-            Id, "admin-vendor-id", 0, UINT16_MAX, Attributes::AdminVendorId::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "set-time", 0, UINT32_MAX, Attributes::SetTime::Id, WriteCommandType::kForceWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "time-remaining", 0, UINT32_MAX, Attributes::TimeRemaining::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::Timer::TimerStatusEnum>>(
+            Id, "timer-state", 0, UINT8_MAX, Attributes::TimerState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14462,9 +16502,9 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "set-time", Attributes::SetTime::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "time-remaining", Attributes::TimeRemaining::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "timer-state", Attributes::TimerState::Id, credsIssuerConfig),                      //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14480,57 +16520,54 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOvenCavityOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OperationalCredentials;
+    using namespace chip::app::Clusters::OvenCavityOperationalState;
 
-    const char * clusterName = "OperationalCredentials";
+    const char * clusterName = "OvenCavityOperationalState";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                              //
-        make_unique<OperationalCredentialsAttestationRequest>(credsIssuerConfig),        //
-        make_unique<OperationalCredentialsCertificateChainRequest>(credsIssuerConfig),   //
-        make_unique<OperationalCredentialsCSRRequest>(credsIssuerConfig),                //
-        make_unique<OperationalCredentialsAddNOC>(credsIssuerConfig),                    //
-        make_unique<OperationalCredentialsUpdateNOC>(credsIssuerConfig),                 //
-        make_unique<OperationalCredentialsUpdateFabricLabel>(credsIssuerConfig),         //
-        make_unique<OperationalCredentialsRemoveFabric>(credsIssuerConfig),              //
-        make_unique<OperationalCredentialsAddTrustedRootCertificate>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
+        make_unique<OvenCavityOperationalStatePause>(credsIssuerConfig),  //
+        make_unique<OvenCavityOperationalStateStop>(credsIssuerConfig),   //
+        make_unique<OvenCavityOperationalStateStart>(credsIssuerConfig),  //
+        make_unique<OvenCavityOperationalStateResume>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                         //
-        make_unique<ReadAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::Type>>>(
-            Id, "nocs", Attributes::NOCs::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptorStruct::Type>>>(
-            Id, "fabrics", Attributes::Fabrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "supported-fabrics", 0, UINT8_MAX, Attributes::SupportedFabrics::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "commissioned-fabrics", 0, UINT8_MAX, Attributes::CommissionedFabrics::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::ByteSpan>>>(
-            Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>>>(
+            Id, "phase-list", Attributes::PhaseList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "current-phase", 0, UINT8_MAX, Attributes::CurrentPhase::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "countdown-time", 0, UINT32_MAX,
+                                                                              Attributes::CountdownTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::Type>>>(
+            Id, "operational-state-list", Attributes::OperationalStateList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-fabric-index", 0, UINT8_MAX, Attributes::CurrentFabricIndex::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum>>(
+            Id, "operational-state", 0, UINT8_MAX, Attributes::OperationalState::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::OvenCavityOperationalState::Structs::ErrorStateStruct::Type>>(
+            Id, "operational-error", Attributes::OperationalError::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14543,15 +16580,14 @@ void registerClusterOperationalCredentials(Commands & commands, CredentialIssuer
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig),     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14561,52 +16597,52 @@ void registerClusterOperationalCredentials(Commands & commands, CredentialIssuer
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                          //
+        make_unique<SubscribeEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOvenMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GroupKeyManagement;
+    using namespace chip::app::Clusters::OvenMode;
 
-    const char * clusterName = "GroupKeyManagement";
+    const char * clusterName = "OvenMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                     //
-        make_unique<GroupKeyManagementKeySetWrite>(credsIssuerConfig),          //
-        make_unique<GroupKeyManagementKeySetRead>(credsIssuerConfig),           //
-        make_unique<GroupKeyManagementKeySetRemove>(credsIssuerConfig),         //
-        make_unique<GroupKeyManagementKeySetReadAllIndices>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),   //
+        make_unique<OvenModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>>>(
-            Id, "group-key-map", Attributes::GroupKeyMap::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::Type>>>(
-            Id, "group-table", Attributes::GroupTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "max-groups-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupsPerFabric::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "max-group-keys-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupKeysPerFabric::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+            chip::app::DataModel::List<const chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14619,13 +16655,12 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id,
-                                        credsIssuerConfig),                                                                     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14641,11 +16676,11 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLaundryDryerControls(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FixedLabel;
+    using namespace chip::app::Clusters::LaundryDryerControls;
 
-    const char * clusterName = "FixedLabel";
+    const char * clusterName = "LaundryDryerControls";
 
     commands_list clusterCommands = {
         //
@@ -14654,19 +16689,24 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
         make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "supported-dryness-levels", Attributes::SupportedDrynessLevels::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "selected-dryness-level", Attributes::SelectedDrynessLevel::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
         make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::FixedLabel::Structs::LabelStruct::Type>>>(
-            Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>>>(
+            Id, "supported-dryness-levels", Attributes::SupportedDrynessLevels::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>>>(
+            Id, "selected-dryness-level", 0, UINT8_MAX, Attributes::SelectedDrynessLevel::Id, WriteCommandType::kWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14679,9 +16719,11 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                  //
+        make_unique<SubscribeAttribute>(Id, "supported-dryness-levels", Attributes::SupportedDrynessLevels::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "selected-dryness-level", Attributes::SelectedDrynessLevel::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14697,22 +16739,28 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::UserLabel;
+    using namespace chip::app::Clusters::ModeSelect;
 
-    const char * clusterName = "UserLabel";
+    const char * clusterName = "ModeSelect";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
+        make_unique<ModeSelectChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14720,9 +16768,20 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<
-            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type>>>(
-            Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite,
+                                                    credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "standard-namespace", 0, UINT16_MAX,
+                                                                              Attributes::StandardNamespace::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14737,7 +16796,12 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14753,21 +16817,26 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyConfiguration;
+    using namespace chip::app::Clusters::LaundryWasherMode;
 
-    const char * clusterName = "ProxyConfiguration";
+    const char * clusterName = "LaundryWasherMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
+        make_unique<LaundryWasherModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14775,6 +16844,15 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14789,6 +16867,10 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14804,21 +16886,27 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & commands,
+                                                                    CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyDiscovery;
+    using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
 
-    const char * clusterName = "ProxyDiscovery";
+    const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                          //
+        make_unique<RefrigeratorAndTemperatureControlledCabinetModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14826,6 +16914,15 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14840,6 +16937,10 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14855,11 +16956,11 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyValid;
+    using namespace chip::app::Clusters::LaundryWasherControls;
 
-    const char * clusterName = "ProxyValid";
+    const char * clusterName = "LaundryWasherControls";
 
     commands_list clusterCommands = {
         //
@@ -14870,6 +16971,10 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "spin-speeds", Attributes::SpinSpeeds::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "spin-speed-current", Attributes::SpinSpeedCurrent::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "number-of-rinses", Attributes::NumberOfRinses::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "supported-rinses", Attributes::SupportedRinses::Id, credsIssuerConfig),            //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14877,6 +16982,16 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
+            Id, "spin-speeds", Attributes::SpinSpeeds::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "spin-speed-current", 0, UINT8_MAX,
+                                                                             Attributes::SpinSpeedCurrent::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>>(
+            Id, "number-of-rinses", 0, UINT8_MAX, Attributes::NumberOfRinses::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>>>(
+            Id, "supported-rinses", Attributes::SupportedRinses::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14891,6 +17006,10 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "spin-speeds", Attributes::SpinSpeeds::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "spin-speed-current", Attributes::SpinSpeedCurrent::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "number-of-rinses", Attributes::NumberOfRinses::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "supported-rinses", Attributes::SupportedRinses::Id, credsIssuerConfig),            //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14906,22 +17025,25 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BooleanState;
+    using namespace chip::app::Clusters::RvcRunMode;
 
-    const char * clusterName = "BooleanState";
+    const char * clusterName = "RvcRunMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
+        make_unique<RvcRunModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14929,8 +17051,13 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<bool>>(Id, "state-value", 0, 1, Attributes::StateValue::Id, WriteCommandType::kForceWrite,
-                                          credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14945,7 +17072,9 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands *
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14955,43 +17084,31 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands *
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                               //
-        make_unique<ReadEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                          //
-        make_unique<SubscribeEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::IcdManagement;
+    using namespace chip::app::Clusters::RvcCleanMode;
 
-    const char * clusterName = "IcdManagement";
+    const char * clusterName = "RvcCleanMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),             //
-        make_unique<IcdManagementRegisterClient>(credsIssuerConfig),    //
-        make_unique<IcdManagementUnregisterClient>(credsIssuerConfig),  //
-        make_unique<IcdManagementStayActiveRequest>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
+        make_unique<RvcCleanModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadAttribute>(Id, "idle-mode-duration", Attributes::IdleModeDuration::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "active-mode-duration", Attributes::ActiveModeDuration::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "user-active-mode-trigger-instruction", Attributes::UserActiveModeTriggerInstruction::Id,
-                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14999,26 +17116,13 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint32_t>>(Id, "idle-mode-duration", 0, UINT32_MAX, Attributes::IdleModeDuration::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "active-mode-duration", 0, UINT32_MAX, Attributes::ActiveModeDuration::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "active-mode-threshold", 0, UINT16_MAX, Attributes::ActiveModeThreshold::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::Type>>>(
-            Id, "registered-clients", Attributes::RegisteredClients::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "icdcounter", 0, UINT32_MAX, Attributes::ICDCounter::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "clients-supported-per-fabric", 0, UINT16_MAX,
-                                              Attributes::ClientsSupportedPerFabric::Id, WriteCommandType::kForceWrite,
-                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>>>(
-            Id, "user-active-mode-trigger-hint", 0, UINT32_MAX, Attributes::UserActiveModeTriggerHint::Id,
-            WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "user-active-mode-trigger-instruction",
-                                                    Attributes::UserActiveModeTriggerInstruction::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
+            chip::app::DataModel::List<const chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
+                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15031,19 +17135,11 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<SubscribeAttribute>(Id, "idle-mode-duration", Attributes::IdleModeDuration::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "active-mode-duration", Attributes::ActiveModeDuration::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "user-active-mode-trigger-instruction",
-                                        Attributes::UserActiveModeTriggerInstruction::Id, credsIssuerConfig),                   //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15059,28 +17155,30 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTemperatureControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ModeSelect;
+    using namespace chip::app::Clusters::TemperatureControl;
 
-    const char * clusterName = "ModeSelect";
+    const char * clusterName = "TemperatureControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
-        make_unique<ModeSelectChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
+        make_unique<TemperatureControlSetTemperature>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, "temperature-setpoint", Attributes::TemperatureSetpoint::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "min-temperature", Attributes::MinTemperature::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "max-temperature", Attributes::MaxTemperature::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "step", Attributes::Step::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "selected-temperature-level", Attributes::SelectedTemperatureLevel::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id,
+                                   credsIssuerConfig),                                                                     //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15088,20 +17186,20 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::CharSpan>>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite,
-                                                    credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "standard-namespace", 0, UINT16_MAX,
-                                                                              Attributes::StandardNamespace::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type>>>(
-            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
+        make_unique<WriteAttribute<int16_t>>(Id, "temperature-setpoint", INT16_MIN, INT16_MAX, Attributes::TemperatureSetpoint::Id,
                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int16_t>>(Id, "min-temperature", INT16_MIN, INT16_MAX, Attributes::MinTemperature::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int16_t>>(Id, "max-temperature", INT16_MIN, INT16_MAX, Attributes::MaxTemperature::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int16_t>>(Id, "step", INT16_MIN, INT16_MAX, Attributes::Step::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "selected-temperature-level", 0, UINT8_MAX,
+                                             Attributes::SelectedTemperatureLevel::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
+            Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15114,14 +17212,16 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "temperature-setpoint", Attributes::TemperatureSetpoint::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "min-temperature", Attributes::MinTemperature::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "max-temperature", Attributes::MaxTemperature::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "step", Attributes::Step::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "selected-temperature-level", Attributes::SelectedTemperatureLevel::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15137,26 +17237,24 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LaundryWasherMode;
+    using namespace chip::app::Clusters::RefrigeratorAlarm;
 
-    const char * clusterName = "LaundryWasherMode";
+    const char * clusterName = "RefrigeratorAlarm";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
-        make_unique<LaundryWasherModeChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15164,15 +17262,12 @@ void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerComma
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::Type>>>(
-            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
+            Id, "mask", 0, UINT32_MAX, Attributes::Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
+            Id, "state", 0, UINT32_MAX, Attributes::State::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
+            Id, "supported", 0, UINT32_MAX, Attributes::Supported::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15187,10 +17282,9 @@ void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerComma
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15200,25 +17294,26 @@ void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerComma
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                    //
+        make_unique<ReadEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                               //
+        make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & commands,
-                                                                    CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
+    using namespace chip::app::Clusters::DishwasherMode;
 
-    const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetMode";
+    const char * clusterName = "DishwasherMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                          //
-        make_unique<RefrigeratorAndTemperatureControlledCabinetModeChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),         //
+        make_unique<DishwasherModeChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
@@ -15234,8 +17329,8 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & c
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
-            const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::Type>>>(
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::Type>>>(
             Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
@@ -15276,11 +17371,11 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & c
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LaundryWasherControls;
+    using namespace chip::app::Clusters::AirQuality;
 
-    const char * clusterName = "LaundryWasherControls";
+    const char * clusterName = "AirQuality";
 
     commands_list clusterCommands = {
         //
@@ -15291,10 +17386,7 @@ void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerC
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "spin-speeds", Attributes::SpinSpeeds::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "spin-speed-current", Attributes::SpinSpeedCurrent::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "number-of-rinses", Attributes::NumberOfRinses::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "supported-rinses", Attributes::SupportedRinses::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "air-quality", Attributes::AirQuality::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15302,16 +17394,8 @@ void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerC
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
-            Id, "spin-speeds", Attributes::SpinSpeeds::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "spin-speed-current", 0, UINT8_MAX,
-                                                                             Attributes::SpinSpeedCurrent::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>>(
-            Id, "number-of-rinses", 0, UINT8_MAX, Attributes::NumberOfRinses::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>>>(
-            Id, "supported-rinses", Attributes::SupportedRinses::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::AirQuality::AirQualityEnum>>(
+            Id, "air-quality", 0, UINT8_MAX, Attributes::AirQuality::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15326,10 +17410,7 @@ void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerC
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "spin-speeds", Attributes::SpinSpeeds::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "spin-speed-current", Attributes::SpinSpeedCurrent::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "number-of-rinses", Attributes::NumberOfRinses::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "supported-rinses", Attributes::SupportedRinses::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "air-quality", Attributes::AirQuality::Id, credsIssuerConfig),                      //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15345,39 +17426,74 @@ void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerC
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RvcRunMode;
+    using namespace chip::app::Clusters::SmokeCoAlarm;
 
-    const char * clusterName = "RvcRunMode";
+    const char * clusterName = "SmokeCoAlarm";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
-        make_unique<RvcRunModeChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
+        make_unique<SmokeCoAlarmSelfTestRequest>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::Type>>>(
-            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "expressed-state", Attributes::ExpressedState::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "smoke-state", Attributes::SmokeState::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "costate", Attributes::COState::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "battery-alert", Attributes::BatteryAlert::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "device-muted", Attributes::DeviceMuted::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "test-in-progress", Attributes::TestInProgress::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "hardware-fault-alert", Attributes::HardwareFaultAlert::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "end-of-service-alert", Attributes::EndOfServiceAlert::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>>(
+            Id, "expressed-state", 0, UINT8_MAX, Attributes::ExpressedState::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
+            Id, "smoke-state", 0, UINT8_MAX, Attributes::SmokeState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
+            Id, "costate", 0, UINT8_MAX, Attributes::COState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
+            Id, "battery-alert", 0, UINT8_MAX, Attributes::BatteryAlert::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>>(
+            Id, "device-muted", 0, UINT8_MAX, Attributes::DeviceMuted::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "test-in-progress", 0, 1, Attributes::TestInProgress::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "hardware-fault-alert", 0, 1, Attributes::HardwareFaultAlert::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>>(
+            Id, "end-of-service-alert", 0, UINT8_MAX, Attributes::EndOfServiceAlert::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
+            Id, "interconnect-smoke-alarm", 0, UINT8_MAX, Attributes::InterconnectSmokeAlarm::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
+            Id, "interconnect-coalarm", 0, UINT8_MAX, Attributes::InterconnectCOAlarm::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>>(
+            Id, "contamination-state", 0, UINT8_MAX, Attributes::ContaminationState::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>>(
+            Id, "smoke-sensitivity-level", 0, UINT8_MAX, Attributes::SmokeSensitivityLevel::Id, WriteCommandType::kWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "expiry-date", 0, UINT32_MAX, Attributes::ExpiryDate::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15390,45 +17506,80 @@ void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
+        make_unique<SubscribeAttribute>(Id, "expressed-state", Attributes::ExpressedState::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "smoke-state", Attributes::SmokeState::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "costate", Attributes::COState::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "battery-alert", Attributes::BatteryAlert::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "device-muted", Attributes::DeviceMuted::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "test-in-progress", Attributes::TestInProgress::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "hardware-fault-alert", Attributes::HardwareFaultAlert::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "end-of-service-alert", Attributes::EndOfServiceAlert::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadEvent>(Id, "smoke-alarm", Events::SmokeAlarm::Id, credsIssuerConfig),                               //
+        make_unique<ReadEvent>(Id, "coalarm", Events::COAlarm::Id, credsIssuerConfig),                                      //
+        make_unique<ReadEvent>(Id, "low-battery", Events::LowBattery::Id, credsIssuerConfig),                               //
+        make_unique<ReadEvent>(Id, "hardware-fault", Events::HardwareFault::Id, credsIssuerConfig),                         //
+        make_unique<ReadEvent>(Id, "end-of-service", Events::EndOfService::Id, credsIssuerConfig),                          //
+        make_unique<ReadEvent>(Id, "self-test-complete", Events::SelfTestComplete::Id, credsIssuerConfig),                  //
+        make_unique<ReadEvent>(Id, "alarm-muted", Events::AlarmMuted::Id, credsIssuerConfig),                               //
+        make_unique<ReadEvent>(Id, "mute-ended", Events::MuteEnded::Id, credsIssuerConfig),                                 //
+        make_unique<ReadEvent>(Id, "interconnect-smoke-alarm", Events::InterconnectSmokeAlarm::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "interconnect-coalarm", Events::InterconnectCOAlarm::Id, credsIssuerConfig),             //
+        make_unique<ReadEvent>(Id, "all-clear", Events::AllClear::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeEvent>(Id, "smoke-alarm", Events::SmokeAlarm::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeEvent>(Id, "coalarm", Events::COAlarm::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeEvent>(Id, "low-battery", Events::LowBattery::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeEvent>(Id, "hardware-fault", Events::HardwareFault::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeEvent>(Id, "end-of-service", Events::EndOfService::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeEvent>(Id, "self-test-complete", Events::SelfTestComplete::Id, credsIssuerConfig),             //
+        make_unique<SubscribeEvent>(Id, "alarm-muted", Events::AlarmMuted::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeEvent>(Id, "mute-ended", Events::MuteEnded::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeEvent>(Id, "interconnect-smoke-alarm", Events::InterconnectSmokeAlarm::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "interconnect-coalarm", Events::InterconnectCOAlarm::Id, credsIssuerConfig),        //
+        make_unique<SubscribeEvent>(Id, "all-clear", Events::AllClear::Id, credsIssuerConfig),                              //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RvcCleanMode;
+    using namespace chip::app::Clusters::DishwasherAlarm;
 
-    const char * clusterName = "RvcCleanMode";
+    const char * clusterName = "DishwasherAlarm";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
-        make_unique<RvcCleanModeChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<DishwasherAlarmReset>(credsIssuerConfig),               //
+        make_unique<DishwasherAlarmModifyEnabledAlarms>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "latch", Attributes::Latch::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15436,13 +17587,14 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::Type>>>(
-            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
+            Id, "mask", 0, UINT32_MAX, Attributes::Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
+            Id, "latch", 0, UINT32_MAX, Attributes::Latch::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
+            Id, "state", 0, UINT32_MAX, Attributes::State::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
+            Id, "supported", 0, UINT32_MAX, Attributes::Supported::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15457,9 +17609,10 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, "latch", Attributes::Latch::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15469,36 +17622,31 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                    //
+        make_unique<ReadEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                               //
+        make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterTemperatureControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterMicrowaveOvenMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TemperatureControl;
+    using namespace chip::app::Clusters::MicrowaveOvenMode;
 
-    const char * clusterName = "TemperatureControl";
+    const char * clusterName = "MicrowaveOvenMode";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
-        make_unique<TemperatureControlSetTemperature>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                              //
-        make_unique<ReadAttribute>(Id, "temperature-setpoint", Attributes::TemperatureSetpoint::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "min-temperature", Attributes::MinTemperature::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "max-temperature", Attributes::MaxTemperature::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "step", Attributes::Step::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "selected-temperature-level", Attributes::SelectedTemperatureLevel::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id,
-                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15506,20 +17654,11 @@ void registerClusterTemperatureControl(Commands & commands, CredentialIssuerComm
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<int16_t>>(Id, "temperature-setpoint", INT16_MIN, INT16_MAX, Attributes::TemperatureSetpoint::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<int16_t>>(Id, "min-temperature", INT16_MIN, INT16_MAX, Attributes::MinTemperature::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<int16_t>>(Id, "max-temperature", INT16_MIN, INT16_MAX, Attributes::MaxTemperature::Id,
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::Type>>>(
+            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<int16_t>>(Id, "step", INT16_MIN, INT16_MAX, Attributes::Step::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "selected-temperature-level", 0, UINT8_MAX,
-                                             Attributes::SelectedTemperatureLevel::Id, WriteCommandType::kForceWrite,
-                                             credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
-            Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15532,16 +17671,10 @@ void registerClusterTemperatureControl(Commands & commands, CredentialIssuerComm
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "temperature-setpoint", Attributes::TemperatureSetpoint::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "min-temperature", Attributes::MinTemperature::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "max-temperature", Attributes::MaxTemperature::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "step", Attributes::Step::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "selected-temperature-level", Attributes::SelectedTemperatureLevel::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supported-temperature-levels", Attributes::SupportedTemperatureLevels::Id,
-                                        credsIssuerConfig),                                                                     //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15557,24 +17690,28 @@ void registerClusterTemperatureControl(Commands & commands, CredentialIssuerComm
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterMicrowaveOvenControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RefrigeratorAlarm;
+    using namespace chip::app::Clusters::MicrowaveOvenControl;
 
-    const char * clusterName = "RefrigeratorAlarm";
+    const char * clusterName = "MicrowaveOvenControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                       //
+        make_unique<MicrowaveOvenControlSetCookingParameters>(credsIssuerConfig), //
+        make_unique<MicrowaveOvenControlAddMoreTime>(credsIssuerConfig),          //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "cook-time", Attributes::CookTime::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "power-setting", Attributes::PowerSetting::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "min-power", Attributes::MinPower::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "max-power", Attributes::MaxPower::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "power-step", Attributes::PowerStep::Id, credsIssuerConfig),                        //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15582,12 +17719,16 @@ void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerComma
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
-            Id, "mask", 0, UINT32_MAX, Attributes::Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
-            Id, "state", 0, UINT32_MAX, Attributes::State::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap>>>(
-            Id, "supported", 0, UINT32_MAX, Attributes::Supported::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "cook-time", 0, UINT32_MAX, Attributes::CookTime::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "power-setting", 0, UINT8_MAX, Attributes::PowerSetting::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "min-power", 0, UINT8_MAX, Attributes::MinPower::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "max-power", 0, UINT8_MAX, Attributes::MaxPower::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "power-step", 0, UINT8_MAX, Attributes::PowerStep::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15602,9 +17743,11 @@ void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerComma
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "cook-time", Attributes::CookTime::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "power-setting", Attributes::PowerSetting::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "min-power", Attributes::MinPower::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "max-power", Attributes::MaxPower::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "power-step", Attributes::PowerStep::Id, credsIssuerConfig),                        //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15614,34 +17757,37 @@ void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerComma
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                    //
-        make_unique<ReadEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                               //
-        make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DishwasherMode;
+    using namespace chip::app::Clusters::OperationalState;
 
-    const char * clusterName = "DishwasherMode";
+    const char * clusterName = "OperationalState";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),         //
-        make_unique<DishwasherModeChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
+        make_unique<OperationalStatePause>(credsIssuerConfig),  //
+        make_unique<OperationalStateStop>(credsIssuerConfig),   //
+        make_unique<OperationalStateStart>(credsIssuerConfig),  //
+        make_unique<OperationalStateResume>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15649,15 +17795,22 @@ void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::Type>>>(
-            Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>>>(
+            Id, "phase-list", Attributes::PhaseList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id,
-                                                                             WriteCommandType::kWrite, credsIssuerConfig), //
+            Id, "current-phase", 0, UINT8_MAX, Attributes::CurrentPhase::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "countdown-time", 0, UINT32_MAX,
+                                                                              Attributes::CountdownTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::Type>>>(
+            Id, "operational-state-list", Attributes::OperationalStateList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::OperationalState::OperationalStateEnum>>(
+            Id, "operational-state", 0, UINT8_MAX, Attributes::OperationalState::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::Type>>(
+            Id, "operational-error", Attributes::OperationalError::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15672,10 +17825,12 @@ void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15685,28 +17840,41 @@ void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                          //
+        make_unique<SubscribeEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AirQuality;
+    using namespace chip::app::Clusters::RvcOperationalState;
 
-    const char * clusterName = "AirQuality";
+    const char * clusterName = "RvcOperationalState";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
+        make_unique<RvcOperationalStatePause>(credsIssuerConfig),  //
+        make_unique<RvcOperationalStateStop>(credsIssuerConfig),   //
+        make_unique<RvcOperationalStateStart>(credsIssuerConfig),  //
+        make_unique<RvcOperationalStateResume>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "air-quality", Attributes::AirQuality::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15714,8 +17882,21 @@ void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::app::Clusters::AirQuality::AirQualityEnum>>(
-            Id, "air-quality", 0, UINT8_MAX, Attributes::AirQuality::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>>>(
+            Id, "phase-list", Attributes::PhaseList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
+            Id, "current-phase", 0, UINT8_MAX, Attributes::CurrentPhase::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "countdown-time", 0, UINT32_MAX,
+                                                                              Attributes::CountdownTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::Type>>>(
+            Id, "operational-state-list", Attributes::OperationalStateList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "operational-state", 0, UINT8_MAX, Attributes::OperationalState::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::Type>>(
+            Id, "operational-error", Attributes::OperationalError::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15730,7 +17911,12 @@ void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "air-quality", Attributes::AirQuality::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15740,41 +17926,38 @@ void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * c
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                          //
+        make_unique<SubscribeEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterHepaFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SmokeCoAlarm;
+    using namespace chip::app::Clusters::HepaFilterMonitoring;
 
-    const char * clusterName = "SmokeCoAlarm";
+    const char * clusterName = "HepaFilterMonitoring";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
-        make_unique<SmokeCoAlarmSelfTestRequest>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<HepaFilterMonitoringResetCondition>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "expressed-state", Attributes::ExpressedState::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "smoke-state", Attributes::SmokeState::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "costate", Attributes::COState::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "battery-alert", Attributes::BatteryAlert::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "device-muted", Attributes::DeviceMuted::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "test-in-progress", Attributes::TestInProgress::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "hardware-fault-alert", Attributes::HardwareFaultAlert::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "end-of-service-alert", Attributes::EndOfServiceAlert::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
@@ -15782,38 +17965,23 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>>(
-            Id, "expressed-state", 0, UINT8_MAX, Attributes::ExpressedState::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
-            Id, "smoke-state", 0, UINT8_MAX, Attributes::SmokeState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
-            Id, "costate", 0, UINT8_MAX, Attributes::COState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
-            Id, "battery-alert", 0, UINT8_MAX, Attributes::BatteryAlert::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>>(
-            Id, "device-muted", 0, UINT8_MAX, Attributes::DeviceMuted::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "test-in-progress", 0, 1, Attributes::TestInProgress::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "hardware-fault-alert", 0, 1, Attributes::HardwareFaultAlert::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>>(
-            Id, "end-of-service-alert", 0, UINT8_MAX, Attributes::EndOfServiceAlert::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
-            Id, "interconnect-smoke-alarm", 0, UINT8_MAX, Attributes::InterconnectSmokeAlarm::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>>(
-            Id, "interconnect-coalarm", 0, UINT8_MAX, Attributes::InterconnectCOAlarm::Id, WriteCommandType::kForceWrite,
+        make_unique<WriteAttribute<chip::Percent>>(Id, "condition", 0, UINT8_MAX, Attributes::Condition::Id,
+                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum>>(
+            Id, "degradation-direction", 0, UINT8_MAX, Attributes::DegradationDirection::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>>(
-            Id, "contamination-state", 0, UINT8_MAX, Attributes::ContaminationState::Id, WriteCommandType::kForceWrite,
+        make_unique<WriteAttribute<chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum>>(
+            Id, "change-indication", 0, UINT8_MAX, Attributes::ChangeIndication::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>>(
-            Id, "smoke-sensitivity-level", 0, UINT8_MAX, Attributes::SmokeSensitivityLevel::Id, WriteCommandType::kWrite,
+        make_unique<WriteAttribute<bool>>(Id, "in-place-indicator", 0, 1, Attributes::InPlaceIndicator::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "last-changed-time", 0, UINT32_MAX,
+                                                                              Attributes::LastChangedTime::Id,
+                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::Type>>>(
+            Id, "replacement-product-list", Attributes::ReplacementProductList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "expiry-date", 0, UINT32_MAX, Attributes::ExpiryDate::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15826,95 +17994,76 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands *
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                             //
-        make_unique<SubscribeAttribute>(Id, "expressed-state", Attributes::ExpressedState::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "smoke-state", Attributes::SmokeState::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "costate", Attributes::COState::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "battery-alert", Attributes::BatteryAlert::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "device-muted", Attributes::DeviceMuted::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "test-in-progress", Attributes::TestInProgress::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "hardware-fault-alert", Attributes::HardwareFaultAlert::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "end-of-service-alert", Attributes::EndOfServiceAlert::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id,
-                                        credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadEvent>(Id, "smoke-alarm", Events::SmokeAlarm::Id, credsIssuerConfig),                               //
-        make_unique<ReadEvent>(Id, "coalarm", Events::COAlarm::Id, credsIssuerConfig),                                      //
-        make_unique<ReadEvent>(Id, "low-battery", Events::LowBattery::Id, credsIssuerConfig),                               //
-        make_unique<ReadEvent>(Id, "hardware-fault", Events::HardwareFault::Id, credsIssuerConfig),                         //
-        make_unique<ReadEvent>(Id, "end-of-service", Events::EndOfService::Id, credsIssuerConfig),                          //
-        make_unique<ReadEvent>(Id, "self-test-complete", Events::SelfTestComplete::Id, credsIssuerConfig),                  //
-        make_unique<ReadEvent>(Id, "alarm-muted", Events::AlarmMuted::Id, credsIssuerConfig),                               //
-        make_unique<ReadEvent>(Id, "mute-ended", Events::MuteEnded::Id, credsIssuerConfig),                                 //
-        make_unique<ReadEvent>(Id, "interconnect-smoke-alarm", Events::InterconnectSmokeAlarm::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "interconnect-coalarm", Events::InterconnectCOAlarm::Id, credsIssuerConfig),             //
-        make_unique<ReadEvent>(Id, "all-clear", Events::AllClear::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeEvent>(Id, "smoke-alarm", Events::SmokeAlarm::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeEvent>(Id, "coalarm", Events::COAlarm::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeEvent>(Id, "low-battery", Events::LowBattery::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeEvent>(Id, "hardware-fault", Events::HardwareFault::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeEvent>(Id, "end-of-service", Events::EndOfService::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeEvent>(Id, "self-test-complete", Events::SelfTestComplete::Id, credsIssuerConfig),             //
-        make_unique<SubscribeEvent>(Id, "alarm-muted", Events::AlarmMuted::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeEvent>(Id, "mute-ended", Events::MuteEnded::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeEvent>(Id, "interconnect-smoke-alarm", Events::InterconnectSmokeAlarm::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "interconnect-coalarm", Events::InterconnectCOAlarm::Id, credsIssuerConfig),        //
-        make_unique<SubscribeEvent>(Id, "all-clear", Events::AllClear::Id, credsIssuerConfig),                              //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DishwasherAlarm;
+    using namespace chip::app::Clusters::ActivatedCarbonFilterMonitoring;
 
-    const char * clusterName = "DishwasherAlarm";
+    const char * clusterName = "ActivatedCarbonFilterMonitoring";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<DishwasherAlarmReset>(credsIssuerConfig),               //
-        make_unique<DishwasherAlarmModifyEnabledAlarms>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
+        make_unique<ActivatedCarbonFilterMonitoringResetCondition>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "latch", Attributes::Latch::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
-            Id, "mask", 0, UINT32_MAX, Attributes::Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
-            Id, "latch", 0, UINT32_MAX, Attributes::Latch::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
-            Id, "state", 0, UINT32_MAX, Attributes::State::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap>>>(
-            Id, "supported", 0, UINT32_MAX, Attributes::Supported::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
+        make_unique<WriteAttribute<chip::Percent>>(Id, "condition", 0, UINT8_MAX, Attributes::Condition::Id,
+                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum>>(
+            Id, "degradation-direction", 0, UINT8_MAX, Attributes::DegradationDirection::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum>>(
+            Id, "change-indication", 0, UINT8_MAX, Attributes::ChangeIndication::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "in-place-indicator", 0, 1, Attributes::InPlaceIndicator::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "last-changed-time", 0, UINT32_MAX,
+                                                                              Attributes::LastChangedTime::Id,
+                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::Type>>>(
+            Id, "replacement-product-list", Attributes::ReplacementProductList::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -15927,12 +18076,15 @@ void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommand
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "mask", Attributes::Mask::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, "latch", Attributes::Latch::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "supported", Attributes::Supported::Id, credsIssuerConfig),                         //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id,
+                                        credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -15942,62 +18094,49 @@ void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommand
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                    //
-        make_unique<ReadEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                               //
-        make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBooleanSensorConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OperationalState;
+    using namespace chip::app::Clusters::BooleanSensorConfiguration;
 
-    const char * clusterName = "OperationalState";
+    const char * clusterName = "BooleanSensorConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
-        make_unique<OperationalStatePause>(credsIssuerConfig),  //
-        make_unique<OperationalStateStop>(credsIssuerConfig),   //
-        make_unique<OperationalStateStart>(credsIssuerConfig),  //
-        make_unique<OperationalStateResume>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
+        make_unique<BooleanSensorConfigurationSuppressRequest>(credsIssuerConfig), //
         //
         // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>>>(
-            Id, "phase-list", Attributes::PhaseList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "current-phase", 0, UINT8_MAX, Attributes::CurrentPhase::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "countdown-time", 0, UINT32_MAX,
-                                                                              Attributes::CountdownTime::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::Type>>>(
-            Id, "operational-state-list", Attributes::OperationalStateList::Id, WriteCommandType::kForceWrite,
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "sensitivity-level", Attributes::SensitivityLevel::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "alarms-active", Attributes::AlarmsActive::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "alarms-suppressed", Attributes::AlarmsSuppressed::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "alarms-enabled", Attributes::AlarmsEnabled::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
+        make_unique<WriteAttribute<chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum>>(
+            Id, "sensitivity-level", 0, UINT8_MAX, Attributes::SensitivityLevel::Id, WriteCommandType::kWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::OperationalState::OperationalStateEnum>>(
-            Id, "operational-state", 0, UINT8_MAX, Attributes::OperationalState::Id, WriteCommandType::kForceWrite,
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>>(
+            Id, "alarms-active", 0, UINT8_MAX, Attributes::AlarmsActive::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>>(
+            Id, "alarms-suppressed", 0, UINT8_MAX, Attributes::AlarmsSuppressed::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::Type>>(
-            Id, "operational-error", Attributes::OperationalError::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap>>>(
+            Id, "alarms-enabled", 0, UINT8_MAX, Attributes::AlarmsEnabled::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -16012,12 +18151,10 @@ void registerClusterOperationalState(Commands & commands, CredentialIssuerComman
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "sensitivity-level", Attributes::SensitivityLevel::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "alarms-active", Attributes::AlarmsActive::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "alarms-suppressed", Attributes::AlarmsSuppressed::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "alarms-enabled", Attributes::AlarmsEnabled::Id, credsIssuerConfig),                //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -16027,41 +18164,44 @@ void registerClusterOperationalState(Commands & commands, CredentialIssuerComman
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                          //
-        make_unique<SubscribeEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),       //
-        make_unique<SubscribeEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadEvent>(Id, "alarms-state-changed", Events::AlarmsStateChanged::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "sensor-fault", Events::SensorFault::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<SubscribeEvent>(Id, "alarms-state-changed", Events::AlarmsStateChanged::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "sensor-fault", Events::SensorFault::Id, credsIssuerConfig),                //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterValveConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RvcOperationalState;
+    using namespace chip::app::Clusters::ValveConfigurationAndControl;
 
-    const char * clusterName = "RvcOperationalState";
+    const char * clusterName = "ValveConfigurationAndControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
-        make_unique<RvcOperationalStatePause>(credsIssuerConfig),  //
-        make_unique<RvcOperationalStateStop>(credsIssuerConfig),   //
-        make_unique<RvcOperationalStateStart>(credsIssuerConfig),  //
-        make_unique<RvcOperationalStateResume>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                   //
+        make_unique<ValveConfigurationAndControlOpen>(credsIssuerConfig),     //
+        make_unique<ValveConfigurationAndControlClose>(credsIssuerConfig),    //
+        make_unique<ValveConfigurationAndControlSetLevel>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "open-duration", Attributes::OpenDuration::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "auto-close-time", Attributes::AutoCloseTime::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "remaining-duration", Attributes::RemainingDuration::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "target-state", Attributes::TargetState::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "start-up-state", Attributes::StartUpState::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "target-level", Attributes::TargetLevel::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "open-level", Attributes::OpenLevel::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "valve-fault", Attributes::ValveFault::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -16069,21 +18209,30 @@ void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCom
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::CharSpan>>>>(
-            Id, "phase-list", Attributes::PhaseList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint8_t>>>(
-            Id, "current-phase", 0, UINT8_MAX, Attributes::CurrentPhase::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "countdown-time", 0, UINT32_MAX,
-                                                                              Attributes::CountdownTime::Id,
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
+            Id, "open-duration", 0, UINT32_MAX, Attributes::OpenDuration::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint64_t>>>(Id, "auto-close-time", 0, UINT64_MAX,
+                                                                              Attributes::AutoCloseTime::Id,
                                                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::Type>>>(
-            Id, "operational-state-list", Attributes::OperationalStateList::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "operational-state", 0, UINT8_MAX, Attributes::OperationalState::Id,
-                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::Type>>(
-            Id, "operational-error", Attributes::OperationalError::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "remaining-duration", 0, UINT32_MAX,
+                                                                              Attributes::RemainingDuration::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>>>(
+            Id, "current-state", 0, UINT8_MAX, Attributes::CurrentState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>>>(
+            Id, "target-state", 0, UINT8_MAX, Attributes::TargetState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>>(
+            Id, "start-up-state", 0, UINT8_MAX, Attributes::StartUpState::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
+            Id, "current-level", 0, UINT8_MAX, Attributes::CurrentLevel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
+            Id, "target-level", 0, UINT8_MAX, Attributes::TargetLevel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
+            Id, "open-level", 0, UINT8_MAX, Attributes::OpenLevel::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>>(
+            Id, "valve-fault", 0, UINT16_MAX, Attributes::ValveFault::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -16098,12 +18247,16 @@ void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCom
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "phase-list", Attributes::PhaseList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "current-phase", Attributes::CurrentPhase::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "countdown-time", Attributes::CountdownTime::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "operational-state-list", Attributes::OperationalStateList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "operational-state", Attributes::OperationalState::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "operational-error", Attributes::OperationalError::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "open-duration", Attributes::OpenDuration::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "auto-close-time", Attributes::AutoCloseTime::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "remaining-duration", Attributes::RemainingDuration::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "target-state", Attributes::TargetState::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-state", Attributes::StartUpState::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "target-level", Attributes::TargetLevel::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "open-level", Attributes::OpenLevel::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "valve-fault", Attributes::ValveFault::Id, credsIssuerConfig),                      //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -16113,62 +18266,74 @@ void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCom
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                          //
-        make_unique<SubscribeEvent>(Id, "operational-error", Events::OperationalError::Id, credsIssuerConfig),       //
-        make_unique<SubscribeEvent>(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                            //
+        make_unique<ReadEvent>(Id, "valve-state-changed", Events::ValveStateChanged::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "valve-fault", Events::ValveFault::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                       //
+        make_unique<SubscribeEvent>(Id, "valve-state-changed", Events::ValveStateChanged::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "valve-fault", Events::ValveFault::Id, credsIssuerConfig),                //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterHepaFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::HepaFilterMonitoring;
+    using namespace chip::app::Clusters::DemandResponseLoadControl;
 
-    const char * clusterName = "HepaFilterMonitoring";
+    const char * clusterName = "DemandResponseLoadControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<HepaFilterMonitoringResetCondition>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                           //
+        make_unique<DemandResponseLoadControlRegisterLoadControlProgramRequest>(credsIssuerConfig),   //
+        make_unique<DemandResponseLoadControlUnregisterLoadControlProgramRequest>(credsIssuerConfig), //
+        make_unique<DemandResponseLoadControlAddLoadControlEventRequest>(credsIssuerConfig),          //
+        make_unique<DemandResponseLoadControlRemoveLoadControlEventRequest>(credsIssuerConfig),       //
+        make_unique<DemandResponseLoadControlClearLoadControlEventsRequest>(credsIssuerConfig),       //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
-        make_unique<WriteAttribute<chip::Percent>>(Id, "condition", 0, UINT8_MAX, Attributes::Condition::Id,
-                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum>>(
-            Id, "degradation-direction", 0, UINT8_MAX, Attributes::DegradationDirection::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum>>(
-            Id, "change-indication", 0, UINT8_MAX, Attributes::ChangeIndication::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "in-place-indicator", 0, 1, Attributes::InPlaceIndicator::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "last-changed-time", 0, UINT32_MAX,
-                                                                              Attributes::LastChangedTime::Id,
-                                                                              WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<
-            chip::app::DataModel::List<const chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::Type>>>(
-            Id, "replacement-product-list", Attributes::ReplacementProductList::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadAttribute>(Id, "load-control-programs", Attributes::LoadControlPrograms::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-load-control-programs", Attributes::NumberOfLoadControlPrograms::Id,
+                                   credsIssuerConfig),                                                    //
+        make_unique<ReadAttribute>(Id, "events", Attributes::Events::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "active-events", Attributes::ActiveEvents::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-events-per-program", Attributes::NumberOfEventsPerProgram::Id,
+                                   credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "number-of-transitions", Attributes::NumberOfTransitions::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "default-random-start", Attributes::DefaultRandomStart::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "default-random-duration", Attributes::DefaultRandomDuration::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type>>>(
+            Id, "load-control-programs", Attributes::LoadControlPrograms::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-load-control-programs", 0, UINT8_MAX,
+                                             Attributes::NumberOfLoadControlPrograms::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type>>>(
+            Id, "events", Attributes::Events::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
+            const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type>>>(
+            Id, "active-events", Attributes::ActiveEvents::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-events-per-program", 0, UINT8_MAX,
+                                             Attributes::NumberOfEventsPerProgram::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-transitions", 0, UINT8_MAX, Attributes::NumberOfTransitions::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "default-random-start", 0, UINT8_MAX, Attributes::DefaultRandomStart::Id,
+                                             WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "default-random-duration", 0, UINT8_MAX, Attributes::DefaultRandomDuration::Id,
+                                             WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -16181,76 +18346,160 @@ void registerClusterHepaFilterMonitoring(Commands & commands, CredentialIssuerCo
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "load-control-programs", Attributes::LoadControlPrograms::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-load-control-programs", Attributes::NumberOfLoadControlPrograms::Id,
+                                        credsIssuerConfig),                                                    //
+        make_unique<SubscribeAttribute>(Id, "events", Attributes::Events::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "active-events", Attributes::ActiveEvents::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-events-per-program", Attributes::NumberOfEventsPerProgram::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "number-of-transitions", Attributes::NumberOfTransitions::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "default-random-start", Attributes::DefaultRandomStart::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "default-random-duration", Attributes::DefaultRandomDuration::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, "load-control-event-status-change", Events::LoadControlEventStatusChange::Id,
+                               credsIssuerConfig),          //
         make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "load-control-event-status-change", Events::LoadControlEventStatusChange::Id,
+                                    credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
-void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterEnergyEvse(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ActivatedCarbonFilterMonitoring;
+    using namespace chip::app::Clusters::EnergyEvse;
 
-    const char * clusterName = "ActivatedCarbonFilterMonitoring";
+    const char * clusterName = "EnergyEvse";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
-        make_unique<ActivatedCarbonFilterMonitoringResetCondition>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
+        make_unique<EnergyEvseDisable>(credsIssuerConfig),           //
+        make_unique<EnergyEvseEnableCharging>(credsIssuerConfig),    //
+        make_unique<EnergyEvseEnableDischarging>(credsIssuerConfig), //
+        make_unique<EnergyEvseStartDiagnostics>(credsIssuerConfig),  //
+        make_unique<EnergyEvseSetTargets>(credsIssuerConfig),        //
+        make_unique<EnergyEvseGetTargets>(credsIssuerConfig),        //
+        make_unique<EnergyEvseClearTargets>(credsIssuerConfig),      //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                  //
-        make_unique<WriteAttribute<chip::Percent>>(Id, "condition", 0, UINT8_MAX, Attributes::Condition::Id,
-                                                   WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum>>(
-            Id, "degradation-direction", 0, UINT8_MAX, Attributes::DegradationDirection::Id, WriteCommandType::kForceWrite,
-            credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum>>(
-            Id, "change-indication", 0, UINT8_MAX, Attributes::ChangeIndication::Id, WriteCommandType::kForceWrite,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                       //
+        make_unique<ReadAttribute>(Id, "supply-state", Attributes::SupplyState::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "fault-state", Attributes::FaultState::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "charging-enabled-until", Attributes::ChargingEnabledUntil::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "discharging-enabled-until", Attributes::DischargingEnabledUntil::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "circuit-capacity", Attributes::CircuitCapacity::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "minimum-charge-current", Attributes::MinimumChargeCurrent::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "maximum-charge-current", Attributes::MaximumChargeCurrent::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "maximum-discharge-current", Attributes::MaximumDischargeCurrent::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "user-maximum-charge-current", Attributes::UserMaximumChargeCurrent::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "randomization-delay-window", Attributes::RandomizationDelayWindow::Id,
+                                   credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "number-of-weekly-targets", Attributes::NumberOfWeeklyTargets::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-daily-targets", Attributes::NumberOfDailyTargets::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "next-charge-start-time", Attributes::NextChargeStartTime::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "next-charge-target-time", Attributes::NextChargeTargetTime::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "next-charge-required-energy", Attributes::NextChargeRequiredEnergy::Id,
+                                   credsIssuerConfig),                                                                           //
+        make_unique<ReadAttribute>(Id, "next-charge-target-so-c", Attributes::NextChargeTargetSoC::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "approximate-evefficiency", Attributes::ApproximateEVEfficiency::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "state-of-charge", Attributes::StateOfCharge::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "vehicle-id", Attributes::VehicleID::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "session-id", Attributes::SessionID::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "session-duration", Attributes::SessionDuration::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "session-energy-charged", Attributes::SessionEnergyCharged::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "session-energy-discharged", Attributes::SessionEnergyDischarged::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum>>>(
+            Id, "state", 0, UINT8_MAX, Attributes::State::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::EnergyEvse::SupplyStateEnum>>(
+            Id, "supply-state", 0, UINT8_MAX, Attributes::SupplyState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::EnergyEvse::FaultStateEnum>>(
+            Id, "fault-state", 0, UINT8_MAX, Attributes::FaultState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "charging-enabled-until", 0, UINT32_MAX,
+                                                                              Attributes::ChargingEnabledUntil::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "discharging-enabled-until", 0, UINT32_MAX,
+                                                                              Attributes::DischargingEnabledUntil::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "circuit-capacity", INT64_MIN, INT64_MAX, Attributes::CircuitCapacity::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "minimum-charge-current", INT64_MIN, INT64_MAX,
+                                             Attributes::MinimumChargeCurrent::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "maximum-charge-current", INT64_MIN, INT64_MAX,
+                                             Attributes::MaximumChargeCurrent::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "maximum-discharge-current", INT64_MIN, INT64_MAX,
+                                             Attributes::MaximumDischargeCurrent::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "user-maximum-charge-current", INT64_MIN, INT64_MAX,
+                                             Attributes::UserMaximumChargeCurrent::Id, WriteCommandType::kWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "randomization-delay-window", 0, UINT32_MAX,
+                                              Attributes::RandomizationDelayWindow::Id, WriteCommandType::kWrite,
+                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-weekly-targets", 0, UINT8_MAX, Attributes::NumberOfWeeklyTargets::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint8_t>>(Id, "number-of-daily-targets", 0, UINT8_MAX, Attributes::NumberOfDailyTargets::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "next-charge-start-time", 0, UINT32_MAX,
+                                                                              Attributes::NextChargeStartTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "next-charge-target-time", 0, UINT32_MAX,
+                                                                              Attributes::NextChargeTargetTime::Id,
+                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int64_t>>>(Id, "next-charge-required-energy", INT64_MIN,
+                                                                             INT64_MAX, Attributes::NextChargeRequiredEnergy::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
+            Id, "next-charge-target-so-c", 0, UINT8_MAX, Attributes::NextChargeTargetSoC::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "in-place-indicator", 0, 1, Attributes::InPlaceIndicator::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "last-changed-time", 0, UINT32_MAX,
-                                                                              Attributes::LastChangedTime::Id,
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "approximate-evefficiency", 0, UINT16_MAX,
+                                                                              Attributes::ApproximateEVEfficiency::Id,
                                                                               WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<
-            const chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::Type>>>(
-            Id, "replacement-product-list", Attributes::ReplacementProductList::Id, WriteCommandType::kForceWrite,
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
+            Id, "state-of-charge", 0, UINT8_MAX, Attributes::StateOfCharge::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<int64_t>>>(Id, "battery-capacity", INT64_MIN, INT64_MAX,
+                                                                             Attributes::BatteryCapacity::Id,
+                                                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
+            Id, "vehicle-id", Attributes::VehicleID::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
+            Id, "session-id", 0, UINT32_MAX, Attributes::SessionID::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint32_t>>(Id, "session-duration", 0, UINT32_MAX, Attributes::SessionDuration::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "session-energy-charged", INT64_MIN, INT64_MAX,
+                                             Attributes::SessionEnergyCharged::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<int64_t>>(Id, "session-energy-discharged", INT64_MIN, INT64_MAX,
+                                             Attributes::SessionEnergyDischarged::Id, WriteCommandType::kForceWrite,
+                                             credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -16263,14 +18512,40 @@ void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, Credent
         make_unique<WriteAttribute<uint32_t>>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "condition", Attributes::Condition::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "degradation-direction", Attributes::DegradationDirection::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "change-indication", Attributes::ChangeIndication::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "in-place-indicator", Attributes::InPlaceIndicator::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "last-changed-time", Attributes::LastChangedTime::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "replacement-product-list", Attributes::ReplacementProductList::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "state", Attributes::State::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "supply-state", Attributes::SupplyState::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "fault-state", Attributes::FaultState::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "charging-enabled-until", Attributes::ChargingEnabledUntil::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "discharging-enabled-until", Attributes::DischargingEnabledUntil::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "circuit-capacity", Attributes::CircuitCapacity::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "minimum-charge-current", Attributes::MinimumChargeCurrent::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "maximum-charge-current", Attributes::MaximumChargeCurrent::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "maximum-discharge-current", Attributes::MaximumDischargeCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "user-maximum-charge-current", Attributes::UserMaximumChargeCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "randomization-delay-window", Attributes::RandomizationDelayWindow::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-weekly-targets", Attributes::NumberOfWeeklyTargets::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "number-of-daily-targets", Attributes::NumberOfDailyTargets::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "next-charge-start-time", Attributes::NextChargeStartTime::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "next-charge-target-time", Attributes::NextChargeTargetTime::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "next-charge-required-energy", Attributes::NextChargeRequiredEnergy::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "next-charge-target-so-c", Attributes::NextChargeTargetSoC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "approximate-evefficiency", Attributes::ApproximateEVEfficiency::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "state-of-charge", Attributes::StateOfCharge::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "vehicle-id", Attributes::VehicleID::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "session-id", Attributes::SessionID::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "session-duration", Attributes::SessionDuration::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "session-energy-charged", Attributes::SessionEnergyCharged::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "session-energy-discharged", Attributes::SessionEnergyDischarged::Id,
                                         credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
@@ -16281,8 +18556,20 @@ void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, Credent
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                    //
+        make_unique<ReadEvent>(Id, "evconnected", Events::EVConnected::Id, credsIssuerConfig),                            //
+        make_unique<ReadEvent>(Id, "evnot-detected", Events::EVNotDetected::Id, credsIssuerConfig),                       //
+        make_unique<ReadEvent>(Id, "energy-transfer-started", Events::EnergyTransferStarted::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "energy-transfer-stopped", Events::EnergyTransferStopped::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "fault", Events::Fault::Id, credsIssuerConfig),                                        //
+        make_unique<ReadEvent>(Id, "rfid", Events::Rfid::Id, credsIssuerConfig),                                          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeEvent>(Id, "evconnected", Events::EVConnected::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeEvent>(Id, "evnot-detected", Events::EVNotDetected::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeEvent>(Id, "energy-transfer-started", Events::EnergyTransferStarted::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "energy-transfer-stopped", Events::EnergyTransferStopped::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "fault", Events::Fault::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeEvent>(Id, "rfid", Events::Rfid::Id, credsIssuerConfig),                                     //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
@@ -17375,7 +19662,8 @@ void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * c
         make_unique<WriteAttribute<chip::app::Clusters::FanControl::FanModeEnum>>(
             Id, "fan-mode", 0, UINT8_MAX, Attributes::FanMode::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<chip::app::Clusters::FanControl::FanModeSequenceEnum>>(
-            Id, "fan-mode-sequence", 0, UINT8_MAX, Attributes::FanModeSequence::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+            Id, "fan-mode-sequence", 0, UINT8_MAX, Attributes::FanModeSequence::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::Percent>>>(
             Id, "percent-setting", 0, UINT8_MAX, Attributes::PercentSetting::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<chip::Percent>>(Id, "percent-current", 0, UINT8_MAX, Attributes::PercentCurrent::Id,
@@ -17464,13 +19752,14 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, Cr
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttribute<uint8_t>>(Id, "temperature-display-mode", 0, UINT8_MAX, Attributes::TemperatureDisplayMode::Id,
-                                             WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "keypad-lockout", 0, UINT8_MAX, Attributes::KeypadLockout::Id,
-                                             WriteCommandType::kWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint8_t>>(Id, "schedule-programming-visibility", 0, UINT8_MAX,
-                                             Attributes::ScheduleProgrammingVisibility::Id, WriteCommandType::kWrite,
-                                             credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum>>(
+            Id, "temperature-display-mode", 0, UINT8_MAX, Attributes::TemperatureDisplayMode::Id, WriteCommandType::kWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum>>(
+            Id, "keypad-lockout", 0, UINT8_MAX, Attributes::KeypadLockout::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum>>(
+            Id, "schedule-programming-visibility", 0, UINT8_MAX, Attributes::ScheduleProgrammingVisibility::Id,
+            WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -19533,6 +21822,7 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
         make_unique<ReadAttribute>(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "link-local-address", Attributes::LinkLocalAddress::Id, credsIssuerConfig),         //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -19542,6 +21832,8 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttribute<chip::CharSpan>>(Id, "macaddress", Attributes::MACAddress::Id, WriteCommandType::kForceWrite,
                                                     credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::ByteSpan>>(Id, "link-local-address", Attributes::LinkLocalAddress::Id,
+                                                    WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -19557,6 +21849,7 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
                                               WriteCommandType::kForceWrite, credsIssuerConfig),                                //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
         make_unique<SubscribeAttribute>(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "link-local-address", Attributes::LinkLocalAddress::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -19992,9 +22285,9 @@ void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommand
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CharSpan>>>(
             Id, "accept-header", Attributes::AcceptHeader::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint32_t>>(Id, "supported-streaming-protocols", 0, UINT32_MAX,
-                                              Attributes::SupportedStreamingProtocols::Id, WriteCommandType::kWrite,
-                                              credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>>>(
+            Id, "supported-streaming-protocols", 0, UINT32_MAX, Attributes::SupportedStreamingProtocols::Id,
+            WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -20120,7 +22413,7 @@ void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCom
             Id, "catalog-list", Attributes::CatalogList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<
             chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEPStruct::Type>>>(
-            Id, "current-app", Attributes::CurrentApp::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+            Id, "current-app", Attributes::CurrentApp::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -21606,6 +23899,10 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterProxyValid(commands, credsIssuerConfig);
     registerClusterBooleanState(commands, credsIssuerConfig);
     registerClusterIcdManagement(commands, credsIssuerConfig);
+    registerClusterTimer(commands, credsIssuerConfig);
+    registerClusterOvenCavityOperationalState(commands, credsIssuerConfig);
+    registerClusterOvenMode(commands, credsIssuerConfig);
+    registerClusterLaundryDryerControls(commands, credsIssuerConfig);
     registerClusterModeSelect(commands, credsIssuerConfig);
     registerClusterLaundryWasherMode(commands, credsIssuerConfig);
     registerClusterRefrigeratorAndTemperatureControlledCabinetMode(commands, credsIssuerConfig);
@@ -21618,10 +23915,16 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterAirQuality(commands, credsIssuerConfig);
     registerClusterSmokeCoAlarm(commands, credsIssuerConfig);
     registerClusterDishwasherAlarm(commands, credsIssuerConfig);
+    registerClusterMicrowaveOvenMode(commands, credsIssuerConfig);
+    registerClusterMicrowaveOvenControl(commands, credsIssuerConfig);
     registerClusterOperationalState(commands, credsIssuerConfig);
     registerClusterRvcOperationalState(commands, credsIssuerConfig);
     registerClusterHepaFilterMonitoring(commands, credsIssuerConfig);
     registerClusterActivatedCarbonFilterMonitoring(commands, credsIssuerConfig);
+    registerClusterBooleanSensorConfiguration(commands, credsIssuerConfig);
+    registerClusterValveConfigurationAndControl(commands, credsIssuerConfig);
+    registerClusterDemandResponseLoadControl(commands, credsIssuerConfig);
+    registerClusterEnergyEvse(commands, credsIssuerConfig);
     registerClusterDoorLock(commands, credsIssuerConfig);
     registerClusterWindowCovering(commands, credsIssuerConfig);
     registerClusterBarrierControl(commands, credsIssuerConfig);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index e0c1360460b1c7..d7054e21dd700b 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -283,6 +283,66 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Scenes::Structs::Exten
     ComplexArgumentParser::Finalize(request.attributeValueList);
 }
 
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type & request,
+                                        Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("SceneInfoStruct.sceneCount", "sceneCount", value.isMember("sceneCount")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("SceneInfoStruct.currentScene", "currentScene", value.isMember("currentScene")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("SceneInfoStruct.currentGroup", "currentGroup", value.isMember("currentGroup")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("SceneInfoStruct.sceneValid", "sceneValid", value.isMember("sceneValid")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("SceneInfoStruct.remainingCapacity", "remainingCapacity",
+                                                                  value.isMember("remainingCapacity")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "sceneCount");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.sceneCount, value["sceneCount"]));
+    valueCopy.removeMember("sceneCount");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "currentScene");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.currentScene, value["currentScene"]));
+    valueCopy.removeMember("currentScene");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "currentGroup");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.currentGroup, value["currentGroup"]));
+    valueCopy.removeMember("currentGroup");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "sceneValid");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.sceneValid, value["sceneValid"]));
+    valueCopy.removeMember("sceneValid");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "remainingCapacity");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.remainingCapacity, value["remainingCapacity"]));
+    valueCopy.removeMember("remainingCapacity");
+
+    if (value.isMember("fabricIndex"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"]));
+    }
+    valueCopy.removeMember("fabricIndex");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.sceneCount);
+    ComplexArgumentParser::Finalize(request.currentScene);
+    ComplexArgumentParser::Finalize(request.currentGroup);
+    ComplexArgumentParser::Finalize(request.sceneValid);
+    ComplexArgumentParser::Finalize(request.remainingCapacity);
+    ComplexArgumentParser::Finalize(request.fabricIndex);
+}
+
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
                                         chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request,
                                         Json::Value & value)
@@ -903,6 +963,20 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.connected, value["connected"]));
     valueCopy.removeMember("connected");
 
+    if (value.isMember("networkIdentifier"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "networkIdentifier");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.networkIdentifier, value["networkIdentifier"]));
+    }
+    valueCopy.removeMember("networkIdentifier");
+
+    if (value.isMember("clientIdentifier"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "clientIdentifier");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.clientIdentifier, value["clientIdentifier"]));
+    }
+    valueCopy.removeMember("clientIdentifier");
+
     return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
 }
 
@@ -910,6 +984,8 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning::
 {
     ComplexArgumentParser::Finalize(request.networkID);
     ComplexArgumentParser::Finalize(request.connected);
+    ComplexArgumentParser::Finalize(request.networkIdentifier);
+    ComplexArgumentParser::Finalize(request.clientIdentifier);
 }
 
 CHIP_ERROR
@@ -2145,6 +2221,418 @@ void ComplexArgumentParser::Finalize(
     ComplexArgumentParser::Finalize(request.productIdentifierValue);
 }
 
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("HeatingSourceControlStruct.heatingSource", "heatingSource",
+                                                                  value.isMember("heatingSource")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "heatingSource");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.heatingSource, value["heatingSource"]));
+    valueCopy.removeMember("heatingSource");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.heatingSource);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PowerSavingsControlStruct.powerSavings", "powerSavings",
+                                                                  value.isMember("powerSavings")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "powerSavings");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.powerSavings, value["powerSavings"]));
+    valueCopy.removeMember("powerSavings");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.powerSavings);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("DutyCycleControlStruct.dutyCycle", "dutyCycle", value.isMember("dutyCycle")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "dutyCycle");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.dutyCycle, value["dutyCycle"]));
+    valueCopy.removeMember("dutyCycle");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.dutyCycle);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AverageLoadControlStruct.loadAdjustment", "loadAdjustment",
+                                                                  value.isMember("loadAdjustment")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "loadAdjustment");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.loadAdjustment, value["loadAdjustment"]));
+    valueCopy.removeMember("loadAdjustment");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.loadAdjustment);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    char labelWithMember[kMaxLabelLength];
+    if (value.isMember("coolingTempOffset"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "coolingTempOffset");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.coolingTempOffset, value["coolingTempOffset"]));
+    }
+    valueCopy.removeMember("coolingTempOffset");
+
+    if (value.isMember("heatingtTempOffset"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "heatingtTempOffset");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.heatingtTempOffset, value["heatingtTempOffset"]));
+    }
+    valueCopy.removeMember("heatingtTempOffset");
+
+    if (value.isMember("coolingTempSetpoint"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "coolingTempSetpoint");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.coolingTempSetpoint, value["coolingTempSetpoint"]));
+    }
+    valueCopy.removeMember("coolingTempSetpoint");
+
+    if (value.isMember("heatingTempSetpoint"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "heatingTempSetpoint");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.heatingTempSetpoint, value["heatingTempSetpoint"]));
+    }
+    valueCopy.removeMember("heatingTempSetpoint");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.coolingTempOffset);
+    ComplexArgumentParser::Finalize(request.heatingtTempOffset);
+    ComplexArgumentParser::Finalize(request.coolingTempSetpoint);
+    ComplexArgumentParser::Finalize(request.heatingTempSetpoint);
+}
+
+CHIP_ERROR ComplexArgumentParser::Setup(
+    const char * label, chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::Type & request,
+    Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlEventTransitionStruct.duration", "duration",
+                                                                  value.isMember("duration")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlEventTransitionStruct.control", "control", value.isMember("control")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "duration");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.duration, value["duration"]));
+    valueCopy.removeMember("duration");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "control");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.control, value["control"]));
+    valueCopy.removeMember("control");
+
+    if (value.isMember("temperatureControl"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "temperatureControl");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.temperatureControl, value["temperatureControl"]));
+    }
+    valueCopy.removeMember("temperatureControl");
+
+    if (value.isMember("averageLoadControl"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "averageLoadControl");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.averageLoadControl, value["averageLoadControl"]));
+    }
+    valueCopy.removeMember("averageLoadControl");
+
+    if (value.isMember("dutyCycleControl"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "dutyCycleControl");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.dutyCycleControl, value["dutyCycleControl"]));
+    }
+    valueCopy.removeMember("dutyCycleControl");
+
+    if (value.isMember("powerSavingsControl"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "powerSavingsControl");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.powerSavingsControl, value["powerSavingsControl"]));
+    }
+    valueCopy.removeMember("powerSavingsControl");
+
+    if (value.isMember("heatingSourceControl"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "heatingSourceControl");
+        ReturnErrorOnFailure(
+            ComplexArgumentParser::Setup(labelWithMember, request.heatingSourceControl, value["heatingSourceControl"]));
+    }
+    valueCopy.removeMember("heatingSourceControl");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.duration);
+    ComplexArgumentParser::Finalize(request.control);
+    ComplexArgumentParser::Finalize(request.temperatureControl);
+    ComplexArgumentParser::Finalize(request.averageLoadControl);
+    ComplexArgumentParser::Finalize(request.dutyCycleControl);
+    ComplexArgumentParser::Finalize(request.powerSavingsControl);
+    ComplexArgumentParser::Finalize(request.heatingSourceControl);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.eventID", "eventID", value.isMember("eventID")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.programID", "programID", value.isMember("programID")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.control", "control", value.isMember("control")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.deviceClass", "deviceClass",
+                                                                  value.isMember("deviceClass")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.criticality", "criticality",
+                                                                  value.isMember("criticality")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.startTime", "startTime", value.isMember("startTime")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlEventStruct.transitions", "transitions",
+                                                                  value.isMember("transitions")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "eventID");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.eventID, value["eventID"]));
+    valueCopy.removeMember("eventID");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "programID");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.programID, value["programID"]));
+    valueCopy.removeMember("programID");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "control");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.control, value["control"]));
+    valueCopy.removeMember("control");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "deviceClass");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.deviceClass, value["deviceClass"]));
+    valueCopy.removeMember("deviceClass");
+
+    if (value.isMember("enrollmentGroup"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "enrollmentGroup");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.enrollmentGroup, value["enrollmentGroup"]));
+    }
+    valueCopy.removeMember("enrollmentGroup");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "criticality");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.criticality, value["criticality"]));
+    valueCopy.removeMember("criticality");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "startTime");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.startTime, value["startTime"]));
+    valueCopy.removeMember("startTime");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "transitions");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.transitions, value["transitions"]));
+    valueCopy.removeMember("transitions");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.eventID);
+    ComplexArgumentParser::Finalize(request.programID);
+    ComplexArgumentParser::Finalize(request.control);
+    ComplexArgumentParser::Finalize(request.deviceClass);
+    ComplexArgumentParser::Finalize(request.enrollmentGroup);
+    ComplexArgumentParser::Finalize(request.criticality);
+    ComplexArgumentParser::Finalize(request.startTime);
+    ComplexArgumentParser::Finalize(request.transitions);
+}
+
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("LoadControlProgramStruct.programID", "programID", value.isMember("programID")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlProgramStruct.name", "name", value.isMember("name")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlProgramStruct.enrollmentGroup", "enrollmentGroup",
+                                                                  value.isMember("enrollmentGroup")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LoadControlProgramStruct.randomStartMinutes",
+                                                                  "randomStartMinutes", value.isMember("randomStartMinutes")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist(
+        "LoadControlProgramStruct.randomDurationMinutes", "randomDurationMinutes", value.isMember("randomDurationMinutes")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "programID");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.programID, value["programID"]));
+    valueCopy.removeMember("programID");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"]));
+    valueCopy.removeMember("name");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "enrollmentGroup");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.enrollmentGroup, value["enrollmentGroup"]));
+    valueCopy.removeMember("enrollmentGroup");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "randomStartMinutes");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.randomStartMinutes, value["randomStartMinutes"]));
+    valueCopy.removeMember("randomStartMinutes");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "randomDurationMinutes");
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::Setup(labelWithMember, request.randomDurationMinutes, value["randomDurationMinutes"]));
+    valueCopy.removeMember("randomDurationMinutes");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(
+    chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.programID);
+    ComplexArgumentParser::Finalize(request.name);
+    ComplexArgumentParser::Finalize(request.enrollmentGroup);
+    ComplexArgumentParser::Finalize(request.randomStartMinutes);
+    ComplexArgumentParser::Finalize(request.randomDurationMinutes);
+}
+
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
+                                        chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type & request,
+                                        Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("ChargingTargetStruct.targetTime", "targetTime", value.isMember("targetTime")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "targetTime");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.targetTime, value["targetTime"]));
+    valueCopy.removeMember("targetTime");
+
+    if (value.isMember("targetSoC"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "targetSoC");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.targetSoC, value["targetSoC"]));
+    }
+    valueCopy.removeMember("targetSoC");
+
+    if (value.isMember("addedEnergy"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "addedEnergy");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.addedEnergy, value["addedEnergy"]));
+    }
+    valueCopy.removeMember("addedEnergy");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.targetTime);
+    ComplexArgumentParser::Finalize(request.targetSoC);
+    ComplexArgumentParser::Finalize(request.addedEnergy);
+}
+
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
                                         chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request,
                                         Json::Value & value)
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 6a9f327de7492c..34a3712ce0f24a 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -61,6 +61,11 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Scenes::Structs
 
 static void Finalize(chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type & request);
 
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::Scenes::Structs::SceneInfoStruct::Type & request);
+
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request,
                         Json::Value & value);
 
@@ -271,6 +276,59 @@ static CHIP_ERROR Setup(const char * label,
 
 static void Finalize(chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::Type & request);
 
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type & request);
+
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type & request);
+
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request,
                         Json::Value & value);
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 037fd3a4af6e9b..3186e4a4164c4d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -237,6 +237,63 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = LogValue("SceneCount", indent + 1, value.sceneCount);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'SceneCount'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("CurrentScene", indent + 1, value.currentScene);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CurrentScene'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("CurrentGroup", indent + 1, value.currentGroup);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CurrentGroup'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("SceneValid", indent + 1, value.sceneValid);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'SceneValid'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("RemainingCapacity", indent + 1, value.remainingCapacity);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'RemainingCapacity'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value)
 {
@@ -769,6 +826,22 @@ DataModelLogger::LogValue(const char * label, size_t indent,
             return err;
         }
     }
+    {
+        CHIP_ERROR err = LogValue("NetworkIdentifier", indent + 1, value.networkIdentifier);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NetworkIdentifier'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("ClientIdentifier", indent + 1, value.clientIdentifier);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ClientIdentifier'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
@@ -1912,23 +1985,16 @@ CHIP_ERROR DataModelLogger::LogValue(
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex);
+        CHIP_ERROR err = LogValue("HeatingSource", indent + 1, value.heatingSource);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatingSource'");
             return err;
         }
     }
@@ -1937,32 +2003,34 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("TransitionTime", indent + 1, value.transitionTime);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransitionTime'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("HeatSetpoint", indent + 1, value.heatSetpoint);
+        CHIP_ERROR err = LogValue("PowerSavings", indent + 1, value.powerSavings);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatSetpoint'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PowerSavings'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("CoolSetpoint", indent + 1, value.coolSetpoint);
+        CHIP_ERROR err = LogValue("DutyCycle", indent + 1, value.dutyCycle);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolSetpoint'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DutyCycle'");
             return err;
         }
     }
@@ -1971,47 +2039,58 @@ DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("MajorNumber", indent + 1, value.majorNumber);
+        CHIP_ERROR err = LogValue("LoadAdjustment", indent + 1, value.loadAdjustment);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MajorNumber'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'LoadAdjustment'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("MinorNumber", indent + 1, value.minorNumber);
+        CHIP_ERROR err = LogValue("CoolingTempOffset", indent + 1, value.coolingTempOffset);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MinorNumber'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolingTempOffset'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = LogValue("HeatingtTempOffset", indent + 1, value.heatingtTempOffset);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatingtTempOffset'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("CallSign", indent + 1, value.callSign);
+        CHIP_ERROR err = LogValue("CoolingTempSetpoint", indent + 1, value.coolingTempSetpoint);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CallSign'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolingTempSetpoint'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("AffiliateCallSign", indent + 1, value.affiliateCallSign);
+        CHIP_ERROR err = LogValue("HeatingTempSetpoint", indent + 1, value.heatingTempSetpoint);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AffiliateCallSign'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatingTempSetpoint'");
             return err;
         }
     }
@@ -2020,64 +2099,64 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::Channel::Structs::LineupInfoStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("OperatorName", indent + 1, value.operatorName);
+        CHIP_ERROR err = LogValue("Duration", indent + 1, value.duration);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OperatorName'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Duration'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("LineupName", indent + 1, value.lineupName);
+        CHIP_ERROR err = LogValue("Control", indent + 1, value.control);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'LineupName'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Control'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("PostalCode", indent + 1, value.postalCode);
+        CHIP_ERROR err = LogValue("TemperatureControl", indent + 1, value.temperatureControl);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PostalCode'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TemperatureControl'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("LineupInfoType", indent + 1, value.lineupInfoType);
+        CHIP_ERROR err = LogValue("AverageLoadControl", indent + 1, value.averageLoadControl);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'LineupInfoType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AverageLoadControl'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Identifier", indent + 1, value.identifier);
+        CHIP_ERROR err = LogValue("DutyCycleControl", indent + 1, value.dutyCycleControl);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Identifier'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DutyCycleControl'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = LogValue("PowerSavingsControl", indent + 1, value.powerSavingsControl);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PowerSavingsControl'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("HeatingSourceControl", indent + 1, value.heatingSourceControl);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatingSourceControl'");
             return err;
         }
     }
@@ -2086,65 +2165,72 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::MediaPlayback::Structs::PlaybackPositionStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("UpdatedAt", indent + 1, value.updatedAt);
+        CHIP_ERROR err = LogValue("EventID", indent + 1, value.eventID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'UpdatedAt'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'EventID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Position", indent + 1, value.position);
+        CHIP_ERROR err = LogValue("ProgramID", indent + 1, value.programID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Position'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProgramID'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::MediaInput::Structs::InputInfoStruct::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Index", indent + 1, value.index);
+        CHIP_ERROR err = LogValue("Control", indent + 1, value.control);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Index'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Control'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("InputType", indent + 1, value.inputType);
+        CHIP_ERROR err = LogValue("DeviceClass", indent + 1, value.deviceClass);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'InputType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceClass'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = LogValue("EnrollmentGroup", indent + 1, value.enrollmentGroup);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'EnrollmentGroup'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Description", indent + 1, value.description);
+        CHIP_ERROR err = LogValue("Criticality", indent + 1, value.criticality);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Description'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Criticality'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("StartTime", indent + 1, value.startTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'StartTime'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("Transitions", indent + 1, value.transitions);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Transitions'");
             return err;
         }
     }
@@ -2153,57 +2239,48 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Width", indent + 1, value.width);
+        CHIP_ERROR err = LogValue("ProgramID", indent + 1, value.programID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProgramID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Height", indent + 1, value.height);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric);
+        CHIP_ERROR err = LogValue("EnrollmentGroup", indent + 1, value.enrollmentGroup);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'EnrollmentGroup'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = LogValue("RandomStartMinutes", indent + 1, value.randomStartMinutes);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'RandomStartMinutes'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Value", indent + 1, value.value);
+        CHIP_ERROR err = LogValue("RandomDurationMinutes", indent + 1, value.randomDurationMinutes);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Value'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'RandomDurationMinutes'");
             return err;
         }
     }
@@ -2213,30 +2290,30 @@ DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value)
+                                     const chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Type", indent + 1, value.type);
+        CHIP_ERROR err = LogValue("TargetTime", indent + 1, value.targetTime);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Type'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TargetTime'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Value", indent + 1, value.value);
+        CHIP_ERROR err = LogValue("TargetSoC", indent + 1, value.targetSoC);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Value'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TargetSoC'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("ExternalIDList", indent + 1, value.externalIDList);
+        CHIP_ERROR err = LogValue("AddedEnergy", indent + 1, value.addedEnergy);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ExternalIDList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AddedEnergy'");
             return err;
         }
     }
@@ -2245,16 +2322,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("ParameterList", indent + 1, value.parameterList);
+        CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ParameterList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'");
             return err;
         }
     }
@@ -2265,30 +2349,30 @@ DataModelLogger::LogValue(const char * label, size_t indent,
 
 CHIP_ERROR
 DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value)
+                          const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("ImageURL", indent + 1, value.imageURL);
+        CHIP_ERROR err = LogValue("TransitionTime", indent + 1, value.transitionTime);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageURL'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransitionTime'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Color", indent + 1, value.color);
+        CHIP_ERROR err = LogValue("HeatSetpoint", indent + 1, value.heatSetpoint);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Color'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatSetpoint'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Size", indent + 1, value.size);
+        CHIP_ERROR err = LogValue("CoolSetpoint", indent + 1, value.coolSetpoint);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Size'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolSetpoint'");
             return err;
         }
     }
@@ -2297,56 +2381,47 @@ DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("ProviderName", indent + 1, value.providerName);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProviderName'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("Background", indent + 1, value.background);
+        CHIP_ERROR err = LogValue("MajorNumber", indent + 1, value.majorNumber);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Background'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MajorNumber'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Logo", indent + 1, value.logo);
+        CHIP_ERROR err = LogValue("MinorNumber", indent + 1, value.minorNumber);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Logo'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MinorNumber'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("ProgressBar", indent + 1, value.progressBar);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProgressBar'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Splash", indent + 1, value.splash);
+        CHIP_ERROR err = LogValue("CallSign", indent + 1, value.callSign);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Splash'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CallSign'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("WaterMark", indent + 1, value.waterMark);
+        CHIP_ERROR err = LogValue("AffiliateCallSign", indent + 1, value.affiliateCallSign);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'WaterMark'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AffiliateCallSign'");
             return err;
         }
     }
@@ -2356,56 +2431,38 @@ DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::AudioOutput::Structs::OutputInfoStruct::DecodableType & value)
+                                     const chip::app::Clusters::Channel::Structs::LineupInfoStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Index", indent + 1, value.index);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Index'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("OutputType", indent + 1, value.outputType);
+        CHIP_ERROR err = LogValue("OperatorName", indent + 1, value.operatorName);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OutputType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OperatorName'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = LogValue("LineupName", indent + 1, value.lineupName);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'LineupName'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEPStruct::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Application", indent + 1, value.application);
+        CHIP_ERROR err = LogValue("PostalCode", indent + 1, value.postalCode);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Application'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PostalCode'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Endpoint", indent + 1, value.endpoint);
+        CHIP_ERROR err = LogValue("LineupInfoType", indent + 1, value.lineupInfoType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Endpoint'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'LineupInfoType'");
             return err;
         }
     }
@@ -2415,70 +2472,89 @@ DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value)
+                                     const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
+        CHIP_ERROR err = LogValue("Identifier", indent + 1, value.identifier);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Identifier'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("B", indent + 1, value.b);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'B'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::MediaPlayback::Structs::PlaybackPositionStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("C", indent + 1, value.c);
+        CHIP_ERROR err = LogValue("UpdatedAt", indent + 1, value.updatedAt);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'C'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'UpdatedAt'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("D", indent + 1, value.d);
+        CHIP_ERROR err = LogValue("Position", indent + 1, value.position);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'D'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Position'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::MediaInput::Structs::InputInfoStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("E", indent + 1, value.e);
+        CHIP_ERROR err = LogValue("Index", indent + 1, value.index);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'E'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Index'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("F", indent + 1, value.f);
+        CHIP_ERROR err = LogValue("InputType", indent + 1, value.inputType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'F'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'InputType'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("G", indent + 1, value.g);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'G'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("H", indent + 1, value.h);
+        CHIP_ERROR err = LogValue("Description", indent + 1, value.description);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'H'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Description'");
             return err;
         }
     }
@@ -2488,71 +2564,89 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::TestFabricScoped::DecodableType & value)
+                                     const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("FabricSensitiveInt8u", indent + 1, value.fabricSensitiveInt8u);
+        CHIP_ERROR err = LogValue("Width", indent + 1, value.width);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveInt8u'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("OptionalFabricSensitiveInt8u", indent + 1, value.optionalFabricSensitiveInt8u);
+        CHIP_ERROR err = LogValue("Height", indent + 1, value.height);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalFabricSensitiveInt8u'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableFabricSensitiveInt8u", indent + 1, value.nullableFabricSensitiveInt8u);
+        CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableFabricSensitiveInt8u'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("NullableOptionalFabricSensitiveInt8u", indent + 1, value.nullableOptionalFabricSensitiveInt8u);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1,
-                                       "Struct truncated due to invalid value for 'NullableOptionalFabricSensitiveInt8u'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("FabricSensitiveCharString", indent + 1, value.fabricSensitiveCharString);
+        CHIP_ERROR err = LogValue("Value", indent + 1, value.value);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveCharString'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Value'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("FabricSensitiveStruct", indent + 1, value.fabricSensitiveStruct);
+        CHIP_ERROR err = LogValue("Type", indent + 1, value.type);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveStruct'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Type'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("FabricSensitiveInt8uList", indent + 1, value.fabricSensitiveInt8uList);
+        CHIP_ERROR err = LogValue("Value", indent + 1, value.value);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveInt8uList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Value'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = LogValue("ExternalIDList", indent + 1, value.externalIDList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ExternalIDList'");
             return err;
         }
     }
@@ -2563,135 +2657,165 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
 CHIP_ERROR
 DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType & value)
+                          const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("NullableInt", indent + 1, value.nullableInt);
+        CHIP_ERROR err = LogValue("ParameterList", indent + 1, value.parameterList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableInt'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ParameterList'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("OptionalInt", indent + 1, value.optionalInt);
+        CHIP_ERROR err = LogValue("ImageURL", indent + 1, value.imageURL);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalInt'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageURL'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableOptionalInt", indent + 1, value.nullableOptionalInt);
+        CHIP_ERROR err = LogValue("Color", indent + 1, value.color);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalInt'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Color'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableString", indent + 1, value.nullableString);
+        CHIP_ERROR err = LogValue("Size", indent + 1, value.size);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableString'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Size'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("OptionalString", indent + 1, value.optionalString);
+        CHIP_ERROR err = LogValue("ProviderName", indent + 1, value.providerName);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalString'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProviderName'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableOptionalString", indent + 1, value.nullableOptionalString);
+        CHIP_ERROR err = LogValue("Background", indent + 1, value.background);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalString'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Background'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableStruct", indent + 1, value.nullableStruct);
+        CHIP_ERROR err = LogValue("Logo", indent + 1, value.logo);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableStruct'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Logo'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("OptionalStruct", indent + 1, value.optionalStruct);
+        CHIP_ERROR err = LogValue("ProgressBar", indent + 1, value.progressBar);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalStruct'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProgressBar'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableOptionalStruct", indent + 1, value.nullableOptionalStruct);
+        CHIP_ERROR err = LogValue("Splash", indent + 1, value.splash);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalStruct'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Splash'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableList", indent + 1, value.nullableList);
+        CHIP_ERROR err = LogValue("WaterMark", indent + 1, value.waterMark);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'WaterMark'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const chip::app::Clusters::AudioOutput::Structs::OutputInfoStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("OptionalList", indent + 1, value.optionalList);
+        CHIP_ERROR err = LogValue("Index", indent + 1, value.index);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Index'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("NullableOptionalList", indent + 1, value.nullableOptionalList);
+        CHIP_ERROR err = LogValue("OutputType", indent + 1, value.outputType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalList'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OutputType'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::NestedStruct::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
+        CHIP_ERROR err = LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEPStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("B", indent + 1, value.b);
+        CHIP_ERROR err = LogValue("Application", indent + 1, value.application);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'B'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Application'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("C", indent + 1, value.c);
+        CHIP_ERROR err = LogValue("Endpoint", indent + 1, value.endpoint);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'C'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Endpoint'");
             return err;
         }
     }
@@ -2701,7 +2825,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::NestedStructList::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -2760,20 +2884,11 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
+        CHIP_ERROR err = LogValue("H", indent + 1, value.h);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'H'");
             return err;
         }
     }
@@ -2783,71 +2898,71 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::UnitTesting::Structs::TestListStructOctet::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::TestFabricScoped::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Member1", indent + 1, value.member1);
+        CHIP_ERROR err = LogValue("FabricSensitiveInt8u", indent + 1, value.fabricSensitiveInt8u);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member1'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveInt8u'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Member2", indent + 1, value.member2);
+        CHIP_ERROR err = LogValue("OptionalFabricSensitiveInt8u", indent + 1, value.optionalFabricSensitiveInt8u);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member2'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalFabricSensitiveInt8u'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const AccessControl::Events::AccessControlEntryChanged::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID);
+        CHIP_ERROR err = LogValue("NullableFabricSensitiveInt8u", indent + 1, value.nullableFabricSensitiveInt8u);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminNodeID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableFabricSensitiveInt8u'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AdminPasscodeID", indent + 1, value.adminPasscodeID);
+        CHIP_ERROR err = LogValue("NullableOptionalFabricSensitiveInt8u", indent + 1, value.nullableOptionalFabricSensitiveInt8u);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminPasscodeID'");
+            DataModelLogger::LogString(indent + 1,
+                                       "Struct truncated due to invalid value for 'NullableOptionalFabricSensitiveInt8u'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ChangeType", indent + 1, value.changeType);
+        CHIP_ERROR err = LogValue("FabricSensitiveCharString", indent + 1, value.fabricSensitiveCharString);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ChangeType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveCharString'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("LatestValue", indent + 1, value.latestValue);
+        CHIP_ERROR err = LogValue("FabricSensitiveStruct", indent + 1, value.fabricSensitiveStruct);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LatestValue'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveStruct'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = LogValue("FabricSensitiveInt8uList", indent + 1, value.fabricSensitiveInt8uList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricSensitiveInt8uList'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'");
             return err;
         }
     }
@@ -2855,117 +2970,105 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const AccessControl::Events::AccessControlExtensionChanged::DecodableType & value)
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID);
+        CHIP_ERROR err = LogValue("NullableInt", indent + 1, value.nullableInt);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminNodeID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableInt'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AdminPasscodeID", indent + 1, value.adminPasscodeID);
+        CHIP_ERROR err = LogValue("OptionalInt", indent + 1, value.optionalInt);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminPasscodeID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalInt'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ChangeType", indent + 1, value.changeType);
+        CHIP_ERROR err = LogValue("NullableOptionalInt", indent + 1, value.nullableOptionalInt);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ChangeType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalInt'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("LatestValue", indent + 1, value.latestValue);
+        CHIP_ERROR err = LogValue("NullableString", indent + 1, value.nullableString);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LatestValue'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableString'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = LogValue("OptionalString", indent + 1, value.optionalString);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalString'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::StateChanged::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ActionID", indent + 1, value.actionID);
+        CHIP_ERROR err = LogValue("NullableOptionalString", indent + 1, value.nullableOptionalString);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActionID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalString'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("InvokeID", indent + 1, value.invokeID);
+        CHIP_ERROR err = LogValue("NullableStruct", indent + 1, value.nullableStruct);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'InvokeID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableStruct'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
+        CHIP_ERROR err = LogValue("OptionalStruct", indent + 1, value.optionalStruct);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalStruct'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::ActionFailed::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ActionID", indent + 1, value.actionID);
+        CHIP_ERROR err = LogValue("NullableOptionalStruct", indent + 1, value.nullableOptionalStruct);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActionID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalStruct'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("InvokeID", indent + 1, value.invokeID);
+        CHIP_ERROR err = LogValue("NullableList", indent + 1, value.nullableList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'InvokeID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableList'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
+        CHIP_ERROR err = LogValue("OptionalList", indent + 1, value.optionalList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OptionalList'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Error", indent + 1, value.error);
+        CHIP_ERROR err = LogValue("NullableOptionalList", indent + 1, value.nullableOptionalList);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Error'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'NullableOptionalList'");
             return err;
         }
     }
@@ -2973,55 +3076,32 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Ac
 
     return CHIP_NO_ERROR;
 }
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BasicInformation::Events::StartUp::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::NestedStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
+        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BasicInformation::Events::ShutDown::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BasicInformation::Events::Leave::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = LogValue("B", indent + 1, value.b);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'B'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BasicInformation::Events::ReachableChanged::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ReachableNewValue", indent + 1, value.reachableNewValue);
+        CHIP_ERROR err = LogValue("C", indent + 1, value.c);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReachableNewValue'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'C'");
             return err;
         }
     }
@@ -3029,63 +3109,64 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::NestedStructList::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PreviousState", indent + 1, value.previousState);
+        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousState'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
+        CHIP_ERROR err = LogValue("B", indent + 1, value.b);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'B'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Reason", indent + 1, value.reason);
+        CHIP_ERROR err = LogValue("C", indent + 1, value.c);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Reason'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'C'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("TargetSoftwareVersion", indent + 1, value.targetSoftwareVersion);
+        CHIP_ERROR err = LogValue("D", indent + 1, value.d);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TargetSoftwareVersion'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'D'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
+        CHIP_ERROR err = LogValue("E", indent + 1, value.e);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'E'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ProductID", indent + 1, value.productID);
+        CHIP_ERROR err = LogValue("F", indent + 1, value.f);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ProductID'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'F'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("G", indent + 1, value.g);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'G'");
             return err;
         }
     }
@@ -3093,39 +3174,16 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("BytesDownloaded", indent + 1, value.bytesDownloaded);
+        CHIP_ERROR err = LogValue("A", indent + 1, value.a);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'BytesDownloaded'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("ProgressPercent", indent + 1, value.progressPercent);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ProgressPercent'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("PlatformCode", indent + 1, value.platformCode);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PlatformCode'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'A'");
             return err;
         }
     }
@@ -3133,23 +3191,24 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PowerSource::Events::WiredFaultChange::DecodableType & value)
+                                     const chip::app::Clusters::UnitTesting::Structs::TestListStructOctet::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = LogValue("Member1", indent + 1, value.member1);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member1'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = LogValue("Member2", indent + 1, value.member2);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member2'");
             return err;
         }
     }
@@ -3157,47 +3216,48 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PowerSource::Events::BatFaultChange::DecodableType & value)
+                                     const AccessControl::Events::AccessControlEntryChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminNodeID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("AdminPasscodeID", indent + 1, value.adminPasscodeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminPasscodeID'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PowerSource::Events::BatChargeFaultChange::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = DataModelLogger::LogValue("ChangeType", indent + 1, value.changeType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ChangeType'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("LatestValue", indent + 1, value.latestValue);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LatestValue'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
             return err;
         }
     }
@@ -3206,46 +3266,46 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralDiagnostics::Events::HardwareFaultChange::DecodableType & value)
+                                     const AccessControl::Events::AccessControlExtensionChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminNodeID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("AdminPasscodeID", indent + 1, value.adminPasscodeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminPasscodeID'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralDiagnostics::Events::RadioFaultChange::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = DataModelLogger::LogValue("ChangeType", indent + 1, value.changeType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ChangeType'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("LatestValue", indent + 1, value.latestValue);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LatestValue'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
             return err;
         }
     }
@@ -3253,39 +3313,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralDiagnostics::Events::NetworkFaultChange::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::StateChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
+        CHIP_ERROR err = DataModelLogger::LogValue("ActionID", indent + 1, value.actionID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActionID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("InvokeID", indent + 1, value.invokeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'InvokeID'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralDiagnostics::Events::BootReason::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("BootReason", indent + 1, value.bootReason);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'BootReason'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
             return err;
         }
     }
@@ -3293,31 +3344,38 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SoftwareDiagnostics::Events::SoftwareFault::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::ActionFailed::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Id", indent + 1, value.id);
+        CHIP_ERROR err = DataModelLogger::LogValue("ActionID", indent + 1, value.actionID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Id'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActionID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = DataModelLogger::LogValue("InvokeID", indent + 1, value.invokeID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'InvokeID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FaultRecording", indent + 1, value.faultRecording);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FaultRecording'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Error", indent + 1, value.error);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Error'");
             return err;
         }
     }
@@ -3326,14 +3384,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType & value)
+                                     const BasicInformation::Events::StartUp::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ConnectionStatus", indent + 1, value.connectionStatus);
+        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ConnectionStatus'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
             return err;
         }
     }
@@ -3342,22 +3400,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ThreadNetworkDiagnostics::Events::NetworkFaultChange::DecodableType & value)
+                                     const BasicInformation::Events::ShutDown::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const BasicInformation::Events::Leave::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
             return err;
         }
     }
@@ -3366,14 +3424,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const WiFiNetworkDiagnostics::Events::Disconnection::DecodableType & value)
+                                     const BasicInformation::Events::ReachableChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ReasonCode", indent + 1, value.reasonCode);
+        CHIP_ERROR err = DataModelLogger::LogValue("ReachableNewValue", indent + 1, value.reachableNewValue);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReasonCode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReachableNewValue'");
             return err;
         }
     }
@@ -3382,62 +3440,38 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType & value)
+                                     const OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AssociationFailure", indent + 1, value.associationFailure);
+        CHIP_ERROR err = DataModelLogger::LogValue("PreviousState", indent + 1, value.previousState);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AssociationFailure'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousState'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Status", indent + 1, value.status);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewState", indent + 1, value.newState);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Status'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewState'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ConnectionStatus", indent + 1, value.connectionStatus);
+        CHIP_ERROR err = DataModelLogger::LogValue("Reason", indent + 1, value.reason);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ConnectionStatus'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Reason'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Events::DSTTableEmpty::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Events::DSTStatus::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("DSTOffsetActive", indent + 1, value.DSTOffsetActive);
+        CHIP_ERROR err = DataModelLogger::LogValue("TargetSoftwareVersion", indent + 1, value.targetSoftwareVersion);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DSTOffsetActive'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TargetSoftwareVersion'");
             return err;
         }
     }
@@ -3446,22 +3480,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Events::TimeZoneStatus::DecodableType & value)
+                                     const OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Offset", indent + 1, value.offset);
+        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Offset'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Name", indent + 1, value.name);
+        CHIP_ERROR err = DataModelLogger::LogValue("ProductID", indent + 1, value.productID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Name'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ProductID'");
             return err;
         }
     }
@@ -3470,23 +3504,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Events::TimeFailure::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Events::MissingTrustedTimeSource::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BridgedDeviceBasicInformation::Events::StartUp::DecodableType & value)
+                                     const OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -3497,50 +3515,51 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
             return err;
         }
     }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("BytesDownloaded", indent + 1, value.bytesDownloaded);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'BytesDownloaded'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ProgressPercent", indent + 1, value.progressPercent);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ProgressPercent'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("PlatformCode", indent + 1, value.platformCode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PlatformCode'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BridgedDeviceBasicInformation::Events::ShutDown::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BridgedDeviceBasicInformation::Events::Leave::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType & value)
+                                     const PowerSource::Events::WiredFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ReachableNewValue", indent + 1, value.reachableNewValue);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReachableNewValue'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::SwitchLatched::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3548,29 +3567,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sw
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::InitialPress::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const PowerSource::Events::BatFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::LongPress::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3578,14 +3591,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sw
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::ShortRelease::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const PowerSource::Events::BatChargeFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3593,14 +3615,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sw
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::LongRelease::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const GeneralDiagnostics::Events::HardwareFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3609,23 +3640,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sw
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Switch::Events::MultiPressOngoing::DecodableType & value)
+                                     const GeneralDiagnostics::Events::RadioFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
             return err;
         }
     }
     {
-        CHIP_ERROR err =
-            DataModelLogger::LogValue("CurrentNumberOfPressesCounted", indent + 1, value.currentNumberOfPressesCounted);
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CurrentNumberOfPressesCounted'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3634,22 +3664,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Switch::Events::MultiPressComplete::DecodableType & value)
+                                     const GeneralDiagnostics::Events::NetworkFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("TotalNumberOfPressesCounted", indent + 1, value.totalNumberOfPressesCounted);
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalNumberOfPressesCounted'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3658,14 +3688,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const BooleanState::Events::StateChange::DecodableType & value)
+                                     const GeneralDiagnostics::Events::BootReason::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("StateValue", indent + 1, value.stateValue);
+        CHIP_ERROR err = DataModelLogger::LogValue("BootReason", indent + 1, value.bootReason);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'StateValue'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'BootReason'");
             return err;
         }
     }
@@ -3674,38 +3704,46 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RefrigeratorAlarm::Events::Notify::DecodableType & value)
+                                     const SoftwareDiagnostics::Events::SoftwareFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Active", indent + 1, value.active);
+        CHIP_ERROR err = DataModelLogger::LogValue("Id", indent + 1, value.id);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Active'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Id'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Inactive", indent + 1, value.inactive);
+        CHIP_ERROR err = DataModelLogger::LogValue("Name", indent + 1, value.name);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Inactive'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Name'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        CHIP_ERROR err = DataModelLogger::LogValue("FaultRecording", indent + 1, value.faultRecording);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FaultRecording'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Mask", indent + 1, value.mask);
+        CHIP_ERROR err = DataModelLogger::LogValue("ConnectionStatus", indent + 1, value.connectionStatus);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Mask'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ConnectionStatus'");
             return err;
         }
     }
@@ -3714,14 +3752,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::SmokeAlarm::DecodableType & value)
+                                     const ThreadNetworkDiagnostics::Events::NetworkFaultChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        CHIP_ERROR err = DataModelLogger::LogValue("Current", indent + 1, value.current);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Current'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Previous", indent + 1, value.previous);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Previous'");
             return err;
         }
     }
@@ -3729,14 +3775,15 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const SmokeCoAlarm::Events::COAlarm::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const WiFiNetworkDiagnostics::Events::Disconnection::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        CHIP_ERROR err = DataModelLogger::LogValue("ReasonCode", indent + 1, value.reasonCode);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReasonCode'");
             return err;
         }
     }
@@ -3745,14 +3792,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sm
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::LowBattery::DecodableType & value)
+                                     const WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        CHIP_ERROR err = DataModelLogger::LogValue("AssociationFailureCause", indent + 1, value.associationFailureCause);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AssociationFailureCause'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Status", indent + 1, value.status);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Status'");
             return err;
         }
     }
@@ -3761,15 +3816,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::HardwareFault::DecodableType & value)
+                                     const WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ConnectionStatus", indent + 1, value.connectionStatus);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ConnectionStatus'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::EndOfService::DecodableType & value)
+                                     const TimeSynchronization::Events::DSTTableEmpty::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -3777,23 +3840,47 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::SelfTestComplete::DecodableType & value)
+                                     const TimeSynchronization::Events::DSTStatus::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("DSTOffsetActive", indent + 1, value.DSTOffsetActive);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DSTOffsetActive'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::AlarmMuted::DecodableType & value)
+                                     const TimeSynchronization::Events::TimeZoneStatus::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Offset", indent + 1, value.offset);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Offset'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Name", indent + 1, value.name);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Name'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::MuteEnded::DecodableType & value)
+                                     const TimeSynchronization::Events::TimeFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -3801,30 +3888,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::InterconnectSmokeAlarm::DecodableType & value)
+                                     const TimeSynchronization::Events::MissingTrustedTimeSource::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
-            return err;
-        }
-    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SmokeCoAlarm::Events::InterconnectCOAlarm::DecodableType & value)
+                                     const BridgedDeviceBasicInformation::Events::StartUp::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        CHIP_ERROR err = DataModelLogger::LogValue("SoftwareVersion", indent + 1, value.softwareVersion);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SoftwareVersion'");
             return err;
         }
     }
@@ -3832,7 +3911,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const SmokeCoAlarm::Events::AllClear::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const BridgedDeviceBasicInformation::Events::ShutDown::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -3840,38 +3920,37 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Sm
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DishwasherAlarm::Events::Notify::DecodableType & value)
+                                     const BridgedDeviceBasicInformation::Events::Leave::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Active", indent + 1, value.active);
+        CHIP_ERROR err = DataModelLogger::LogValue("ReachableNewValue", indent + 1, value.reachableNewValue);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Active'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("Inactive", indent + 1, value.inactive);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Inactive'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ReachableNewValue'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::SwitchLatched::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Mask", indent + 1, value.mask);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Mask'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
             return err;
         }
     }
@@ -3879,15 +3958,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalState::Events::OperationalError::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::InitialPress::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ErrorState'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
             return err;
         }
     }
@@ -3895,31 +3973,44 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalState::Events::OperationCompletion::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::LongPress::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CompletionErrorCode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::ShortRelease::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalOperationalTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Switch::Events::LongRelease::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PausedTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
             return err;
         }
     }
@@ -3928,14 +4019,23 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcOperationalState::Events::OperationalError::DecodableType & value)
+                                     const Switch::Events::MultiPressOngoing::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ErrorState'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err =
+            DataModelLogger::LogValue("CurrentNumberOfPressesCounted", indent + 1, value.currentNumberOfPressesCounted);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CurrentNumberOfPressesCounted'");
             return err;
         }
     }
@@ -3944,30 +4044,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcOperationalState::Events::OperationCompletion::DecodableType & value)
+                                     const Switch::Events::MultiPressComplete::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CompletionErrorCode'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalOperationalTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        CHIP_ERROR err = DataModelLogger::LogValue("TotalNumberOfPressesCounted", indent + 1, value.totalNumberOfPressesCounted);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PausedTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalNumberOfPressesCounted'");
             return err;
         }
     }
@@ -3976,14 +4068,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Events::DoorLockAlarm::DecodableType & value)
+                                     const BooleanState::Events::StateChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmCode", indent + 1, value.alarmCode);
+        CHIP_ERROR err = DataModelLogger::LogValue("StateValue", indent + 1, value.stateValue);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmCode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'StateValue'");
             return err;
         }
     }
@@ -3992,14 +4084,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Events::DoorStateChange::DecodableType & value)
+                                     const OvenCavityOperationalState::Events::OperationalError::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("DoorState", indent + 1, value.doorState);
+        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DoorState'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ErrorState'");
             return err;
         }
     }
@@ -4008,54 +4100,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Events::LockOperation::DecodableType & value)
+                                     const OvenCavityOperationalState::Events::OperationCompletion::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("LockOperationType", indent + 1, value.lockOperationType);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockOperationType'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CompletionErrorCode'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalOperationalTime'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Credentials", indent + 1, value.credentials);
+        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Credentials'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PausedTime'");
             return err;
         }
     }
@@ -4064,62 +4132,38 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Events::LockOperationError::DecodableType & value)
+                                     const RefrigeratorAlarm::Events::Notify::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("LockOperationType", indent + 1, value.lockOperationType);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockOperationType'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("OperationError", indent + 1, value.operationError);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationError'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("Active", indent + 1, value.active);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Active'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("Inactive", indent + 1, value.inactive);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Inactive'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Credentials", indent + 1, value.credentials);
+        CHIP_ERROR err = DataModelLogger::LogValue("Mask", indent + 1, value.mask);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Credentials'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Mask'");
             return err;
         }
     }
@@ -4128,62 +4172,45 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Events::LockUserChange::DecodableType & value)
+                                     const SmokeCoAlarm::Events::SmokeAlarm::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("LockDataType", indent + 1, value.lockDataType);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockDataType'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("DataOperationType", indent + 1, value.dataOperationType);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DataOperationType'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const SmokeCoAlarm::Events::COAlarm::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
             return err;
         }
     }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const SmokeCoAlarm::Events::LowBattery::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("DataIndex", indent + 1, value.dataIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DataIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
             return err;
         }
     }
@@ -4192,7 +4219,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::SupplyVoltageLow::DecodableType & value)
+                                     const SmokeCoAlarm::Events::HardwareFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4200,7 +4227,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::SupplyVoltageHigh::DecodableType & value)
+                                     const SmokeCoAlarm::Events::EndOfService::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4208,7 +4235,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::PowerMissingPhase::DecodableType & value)
+                                     const SmokeCoAlarm::Events::SelfTestComplete::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4216,7 +4243,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::SystemPressureLow::DecodableType & value)
+                                     const SmokeCoAlarm::Events::AlarmMuted::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4224,7 +4251,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::SystemPressureHigh::DecodableType & value)
+                                     const SmokeCoAlarm::Events::MuteEnded::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4232,23 +4259,38 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::DryRunning::DecodableType & value)
+                                     const SmokeCoAlarm::Events::InterconnectSmokeAlarm::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::MotorTemperatureHigh::DecodableType & value)
+                                     const SmokeCoAlarm::Events::InterconnectCOAlarm::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmSeverityLevel'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::PumpMotorFatalFailure::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const SmokeCoAlarm::Events::AllClear::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4256,55 +4298,167 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::ElectronicTemperatureHigh::DecodableType & value)
+                                     const DishwasherAlarm::Events::Notify::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Active", indent + 1, value.active);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Active'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Inactive", indent + 1, value.inactive);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Inactive'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Mask", indent + 1, value.mask);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Mask'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::PumpBlocked::DecodableType & value)
+                                     const OperationalState::Events::OperationalError::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ErrorState'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::SensorFailure::DecodableType & value)
+                                     const OperationalState::Events::OperationCompletion::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CompletionErrorCode'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalOperationalTime'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PausedTime'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::ElectronicNonFatalFailure::DecodableType & value)
+                                     const RvcOperationalState::Events::OperationalError::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ErrorState'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::ElectronicFatalFailure::DecodableType & value)
+                                     const RvcOperationalState::Events::OperationCompletion::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'CompletionErrorCode'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TotalOperationalTime'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PausedTime'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::GeneralFault::DecodableType & value)
+                                     const BooleanSensorConfiguration::Events::AlarmsStateChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmsActive", indent + 1, value.alarmsActive);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmsActive'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmsSuppressed", indent + 1, value.alarmsSuppressed);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmsSuppressed'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::Leakage::DecodableType & value)
+                                     const BooleanSensorConfiguration::Events::SensorFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -4312,69 +4466,118 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::AirDetection::DecodableType & value)
+                                     const ValveConfigurationAndControl::Events::ValveStateChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ValveState", indent + 1, value.valveState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ValveState'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const PumpConfigurationAndControl::Events::TurbineOperation::DecodableType & value)
+                                     const ValveConfigurationAndControl::Events::ValveFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ValveFault", indent + 1, value.valveFault);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ValveFault'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const UnitTesting::Events::TestEvent::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DemandResponseLoadControl::Events::LoadControlEventStatusChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg1", indent + 1, value.arg1);
+        CHIP_ERROR err = DataModelLogger::LogValue("EventID", indent + 1, value.eventID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg1'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'EventID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg2", indent + 1, value.arg2);
+        CHIP_ERROR err = DataModelLogger::LogValue("TransitionIndex", indent + 1, value.transitionIndex);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg2'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TransitionIndex'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg3", indent + 1, value.arg3);
+        CHIP_ERROR err = DataModelLogger::LogValue("Status", indent + 1, value.status);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg3'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Status'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg4", indent + 1, value.arg4);
+        CHIP_ERROR err = DataModelLogger::LogValue("Criticality", indent + 1, value.criticality);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg4'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Criticality'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg5", indent + 1, value.arg5);
+        CHIP_ERROR err = DataModelLogger::LogValue("Control", indent + 1, value.control);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg5'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Control'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Arg6", indent + 1, value.arg6);
+        CHIP_ERROR err = DataModelLogger::LogValue("TemperatureControl", indent + 1, value.temperatureControl);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg6'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TemperatureControl'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AverageLoadControl", indent + 1, value.averageLoadControl);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AverageLoadControl'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("DutyCycleControl", indent + 1, value.dutyCycleControl);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DutyCycleControl'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("PowerSavingsControl", indent + 1, value.powerSavingsControl);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PowerSavingsControl'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("HeatingSourceControl", indent + 1, value.heatingSourceControl);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'HeatingSourceControl'");
             return err;
         }
     }
@@ -4383,14 +4586,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Un
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Events::TestFabricScopedEvent::DecodableType & value)
+                                     const EnergyEvse::Events::EVConnected::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionID", indent + 1, value.sessionID);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionID'");
             return err;
         }
     }
@@ -4398,690 +4601,1341 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::AddGroupResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::ViewGroupResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupName", indent + 1, value.groupName));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::GetGroupMembershipResponse::DecodableType & value)
+                                     const EnergyEvse::Events::EVNotDetected::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupList", indent + 1, value.groupList));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionID", indent + 1, value.sessionID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionID'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionDuration", indent + 1, value.sessionDuration);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionDuration'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionEnergyCharged", indent + 1, value.sessionEnergyCharged);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionEnergyCharged'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionEnergyDischarged", indent + 1, value.sessionEnergyDischarged);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionEnergyDischarged'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::RemoveGroupResponse::DecodableType & value)
+                                     const EnergyEvse::Events::EnergyTransferStarted::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionID", indent + 1, value.sessionID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionID'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("MaximumCurrent", indent + 1, value.maximumCurrent);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'MaximumCurrent'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::AddSceneResponse::DecodableType & value)
+                                     const EnergyEvse::Events::EnergyTransferStopped::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionID", indent + 1, value.sessionID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionID'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Reason", indent + 1, value.reason);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Reason'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("EnergyTransferred", indent + 1, value.energyTransferred);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'EnergyTransferred'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::ViewSceneResponse::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const EnergyEvse::Events::Fault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SessionID", indent + 1, value.sessionID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SessionID'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'State'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FaultStatePreviousState", indent + 1, value.faultStatePreviousState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FaultStatePreviousState'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FaultStateCurrentState", indent + 1, value.faultStateCurrentState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FaultStateCurrentState'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::RemoveSceneResponse::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const EnergyEvse::Events::Rfid::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Uid", indent + 1, value.uid);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Uid'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::RemoveAllScenesResponse::DecodableType & value)
+                                     const DoorLock::Events::DoorLockAlarm::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("AlarmCode", indent + 1, value.alarmCode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AlarmCode'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::StoreSceneResponse::DecodableType & value)
+                                     const DoorLock::Events::DoorStateChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("DoorState", indent + 1, value.doorState);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DoorState'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::GetSceneMembershipResponse::DecodableType & value)
+                                     const DoorLock::Events::LockOperation::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneList", indent + 1, value.sceneList));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("LockOperationType", indent + 1, value.lockOperationType);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockOperationType'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Credentials", indent + 1, value.credentials);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Credentials'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value)
+                                     const DoorLock::Events::LockOperationError::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("LockOperationType", indent + 1, value.lockOperationType);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockOperationType'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("OperationError", indent + 1, value.operationError);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationError'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Credentials", indent + 1, value.credentials);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Credentials'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value)
+                                     const DoorLock::Events::LockUserChange::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
-    DataModelLogger::LogString(indent, "}");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("LockDataType", indent + 1, value.lockDataType);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'LockDataType'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("DataOperationType", indent + 1, value.dataOperationType);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DataOperationType'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("OperationSource", indent + 1, value.operationSource);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'OperationSource'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("UserIndex", indent + 1, value.userIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'UserIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("SourceNode", indent + 1, value.sourceNode);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'SourceNode'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("DataIndex", indent + 1, value.dataIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DataIndex'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::CopySceneResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::SupplyVoltageLow::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdentifierFrom", indent + 1, value.groupIdentifierFrom));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdentifierFrom", indent + 1, value.sceneIdentifierFrom));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::SupplyVoltageHigh::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("imageURI", indent + 1, value.imageURI));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersion", indent + 1, value.softwareVersion));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersionString", indent + 1, value.softwareVersionString));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("updateToken", indent + 1, value.updateToken));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userConsentNeeded", indent + 1, value.userConsentNeeded));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("metadataForRequestor", indent + 1, value.metadataForRequestor));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::PowerMissingPhase::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("action", indent + 1, value.action));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::SystemPressureLow::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::SystemPressureHigh::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::DryRunning::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::MotorTemperatureHigh::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("wiFiScanResults", indent + 1, value.wiFiScanResults));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("threadScanResults", indent + 1, value.threadScanResults));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::PumpMotorFatalFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("networkIndex", indent + 1, value.networkIndex));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::ElectronicTemperatureHigh::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorValue", indent + 1, value.errorValue));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::PumpBlocked::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("logContent", indent + 1, value.logContent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("UTCTimeStamp", indent + 1, value.UTCTimeStamp));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("timeSinceBoot", indent + 1, value.timeSinceBoot));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TimeSynchronization::Commands::SetTimeZoneResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::SensorFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("DSTOffsetRequired", indent + 1, value.DSTOffsetRequired));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalCredentials::Commands::AttestationResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::ElectronicNonFatalFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationElements", indent + 1, value.attestationElements));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationSignature", indent + 1, value.attestationSignature));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalCredentials::Commands::CertificateChainResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::ElectronicFatalFailure::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("certificate", indent + 1, value.certificate));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalCredentials::Commands::CSRResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::GeneralFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("NOCSRElements", indent + 1, value.NOCSRElements));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationSignature", indent + 1, value.attestationSignature));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalCredentials::Commands::NOCResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::Leakage::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusCode", indent + 1, value.statusCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("fabricIndex", indent + 1, value.fabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::AirDetection::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySet", indent + 1, value.groupKeySet));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value)
+                                     const PumpConfigurationAndControl::Events::TurbineOperation::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySetIDs", indent + 1, value.groupKeySetIDs));
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const IcdManagement::Commands::RegisterClientResponse::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const UnitTesting::Events::TestEvent::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("ICDCounter", indent + 1, value.ICDCounter));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg1", indent + 1, value.arg1);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg1'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg2", indent + 1, value.arg2);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg2'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg3", indent + 1, value.arg3);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg3'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg4", indent + 1, value.arg4);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg4'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg5", indent + 1, value.arg5);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg5'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("Arg6", indent + 1, value.arg6);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg6'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value)
+                                     const UnitTesting::Events::TestFabricScopedEvent::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
+
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(
-    const char * label, size_t indent,
-    const RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & value)
+
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Groups::Commands::AddGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcRunMode::Commands::ChangeToModeResponse::DecodableType & value)
+                                     const Groups::Commands::ViewGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupName", indent + 1, value.groupName));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & value)
+                                     const Groups::Commands::GetGroupMembershipResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupList", indent + 1, value.groupList));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DishwasherMode::Commands::ChangeToModeResponse::DecodableType & value)
+                                     const Groups::Commands::RemoveGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalState::Commands::OperationalCommandResponse::DecodableType & value)
+                                     const Scenes::Commands::AddSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("commandResponseState", indent + 1, value.commandResponseState));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcOperationalState::Commands::OperationalCommandResponse::DecodableType & value)
+                                     const Scenes::Commands::ViewSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("commandResponseState", indent + 1, value.commandResponseState));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value)
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Scenes::Commands::RemoveSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("weekDayIndex", indent + 1, value.weekDayIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("daysMask", indent + 1, value.daysMask));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startHour", indent + 1, value.startHour));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startMinute", indent + 1, value.startMinute));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("endHour", indent + 1, value.endHour));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("endMinute", indent + 1, value.endMinute));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::RemoveAllScenesResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("yearDayIndex", indent + 1, value.yearDayIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::StoreSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("holidayIndex", indent + 1, value.holidayIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("operatingMode", indent + 1, value.operatingMode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetUserResponse::DecodableType & value)
+                                     const Scenes::Commands::GetSceneMembershipResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueID", indent + 1, value.userUniqueID));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentials", indent + 1, value.credentials));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextUserIndex", indent + 1, value.nextUserIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneList", indent + 1, value.sceneList));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::SetCredentialResponse::DecodableType & value)
+                                     const Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value)
+                                     const Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialExists", indent + 1, value.credentialExists));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::CopySceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("numberOfTransitionsForSequence", indent + 1, value.numberOfTransitionsForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekForSequence", indent + 1, value.dayOfWeekForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("modeForSequence", indent + 1, value.modeForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitions", indent + 1, value.transitions));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdentifierFrom", indent + 1, value.groupIdentifierFrom));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdentifierFrom", indent + 1, value.sceneIdentifierFrom));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Channel::Commands::ChangeChannelResponse::DecodableType & value)
+                                     const OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("imageURI", indent + 1, value.imageURI));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersion", indent + 1, value.softwareVersion));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersionString", indent + 1, value.softwareVersionString));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("updateToken", indent + 1, value.updateToken));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userConsentNeeded", indent + 1, value.userConsentNeeded));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("metadataForRequestor", indent + 1, value.metadataForRequestor));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TargetNavigator::Commands::NavigateTargetResponse::DecodableType & value)
+                                     const OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("action", indent + 1, value.action));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const MediaPlayback::Commands::PlaybackResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const KeypadInput::Commands::SendKeyResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ContentLauncher::Commands::LauncherResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ApplicationLauncher::Commands::LauncherResponse::DecodableType & value)
+                                     const NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("wiFiScanResults", indent + 1, value.wiFiScanResults));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("threadScanResults", indent + 1, value.threadScanResults));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const AccountLogin::Commands::GetSetupPINResponse::DecodableType & value)
+                                     const NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("setupPIN", indent + 1, value.setupPIN));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("networkIndex", indent + 1, value.networkIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("clientIdentity", indent + 1, value.clientIdentity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("possessionSignature", indent + 1, value.possessionSignature));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value)
+                                     const NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileCount", indent + 1, value.profileCount));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("maxNumberOfIntervals", indent + 1, value.maxNumberOfIntervals));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("listOfAttributes", indent + 1, value.listOfAttributes));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("networkingStatus", indent + 1, value.networkingStatus));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorValue", indent + 1, value.errorValue));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("identity", indent + 1, value.identity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("possessionSignature", indent + 1, value.possessionSignature));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startTime", indent + 1, value.startTime));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("numberOfIntervalsDelivered", indent + 1, value.numberOfIntervalsDelivered));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("attributeId", indent + 1, value.attributeId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("intervals", indent + 1, value.intervals));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("logContent", indent + 1, value.logContent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("UTCTimeStamp", indent + 1, value.UTCTimeStamp));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("timeSinceBoot", indent + 1, value.timeSinceBoot));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestSpecificResponse::DecodableType & value)
+                                     const GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("systemTimeUs", indent + 1, value.systemTimeUs));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("UTCTimeUs", indent + 1, value.UTCTimeUs));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestAddArgumentsResponse::DecodableType & value)
+                                     const TimeSynchronization::Commands::SetTimeZoneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("DSTOffsetRequired", indent + 1, value.DSTOffsetRequired));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType & value)
+                                     const OperationalCredentials::Commands::AttestationResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationElements", indent + 1, value.attestationElements));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationSignature", indent + 1, value.attestationSignature));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestStructArrayArgumentResponse::DecodableType & value)
+                                     const OperationalCredentials::Commands::CertificateChainResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg2", indent + 1, value.arg2));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg3", indent + 1, value.arg3));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg4", indent + 1, value.arg4));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg5", indent + 1, value.arg5));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg6", indent + 1, value.arg6));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("certificate", indent + 1, value.certificate));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType & value)
+                                     const OperationalCredentials::Commands::CSRResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("NOCSRElements", indent + 1, value.NOCSRElements));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("attestationSignature", indent + 1, value.attestationSignature));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestEnumsResponse::DecodableType & value)
+                                     const OperationalCredentials::Commands::NOCResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg2", indent + 1, value.arg2));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusCode", indent + 1, value.statusCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("fabricIndex", indent + 1, value.fabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestNullableOptionalResponse::DecodableType & value)
+                                     const GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("wasPresent", indent + 1, value.wasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("wasNull", indent + 1, value.wasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("originalValue", indent + 1, value.originalValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySet", indent + 1, value.groupKeySet));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestComplexNullableOptionalResponse::DecodableType & value)
+                                     const GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableIntWasNull", indent + 1, value.nullableIntWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableIntValue", indent + 1, value.nullableIntValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalIntWasPresent", indent + 1, value.optionalIntWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalIntValue", indent + 1, value.optionalIntValue));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalIntWasPresent", indent + 1, value.nullableOptionalIntWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalIntWasNull", indent + 1, value.nullableOptionalIntWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalIntValue", indent + 1, value.nullableOptionalIntValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStringWasNull", indent + 1, value.nullableStringWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStringValue", indent + 1, value.nullableStringValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStringWasPresent", indent + 1, value.optionalStringWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStringValue", indent + 1, value.optionalStringValue));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalStringWasPresent", indent + 1, value.nullableOptionalStringWasPresent));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalStringWasNull", indent + 1, value.nullableOptionalStringWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalStringValue", indent + 1, value.nullableOptionalStringValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStructWasNull", indent + 1, value.nullableStructWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStructValue", indent + 1, value.nullableStructValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStructWasPresent", indent + 1, value.optionalStructWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStructValue", indent + 1, value.optionalStructValue));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalStructWasPresent", indent + 1, value.nullableOptionalStructWasPresent));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalStructWasNull", indent + 1, value.nullableOptionalStructWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalStructValue", indent + 1, value.nullableOptionalStructValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableListWasNull", indent + 1, value.nullableListWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableListValue", indent + 1, value.nullableListValue));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalListWasPresent", indent + 1, value.optionalListWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalListValue", indent + 1, value.optionalListValue));
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("nullableOptionalListWasPresent", indent + 1, value.nullableOptionalListWasPresent));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalListWasNull", indent + 1, value.nullableOptionalListWasNull));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalListValue", indent + 1, value.nullableOptionalListValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySetIDs", indent + 1, value.groupKeySetIDs));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::BooleanResponse::DecodableType & value)
+                                     const IcdManagement::Commands::RegisterClientResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("ICDCounter", indent + 1, value.ICDCounter));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::SimpleStructResponse::DecodableType & value)
+                                     const IcdManagement::Commands::StayActiveResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("promisedActiveDuration", indent + 1, value.promisedActiveDuration));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestEmitTestEventResponse::DecodableType & value)
+                                     const OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("commandResponseState", indent + 1, value.commandResponseState));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value)
+                                     const OvenMode::Commands::ChangeToModeResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const SampleMei::Commands::AddArgumentsResponse::DecodableType & value)
+                                     const LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-
-CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data)
+CHIP_ERROR DataModelLogger::LogValue(
+    const char * label, size_t indent,
+    const RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & value)
 {
-    ChipLogProgress(chipTool, "Endpoint: %u Cluster: " ChipLogFormatMEI " Attribute " ChipLogFormatMEI " DataVersion: %" PRIu32,
-                    path.mEndpointId, ChipLogValueMEI(path.mClusterId), ChipLogValueMEI(path.mAttributeId),
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const RvcRunMode::Commands::ChangeToModeResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DishwasherMode::Commands::ChangeToModeResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const OperationalState::Commands::OperationalCommandResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("commandResponseState", indent + 1, value.commandResponseState));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const RvcOperationalState::Commands::OperationalCommandResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("commandResponseState", indent + 1, value.commandResponseState));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const EnergyEvse::Commands::GetTargetsResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekforSequence", indent + 1, value.dayOfWeekforSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("chargingTargets", indent + 1, value.chargingTargets));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("weekDayIndex", indent + 1, value.weekDayIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("daysMask", indent + 1, value.daysMask));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startHour", indent + 1, value.startHour));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startMinute", indent + 1, value.startMinute));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("endHour", indent + 1, value.endHour));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("endMinute", indent + 1, value.endMinute));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("yearDayIndex", indent + 1, value.yearDayIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("holidayIndex", indent + 1, value.holidayIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("operatingMode", indent + 1, value.operatingMode));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::GetUserResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueID", indent + 1, value.userUniqueID));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentials", indent + 1, value.credentials));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextUserIndex", indent + 1, value.nextUserIndex));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::SetCredentialResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialExists", indent + 1, value.credentialExists));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("numberOfTransitionsForSequence", indent + 1, value.numberOfTransitionsForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekForSequence", indent + 1, value.dayOfWeekForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("modeForSequence", indent + 1, value.modeForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitions", indent + 1, value.transitions));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Channel::Commands::ChangeChannelResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const TargetNavigator::Commands::NavigateTargetResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const MediaPlayback::Commands::PlaybackResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const KeypadInput::Commands::SendKeyResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ContentLauncher::Commands::LauncherResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ApplicationLauncher::Commands::LauncherResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const AccountLogin::Commands::GetSetupPINResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("setupPIN", indent + 1, value.setupPIN));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileCount", indent + 1, value.profileCount));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("maxNumberOfIntervals", indent + 1, value.maxNumberOfIntervals));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("listOfAttributes", indent + 1, value.listOfAttributes));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startTime", indent + 1, value.startTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("numberOfIntervalsDelivered", indent + 1, value.numberOfIntervalsDelivered));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("attributeId", indent + 1, value.attributeId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("intervals", indent + 1, value.intervals));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestSpecificResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestAddArgumentsResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestStructArrayArgumentResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg2", indent + 1, value.arg2));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg3", indent + 1, value.arg3));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg4", indent + 1, value.arg4));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg5", indent + 1, value.arg5));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg6", indent + 1, value.arg6));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestEnumsResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg2", indent + 1, value.arg2));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestNullableOptionalResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("wasPresent", indent + 1, value.wasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("wasNull", indent + 1, value.wasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("originalValue", indent + 1, value.originalValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestComplexNullableOptionalResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableIntWasNull", indent + 1, value.nullableIntWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableIntValue", indent + 1, value.nullableIntValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalIntWasPresent", indent + 1, value.optionalIntWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalIntValue", indent + 1, value.optionalIntValue));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalIntWasPresent", indent + 1, value.nullableOptionalIntWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalIntWasNull", indent + 1, value.nullableOptionalIntWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalIntValue", indent + 1, value.nullableOptionalIntValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStringWasNull", indent + 1, value.nullableStringWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStringValue", indent + 1, value.nullableStringValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStringWasPresent", indent + 1, value.optionalStringWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStringValue", indent + 1, value.optionalStringValue));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalStringWasPresent", indent + 1, value.nullableOptionalStringWasPresent));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalStringWasNull", indent + 1, value.nullableOptionalStringWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalStringValue", indent + 1, value.nullableOptionalStringValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStructWasNull", indent + 1, value.nullableStructWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableStructValue", indent + 1, value.nullableStructValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStructWasPresent", indent + 1, value.optionalStructWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalStructValue", indent + 1, value.optionalStructValue));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalStructWasPresent", indent + 1, value.nullableOptionalStructWasPresent));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalStructWasNull", indent + 1, value.nullableOptionalStructWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalStructValue", indent + 1, value.nullableOptionalStructValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableListWasNull", indent + 1, value.nullableListWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableListValue", indent + 1, value.nullableListValue));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalListWasPresent", indent + 1, value.optionalListWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("optionalListValue", indent + 1, value.optionalListValue));
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("nullableOptionalListWasPresent", indent + 1, value.nullableOptionalListWasPresent));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalListWasNull", indent + 1, value.nullableOptionalListWasNull));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nullableOptionalListValue", indent + 1, value.nullableOptionalListValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::BooleanResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::SimpleStructResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestEmitTestEventResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const SampleMei::Commands::AddArgumentsResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data)
+{
+    ChipLogProgress(chipTool, "Endpoint: %u Cluster: " ChipLogFormatMEI " Attribute " ChipLogFormatMEI " DataVersion: %" PRIu32,
+                    path.mEndpointId, ChipLogValueMEI(path.mClusterId), ChipLogValueMEI(path.mAttributeId),
                     path.mDataVersion.ValueOr(0));
 
     switch (path.mClusterId)
@@ -5089,42 +5943,656 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
     case Identify::Id: {
         switch (path.mAttributeId)
         {
-        case Identify::Attributes::IdentifyTime::Id: {
+        case Identify::Attributes::IdentifyTime::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("IdentifyTime", 1, value);
+        }
+        case Identify::Attributes::IdentifyType::Id: {
+            chip::app::Clusters::Identify::IdentifyTypeEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("IdentifyType", 1, value);
+        }
+        case Identify::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case Identify::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case Identify::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case Identify::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case Identify::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case Identify::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case Groups::Id: {
+        switch (path.mAttributeId)
+        {
+        case Groups::Attributes::NameSupport::Id: {
+            chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NameSupport", 1, value);
+        }
+        case Groups::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case Groups::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case Groups::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case Groups::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case Groups::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case Groups::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case Scenes::Id: {
+        switch (path.mAttributeId)
+        {
+        case Scenes::Attributes::SceneCount::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SceneCount", 1, value);
+        }
+        case Scenes::Attributes::CurrentScene::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentScene", 1, value);
+        }
+        case Scenes::Attributes::CurrentGroup::Id: {
+            chip::GroupId value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentGroup", 1, value);
+        }
+        case Scenes::Attributes::SceneValid::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SceneValid", 1, value);
+        }
+        case Scenes::Attributes::NameSupport::Id: {
+            chip::BitMask<chip::app::Clusters::Scenes::NameSupportBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NameSupport", 1, value);
+        }
+        case Scenes::Attributes::LastConfiguredBy::Id: {
+            chip::app::DataModel::Nullable<chip::NodeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastConfiguredBy", 1, value);
+        }
+        case Scenes::Attributes::SceneTableSize::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SceneTableSize", 1, value);
+        }
+        case Scenes::Attributes::FabricSceneInfo::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FabricSceneInfo", 1, value);
+        }
+        case Scenes::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case Scenes::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case Scenes::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case Scenes::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case Scenes::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case Scenes::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case OnOff::Id: {
+        switch (path.mAttributeId)
+        {
+        case OnOff::Attributes::OnOff::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnOff", 1, value);
+        }
+        case OnOff::Attributes::GlobalSceneControl::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GlobalSceneControl", 1, value);
+        }
+        case OnOff::Attributes::OnTime::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnTime", 1, value);
+        }
+        case OnOff::Attributes::OffWaitTime::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OffWaitTime", 1, value);
+        }
+        case OnOff::Attributes::StartUpOnOff::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StartUpOnOff", 1, value);
+        }
+        case OnOff::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case OnOff::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case OnOff::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case OnOff::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case OnOff::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case OnOff::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case OnOffSwitchConfiguration::Id: {
+        switch (path.mAttributeId)
+        {
+        case OnOffSwitchConfiguration::Attributes::SwitchType::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("switch type", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::SwitchActions::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("switch actions", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case OnOffSwitchConfiguration::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case LevelControl::Id: {
+        switch (path.mAttributeId)
+        {
+        case LevelControl::Attributes::CurrentLevel::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentLevel", 1, value);
+        }
+        case LevelControl::Attributes::RemainingTime::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RemainingTime", 1, value);
+        }
+        case LevelControl::Attributes::MinLevel::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MinLevel", 1, value);
+        }
+        case LevelControl::Attributes::MaxLevel::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MaxLevel", 1, value);
+        }
+        case LevelControl::Attributes::CurrentFrequency::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentFrequency", 1, value);
+        }
+        case LevelControl::Attributes::MinFrequency::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MinFrequency", 1, value);
+        }
+        case LevelControl::Attributes::MaxFrequency::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MaxFrequency", 1, value);
+        }
+        case LevelControl::Attributes::Options::Id: {
+            chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Options", 1, value);
+        }
+        case LevelControl::Attributes::OnOffTransitionTime::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnOffTransitionTime", 1, value);
+        }
+        case LevelControl::Attributes::OnLevel::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnLevel", 1, value);
+        }
+        case LevelControl::Attributes::OnTransitionTime::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnTransitionTime", 1, value);
+        }
+        case LevelControl::Attributes::OffTransitionTime::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OffTransitionTime", 1, value);
+        }
+        case LevelControl::Attributes::DefaultMoveRate::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DefaultMoveRate", 1, value);
+        }
+        case LevelControl::Attributes::StartUpCurrentLevel::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StartUpCurrentLevel", 1, value);
+        }
+        case LevelControl::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case LevelControl::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case LevelControl::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case LevelControl::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case LevelControl::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case LevelControl::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case BinaryInputBasic::Id: {
+        switch (path.mAttributeId)
+        {
+        case BinaryInputBasic::Attributes::ActiveText::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("active text", 1, value);
+        }
+        case BinaryInputBasic::Attributes::Description::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("description", 1, value);
+        }
+        case BinaryInputBasic::Attributes::InactiveText::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("inactive text", 1, value);
+        }
+        case BinaryInputBasic::Attributes::OutOfService::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("out of service", 1, value);
+        }
+        case BinaryInputBasic::Attributes::Polarity::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("polarity", 1, value);
+        }
+        case BinaryInputBasic::Attributes::PresentValue::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("present value", 1, value);
+        }
+        case BinaryInputBasic::Attributes::Reliability::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("reliability", 1, value);
+        }
+        case BinaryInputBasic::Attributes::StatusFlags::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("status flags", 1, value);
+        }
+        case BinaryInputBasic::Attributes::ApplicationType::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("application type", 1, value);
+        }
+        case BinaryInputBasic::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case BinaryInputBasic::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case BinaryInputBasic::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case BinaryInputBasic::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case BinaryInputBasic::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case BinaryInputBasic::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("IdentifyTime", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case Identify::Attributes::IdentifyType::Id: {
-            chip::app::Clusters::Identify::IdentifyTypeEnum value;
+        }
+        break;
+    }
+    case PulseWidthModulation::Id: {
+        switch (path.mAttributeId)
+        {
+        case PulseWidthModulation::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case PulseWidthModulation::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case PulseWidthModulation::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case PulseWidthModulation::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case PulseWidthModulation::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case PulseWidthModulation::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case Descriptor::Id: {
+        switch (path.mAttributeId)
+        {
+        case Descriptor::Attributes::DeviceTypeList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DeviceTypeList", 1, value);
+        }
+        case Descriptor::Attributes::ServerList::Id: {
+            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ServerList", 1, value);
+        }
+        case Descriptor::Attributes::ClientList::Id: {
+            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClientList", 1, value);
+        }
+        case Descriptor::Attributes::PartsList::Id: {
+            chip::app::DataModel::DecodableList<chip::EndpointId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PartsList", 1, value);
+        }
+        case Descriptor::Attributes::TagList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TagList", 1, value);
+        }
+        case Descriptor::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case Descriptor::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case Descriptor::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case Descriptor::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case Descriptor::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case Descriptor::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case Binding::Id: {
+        switch (path.mAttributeId)
+        {
+        case Binding::Attributes::Binding::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Binding", 1, value);
+        }
+        case Binding::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case Binding::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case Binding::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EventList", 1, value);
+        }
+        case Binding::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case Binding::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case Binding::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case AccessControl::Id: {
+        switch (path.mAttributeId)
+        {
+        case AccessControl::Attributes::Acl::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::DecodableType>
+                value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ACL", 1, value);
+        }
+        case AccessControl::Attributes::Extension::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::AccessControl::Structs::AccessControlExtensionStruct::DecodableType>
+                value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Extension", 1, value);
+        }
+        case AccessControl::Attributes::SubjectsPerAccessControlEntry::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SubjectsPerAccessControlEntry", 1, value);
+        }
+        case AccessControl::Attributes::TargetsPerAccessControlEntry::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetsPerAccessControlEntry", 1, value);
+        }
+        case AccessControl::Attributes::AccessControlEntriesPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("IdentifyType", 1, value);
+            return DataModelLogger::LogValue("AccessControlEntriesPerFabric", 1, value);
         }
-        case Identify::Attributes::GeneratedCommandList::Id: {
+        case AccessControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Identify::Attributes::AcceptedCommandList::Id: {
+        case AccessControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Identify::Attributes::EventList::Id: {
+        case AccessControl::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case Identify::Attributes::AttributeList::Id: {
+        case AccessControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Identify::Attributes::FeatureMap::Id: {
+        case AccessControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Identify::Attributes::ClusterRevision::Id: {
+        case AccessControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5132,40 +6600,50 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Groups::Id: {
+    case Actions::Id: {
         switch (path.mAttributeId)
         {
-        case Groups::Attributes::NameSupport::Id: {
-            chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value;
+        case Actions::Attributes::ActionList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NameSupport", 1, value);
+            return DataModelLogger::LogValue("ActionList", 1, value);
         }
-        case Groups::Attributes::GeneratedCommandList::Id: {
+        case Actions::Attributes::EndpointLists::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EndpointLists", 1, value);
+        }
+        case Actions::Attributes::SetupURL::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SetupURL", 1, value);
+        }
+        case Actions::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Groups::Attributes::AcceptedCommandList::Id: {
+        case Actions::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Groups::Attributes::EventList::Id: {
+        case Actions::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case Groups::Attributes::AttributeList::Id: {
+        case Actions::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Groups::Attributes::FeatureMap::Id: {
+        case Actions::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Groups::Attributes::ClusterRevision::Id: {
+        case Actions::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5173,136 +6651,150 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Scenes::Id: {
+    case BasicInformation::Id: {
         switch (path.mAttributeId)
         {
-        case Scenes::Attributes::SceneCount::Id: {
-            uint8_t value;
+        case BasicInformation::Attributes::DataModelRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SceneCount", 1, value);
+            return DataModelLogger::LogValue("DataModelRevision", 1, value);
         }
-        case Scenes::Attributes::CurrentScene::Id: {
-            uint8_t value;
+        case BasicInformation::Attributes::VendorName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentScene", 1, value);
+            return DataModelLogger::LogValue("VendorName", 1, value);
         }
-        case Scenes::Attributes::CurrentGroup::Id: {
-            chip::GroupId value;
+        case BasicInformation::Attributes::VendorID::Id: {
+            chip::VendorId value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentGroup", 1, value);
+            return DataModelLogger::LogValue("VendorID", 1, value);
         }
-        case Scenes::Attributes::SceneValid::Id: {
-            bool value;
+        case BasicInformation::Attributes::ProductName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SceneValid", 1, value);
+            return DataModelLogger::LogValue("ProductName", 1, value);
         }
-        case Scenes::Attributes::NameSupport::Id: {
-            uint8_t value;
+        case BasicInformation::Attributes::ProductID::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NameSupport", 1, value);
+            return DataModelLogger::LogValue("ProductID", 1, value);
         }
-        case Scenes::Attributes::LastConfiguredBy::Id: {
-            chip::app::DataModel::Nullable<chip::NodeId> value;
+        case BasicInformation::Attributes::NodeLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastConfiguredBy", 1, value);
+            return DataModelLogger::LogValue("NodeLabel", 1, value);
         }
-        case Scenes::Attributes::SceneTableSize::Id: {
+        case BasicInformation::Attributes::Location::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Location", 1, value);
+        }
+        case BasicInformation::Attributes::HardwareVersion::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SceneTableSize", 1, value);
+            return DataModelLogger::LogValue("HardwareVersion", 1, value);
         }
-        case Scenes::Attributes::RemainingCapacity::Id: {
-            uint8_t value;
+        case BasicInformation::Attributes::HardwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemainingCapacity", 1, value);
+            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
         }
-        case Scenes::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case BasicInformation::Attributes::SoftwareVersion::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
         }
-        case Scenes::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case BasicInformation::Attributes::SoftwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
         }
-        case Scenes::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case BasicInformation::Attributes::ManufacturingDate::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
         }
-        case Scenes::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case BasicInformation::Attributes::PartNumber::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("PartNumber", 1, value);
         }
-        case Scenes::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case BasicInformation::Attributes::ProductURL::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("ProductURL", 1, value);
         }
-        case Scenes::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case BasicInformation::Attributes::ProductLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("ProductLabel", 1, value);
         }
+        case BasicInformation::Attributes::SerialNumber::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SerialNumber", 1, value);
         }
-        break;
-    }
-    case OnOff::Id: {
-        switch (path.mAttributeId)
-        {
-        case OnOff::Attributes::OnOff::Id: {
+        case BasicInformation::Attributes::LocalConfigDisabled::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnOff", 1, value);
+            return DataModelLogger::LogValue("LocalConfigDisabled", 1, value);
         }
-        case OnOff::Attributes::GlobalSceneControl::Id: {
+        case BasicInformation::Attributes::Reachable::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GlobalSceneControl", 1, value);
+            return DataModelLogger::LogValue("Reachable", 1, value);
         }
-        case OnOff::Attributes::OnTime::Id: {
-            uint16_t value;
+        case BasicInformation::Attributes::UniqueID::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnTime", 1, value);
+            return DataModelLogger::LogValue("UniqueID", 1, value);
         }
-        case OnOff::Attributes::OffWaitTime::Id: {
-            uint16_t value;
+        case BasicInformation::Attributes::CapabilityMinima::Id: {
+            chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OffWaitTime", 1, value);
+            return DataModelLogger::LogValue("CapabilityMinima", 1, value);
         }
-        case OnOff::Attributes::StartUpOnOff::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> value;
+        case BasicInformation::Attributes::ProductAppearance::Id: {
+            chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpOnOff", 1, value);
+            return DataModelLogger::LogValue("ProductAppearance", 1, value);
         }
-        case OnOff::Attributes::GeneratedCommandList::Id: {
+        case BasicInformation::Attributes::SpecificationVersion::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SpecificationVersion", 1, value);
+        }
+        case BasicInformation::Attributes::MaxPathsPerInvoke::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MaxPathsPerInvoke", 1, value);
+        }
+        case BasicInformation::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OnOff::Attributes::AcceptedCommandList::Id: {
+        case BasicInformation::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OnOff::Attributes::EventList::Id: {
+        case BasicInformation::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OnOff::Attributes::AttributeList::Id: {
+        case BasicInformation::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OnOff::Attributes::FeatureMap::Id: {
+        case BasicInformation::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OnOff::Attributes::ClusterRevision::Id: {
+        case BasicInformation::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5310,45 +6802,35 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OnOffSwitchConfiguration::Id: {
+    case OtaSoftwareUpdateProvider::Id: {
         switch (path.mAttributeId)
         {
-        case OnOffSwitchConfiguration::Attributes::SwitchType::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("switch type", 1, value);
-        }
-        case OnOffSwitchConfiguration::Attributes::SwitchActions::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("switch actions", 1, value);
-        }
-        case OnOffSwitchConfiguration::Attributes::GeneratedCommandList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::AcceptedCommandList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::EventList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::AttributeList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::FeatureMap::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::ClusterRevision::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5356,105 +6838,103 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LevelControl::Id: {
+    case OtaSoftwareUpdateRequestor::Id: {
         switch (path.mAttributeId)
         {
-        case LevelControl::Attributes::CurrentLevel::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentLevel", 1, value);
-        }
-        case LevelControl::Attributes::RemainingTime::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemainingTime", 1, value);
-        }
-        case LevelControl::Attributes::MinLevel::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinLevel", 1, value);
+            return DataModelLogger::LogValue("DefaultOTAProviders", 1, value);
         }
-        case LevelControl::Attributes::MaxLevel::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxLevel", 1, value);
+            return DataModelLogger::LogValue("UpdatePossible", 1, value);
         }
-        case LevelControl::Attributes::CurrentFrequency::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdateState::Id: {
+            chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentFrequency", 1, value);
+            return DataModelLogger::LogValue("UpdateState", 1, value);
         }
-        case LevelControl::Attributes::MinFrequency::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinFrequency", 1, value);
+            return DataModelLogger::LogValue("UpdateStateProgress", 1, value);
         }
-        case LevelControl::Attributes::MaxFrequency::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxFrequency", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LevelControl::Attributes::Options::Id: {
-            chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> value;
+        case OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Options", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LevelControl::Attributes::OnOffTransitionTime::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnOffTransitionTime", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case LevelControl::Attributes::OnLevel::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case OtaSoftwareUpdateRequestor::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnLevel", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LevelControl::Attributes::OnTransitionTime::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case OtaSoftwareUpdateRequestor::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnTransitionTime", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LevelControl::Attributes::OffTransitionTime::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OffTransitionTime", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case LevelControl::Attributes::DefaultMoveRate::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        }
+        break;
+    }
+    case LocalizationConfiguration::Id: {
+        switch (path.mAttributeId)
+        {
+        case LocalizationConfiguration::Attributes::ActiveLocale::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DefaultMoveRate", 1, value);
+            return DataModelLogger::LogValue("ActiveLocale", 1, value);
         }
-        case LevelControl::Attributes::StartUpCurrentLevel::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case LocalizationConfiguration::Attributes::SupportedLocales::Id: {
+            chip::app::DataModel::DecodableList<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpCurrentLevel", 1, value);
+            return DataModelLogger::LogValue("SupportedLocales", 1, value);
         }
-        case LevelControl::Attributes::GeneratedCommandList::Id: {
+        case LocalizationConfiguration::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LevelControl::Attributes::AcceptedCommandList::Id: {
+        case LocalizationConfiguration::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LevelControl::Attributes::EventList::Id: {
+        case LocalizationConfiguration::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case LevelControl::Attributes::AttributeList::Id: {
+        case LocalizationConfiguration::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LevelControl::Attributes::FeatureMap::Id: {
+        case LocalizationConfiguration::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LevelControl::Attributes::ClusterRevision::Id: {
+        case LocalizationConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5462,80 +6942,91 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BinaryInputBasic::Id: {
+    case TimeFormatLocalization::Id: {
         switch (path.mAttributeId)
         {
-        case BinaryInputBasic::Attributes::ActiveText::Id: {
-            chip::CharSpan value;
+        case TimeFormatLocalization::Attributes::HourFormat::Id: {
+            chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active text", 1, value);
+            return DataModelLogger::LogValue("HourFormat", 1, value);
         }
-        case BinaryInputBasic::Attributes::Description::Id: {
-            chip::CharSpan value;
+        case TimeFormatLocalization::Attributes::ActiveCalendarType::Id: {
+            chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("description", 1, value);
+            return DataModelLogger::LogValue("ActiveCalendarType", 1, value);
         }
-        case BinaryInputBasic::Attributes::InactiveText::Id: {
-            chip::CharSpan value;
+        case TimeFormatLocalization::Attributes::SupportedCalendarTypes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("inactive text", 1, value);
+            return DataModelLogger::LogValue("SupportedCalendarTypes", 1, value);
         }
-        case BinaryInputBasic::Attributes::OutOfService::Id: {
-            bool value;
+        case TimeFormatLocalization::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("out of service", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::Polarity::Id: {
-            uint8_t value;
+        case TimeFormatLocalization::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("polarity", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::PresentValue::Id: {
-            bool value;
+        case TimeFormatLocalization::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("present value", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BinaryInputBasic::Attributes::Reliability::Id: {
-            uint8_t value;
+        case TimeFormatLocalization::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reliability", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BinaryInputBasic::Attributes::StatusFlags::Id: {
-            uint8_t value;
+        case TimeFormatLocalization::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("status flags", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BinaryInputBasic::Attributes::ApplicationType::Id: {
-            uint32_t value;
+        case TimeFormatLocalization::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("application type", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case BinaryInputBasic::Attributes::GeneratedCommandList::Id: {
+        }
+        break;
+    }
+    case UnitLocalization::Id: {
+        switch (path.mAttributeId)
+        {
+        case UnitLocalization::Attributes::TemperatureUnit::Id: {
+            chip::app::Clusters::UnitLocalization::TempUnitEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TemperatureUnit", 1, value);
+        }
+        case UnitLocalization::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::AcceptedCommandList::Id: {
+        case UnitLocalization::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::EventList::Id: {
+        case UnitLocalization::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BinaryInputBasic::Attributes::AttributeList::Id: {
+        case UnitLocalization::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BinaryInputBasic::Attributes::FeatureMap::Id: {
+        case UnitLocalization::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BinaryInputBasic::Attributes::ClusterRevision::Id: {
+        case UnitLocalization::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5543,35 +7034,40 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case PulseWidthModulation::Id: {
+    case PowerSourceConfiguration::Id: {
         switch (path.mAttributeId)
         {
-        case PulseWidthModulation::Attributes::GeneratedCommandList::Id: {
+        case PowerSourceConfiguration::Attributes::Sources::Id: {
+            chip::app::DataModel::DecodableList<chip::EndpointId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Sources", 1, value);
+        }
+        case PowerSourceConfiguration::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PulseWidthModulation::Attributes::AcceptedCommandList::Id: {
+        case PowerSourceConfiguration::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PulseWidthModulation::Attributes::EventList::Id: {
+        case PowerSourceConfiguration::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case PulseWidthModulation::Attributes::AttributeList::Id: {
+        case PowerSourceConfiguration::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PulseWidthModulation::Attributes::FeatureMap::Id: {
+        case PowerSourceConfiguration::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PulseWidthModulation::Attributes::ClusterRevision::Id: {
+        case PowerSourceConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5579,166 +7075,195 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Descriptor::Id: {
+    case PowerSource::Id: {
         switch (path.mAttributeId)
         {
-        case Descriptor::Attributes::DeviceTypeList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType> value;
+        case PowerSource::Attributes::Status::Id: {
+            chip::app::Clusters::PowerSource::PowerSourceStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DeviceTypeList", 1, value);
+            return DataModelLogger::LogValue("Status", 1, value);
         }
-        case Descriptor::Attributes::ServerList::Id: {
-            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+        case PowerSource::Attributes::Order::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ServerList", 1, value);
+            return DataModelLogger::LogValue("Order", 1, value);
         }
-        case Descriptor::Attributes::ClientList::Id: {
-            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+        case PowerSource::Attributes::Description::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClientList", 1, value);
+            return DataModelLogger::LogValue("Description", 1, value);
         }
-        case Descriptor::Attributes::PartsList::Id: {
-            chip::app::DataModel::DecodableList<chip::EndpointId> value;
+        case PowerSource::Attributes::WiredAssessedInputVoltage::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartsList", 1, value);
+            return DataModelLogger::LogValue("WiredAssessedInputVoltage", 1, value);
         }
-        case Descriptor::Attributes::TagList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::DecodableType> value;
+        case PowerSource::Attributes::WiredAssessedInputFrequency::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TagList", 1, value);
+            return DataModelLogger::LogValue("WiredAssessedInputFrequency", 1, value);
         }
-        case Descriptor::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PowerSource::Attributes::WiredCurrentType::Id: {
+            chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("WiredCurrentType", 1, value);
         }
-        case Descriptor::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PowerSource::Attributes::WiredAssessedCurrent::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("WiredAssessedCurrent", 1, value);
         }
-        case Descriptor::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case PowerSource::Attributes::WiredNominalVoltage::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("WiredNominalVoltage", 1, value);
         }
-        case Descriptor::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case PowerSource::Attributes::WiredMaximumCurrent::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("WiredMaximumCurrent", 1, value);
         }
-        case Descriptor::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case PowerSource::Attributes::WiredPresent::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("WiredPresent", 1, value);
         }
-        case Descriptor::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::ActiveWiredFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::WiredFaultEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveWiredFaults", 1, value);
+        }
+        case PowerSource::Attributes::BatVoltage::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatVoltage", 1, value);
+        }
+        case PowerSource::Attributes::BatPercentRemaining::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatPercentRemaining", 1, value);
+        }
+        case PowerSource::Attributes::BatTimeRemaining::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatTimeRemaining", 1, value);
+        }
+        case PowerSource::Attributes::BatChargeLevel::Id: {
+            chip::app::Clusters::PowerSource::BatChargeLevelEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatChargeLevel", 1, value);
+        }
+        case PowerSource::Attributes::BatReplacementNeeded::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatReplacementNeeded", 1, value);
+        }
+        case PowerSource::Attributes::BatReplaceability::Id: {
+            chip::app::Clusters::PowerSource::BatReplaceabilityEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatReplaceability", 1, value);
+        }
+        case PowerSource::Attributes::BatPresent::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("BatPresent", 1, value);
         }
+        case PowerSource::Attributes::ActiveBatFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::BatFaultEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveBatFaults", 1, value);
         }
-        break;
-    }
-    case Binding::Id: {
-        switch (path.mAttributeId)
-        {
-        case Binding::Attributes::Binding::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> value;
+        case PowerSource::Attributes::BatReplacementDescription::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Binding", 1, value);
+            return DataModelLogger::LogValue("BatReplacementDescription", 1, value);
         }
-        case Binding::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PowerSource::Attributes::BatCommonDesignation::Id: {
+            chip::app::Clusters::PowerSource::BatCommonDesignationEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("BatCommonDesignation", 1, value);
         }
-        case Binding::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PowerSource::Attributes::BatANSIDesignation::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("BatANSIDesignation", 1, value);
         }
-        case Binding::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case PowerSource::Attributes::BatIECDesignation::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("BatIECDesignation", 1, value);
         }
-        case Binding::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case PowerSource::Attributes::BatApprovedChemistry::Id: {
+            chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("BatApprovedChemistry", 1, value);
         }
-        case Binding::Attributes::FeatureMap::Id: {
+        case PowerSource::Attributes::BatCapacity::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("BatCapacity", 1, value);
         }
-        case Binding::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatQuantity::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("BatQuantity", 1, value);
         }
+        case PowerSource::Attributes::BatChargeState::Id: {
+            chip::app::Clusters::PowerSource::BatChargeStateEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatChargeState", 1, value);
         }
-        break;
-    }
-    case AccessControl::Id: {
-        switch (path.mAttributeId)
-        {
-        case AccessControl::Attributes::Acl::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::DecodableType>
-                value;
+        case PowerSource::Attributes::BatTimeToFullCharge::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACL", 1, value);
+            return DataModelLogger::LogValue("BatTimeToFullCharge", 1, value);
         }
-        case AccessControl::Attributes::Extension::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::AccessControl::Structs::AccessControlExtensionStruct::DecodableType>
-                value;
+        case PowerSource::Attributes::BatFunctionalWhileCharging::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Extension", 1, value);
+            return DataModelLogger::LogValue("BatFunctionalWhileCharging", 1, value);
         }
-        case AccessControl::Attributes::SubjectsPerAccessControlEntry::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatChargingCurrent::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SubjectsPerAccessControlEntry", 1, value);
+            return DataModelLogger::LogValue("BatChargingCurrent", 1, value);
         }
-        case AccessControl::Attributes::TargetsPerAccessControlEntry::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::ActiveBatChargeFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::BatChargeFaultEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TargetsPerAccessControlEntry", 1, value);
+            return DataModelLogger::LogValue("ActiveBatChargeFaults", 1, value);
         }
-        case AccessControl::Attributes::AccessControlEntriesPerFabric::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::EndpointList::Id: {
+            chip::app::DataModel::DecodableList<chip::EndpointId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AccessControlEntriesPerFabric", 1, value);
+            return DataModelLogger::LogValue("EndpointList", 1, value);
         }
-        case AccessControl::Attributes::GeneratedCommandList::Id: {
+        case PowerSource::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AccessControl::Attributes::AcceptedCommandList::Id: {
+        case PowerSource::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AccessControl::Attributes::EventList::Id: {
+        case PowerSource::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case AccessControl::Attributes::AttributeList::Id: {
+        case PowerSource::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AccessControl::Attributes::FeatureMap::Id: {
+        case PowerSource::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AccessControl::Attributes::ClusterRevision::Id: {
+        case PowerSource::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5746,50 +7271,60 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Actions::Id: {
+    case GeneralCommissioning::Id: {
         switch (path.mAttributeId)
         {
-        case Actions::Attributes::ActionList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> value;
+        case GeneralCommissioning::Attributes::Breadcrumb::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActionList", 1, value);
+            return DataModelLogger::LogValue("Breadcrumb", 1, value);
         }
-        case Actions::Attributes::EndpointLists::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> value;
+        case GeneralCommissioning::Attributes::BasicCommissioningInfo::Id: {
+            chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EndpointLists", 1, value);
+            return DataModelLogger::LogValue("BasicCommissioningInfo", 1, value);
         }
-        case Actions::Attributes::SetupURL::Id: {
-            chip::CharSpan value;
+        case GeneralCommissioning::Attributes::RegulatoryConfig::Id: {
+            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetupURL", 1, value);
+            return DataModelLogger::LogValue("RegulatoryConfig", 1, value);
         }
-        case Actions::Attributes::GeneratedCommandList::Id: {
+        case GeneralCommissioning::Attributes::LocationCapability::Id: {
+            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LocationCapability", 1, value);
+        }
+        case GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SupportsConcurrentConnection", 1, value);
+        }
+        case GeneralCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Actions::Attributes::AcceptedCommandList::Id: {
+        case GeneralCommissioning::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Actions::Attributes::EventList::Id: {
+        case GeneralCommissioning::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case Actions::Attributes::AttributeList::Id: {
+        case GeneralCommissioning::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Actions::Attributes::FeatureMap::Id: {
+        case GeneralCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Actions::Attributes::ClusterRevision::Id: {
+        case GeneralCommissioning::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5797,140 +7332,92 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BasicInformation::Id: {
+    case NetworkCommissioning::Id: {
         switch (path.mAttributeId)
         {
-        case BasicInformation::Attributes::DataModelRevision::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DataModelRevision", 1, value);
-        }
-        case BasicInformation::Attributes::VendorName::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorName", 1, value);
-        }
-        case BasicInformation::Attributes::VendorID::Id: {
-            chip::VendorId value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorID", 1, value);
-        }
-        case BasicInformation::Attributes::ProductName::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductName", 1, value);
-        }
-        case BasicInformation::Attributes::ProductID::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductID", 1, value);
-        }
-        case BasicInformation::Attributes::NodeLabel::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NodeLabel", 1, value);
-        }
-        case BasicInformation::Attributes::Location::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Location", 1, value);
-        }
-        case BasicInformation::Attributes::HardwareVersion::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersion", 1, value);
-        }
-        case BasicInformation::Attributes::HardwareVersionString::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
-        }
-        case BasicInformation::Attributes::SoftwareVersion::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
-        }
-        case BasicInformation::Attributes::SoftwareVersionString::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::MaxNetworks::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
+            return DataModelLogger::LogValue("MaxNetworks", 1, value);
         }
-        case BasicInformation::Attributes::ManufacturingDate::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::Networks::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
+            return DataModelLogger::LogValue("Networks", 1, value);
         }
-        case BasicInformation::Attributes::PartNumber::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::ScanMaxTimeSeconds::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartNumber", 1, value);
+            return DataModelLogger::LogValue("ScanMaxTimeSeconds", 1, value);
         }
-        case BasicInformation::Attributes::ProductURL::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductURL", 1, value);
+            return DataModelLogger::LogValue("ConnectMaxTimeSeconds", 1, value);
         }
-        case BasicInformation::Attributes::ProductLabel::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::InterfaceEnabled::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductLabel", 1, value);
+            return DataModelLogger::LogValue("InterfaceEnabled", 1, value);
         }
-        case BasicInformation::Attributes::SerialNumber::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::LastNetworkingStatus::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SerialNumber", 1, value);
+            return DataModelLogger::LogValue("LastNetworkingStatus", 1, value);
         }
-        case BasicInformation::Attributes::LocalConfigDisabled::Id: {
-            bool value;
+        case NetworkCommissioning::Attributes::LastNetworkID::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalConfigDisabled", 1, value);
+            return DataModelLogger::LogValue("LastNetworkID", 1, value);
         }
-        case BasicInformation::Attributes::Reachable::Id: {
-            bool value;
+        case NetworkCommissioning::Attributes::LastConnectErrorValue::Id: {
+            chip::app::DataModel::Nullable<int32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Reachable", 1, value);
+            return DataModelLogger::LogValue("LastConnectErrorValue", 1, value);
         }
-        case BasicInformation::Attributes::UniqueID::Id: {
-            chip::CharSpan value;
+        case NetworkCommissioning::Attributes::SupportedWiFiBands::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UniqueID", 1, value);
+            return DataModelLogger::LogValue("SupportedWiFiBands", 1, value);
         }
-        case BasicInformation::Attributes::CapabilityMinima::Id: {
-            chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType value;
+        case NetworkCommissioning::Attributes::SupportedThreadFeatures::Id: {
+            chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CapabilityMinima", 1, value);
+            return DataModelLogger::LogValue("SupportedThreadFeatures", 1, value);
         }
-        case BasicInformation::Attributes::ProductAppearance::Id: {
-            chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType value;
+        case NetworkCommissioning::Attributes::ThreadVersion::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductAppearance", 1, value);
+            return DataModelLogger::LogValue("ThreadVersion", 1, value);
         }
-        case BasicInformation::Attributes::GeneratedCommandList::Id: {
+        case NetworkCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BasicInformation::Attributes::AcceptedCommandList::Id: {
+        case NetworkCommissioning::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BasicInformation::Attributes::EventList::Id: {
+        case NetworkCommissioning::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BasicInformation::Attributes::AttributeList::Id: {
+        case NetworkCommissioning::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BasicInformation::Attributes::FeatureMap::Id: {
+        case NetworkCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BasicInformation::Attributes::ClusterRevision::Id: {
+        case NetworkCommissioning::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5938,35 +7425,35 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OtaSoftwareUpdateProvider::Id: {
+    case DiagnosticLogs::Id: {
         switch (path.mAttributeId)
         {
-        case OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::Id: {
+        case DiagnosticLogs::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::Id: {
+        case DiagnosticLogs::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::EventList::Id: {
+        case DiagnosticLogs::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::AttributeList::Id: {
+        case DiagnosticLogs::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::FeatureMap::Id: {
+        case DiagnosticLogs::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::ClusterRevision::Id: {
+        case DiagnosticLogs::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5974,57 +7461,81 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OtaSoftwareUpdateRequestor::Id: {
+    case GeneralDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType>
+        case GeneralDiagnostics::Attributes::NetworkInterfaces::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DefaultOTAProviders", 1, value);
+            return DataModelLogger::LogValue("NetworkInterfaces", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::Id: {
-            bool value;
+        case GeneralDiagnostics::Attributes::RebootCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdatePossible", 1, value);
+            return DataModelLogger::LogValue("RebootCount", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdateState::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value;
+        case GeneralDiagnostics::Attributes::UpTime::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdateState", 1, value);
+            return DataModelLogger::LogValue("UpTime", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case GeneralDiagnostics::Attributes::TotalOperationalHours::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdateStateProgress", 1, value);
+            return DataModelLogger::LogValue("TotalOperationalHours", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::Id: {
+        case GeneralDiagnostics::Attributes::BootReason::Id: {
+            chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BootReason", 1, value);
+        }
+        case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
+        }
+        case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
+        }
+        case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
+        }
+        case GeneralDiagnostics::Attributes::TestEventTriggersEnabled::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TestEventTriggersEnabled", 1, value);
+        }
+        case GeneralDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::Id: {
+        case GeneralDiagnostics::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::EventList::Id: {
+        case GeneralDiagnostics::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::AttributeList::Id: {
+        case GeneralDiagnostics::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::FeatureMap::Id: {
+        case GeneralDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::Id: {
+        case GeneralDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6032,45 +7543,57 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LocalizationConfiguration::Id: {
+    case SoftwareDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case LocalizationConfiguration::Attributes::ActiveLocale::Id: {
-            chip::CharSpan value;
+        case SoftwareDiagnostics::Attributes::ThreadMetrics::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveLocale", 1, value);
+            return DataModelLogger::LogValue("ThreadMetrics", 1, value);
         }
-        case LocalizationConfiguration::Attributes::SupportedLocales::Id: {
-            chip::app::DataModel::DecodableList<chip::CharSpan> value;
+        case SoftwareDiagnostics::Attributes::CurrentHeapFree::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedLocales", 1, value);
+            return DataModelLogger::LogValue("CurrentHeapFree", 1, value);
         }
-        case LocalizationConfiguration::Attributes::GeneratedCommandList::Id: {
+        case SoftwareDiagnostics::Attributes::CurrentHeapUsed::Id: {
+            uint64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentHeapUsed", 1, value);
+        }
+        case SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::Id: {
+            uint64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentHeapHighWatermark", 1, value);
+        }
+        case SoftwareDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LocalizationConfiguration::Attributes::AcceptedCommandList::Id: {
+        case SoftwareDiagnostics::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LocalizationConfiguration::Attributes::EventList::Id: {
+        case SoftwareDiagnostics::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case LocalizationConfiguration::Attributes::AttributeList::Id: {
+        case SoftwareDiagnostics::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LocalizationConfiguration::Attributes::FeatureMap::Id: {
+        case SoftwareDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LocalizationConfiguration::Attributes::ClusterRevision::Id: {
+        case SoftwareDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6078,328 +7601,357 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TimeFormatLocalization::Id: {
+    case ThreadNetworkDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case TimeFormatLocalization::Attributes::HourFormat::Id: {
-            chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value;
+        case ThreadNetworkDiagnostics::Attributes::Channel::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HourFormat", 1, value);
+            return DataModelLogger::LogValue("Channel", 1, value);
         }
-        case TimeFormatLocalization::Attributes::ActiveCalendarType::Id: {
-            chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value;
+        case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveCalendarType", 1, value);
+            return DataModelLogger::LogValue("RoutingRole", 1, value);
         }
-        case TimeFormatLocalization::Attributes::SupportedCalendarTypes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum> value;
+        case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
+            chip::app::DataModel::Nullable<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedCalendarTypes", 1, value);
+            return DataModelLogger::LogValue("NetworkName", 1, value);
         }
-        case TimeFormatLocalization::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::PanId::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("PanId", 1, value);
         }
-        case TimeFormatLocalization::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("ExtendedPanId", 1, value);
         }
-        case TimeFormatLocalization::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("MeshLocalPrefix", 1, value);
         }
-        case TimeFormatLocalization::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case TimeFormatLocalization::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ThreadNetworkDiagnostics::Attributes::NeighborTable::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("NeighborTable", 1, value);
         }
-        case TimeFormatLocalization::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RouteTable::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("RouteTable", 1, value);
         }
+        case ThreadNetworkDiagnostics::Attributes::PartitionId::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PartitionId", 1, value);
         }
-        break;
-    }
-    case UnitLocalization::Id: {
-        switch (path.mAttributeId)
-        {
-        case UnitLocalization::Attributes::TemperatureUnit::Id: {
-            chip::app::Clusters::UnitLocalization::TempUnitEnum value;
+        case ThreadNetworkDiagnostics::Attributes::Weighting::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TemperatureUnit", 1, value);
+            return DataModelLogger::LogValue("Weighting", 1, value);
         }
-        case UnitLocalization::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::DataVersion::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("DataVersion", 1, value);
         }
-        case UnitLocalization::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("StableDataVersion", 1, value);
         }
-        case UnitLocalization::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LeaderRouterId", 1, value);
+        }
+        case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DetachedRoleCount", 1, value);
+        }
+        case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ChildRoleCount", 1, value);
+        }
+        case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RouterRoleCount", 1, value);
+        }
+        case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LeaderRoleCount", 1, value);
+        }
+        case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("AttachAttemptCount", 1, value);
         }
-        case UnitLocalization::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("PartitionIdChangeCount", 1, value);
         }
-        case UnitLocalization::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("BetterPartitionAttachAttemptCount", 1, value);
         }
-        case UnitLocalization::Attributes::ClusterRevision::Id: {
+        case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("ParentChangeCount", 1, value);
         }
+        case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TxTotalCount", 1, value);
         }
-        break;
-    }
-    case PowerSourceConfiguration::Id: {
-        switch (path.mAttributeId)
-        {
-        case PowerSourceConfiguration::Attributes::Sources::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Sources", 1, value);
+            return DataModelLogger::LogValue("TxUnicastCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("TxBroadcastCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("TxAckRequestedCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("TxAckedCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("TxNoAckRequestedCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::FeatureMap::Id: {
+        case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("TxDataCount", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("TxDataPollCount", 1, value);
         }
+        case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TxBeaconCount", 1, value);
         }
-        break;
-    }
-    case PowerSource::Id: {
-        switch (path.mAttributeId)
-        {
-        case PowerSource::Attributes::Status::Id: {
-            chip::app::Clusters::PowerSource::PowerSourceStatusEnum value;
+        case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Status", 1, value);
+            return DataModelLogger::LogValue("TxBeaconRequestCount", 1, value);
         }
-        case PowerSource::Attributes::Order::Id: {
-            uint8_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Order", 1, value);
+            return DataModelLogger::LogValue("TxOtherCount", 1, value);
         }
-        case PowerSource::Attributes::Description::Id: {
-            chip::CharSpan value;
+        case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Description", 1, value);
+            return DataModelLogger::LogValue("TxRetryCount", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedInputVoltage::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedInputVoltage", 1, value);
+            return DataModelLogger::LogValue("TxDirectMaxRetryExpiryCount", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedInputFrequency::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedInputFrequency", 1, value);
+            return DataModelLogger::LogValue("TxIndirectMaxRetryExpiryCount", 1, value);
         }
-        case PowerSource::Attributes::WiredCurrentType::Id: {
-            chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value;
+        case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredCurrentType", 1, value);
+            return DataModelLogger::LogValue("TxErrCcaCount", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedCurrent::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedCurrent", 1, value);
+            return DataModelLogger::LogValue("TxErrAbortCount", 1, value);
         }
-        case PowerSource::Attributes::WiredNominalVoltage::Id: {
+        case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredNominalVoltage", 1, value);
+            return DataModelLogger::LogValue("TxErrBusyChannelCount", 1, value);
         }
-        case PowerSource::Attributes::WiredMaximumCurrent::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredMaximumCurrent", 1, value);
+            return DataModelLogger::LogValue("RxTotalCount", 1, value);
         }
-        case PowerSource::Attributes::WiredPresent::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredPresent", 1, value);
+            return DataModelLogger::LogValue("RxUnicastCount", 1, value);
         }
-        case PowerSource::Attributes::ActiveWiredFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::WiredFaultEnum> value;
+        case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveWiredFaults", 1, value);
+            return DataModelLogger::LogValue("RxBroadcastCount", 1, value);
         }
-        case PowerSource::Attributes::BatVoltage::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatVoltage", 1, value);
+            return DataModelLogger::LogValue("RxDataCount", 1, value);
         }
-        case PowerSource::Attributes::BatPercentRemaining::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatPercentRemaining", 1, value);
+            return DataModelLogger::LogValue("RxDataPollCount", 1, value);
         }
-        case PowerSource::Attributes::BatTimeRemaining::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatTimeRemaining", 1, value);
+            return DataModelLogger::LogValue("RxBeaconCount", 1, value);
         }
-        case PowerSource::Attributes::BatChargeLevel::Id: {
-            chip::app::Clusters::PowerSource::BatChargeLevelEnum value;
+        case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatChargeLevel", 1, value);
+            return DataModelLogger::LogValue("RxBeaconRequestCount", 1, value);
         }
-        case PowerSource::Attributes::BatReplacementNeeded::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatReplacementNeeded", 1, value);
+            return DataModelLogger::LogValue("RxOtherCount", 1, value);
         }
-        case PowerSource::Attributes::BatReplaceability::Id: {
-            chip::app::Clusters::PowerSource::BatReplaceabilityEnum value;
+        case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatReplaceability", 1, value);
+            return DataModelLogger::LogValue("RxAddressFilteredCount", 1, value);
         }
-        case PowerSource::Attributes::BatPresent::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatPresent", 1, value);
+            return DataModelLogger::LogValue("RxDestAddrFilteredCount", 1, value);
         }
-        case PowerSource::Attributes::ActiveBatFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::BatFaultEnum> value;
+        case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveBatFaults", 1, value);
+            return DataModelLogger::LogValue("RxDuplicatedCount", 1, value);
         }
-        case PowerSource::Attributes::BatReplacementDescription::Id: {
-            chip::CharSpan value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatReplacementDescription", 1, value);
+            return DataModelLogger::LogValue("RxErrNoFrameCount", 1, value);
         }
-        case PowerSource::Attributes::BatCommonDesignation::Id: {
-            chip::app::Clusters::PowerSource::BatCommonDesignationEnum value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatCommonDesignation", 1, value);
+            return DataModelLogger::LogValue("RxErrUnknownNeighborCount", 1, value);
         }
-        case PowerSource::Attributes::BatANSIDesignation::Id: {
-            chip::CharSpan value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatANSIDesignation", 1, value);
+            return DataModelLogger::LogValue("RxErrInvalidSrcAddrCount", 1, value);
         }
-        case PowerSource::Attributes::BatIECDesignation::Id: {
-            chip::CharSpan value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatIECDesignation", 1, value);
+            return DataModelLogger::LogValue("RxErrSecCount", 1, value);
         }
-        case PowerSource::Attributes::BatApprovedChemistry::Id: {
-            chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatApprovedChemistry", 1, value);
+            return DataModelLogger::LogValue("RxErrFcsCount", 1, value);
         }
-        case PowerSource::Attributes::BatCapacity::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatCapacity", 1, value);
+            return DataModelLogger::LogValue("RxErrOtherCount", 1, value);
         }
-        case PowerSource::Attributes::BatQuantity::Id: {
-            uint8_t value;
+        case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatQuantity", 1, value);
+            return DataModelLogger::LogValue("ActiveTimestamp", 1, value);
         }
-        case PowerSource::Attributes::BatChargeState::Id: {
-            chip::app::Clusters::PowerSource::BatChargeStateEnum value;
+        case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatChargeState", 1, value);
+            return DataModelLogger::LogValue("PendingTimestamp", 1, value);
         }
-        case PowerSource::Attributes::BatTimeToFullCharge::Id: {
+        case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
             chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatTimeToFullCharge", 1, value);
+            return DataModelLogger::LogValue("Delay", 1, value);
         }
-        case PowerSource::Attributes::BatFunctionalWhileCharging::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatFunctionalWhileCharging", 1, value);
+            return DataModelLogger::LogValue("SecurityPolicy", 1, value);
         }
-        case PowerSource::Attributes::BatChargingCurrent::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatChargingCurrent", 1, value);
+            return DataModelLogger::LogValue("ChannelPage0Mask", 1, value);
         }
-        case PowerSource::Attributes::ActiveBatChargeFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::PowerSource::BatChargeFaultEnum> value;
+        case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
+            chip::app::DataModel::Nullable<
+                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveBatChargeFaults", 1, value);
+            return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value);
         }
-        case PowerSource::Attributes::EndpointList::Id: {
-            chip::app::DataModel::DecodableList<chip::EndpointId> value;
+        case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EndpointList", 1, value);
+            return DataModelLogger::LogValue("ActiveNetworkFaultsList", 1, value);
         }
-        case PowerSource::Attributes::GeneratedCommandList::Id: {
+        case ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PowerSource::Attributes::AcceptedCommandList::Id: {
+        case ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PowerSource::Attributes::EventList::Id: {
+        case ThreadNetworkDiagnostics::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case PowerSource::Attributes::AttributeList::Id: {
+        case ThreadNetworkDiagnostics::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PowerSource::Attributes::FeatureMap::Id: {
+        case ThreadNetworkDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PowerSource::Attributes::ClusterRevision::Id: {
+        case ThreadNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6407,60 +7959,100 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case GeneralCommissioning::Id: {
+    case WiFiNetworkDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case GeneralCommissioning::Attributes::Breadcrumb::Id: {
-            uint64_t value;
+        case WiFiNetworkDiagnostics::Attributes::Bssid::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Breadcrumb", 1, value);
+            return DataModelLogger::LogValue("BSSID", 1, value);
         }
-        case GeneralCommissioning::Attributes::BasicCommissioningInfo::Id: {
-            chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType value;
+        case WiFiNetworkDiagnostics::Attributes::SecurityType::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BasicCommissioningInfo", 1, value);
+            return DataModelLogger::LogValue("SecurityType", 1, value);
         }
-        case GeneralCommissioning::Attributes::RegulatoryConfig::Id: {
-            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value;
+        case WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RegulatoryConfig", 1, value);
+            return DataModelLogger::LogValue("WiFiVersion", 1, value);
         }
-        case GeneralCommissioning::Attributes::LocationCapability::Id: {
-            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value;
+        case WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocationCapability", 1, value);
+            return DataModelLogger::LogValue("ChannelNumber", 1, value);
         }
-        case GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id: {
-            bool value;
+        case WiFiNetworkDiagnostics::Attributes::Rssi::Id: {
+            chip::app::DataModel::Nullable<int8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportsConcurrentConnection", 1, value);
+            return DataModelLogger::LogValue("RSSI", 1, value);
         }
-        case GeneralCommissioning::Attributes::GeneratedCommandList::Id: {
+        case WiFiNetworkDiagnostics::Attributes::BeaconLostCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BeaconLostCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::BeaconRxCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BeaconRxCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PacketMulticastRxCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PacketMulticastTxCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PacketUnicastRxCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PacketUnicastTxCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentMaxRate", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case GeneralCommissioning::Attributes::AcceptedCommandList::Id: {
+        case WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case GeneralCommissioning::Attributes::EventList::Id: {
+        case WiFiNetworkDiagnostics::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case GeneralCommissioning::Attributes::AttributeList::Id: {
+        case WiFiNetworkDiagnostics::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case GeneralCommissioning::Attributes::FeatureMap::Id: {
+        case WiFiNetworkDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case GeneralCommissioning::Attributes::ClusterRevision::Id: {
+        case WiFiNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6468,92 +8060,80 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case NetworkCommissioning::Id: {
+    case EthernetNetworkDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case NetworkCommissioning::Attributes::MaxNetworks::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxNetworks", 1, value);
-        }
-        case NetworkCommissioning::Attributes::Networks::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Networks", 1, value);
-        }
-        case NetworkCommissioning::Attributes::ScanMaxTimeSeconds::Id: {
-            uint8_t value;
+        case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ScanMaxTimeSeconds", 1, value);
+            return DataModelLogger::LogValue("PHYRate", 1, value);
         }
-        case NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::Id: {
-            uint8_t value;
+        case EthernetNetworkDiagnostics::Attributes::FullDuplex::Id: {
+            chip::app::DataModel::Nullable<bool> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ConnectMaxTimeSeconds", 1, value);
+            return DataModelLogger::LogValue("FullDuplex", 1, value);
         }
-        case NetworkCommissioning::Attributes::InterfaceEnabled::Id: {
-            bool value;
+        case EthernetNetworkDiagnostics::Attributes::PacketRxCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InterfaceEnabled", 1, value);
+            return DataModelLogger::LogValue("PacketRxCount", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastNetworkingStatus::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> value;
+        case EthernetNetworkDiagnostics::Attributes::PacketTxCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastNetworkingStatus", 1, value);
+            return DataModelLogger::LogValue("PacketTxCount", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastNetworkID::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case EthernetNetworkDiagnostics::Attributes::TxErrCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastNetworkID", 1, value);
+            return DataModelLogger::LogValue("TxErrCount", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastConnectErrorValue::Id: {
-            chip::app::DataModel::Nullable<int32_t> value;
+        case EthernetNetworkDiagnostics::Attributes::CollisionCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastConnectErrorValue", 1, value);
+            return DataModelLogger::LogValue("CollisionCount", 1, value);
         }
-        case NetworkCommissioning::Attributes::SupportedWiFiBands::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> value;
+        case EthernetNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedWiFiBands", 1, value);
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case NetworkCommissioning::Attributes::SupportedThreadFeatures::Id: {
-            chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value;
+        case EthernetNetworkDiagnostics::Attributes::CarrierDetect::Id: {
+            chip::app::DataModel::Nullable<bool> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedThreadFeatures", 1, value);
+            return DataModelLogger::LogValue("CarrierDetect", 1, value);
         }
-        case NetworkCommissioning::Attributes::ThreadVersion::Id: {
-            uint16_t value;
+        case EthernetNetworkDiagnostics::Attributes::TimeSinceReset::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThreadVersion", 1, value);
+            return DataModelLogger::LogValue("TimeSinceReset", 1, value);
         }
-        case NetworkCommissioning::Attributes::GeneratedCommandList::Id: {
+        case EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case NetworkCommissioning::Attributes::AcceptedCommandList::Id: {
+        case EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case NetworkCommissioning::Attributes::EventList::Id: {
+        case EthernetNetworkDiagnostics::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case NetworkCommissioning::Attributes::AttributeList::Id: {
+        case EthernetNetworkDiagnostics::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case NetworkCommissioning::Attributes::FeatureMap::Id: {
+        case EthernetNetworkDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case NetworkCommissioning::Attributes::ClusterRevision::Id: {
+        case EthernetNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6561,122 +8141,104 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case DiagnosticLogs::Id: {
+    case TimeSynchronization::Id: {
         switch (path.mAttributeId)
         {
-        case DiagnosticLogs::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case DiagnosticLogs::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TimeSynchronization::Attributes::UTCTime::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("UTCTime", 1, value);
         }
-        case DiagnosticLogs::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case TimeSynchronization::Attributes::Granularity::Id: {
+            chip::app::Clusters::TimeSynchronization::GranularityEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("Granularity", 1, value);
         }
-        case DiagnosticLogs::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TimeSynchronization::Attributes::TimeSource::Id: {
+            chip::app::Clusters::TimeSynchronization::TimeSourceEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("TimeSource", 1, value);
         }
-        case DiagnosticLogs::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case TimeSynchronization::Attributes::TrustedTimeSource::Id: {
+            chip::app::DataModel::Nullable<
+                chip::app::Clusters::TimeSynchronization::Structs::TrustedTimeSourceStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("TrustedTimeSource", 1, value);
         }
-        case DiagnosticLogs::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case TimeSynchronization::Attributes::DefaultNTP::Id: {
+            chip::app::DataModel::Nullable<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("DefaultNTP", 1, value);
         }
-        break;
-    }
-    case GeneralDiagnostics::Id: {
-        switch (path.mAttributeId)
-        {
-        case GeneralDiagnostics::Attributes::NetworkInterfaces::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType>
+        case TimeSynchronization::Attributes::TimeZone::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NetworkInterfaces", 1, value);
-        }
-        case GeneralDiagnostics::Attributes::RebootCount::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RebootCount", 1, value);
+            return DataModelLogger::LogValue("TimeZone", 1, value);
         }
-        case GeneralDiagnostics::Attributes::UpTime::Id: {
-            uint64_t value;
+        case TimeSynchronization::Attributes::DSTOffset::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpTime", 1, value);
+            return DataModelLogger::LogValue("DSTOffset", 1, value);
         }
-        case GeneralDiagnostics::Attributes::TotalOperationalHours::Id: {
-            uint32_t value;
+        case TimeSynchronization::Attributes::LocalTime::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TotalOperationalHours", 1, value);
+            return DataModelLogger::LogValue("LocalTime", 1, value);
         }
-        case GeneralDiagnostics::Attributes::BootReason::Id: {
-            chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value;
+        case TimeSynchronization::Attributes::TimeZoneDatabase::Id: {
+            chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BootReason", 1, value);
+            return DataModelLogger::LogValue("TimeZoneDatabase", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> value;
+        case TimeSynchronization::Attributes::NTPServerAvailable::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
+            return DataModelLogger::LogValue("NTPServerAvailable", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> value;
+        case TimeSynchronization::Attributes::TimeZoneListMaxSize::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
+            return DataModelLogger::LogValue("TimeZoneListMaxSize", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> value;
+        case TimeSynchronization::Attributes::DSTOffsetListMaxSize::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
+            return DataModelLogger::LogValue("DSTOffsetListMaxSize", 1, value);
         }
-        case GeneralDiagnostics::Attributes::TestEventTriggersEnabled::Id: {
+        case TimeSynchronization::Attributes::SupportsDNSResolve::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TestEventTriggersEnabled", 1, value);
-        }
-        case GeneralDiagnostics::Attributes::AverageWearCount::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AverageWearCount", 1, value);
+            return DataModelLogger::LogValue("SupportsDNSResolve", 1, value);
         }
-        case GeneralDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case TimeSynchronization::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case GeneralDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case TimeSynchronization::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case GeneralDiagnostics::Attributes::EventList::Id: {
+        case TimeSynchronization::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case GeneralDiagnostics::Attributes::AttributeList::Id: {
+        case TimeSynchronization::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case GeneralDiagnostics::Attributes::FeatureMap::Id: {
+        case TimeSynchronization::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ClusterRevision::Id: {
+        case TimeSynchronization::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6684,415 +8246,426 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case SoftwareDiagnostics::Id: {
+    case BridgedDeviceBasicInformation::Id: {
         switch (path.mAttributeId)
         {
-        case SoftwareDiagnostics::Attributes::ThreadMetrics::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType>
-                value;
+        case BridgedDeviceBasicInformation::Attributes::VendorName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThreadMetrics", 1, value);
+            return DataModelLogger::LogValue("VendorName", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::CurrentHeapFree::Id: {
-            uint64_t value;
+        case BridgedDeviceBasicInformation::Attributes::VendorID::Id: {
+            chip::VendorId value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapFree", 1, value);
+            return DataModelLogger::LogValue("VendorID", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::CurrentHeapUsed::Id: {
-            uint64_t value;
+        case BridgedDeviceBasicInformation::Attributes::ProductName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapUsed", 1, value);
+            return DataModelLogger::LogValue("ProductName", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::Id: {
-            uint64_t value;
+        case BridgedDeviceBasicInformation::Attributes::NodeLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapHighWatermark", 1, value);
+            return DataModelLogger::LogValue("NodeLabel", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("HardwareVersion", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case BridgedDeviceBasicInformation::Attributes::PartNumber::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("PartNumber", 1, value);
         }
-        break;
-    }
-    case ThreadNetworkDiagnostics::Id: {
-        switch (path.mAttributeId)
-        {
-        case ThreadNetworkDiagnostics::Attributes::Channel::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case BridgedDeviceBasicInformation::Attributes::ProductURL::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Channel", 1, value);
+            return DataModelLogger::LogValue("ProductURL", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> value;
+        case BridgedDeviceBasicInformation::Attributes::ProductLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RoutingRole", 1, value);
+            return DataModelLogger::LogValue("ProductLabel", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
-            chip::app::DataModel::Nullable<chip::CharSpan> value;
+        case BridgedDeviceBasicInformation::Attributes::SerialNumber::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NetworkName", 1, value);
+            return DataModelLogger::LogValue("SerialNumber", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PanId::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case BridgedDeviceBasicInformation::Attributes::Reachable::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PanId", 1, value);
+            return DataModelLogger::LogValue("Reachable", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case BridgedDeviceBasicInformation::Attributes::UniqueID::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ExtendedPanId", 1, value);
+            return DataModelLogger::LogValue("UniqueID", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case BridgedDeviceBasicInformation::Attributes::ProductAppearance::Id: {
+            chip::app::Clusters::BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MeshLocalPrefix", 1, value);
+            return DataModelLogger::LogValue("ProductAppearance", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            uint64_t value;
+        case BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::NeighborTable::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType>
-                value;
+        case BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NeighborTable", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RouteTable::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType>
-                value;
+        case BridgedDeviceBasicInformation::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RouteTable", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PartitionId::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case BridgedDeviceBasicInformation::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartitionId", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::Weighting::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case BridgedDeviceBasicInformation::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Weighting", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::DataVersion::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case BridgedDeviceBasicInformation::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DataVersion", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StableDataVersion", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        break;
+    }
+    case Switch::Id: {
+        switch (path.mAttributeId)
+        {
+        case Switch::Attributes::NumberOfPositions::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LeaderRouterId", 1, value);
+            return DataModelLogger::LogValue("NumberOfPositions", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::CurrentPosition::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DetachedRoleCount", 1, value);
+            return DataModelLogger::LogValue("CurrentPosition", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::MultiPressMax::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChildRoleCount", 1, value);
+            return DataModelLogger::LogValue("MultiPressMax", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RouterRoleCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LeaderRoleCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttachAttemptCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartitionIdChangeCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id: {
-            uint16_t value;
+        case Switch::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BetterPartitionAttachAttemptCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id: {
+        case Switch::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ParentChangeCount", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id: {
-            uint32_t value;
+        }
+        break;
+    }
+    case AdministratorCommissioning::Id: {
+        switch (path.mAttributeId)
+        {
+        case AdministratorCommissioning::Attributes::WindowStatus::Id: {
+            chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxTotalCount", 1, value);
+            return DataModelLogger::LogValue("WindowStatus", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::AdminFabricIndex::Id: {
+            chip::app::DataModel::Nullable<chip::FabricIndex> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxUnicastCount", 1, value);
+            return DataModelLogger::LogValue("AdminFabricIndex", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::AdminVendorId::Id: {
+            chip::app::DataModel::Nullable<chip::VendorId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBroadcastCount", 1, value);
+            return DataModelLogger::LogValue("AdminVendorId", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxAckRequestedCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxAckedCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxNoAckRequestedCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDataCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id: {
+        case AdministratorCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDataPollCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id: {
-            uint32_t value;
+        case AdministratorCommissioning::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBeaconCount", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBeaconRequestCount", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id: {
-            uint32_t value;
+        break;
+    }
+    case OperationalCredentials::Id: {
+        switch (path.mAttributeId)
+        {
+        case OperationalCredentials::Attributes::NOCs::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxOtherCount", 1, value);
+            return DataModelLogger::LogValue("NOCs", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::Fabrics::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptorStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxRetryCount", 1, value);
+            return DataModelLogger::LogValue("Fabrics", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::SupportedFabrics::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDirectMaxRetryExpiryCount", 1, value);
+            return DataModelLogger::LogValue("SupportedFabrics", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::CommissionedFabrics::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxIndirectMaxRetryExpiryCount", 1, value);
+            return DataModelLogger::LogValue("CommissionedFabrics", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::TrustedRootCertificates::Id: {
+            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrCcaCount", 1, value);
+            return DataModelLogger::LogValue("TrustedRootCertificates", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::CurrentFabricIndex::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrAbortCount", 1, value);
+            return DataModelLogger::LogValue("CurrentFabricIndex", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrBusyChannelCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxTotalCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxUnicastCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBroadcastCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id: {
+        case OperationalCredentials::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDataCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id: {
-            uint32_t value;
+        case OperationalCredentials::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDataPollCount", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBeaconCount", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id: {
-            uint32_t value;
+        break;
+    }
+    case GroupKeyManagement::Id: {
+        switch (path.mAttributeId)
+        {
+        case GroupKeyManagement::Attributes::GroupKeyMap::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBeaconRequestCount", 1, value);
+            return DataModelLogger::LogValue("GroupKeyMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::GroupTable::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxOtherCount", 1, value);
+            return DataModelLogger::LogValue("GroupTable", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxAddressFilteredCount", 1, value);
+            return DataModelLogger::LogValue("MaxGroupsPerFabric", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDestAddrFilteredCount", 1, value);
+            return DataModelLogger::LogValue("MaxGroupKeysPerFabric", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDuplicatedCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrNoFrameCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrUnknownNeighborCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrInvalidSrcAddrCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id: {
+        case GroupKeyManagement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrSecCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id: {
-            uint32_t value;
+        case GroupKeyManagement::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrFcsCount", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id: {
-            uint32_t value;
+        }
+        break;
+    }
+    case FixedLabel::Id: {
+        switch (path.mAttributeId)
+        {
+        case FixedLabel::Attributes::LabelList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrOtherCount", 1, value);
+            return DataModelLogger::LogValue("LabelList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case FixedLabel::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveTimestamp", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case FixedLabel::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PendingTimestamp", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case FixedLabel::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Delay", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
-                value;
+        case FixedLabel::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SecurityPolicy", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case FixedLabel::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChannelPage0Mask", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
-            chip::app::DataModel::Nullable<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>
-                value;
+        case FixedLabel::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> value;
+        }
+        break;
+    }
+    case UserLabel::Id: {
+        switch (path.mAttributeId)
+        {
+        case UserLabel::Attributes::LabelList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveNetworkFaultsList", 1, value);
+            return DataModelLogger::LogValue("LabelList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case UserLabel::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case UserLabel::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::EventList::Id: {
+        case UserLabel::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AttributeList::Id: {
+        case UserLabel::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::FeatureMap::Id: {
+        case UserLabel::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ClusterRevision::Id: {
+        case UserLabel::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7100,100 +8673,71 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case WiFiNetworkDiagnostics::Id: {
+    case ProxyConfiguration::Id: {
         switch (path.mAttributeId)
         {
-        case WiFiNetworkDiagnostics::Attributes::Bssid::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BSSID", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::SecurityType::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SecurityType", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiFiVersion", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChannelNumber", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::Rssi::Id: {
-            chip::app::DataModel::Nullable<int8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RSSI", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::BeaconLostCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BeaconLostCount", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Attributes::BeaconRxCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ProxyConfiguration::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BeaconRxCount", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ProxyConfiguration::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketMulticastRxCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ProxyConfiguration::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketMulticastTxCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ProxyConfiguration::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketUnicastRxCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ProxyConfiguration::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketUnicastTxCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case ProxyConfiguration::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMaxRate", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+        break;
+    }
+    case ProxyDiscovery::Id: {
+        switch (path.mAttributeId)
+        {
+        case ProxyDiscovery::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case ProxyDiscovery::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::EventList::Id: {
+        case ProxyDiscovery::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::AttributeList::Id: {
+        case ProxyDiscovery::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::FeatureMap::Id: {
+        case ProxyDiscovery::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::ClusterRevision::Id: {
+        case ProxyDiscovery::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7201,80 +8745,76 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case EthernetNetworkDiagnostics::Id: {
+    case ProxyValid::Id: {
         switch (path.mAttributeId)
         {
-        case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PHYRate", 1, value);
-        }
-        case EthernetNetworkDiagnostics::Attributes::FullDuplex::Id: {
-            chip::app::DataModel::Nullable<bool> value;
+        case ProxyValid::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FullDuplex", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::PacketRxCount::Id: {
-            uint64_t value;
+        case ProxyValid::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketRxCount", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::PacketTxCount::Id: {
-            uint64_t value;
+        case ProxyValid::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketTxCount", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::TxErrCount::Id: {
-            uint64_t value;
+        case ProxyValid::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrCount", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::CollisionCount::Id: {
-            uint64_t value;
+        case ProxyValid::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CollisionCount", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            uint64_t value;
+        case ProxyValid::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::CarrierDetect::Id: {
-            chip::app::DataModel::Nullable<bool> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CarrierDetect", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::TimeSinceReset::Id: {
-            uint64_t value;
+        break;
+    }
+    case BooleanState::Id: {
+        switch (path.mAttributeId)
+        {
+        case BooleanState::Attributes::StateValue::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeSinceReset", 1, value);
+            return DataModelLogger::LogValue("StateValue", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case BooleanState::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case BooleanState::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::EventList::Id: {
+        case BooleanState::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::AttributeList::Id: {
+        case BooleanState::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::FeatureMap::Id: {
+        case BooleanState::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::ClusterRevision::Id: {
+        case BooleanState::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7282,104 +8822,77 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TimeSynchronization::Id: {
+    case IcdManagement::Id: {
         switch (path.mAttributeId)
         {
-        case TimeSynchronization::Attributes::UTCTime::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UTCTime", 1, value);
-        }
-        case TimeSynchronization::Attributes::Granularity::Id: {
-            chip::app::Clusters::TimeSynchronization::GranularityEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Granularity", 1, value);
-        }
-        case TimeSynchronization::Attributes::TimeSource::Id: {
-            chip::app::Clusters::TimeSynchronization::TimeSourceEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeSource", 1, value);
-        }
-        case TimeSynchronization::Attributes::TrustedTimeSource::Id: {
-            chip::app::DataModel::Nullable<
-                chip::app::Clusters::TimeSynchronization::Structs::TrustedTimeSourceStruct::DecodableType>
-                value;
+        case IcdManagement::Attributes::IdleModeDuration::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TrustedTimeSource", 1, value);
+            return DataModelLogger::LogValue("IdleModeDuration", 1, value);
         }
-        case TimeSynchronization::Attributes::DefaultNTP::Id: {
-            chip::app::DataModel::Nullable<chip::CharSpan> value;
+        case IcdManagement::Attributes::ActiveModeDuration::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DefaultNTP", 1, value);
+            return DataModelLogger::LogValue("ActiveModeDuration", 1, value);
         }
-        case TimeSynchronization::Attributes::TimeZone::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::DecodableType>
-                value;
+        case IcdManagement::Attributes::ActiveModeThreshold::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeZone", 1, value);
+            return DataModelLogger::LogValue("ActiveModeThreshold", 1, value);
         }
-        case TimeSynchronization::Attributes::DSTOffset::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::DecodableType>
+        case IcdManagement::Attributes::RegisteredClients::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DSTOffset", 1, value);
-        }
-        case TimeSynchronization::Attributes::LocalTime::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalTime", 1, value);
-        }
-        case TimeSynchronization::Attributes::TimeZoneDatabase::Id: {
-            chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeZoneDatabase", 1, value);
+            return DataModelLogger::LogValue("RegisteredClients", 1, value);
         }
-        case TimeSynchronization::Attributes::NTPServerAvailable::Id: {
-            bool value;
+        case IcdManagement::Attributes::ICDCounter::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NTPServerAvailable", 1, value);
+            return DataModelLogger::LogValue("ICDCounter", 1, value);
         }
-        case TimeSynchronization::Attributes::TimeZoneListMaxSize::Id: {
-            uint8_t value;
+        case IcdManagement::Attributes::ClientsSupportedPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeZoneListMaxSize", 1, value);
+            return DataModelLogger::LogValue("ClientsSupportedPerFabric", 1, value);
         }
-        case TimeSynchronization::Attributes::DSTOffsetListMaxSize::Id: {
-            uint8_t value;
+        case IcdManagement::Attributes::UserActiveModeTriggerHint::Id: {
+            chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DSTOffsetListMaxSize", 1, value);
+            return DataModelLogger::LogValue("UserActiveModeTriggerHint", 1, value);
         }
-        case TimeSynchronization::Attributes::SupportsDNSResolve::Id: {
-            bool value;
+        case IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportsDNSResolve", 1, value);
+            return DataModelLogger::LogValue("UserActiveModeTriggerInstruction", 1, value);
         }
-        case TimeSynchronization::Attributes::GeneratedCommandList::Id: {
+        case IcdManagement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TimeSynchronization::Attributes::AcceptedCommandList::Id: {
+        case IcdManagement::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TimeSynchronization::Attributes::EventList::Id: {
+        case IcdManagement::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case TimeSynchronization::Attributes::AttributeList::Id: {
+        case IcdManagement::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TimeSynchronization::Attributes::FeatureMap::Id: {
+        case IcdManagement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TimeSynchronization::Attributes::ClusterRevision::Id: {
+        case IcdManagement::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7387,115 +8900,118 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BridgedDeviceBasicInformation::Id: {
+    case Timer::Id: {
         switch (path.mAttributeId)
         {
-        case BridgedDeviceBasicInformation::Attributes::VendorName::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::SetTime::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorName", 1, value);
+            return DataModelLogger::LogValue("SetTime", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::VendorID::Id: {
-            chip::VendorId value;
+        case Timer::Attributes::TimeRemaining::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorID", 1, value);
+            return DataModelLogger::LogValue("TimeRemaining", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ProductName::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::TimerState::Id: {
+            chip::app::Clusters::Timer::TimerStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductName", 1, value);
+            return DataModelLogger::LogValue("TimerState", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::NodeLabel::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NodeLabel", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id: {
-            uint16_t value;
+        case Timer::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersion", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::EventList::Id: {
+            chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
+            return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id: {
-            uint32_t value;
+        case Timer::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id: {
-            chip::CharSpan value;
+        case Timer::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::PartNumber::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartNumber", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ProductURL::Id: {
-            chip::CharSpan value;
+        break;
+    }
+    case OvenCavityOperationalState::Id: {
+        switch (path.mAttributeId)
+        {
+        case OvenCavityOperationalState::Attributes::PhaseList::Id: {
+            chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductURL", 1, value);
+            return DataModelLogger::LogValue("PhaseList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ProductLabel::Id: {
-            chip::CharSpan value;
+        case OvenCavityOperationalState::Attributes::CurrentPhase::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductLabel", 1, value);
+            return DataModelLogger::LogValue("CurrentPhase", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::SerialNumber::Id: {
-            chip::CharSpan value;
+        case OvenCavityOperationalState::Attributes::CountdownTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SerialNumber", 1, value);
+            return DataModelLogger::LogValue("CountdownTime", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::Reachable::Id: {
-            bool value;
+        case OvenCavityOperationalState::Attributes::OperationalStateList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OvenCavityOperationalState::Structs::OperationalStateStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Reachable", 1, value);
+            return DataModelLogger::LogValue("OperationalStateList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::UniqueID::Id: {
-            chip::CharSpan value;
+        case OvenCavityOperationalState::Attributes::OperationalState::Id: {
+            chip::app::Clusters::OvenCavityOperationalState::OperationalStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UniqueID", 1, value);
+            return DataModelLogger::LogValue("OperationalState", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ProductAppearance::Id: {
-            chip::app::Clusters::BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::DecodableType value;
+        case OvenCavityOperationalState::Attributes::OperationalError::Id: {
+            chip::app::Clusters::OvenCavityOperationalState::Structs::ErrorStateStruct::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductAppearance", 1, value);
+            return DataModelLogger::LogValue("OperationalError", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::Id: {
+        case OvenCavityOperationalState::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::Id: {
+        case OvenCavityOperationalState::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::EventList::Id: {
+        case OvenCavityOperationalState::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::AttributeList::Id: {
+        case OvenCavityOperationalState::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::FeatureMap::Id: {
+        case OvenCavityOperationalState::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BridgedDeviceBasicInformation::Attributes::ClusterRevision::Id: {
+        case OvenCavityOperationalState::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7503,50 +9019,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Switch::Id: {
+    case OvenMode::Id: {
         switch (path.mAttributeId)
         {
-        case Switch::Attributes::NumberOfPositions::Id: {
-            uint8_t value;
+        case OvenMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::OvenMode::Structs::ModeOptionStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfPositions", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case Switch::Attributes::CurrentPosition::Id: {
+        case OvenMode::Attributes::CurrentMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPosition", 1, value);
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case Switch::Attributes::MultiPressMax::Id: {
-            uint8_t value;
+        case OvenMode::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MultiPressMax", 1, value);
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        case Switch::Attributes::GeneratedCommandList::Id: {
+        case OvenMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnMode", 1, value);
+        }
+        case OvenMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Switch::Attributes::AcceptedCommandList::Id: {
+        case OvenMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Switch::Attributes::EventList::Id: {
+        case OvenMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case Switch::Attributes::AttributeList::Id: {
+        case OvenMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Switch::Attributes::FeatureMap::Id: {
+        case OvenMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Switch::Attributes::ClusterRevision::Id: {
+        case OvenMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7554,50 +9075,45 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case AdministratorCommissioning::Id: {
+    case LaundryDryerControls::Id: {
         switch (path.mAttributeId)
         {
-        case AdministratorCommissioning::Attributes::WindowStatus::Id: {
-            chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WindowStatus", 1, value);
-        }
-        case AdministratorCommissioning::Attributes::AdminFabricIndex::Id: {
-            chip::app::DataModel::Nullable<chip::FabricIndex> value;
+        case LaundryDryerControls::Attributes::SupportedDrynessLevels::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AdminFabricIndex", 1, value);
+            return DataModelLogger::LogValue("SupportedDrynessLevels", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AdminVendorId::Id: {
-            chip::app::DataModel::Nullable<chip::VendorId> value;
+        case LaundryDryerControls::Attributes::SelectedDrynessLevel::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AdminVendorId", 1, value);
+            return DataModelLogger::LogValue("SelectedDrynessLevel", 1, value);
         }
-        case AdministratorCommissioning::Attributes::GeneratedCommandList::Id: {
+        case LaundryDryerControls::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AcceptedCommandList::Id: {
+        case LaundryDryerControls::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::EventList::Id: {
+        case LaundryDryerControls::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AttributeList::Id: {
+        case LaundryDryerControls::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::FeatureMap::Id: {
+        case LaundryDryerControls::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AdministratorCommissioning::Attributes::ClusterRevision::Id: {
+        case LaundryDryerControls::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7605,68 +9121,65 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OperationalCredentials::Id: {
+    case ModeSelect::Id: {
         switch (path.mAttributeId)
         {
-        case OperationalCredentials::Attributes::NOCs::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType>
-                value;
+        case ModeSelect::Attributes::Description::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NOCs", 1, value);
+            return DataModelLogger::LogValue("Description", 1, value);
         }
-        case OperationalCredentials::Attributes::Fabrics::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptorStruct::DecodableType>
-                value;
+        case ModeSelect::Attributes::StandardNamespace::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Fabrics", 1, value);
+            return DataModelLogger::LogValue("StandardNamespace", 1, value);
         }
-        case OperationalCredentials::Attributes::SupportedFabrics::Id: {
-            uint8_t value;
+        case ModeSelect::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedFabrics", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case OperationalCredentials::Attributes::CommissionedFabrics::Id: {
+        case ModeSelect::Attributes::CurrentMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CommissionedFabrics", 1, value);
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case OperationalCredentials::Attributes::TrustedRootCertificates::Id: {
-            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
+        case ModeSelect::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TrustedRootCertificates", 1, value);
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        case OperationalCredentials::Attributes::CurrentFabricIndex::Id: {
-            uint8_t value;
+        case ModeSelect::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentFabricIndex", 1, value);
+            return DataModelLogger::LogValue("OnMode", 1, value);
         }
-        case OperationalCredentials::Attributes::GeneratedCommandList::Id: {
+        case ModeSelect::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OperationalCredentials::Attributes::AcceptedCommandList::Id: {
+        case ModeSelect::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OperationalCredentials::Attributes::EventList::Id: {
+        case ModeSelect::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OperationalCredentials::Attributes::AttributeList::Id: {
+        case ModeSelect::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OperationalCredentials::Attributes::FeatureMap::Id: {
+        case ModeSelect::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OperationalCredentials::Attributes::ClusterRevision::Id: {
+        case ModeSelect::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7674,98 +9187,56 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case GroupKeyManagement::Id: {
+    case LaundryWasherMode::Id: {
         switch (path.mAttributeId)
         {
-        case GroupKeyManagement::Attributes::GroupKeyMap::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GroupKeyMap", 1, value);
-        }
-        case GroupKeyManagement::Attributes::GroupTable::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
+        case LaundryWasherMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GroupTable", 1, value);
-        }
-        case GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxGroupsPerFabric", 1, value);
-        }
-        case GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxGroupKeysPerFabric", 1, value);
-        }
-        case GroupKeyManagement::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case GroupKeyManagement::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
-        }
-        case GroupKeyManagement::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
-        }
-        case GroupKeyManagement::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case GroupKeyManagement::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case LaundryWasherMode::Attributes::CurrentMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case GroupKeyManagement::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case LaundryWasherMode::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        break;
-    }
-    case FixedLabel::Id: {
-        switch (path.mAttributeId)
-        {
-        case FixedLabel::Attributes::LabelList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> value;
+        case LaundryWasherMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LabelList", 1, value);
+            return DataModelLogger::LogValue("OnMode", 1, value);
         }
-        case FixedLabel::Attributes::GeneratedCommandList::Id: {
+        case LaundryWasherMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case FixedLabel::Attributes::AcceptedCommandList::Id: {
+        case LaundryWasherMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case FixedLabel::Attributes::EventList::Id: {
+        case LaundryWasherMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case FixedLabel::Attributes::AttributeList::Id: {
+        case LaundryWasherMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case FixedLabel::Attributes::FeatureMap::Id: {
+        case LaundryWasherMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case FixedLabel::Attributes::ClusterRevision::Id: {
+        case LaundryWasherMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7773,40 +9244,57 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case UserLabel::Id: {
+    case RefrigeratorAndTemperatureControlledCabinetMode::Id: {
         switch (path.mAttributeId)
         {
-        case UserLabel::Attributes::LabelList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> value;
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LabelList", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case UserLabel::Attributes::GeneratedCommandList::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
+        }
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
+        }
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnMode", 1, value);
+        }
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case UserLabel::Attributes::AcceptedCommandList::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case UserLabel::Attributes::EventList::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case UserLabel::Attributes::AttributeList::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case UserLabel::Attributes::FeatureMap::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case UserLabel::Attributes::ClusterRevision::Id: {
+        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7814,71 +9302,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ProxyConfiguration::Id: {
+    case LaundryWasherControls::Id: {
         switch (path.mAttributeId)
         {
-        case ProxyConfiguration::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case ProxyConfiguration::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
-        }
-        case ProxyConfiguration::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case LaundryWasherControls::Attributes::SpinSpeeds::Id: {
+            chip::app::DataModel::DecodableList<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("SpinSpeeds", 1, value);
         }
-        case ProxyConfiguration::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case LaundryWasherControls::Attributes::SpinSpeedCurrent::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("SpinSpeedCurrent", 1, value);
         }
-        case ProxyConfiguration::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case LaundryWasherControls::Attributes::NumberOfRinses::Id: {
+            chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("NumberOfRinses", 1, value);
         }
-        case ProxyConfiguration::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case LaundryWasherControls::Attributes::SupportedRinses::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("SupportedRinses", 1, value);
         }
-        break;
-    }
-    case ProxyDiscovery::Id: {
-        switch (path.mAttributeId)
-        {
-        case ProxyDiscovery::Attributes::GeneratedCommandList::Id: {
+        case LaundryWasherControls::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ProxyDiscovery::Attributes::AcceptedCommandList::Id: {
+        case LaundryWasherControls::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ProxyDiscovery::Attributes::EventList::Id: {
+        case LaundryWasherControls::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ProxyDiscovery::Attributes::AttributeList::Id: {
+        case LaundryWasherControls::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ProxyDiscovery::Attributes::FeatureMap::Id: {
+        case LaundryWasherControls::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ProxyDiscovery::Attributes::ClusterRevision::Id: {
+        case LaundryWasherControls::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7886,35 +9358,50 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ProxyValid::Id: {
+    case RvcRunMode::Id: {
         switch (path.mAttributeId)
         {
-        case ProxyValid::Attributes::GeneratedCommandList::Id: {
+        case RvcRunMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
+        }
+        case RvcRunMode::Attributes::CurrentMode::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
+        }
+        case RvcRunMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnMode", 1, value);
+        }
+        case RvcRunMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ProxyValid::Attributes::AcceptedCommandList::Id: {
+        case RvcRunMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ProxyValid::Attributes::EventList::Id: {
+        case RvcRunMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ProxyValid::Attributes::AttributeList::Id: {
+        case RvcRunMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ProxyValid::Attributes::FeatureMap::Id: {
+        case RvcRunMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ProxyValid::Attributes::ClusterRevision::Id: {
+        case RvcRunMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7922,40 +9409,50 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BooleanState::Id: {
+    case RvcCleanMode::Id: {
         switch (path.mAttributeId)
         {
-        case BooleanState::Attributes::StateValue::Id: {
-            bool value;
+        case RvcCleanMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateValue", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case BooleanState::Attributes::GeneratedCommandList::Id: {
+        case RvcCleanMode::Attributes::CurrentMode::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
+        }
+        case RvcCleanMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnMode", 1, value);
+        }
+        case RvcCleanMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BooleanState::Attributes::AcceptedCommandList::Id: {
+        case RvcCleanMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BooleanState::Attributes::EventList::Id: {
+        case RvcCleanMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case BooleanState::Attributes::AttributeList::Id: {
+        case RvcCleanMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BooleanState::Attributes::FeatureMap::Id: {
+        case RvcCleanMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BooleanState::Attributes::ClusterRevision::Id: {
+        case RvcCleanMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7963,77 +9460,65 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case IcdManagement::Id: {
+    case TemperatureControl::Id: {
         switch (path.mAttributeId)
         {
-        case IcdManagement::Attributes::IdleModeDuration::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("IdleModeDuration", 1, value);
-        }
-        case IcdManagement::Attributes::ActiveModeDuration::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveModeDuration", 1, value);
-        }
-        case IcdManagement::Attributes::ActiveModeThreshold::Id: {
-            uint16_t value;
+        case TemperatureControl::Attributes::TemperatureSetpoint::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveModeThreshold", 1, value);
+            return DataModelLogger::LogValue("TemperatureSetpoint", 1, value);
         }
-        case IcdManagement::Attributes::RegisteredClients::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::DecodableType>
-                value;
+        case TemperatureControl::Attributes::MinTemperature::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RegisteredClients", 1, value);
+            return DataModelLogger::LogValue("MinTemperature", 1, value);
         }
-        case IcdManagement::Attributes::ICDCounter::Id: {
-            uint32_t value;
+        case TemperatureControl::Attributes::MaxTemperature::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ICDCounter", 1, value);
+            return DataModelLogger::LogValue("MaxTemperature", 1, value);
         }
-        case IcdManagement::Attributes::ClientsSupportedPerFabric::Id: {
-            uint16_t value;
+        case TemperatureControl::Attributes::Step::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClientsSupportedPerFabric", 1, value);
+            return DataModelLogger::LogValue("Step", 1, value);
         }
-        case IcdManagement::Attributes::UserActiveModeTriggerHint::Id: {
-            chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value;
+        case TemperatureControl::Attributes::SelectedTemperatureLevel::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UserActiveModeTriggerHint", 1, value);
+            return DataModelLogger::LogValue("SelectedTemperatureLevel", 1, value);
         }
-        case IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id: {
-            chip::CharSpan value;
+        case TemperatureControl::Attributes::SupportedTemperatureLevels::Id: {
+            chip::app::DataModel::DecodableList<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UserActiveModeTriggerInstruction", 1, value);
+            return DataModelLogger::LogValue("SupportedTemperatureLevels", 1, value);
         }
-        case IcdManagement::Attributes::GeneratedCommandList::Id: {
+        case TemperatureControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case IcdManagement::Attributes::AcceptedCommandList::Id: {
+        case TemperatureControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case IcdManagement::Attributes::EventList::Id: {
+        case TemperatureControl::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case IcdManagement::Attributes::AttributeList::Id: {
+        case TemperatureControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case IcdManagement::Attributes::FeatureMap::Id: {
+        case TemperatureControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case IcdManagement::Attributes::ClusterRevision::Id: {
+        case TemperatureControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8041,65 +9526,50 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ModeSelect::Id: {
+    case RefrigeratorAlarm::Id: {
         switch (path.mAttributeId)
         {
-        case ModeSelect::Attributes::Description::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Description", 1, value);
-        }
-        case ModeSelect::Attributes::StandardNamespace::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StandardNamespace", 1, value);
-        }
-        case ModeSelect::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedModes", 1, value);
-        }
-        case ModeSelect::Attributes::CurrentMode::Id: {
-            uint8_t value;
+        case RefrigeratorAlarm::Attributes::Mask::Id: {
+            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMode", 1, value);
+            return DataModelLogger::LogValue("Mask", 1, value);
         }
-        case ModeSelect::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case RefrigeratorAlarm::Attributes::State::Id: {
+            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
+            return DataModelLogger::LogValue("State", 1, value);
         }
-        case ModeSelect::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case RefrigeratorAlarm::Attributes::Supported::Id: {
+            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
+            return DataModelLogger::LogValue("Supported", 1, value);
         }
-        case ModeSelect::Attributes::GeneratedCommandList::Id: {
+        case RefrigeratorAlarm::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ModeSelect::Attributes::AcceptedCommandList::Id: {
+        case RefrigeratorAlarm::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ModeSelect::Attributes::EventList::Id: {
+        case RefrigeratorAlarm::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ModeSelect::Attributes::AttributeList::Id: {
+        case RefrigeratorAlarm::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ModeSelect::Attributes::FeatureMap::Id: {
+        case RefrigeratorAlarm::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ModeSelect::Attributes::ClusterRevision::Id: {
+        case RefrigeratorAlarm::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8107,56 +9577,56 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LaundryWasherMode::Id: {
+    case DishwasherMode::Id: {
         switch (path.mAttributeId)
         {
-        case LaundryWasherMode::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType>
+        case DishwasherMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case LaundryWasherMode::Attributes::CurrentMode::Id: {
+        case DishwasherMode::Attributes::CurrentMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case LaundryWasherMode::Attributes::StartUpMode::Id: {
+        case DishwasherMode::Attributes::StartUpMode::Id: {
             chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        case LaundryWasherMode::Attributes::OnMode::Id: {
+        case DishwasherMode::Attributes::OnMode::Id: {
             chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OnMode", 1, value);
         }
-        case LaundryWasherMode::Attributes::GeneratedCommandList::Id: {
+        case DishwasherMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LaundryWasherMode::Attributes::AcceptedCommandList::Id: {
+        case DishwasherMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LaundryWasherMode::Attributes::EventList::Id: {
+        case DishwasherMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case LaundryWasherMode::Attributes::AttributeList::Id: {
+        case DishwasherMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LaundryWasherMode::Attributes::FeatureMap::Id: {
+        case DishwasherMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LaundryWasherMode::Attributes::ClusterRevision::Id: {
+        case DishwasherMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8164,57 +9634,40 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case RefrigeratorAndTemperatureControlledCabinetMode::Id: {
+    case AirQuality::Id: {
         switch (path.mAttributeId)
         {
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedModes", 1, value);
-        }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMode", 1, value);
-        }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
-        }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case AirQuality::Attributes::AirQuality::Id: {
+            chip::app::Clusters::AirQuality::AirQualityEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
+            return DataModelLogger::LogValue("AirQuality", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id: {
+        case AirQuality::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id: {
+        case AirQuality::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id: {
+        case AirQuality::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id: {
+        case AirQuality::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id: {
+        case AirQuality::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id: {
+        case AirQuality::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8222,55 +9675,100 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LaundryWasherControls::Id: {
+    case SmokeCoAlarm::Id: {
         switch (path.mAttributeId)
         {
-        case LaundryWasherControls::Attributes::SpinSpeeds::Id: {
-            chip::app::DataModel::DecodableList<chip::CharSpan> value;
+        case SmokeCoAlarm::Attributes::ExpressedState::Id: {
+            chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SpinSpeeds", 1, value);
+            return DataModelLogger::LogValue("ExpressedState", 1, value);
         }
-        case LaundryWasherControls::Attributes::SpinSpeedCurrent::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case SmokeCoAlarm::Attributes::SmokeState::Id: {
+            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SpinSpeedCurrent", 1, value);
+            return DataModelLogger::LogValue("SmokeState", 1, value);
         }
-        case LaundryWasherControls::Attributes::NumberOfRinses::Id: {
-            chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value;
+        case SmokeCoAlarm::Attributes::COState::Id: {
+            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfRinses", 1, value);
+            return DataModelLogger::LogValue("COState", 1, value);
         }
-        case LaundryWasherControls::Attributes::SupportedRinses::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> value;
+        case SmokeCoAlarm::Attributes::BatteryAlert::Id: {
+            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedRinses", 1, value);
+            return DataModelLogger::LogValue("BatteryAlert", 1, value);
         }
-        case LaundryWasherControls::Attributes::GeneratedCommandList::Id: {
+        case SmokeCoAlarm::Attributes::DeviceMuted::Id: {
+            chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DeviceMuted", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::TestInProgress::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TestInProgress", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::HardwareFaultAlert::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("HardwareFaultAlert", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::EndOfServiceAlert::Id: {
+            chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EndOfServiceAlert", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id: {
+            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InterconnectSmokeAlarm", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id: {
+            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InterconnectCOAlarm", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::ContaminationState::Id: {
+            chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ContaminationState", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id: {
+            chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SmokeSensitivityLevel", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::ExpiryDate::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ExpiryDate", 1, value);
+        }
+        case SmokeCoAlarm::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LaundryWasherControls::Attributes::AcceptedCommandList::Id: {
+        case SmokeCoAlarm::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LaundryWasherControls::Attributes::EventList::Id: {
+        case SmokeCoAlarm::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case LaundryWasherControls::Attributes::AttributeList::Id: {
+        case SmokeCoAlarm::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LaundryWasherControls::Attributes::FeatureMap::Id: {
+        case SmokeCoAlarm::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LaundryWasherControls::Attributes::ClusterRevision::Id: {
+        case SmokeCoAlarm::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8278,50 +9776,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case RvcRunMode::Id: {
+    case DishwasherAlarm::Id: {
         switch (path.mAttributeId)
         {
-        case RvcRunMode::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> value;
+        case DishwasherAlarm::Attributes::Mask::Id: {
+            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedModes", 1, value);
+            return DataModelLogger::LogValue("Mask", 1, value);
         }
-        case RvcRunMode::Attributes::CurrentMode::Id: {
-            uint8_t value;
+        case DishwasherAlarm::Attributes::Latch::Id: {
+            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMode", 1, value);
+            return DataModelLogger::LogValue("Latch", 1, value);
         }
-        case RvcRunMode::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case DishwasherAlarm::Attributes::State::Id: {
+            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
+            return DataModelLogger::LogValue("State", 1, value);
         }
-        case RvcRunMode::Attributes::GeneratedCommandList::Id: {
+        case DishwasherAlarm::Attributes::Supported::Id: {
+            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Supported", 1, value);
+        }
+        case DishwasherAlarm::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case RvcRunMode::Attributes::AcceptedCommandList::Id: {
+        case DishwasherAlarm::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case RvcRunMode::Attributes::EventList::Id: {
+        case DishwasherAlarm::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case RvcRunMode::Attributes::AttributeList::Id: {
+        case DishwasherAlarm::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case RvcRunMode::Attributes::FeatureMap::Id: {
+        case DishwasherAlarm::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case RvcRunMode::Attributes::ClusterRevision::Id: {
+        case DishwasherAlarm::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8329,50 +9832,46 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case RvcCleanMode::Id: {
+    case MicrowaveOvenMode::Id: {
         switch (path.mAttributeId)
         {
-        case RvcCleanMode::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> value;
+        case MicrowaveOvenMode::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case RvcCleanMode::Attributes::CurrentMode::Id: {
+        case MicrowaveOvenMode::Attributes::CurrentMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case RvcCleanMode::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
-        }
-        case RvcCleanMode::Attributes::GeneratedCommandList::Id: {
+        case MicrowaveOvenMode::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case RvcCleanMode::Attributes::AcceptedCommandList::Id: {
+        case MicrowaveOvenMode::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case RvcCleanMode::Attributes::EventList::Id: {
+        case MicrowaveOvenMode::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case RvcCleanMode::Attributes::AttributeList::Id: {
+        case MicrowaveOvenMode::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case RvcCleanMode::Attributes::FeatureMap::Id: {
+        case MicrowaveOvenMode::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case RvcCleanMode::Attributes::ClusterRevision::Id: {
+        case MicrowaveOvenMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8380,65 +9879,60 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TemperatureControl::Id: {
+    case MicrowaveOvenControl::Id: {
         switch (path.mAttributeId)
         {
-        case TemperatureControl::Attributes::TemperatureSetpoint::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TemperatureSetpoint", 1, value);
-        }
-        case TemperatureControl::Attributes::MinTemperature::Id: {
-            int16_t value;
+        case MicrowaveOvenControl::Attributes::CookTime::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinTemperature", 1, value);
+            return DataModelLogger::LogValue("CookTime", 1, value);
         }
-        case TemperatureControl::Attributes::MaxTemperature::Id: {
-            int16_t value;
+        case MicrowaveOvenControl::Attributes::PowerSetting::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxTemperature", 1, value);
+            return DataModelLogger::LogValue("PowerSetting", 1, value);
         }
-        case TemperatureControl::Attributes::Step::Id: {
-            int16_t value;
+        case MicrowaveOvenControl::Attributes::MinPower::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Step", 1, value);
+            return DataModelLogger::LogValue("MinPower", 1, value);
         }
-        case TemperatureControl::Attributes::SelectedTemperatureLevel::Id: {
+        case MicrowaveOvenControl::Attributes::MaxPower::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SelectedTemperatureLevel", 1, value);
+            return DataModelLogger::LogValue("MaxPower", 1, value);
         }
-        case TemperatureControl::Attributes::SupportedTemperatureLevels::Id: {
-            chip::app::DataModel::DecodableList<chip::CharSpan> value;
+        case MicrowaveOvenControl::Attributes::PowerStep::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedTemperatureLevels", 1, value);
+            return DataModelLogger::LogValue("PowerStep", 1, value);
         }
-        case TemperatureControl::Attributes::GeneratedCommandList::Id: {
+        case MicrowaveOvenControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TemperatureControl::Attributes::AcceptedCommandList::Id: {
+        case MicrowaveOvenControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TemperatureControl::Attributes::EventList::Id: {
+        case MicrowaveOvenControl::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case TemperatureControl::Attributes::AttributeList::Id: {
+        case MicrowaveOvenControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TemperatureControl::Attributes::FeatureMap::Id: {
+        case MicrowaveOvenControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TemperatureControl::Attributes::ClusterRevision::Id: {
+        case MicrowaveOvenControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8446,50 +9940,67 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case RefrigeratorAlarm::Id: {
+    case OperationalState::Id: {
         switch (path.mAttributeId)
         {
-        case RefrigeratorAlarm::Attributes::Mask::Id: {
-            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
+        case OperationalState::Attributes::PhaseList::Id: {
+            chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PhaseList", 1, value);
+        }
+        case OperationalState::Attributes::CurrentPhase::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentPhase", 1, value);
+        }
+        case OperationalState::Attributes::CountdownTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Mask", 1, value);
+            return DataModelLogger::LogValue("CountdownTime", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::State::Id: {
-            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
+        case OperationalState::Attributes::OperationalStateList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("State", 1, value);
+            return DataModelLogger::LogValue("OperationalStateList", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::Supported::Id: {
-            chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmMap> value;
+        case OperationalState::Attributes::OperationalState::Id: {
+            chip::app::Clusters::OperationalState::OperationalStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Supported", 1, value);
+            return DataModelLogger::LogValue("OperationalState", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::GeneratedCommandList::Id: {
+        case OperationalState::Attributes::OperationalError::Id: {
+            chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationalError", 1, value);
+        }
+        case OperationalState::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::AcceptedCommandList::Id: {
+        case OperationalState::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::EventList::Id: {
+        case OperationalState::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::AttributeList::Id: {
+        case OperationalState::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::FeatureMap::Id: {
+        case OperationalState::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case RefrigeratorAlarm::Attributes::ClusterRevision::Id: {
+        case OperationalState::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8497,56 +10008,67 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case DishwasherMode::Id: {
+    case RvcOperationalState::Id: {
         switch (path.mAttributeId)
         {
-        case DishwasherMode::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType>
-                value;
+        case RvcOperationalState::Attributes::PhaseList::Id: {
+            chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedModes", 1, value);
+            return DataModelLogger::LogValue("PhaseList", 1, value);
         }
-        case DishwasherMode::Attributes::CurrentMode::Id: {
-            uint8_t value;
+        case RvcOperationalState::Attributes::CurrentPhase::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMode", 1, value);
+            return DataModelLogger::LogValue("CurrentPhase", 1, value);
         }
-        case DishwasherMode::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case RvcOperationalState::Attributes::CountdownTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
+            return DataModelLogger::LogValue("CountdownTime", 1, value);
         }
-        case DishwasherMode::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case RvcOperationalState::Attributes::OperationalStateList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
+            return DataModelLogger::LogValue("OperationalStateList", 1, value);
         }
-        case DishwasherMode::Attributes::GeneratedCommandList::Id: {
+        case RvcOperationalState::Attributes::OperationalState::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationalState", 1, value);
+        }
+        case RvcOperationalState::Attributes::OperationalError::Id: {
+            chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationalError", 1, value);
+        }
+        case RvcOperationalState::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case DishwasherMode::Attributes::AcceptedCommandList::Id: {
+        case RvcOperationalState::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case DishwasherMode::Attributes::EventList::Id: {
+        case RvcOperationalState::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case DishwasherMode::Attributes::AttributeList::Id: {
+        case RvcOperationalState::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case DishwasherMode::Attributes::FeatureMap::Id: {
+        case RvcOperationalState::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case DishwasherMode::Attributes::ClusterRevision::Id: {
+        case RvcOperationalState::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8554,40 +10076,67 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case AirQuality::Id: {
+    case HepaFilterMonitoring::Id: {
         switch (path.mAttributeId)
         {
-        case AirQuality::Attributes::AirQuality::Id: {
-            chip::app::Clusters::AirQuality::AirQualityEnum value;
+        case HepaFilterMonitoring::Attributes::Condition::Id: {
+            chip::Percent value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AirQuality", 1, value);
+            return DataModelLogger::LogValue("Condition", 1, value);
         }
-        case AirQuality::Attributes::GeneratedCommandList::Id: {
+        case HepaFilterMonitoring::Attributes::DegradationDirection::Id: {
+            chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DegradationDirection", 1, value);
+        }
+        case HepaFilterMonitoring::Attributes::ChangeIndication::Id: {
+            chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ChangeIndication", 1, value);
+        }
+        case HepaFilterMonitoring::Attributes::InPlaceIndicator::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InPlaceIndicator", 1, value);
+        }
+        case HepaFilterMonitoring::Attributes::LastChangedTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastChangedTime", 1, value);
+        }
+        case HepaFilterMonitoring::Attributes::ReplacementProductList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>
+                value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ReplacementProductList", 1, value);
+        }
+        case HepaFilterMonitoring::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AirQuality::Attributes::AcceptedCommandList::Id: {
+        case HepaFilterMonitoring::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AirQuality::Attributes::EventList::Id: {
+        case HepaFilterMonitoring::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case AirQuality::Attributes::AttributeList::Id: {
+        case HepaFilterMonitoring::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AirQuality::Attributes::FeatureMap::Id: {
+        case HepaFilterMonitoring::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AirQuality::Attributes::ClusterRevision::Id: {
+        case HepaFilterMonitoring::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8595,100 +10144,67 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case SmokeCoAlarm::Id: {
+    case ActivatedCarbonFilterMonitoring::Id: {
         switch (path.mAttributeId)
         {
-        case SmokeCoAlarm::Attributes::ExpressedState::Id: {
-            chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ExpressedState", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::SmokeState::Id: {
-            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SmokeState", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::COState::Id: {
-            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("COState", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::BatteryAlert::Id: {
-            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
+        case ActivatedCarbonFilterMonitoring::Attributes::Condition::Id: {
+            chip::Percent value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryAlert", 1, value);
+            return DataModelLogger::LogValue("Condition", 1, value);
         }
-        case SmokeCoAlarm::Attributes::DeviceMuted::Id: {
-            chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value;
+        case ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id: {
+            chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DeviceMuted", 1, value);
+            return DataModelLogger::LogValue("DegradationDirection", 1, value);
         }
-        case SmokeCoAlarm::Attributes::TestInProgress::Id: {
-            bool value;
+        case ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id: {
+            chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TestInProgress", 1, value);
+            return DataModelLogger::LogValue("ChangeIndication", 1, value);
         }
-        case SmokeCoAlarm::Attributes::HardwareFaultAlert::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareFaultAlert", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::EndOfServiceAlert::Id: {
-            chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EndOfServiceAlert", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InterconnectSmokeAlarm", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InterconnectCOAlarm", 1, value);
-        }
-        case SmokeCoAlarm::Attributes::ContaminationState::Id: {
-            chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ContaminationState", 1, value);
+            return DataModelLogger::LogValue("InPlaceIndicator", 1, value);
         }
-        case SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id: {
-            chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value;
+        case ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SmokeSensitivityLevel", 1, value);
+            return DataModelLogger::LogValue("LastChangedTime", 1, value);
         }
-        case SmokeCoAlarm::Attributes::ExpiryDate::Id: {
-            uint32_t value;
+        case ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ExpiryDate", 1, value);
+            return DataModelLogger::LogValue("ReplacementProductList", 1, value);
         }
-        case SmokeCoAlarm::Attributes::GeneratedCommandList::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case SmokeCoAlarm::Attributes::AcceptedCommandList::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case SmokeCoAlarm::Attributes::EventList::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case SmokeCoAlarm::Attributes::AttributeList::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case SmokeCoAlarm::Attributes::FeatureMap::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case SmokeCoAlarm::Attributes::ClusterRevision::Id: {
+        case ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8696,55 +10212,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case DishwasherAlarm::Id: {
+    case BooleanSensorConfiguration::Id: {
         switch (path.mAttributeId)
         {
-        case DishwasherAlarm::Attributes::Mask::Id: {
-            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
+        case BooleanSensorConfiguration::Attributes::SensitivityLevel::Id: {
+            chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Mask", 1, value);
+            return DataModelLogger::LogValue("SensitivityLevel", 1, value);
         }
-        case DishwasherAlarm::Attributes::Latch::Id: {
-            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
+        case BooleanSensorConfiguration::Attributes::AlarmsActive::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Latch", 1, value);
+            return DataModelLogger::LogValue("AlarmsActive", 1, value);
         }
-        case DishwasherAlarm::Attributes::State::Id: {
-            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
+        case BooleanSensorConfiguration::Attributes::AlarmsSuppressed::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("State", 1, value);
+            return DataModelLogger::LogValue("AlarmsSuppressed", 1, value);
         }
-        case DishwasherAlarm::Attributes::Supported::Id: {
-            chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmMap> value;
+        case BooleanSensorConfiguration::Attributes::AlarmsEnabled::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Supported", 1, value);
+            return DataModelLogger::LogValue("AlarmsEnabled", 1, value);
         }
-        case DishwasherAlarm::Attributes::GeneratedCommandList::Id: {
+        case BooleanSensorConfiguration::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case DishwasherAlarm::Attributes::AcceptedCommandList::Id: {
+        case BooleanSensorConfiguration::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case DishwasherAlarm::Attributes::EventList::Id: {
+        case BooleanSensorConfiguration::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case DishwasherAlarm::Attributes::AttributeList::Id: {
+        case BooleanSensorConfiguration::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case DishwasherAlarm::Attributes::FeatureMap::Id: {
+        case BooleanSensorConfiguration::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case DishwasherAlarm::Attributes::ClusterRevision::Id: {
+        case BooleanSensorConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8752,67 +10268,85 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OperationalState::Id: {
+    case ValveConfigurationAndControl::Id: {
         switch (path.mAttributeId)
         {
-        case OperationalState::Attributes::PhaseList::Id: {
-            chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> value;
+        case ValveConfigurationAndControl::Attributes::OpenDuration::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PhaseList", 1, value);
+            return DataModelLogger::LogValue("OpenDuration", 1, value);
         }
-        case OperationalState::Attributes::CurrentPhase::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ValveConfigurationAndControl::Attributes::AutoCloseTime::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AutoCloseTime", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::RemainingDuration::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RemainingDuration", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::CurrentState::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentState", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::TargetState::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetState", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::StartUpState::Id: {
+            chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPhase", 1, value);
+            return DataModelLogger::LogValue("StartUpState", 1, value);
         }
-        case OperationalState::Attributes::CountdownTime::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ValveConfigurationAndControl::Attributes::CurrentLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CountdownTime", 1, value);
+            return DataModelLogger::LogValue("CurrentLevel", 1, value);
         }
-        case OperationalState::Attributes::OperationalStateList::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType>
-                value;
+        case ValveConfigurationAndControl::Attributes::TargetLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalStateList", 1, value);
+            return DataModelLogger::LogValue("TargetLevel", 1, value);
         }
-        case OperationalState::Attributes::OperationalState::Id: {
-            chip::app::Clusters::OperationalState::OperationalStateEnum value;
+        case ValveConfigurationAndControl::Attributes::OpenLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalState", 1, value);
+            return DataModelLogger::LogValue("OpenLevel", 1, value);
         }
-        case OperationalState::Attributes::OperationalError::Id: {
-            chip::app::Clusters::OperationalState::Structs::ErrorStateStruct::DecodableType value;
+        case ValveConfigurationAndControl::Attributes::ValveFault::Id: {
+            chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalError", 1, value);
+            return DataModelLogger::LogValue("ValveFault", 1, value);
         }
-        case OperationalState::Attributes::GeneratedCommandList::Id: {
+        case ValveConfigurationAndControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OperationalState::Attributes::AcceptedCommandList::Id: {
+        case ValveConfigurationAndControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OperationalState::Attributes::EventList::Id: {
+        case ValveConfigurationAndControl::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case OperationalState::Attributes::AttributeList::Id: {
+        case ValveConfigurationAndControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OperationalState::Attributes::FeatureMap::Id: {
+        case ValveConfigurationAndControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OperationalState::Attributes::ClusterRevision::Id: {
+        case ValveConfigurationAndControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8820,67 +10354,81 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case RvcOperationalState::Id: {
+    case DemandResponseLoadControl::Id: {
         switch (path.mAttributeId)
         {
-        case RvcOperationalState::Attributes::PhaseList::Id: {
-            chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> value;
+        case DemandResponseLoadControl::Attributes::LoadControlPrograms::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PhaseList", 1, value);
+            return DataModelLogger::LogValue("LoadControlPrograms", 1, value);
         }
-        case RvcOperationalState::Attributes::CurrentPhase::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPhase", 1, value);
+            return DataModelLogger::LogValue("NumberOfLoadControlPrograms", 1, value);
         }
-        case RvcOperationalState::Attributes::CountdownTime::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case DemandResponseLoadControl::Attributes::Events::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CountdownTime", 1, value);
+            return DataModelLogger::LogValue("Events", 1, value);
         }
-        case RvcOperationalState::Attributes::OperationalStateList::Id: {
+        case DemandResponseLoadControl::Attributes::ActiveEvents::Id: {
             chip::app::DataModel::DecodableList<
-                chip::app::Clusters::RvcOperationalState::Structs::OperationalStateStruct::DecodableType>
+                chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalStateList", 1, value);
+            return DataModelLogger::LogValue("ActiveEvents", 1, value);
         }
-        case RvcOperationalState::Attributes::OperationalState::Id: {
+        case DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalState", 1, value);
+            return DataModelLogger::LogValue("NumberOfEventsPerProgram", 1, value);
         }
-        case RvcOperationalState::Attributes::OperationalError::Id: {
-            chip::app::Clusters::RvcOperationalState::Structs::ErrorStateStruct::DecodableType value;
+        case DemandResponseLoadControl::Attributes::NumberOfTransitions::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalError", 1, value);
+            return DataModelLogger::LogValue("NumberOfTransitions", 1, value);
         }
-        case RvcOperationalState::Attributes::GeneratedCommandList::Id: {
+        case DemandResponseLoadControl::Attributes::DefaultRandomStart::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DefaultRandomStart", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::DefaultRandomDuration::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DefaultRandomDuration", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case RvcOperationalState::Attributes::AcceptedCommandList::Id: {
+        case DemandResponseLoadControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case RvcOperationalState::Attributes::EventList::Id: {
+        case DemandResponseLoadControl::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case RvcOperationalState::Attributes::AttributeList::Id: {
+        case DemandResponseLoadControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case RvcOperationalState::Attributes::FeatureMap::Id: {
+        case DemandResponseLoadControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case RvcOperationalState::Attributes::ClusterRevision::Id: {
+        case DemandResponseLoadControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8888,135 +10436,160 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case HepaFilterMonitoring::Id: {
+    case EnergyEvse::Id: {
         switch (path.mAttributeId)
         {
-        case HepaFilterMonitoring::Attributes::Condition::Id: {
-            chip::Percent value;
+        case EnergyEvse::Attributes::State::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::EnergyEvse::StateEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Condition", 1, value);
+            return DataModelLogger::LogValue("State", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::DegradationDirection::Id: {
-            chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum value;
+        case EnergyEvse::Attributes::SupplyState::Id: {
+            chip::app::Clusters::EnergyEvse::SupplyStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DegradationDirection", 1, value);
+            return DataModelLogger::LogValue("SupplyState", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::ChangeIndication::Id: {
-            chip::app::Clusters::HepaFilterMonitoring::ChangeIndicationEnum value;
+        case EnergyEvse::Attributes::FaultState::Id: {
+            chip::app::Clusters::EnergyEvse::FaultStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChangeIndication", 1, value);
+            return DataModelLogger::LogValue("FaultState", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::InPlaceIndicator::Id: {
-            bool value;
+        case EnergyEvse::Attributes::ChargingEnabledUntil::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InPlaceIndicator", 1, value);
+            return DataModelLogger::LogValue("ChargingEnabledUntil", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::LastChangedTime::Id: {
+        case EnergyEvse::Attributes::DischargingEnabledUntil::Id: {
             chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastChangedTime", 1, value);
+            return DataModelLogger::LogValue("DischargingEnabledUntil", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::ReplacementProductList::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::HepaFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>
-                value;
+        case EnergyEvse::Attributes::CircuitCapacity::Id: {
+            int64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ReplacementProductList", 1, value);
+            return DataModelLogger::LogValue("CircuitCapacity", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case EnergyEvse::Attributes::MinimumChargeCurrent::Id: {
+            int64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("MinimumChargeCurrent", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case EnergyEvse::Attributes::MaximumChargeCurrent::Id: {
+            int64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("MaximumChargeCurrent", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::EventList::Id: {
-            chip::app::DataModel::DecodableList<chip::EventId> value;
+        case EnergyEvse::Attributes::MaximumDischargeCurrent::Id: {
+            int64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EventList", 1, value);
+            return DataModelLogger::LogValue("MaximumDischargeCurrent", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case EnergyEvse::Attributes::UserMaximumChargeCurrent::Id: {
+            int64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("UserMaximumChargeCurrent", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::FeatureMap::Id: {
+        case EnergyEvse::Attributes::RandomizationDelayWindow::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("RandomizationDelayWindow", 1, value);
         }
-        case HepaFilterMonitoring::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case EnergyEvse::Attributes::NumberOfWeeklyTargets::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("NumberOfWeeklyTargets", 1, value);
         }
+        case EnergyEvse::Attributes::NumberOfDailyTargets::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NumberOfDailyTargets", 1, value);
         }
-        break;
-    }
-    case ActivatedCarbonFilterMonitoring::Id: {
-        switch (path.mAttributeId)
-        {
-        case ActivatedCarbonFilterMonitoring::Attributes::Condition::Id: {
-            chip::Percent value;
+        case EnergyEvse::Attributes::NextChargeStartTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Condition", 1, value);
+            return DataModelLogger::LogValue("NextChargeStartTime", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id: {
-            chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum value;
+        case EnergyEvse::Attributes::NextChargeTargetTime::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DegradationDirection", 1, value);
+            return DataModelLogger::LogValue("NextChargeTargetTime", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id: {
-            chip::app::Clusters::ActivatedCarbonFilterMonitoring::ChangeIndicationEnum value;
+        case EnergyEvse::Attributes::NextChargeRequiredEnergy::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChangeIndication", 1, value);
+            return DataModelLogger::LogValue("NextChargeRequiredEnergy", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id: {
-            bool value;
+        case EnergyEvse::Attributes::NextChargeTargetSoC::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InPlaceIndicator", 1, value);
+            return DataModelLogger::LogValue("NextChargeTargetSoC", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id: {
+        case EnergyEvse::Attributes::ApproximateEVEfficiency::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ApproximateEVEfficiency", 1, value);
+        }
+        case EnergyEvse::Attributes::StateOfCharge::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StateOfCharge", 1, value);
+        }
+        case EnergyEvse::Attributes::BatteryCapacity::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryCapacity", 1, value);
+        }
+        case EnergyEvse::Attributes::VehicleID::Id: {
+            chip::app::DataModel::Nullable<chip::CharSpan> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("VehicleID", 1, value);
+        }
+        case EnergyEvse::Attributes::SessionID::Id: {
             chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastChangedTime", 1, value);
+            return DataModelLogger::LogValue("SessionID", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType>
-                value;
+        case EnergyEvse::Attributes::SessionDuration::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ReplacementProductList", 1, value);
+            return DataModelLogger::LogValue("SessionDuration", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id: {
+        case EnergyEvse::Attributes::SessionEnergyCharged::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SessionEnergyCharged", 1, value);
+        }
+        case EnergyEvse::Attributes::SessionEnergyDischarged::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SessionEnergyDischarged", 1, value);
+        }
+        case EnergyEvse::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id: {
+        case EnergyEvse::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::EventList::Id: {
+        case EnergyEvse::Attributes::EventList::Id: {
             chip::app::DataModel::DecodableList<chip::EventId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EventList", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id: {
+        case EnergyEvse::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id: {
+        case EnergyEvse::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id: {
+        case EnergyEvse::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -10004,17 +11577,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         switch (path.mAttributeId)
         {
         case ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::Id: {
-            uint8_t value;
+            chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TemperatureDisplayMode", 1, value);
         }
         case ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::Id: {
-            uint8_t value;
+            chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("KeypadLockout", 1, value);
         }
         case ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::Id: {
-            uint8_t value;
+            chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ScheduleProgrammingVisibility", 1, value);
         }
@@ -11777,6 +13350,11 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MACAddress", 1, value);
         }
+        case WakeOnLan::Attributes::LinkLocalAddress::Id: {
+            chip::ByteSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LinkLocalAddress", 1, value);
+        }
         case WakeOnLan::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -12107,7 +13685,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("AcceptHeader", 1, value);
         }
         case ContentLauncher::Attributes::SupportedStreamingProtocols::Id: {
-            uint32_t value;
+            chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupportedStreamingProtocols", 1, value);
         }
@@ -13697,6 +15275,11 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ConnectNetworkResponse", 1, value);
         }
+        case NetworkCommissioning::Commands::QueryIdentityResponse::Id: {
+            NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("QueryIdentityResponse", 1, value);
+        }
         }
         break;
     }
@@ -13711,6 +15294,17 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
+    case GeneralDiagnostics::Id: {
+        switch (path.mCommandId)
+        {
+        case GeneralDiagnostics::Commands::TimeSnapshotResponse::Id: {
+            GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TimeSnapshotResponse", 1, value);
+        }
+        }
+        break;
+    }
     case TimeSynchronization::Id: {
         switch (path.mCommandId)
         {
@@ -13772,6 +15366,33 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("RegisterClientResponse", 1, value);
         }
+        case IcdManagement::Commands::StayActiveResponse::Id: {
+            IcdManagement::Commands::StayActiveResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StayActiveResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case OvenCavityOperationalState::Id: {
+        switch (path.mCommandId)
+        {
+        case OvenCavityOperationalState::Commands::OperationalCommandResponse::Id: {
+            OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationalCommandResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case OvenMode::Id: {
+        switch (path.mCommandId)
+        {
+        case OvenMode::Commands::ChangeToModeResponse::Id: {
+            OvenMode::Commands::ChangeToModeResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ChangeToModeResponse", 1, value);
+        }
         }
         break;
     }
@@ -13852,6 +15473,17 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
+    case EnergyEvse::Id: {
+        switch (path.mCommandId)
+        {
+        case EnergyEvse::Commands::GetTargetsResponse::Id: {
+            EnergyEvse::Commands::GetTargetsResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GetTargetsResponse", 1, value);
+        }
+        }
+        break;
+    }
     case DoorLock::Id: {
         switch (path.mCommandId)
         {
@@ -14108,12 +15740,12 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case AccessControl::Events::AccessControlEntryChanged::Id: {
-            chip::app::Clusters::AccessControl::Events::AccessControlEntryChanged::DecodableType value;
+            AccessControl::Events::AccessControlEntryChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AccessControlEntryChanged", 1, value);
         }
         case AccessControl::Events::AccessControlExtensionChanged::Id: {
-            chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value;
+            AccessControl::Events::AccessControlExtensionChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AccessControlExtensionChanged", 1, value);
         }
@@ -14124,12 +15756,12 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case Actions::Events::StateChanged::Id: {
-            chip::app::Clusters::Actions::Events::StateChanged::DecodableType value;
+            Actions::Events::StateChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StateChanged", 1, value);
         }
         case Actions::Events::ActionFailed::Id: {
-            chip::app::Clusters::Actions::Events::ActionFailed::DecodableType value;
+            Actions::Events::ActionFailed::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActionFailed", 1, value);
         }
@@ -14140,22 +15772,22 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case BasicInformation::Events::StartUp::Id: {
-            chip::app::Clusters::BasicInformation::Events::StartUp::DecodableType value;
+            BasicInformation::Events::StartUp::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StartUp", 1, value);
         }
         case BasicInformation::Events::ShutDown::Id: {
-            chip::app::Clusters::BasicInformation::Events::ShutDown::DecodableType value;
+            BasicInformation::Events::ShutDown::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ShutDown", 1, value);
         }
         case BasicInformation::Events::Leave::Id: {
-            chip::app::Clusters::BasicInformation::Events::Leave::DecodableType value;
+            BasicInformation::Events::Leave::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Leave", 1, value);
         }
         case BasicInformation::Events::ReachableChanged::Id: {
-            chip::app::Clusters::BasicInformation::Events::ReachableChanged::DecodableType value;
+            BasicInformation::Events::ReachableChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ReachableChanged", 1, value);
         }
@@ -14166,17 +15798,17 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case OtaSoftwareUpdateRequestor::Events::StateTransition::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType value;
+            OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StateTransition", 1, value);
         }
         case OtaSoftwareUpdateRequestor::Events::VersionApplied::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType value;
+            OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("VersionApplied", 1, value);
         }
         case OtaSoftwareUpdateRequestor::Events::DownloadError::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType value;
+            OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DownloadError", 1, value);
         }
@@ -14187,17 +15819,17 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case PowerSource::Events::WiredFaultChange::Id: {
-            chip::app::Clusters::PowerSource::Events::WiredFaultChange::DecodableType value;
+            PowerSource::Events::WiredFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("WiredFaultChange", 1, value);
         }
         case PowerSource::Events::BatFaultChange::Id: {
-            chip::app::Clusters::PowerSource::Events::BatFaultChange::DecodableType value;
+            PowerSource::Events::BatFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("BatFaultChange", 1, value);
         }
         case PowerSource::Events::BatChargeFaultChange::Id: {
-            chip::app::Clusters::PowerSource::Events::BatChargeFaultChange::DecodableType value;
+            PowerSource::Events::BatChargeFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("BatChargeFaultChange", 1, value);
         }
@@ -14208,22 +15840,22 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case GeneralDiagnostics::Events::HardwareFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::HardwareFaultChange::DecodableType value;
+            GeneralDiagnostics::Events::HardwareFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("HardwareFaultChange", 1, value);
         }
         case GeneralDiagnostics::Events::RadioFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::RadioFaultChange::DecodableType value;
+            GeneralDiagnostics::Events::RadioFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("RadioFaultChange", 1, value);
         }
         case GeneralDiagnostics::Events::NetworkFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::NetworkFaultChange::DecodableType value;
+            GeneralDiagnostics::Events::NetworkFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("NetworkFaultChange", 1, value);
         }
         case GeneralDiagnostics::Events::BootReason::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::BootReason::DecodableType value;
+            GeneralDiagnostics::Events::BootReason::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("BootReason", 1, value);
         }
@@ -14234,7 +15866,7 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case SoftwareDiagnostics::Events::SoftwareFault::Id: {
-            chip::app::Clusters::SoftwareDiagnostics::Events::SoftwareFault::DecodableType value;
+            SoftwareDiagnostics::Events::SoftwareFault::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SoftwareFault", 1, value);
         }
@@ -14245,12 +15877,12 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case ThreadNetworkDiagnostics::Events::ConnectionStatus::Id: {
-            chip::app::Clusters::ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
+            ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ConnectionStatus", 1, value);
         }
         case ThreadNetworkDiagnostics::Events::NetworkFaultChange::Id: {
-            chip::app::Clusters::ThreadNetworkDiagnostics::Events::NetworkFaultChange::DecodableType value;
+            ThreadNetworkDiagnostics::Events::NetworkFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("NetworkFaultChange", 1, value);
         }
@@ -14261,17 +15893,17 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case WiFiNetworkDiagnostics::Events::Disconnection::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::Disconnection::DecodableType value;
+            WiFiNetworkDiagnostics::Events::Disconnection::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Disconnection", 1, value);
         }
         case WiFiNetworkDiagnostics::Events::AssociationFailure::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType value;
+            WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AssociationFailure", 1, value);
         }
         case WiFiNetworkDiagnostics::Events::ConnectionStatus::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
+            WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ConnectionStatus", 1, value);
         }
@@ -14282,27 +15914,27 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case TimeSynchronization::Events::DSTTableEmpty::Id: {
-            chip::app::Clusters::TimeSynchronization::Events::DSTTableEmpty::DecodableType value;
+            TimeSynchronization::Events::DSTTableEmpty::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DSTTableEmpty", 1, value);
         }
         case TimeSynchronization::Events::DSTStatus::Id: {
-            chip::app::Clusters::TimeSynchronization::Events::DSTStatus::DecodableType value;
+            TimeSynchronization::Events::DSTStatus::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DSTStatus", 1, value);
         }
         case TimeSynchronization::Events::TimeZoneStatus::Id: {
-            chip::app::Clusters::TimeSynchronization::Events::TimeZoneStatus::DecodableType value;
+            TimeSynchronization::Events::TimeZoneStatus::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TimeZoneStatus", 1, value);
         }
         case TimeSynchronization::Events::TimeFailure::Id: {
-            chip::app::Clusters::TimeSynchronization::Events::TimeFailure::DecodableType value;
+            TimeSynchronization::Events::TimeFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TimeFailure", 1, value);
         }
         case TimeSynchronization::Events::MissingTrustedTimeSource::Id: {
-            chip::app::Clusters::TimeSynchronization::Events::MissingTrustedTimeSource::DecodableType value;
+            TimeSynchronization::Events::MissingTrustedTimeSource::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MissingTrustedTimeSource", 1, value);
         }
@@ -14313,22 +15945,22 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case BridgedDeviceBasicInformation::Events::StartUp::Id: {
-            chip::app::Clusters::BridgedDeviceBasicInformation::Events::StartUp::DecodableType value;
+            BridgedDeviceBasicInformation::Events::StartUp::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StartUp", 1, value);
         }
         case BridgedDeviceBasicInformation::Events::ShutDown::Id: {
-            chip::app::Clusters::BridgedDeviceBasicInformation::Events::ShutDown::DecodableType value;
+            BridgedDeviceBasicInformation::Events::ShutDown::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ShutDown", 1, value);
         }
         case BridgedDeviceBasicInformation::Events::Leave::Id: {
-            chip::app::Clusters::BridgedDeviceBasicInformation::Events::Leave::DecodableType value;
+            BridgedDeviceBasicInformation::Events::Leave::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Leave", 1, value);
         }
         case BridgedDeviceBasicInformation::Events::ReachableChanged::Id: {
-            chip::app::Clusters::BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType value;
+            BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ReachableChanged", 1, value);
         }
@@ -14339,37 +15971,37 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case Switch::Events::SwitchLatched::Id: {
-            chip::app::Clusters::Switch::Events::SwitchLatched::DecodableType value;
+            Switch::Events::SwitchLatched::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SwitchLatched", 1, value);
         }
         case Switch::Events::InitialPress::Id: {
-            chip::app::Clusters::Switch::Events::InitialPress::DecodableType value;
+            Switch::Events::InitialPress::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("InitialPress", 1, value);
         }
         case Switch::Events::LongPress::Id: {
-            chip::app::Clusters::Switch::Events::LongPress::DecodableType value;
+            Switch::Events::LongPress::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LongPress", 1, value);
         }
         case Switch::Events::ShortRelease::Id: {
-            chip::app::Clusters::Switch::Events::ShortRelease::DecodableType value;
+            Switch::Events::ShortRelease::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ShortRelease", 1, value);
         }
         case Switch::Events::LongRelease::Id: {
-            chip::app::Clusters::Switch::Events::LongRelease::DecodableType value;
+            Switch::Events::LongRelease::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LongRelease", 1, value);
         }
         case Switch::Events::MultiPressOngoing::Id: {
-            chip::app::Clusters::Switch::Events::MultiPressOngoing::DecodableType value;
+            Switch::Events::MultiPressOngoing::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MultiPressOngoing", 1, value);
         }
         case Switch::Events::MultiPressComplete::Id: {
-            chip::app::Clusters::Switch::Events::MultiPressComplete::DecodableType value;
+            Switch::Events::MultiPressComplete::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MultiPressComplete", 1, value);
         }
@@ -14380,18 +16012,34 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case BooleanState::Events::StateChange::Id: {
-            chip::app::Clusters::BooleanState::Events::StateChange::DecodableType value;
+            BooleanState::Events::StateChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StateChange", 1, value);
         }
         }
         break;
     }
+    case OvenCavityOperationalState::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case OvenCavityOperationalState::Events::OperationalError::Id: {
+            chip::app::Clusters::OvenCavityOperationalState::Events::OperationalError::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationalError", 1, value);
+        }
+        case OvenCavityOperationalState::Events::OperationCompletion::Id: {
+            chip::app::Clusters::OvenCavityOperationalState::Events::OperationCompletion::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationCompletion", 1, value);
+        }
+        }
+        break;
+    }
     case RefrigeratorAlarm::Id: {
         switch (header.mPath.mEventId)
         {
         case RefrigeratorAlarm::Events::Notify::Id: {
-            chip::app::Clusters::RefrigeratorAlarm::Events::Notify::DecodableType value;
+            RefrigeratorAlarm::Events::Notify::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Notify", 1, value);
         }
@@ -14402,57 +16050,57 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case SmokeCoAlarm::Events::SmokeAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::SmokeAlarm::DecodableType value;
+            SmokeCoAlarm::Events::SmokeAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SmokeAlarm", 1, value);
         }
         case SmokeCoAlarm::Events::COAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::COAlarm::DecodableType value;
+            SmokeCoAlarm::Events::COAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("COAlarm", 1, value);
         }
         case SmokeCoAlarm::Events::LowBattery::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::LowBattery::DecodableType value;
+            SmokeCoAlarm::Events::LowBattery::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LowBattery", 1, value);
         }
         case SmokeCoAlarm::Events::HardwareFault::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::HardwareFault::DecodableType value;
+            SmokeCoAlarm::Events::HardwareFault::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("HardwareFault", 1, value);
         }
         case SmokeCoAlarm::Events::EndOfService::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::EndOfService::DecodableType value;
+            SmokeCoAlarm::Events::EndOfService::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("EndOfService", 1, value);
         }
         case SmokeCoAlarm::Events::SelfTestComplete::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::SelfTestComplete::DecodableType value;
+            SmokeCoAlarm::Events::SelfTestComplete::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SelfTestComplete", 1, value);
         }
         case SmokeCoAlarm::Events::AlarmMuted::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::AlarmMuted::DecodableType value;
+            SmokeCoAlarm::Events::AlarmMuted::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AlarmMuted", 1, value);
         }
         case SmokeCoAlarm::Events::MuteEnded::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::MuteEnded::DecodableType value;
+            SmokeCoAlarm::Events::MuteEnded::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MuteEnded", 1, value);
         }
         case SmokeCoAlarm::Events::InterconnectSmokeAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::InterconnectSmokeAlarm::DecodableType value;
+            SmokeCoAlarm::Events::InterconnectSmokeAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("InterconnectSmokeAlarm", 1, value);
         }
         case SmokeCoAlarm::Events::InterconnectCOAlarm::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::InterconnectCOAlarm::DecodableType value;
+            SmokeCoAlarm::Events::InterconnectCOAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("InterconnectCOAlarm", 1, value);
         }
         case SmokeCoAlarm::Events::AllClear::Id: {
-            chip::app::Clusters::SmokeCoAlarm::Events::AllClear::DecodableType value;
+            SmokeCoAlarm::Events::AllClear::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AllClear", 1, value);
         }
@@ -14463,7 +16111,7 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case DishwasherAlarm::Events::Notify::Id: {
-            chip::app::Clusters::DishwasherAlarm::Events::Notify::DecodableType value;
+            DishwasherAlarm::Events::Notify::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Notify", 1, value);
         }
@@ -14474,12 +16122,12 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case OperationalState::Events::OperationalError::Id: {
-            chip::app::Clusters::OperationalState::Events::OperationalError::DecodableType value;
+            OperationalState::Events::OperationalError::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OperationalError", 1, value);
         }
         case OperationalState::Events::OperationCompletion::Id: {
-            chip::app::Clusters::OperationalState::Events::OperationCompletion::DecodableType value;
+            OperationalState::Events::OperationCompletion::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OperationCompletion", 1, value);
         }
@@ -14490,43 +16138,122 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case RvcOperationalState::Events::OperationalError::Id: {
-            chip::app::Clusters::RvcOperationalState::Events::OperationalError::DecodableType value;
+            RvcOperationalState::Events::OperationalError::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OperationalError", 1, value);
         }
         case RvcOperationalState::Events::OperationCompletion::Id: {
-            chip::app::Clusters::RvcOperationalState::Events::OperationCompletion::DecodableType value;
+            RvcOperationalState::Events::OperationCompletion::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OperationCompletion", 1, value);
         }
         }
         break;
     }
+    case BooleanSensorConfiguration::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case BooleanSensorConfiguration::Events::AlarmsStateChanged::Id: {
+            BooleanSensorConfiguration::Events::AlarmsStateChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AlarmsStateChanged", 1, value);
+        }
+        case BooleanSensorConfiguration::Events::SensorFault::Id: {
+            BooleanSensorConfiguration::Events::SensorFault::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SensorFault", 1, value);
+        }
+        }
+        break;
+    }
+    case ValveConfigurationAndControl::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case ValveConfigurationAndControl::Events::ValveStateChanged::Id: {
+            ValveConfigurationAndControl::Events::ValveStateChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ValveStateChanged", 1, value);
+        }
+        case ValveConfigurationAndControl::Events::ValveFault::Id: {
+            ValveConfigurationAndControl::Events::ValveFault::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ValveFault", 1, value);
+        }
+        }
+        break;
+    }
+    case DemandResponseLoadControl::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case DemandResponseLoadControl::Events::LoadControlEventStatusChange::Id: {
+            DemandResponseLoadControl::Events::LoadControlEventStatusChange::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LoadControlEventStatusChange", 1, value);
+        }
+        }
+        break;
+    }
+    case EnergyEvse::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case EnergyEvse::Events::EVConnected::Id: {
+            EnergyEvse::Events::EVConnected::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EVConnected", 1, value);
+        }
+        case EnergyEvse::Events::EVNotDetected::Id: {
+            EnergyEvse::Events::EVNotDetected::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EVNotDetected", 1, value);
+        }
+        case EnergyEvse::Events::EnergyTransferStarted::Id: {
+            EnergyEvse::Events::EnergyTransferStarted::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EnergyTransferStarted", 1, value);
+        }
+        case EnergyEvse::Events::EnergyTransferStopped::Id: {
+            EnergyEvse::Events::EnergyTransferStopped::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EnergyTransferStopped", 1, value);
+        }
+        case EnergyEvse::Events::Fault::Id: {
+            EnergyEvse::Events::Fault::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Fault", 1, value);
+        }
+        case EnergyEvse::Events::Rfid::Id: {
+            EnergyEvse::Events::Rfid::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RFID", 1, value);
+        }
+        }
+        break;
+    }
     case DoorLock::Id: {
         switch (header.mPath.mEventId)
         {
         case DoorLock::Events::DoorLockAlarm::Id: {
-            chip::app::Clusters::DoorLock::Events::DoorLockAlarm::DecodableType value;
+            DoorLock::Events::DoorLockAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DoorLockAlarm", 1, value);
         }
         case DoorLock::Events::DoorStateChange::Id: {
-            chip::app::Clusters::DoorLock::Events::DoorStateChange::DecodableType value;
+            DoorLock::Events::DoorStateChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DoorStateChange", 1, value);
         }
         case DoorLock::Events::LockOperation::Id: {
-            chip::app::Clusters::DoorLock::Events::LockOperation::DecodableType value;
+            DoorLock::Events::LockOperation::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LockOperation", 1, value);
         }
         case DoorLock::Events::LockOperationError::Id: {
-            chip::app::Clusters::DoorLock::Events::LockOperationError::DecodableType value;
+            DoorLock::Events::LockOperationError::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LockOperationError", 1, value);
         }
         case DoorLock::Events::LockUserChange::Id: {
-            chip::app::Clusters::DoorLock::Events::LockUserChange::DecodableType value;
+            DoorLock::Events::LockUserChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LockUserChange", 1, value);
         }
@@ -14537,87 +16264,87 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case PumpConfigurationAndControl::Events::SupplyVoltageLow::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::SupplyVoltageLow::DecodableType value;
+            PumpConfigurationAndControl::Events::SupplyVoltageLow::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupplyVoltageLow", 1, value);
         }
         case PumpConfigurationAndControl::Events::SupplyVoltageHigh::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::SupplyVoltageHigh::DecodableType value;
+            PumpConfigurationAndControl::Events::SupplyVoltageHigh::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupplyVoltageHigh", 1, value);
         }
         case PumpConfigurationAndControl::Events::PowerMissingPhase::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::PowerMissingPhase::DecodableType value;
+            PumpConfigurationAndControl::Events::PowerMissingPhase::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PowerMissingPhase", 1, value);
         }
         case PumpConfigurationAndControl::Events::SystemPressureLow::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::SystemPressureLow::DecodableType value;
+            PumpConfigurationAndControl::Events::SystemPressureLow::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SystemPressureLow", 1, value);
         }
         case PumpConfigurationAndControl::Events::SystemPressureHigh::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::SystemPressureHigh::DecodableType value;
+            PumpConfigurationAndControl::Events::SystemPressureHigh::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SystemPressureHigh", 1, value);
         }
         case PumpConfigurationAndControl::Events::DryRunning::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::DryRunning::DecodableType value;
+            PumpConfigurationAndControl::Events::DryRunning::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DryRunning", 1, value);
         }
         case PumpConfigurationAndControl::Events::MotorTemperatureHigh::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::MotorTemperatureHigh::DecodableType value;
+            PumpConfigurationAndControl::Events::MotorTemperatureHigh::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MotorTemperatureHigh", 1, value);
         }
         case PumpConfigurationAndControl::Events::PumpMotorFatalFailure::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::PumpMotorFatalFailure::DecodableType value;
+            PumpConfigurationAndControl::Events::PumpMotorFatalFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PumpMotorFatalFailure", 1, value);
         }
         case PumpConfigurationAndControl::Events::ElectronicTemperatureHigh::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::ElectronicTemperatureHigh::DecodableType value;
+            PumpConfigurationAndControl::Events::ElectronicTemperatureHigh::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ElectronicTemperatureHigh", 1, value);
         }
         case PumpConfigurationAndControl::Events::PumpBlocked::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::PumpBlocked::DecodableType value;
+            PumpConfigurationAndControl::Events::PumpBlocked::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PumpBlocked", 1, value);
         }
         case PumpConfigurationAndControl::Events::SensorFailure::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::SensorFailure::DecodableType value;
+            PumpConfigurationAndControl::Events::SensorFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SensorFailure", 1, value);
         }
         case PumpConfigurationAndControl::Events::ElectronicNonFatalFailure::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::ElectronicNonFatalFailure::DecodableType value;
+            PumpConfigurationAndControl::Events::ElectronicNonFatalFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ElectronicNonFatalFailure", 1, value);
         }
         case PumpConfigurationAndControl::Events::ElectronicFatalFailure::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::ElectronicFatalFailure::DecodableType value;
+            PumpConfigurationAndControl::Events::ElectronicFatalFailure::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ElectronicFatalFailure", 1, value);
         }
         case PumpConfigurationAndControl::Events::GeneralFault::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::GeneralFault::DecodableType value;
+            PumpConfigurationAndControl::Events::GeneralFault::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneralFault", 1, value);
         }
         case PumpConfigurationAndControl::Events::Leakage::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::Leakage::DecodableType value;
+            PumpConfigurationAndControl::Events::Leakage::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Leakage", 1, value);
         }
         case PumpConfigurationAndControl::Events::AirDetection::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::AirDetection::DecodableType value;
+            PumpConfigurationAndControl::Events::AirDetection::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AirDetection", 1, value);
         }
         case PumpConfigurationAndControl::Events::TurbineOperation::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::Events::TurbineOperation::DecodableType value;
+            PumpConfigurationAndControl::Events::TurbineOperation::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TurbineOperation", 1, value);
         }
@@ -14628,12 +16355,12 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         switch (header.mPath.mEventId)
         {
         case UnitTesting::Events::TestEvent::Id: {
-            chip::app::Clusters::UnitTesting::Events::TestEvent::DecodableType value;
+            UnitTesting::Events::TestEvent::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TestEvent", 1, value);
         }
         case UnitTesting::Events::TestFabricScopedEvent::Id: {
-            chip::app::Clusters::UnitTesting::Events::TestFabricScopedEvent::DecodableType value;
+            UnitTesting::Events::TestFabricScopedEvent::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("TestFabricScopedEvent", 1, value);
         }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 96f8b52b007164..82102ec08c82f3 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -44,6 +44,9 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType & value);
 
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::Scenes::Structs::SceneInfoStruct::DecodableType & value);
+
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value);
 
@@ -170,6 +173,41 @@ static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType & value);
 
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::HeatingSourceControlStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::PowerSavingsControlStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::DutyCycleControlStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::AverageLoadControlStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::TemperatureControlStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventTransitionStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType & value);
+
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType & value);
+
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::DecodableType & value);
+
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value);
 
@@ -319,6 +357,11 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Switch::Events::MultiPressComplete::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::BooleanState::Events::StateChange::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::OvenCavityOperationalState::Events::OperationalError::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::OvenCavityOperationalState::Events::OperationCompletion::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::RefrigeratorAlarm::Events::Notify::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -353,6 +396,31 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::RvcOperationalState::Events::OperationalError::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::RvcOperationalState::Events::OperationCompletion::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::BooleanSensorConfiguration::Events::AlarmsStateChanged::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::BooleanSensorConfiguration::Events::SensorFault::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::ValveConfigurationAndControl::Events::ValveStateChanged::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::ValveConfigurationAndControl::Events::ValveFault::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::DemandResponseLoadControl::Events::LoadControlEventStatusChange::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::EVConnected::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::EVNotDetected::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::EnergyTransferStarted::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::EnergyTransferStopped::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::Fault::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Events::Rfid::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Events::DoorLockAlarm::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -458,8 +526,12 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -478,6 +550,13 @@ LogValue(const char * label, size_t indent,
          const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value);
 static CHIP_ERROR
@@ -496,6 +575,8 @@ LogValue(const char * label, size_t indent,
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 519a27da8c68ba..4358b5753c47c4 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -78,6 +78,10 @@
 | ProxyValid                                                          | 0x0044 |
 | BooleanState                                                        | 0x0045 |
 | IcdManagement                                                       | 0x0046 |
+| Timer                                                               | 0x0047 |
+| OvenCavityOperationalState                                          | 0x0048 |
+| OvenMode                                                            | 0x0049 |
+| LaundryDryerControls                                                | 0x004A |
 | ModeSelect                                                          | 0x0050 |
 | LaundryWasherMode                                                   | 0x0051 |
 | RefrigeratorAndTemperatureControlledCabinetMode                     | 0x0052 |
@@ -90,10 +94,16 @@
 | AirQuality                                                          | 0x005B |
 | SmokeCoAlarm                                                        | 0x005C |
 | DishwasherAlarm                                                     | 0x005D |
+| MicrowaveOvenMode                                                   | 0x005E |
+| MicrowaveOvenControl                                                | 0x005F |
 | OperationalState                                                    | 0x0060 |
 | RvcOperationalState                                                 | 0x0061 |
 | HepaFilterMonitoring                                                | 0x0071 |
 | ActivatedCarbonFilterMonitoring                                     | 0x0072 |
+| BooleanSensorConfiguration                                          | 0x0080 |
+| ValveConfigurationAndControl                                        | 0x0081 |
+| DemandResponseLoadControl                                           | 0x0096 |
+| EnergyEvse                                                          | 0x0099 |
 | DoorLock                                                            | 0x0101 |
 | WindowCovering                                                      | 0x0102 |
 | BarrierControl                                                      | 0x0103 |
@@ -1895,7 +1905,7 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
 | * NameSupport                                                       | 0x0004 |
 | * LastConfiguredBy                                                  | 0x0005 |
 | * SceneTableSize                                                    | 0x0006 |
-| * RemainingCapacity                                                 | 0x0007 |
+| * FabricSceneInfo                                                   | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -3098,34 +3108,38 @@ class SubscribeAttributeScenesSceneTableSize : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute RemainingCapacity
+ * Attribute FabricSceneInfo
  */
-class ReadScenesRemainingCapacity : public ReadAttribute {
+class ReadScenesFabricSceneInfo : public ReadAttribute {
 public:
-    ReadScenesRemainingCapacity()
-        : ReadAttribute("remaining-capacity")
+    ReadScenesFabricSceneInfo()
+        : ReadAttribute("fabric-scene-info")
     {
     }
 
-    ~ReadScenesRemainingCapacity()
+    ~ReadScenesFabricSceneInfo()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::Scenes::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::Scenes::Attributes::RemainingCapacity::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Scenes::Attributes::FabricSceneInfo::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeRemainingCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.RemainingCapacity response %@", [value description]);
+        __auto_type * params = [[MTRReadParams alloc] init];
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        [cluster readAttributeFabricSceneInfoWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.FabricSceneInfo response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("Scenes RemainingCapacity read Error", error);
+                LogNSError("Scenes FabricSceneInfo read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -3134,21 +3148,21 @@ class ReadScenesRemainingCapacity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesRemainingCapacity : public SubscribeAttribute {
+class SubscribeAttributeScenesFabricSceneInfo : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesRemainingCapacity()
-        : SubscribeAttribute("remaining-capacity")
+    SubscribeAttributeScenesFabricSceneInfo()
+        : SubscribeAttribute("fabric-scene-info")
     {
     }
 
-    ~SubscribeAttributeScenesRemainingCapacity()
+    ~SubscribeAttributeScenesFabricSceneInfo()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::Scenes::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::Scenes::Attributes::RemainingCapacity::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Scenes::Attributes::FabricSceneInfo::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
@@ -3163,10 +3177,10 @@ class SubscribeAttributeScenesRemainingCapacity : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeRemainingCapacityWithParams:params
+        [cluster subscribeAttributeFabricSceneInfoWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.RemainingCapacity response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.FabricSceneInfo response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -14379,6 +14393,8 @@ class SubscribeAttributeActionsClusterRevision : public SubscribeAttribute {
 | * UniqueID                                                          | 0x0012 |
 | * CapabilityMinima                                                  | 0x0013 |
 | * ProductAppearance                                                 | 0x0014 |
+| * SpecificationVersion                                              | 0x0015 |
+| * MaxPathsPerInvoke                                                 | 0x0016 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -16238,6 +16254,177 @@ class SubscribeAttributeBasicInformationProductAppearance : public SubscribeAttr
     }
 };
 
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SpecificationVersion
+ */
+class ReadBasicInformationSpecificationVersion : public ReadAttribute {
+public:
+    ReadBasicInformationSpecificationVersion()
+        : ReadAttribute("specification-version")
+    {
+    }
+
+    ~ReadBasicInformationSpecificationVersion()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BasicInformation::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BasicInformation::Attributes::SpecificationVersion::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSpecificationVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BasicInformation.SpecificationVersion response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BasicInformation SpecificationVersion read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBasicInformationSpecificationVersion : public SubscribeAttribute {
+public:
+    SubscribeAttributeBasicInformationSpecificationVersion()
+        : SubscribeAttribute("specification-version")
+    {
+    }
+
+    ~SubscribeAttributeBasicInformationSpecificationVersion()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BasicInformation::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BasicInformation::Attributes::SpecificationVersion::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeSpecificationVersionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BasicInformation.SpecificationVersion response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute MaxPathsPerInvoke
+ */
+class ReadBasicInformationMaxPathsPerInvoke : public ReadAttribute {
+public:
+    ReadBasicInformationMaxPathsPerInvoke()
+        : ReadAttribute("max-paths-per-invoke")
+    {
+    }
+
+    ~ReadBasicInformationMaxPathsPerInvoke()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BasicInformation::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BasicInformation::Attributes::MaxPathsPerInvoke::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaxPathsPerInvokeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BasicInformation.MaxPathsPerInvoke response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BasicInformation MaxPathsPerInvoke read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBasicInformationMaxPathsPerInvoke : public SubscribeAttribute {
+public:
+    SubscribeAttributeBasicInformationMaxPathsPerInvoke()
+        : SubscribeAttribute("max-paths-per-invoke")
+    {
+    }
+
+    ~SubscribeAttributeBasicInformationMaxPathsPerInvoke()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BasicInformation::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BasicInformation::Attributes::MaxPathsPerInvoke::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeMaxPathsPerInvokeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BasicInformation.MaxPathsPerInvoke response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -25523,6 +25710,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
 | * RemoveNetwork                                                     |   0x04 |
 | * ConnectNetwork                                                    |   0x06 |
 | * ReorderNetwork                                                    |   0x08 |
+| * QueryIdentity                                                     |   0x09 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MaxNetworks                                                       | 0x0000 |
@@ -25624,6 +25812,15 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand {
         AddArgument("Ssid", &mRequest.ssid);
         AddArgument("Credentials", &mRequest.credentials);
         AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("NetworkIdentity", &mRequest.networkIdentity);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("ClientIdentifier", &mRequest.clientIdentifier);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("PossessionNonce", &mRequest.possessionNonce);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -25645,6 +25842,27 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand {
         } else {
             params.breadcrumb = nil;
         }
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.networkIdentity.HasValue()) {
+            params.networkIdentity = [NSData dataWithBytes:mRequest.networkIdentity.Value().data() length:mRequest.networkIdentity.Value().size()];
+        } else {
+            params.networkIdentity = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.clientIdentifier.HasValue()) {
+            params.clientIdentifier = [NSData dataWithBytes:mRequest.clientIdentifier.Value().data() length:mRequest.clientIdentifier.Value().size()];
+        } else {
+            params.clientIdentifier = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.possessionNonce.HasValue()) {
+            params.possessionNonce = [NSData dataWithBytes:mRequest.possessionNonce.Value().data() length:mRequest.possessionNonce.Value().size()];
+        } else {
+            params.possessionNonce = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -25912,6 +26130,76 @@ class NetworkCommissioningReorderNetwork : public ClusterCommand {
     chip::app::Clusters::NetworkCommissioning::Commands::ReorderNetwork::Type mRequest;
 };
 
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command QueryIdentity
+ */
+class NetworkCommissioningQueryIdentity : public ClusterCommand {
+public:
+    NetworkCommissioningQueryIdentity()
+        : ClusterCommand("query-identity")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("KeyIdentifier", &mRequest.keyIdentifier);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("PossessionNonce", &mRequest.possessionNonce);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRNetworkCommissioningClusterQueryIdentityParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.keyIdentifier = [NSData dataWithBytes:mRequest.keyIdentifier.data() length:mRequest.keyIdentifier.size()];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.possessionNonce.HasValue()) {
+            params.possessionNonce = [NSData dataWithBytes:mRequest.possessionNonce.Value().data() length:mRequest.possessionNonce.Value().size()];
+        } else {
+            params.possessionNonce = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster queryIdentityWithParams:params completion:
+                                                        ^(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                            NSLog(@"Values: %@", values);
+                                                            if (error == nil) {
+                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
+                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                            }
+                                                            responsesNeeded--;
+                                                            if (error != nil) {
+                                                                mError = error;
+                                                                LogNSError("Error", error);
+                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
+                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                            }
+                                                            if (responsesNeeded == 0) {
+                                                                SetCommandExitStatus(mError);
+                                                            }
+                                                        }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentity::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute MaxNetworks
  */
@@ -26609,6 +26897,8 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc
     }
 };
 
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute SupportedWiFiBands
  */
@@ -26691,6 +26981,9 @@ class SubscribeAttributeNetworkCommissioningSupportedWiFiBands : public Subscrib
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute SupportedThreadFeatures
  */
@@ -26773,6 +27066,9 @@ class SubscribeAttributeNetworkCommissioningSupportedThreadFeatures : public Sub
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute ThreadVersion
  */
@@ -26855,6 +27151,8 @@ class SubscribeAttributeNetworkCommissioningThreadVersion : public SubscribeAttr
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -27930,6 +28228,7 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * TestEventTrigger                                                  |   0x00 |
+| * TimeSnapshot                                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NetworkInterfaces                                                 | 0x0000 |
@@ -27941,7 +28240,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * ActiveRadioFaults                                                 | 0x0006 |
 | * ActiveNetworkFaults                                               | 0x0007 |
 | * TestEventTriggersEnabled                                          | 0x0008 |
-| * AverageWearCount                                                  | 0x0009 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -28005,6 +28303,59 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
     chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
 };
 
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command TimeSnapshot
+ */
+class GeneralDiagnosticsTimeSnapshot : public ClusterCommand {
+public:
+    GeneralDiagnosticsTimeSnapshot()
+        : ClusterCommand("time-snapshot")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster timeSnapshotWithParams:params completion:
+                                                       ^(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                           NSLog(@"Values: %@", values);
+                                                           if (error == nil) {
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                           }
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute NetworkInterfaces
  */
@@ -28743,92 +29094,6 @@ class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public Subs
     }
 };
 
-#if MTR_ENABLE_PROVISIONAL
-
-/*
- * Attribute AverageWearCount
- */
-class ReadGeneralDiagnosticsAverageWearCount : public ReadAttribute {
-public:
-    ReadGeneralDiagnosticsAverageWearCount()
-        : ReadAttribute("average-wear-count")
-    {
-    }
-
-    ~ReadGeneralDiagnosticsAverageWearCount()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::GeneralDiagnostics::Attributes::AverageWearCount::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAverageWearCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.AverageWearCount response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("GeneralDiagnostics AverageWearCount read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeGeneralDiagnosticsAverageWearCount : public SubscribeAttribute {
-public:
-    SubscribeAttributeGeneralDiagnosticsAverageWearCount()
-        : SubscribeAttribute("average-wear-count")
-    {
-    }
-
-    ~SubscribeAttributeGeneralDiagnosticsAverageWearCount()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::GeneralDiagnostics::Attributes::AverageWearCount::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
-        }
-        [cluster subscribeAttributeAverageWearCountWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.AverageWearCount response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute GeneratedCommandList
  */
@@ -39053,7 +39318,9 @@ class TimeSynchronizationSetTrustedTimeSource : public ClusterCommand {
         : ClusterCommand("set-trusted-time-source")
         , mComplex_TrustedTimeSource(&mRequest.trustedTimeSource)
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("TrustedTimeSource", &mComplex_TrustedTimeSource);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -39068,6 +39335,7 @@ class TimeSynchronizationSetTrustedTimeSource : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterTimeSynchronization alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRTimeSynchronizationClusterSetTrustedTimeSourceParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.trustedTimeSource.IsNull()) {
             params.trustedTimeSource = nil;
         } else {
@@ -39075,6 +39343,7 @@ class TimeSynchronizationSetTrustedTimeSource : public ClusterCommand {
             params.trustedTimeSource.nodeID = [NSNumber numberWithUnsignedLongLong:mRequest.trustedTimeSource.Value().nodeID];
             params.trustedTimeSource.endpoint = [NSNumber numberWithUnsignedShort:mRequest.trustedTimeSource.Value().endpoint];
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -39110,7 +39379,9 @@ class TimeSynchronizationSetTimeZone : public ClusterCommand {
         : ClusterCommand("set-time-zone")
         , mComplex_TimeZone(&mRequest.timeZone)
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("TimeZone", &mComplex_TimeZone);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -39125,6 +39396,7 @@ class TimeSynchronizationSetTimeZone : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterTimeSynchronization alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRTimeSynchronizationClusterSetTimeZoneParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         { // Scope for our temporary variables
             auto * array_0 = [NSMutableArray new];
             for (auto & entry_0 : mRequest.timeZone) {
@@ -39141,6 +39413,7 @@ class TimeSynchronizationSetTimeZone : public ClusterCommand {
             }
             params.timeZone = array_0;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -39182,7 +39455,9 @@ class TimeSynchronizationSetDSTOffset : public ClusterCommand {
         : ClusterCommand("set-dstoffset")
         , mComplex_DSTOffset(&mRequest.DSTOffset)
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("DSTOffset", &mComplex_DSTOffset);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -39197,6 +39472,7 @@ class TimeSynchronizationSetDSTOffset : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterTimeSynchronization alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRTimeSynchronizationClusterSetDSTOffsetParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         { // Scope for our temporary variables
             auto * array_0 = [NSMutableArray new];
             for (auto & entry_0 : mRequest.DSTOffset) {
@@ -39213,6 +39489,7 @@ class TimeSynchronizationSetDSTOffset : public ClusterCommand {
             }
             params.dstOffset = array_0;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -39247,7 +39524,9 @@ class TimeSynchronizationSetDefaultNTP : public ClusterCommand {
     TimeSynchronizationSetDefaultNTP()
         : ClusterCommand("set-default-ntp")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("DefaultNTP", &mRequest.defaultNTP);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -39262,11 +39541,13 @@ class TimeSynchronizationSetDefaultNTP : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterTimeSynchronization alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRTimeSynchronizationClusterSetDefaultNTPParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.defaultNTP.IsNull()) {
             params.defaultNTP = nil;
         } else {
             params.defaultNTP = [[NSString alloc] initWithBytes:mRequest.defaultNTP.Value().data() length:mRequest.defaultNTP.Value().size() encoding:NSUTF8StringEncoding];
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -48958,10 +49239,18 @@ class IcdManagementRegisterClient : public ClusterCommand {
     IcdManagementRegisterClient()
         : ClusterCommand("register-client")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("CheckInNodeID", 0, UINT64_MAX, &mRequest.checkInNodeID);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("MonitoredSubject", 0, UINT64_MAX, &mRequest.monitoredSubject);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("Key", &mRequest.key);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("VerificationKey", &mRequest.verificationKey);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -48976,14 +49265,22 @@ class IcdManagementRegisterClient : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.checkInNodeID = [NSNumber numberWithUnsignedLongLong:mRequest.checkInNodeID];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         params.monitoredSubject = [NSNumber numberWithUnsignedLongLong:mRequest.monitoredSubject];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         params.key = [NSData dataWithBytes:mRequest.key.data() length:mRequest.key.size()];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.verificationKey.HasValue()) {
             params.verificationKey = [NSData dataWithBytes:mRequest.verificationKey.Value().data() length:mRequest.verificationKey.Value().size()];
         } else {
             params.verificationKey = nil;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -49023,8 +49320,12 @@ class IcdManagementUnregisterClient : public ClusterCommand {
     IcdManagementUnregisterClient()
         : ClusterCommand("unregister-client")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("CheckInNodeID", 0, UINT64_MAX, &mRequest.checkInNodeID);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("VerificationKey", &mRequest.verificationKey);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -49039,12 +49340,16 @@ class IcdManagementUnregisterClient : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.checkInNodeID = [NSNumber numberWithUnsignedLongLong:mRequest.checkInNodeID];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.verificationKey.HasValue()) {
             params.verificationKey = [NSData dataWithBytes:mRequest.verificationKey.Value().data() length:mRequest.verificationKey.Value().size()];
         } else {
             params.verificationKey = nil;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -49096,12 +49401,18 @@ class IcdManagementStayActiveRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stayActiveRequestWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
+                                                            ^(MTRICDManagementClusterStayActiveResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                                NSLog(@"Values: %@", values);
+                                                                if (error == nil) {
+                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
+                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                                }
                                                                 responsesNeeded--;
                                                                 if (error != nil) {
                                                                     mError = error;
                                                                     LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
+                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                                 }
                                                                 if (responsesNeeded == 0) {
                                                                     SetCommandExitStatus(mError);
@@ -50311,19 +50622,20 @@ class SubscribeAttributeIcdManagementClusterRevision : public SubscribeAttribute
 
 #endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster ModeSelect                                                  | 0x0050 |
+| Cluster Timer                                                       | 0x0047 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * SetTimer                                                          |   0x00 |
+| * ResetTimer                                                        |   0x01 |
+| * AddTime                                                           |   0x02 |
+| * ReduceTime                                                        |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Description                                                       | 0x0000 |
-| * StandardNamespace                                                 | 0x0001 |
-| * SupportedModes                                                    | 0x0002 |
-| * CurrentMode                                                       | 0x0003 |
-| * StartUpMode                                                       | 0x0004 |
-| * OnMode                                                            | 0x0005 |
+| * SetTime                                                           | 0x0000 |
+| * TimeRemaining                                                     | 0x0001 |
+| * TimerState                                                        | 0x0002 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -50334,328 +50646,243 @@ class SubscribeAttributeIcdManagementClusterRevision : public SubscribeAttribute
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Command ChangeToMode
+ * Command SetTimer
  */
-class ModeSelectChangeToMode : public ClusterCommand {
+class TimerSetTimer : public ClusterCommand {
 public:
-    ModeSelectChangeToMode()
-        : ClusterCommand("change-to-mode")
+    TimerSetTimer()
+        : ClusterCommand("set-timer")
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("NewTime", 0, UINT32_MAX, &mRequest.newTime);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::SetTimer::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRModeSelectClusterChangeToModeParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRTimerClusterSetTimerParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#if MTR_ENABLE_PROVISIONAL
+        params.newTime = [NSNumber numberWithUnsignedInt:mRequest.newTime];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster changeToModeWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+            [cluster setTimerWithParams:params completion:
+                                                   ^(NSError * _Nullable error) {
+                                                       responsesNeeded--;
+                                                       if (error != nil) {
+                                                           mError = error;
+                                                           LogNSError("Error", error);
+                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                       }
+                                                       if (responsesNeeded == 0) {
+                                                           SetCommandExitStatus(mError);
+                                                       }
+                                                   }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Timer::Commands::SetTimer::Type mRequest;
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Attribute Description
+ * Command ResetTimer
  */
-class ReadModeSelectDescription : public ReadAttribute {
+class TimerResetTimer : public ClusterCommand {
 public:
-    ReadModeSelectDescription()
-        : ReadAttribute("description")
-    {
-    }
-
-    ~ReadModeSelectDescription()
+    TimerResetTimer()
+        : ClusterCommand("reset-timer")
     {
+        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::Description::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.Description response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("ModeSelect Description read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
-public:
-    SubscribeAttributeModeSelectDescription()
-        : SubscribeAttribute("description")
-    {
-    }
-
-    ~SubscribeAttributeModeSelectDescription()
-    {
-    }
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ResetTimer::Id;
 
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::Description::Id;
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRTimerClusterResetTimerParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetTimerWithParams:params completion:
+                                                     ^(NSError * _Nullable error) {
+                                                         responsesNeeded--;
+                                                         if (error != nil) {
+                                                             mError = error;
+                                                             LogNSError("Error", error);
+                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                         }
+                                                         if (responsesNeeded == 0) {
+                                                             SetCommandExitStatus(mError);
+                                                         }
+                                                     }];
         }
-        [cluster subscribeAttributeDescriptionWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.Description response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Attribute StandardNamespace
+ * Command AddTime
  */
-class ReadModeSelectStandardNamespace : public ReadAttribute {
+class TimerAddTime : public ClusterCommand {
 public:
-    ReadModeSelectStandardNamespace()
-        : ReadAttribute("standard-namespace")
-    {
-    }
-
-    ~ReadModeSelectStandardNamespace()
+    TimerAddTime()
+        : ClusterCommand("add-time")
     {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("AdditionalTime", 0, UINT32_MAX, &mRequest.additionalTime);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StandardNamespace::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("ModeSelect StandardNamespace read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute {
-public:
-    SubscribeAttributeModeSelectStandardNamespace()
-        : SubscribeAttribute("standard-namespace")
-    {
-    }
-
-    ~SubscribeAttributeModeSelectStandardNamespace()
-    {
-    }
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::AddTime::Id;
 
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::StandardNamespace::Id;
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRTimerClusterAddTimeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.additionalTime = [NSNumber numberWithUnsignedInt:mRequest.additionalTime];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addTimeWithParams:params completion:
+                                                  ^(NSError * _Nullable error) {
+                                                      responsesNeeded--;
+                                                      if (error != nil) {
+                                                          mError = error;
+                                                          LogNSError("Error", error);
+                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                      }
+                                                      if (responsesNeeded == 0) {
+                                                          SetCommandExitStatus(mError);
+                                                      }
+                                                  }];
         }
-        [cluster subscribeAttributeStandardNamespaceWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Timer::Commands::AddTime::Type mRequest;
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Attribute SupportedModes
+ * Command ReduceTime
  */
-class ReadModeSelectSupportedModes : public ReadAttribute {
+class TimerReduceTime : public ClusterCommand {
 public:
-    ReadModeSelectSupportedModes()
-        : ReadAttribute("supported-modes")
-    {
-    }
-
-    ~ReadModeSelectSupportedModes()
+    TimerReduceTime()
+        : ClusterCommand("reduce-time")
     {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("TimeReduction", 0, UINT32_MAX, &mRequest.timeReduction);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::Timer::Commands::ReduceTime::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("ModeSelect SupportedModes read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRTimerClusterReduceTimeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.timeReduction = [NSNumber numberWithUnsignedInt:mRequest.timeReduction];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster reduceTimeWithParams:params completion:
+                                                     ^(NSError * _Nullable error) {
+                                                         responsesNeeded--;
+                                                         if (error != nil) {
+                                                             mError = error;
+                                                             LogNSError("Error", error);
+                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                         }
+                                                         if (responsesNeeded == 0) {
+                                                             SetCommandExitStatus(mError);
+                                                         }
+                                                     }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
-public:
-    SubscribeAttributeModeSelectSupportedModes()
-        : SubscribeAttribute("supported-modes")
-    {
-    }
-
-    ~SubscribeAttributeModeSelectSupportedModes()
-    {
-    }
 
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::SupportedModes::Id;
+private:
+    chip::app::Clusters::Timer::Commands::ReduceTime::Type mRequest;
+};
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
-        }
-        [cluster subscribeAttributeSupportedModesWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
+#endif // MTR_ENABLE_PROVISIONAL
 
-        return CHIP_NO_ERROR;
-    }
-};
+#if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentMode
+ * Attribute SetTime
  */
-class ReadModeSelectCurrentMode : public ReadAttribute {
+class ReadTimerSetTime : public ReadAttribute {
 public:
-    ReadModeSelectCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadTimerSetTime()
+        : ReadAttribute("set-time")
     {
     }
 
-    ~ReadModeSelectCurrentMode()
+    ~ReadTimerSetTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::SetTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSetTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Timer.SetTime response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect CurrentMode read Error", error);
+                LogNSError("Timer SetTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -50664,25 +50891,25 @@ class ReadModeSelectCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeTimerSetTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeTimerSetTime()
+        : SubscribeAttribute("set-time")
     {
     }
 
-    ~SubscribeAttributeModeSelectCurrentMode()
+    ~SubscribeAttributeTimerSetTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::SetTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -50693,10 +50920,10 @@ class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeSetTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
+                NSLog(@"Timer.SetTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -50709,106 +50936,65 @@ class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
- * Attribute StartUpMode
+ * Attribute TimeRemaining
  */
-class ReadModeSelectStartUpMode : public ReadAttribute {
+class ReadTimerTimeRemaining : public ReadAttribute {
 public:
-    ReadModeSelectStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadTimerTimeRemaining()
+        : ReadAttribute("time-remaining")
     {
     }
 
-    ~ReadModeSelectStartUpMode()
+    ~ReadTimerTimeRemaining()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::TimeRemaining::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTimeRemainingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Timer.TimeRemaining response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect StartUpMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteModeSelectStartUpMode : public WriteAttribute {
-public:
-    WriteModeSelectStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteModeSelectStartUpMode()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
-        }
-
-        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("ModeSelect StartUpMode write Error", error);
+                LogNSError("Timer TimeRemaining read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeTimerTimeRemaining : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeTimerTimeRemaining()
+        : SubscribeAttribute("time-remaining")
     {
     }
 
-    ~SubscribeAttributeModeSelectStartUpMode()
+    ~SubscribeAttributeTimerTimeRemaining()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::TimeRemaining::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -50819,10 +51005,10 @@ class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStartUpModeWithParams:params
+        [cluster subscribeAttributeTimeRemainingWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
+                NSLog(@"Timer.TimeRemaining response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -50835,106 +51021,65 @@ class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
- * Attribute OnMode
+ * Attribute TimerState
  */
-class ReadModeSelectOnMode : public ReadAttribute {
+class ReadTimerTimerState : public ReadAttribute {
 public:
-    ReadModeSelectOnMode()
-        : ReadAttribute("on-mode")
+    ReadTimerTimerState()
+        : ReadAttribute("timer-state")
     {
     }
 
-    ~ReadModeSelectOnMode()
+    ~ReadTimerTimerState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::TimerState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.OnMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTimerStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Timer.TimerState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect OnMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteModeSelectOnMode : public WriteAttribute {
-public:
-    WriteModeSelectOnMode()
-        : WriteAttribute("on-mode")
-    {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteModeSelectOnMode()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
-        }
-
-        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("ModeSelect OnMode write Error", error);
+                LogNSError("Timer TimerState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
+class SubscribeAttributeTimerTimerState : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeTimerTimerState()
+        : SubscribeAttribute("timer-state")
     {
     }
 
-    ~SubscribeAttributeModeSelectOnMode()
+    ~SubscribeAttributeTimerTimerState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::TimerState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -50945,10 +51090,10 @@ class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeTimerStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.OnMode response %@", [value description]);
+                NSLog(@"Timer.TimerState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -50961,35 +51106,38 @@ class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
-class ReadModeSelectGeneratedCommandList : public ReadAttribute {
+class ReadTimerGeneratedCommandList : public ReadAttribute {
 public:
-    ReadModeSelectGeneratedCommandList()
+    ReadTimerGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadModeSelectGeneratedCommandList()
+    ~ReadTimerGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
+            NSLog(@"Timer.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect GeneratedCommandList read Error", error);
+                LogNSError("Timer GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -50998,25 +51146,25 @@ class ReadModeSelectGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTimerGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectGeneratedCommandList()
+    SubscribeAttributeTimerGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeModeSelectGeneratedCommandList()
+    ~SubscribeAttributeTimerGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51030,7 +51178,7 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribu
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
+                NSLog(@"Timer.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51043,35 +51191,38 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribu
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute AcceptedCommandList
  */
-class ReadModeSelectAcceptedCommandList : public ReadAttribute {
+class ReadTimerAcceptedCommandList : public ReadAttribute {
 public:
-    ReadModeSelectAcceptedCommandList()
+    ReadTimerAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadModeSelectAcceptedCommandList()
+    ~ReadTimerAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
+            NSLog(@"Timer.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect AcceptedCommandList read Error", error);
+                LogNSError("Timer AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51080,25 +51231,25 @@ class ReadModeSelectAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTimerAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectAcceptedCommandList()
+    SubscribeAttributeTimerAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeModeSelectAcceptedCommandList()
+    ~SubscribeAttributeTimerAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51112,7 +51263,7 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribut
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
+                NSLog(@"Timer.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51125,37 +51276,38 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribut
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute EventList
  */
-class ReadModeSelectEventList : public ReadAttribute {
+class ReadTimerEventList : public ReadAttribute {
 public:
-    ReadModeSelectEventList()
+    ReadTimerEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadModeSelectEventList()
+    ~ReadTimerEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.EventList response %@", [value description]);
+            NSLog(@"Timer.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect EventList read Error", error);
+                LogNSError("Timer EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51164,25 +51316,25 @@ class ReadModeSelectEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectEventList : public SubscribeAttribute {
+class SubscribeAttributeTimerEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectEventList()
+    SubscribeAttributeTimerEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeModeSelectEventList()
+    ~SubscribeAttributeTimerEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51196,7 +51348,7 @@ class SubscribeAttributeModeSelectEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.EventList response %@", [value description]);
+                NSLog(@"Timer.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51210,36 +51362,37 @@ class SubscribeAttributeModeSelectEventList : public SubscribeAttribute {
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute AttributeList
  */
-class ReadModeSelectAttributeList : public ReadAttribute {
+class ReadTimerAttributeList : public ReadAttribute {
 public:
-    ReadModeSelectAttributeList()
+    ReadTimerAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadModeSelectAttributeList()
+    ~ReadTimerAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.AttributeList response %@", [value description]);
+            NSLog(@"Timer.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect AttributeList read Error", error);
+                LogNSError("Timer AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51248,25 +51401,25 @@ class ReadModeSelectAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
+class SubscribeAttributeTimerAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectAttributeList()
+    SubscribeAttributeTimerAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeModeSelectAttributeList()
+    ~SubscribeAttributeTimerAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51280,7 +51433,7 @@ class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
+                NSLog(@"Timer.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51293,35 +51446,38 @@ class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute FeatureMap
  */
-class ReadModeSelectFeatureMap : public ReadAttribute {
+class ReadTimerFeatureMap : public ReadAttribute {
 public:
-    ReadModeSelectFeatureMap()
+    ReadTimerFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadModeSelectFeatureMap()
+    ~ReadTimerFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
+            NSLog(@"Timer.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect FeatureMap read Error", error);
+                LogNSError("Timer FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51330,25 +51486,25 @@ class ReadModeSelectFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeTimerFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectFeatureMap()
+    SubscribeAttributeTimerFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeModeSelectFeatureMap()
+    ~SubscribeAttributeTimerFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51362,7 +51518,7 @@ class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
+                NSLog(@"Timer.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51375,35 +51531,38 @@ class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute ClusterRevision
  */
-class ReadModeSelectClusterRevision : public ReadAttribute {
+class ReadTimerClusterRevision : public ReadAttribute {
 public:
-    ReadModeSelectClusterRevision()
+    ReadTimerClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadModeSelectClusterRevision()
+    ~ReadTimerClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::Timer::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
+            NSLog(@"Timer.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ModeSelect ClusterRevision read Error", error);
+                LogNSError("Timer ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51412,25 +51571,25 @@ class ReadModeSelectClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeTimerClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectClusterRevision()
+    SubscribeAttributeTimerClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeModeSelectClusterRevision()
+    ~SubscribeAttributeTimerClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::Timer::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::Timer::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTimer alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51444,7 +51603,7 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
+                NSLog(@"Timer.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51457,18 +51616,25 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherMode                                           | 0x0051 |
+| Cluster OvenCavityOperationalState                                  | 0x0048 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
-| * OnMode                                                            | 0x0003 |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -51477,60 +51643,215 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command ChangeToMode
+ * Command Pause
  */
-class LaundryWasherModeChangeToMode : public ClusterCommand {
+class OvenCavityOperationalStatePause : public ClusterCommand {
 public:
-    LaundryWasherModeChangeToMode()
-        : ClusterCommand("change-to-mode")
+    OvenCavityOperationalStatePause()
+        : ClusterCommand("pause")
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Pause::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRLaundryWasherModeClusterChangeToModeParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROvenCavityOperationalStateClusterPauseParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+            [cluster pauseWithParams:params completion:
+                                                ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Stop
+ */
+class OvenCavityOperationalStateStop : public ClusterCommand {
+public:
+    OvenCavityOperationalStateStop()
+        : ClusterCommand("stop")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Stop::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROvenCavityOperationalStateClusterStopParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopWithParams:params completion:
+                                               ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                   NSLog(@"Values: %@", values);
+                                                   if (error == nil) {
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                   }
+                                                   responsesNeeded--;
+                                                   if (error != nil) {
+                                                       mError = error;
+                                                       LogNSError("Error", error);
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                   }
+                                                   if (responsesNeeded == 0) {
+                                                       SetCommandExitStatus(mError);
+                                                   }
+                                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Start
+ */
+class OvenCavityOperationalStateStart : public ClusterCommand {
+public:
+    OvenCavityOperationalStateStart()
+        : ClusterCommand("start")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Start::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROvenCavityOperationalStateClusterStartParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startWithParams:params completion:
+                                                ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Resume
+ */
+class OvenCavityOperationalStateResume : public ClusterCommand {
+public:
+    OvenCavityOperationalStateResume()
+        : ClusterCommand("resume")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenCavityOperationalState::Commands::Resume::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROvenCavityOperationalStateClusterResumeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resumeWithParams:params completion:
+                                                 ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                     NSLog(@"Values: %@", values);
+                                                     if (error == nil) {
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                     }
+                                                     responsesNeeded--;
+                                                     if (error != nil) {
+                                                         mError = error;
+                                                         LogNSError("Error", error);
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                     }
+                                                     if (responsesNeeded == 0) {
+                                                         SetCommandExitStatus(mError);
+                                                     }
+                                                 }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -51538,34 +51859,34 @@ class LaundryWasherModeChangeToMode : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SupportedModes
+ * Attribute PhaseList
  */
-class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
+class ReadOvenCavityOperationalStatePhaseList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadOvenCavityOperationalStatePhaseList()
+        : ReadAttribute("phase-list")
     {
     }
 
-    ~ReadLaundryWasherModeSupportedModes()
+    ~ReadOvenCavityOperationalStatePhaseList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::PhaseList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.PhaseList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode SupportedModes read Error", error);
+                LogNSError("OvenCavityOperationalState PhaseList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51574,25 +51895,25 @@ class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStatePhaseList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    SubscribeAttributeOvenCavityOperationalStatePhaseList()
+        : SubscribeAttribute("phase-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeSupportedModes()
+    ~SubscribeAttributeOvenCavityOperationalStatePhaseList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::PhaseList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51603,10 +51924,10 @@ class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedModesWithParams:params
+        [cluster subscribeAttributePhaseListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.PhaseList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51623,34 +51944,34 @@ class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentMode
+ * Attribute CurrentPhase
  */
-class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
+class ReadOvenCavityOperationalStateCurrentPhase : public ReadAttribute {
 public:
-    ReadLaundryWasherModeCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadOvenCavityOperationalStateCurrentPhase()
+        : ReadAttribute("current-phase")
     {
     }
 
-    ~ReadLaundryWasherModeCurrentMode()
+    ~ReadOvenCavityOperationalStateCurrentPhase()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::CurrentPhase::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.CurrentPhase response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode CurrentMode read Error", error);
+                LogNSError("OvenCavityOperationalState CurrentPhase read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51659,25 +51980,25 @@ class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateCurrentPhase : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeOvenCavityOperationalStateCurrentPhase()
+        : SubscribeAttribute("current-phase")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeCurrentMode()
+    ~SubscribeAttributeOvenCavityOperationalStateCurrentPhase()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::CurrentPhase::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51688,10 +52009,10 @@ class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeCurrentPhaseWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.CurrentPhase response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51708,105 +52029,61 @@ class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute StartUpMode
+ * Attribute CountdownTime
  */
-class ReadLaundryWasherModeStartUpMode : public ReadAttribute {
+class ReadOvenCavityOperationalStateCountdownTime : public ReadAttribute {
 public:
-    ReadLaundryWasherModeStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadOvenCavityOperationalStateCountdownTime()
+        : ReadAttribute("countdown-time")
     {
     }
 
-    ~ReadLaundryWasherModeStartUpMode()
+    ~ReadOvenCavityOperationalStateCountdownTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::CountdownTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.CountdownTime response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode StartUpMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
-public:
-    WriteLaundryWasherModeStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLaundryWasherModeStartUpMode()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
-        }
-
-        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("LaundryWasherMode StartUpMode write Error", error);
+                LogNSError("OvenCavityOperationalState CountdownTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateCountdownTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeOvenCavityOperationalStateCountdownTime()
+        : SubscribeAttribute("countdown-time")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeStartUpMode()
+    ~SubscribeAttributeOvenCavityOperationalStateCountdownTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::CountdownTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51817,10 +52094,10 @@ class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStartUpModeWithParams:params
+        [cluster subscribeAttributeCountdownTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.CountdownTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51837,34 +52114,34 @@ class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OnMode
+ * Attribute OperationalStateList
  */
-class ReadLaundryWasherModeOnMode : public ReadAttribute {
+class ReadOvenCavityOperationalStateOperationalStateList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadOvenCavityOperationalStateOperationalStateList()
+        : ReadAttribute("operational-state-list")
     {
     }
 
-    ~ReadLaundryWasherModeOnMode()
+    ~ReadOvenCavityOperationalStateOperationalStateList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalStateList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.OperationalStateList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode OnMode read Error", error);
+                LogNSError("OvenCavityOperationalState OperationalStateList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51873,69 +52150,110 @@ class ReadLaundryWasherModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteLaundryWasherModeOnMode : public WriteAttribute {
+class SubscribeAttributeOvenCavityOperationalStateOperationalStateList : public SubscribeAttribute {
 public:
-    WriteLaundryWasherModeOnMode()
-        : WriteAttribute("on-mode")
+    SubscribeAttributeOvenCavityOperationalStateOperationalStateList()
+        : SubscribeAttribute("operational-state-list")
     {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteLaundryWasherModeOnMode()
+    ~SubscribeAttributeOvenCavityOperationalStateOperationalStateList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalStateList::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
+        [cluster subscribeAttributeOperationalStateListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OvenCavityOperationalState.OperationalStateList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
 
-        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("LaundryWasherMode OnMode write Error", error);
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalState
+ */
+class ReadOvenCavityOperationalStateOperationalState : public ReadAttribute {
+public:
+    ReadOvenCavityOperationalStateOperationalState()
+        : ReadAttribute("operational-state")
+    {
+    }
+
+    ~ReadOvenCavityOperationalStateOperationalState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.OperationalState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OvenCavityOperationalState OperationalState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateOperationalState : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeOvenCavityOperationalStateOperationalState()
+        : SubscribeAttribute("operational-state")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeOnMode()
+    ~SubscribeAttributeOvenCavityOperationalStateOperationalState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -51946,10 +52264,95 @@ class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeOperationalStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.OperationalState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalError
+ */
+class ReadOvenCavityOperationalStateOperationalError : public ReadAttribute {
+public:
+    ReadOvenCavityOperationalStateOperationalError()
+        : ReadAttribute("operational-error")
+    {
+    }
+
+    ~ReadOvenCavityOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalErrorWithCompletion:^(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OvenCavityOperationalState.OperationalError response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OvenCavityOperationalState OperationalError read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOvenCavityOperationalStateOperationalError : public SubscribeAttribute {
+public:
+    SubscribeAttributeOvenCavityOperationalStateOperationalError()
+        : SubscribeAttribute("operational-error")
+    {
+    }
+
+    ~SubscribeAttributeOvenCavityOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalErrorWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(MTROvenCavityOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OvenCavityOperationalState.OperationalError response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51968,32 +52371,32 @@ class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
+class ReadOvenCavityOperationalStateGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeGeneratedCommandList()
+    ReadOvenCavityOperationalStateGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLaundryWasherModeGeneratedCommandList()
+    ~ReadOvenCavityOperationalStateGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode GeneratedCommandList read Error", error);
+                LogNSError("OvenCavityOperationalState GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52002,25 +52405,25 @@ class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeGeneratedCommandList()
+    SubscribeAttributeOvenCavityOperationalStateGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeGeneratedCommandList()
+    ~SubscribeAttributeOvenCavityOperationalStateGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52034,7 +52437,7 @@ class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public Subscribe
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52053,32 +52456,32 @@ class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public Subscribe
 /*
  * Attribute AcceptedCommandList
  */
-class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
+class ReadOvenCavityOperationalStateAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeAcceptedCommandList()
+    ReadOvenCavityOperationalStateAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLaundryWasherModeAcceptedCommandList()
+    ~ReadOvenCavityOperationalStateAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode AcceptedCommandList read Error", error);
+                LogNSError("OvenCavityOperationalState AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52087,25 +52490,25 @@ class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeAcceptedCommandList()
+    SubscribeAttributeOvenCavityOperationalStateAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeAcceptedCommandList()
+    ~SubscribeAttributeOvenCavityOperationalStateAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52119,7 +52522,7 @@ class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeA
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52138,32 +52541,32 @@ class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeA
 /*
  * Attribute EventList
  */
-class ReadLaundryWasherModeEventList : public ReadAttribute {
+class ReadOvenCavityOperationalStateEventList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeEventList()
+    ReadOvenCavityOperationalStateEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadLaundryWasherModeEventList()
+    ~ReadOvenCavityOperationalStateEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode EventList read Error", error);
+                LogNSError("OvenCavityOperationalState EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52172,25 +52575,25 @@ class ReadLaundryWasherModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeEventList()
+    SubscribeAttributeOvenCavityOperationalStateEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeEventList()
+    ~SubscribeAttributeOvenCavityOperationalStateEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52204,7 +52607,7 @@ class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52223,32 +52626,32 @@ class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadLaundryWasherModeAttributeList : public ReadAttribute {
+class ReadOvenCavityOperationalStateAttributeList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeAttributeList()
+    ReadOvenCavityOperationalStateAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLaundryWasherModeAttributeList()
+    ~ReadOvenCavityOperationalStateAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode AttributeList read Error", error);
+                LogNSError("OvenCavityOperationalState AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52257,25 +52660,25 @@ class ReadLaundryWasherModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeAttributeList()
+    SubscribeAttributeOvenCavityOperationalStateAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeAttributeList()
+    ~SubscribeAttributeOvenCavityOperationalStateAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52289,7 +52692,7 @@ class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribu
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52308,32 +52711,32 @@ class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribu
 /*
  * Attribute FeatureMap
  */
-class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
+class ReadOvenCavityOperationalStateFeatureMap : public ReadAttribute {
 public:
-    ReadLaundryWasherModeFeatureMap()
+    ReadOvenCavityOperationalStateFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLaundryWasherModeFeatureMap()
+    ~ReadOvenCavityOperationalStateFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode FeatureMap read Error", error);
+                LogNSError("OvenCavityOperationalState FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52342,25 +52745,25 @@ class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeFeatureMap()
+    SubscribeAttributeOvenCavityOperationalStateFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeFeatureMap()
+    ~SubscribeAttributeOvenCavityOperationalStateFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52374,7 +52777,7 @@ class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52393,32 +52796,32 @@ class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
+class ReadOvenCavityOperationalStateClusterRevision : public ReadAttribute {
 public:
-    ReadLaundryWasherModeClusterRevision()
+    ReadOvenCavityOperationalStateClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLaundryWasherModeClusterRevision()
+    ~ReadOvenCavityOperationalStateClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
+            NSLog(@"OvenCavityOperationalState.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode ClusterRevision read Error", error);
+                LogNSError("OvenCavityOperationalState ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52427,25 +52830,25 @@ class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOvenCavityOperationalStateClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeClusterRevision()
+    SubscribeAttributeOvenCavityOperationalStateClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeClusterRevision()
+    ~SubscribeAttributeOvenCavityOperationalStateClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenCavityOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenCavityOperationalState::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenCavityOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52459,7 +52862,7 @@ class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttri
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
+                NSLog(@"OvenCavityOperationalState.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52476,7 +52879,7 @@ class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttri
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
+| Cluster OvenMode                                                    | 0x0049 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -52500,42 +52903,46 @@ class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttri
 /*
  * Command ChangeToMode
  */
-class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand {
+class OvenModeChangeToMode : public ClusterCommand {
 public:
-    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode()
+    OvenModeChangeToMode()
         : ClusterCommand("change-to-mode")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OvenMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROvenModeClusterChangeToModeParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                       ^(MTROvenModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
                                                            NSLog(@"Values: %@", values);
                                                            if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
                                                            }
                                                            responsesNeeded--;
                                                            if (error != nil) {
                                                                mError = error;
                                                                LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
@@ -52547,7 +52954,7 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
     }
 
 private:
-    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -52557,32 +52964,32 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
 /*
  * Attribute SupportedModes
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public ReadAttribute {
+class ReadOvenModeSupportedModes : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    ReadOvenModeSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    ~ReadOvenModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
+            NSLog(@"OvenMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode SupportedModes read Error", error);
+                LogNSError("OvenMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52591,25 +52998,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeOvenModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    SubscribeAttributeOvenModeSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    ~SubscribeAttributeOvenModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52623,7 +53030,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupported
         [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
+                NSLog(@"OvenMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52642,32 +53049,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupported
 /*
  * Attribute CurrentMode
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public ReadAttribute {
+class ReadOvenModeCurrentMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    ReadOvenModeCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    ~ReadOvenModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
+            NSLog(@"OvenMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode CurrentMode read Error", error);
+                LogNSError("OvenMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52676,25 +53083,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public Re
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    SubscribeAttributeOvenModeCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    ~SubscribeAttributeOvenModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52708,7 +53115,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMo
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
+                NSLog(@"OvenMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52727,32 +53134,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMo
 /*
  * Attribute StartUpMode
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public ReadAttribute {
+class ReadOvenModeStartUpMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ReadOvenModeStartUpMode()
         : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ~ReadOvenModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
+            NSLog(@"OvenMode.StartUpMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode read Error", error);
+                LogNSError("OvenMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52761,9 +53168,9 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public Re
     }
 };
 
-class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public WriteAttribute {
+class WriteOvenModeStartUpMode : public WriteAttribute {
 public:
-    WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    WriteOvenModeStartUpMode()
         : WriteAttribute("start-up-mode")
     {
         AddArgument("attr-name", "start-up-mode");
@@ -52771,18 +53178,18 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public W
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ~WriteOvenModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -52793,7 +53200,7 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public W
 
         [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode write Error", error);
+                LogNSError("OvenMode StartUpMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52805,25 +53212,25 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public W
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeStartUpMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    SubscribeAttributeOvenModeStartUpMode()
         : SubscribeAttribute("start-up-mode")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ~SubscribeAttributeOvenModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52837,7 +53244,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMo
         [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
+                NSLog(@"OvenMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52856,32 +53263,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMo
 /*
  * Attribute OnMode
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAttribute {
+class ReadOvenModeOnMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ReadOvenModeOnMode()
         : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~ReadOvenModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
+            NSLog(@"OvenMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode read Error", error);
+                LogNSError("OvenMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52890,9 +53297,9 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAtt
     }
 };
 
-class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteAttribute {
+class WriteOvenModeOnMode : public WriteAttribute {
 public:
-    WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    WriteOvenModeOnMode()
         : WriteAttribute("on-mode")
     {
         AddArgument("attr-name", "on-mode");
@@ -52900,18 +53307,18 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteA
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~WriteOvenModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -52922,7 +53329,7 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteA
 
         [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode write Error", error);
+                LogNSError("OvenMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52934,25 +53341,25 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteA
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    SubscribeAttributeOvenModeOnMode()
         : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~SubscribeAttributeOvenModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -52966,7 +53373,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode :
         [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
+                NSLog(@"OvenMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52985,32 +53392,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode :
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public ReadAttribute {
+class ReadOvenModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ReadOvenModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ~ReadOvenModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OvenMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode GeneratedCommandList read Error", error);
+                LogNSError("OvenMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53019,25 +53426,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList :
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    SubscribeAttributeOvenModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ~SubscribeAttributeOvenModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53051,7 +53458,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGenerated
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OvenMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53070,32 +53477,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGenerated
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public ReadAttribute {
+class ReadOvenModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ReadOvenModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ~ReadOvenModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OvenMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AcceptedCommandList read Error", error);
+                LogNSError("OvenMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53104,25 +53511,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : p
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    SubscribeAttributeOvenModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ~SubscribeAttributeOvenModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53136,7 +53543,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedC
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OvenMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53155,32 +53562,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedC
 /*
  * Attribute EventList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public ReadAttribute {
+class ReadOvenModeEventList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ReadOvenModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ~ReadOvenModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
+            NSLog(@"OvenMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode EventList read Error", error);
+                LogNSError("OvenMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53189,25 +53596,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public Read
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    SubscribeAttributeOvenModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ~SubscribeAttributeOvenModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53221,7 +53628,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
+                NSLog(@"OvenMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53240,32 +53647,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList
 /*
  * Attribute AttributeList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public ReadAttribute {
+class ReadOvenModeAttributeList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ReadOvenModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ~ReadOvenModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
+            NSLog(@"OvenMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AttributeList read Error", error);
+                LogNSError("OvenMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53274,25 +53681,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    SubscribeAttributeOvenModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ~SubscribeAttributeOvenModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53306,7 +53713,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttribute
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
+                NSLog(@"OvenMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53325,32 +53732,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttribute
 /*
  * Attribute FeatureMap
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public ReadAttribute {
+class ReadOvenModeFeatureMap : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ReadOvenModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ~ReadOvenModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
+            NSLog(@"OvenMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode FeatureMap read Error", error);
+                LogNSError("OvenMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53359,25 +53766,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public Rea
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOvenModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    SubscribeAttributeOvenModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ~SubscribeAttributeOvenModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53391,7 +53798,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMa
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
+                NSLog(@"OvenMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53410,32 +53817,32 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMa
 /*
  * Attribute ClusterRevision
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public ReadAttribute {
+class ReadOvenModeClusterRevision : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ReadOvenModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ~ReadOvenModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OvenMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
+            NSLog(@"OvenMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode ClusterRevision read Error", error);
+                LogNSError("OvenMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53444,25 +53851,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : publi
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOvenModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    SubscribeAttributeOvenModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ~SubscribeAttributeOvenModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OvenMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53476,7 +53883,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
+                NSLog(@"OvenMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53493,15 +53900,13 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherControls                                       | 0x0053 |
+| Cluster LaundryDryerControls                                        | 0x004A |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SpinSpeeds                                                        | 0x0000 |
-| * SpinSpeedCurrent                                                  | 0x0001 |
-| * NumberOfRinses                                                    | 0x0002 |
-| * SupportedRinses                                                   | 0x0003 |
+| * SupportedDrynessLevels                                            | 0x0000 |
+| * SelectedDrynessLevel                                              | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -53515,34 +53920,34 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SpinSpeeds
+ * Attribute SupportedDrynessLevels
  */
-class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
+class ReadLaundryDryerControlsSupportedDrynessLevels : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSpinSpeeds()
-        : ReadAttribute("spin-speeds")
+    ReadLaundryDryerControlsSupportedDrynessLevels()
+        : ReadAttribute("supported-dryness-levels")
     {
     }
 
-    ~ReadLaundryWasherControlsSpinSpeeds()
+    ~ReadLaundryDryerControlsSupportedDrynessLevels()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeeds::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::SupportedDrynessLevels::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSpinSpeedsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedDrynessLevelsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.SupportedDrynessLevels response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SpinSpeeds read Error", error);
+                LogNSError("LaundryDryerControls SupportedDrynessLevels read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53551,25 +53956,25 @@ class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsSupportedDrynessLevels : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSpinSpeeds()
-        : SubscribeAttribute("spin-speeds")
+    SubscribeAttributeLaundryDryerControlsSupportedDrynessLevels()
+        : SubscribeAttribute("supported-dryness-levels")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSpinSpeeds()
+    ~SubscribeAttributeLaundryDryerControlsSupportedDrynessLevels()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeeds::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::SupportedDrynessLevels::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53580,10 +53985,10 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSpinSpeedsWithParams:params
+        [cluster subscribeAttributeSupportedDrynessLevelsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
+                NSLog(@"LaundryDryerControls.SupportedDrynessLevels response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53600,34 +54005,34 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SpinSpeedCurrent
+ * Attribute SelectedDrynessLevel
  */
-class ReadLaundryWasherControlsSpinSpeedCurrent : public ReadAttribute {
+class ReadLaundryDryerControlsSelectedDrynessLevel : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSpinSpeedCurrent()
-        : ReadAttribute("spin-speed-current")
+    ReadLaundryDryerControlsSelectedDrynessLevel()
+        : ReadAttribute("selected-dryness-level")
     {
     }
 
-    ~ReadLaundryWasherControlsSpinSpeedCurrent()
+    ~ReadLaundryDryerControlsSelectedDrynessLevel()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::SelectedDrynessLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSpinSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSelectedDrynessLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.SelectedDrynessLevel response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SpinSpeedCurrent read Error", error);
+                LogNSError("LaundryDryerControls SelectedDrynessLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53636,28 +54041,28 @@ class ReadLaundryWasherControlsSpinSpeedCurrent : public ReadAttribute {
     }
 };
 
-class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
+class WriteLaundryDryerControlsSelectedDrynessLevel : public WriteAttribute {
 public:
-    WriteLaundryWasherControlsSpinSpeedCurrent()
-        : WriteAttribute("spin-speed-current")
+    WriteLaundryDryerControlsSelectedDrynessLevel()
+        : WriteAttribute("selected-dryness-level")
     {
-        AddArgument("attr-name", "spin-speed-current");
+        AddArgument("attr-name", "selected-dryness-level");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteLaundryWasherControlsSpinSpeedCurrent()
+    ~WriteLaundryDryerControlsSelectedDrynessLevel()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::SelectedDrynessLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -53666,9 +54071,9 @@ class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
             value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
 
-        [cluster writeAttributeSpinSpeedCurrentWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeSelectedDrynessLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("LaundryWasherControls SpinSpeedCurrent write Error", error);
+                LogNSError("LaundryDryerControls SelectedDrynessLevel write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53680,25 +54085,25 @@ class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsSelectedDrynessLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
-        : SubscribeAttribute("spin-speed-current")
+    SubscribeAttributeLaundryDryerControlsSelectedDrynessLevel()
+        : SubscribeAttribute("selected-dryness-level")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
+    ~SubscribeAttributeLaundryDryerControlsSelectedDrynessLevel()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::SelectedDrynessLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53709,10 +54114,10 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public Subscribe
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSpinSpeedCurrentWithParams:params
+        [cluster subscribeAttributeSelectedDrynessLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
+                NSLog(@"LaundryDryerControls.SelectedDrynessLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53729,102 +54134,61 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public Subscribe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute NumberOfRinses
+ * Attribute GeneratedCommandList
  */
-class ReadLaundryWasherControlsNumberOfRinses : public ReadAttribute {
+class ReadLaundryDryerControlsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsNumberOfRinses()
-        : ReadAttribute("number-of-rinses")
+    ReadLaundryDryerControlsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLaundryWasherControlsNumberOfRinses()
+    ~ReadLaundryDryerControlsGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeNumberOfRinsesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.NumberOfRinses response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls NumberOfRinses read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteLaundryWasherControlsNumberOfRinses : public WriteAttribute {
-public:
-    WriteLaundryWasherControlsNumberOfRinses()
-        : WriteAttribute("number-of-rinses")
-    {
-        AddArgument("attr-name", "number-of-rinses");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLaundryWasherControlsNumberOfRinses()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeNumberOfRinsesWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("LaundryWasherControls NumberOfRinses write Error", error);
+                LogNSError("LaundryDryerControls GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsNumberOfRinses()
-        : SubscribeAttribute("number-of-rinses")
+    SubscribeAttributeLaundryDryerControlsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsNumberOfRinses()
+    ~SubscribeAttributeLaundryDryerControlsGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53835,10 +54199,10 @@ class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeNumberOfRinsesWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.NumberOfRinses response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryDryerControls.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53855,34 +54219,34 @@ class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SupportedRinses
+ * Attribute AcceptedCommandList
  */
-class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
+class ReadLaundryDryerControlsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSupportedRinses()
-        : ReadAttribute("supported-rinses")
+    ReadLaundryDryerControlsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLaundryWasherControlsSupportedRinses()
+    ~ReadLaundryDryerControlsAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SupportedRinses::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedRinsesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SupportedRinses read Error", error);
+                LogNSError("LaundryDryerControls AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53891,25 +54255,25 @@ class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSupportedRinses()
-        : SubscribeAttribute("supported-rinses")
+    SubscribeAttributeLaundryDryerControlsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSupportedRinses()
+    ~SubscribeAttributeLaundryDryerControlsAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SupportedRinses::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53920,10 +54284,10 @@ class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedRinsesWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
+                NSLog(@"LaundryDryerControls.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53940,34 +54304,34 @@ class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute EventList
  */
-class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
+class ReadLaundryDryerControlsEventList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadLaundryDryerControlsEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadLaundryWasherControlsGeneratedCommandList()
+    ~ReadLaundryDryerControlsEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls GeneratedCommandList read Error", error);
+                LogNSError("LaundryDryerControls EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53976,25 +54340,25 @@ class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeLaundryDryerControlsEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
+    ~SubscribeAttributeLaundryDryerControlsEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54005,10 +54369,10 @@ class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public Subsc
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
+                NSLog(@"LaundryDryerControls.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54025,34 +54389,34 @@ class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public Subsc
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute AttributeList
  */
-class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
+class ReadLaundryDryerControlsAttributeList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadLaundryDryerControlsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLaundryWasherControlsAcceptedCommandList()
+    ~ReadLaundryDryerControlsAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls AcceptedCommandList read Error", error);
+                LogNSError("LaundryDryerControls AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54061,25 +54425,25 @@ class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeLaundryDryerControlsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
+    ~SubscribeAttributeLaundryDryerControlsAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54090,10 +54454,10 @@ class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
+                NSLog(@"LaundryDryerControls.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54110,34 +54474,34 @@ class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute FeatureMap
  */
-class ReadLaundryWasherControlsEventList : public ReadAttribute {
+class ReadLaundryDryerControlsFeatureMap : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsEventList()
-        : ReadAttribute("event-list")
+    ReadLaundryDryerControlsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLaundryWasherControlsEventList()
+    ~ReadLaundryDryerControlsFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls EventList read Error", error);
+                LogNSError("LaundryDryerControls FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54146,25 +54510,25 @@ class ReadLaundryWasherControlsEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeLaundryDryerControlsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsEventList()
+    ~SubscribeAttributeLaundryDryerControlsFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54175,10 +54539,10 @@ class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryDryerControls.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54195,34 +54559,34 @@ class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute ClusterRevision
  */
-class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
+class ReadLaundryDryerControlsClusterRevision : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadLaundryDryerControlsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLaundryWasherControlsAttributeList()
+    ~ReadLaundryDryerControlsClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryDryerControls.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls AttributeList read Error", error);
+                LogNSError("LaundryDryerControls ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54231,25 +54595,25 @@ class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeLaundryDryerControlsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeLaundryDryerControlsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsAttributeList()
+    ~SubscribeAttributeLaundryDryerControlsClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryDryerControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryDryerControls::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryDryerControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54260,10 +54624,10 @@ class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryDryerControls.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54277,37 +54641,106 @@ class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAtt
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster ModeSelect                                                  | 0x0050 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Description                                                       | 0x0000 |
+| * StandardNamespace                                                 | 0x0001 |
+| * SupportedModes                                                    | 0x0002 |
+| * CurrentMode                                                       | 0x0003 |
+| * StartUpMode                                                       | 0x0004 |
+| * OnMode                                                            | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*
- * Attribute FeatureMap
+ * Command ChangeToMode
  */
-class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
+class ModeSelectChangeToMode : public ClusterCommand {
 public:
-    ReadLaundryWasherControlsFeatureMap()
-        : ReadAttribute("feature-map")
+    ModeSelectChangeToMode()
+        : ClusterCommand("change-to-mode")
+    {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRModeSelectClusterChangeToModeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster changeToModeWithParams:params completion:
+                                                       ^(NSError * _Nullable error) {
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
+        }
+        return CHIP_NO_ERROR;
     }
 
-    ~ReadLaundryWasherControlsFeatureMap()
+private:
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
+};
+
+/*
+ * Attribute Description
+ */
+class ReadModeSelectDescription : public ReadAttribute {
+public:
+    ReadModeSelectDescription()
+        : ReadAttribute("description")
+    {
+    }
+
+    ~ReadModeSelectDescription()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::Description::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.Description response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls FeatureMap read Error", error);
+                LogNSError("ModeSelect Description read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54316,25 +54749,25 @@ class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeModeSelectDescription()
+        : SubscribeAttribute("description")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsFeatureMap()
+    ~SubscribeAttributeModeSelectDescription()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::Description::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54345,10 +54778,10 @@ class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeDescriptionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.Description response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54361,38 +54794,35 @@ class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttrib
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute ClusterRevision
+ * Attribute StandardNamespace
  */
-class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
+class ReadModeSelectStandardNamespace : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadModeSelectStandardNamespace()
+        : ReadAttribute("standard-namespace")
     {
     }
 
-    ~ReadLaundryWasherControlsClusterRevision()
+    ~ReadModeSelectStandardNamespace()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StandardNamespace::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls ClusterRevision read Error", error);
+                LogNSError("ModeSelect StandardNamespace read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54401,25 +54831,25 @@ class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeModeSelectStandardNamespace()
+        : SubscribeAttribute("standard-namespace")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsClusterRevision()
+    ~SubscribeAttributeModeSelectStandardNamespace()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::StandardNamespace::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54430,10 +54860,10 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeStandardNamespaceWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
+                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54446,116 +54876,35 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster RvcRunMode                                                  | 0x0054 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * OnMode                                                            | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command ChangeToMode
- */
-class RvcRunModeChangeToMode : public ClusterCommand {
-public:
-    RvcRunModeChangeToMode()
-        : ClusterCommand("change-to-mode")
-    {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute SupportedModes
  */
-class ReadRvcRunModeSupportedModes : public ReadAttribute {
+class ReadModeSelectSupportedModes : public ReadAttribute {
 public:
-    ReadRvcRunModeSupportedModes()
+    ReadModeSelectSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRvcRunModeSupportedModes()
+    ~ReadModeSelectSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
+            NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode SupportedModes read Error", error);
+                LogNSError("ModeSelect SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54564,25 +54913,25 @@ class ReadRvcRunModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeSupportedModes()
+    SubscribeAttributeModeSelectSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeSupportedModes()
+    ~SubscribeAttributeModeSelectSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54596,7 +54945,7 @@ class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
         [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
+                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54609,38 +54958,35 @@ class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute CurrentMode
  */
-class ReadRvcRunModeCurrentMode : public ReadAttribute {
+class ReadModeSelectCurrentMode : public ReadAttribute {
 public:
-    ReadRvcRunModeCurrentMode()
+    ReadModeSelectCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRvcRunModeCurrentMode()
+    ~ReadModeSelectCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
+            NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode CurrentMode read Error", error);
+                LogNSError("ModeSelect CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54649,25 +54995,25 @@ class ReadRvcRunModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeCurrentMode()
+    SubscribeAttributeModeSelectCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeCurrentMode()
+    ~SubscribeAttributeModeSelectCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54681,7 +55027,7 @@ class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
+                NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54694,38 +55040,35 @@ class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute OnMode
+ * Attribute StartUpMode
  */
-class ReadRvcRunModeOnMode : public ReadAttribute {
+class ReadModeSelectStartUpMode : public ReadAttribute {
 public:
-    ReadRvcRunModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadModeSelectStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadRvcRunModeOnMode()
+    ~ReadModeSelectStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.OnMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode OnMode read Error", error);
+                LogNSError("ModeSelect StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54734,28 +55077,28 @@ class ReadRvcRunModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteRvcRunModeOnMode : public WriteAttribute {
+class WriteModeSelectStartUpMode : public WriteAttribute {
 public:
-    WriteRvcRunModeOnMode()
-        : WriteAttribute("on-mode")
+    WriteModeSelectStartUpMode()
+        : WriteAttribute("start-up-mode")
     {
-        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-name", "start-up-mode");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRvcRunModeOnMode()
+    ~WriteModeSelectStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -54764,9 +55107,9 @@ class WriteRvcRunModeOnMode : public WriteAttribute {
             value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
 
-        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RVCRunMode OnMode write Error", error);
+                LogNSError("ModeSelect StartUpMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54778,25 +55121,25 @@ class WriteRvcRunModeOnMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeModeSelectStartUpMode()
+        : SubscribeAttribute("start-up-mode")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeOnMode()
+    ~SubscribeAttributeModeSelectStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54807,10 +55150,10 @@ class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.OnMode response %@", [value description]);
+                NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54823,38 +55166,161 @@ class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
+/*
+ * Attribute OnMode
+ */
+class ReadModeSelectOnMode : public ReadAttribute {
+public:
+    ReadModeSelectOnMode()
+        : ReadAttribute("on-mode")
+    {
+    }
+
+    ~ReadModeSelectOnMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.OnMode response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ModeSelect OnMode read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteModeSelectOnMode : public WriteAttribute {
+public:
+    WriteModeSelectOnMode()
+        : WriteAttribute("on-mode")
+    {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteModeSelectOnMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("ModeSelect OnMode write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeModeSelectOnMode()
+        : SubscribeAttribute("on-mode")
+    {
+    }
+
+    ~SubscribeAttributeModeSelectOnMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::OnMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOnModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.OnMode response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
 
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
+class ReadModeSelectGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcRunModeGeneratedCommandList()
+    ReadModeSelectGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcRunModeGeneratedCommandList()
+    ~ReadModeSelectGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode GeneratedCommandList read Error", error);
+                LogNSError("ModeSelect GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54863,25 +55329,25 @@ class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeGeneratedCommandList()
+    SubscribeAttributeModeSelectGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeGeneratedCommandList()
+    ~SubscribeAttributeModeSelectGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54895,7 +55361,7 @@ class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribu
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54908,38 +55374,35 @@ class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribu
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
+class ReadModeSelectAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcRunModeAcceptedCommandList()
+    ReadModeSelectAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcRunModeAcceptedCommandList()
+    ~ReadModeSelectAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode AcceptedCommandList read Error", error);
+                LogNSError("ModeSelect AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54948,25 +55411,25 @@ class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeAcceptedCommandList()
+    SubscribeAttributeModeSelectAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeAcceptedCommandList()
+    ~SubscribeAttributeModeSelectAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -54980,7 +55443,7 @@ class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribut
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54993,38 +55456,37 @@ class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribut
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute EventList
  */
-class ReadRvcRunModeEventList : public ReadAttribute {
+class ReadModeSelectEventList : public ReadAttribute {
 public:
-    ReadRvcRunModeEventList()
+    ReadModeSelectEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcRunModeEventList()
+    ~ReadModeSelectEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.EventList response %@", [value description]);
+            NSLog(@"ModeSelect.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode EventList read Error", error);
+                LogNSError("ModeSelect EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55033,25 +55495,25 @@ class ReadRvcRunModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeEventList()
+    SubscribeAttributeModeSelectEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeEventList()
+    ~SubscribeAttributeModeSelectEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55065,7 +55527,7 @@ class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.EventList response %@", [value description]);
+                NSLog(@"ModeSelect.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55079,37 +55541,36 @@ class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute AttributeList
  */
-class ReadRvcRunModeAttributeList : public ReadAttribute {
+class ReadModeSelectAttributeList : public ReadAttribute {
 public:
-    ReadRvcRunModeAttributeList()
+    ReadModeSelectAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcRunModeAttributeList()
+    ~ReadModeSelectAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
+            NSLog(@"ModeSelect.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode AttributeList read Error", error);
+                LogNSError("ModeSelect AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55118,25 +55579,25 @@ class ReadRvcRunModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeAttributeList()
+    SubscribeAttributeModeSelectAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeAttributeList()
+    ~SubscribeAttributeModeSelectAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55150,7 +55611,7 @@ class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
+                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55163,38 +55624,35 @@ class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute FeatureMap
  */
-class ReadRvcRunModeFeatureMap : public ReadAttribute {
+class ReadModeSelectFeatureMap : public ReadAttribute {
 public:
-    ReadRvcRunModeFeatureMap()
+    ReadModeSelectFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcRunModeFeatureMap()
+    ~ReadModeSelectFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
+            NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode FeatureMap read Error", error);
+                LogNSError("ModeSelect FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55203,25 +55661,25 @@ class ReadRvcRunModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeFeatureMap()
+    SubscribeAttributeModeSelectFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeFeatureMap()
+    ~SubscribeAttributeModeSelectFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55235,7 +55693,7 @@ class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
+                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55248,38 +55706,35 @@ class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute ClusterRevision
  */
-class ReadRvcRunModeClusterRevision : public ReadAttribute {
+class ReadModeSelectClusterRevision : public ReadAttribute {
 public:
-    ReadRvcRunModeClusterRevision()
+    ReadModeSelectClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRvcRunModeClusterRevision()
+    ~ReadModeSelectClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ModeSelect::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
+            NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode ClusterRevision read Error", error);
+                LogNSError("ModeSelect ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55288,25 +55743,25 @@ class ReadRvcRunModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeClusterRevision()
+    SubscribeAttributeModeSelectClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeClusterRevision()
+    ~SubscribeAttributeModeSelectClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55320,7 +55775,7 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
+                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55333,11 +55788,9 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RvcCleanMode                                                | 0x0055 |
+| Cluster LaundryWasherMode                                           | 0x0051 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -55345,6 +55798,7 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -55360,42 +55814,46 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 /*
  * Command ChangeToMode
  */
-class RvcCleanModeChangeToMode : public ClusterCommand {
+class LaundryWasherModeChangeToMode : public ClusterCommand {
 public:
-    RvcCleanModeChangeToMode()
+    LaundryWasherModeChangeToMode()
         : ClusterCommand("change-to-mode")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCCleanModeClusterChangeToModeParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRLaundryWasherModeClusterChangeToModeParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                       ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
                                                            NSLog(@"Values: %@", values);
                                                            if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
                                                            }
                                                            responsesNeeded--;
                                                            if (error != nil) {
                                                                mError = error;
                                                                LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
@@ -55407,7 +55865,7 @@ class RvcCleanModeChangeToMode : public ClusterCommand {
     }
 
 private:
-    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -55417,32 +55875,32 @@ class RvcCleanModeChangeToMode : public ClusterCommand {
 /*
  * Attribute SupportedModes
  */
-class ReadRvcCleanModeSupportedModes : public ReadAttribute {
+class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
 public:
-    ReadRvcCleanModeSupportedModes()
+    ReadLaundryWasherModeSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRvcCleanModeSupportedModes()
+    ~ReadLaundryWasherModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.SupportedModes response %@", [value description]);
+            NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode SupportedModes read Error", error);
+                LogNSError("LaundryWasherMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55451,25 +55909,25 @@ class ReadRvcCleanModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeSupportedModes()
+    SubscribeAttributeLaundryWasherModeSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeSupportedModes()
+    ~SubscribeAttributeLaundryWasherModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55483,7 +55941,7 @@ class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
         [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.SupportedModes response %@", [value description]);
+                NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55502,32 +55960,32 @@ class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
 /*
  * Attribute CurrentMode
  */
-class ReadRvcCleanModeCurrentMode : public ReadAttribute {
+class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
 public:
-    ReadRvcCleanModeCurrentMode()
+    ReadLaundryWasherModeCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRvcCleanModeCurrentMode()
+    ~ReadLaundryWasherModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
+            NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode CurrentMode read Error", error);
+                LogNSError("LaundryWasherMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55536,25 +55994,25 @@ class ReadRvcCleanModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeCurrentMode()
+    SubscribeAttributeLaundryWasherModeCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeCurrentMode()
+    ~SubscribeAttributeLaundryWasherModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55568,7 +56026,136 @@ class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
+                NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute StartUpMode
+ */
+class ReadLaundryWasherModeStartUpMode : public ReadAttribute {
+public:
+    ReadLaundryWasherModeStartUpMode()
+        : ReadAttribute("start-up-mode")
+    {
+    }
+
+    ~ReadLaundryWasherModeStartUpMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("LaundryWasherMode StartUpMode read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
+public:
+    WriteLaundryWasherModeStartUpMode()
+        : WriteAttribute("start-up-mode")
+    {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteLaundryWasherModeStartUpMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("LaundryWasherMode StartUpMode write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeLaundryWasherModeStartUpMode()
+        : SubscribeAttribute("start-up-mode")
+    {
+    }
+
+    ~SubscribeAttributeLaundryWasherModeStartUpMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeStartUpModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55587,32 +56174,32 @@ class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
 /*
  * Attribute OnMode
  */
-class ReadRvcCleanModeOnMode : public ReadAttribute {
+class ReadLaundryWasherModeOnMode : public ReadAttribute {
 public:
-    ReadRvcCleanModeOnMode()
+    ReadLaundryWasherModeOnMode()
         : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadRvcCleanModeOnMode()
+    ~ReadLaundryWasherModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
+            NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode OnMode read Error", error);
+                LogNSError("LaundryWasherMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55621,9 +56208,9 @@ class ReadRvcCleanModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteRvcCleanModeOnMode : public WriteAttribute {
+class WriteLaundryWasherModeOnMode : public WriteAttribute {
 public:
-    WriteRvcCleanModeOnMode()
+    WriteLaundryWasherModeOnMode()
         : WriteAttribute("on-mode")
     {
         AddArgument("attr-name", "on-mode");
@@ -55631,18 +56218,18 @@ class WriteRvcCleanModeOnMode : public WriteAttribute {
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRvcCleanModeOnMode()
+    ~WriteLaundryWasherModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -55653,7 +56240,7 @@ class WriteRvcCleanModeOnMode : public WriteAttribute {
 
         [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RVCCleanMode OnMode write Error", error);
+                LogNSError("LaundryWasherMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55665,25 +56252,25 @@ class WriteRvcCleanModeOnMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeOnMode()
+    SubscribeAttributeLaundryWasherModeOnMode()
         : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeOnMode()
+    ~SubscribeAttributeLaundryWasherModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55697,7 +56284,7 @@ class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
         [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
+                NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55716,32 +56303,32 @@ class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
+class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcCleanModeGeneratedCommandList()
+    ReadLaundryWasherModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcCleanModeGeneratedCommandList()
+    ~ReadLaundryWasherModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode GeneratedCommandList read Error", error);
+                LogNSError("LaundryWasherMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55750,25 +56337,25 @@ class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeGeneratedCommandList()
+    SubscribeAttributeLaundryWasherModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeGeneratedCommandList()
+    ~SubscribeAttributeLaundryWasherModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55782,7 +56369,7 @@ class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttri
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55801,32 +56388,32 @@ class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttri
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
+class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcCleanModeAcceptedCommandList()
+    ReadLaundryWasherModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcCleanModeAcceptedCommandList()
+    ~ReadLaundryWasherModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode AcceptedCommandList read Error", error);
+                LogNSError("LaundryWasherMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55835,25 +56422,25 @@ class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeAcceptedCommandList()
+    SubscribeAttributeLaundryWasherModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeAcceptedCommandList()
+    ~SubscribeAttributeLaundryWasherModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55867,7 +56454,7 @@ class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttrib
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55886,32 +56473,32 @@ class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute EventList
  */
-class ReadRvcCleanModeEventList : public ReadAttribute {
+class ReadLaundryWasherModeEventList : public ReadAttribute {
 public:
-    ReadRvcCleanModeEventList()
+    ReadLaundryWasherModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcCleanModeEventList()
+    ~ReadLaundryWasherModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.EventList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode EventList read Error", error);
+                LogNSError("LaundryWasherMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55920,25 +56507,25 @@ class ReadRvcCleanModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeEventList()
+    SubscribeAttributeLaundryWasherModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeEventList()
+    ~SubscribeAttributeLaundryWasherModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -55952,7 +56539,7 @@ class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.EventList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55971,32 +56558,32 @@ class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadRvcCleanModeAttributeList : public ReadAttribute {
+class ReadLaundryWasherModeAttributeList : public ReadAttribute {
 public:
-    ReadRvcCleanModeAttributeList()
+    ReadLaundryWasherModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcCleanModeAttributeList()
+    ~ReadLaundryWasherModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.AttributeList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode AttributeList read Error", error);
+                LogNSError("LaundryWasherMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56005,25 +56592,25 @@ class ReadRvcCleanModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeAttributeList()
+    SubscribeAttributeLaundryWasherModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeAttributeList()
+    ~SubscribeAttributeLaundryWasherModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56037,7 +56624,7 @@ class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.AttributeList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56056,32 +56643,32 @@ class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadRvcCleanModeFeatureMap : public ReadAttribute {
+class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
 public:
-    ReadRvcCleanModeFeatureMap()
+    ReadLaundryWasherModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcCleanModeFeatureMap()
+    ~ReadLaundryWasherModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.FeatureMap response %@", [value description]);
+            NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode FeatureMap read Error", error);
+                LogNSError("LaundryWasherMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56090,25 +56677,25 @@ class ReadRvcCleanModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeFeatureMap()
+    SubscribeAttributeLaundryWasherModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeFeatureMap()
+    ~SubscribeAttributeLaundryWasherModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56122,7 +56709,7 @@ class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.FeatureMap response %@", [value description]);
+                NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56141,32 +56728,32 @@ class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadRvcCleanModeClusterRevision : public ReadAttribute {
+class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
 public:
-    ReadRvcCleanModeClusterRevision()
+    ReadLaundryWasherModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRvcCleanModeClusterRevision()
+    ~ReadLaundryWasherModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.ClusterRevision response %@", [value description]);
+            NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode ClusterRevision read Error", error);
+                LogNSError("LaundryWasherMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56175,25 +56762,25 @@ class ReadRvcCleanModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeClusterRevision()
+    SubscribeAttributeLaundryWasherModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeClusterRevision()
+    ~SubscribeAttributeLaundryWasherModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56207,7 +56794,7 @@ class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.ClusterRevision response %@", [value description]);
+                NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56224,18 +56811,16 @@ class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster TemperatureControl                                          | 0x0056 |
+| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SetTemperature                                                    |   0x00 |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * TemperatureSetpoint                                               | 0x0000 |
-| * MinTemperature                                                    | 0x0001 |
-| * MaxTemperature                                                    | 0x0002 |
-| * Step                                                              | 0x0003 |
-| * SelectedTemperatureLevel                                          | 0x0004 |
-| * SupportedTemperatureLevels                                        | 0x0005 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -56248,60 +56833,60 @@ class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command SetTemperature
+ * Command ChangeToMode
  */
-class TemperatureControlSetTemperature : public ClusterCommand {
+class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand {
 public:
-    TemperatureControlSetTemperature()
-        : ClusterCommand("set-temperature")
+    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode()
+        : ClusterCommand("change-to-mode")
     {
-        AddArgument("TargetTemperature", INT16_MIN, INT16_MAX, &mRequest.targetTemperature);
-        AddArgument("TargetTemperatureLevel", 0, UINT8_MAX, &mRequest.targetTemperatureLevel);
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.targetTemperature.HasValue()) {
-            params.targetTemperature = [NSNumber numberWithShort:mRequest.targetTemperature.Value()];
-        } else {
-            params.targetTemperature = nil;
-        }
-        if (mRequest.targetTemperatureLevel.HasValue()) {
-            params.targetTemperatureLevel = [NSNumber numberWithUnsignedChar:mRequest.targetTemperatureLevel.Value()];
-        } else {
-            params.targetTemperatureLevel = nil;
-        }
+#if MTR_ENABLE_PROVISIONAL
+        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster setTemperatureWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+            [cluster changeToModeWithParams:params completion:
+                                                       ^(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                           NSLog(@"Values: %@", values);
+                                                           if (error == nil) {
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                           }
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type mRequest;
+    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -56309,34 +56894,34 @@ class TemperatureControlSetTemperature : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute TemperatureSetpoint
+ * Attribute SupportedModes
  */
-class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public ReadAttribute {
 public:
-    ReadTemperatureControlTemperatureSetpoint()
-        : ReadAttribute("temperature-setpoint")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadTemperatureControlTemperatureSetpoint()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::TemperatureSetpoint::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeTemperatureSetpointWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.TemperatureSetpoint response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl TemperatureSetpoint read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56345,25 +56930,25 @@ class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlTemperatureSetpoint : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlTemperatureSetpoint()
-        : SubscribeAttribute("temperature-setpoint")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlTemperatureSetpoint()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::TemperatureSetpoint::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56374,10 +56959,10 @@ class SubscribeAttributeTemperatureControlTemperatureSetpoint : public Subscribe
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeTemperatureSetpointWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.TemperatureSetpoint response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56394,34 +56979,34 @@ class SubscribeAttributeTemperatureControlTemperatureSetpoint : public Subscribe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MinTemperature
+ * Attribute CurrentMode
  */
-class ReadTemperatureControlMinTemperature : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public ReadAttribute {
 public:
-    ReadTemperatureControlMinTemperature()
-        : ReadAttribute("min-temperature")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadTemperatureControlMinTemperature()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MinTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMinTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.MinTemperature response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl MinTemperature read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56430,25 +57015,25 @@ class ReadTemperatureControlMinTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlMinTemperature()
-        : SubscribeAttribute("min-temperature")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlMinTemperature()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MinTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56459,10 +57044,10 @@ class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMinTemperatureWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.MinTemperature response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56479,34 +57064,34 @@ class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MaxTemperature
+ * Attribute StartUpMode
  */
-class ReadTemperatureControlMaxTemperature : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public ReadAttribute {
 public:
-    ReadTemperatureControlMaxTemperature()
-        : ReadAttribute("max-temperature")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadTemperatureControlMaxTemperature()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MaxTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMaxTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.MaxTemperature response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl MaxTemperature read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56515,25 +57100,69 @@ class ReadTemperatureControlMaxTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttribute {
+class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public WriteAttribute {
 public:
-    SubscribeAttributeTemperatureControlMaxTemperature()
-        : SubscribeAttribute("max-temperature")
+    WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+        : WriteAttribute("start-up-mode")
+    {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
     {
     }
 
-    ~SubscribeAttributeTemperatureControlMaxTemperature()
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+        : SubscribeAttribute("start-up-mode")
+    {
+    }
+
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MaxTemperature::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56544,10 +57173,10 @@ class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMaxTemperatureWithParams:params
+        [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.MaxTemperature response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56564,34 +57193,34 @@ class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Step
+ * Attribute OnMode
  */
-class ReadTemperatureControlStep : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAttribute {
 public:
-    ReadTemperatureControlStep()
-        : ReadAttribute("step")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadTemperatureControlStep()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::Step::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStepWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.Step response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl Step read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56600,110 +57229,69 @@ class ReadTemperatureControlStep : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlStep : public SubscribeAttribute {
+class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeTemperatureControlStep()
-        : SubscribeAttribute("step")
+    WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTemperatureControlStep()
+    ~WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::Step::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
-        [cluster subscribeAttributeStepWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.Step response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
-/*
- * Attribute SelectedTemperatureLevel
- */
-class ReadTemperatureControlSelectedTemperatureLevel : public ReadAttribute {
-public:
-    ReadTemperatureControlSelectedTemperatureLevel()
-        : ReadAttribute("selected-temperature-level")
-    {
-    }
-
-    ~ReadTemperatureControlSelectedTemperatureLevel()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SelectedTemperatureLevel::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.SelectedTemperatureLevel response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("TemperatureControl SelectedTemperatureLevel read Error", error);
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeTemperatureControlSelectedTemperatureLevel : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
-        : SubscribeAttribute("selected-temperature-level")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+        : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SelectedTemperatureLevel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56714,10 +57302,10 @@ class SubscribeAttributeTemperatureControlSelectedTemperatureLevel : public Subs
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSelectedTemperatureLevelWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.SelectedTemperatureLevel response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56734,34 +57322,34 @@ class SubscribeAttributeTemperatureControlSelectedTemperatureLevel : public Subs
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SupportedTemperatureLevels
+ * Attribute GeneratedCommandList
  */
-class ReadTemperatureControlSupportedTemperatureLevels : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureControlSupportedTemperatureLevels()
-        : ReadAttribute("supported-temperature-levels")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTemperatureControlSupportedTemperatureLevels()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SupportedTemperatureLevels::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedTemperatureLevelsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl SupportedTemperatureLevels read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56770,25 +57358,25 @@ class ReadTemperatureControlSupportedTemperatureLevels : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
-        : SubscribeAttribute("supported-temperature-levels")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SupportedTemperatureLevels::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56799,10 +57387,10 @@ class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public Su
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedTemperatureLevelsWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56819,34 +57407,34 @@ class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public Su
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AcceptedCommandList
  */
-class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTemperatureControlGeneratedCommandList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl GeneratedCommandList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56855,25 +57443,25 @@ class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlGeneratedCommandList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56884,10 +57472,10 @@ class SubscribeAttributeTemperatureControlGeneratedCommandList : public Subscrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56904,34 +57492,34 @@ class SubscribeAttributeTemperatureControlGeneratedCommandList : public Subscrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute EventList
  */
-class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public ReadAttribute {
 public:
-    ReadTemperatureControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadTemperatureControlAcceptedCommandList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl AcceptedCommandList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56940,25 +57528,25 @@ class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlAcceptedCommandList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56969,10 +57557,10 @@ class SubscribeAttributeTemperatureControlAcceptedCommandList : public Subscribe
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56989,34 +57577,34 @@ class SubscribeAttributeTemperatureControlAcceptedCommandList : public Subscribe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute AttributeList
  */
-class ReadTemperatureControlEventList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public ReadAttribute {
 public:
-    ReadTemperatureControlEventList()
-        : ReadAttribute("event-list")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTemperatureControlEventList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl EventList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57025,25 +57613,25 @@ class ReadTemperatureControlEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlEventList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57054,10 +57642,10 @@ class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.EventList response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57074,34 +57662,34 @@ class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute FeatureMap
  */
-class ReadTemperatureControlAttributeList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public ReadAttribute {
 public:
-    ReadTemperatureControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTemperatureControlAttributeList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl AttributeList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57110,25 +57698,25 @@ class ReadTemperatureControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlAttributeList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57139,10 +57727,10 @@ class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57159,34 +57747,34 @@ class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute ClusterRevision
  */
-class ReadTemperatureControlFeatureMap : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public ReadAttribute {
 public:
-    ReadTemperatureControlFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTemperatureControlFeatureMap()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl FeatureMap read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57195,25 +57783,25 @@ class ReadTemperatureControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlFeatureMap()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57224,10 +57812,10 @@ class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57241,37 +57829,59 @@ class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster LaundryWasherControls                                       | 0x0053 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SpinSpeeds                                                        | 0x0000 |
+| * SpinSpeedCurrent                                                  | 0x0001 |
+| * NumberOfRinses                                                    | 0x0002 |
+| * SupportedRinses                                                   | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute SpinSpeeds
  */
-class ReadTemperatureControlClusterRevision : public ReadAttribute {
+class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
 public:
-    ReadTemperatureControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadLaundryWasherControlsSpinSpeeds()
+        : ReadAttribute("spin-speeds")
     {
     }
 
-    ~ReadTemperatureControlClusterRevision()
+    ~ReadLaundryWasherControlsSpinSpeeds()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeeds::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSpinSpeedsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl ClusterRevision read Error", error);
+                LogNSError("LaundryWasherControls SpinSpeeds read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57280,25 +57890,25 @@ class ReadTemperatureControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeLaundryWasherControlsSpinSpeeds()
+        : SubscribeAttribute("spin-speeds")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlClusterRevision()
+    ~SubscribeAttributeLaundryWasherControlsSpinSpeeds()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeeds::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57309,10 +57919,10 @@ class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeSpinSpeedsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57326,59 +57936,37 @@ class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttr
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAlarm                                           | 0x0057 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
-\*----------------------------------------------------------------------------*/
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Mask
+ * Attribute SpinSpeedCurrent
  */
-class ReadRefrigeratorAlarmMask : public ReadAttribute {
+class ReadLaundryWasherControlsSpinSpeedCurrent : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmMask()
-        : ReadAttribute("mask")
+    ReadLaundryWasherControlsSpinSpeedCurrent()
+        : ReadAttribute("spin-speed-current")
     {
     }
 
-    ~ReadRefrigeratorAlarmMask()
+    ~ReadLaundryWasherControlsSpinSpeedCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Mask::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.Mask response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSpinSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm Mask read Error", error);
+                LogNSError("LaundryWasherControls SpinSpeedCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57387,25 +57975,69 @@ class ReadRefrigeratorAlarmMask : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
+class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmMask()
-        : SubscribeAttribute("mask")
+    WriteLaundryWasherControlsSpinSpeedCurrent()
+        : WriteAttribute("spin-speed-current")
     {
+        AddArgument("attr-name", "spin-speed-current");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmMask()
+    ~WriteLaundryWasherControlsSpinSpeedCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Mask::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeSpinSpeedCurrentWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("LaundryWasherControls SpinSpeedCurrent write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public SubscribeAttribute {
+public:
+    SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
+        : SubscribeAttribute("spin-speed-current")
+    {
+    }
+
+    ~SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SpinSpeedCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57416,10 +58048,10 @@ class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMaskWithParams:params
+        [cluster subscribeAttributeSpinSpeedCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.Mask response %@", [value description]);
+                NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57436,34 +58068,34 @@ class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute State
+ * Attribute NumberOfRinses
  */
-class ReadRefrigeratorAlarmState : public ReadAttribute {
+class ReadLaundryWasherControlsNumberOfRinses : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmState()
-        : ReadAttribute("state")
+    ReadLaundryWasherControlsNumberOfRinses()
+        : ReadAttribute("number-of-rinses")
     {
     }
 
-    ~ReadRefrigeratorAlarmState()
+    ~ReadLaundryWasherControlsNumberOfRinses()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::State::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfRinsesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherControls.NumberOfRinses response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm State read Error", error);
+                LogNSError("LaundryWasherControls NumberOfRinses read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57472,25 +58104,66 @@ class ReadRefrigeratorAlarmState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
+class WriteLaundryWasherControlsNumberOfRinses : public WriteAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmState()
-        : SubscribeAttribute("state")
+    WriteLaundryWasherControlsNumberOfRinses()
+        : WriteAttribute("number-of-rinses")
     {
+        AddArgument("attr-name", "number-of-rinses");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmState()
+    ~WriteLaundryWasherControlsNumberOfRinses()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::State::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeNumberOfRinsesWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("LaundryWasherControls NumberOfRinses write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAttribute {
+public:
+    SubscribeAttributeLaundryWasherControlsNumberOfRinses()
+        : SubscribeAttribute("number-of-rinses")
+    {
+    }
+
+    ~SubscribeAttributeLaundryWasherControlsNumberOfRinses()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::NumberOfRinses::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57501,10 +58174,10 @@ class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStateWithParams:params
+        [cluster subscribeAttributeNumberOfRinsesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
+                NSLog(@"LaundryWasherControls.NumberOfRinses response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57521,34 +58194,34 @@ class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Supported
+ * Attribute SupportedRinses
  */
-class ReadRefrigeratorAlarmSupported : public ReadAttribute {
+class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmSupported()
-        : ReadAttribute("supported")
+    ReadLaundryWasherControlsSupportedRinses()
+        : ReadAttribute("supported-rinses")
     {
     }
 
-    ~ReadRefrigeratorAlarmSupported()
+    ~ReadLaundryWasherControlsSupportedRinses()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Supported::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SupportedRinses::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedRinsesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm Supported read Error", error);
+                LogNSError("LaundryWasherControls SupportedRinses read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57557,25 +58230,25 @@ class ReadRefrigeratorAlarmSupported : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmSupported()
-        : SubscribeAttribute("supported")
+    SubscribeAttributeLaundryWasherControlsSupportedRinses()
+        : SubscribeAttribute("supported-rinses")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmSupported()
+    ~SubscribeAttributeLaundryWasherControlsSupportedRinses()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Supported::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::SupportedRinses::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57586,10 +58259,10 @@ class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedWithParams:params
+        [cluster subscribeAttributeSupportedRinsesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57608,32 +58281,32 @@ class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
+class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmGeneratedCommandList()
+    ReadLaundryWasherControlsGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmGeneratedCommandList()
+    ~ReadLaundryWasherControlsGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm GeneratedCommandList read Error", error);
+                LogNSError("LaundryWasherControls GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57642,25 +58315,25 @@ class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
+    SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
+    ~SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57674,7 +58347,7 @@ class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public Subscribe
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57693,32 +58366,32 @@ class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public Subscribe
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
+class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmAcceptedCommandList()
+    ReadLaundryWasherControlsAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmAcceptedCommandList()
+    ~ReadLaundryWasherControlsAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm AcceptedCommandList read Error", error);
+                LogNSError("LaundryWasherControls AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57727,25 +58400,25 @@ class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
+    SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
+    ~SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57759,7 +58432,7 @@ class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeA
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57778,32 +58451,32 @@ class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeA
 /*
  * Attribute EventList
  */
-class ReadRefrigeratorAlarmEventList : public ReadAttribute {
+class ReadLaundryWasherControlsEventList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmEventList()
+    ReadLaundryWasherControlsEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmEventList()
+    ~ReadLaundryWasherControlsEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm EventList read Error", error);
+                LogNSError("LaundryWasherControls EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57812,25 +58485,25 @@ class ReadRefrigeratorAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmEventList()
+    SubscribeAttributeLaundryWasherControlsEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmEventList()
+    ~SubscribeAttributeLaundryWasherControlsEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57844,7 +58517,7 @@ class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
+                NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57863,32 +58536,32 @@ class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
+class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmAttributeList()
+    ReadLaundryWasherControlsAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmAttributeList()
+    ~ReadLaundryWasherControlsAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm AttributeList read Error", error);
+                LogNSError("LaundryWasherControls AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57897,25 +58570,25 @@ class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmAttributeList()
+    SubscribeAttributeLaundryWasherControlsAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmAttributeList()
+    ~SubscribeAttributeLaundryWasherControlsAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -57929,7 +58602,7 @@ class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribu
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
+                NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57948,32 +58621,32 @@ class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribu
 /*
  * Attribute FeatureMap
  */
-class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
+class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmFeatureMap()
+    ReadLaundryWasherControlsFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRefrigeratorAlarmFeatureMap()
+    ~ReadLaundryWasherControlsFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
+            NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm FeatureMap read Error", error);
+                LogNSError("LaundryWasherControls FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57982,25 +58655,25 @@ class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmFeatureMap()
+    SubscribeAttributeLaundryWasherControlsFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmFeatureMap()
+    ~SubscribeAttributeLaundryWasherControlsFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58014,7 +58687,7 @@ class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
+                NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58033,32 +58706,32 @@ class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
+class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmClusterRevision()
+    ReadLaundryWasherControlsClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRefrigeratorAlarmClusterRevision()
+    ~ReadLaundryWasherControlsClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
+            NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm ClusterRevision read Error", error);
+                LogNSError("LaundryWasherControls ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58067,25 +58740,25 @@ class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmClusterRevision()
+    SubscribeAttributeLaundryWasherControlsClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmClusterRevision()
+    ~SubscribeAttributeLaundryWasherControlsClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::LaundryWasherControls::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::LaundryWasherControls::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterLaundryWasherControls alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58099,7 +58772,7 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
+                NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58116,7 +58789,7 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherMode                                              | 0x0059 |
+| Cluster RvcRunMode                                                  | 0x0054 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -58124,7 +58797,6 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -58140,42 +58812,46 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
 /*
  * Command ChangeToMode
  */
-class DishwasherModeChangeToMode : public ClusterCommand {
+class RvcRunModeChangeToMode : public ClusterCommand {
 public:
-    DishwasherModeChangeToMode()
+    RvcRunModeChangeToMode()
         : ClusterCommand("change-to-mode")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                       ^(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
                                                            NSLog(@"Values: %@", values);
                                                            if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
                                                            }
                                                            responsesNeeded--;
                                                            if (error != nil) {
                                                                mError = error;
                                                                LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
@@ -58187,7 +58863,7 @@ class DishwasherModeChangeToMode : public ClusterCommand {
     }
 
 private:
-    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -58197,32 +58873,32 @@ class DishwasherModeChangeToMode : public ClusterCommand {
 /*
  * Attribute SupportedModes
  */
-class ReadDishwasherModeSupportedModes : public ReadAttribute {
+class ReadRvcRunModeSupportedModes : public ReadAttribute {
 public:
-    ReadDishwasherModeSupportedModes()
+    ReadRvcRunModeSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadDishwasherModeSupportedModes()
+    ~ReadRvcRunModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.SupportedModes response %@", [value description]);
+            NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode SupportedModes read Error", error);
+                LogNSError("RVCRunMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58231,25 +58907,25 @@ class ReadDishwasherModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeSupportedModes()
+    SubscribeAttributeRvcRunModeSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeSupportedModes()
+    ~SubscribeAttributeRvcRunModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::SupportedModes::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58263,7 +58939,7 @@ class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute
         [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.SupportedModes response %@", [value description]);
+                NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58282,32 +58958,32 @@ class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute
 /*
  * Attribute CurrentMode
  */
-class ReadDishwasherModeCurrentMode : public ReadAttribute {
+class ReadRvcRunModeCurrentMode : public ReadAttribute {
 public:
-    ReadDishwasherModeCurrentMode()
+    ReadRvcRunModeCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadDishwasherModeCurrentMode()
+    ~ReadRvcRunModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
+            NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode CurrentMode read Error", error);
+                LogNSError("RVCRunMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58316,25 +58992,25 @@ class ReadDishwasherModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeCurrentMode()
+    SubscribeAttributeRvcRunModeCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeCurrentMode()
+    ~SubscribeAttributeRvcRunModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::CurrentMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58348,7 +59024,7 @@ class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
+                NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58365,34 +59041,34 @@ class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute StartUpMode
+ * Attribute OnMode
  */
-class ReadDishwasherModeStartUpMode : public ReadAttribute {
+class ReadRvcRunModeOnMode : public ReadAttribute {
 public:
-    ReadDishwasherModeStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadRvcRunModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadDishwasherModeStartUpMode()
+    ~ReadRvcRunModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode StartUpMode read Error", error);
+                LogNSError("RVCRunMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58401,28 +59077,28 @@ class ReadDishwasherModeStartUpMode : public ReadAttribute {
     }
 };
 
-class WriteDishwasherModeStartUpMode : public WriteAttribute {
+class WriteRvcRunModeOnMode : public WriteAttribute {
 public:
-    WriteDishwasherModeStartUpMode()
-        : WriteAttribute("start-up-mode")
+    WriteRvcRunModeOnMode()
+        : WriteAttribute("on-mode")
     {
-        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-name", "on-mode");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteDishwasherModeStartUpMode()
+    ~WriteRvcRunModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
@@ -58431,9 +59107,9 @@ class WriteDishwasherModeStartUpMode : public WriteAttribute {
             value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
 
-        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("DishwasherMode StartUpMode write Error", error);
+                LogNSError("RVCRunMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58445,25 +59121,25 @@ class WriteDishwasherModeStartUpMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeRvcRunModeOnMode()
+        : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeStartUpMode()
+    ~SubscribeAttributeRvcRunModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58474,10 +59150,10 @@ class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStartUpModeWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
+                NSLog(@"RVCRunMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58494,34 +59170,34 @@ class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OnMode
+ * Attribute GeneratedCommandList
  */
-class ReadDishwasherModeOnMode : public ReadAttribute {
+class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadDishwasherModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadRvcRunModeGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadDishwasherModeOnMode()
+    ~ReadRvcRunModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.OnMode response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode OnMode read Error", error);
+                LogNSError("RVCRunMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58530,69 +59206,110 @@ class ReadDishwasherModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteDishwasherModeOnMode : public WriteAttribute {
+class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    WriteDishwasherModeOnMode()
-        : WriteAttribute("on-mode")
+    SubscribeAttributeRvcRunModeGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDishwasherModeOnMode()
+    ~SubscribeAttributeRvcRunModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::GeneratedCommandList::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
 
-        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("DishwasherMode OnMode write Error", error);
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
+public:
+    ReadRvcRunModeAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadRvcRunModeAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCRunMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeRvcRunModeAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeOnMode()
+    ~SubscribeAttributeRvcRunModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58603,10 +59320,10 @@ class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.OnMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58623,34 +59340,34 @@ class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute EventList
  */
-class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
+class ReadRvcRunModeEventList : public ReadAttribute {
 public:
-    ReadDishwasherModeGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadRvcRunModeEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadDishwasherModeGeneratedCommandList()
+    ~ReadRvcRunModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode GeneratedCommandList read Error", error);
+                LogNSError("RVCRunMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58659,25 +59376,25 @@ class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeRvcRunModeEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeGeneratedCommandList()
+    ~SubscribeAttributeRvcRunModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58688,10 +59405,10 @@ class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RVCRunMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58708,34 +59425,34 @@ class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAtt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute AttributeList
  */
-class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
+class ReadRvcRunModeAttributeList : public ReadAttribute {
 public:
-    ReadDishwasherModeAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadRvcRunModeAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDishwasherModeAcceptedCommandList()
+    ~ReadRvcRunModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode AcceptedCommandList read Error", error);
+                LogNSError("RVCRunMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58744,25 +59461,25 @@ class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeRvcRunModeAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeAcceptedCommandList()
+    ~SubscribeAttributeRvcRunModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58773,10 +59490,10 @@ class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58793,34 +59510,34 @@ class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute FeatureMap
  */
-class ReadDishwasherModeEventList : public ReadAttribute {
+class ReadRvcRunModeFeatureMap : public ReadAttribute {
 public:
-    ReadDishwasherModeEventList()
-        : ReadAttribute("event-list")
+    ReadRvcRunModeFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDishwasherModeEventList()
+    ~ReadRvcRunModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode EventList read Error", error);
+                LogNSError("RVCRunMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58829,25 +59546,25 @@ class ReadDishwasherModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeRvcRunModeFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeEventList()
+    ~SubscribeAttributeRvcRunModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58858,10 +59575,10 @@ class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58878,34 +59595,34 @@ class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute ClusterRevision
  */
-class ReadDishwasherModeAttributeList : public ReadAttribute {
+class ReadRvcRunModeClusterRevision : public ReadAttribute {
 public:
-    ReadDishwasherModeAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadRvcRunModeClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDishwasherModeAttributeList()
+    ~ReadRvcRunModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcRunMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode AttributeList read Error", error);
+                LogNSError("RVCRunMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58914,25 +59631,25 @@ class ReadDishwasherModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeRvcRunModeClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeAttributeList()
+    ~SubscribeAttributeRvcRunModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -58943,10 +59660,10 @@ class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58960,37 +59677,119 @@ class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster RvcCleanMode                                                | 0x0055 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * OnMode                                                            | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ChangeToMode
+ */
+class RvcCleanModeChangeToMode : public ClusterCommand {
+public:
+    RvcCleanModeChangeToMode()
+        : ClusterCommand("change-to-mode")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCCleanModeClusterChangeToModeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster changeToModeWithParams:params completion:
+                                                       ^(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                           NSLog(@"Values: %@", values);
+                                                           if (error == nil) {
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                           }
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute SupportedModes
  */
-class ReadDishwasherModeFeatureMap : public ReadAttribute {
+class ReadRvcCleanModeSupportedModes : public ReadAttribute {
 public:
-    ReadDishwasherModeFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadRvcCleanModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadDishwasherModeFeatureMap()
+    ~ReadRvcCleanModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCCleanMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode FeatureMap read Error", error);
+                LogNSError("RVCCleanMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58999,25 +59798,25 @@ class ReadDishwasherModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeRvcCleanModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeFeatureMap()
+    ~SubscribeAttributeRvcCleanModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59028,10 +59827,10 @@ class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCCleanMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59048,34 +59847,34 @@ class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute CurrentMode
  */
-class ReadDishwasherModeClusterRevision : public ReadAttribute {
+class ReadRvcCleanModeCurrentMode : public ReadAttribute {
 public:
-    ReadDishwasherModeClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadRvcCleanModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadDishwasherModeClusterRevision()
+    ~ReadRvcCleanModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode ClusterRevision read Error", error);
+                LogNSError("RVCCleanMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59084,25 +59883,25 @@ class ReadDishwasherModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeRvcCleanModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeClusterRevision()
+    ~SubscribeAttributeRvcCleanModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59113,10 +59912,10 @@ class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
+                NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59130,56 +59929,37 @@ class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribut
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster AirQuality                                                  | 0x005B |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * AirQuality                                                        | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AirQuality
+ * Attribute OnMode
  */
-class ReadAirQualityAirQuality : public ReadAttribute {
+class ReadRvcCleanModeOnMode : public ReadAttribute {
 public:
-    ReadAirQualityAirQuality()
-        : ReadAttribute("air-quality")
+    ReadRvcCleanModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadAirQualityAirQuality()
+    ~ReadRvcCleanModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AirQuality::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAirQualityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.AirQuality response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality AirQuality read Error", error);
+                LogNSError("RVCCleanMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59188,25 +59968,69 @@ class ReadAirQualityAirQuality : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
+class WriteRvcCleanModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeAirQualityAirQuality()
-        : SubscribeAttribute("air-quality")
+    WriteRvcCleanModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeAirQualityAirQuality()
+    ~WriteRvcCleanModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AirQuality::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("RVCCleanMode OnMode write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcCleanModeOnMode()
+        : SubscribeAttribute("on-mode")
+    {
+    }
+
+    ~SubscribeAttributeRvcCleanModeOnMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59217,10 +60041,10 @@ class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAirQualityWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AirQuality response %@", [value description]);
+                NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59239,32 +60063,32 @@ class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadAirQualityGeneratedCommandList : public ReadAttribute {
+class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadAirQualityGeneratedCommandList()
+    ReadRvcCleanModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadAirQualityGeneratedCommandList()
+    ~ReadRvcCleanModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality GeneratedCommandList read Error", error);
+                LogNSError("RVCCleanMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59273,25 +60097,25 @@ class ReadAirQualityGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityGeneratedCommandList()
+    SubscribeAttributeRvcCleanModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityGeneratedCommandList()
+    ~SubscribeAttributeRvcCleanModeGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59305,7 +60129,7 @@ class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribu
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59324,32 +60148,32 @@ class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribu
 /*
  * Attribute AcceptedCommandList
  */
-class ReadAirQualityAcceptedCommandList : public ReadAttribute {
+class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadAirQualityAcceptedCommandList()
+    ReadRvcCleanModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadAirQualityAcceptedCommandList()
+    ~ReadRvcCleanModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality AcceptedCommandList read Error", error);
+                LogNSError("RVCCleanMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59358,25 +60182,25 @@ class ReadAirQualityAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityAcceptedCommandList()
+    SubscribeAttributeRvcCleanModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityAcceptedCommandList()
+    ~SubscribeAttributeRvcCleanModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59390,7 +60214,7 @@ class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribut
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59409,32 +60233,32 @@ class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribut
 /*
  * Attribute EventList
  */
-class ReadAirQualityEventList : public ReadAttribute {
+class ReadRvcCleanModeEventList : public ReadAttribute {
 public:
-    ReadAirQualityEventList()
+    ReadRvcCleanModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadAirQualityEventList()
+    ~ReadRvcCleanModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.EventList response %@", [value description]);
+            NSLog(@"RVCCleanMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality EventList read Error", error);
+                LogNSError("RVCCleanMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59443,25 +60267,25 @@ class ReadAirQualityEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityEventList()
+    SubscribeAttributeRvcCleanModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityEventList()
+    ~SubscribeAttributeRvcCleanModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59475,7 +60299,7 @@ class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.EventList response %@", [value description]);
+                NSLog(@"RVCCleanMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59494,32 +60318,32 @@ class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadAirQualityAttributeList : public ReadAttribute {
+class ReadRvcCleanModeAttributeList : public ReadAttribute {
 public:
-    ReadAirQualityAttributeList()
+    ReadRvcCleanModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadAirQualityAttributeList()
+    ~ReadRvcCleanModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.AttributeList response %@", [value description]);
+            NSLog(@"RVCCleanMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality AttributeList read Error", error);
+                LogNSError("RVCCleanMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59528,25 +60352,25 @@ class ReadAirQualityAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityAttributeList()
+    SubscribeAttributeRvcCleanModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityAttributeList()
+    ~SubscribeAttributeRvcCleanModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59560,7 +60384,7 @@ class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AttributeList response %@", [value description]);
+                NSLog(@"RVCCleanMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59579,32 +60403,32 @@ class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadAirQualityFeatureMap : public ReadAttribute {
+class ReadRvcCleanModeFeatureMap : public ReadAttribute {
 public:
-    ReadAirQualityFeatureMap()
+    ReadRvcCleanModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadAirQualityFeatureMap()
+    ~ReadRvcCleanModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.FeatureMap response %@", [value description]);
+            NSLog(@"RVCCleanMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality FeatureMap read Error", error);
+                LogNSError("RVCCleanMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59613,25 +60437,25 @@ class ReadAirQualityFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityFeatureMap()
+    SubscribeAttributeRvcCleanModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeAirQualityFeatureMap()
+    ~SubscribeAttributeRvcCleanModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59645,7 +60469,7 @@ class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.FeatureMap response %@", [value description]);
+                NSLog(@"RVCCleanMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59664,32 +60488,32 @@ class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadAirQualityClusterRevision : public ReadAttribute {
+class ReadRvcCleanModeClusterRevision : public ReadAttribute {
 public:
-    ReadAirQualityClusterRevision()
+    ReadRvcCleanModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadAirQualityClusterRevision()
+    ~ReadRvcCleanModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
+            NSLog(@"RVCCleanMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality ClusterRevision read Error", error);
+                LogNSError("RVCCleanMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59698,25 +60522,25 @@ class ReadAirQualityClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityClusterRevision()
+    SubscribeAttributeRvcCleanModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeAirQualityClusterRevision()
+    ~SubscribeAttributeRvcCleanModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcCleanMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59730,7 +60554,7 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
+                NSLog(@"RVCCleanMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59747,25 +60571,18 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster SmokeCoAlarm                                                | 0x005C |
+| Cluster TemperatureControl                                          | 0x0056 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SelfTestRequest                                                   |   0x00 |
+| * SetTemperature                                                    |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ExpressedState                                                    | 0x0000 |
-| * SmokeState                                                        | 0x0001 |
-| * COState                                                           | 0x0002 |
-| * BatteryAlert                                                      | 0x0003 |
-| * DeviceMuted                                                       | 0x0004 |
-| * TestInProgress                                                    | 0x0005 |
-| * HardwareFaultAlert                                                | 0x0006 |
-| * EndOfServiceAlert                                                 | 0x0007 |
-| * InterconnectSmokeAlarm                                            | 0x0008 |
-| * InterconnectCOAlarm                                               | 0x0009 |
-| * ContaminationState                                                | 0x000A |
-| * SmokeSensitivityLevel                                             | 0x000B |
-| * ExpiryDate                                                        | 0x000C |
+| * TemperatureSetpoint                                               | 0x0000 |
+| * MinTemperature                                                    | 0x0001 |
+| * MaxTemperature                                                    | 0x0002 |
+| * Step                                                              | 0x0003 |
+| * SelectedTemperatureLevel                                          | 0x0004 |
+| * SupportedTemperatureLevels                                        | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -59774,62 +60591,72 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * SmokeAlarm                                                        | 0x0000 |
-| * COAlarm                                                           | 0x0001 |
-| * LowBattery                                                        | 0x0002 |
-| * HardwareFault                                                     | 0x0003 |
-| * EndOfService                                                      | 0x0004 |
-| * SelfTestComplete                                                  | 0x0005 |
-| * AlarmMuted                                                        | 0x0006 |
-| * MuteEnded                                                         | 0x0007 |
-| * InterconnectSmokeAlarm                                            | 0x0008 |
-| * InterconnectCOAlarm                                               | 0x0009 |
-| * AllClear                                                          | 0x000A |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command SelfTestRequest
+ * Command SetTemperature
  */
-class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
+class TemperatureControlSetTemperature : public ClusterCommand {
 public:
-    SmokeCoAlarmSelfTestRequest()
-        : ClusterCommand("self-test-request")
+    TemperatureControlSetTemperature()
+        : ClusterCommand("set-temperature")
     {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("TargetTemperature", INT16_MIN, INT16_MAX, &mRequest.targetTemperature);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("TargetTemperatureLevel", 0, UINT8_MAX, &mRequest.targetTemperatureLevel);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.targetTemperature.HasValue()) {
+            params.targetTemperature = [NSNumber numberWithShort:mRequest.targetTemperature.Value()];
+        } else {
+            params.targetTemperature = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.targetTemperatureLevel.HasValue()) {
+            params.targetTemperatureLevel = [NSNumber numberWithUnsignedChar:mRequest.targetTemperatureLevel.Value()];
+        } else {
+            params.targetTemperatureLevel = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster selfTestRequestWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+            [cluster setTemperatureWithParams:params completion:
+                                                         ^(NSError * _Nullable error) {
+                                                             responsesNeeded--;
+                                                             if (error != nil) {
+                                                                 mError = error;
+                                                                 LogNSError("Error", error);
+                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                             }
+                                                             if (responsesNeeded == 0) {
+                                                                 SetCommandExitStatus(mError);
+                                                             }
+                                                         }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -59837,34 +60664,34 @@ class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ExpressedState
+ * Attribute TemperatureSetpoint
  */
-class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
+class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmExpressedState()
-        : ReadAttribute("expressed-state")
+    ReadTemperatureControlTemperatureSetpoint()
+        : ReadAttribute("temperature-setpoint")
     {
     }
 
-    ~ReadSmokeCoAlarmExpressedState()
+    ~ReadTemperatureControlTemperatureSetpoint()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpressedState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::TemperatureSetpoint::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeExpressedStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTemperatureSetpointWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.TemperatureSetpoint response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ExpressedState read Error", error);
+                LogNSError("TemperatureControl TemperatureSetpoint read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59873,25 +60700,25 @@ class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlTemperatureSetpoint : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmExpressedState()
-        : SubscribeAttribute("expressed-state")
+    SubscribeAttributeTemperatureControlTemperatureSetpoint()
+        : SubscribeAttribute("temperature-setpoint")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmExpressedState()
+    ~SubscribeAttributeTemperatureControlTemperatureSetpoint()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpressedState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::TemperatureSetpoint::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59902,10 +60729,10 @@ class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeExpressedStateWithParams:params
+        [cluster subscribeAttributeTemperatureSetpointWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
+                NSLog(@"TemperatureControl.TemperatureSetpoint response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59922,34 +60749,34 @@ class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SmokeState
+ * Attribute MinTemperature
  */
-class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
+class ReadTemperatureControlMinTemperature : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmSmokeState()
-        : ReadAttribute("smoke-state")
+    ReadTemperatureControlMinTemperature()
+        : ReadAttribute("min-temperature")
     {
     }
 
-    ~ReadSmokeCoAlarmSmokeState()
+    ~ReadTemperatureControlMinTemperature()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MinTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSmokeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMinTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.MinTemperature response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm SmokeState read Error", error);
+                LogNSError("TemperatureControl MinTemperature read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59958,25 +60785,25 @@ class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmSmokeState()
-        : SubscribeAttribute("smoke-state")
+    SubscribeAttributeTemperatureControlMinTemperature()
+        : SubscribeAttribute("min-temperature")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmSmokeState()
+    ~SubscribeAttributeTemperatureControlMinTemperature()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MinTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59987,10 +60814,10 @@ class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSmokeStateWithParams:params
+        [cluster subscribeAttributeMinTemperatureWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
+                NSLog(@"TemperatureControl.MinTemperature response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60007,34 +60834,34 @@ class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute COState
+ * Attribute MaxTemperature
  */
-class ReadSmokeCoAlarmCOState : public ReadAttribute {
+class ReadTemperatureControlMaxTemperature : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmCOState()
-        : ReadAttribute("costate")
+    ReadTemperatureControlMaxTemperature()
+        : ReadAttribute("max-temperature")
     {
     }
 
-    ~ReadSmokeCoAlarmCOState()
+    ~ReadTemperatureControlMaxTemperature()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::COState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MaxTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCOStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.COState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaxTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.MaxTemperature response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm COState read Error", error);
+                LogNSError("TemperatureControl MaxTemperature read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60043,25 +60870,25 @@ class ReadSmokeCoAlarmCOState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmCOState()
-        : SubscribeAttribute("costate")
+    SubscribeAttributeTemperatureControlMaxTemperature()
+        : SubscribeAttribute("max-temperature")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmCOState()
+    ~SubscribeAttributeTemperatureControlMaxTemperature()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::COState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MaxTemperature::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60072,10 +60899,10 @@ class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCOStateWithParams:params
+        [cluster subscribeAttributeMaxTemperatureWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.COState response %@", [value description]);
+                NSLog(@"TemperatureControl.MaxTemperature response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60092,34 +60919,34 @@ class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute BatteryAlert
+ * Attribute Step
  */
-class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
+class ReadTemperatureControlStep : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmBatteryAlert()
-        : ReadAttribute("battery-alert")
+    ReadTemperatureControlStep()
+        : ReadAttribute("step")
     {
     }
 
-    ~ReadSmokeCoAlarmBatteryAlert()
+    ~ReadTemperatureControlStep()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::BatteryAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::Step::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeBatteryAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStepWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.Step response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm BatteryAlert read Error", error);
+                LogNSError("TemperatureControl Step read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60128,25 +60955,25 @@ class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlStep : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmBatteryAlert()
-        : SubscribeAttribute("battery-alert")
+    SubscribeAttributeTemperatureControlStep()
+        : SubscribeAttribute("step")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmBatteryAlert()
+    ~SubscribeAttributeTemperatureControlStep()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::BatteryAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::Step::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60157,10 +60984,10 @@ class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeBatteryAlertWithParams:params
+        [cluster subscribeAttributeStepWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
+                NSLog(@"TemperatureControl.Step response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60177,34 +61004,34 @@ class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DeviceMuted
+ * Attribute SelectedTemperatureLevel
  */
-class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
+class ReadTemperatureControlSelectedTemperatureLevel : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmDeviceMuted()
-        : ReadAttribute("device-muted")
+    ReadTemperatureControlSelectedTemperatureLevel()
+        : ReadAttribute("selected-temperature-level")
     {
     }
 
-    ~ReadSmokeCoAlarmDeviceMuted()
+    ~ReadTemperatureControlSelectedTemperatureLevel()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::DeviceMuted::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SelectedTemperatureLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeDeviceMutedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.SelectedTemperatureLevel response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm DeviceMuted read Error", error);
+                LogNSError("TemperatureControl SelectedTemperatureLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60213,25 +61040,25 @@ class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlSelectedTemperatureLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmDeviceMuted()
-        : SubscribeAttribute("device-muted")
+    SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
+        : SubscribeAttribute("selected-temperature-level")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmDeviceMuted()
+    ~SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::DeviceMuted::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SelectedTemperatureLevel::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60242,10 +61069,10 @@ class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDeviceMutedWithParams:params
+        [cluster subscribeAttributeSelectedTemperatureLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
+                NSLog(@"TemperatureControl.SelectedTemperatureLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60262,34 +61089,34 @@ class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute TestInProgress
+ * Attribute SupportedTemperatureLevels
  */
-class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
+class ReadTemperatureControlSupportedTemperatureLevels : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmTestInProgress()
-        : ReadAttribute("test-in-progress")
+    ReadTemperatureControlSupportedTemperatureLevels()
+        : ReadAttribute("supported-temperature-levels")
     {
     }
 
-    ~ReadSmokeCoAlarmTestInProgress()
+    ~ReadTemperatureControlSupportedTemperatureLevels()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::TestInProgress::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SupportedTemperatureLevels::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeTestInProgressWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedTemperatureLevelsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm TestInProgress read Error", error);
+                LogNSError("TemperatureControl SupportedTemperatureLevels read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60298,25 +61125,25 @@ class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmTestInProgress()
-        : SubscribeAttribute("test-in-progress")
+    SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
+        : SubscribeAttribute("supported-temperature-levels")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmTestInProgress()
+    ~SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::TestInProgress::Id;
-
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SupportedTemperatureLevels::Id;
+
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60327,10 +61154,10 @@ class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeTestInProgressWithParams:params
+        [cluster subscribeAttributeSupportedTemperatureLevelsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60347,34 +61174,34 @@ class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute HardwareFaultAlert
+ * Attribute GeneratedCommandList
  */
-class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
+class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmHardwareFaultAlert()
-        : ReadAttribute("hardware-fault-alert")
+    ReadTemperatureControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmHardwareFaultAlert()
+    ~ReadTemperatureControlGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::HardwareFaultAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeHardwareFaultAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.HardwareFaultAlert response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm HardwareFaultAlert read Error", error);
+                LogNSError("TemperatureControl GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60383,25 +61210,25 @@ class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
-        : SubscribeAttribute("hardware-fault-alert")
+    SubscribeAttributeTemperatureControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
+    ~SubscribeAttributeTemperatureControlGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::HardwareFaultAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60412,10 +61239,10 @@ class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeHardwareFaultAlertWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.HardwareFaultAlert response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60432,34 +61259,34 @@ class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EndOfServiceAlert
+ * Attribute AcceptedCommandList
  */
-class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
+class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmEndOfServiceAlert()
-        : ReadAttribute("end-of-service-alert")
+    ReadTemperatureControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmEndOfServiceAlert()
+    ~ReadTemperatureControlAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EndOfServiceAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEndOfServiceAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.EndOfServiceAlert response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm EndOfServiceAlert read Error", error);
+                LogNSError("TemperatureControl AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60468,25 +61295,25 @@ class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
-        : SubscribeAttribute("end-of-service-alert")
+    SubscribeAttributeTemperatureControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
+    ~SubscribeAttributeTemperatureControlAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EndOfServiceAlert::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60497,10 +61324,10 @@ class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEndOfServiceAlertWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.EndOfServiceAlert response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60517,34 +61344,34 @@ class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InterconnectSmokeAlarm
+ * Attribute EventList
  */
-class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
+class ReadTemperatureControlEventList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmInterconnectSmokeAlarm()
-        : ReadAttribute("interconnect-smoke-alarm")
+    ReadTemperatureControlEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadSmokeCoAlarmInterconnectSmokeAlarm()
+    ~ReadTemperatureControlEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeInterconnectSmokeAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.InterconnectSmokeAlarm response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm InterconnectSmokeAlarm read Error", error);
+                LogNSError("TemperatureControl EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60553,25 +61380,25 @@ class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
-        : SubscribeAttribute("interconnect-smoke-alarm")
+    SubscribeAttributeTemperatureControlEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
+    ~SubscribeAttributeTemperatureControlEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60582,10 +61409,10 @@ class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInterconnectSmokeAlarmWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.InterconnectSmokeAlarm response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60602,34 +61429,34 @@ class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAtt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InterconnectCOAlarm
+ * Attribute AttributeList
  */
-class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
+class ReadTemperatureControlAttributeList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmInterconnectCOAlarm()
-        : ReadAttribute("interconnect-coalarm")
+    ReadTemperatureControlAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadSmokeCoAlarmInterconnectCOAlarm()
+    ~ReadTemperatureControlAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeInterconnectCOAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.InterconnectCOAlarm response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm InterconnectCOAlarm read Error", error);
+                LogNSError("TemperatureControl AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60638,25 +61465,25 @@ class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
-        : SubscribeAttribute("interconnect-coalarm")
+    SubscribeAttributeTemperatureControlAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
+    ~SubscribeAttributeTemperatureControlAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60667,10 +61494,10 @@ class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInterconnectCOAlarmWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.InterconnectCOAlarm response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60687,34 +61514,34 @@ class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ContaminationState
+ * Attribute FeatureMap
  */
-class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
+class ReadTemperatureControlFeatureMap : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmContaminationState()
-        : ReadAttribute("contamination-state")
+    ReadTemperatureControlFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSmokeCoAlarmContaminationState()
+    ~ReadTemperatureControlFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ContaminationState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeContaminationStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ContaminationState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ContaminationState read Error", error);
+                LogNSError("TemperatureControl FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60723,25 +61550,25 @@ class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmContaminationState()
-        : SubscribeAttribute("contamination-state")
+    SubscribeAttributeTemperatureControlFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmContaminationState()
+    ~SubscribeAttributeTemperatureControlFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ContaminationState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60752,10 +61579,10 @@ class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeContaminationStateWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ContaminationState response %@", [value description]);
+                NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60772,34 +61599,34 @@ class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SmokeSensitivityLevel
+ * Attribute ClusterRevision
  */
-class ReadSmokeCoAlarmSmokeSensitivityLevel : public ReadAttribute {
+class ReadTemperatureControlClusterRevision : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmSmokeSensitivityLevel()
-        : ReadAttribute("smoke-sensitivity-level")
+    ReadTemperatureControlClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSmokeCoAlarmSmokeSensitivityLevel()
+    ~ReadTemperatureControlClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::TemperatureControl::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSmokeSensitivityLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm SmokeSensitivityLevel read Error", error);
+                LogNSError("TemperatureControl ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60808,66 +61635,217 @@ class ReadSmokeCoAlarmSmokeSensitivityLevel : public ReadAttribute {
     }
 };
 
-class WriteSmokeCoAlarmSmokeSensitivityLevel : public WriteAttribute {
+class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttribute {
 public:
-    WriteSmokeCoAlarmSmokeSensitivityLevel()
-        : WriteAttribute("smoke-sensitivity-level")
+    SubscribeAttributeTemperatureControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
-        AddArgument("attr-name", "smoke-sensitivity-level");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteSmokeCoAlarmSmokeSensitivityLevel()
+    ~SubscribeAttributeTemperatureControlClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::ClusterRevision::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
 
-        [cluster writeAttributeSmokeSensitivityLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("SmokeCOAlarm SmokeSensitivityLevel write Error", error);
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster RefrigeratorAlarm                                           | 0x0057 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Mask                                                              | 0x0000 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Mask
+ */
+class ReadRefrigeratorAlarmMask : public ReadAttribute {
+public:
+    ReadRefrigeratorAlarmMask()
+        : ReadAttribute("mask")
+    {
+    }
+
+    ~ReadRefrigeratorAlarmMask()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Mask::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.Mask response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RefrigeratorAlarm Mask read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint8_t mValue;
+class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
+public:
+    SubscribeAttributeRefrigeratorAlarmMask()
+        : SubscribeAttribute("mask")
+    {
+    }
+
+    ~SubscribeAttributeRefrigeratorAlarmMask()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Mask::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeMaskWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAlarm.Mask response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttribute {
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute State
+ */
+class ReadRefrigeratorAlarmState : public ReadAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
-        : SubscribeAttribute("smoke-sensitivity-level")
+    ReadRefrigeratorAlarmState()
+        : ReadAttribute("state")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
+    ~ReadRefrigeratorAlarmState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::State::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RefrigeratorAlarm State read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
+public:
+    SubscribeAttributeRefrigeratorAlarmState()
+        : SubscribeAttribute("state")
+    {
+    }
+
+    ~SubscribeAttributeRefrigeratorAlarmState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::State::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60878,10 +61856,10 @@ class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSmokeSensitivityLevelWithParams:params
+        [cluster subscribeAttributeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60898,34 +61876,34 @@ class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ExpiryDate
+ * Attribute Supported
  */
-class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
+class ReadRefrigeratorAlarmSupported : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmExpiryDate()
-        : ReadAttribute("expiry-date")
+    ReadRefrigeratorAlarmSupported()
+        : ReadAttribute("supported")
     {
     }
 
-    ~ReadSmokeCoAlarmExpiryDate()
+    ~ReadRefrigeratorAlarmSupported()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpiryDate::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Supported::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeExpiryDateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ExpiryDate read Error", error);
+                LogNSError("RefrigeratorAlarm Supported read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60934,25 +61912,25 @@ class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmExpiryDate()
-        : SubscribeAttribute("expiry-date")
+    SubscribeAttributeRefrigeratorAlarmSupported()
+        : SubscribeAttribute("supported")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmExpiryDate()
+    ~SubscribeAttributeRefrigeratorAlarmSupported()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpiryDate::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::Supported::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60963,10 +61941,10 @@ class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeExpiryDateWithParams:params
+        [cluster subscribeAttributeSupportedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60985,32 +61963,32 @@ class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
+class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmGeneratedCommandList()
+    ReadRefrigeratorAlarmGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmGeneratedCommandList()
+    ~ReadRefrigeratorAlarmGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm GeneratedCommandList read Error", error);
+                LogNSError("RefrigeratorAlarm GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61019,25 +61997,25 @@ class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
+    SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
+    ~SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61051,7 +62029,7 @@ class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttri
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61070,32 +62048,32 @@ class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttri
 /*
  * Attribute AcceptedCommandList
  */
-class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
+class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmAcceptedCommandList()
+    ReadRefrigeratorAlarmAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmAcceptedCommandList()
+    ~ReadRefrigeratorAlarmAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm AcceptedCommandList read Error", error);
+                LogNSError("RefrigeratorAlarm AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61104,25 +62082,25 @@ class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
+    SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
+    ~SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61136,7 +62114,7 @@ class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttrib
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61155,32 +62133,32 @@ class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute EventList
  */
-class ReadSmokeCoAlarmEventList : public ReadAttribute {
+class ReadRefrigeratorAlarmEventList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmEventList()
+    ReadRefrigeratorAlarmEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadSmokeCoAlarmEventList()
+    ~ReadRefrigeratorAlarmEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm EventList read Error", error);
+                LogNSError("RefrigeratorAlarm EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61189,25 +62167,25 @@ class ReadSmokeCoAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmEventList()
+    SubscribeAttributeRefrigeratorAlarmEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmEventList()
+    ~SubscribeAttributeRefrigeratorAlarmEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61221,7 +62199,7 @@ class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61240,32 +62218,32 @@ class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
+class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmAttributeList()
+    ReadRefrigeratorAlarmAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadSmokeCoAlarmAttributeList()
+    ~ReadRefrigeratorAlarmAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm AttributeList read Error", error);
+                LogNSError("RefrigeratorAlarm AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61274,25 +62252,25 @@ class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmAttributeList()
+    SubscribeAttributeRefrigeratorAlarmAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmAttributeList()
+    ~SubscribeAttributeRefrigeratorAlarmAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61306,7 +62284,7 @@ class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61325,32 +62303,32 @@ class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
+class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmFeatureMap()
+    ReadRefrigeratorAlarmFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSmokeCoAlarmFeatureMap()
+    ~ReadRefrigeratorAlarmFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm FeatureMap read Error", error);
+                LogNSError("RefrigeratorAlarm FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61359,25 +62337,25 @@ class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmFeatureMap()
+    SubscribeAttributeRefrigeratorAlarmFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmFeatureMap()
+    ~SubscribeAttributeRefrigeratorAlarmFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61391,7 +62369,7 @@ class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61410,32 +62388,32 @@ class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
+class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmClusterRevision()
+    ReadRefrigeratorAlarmClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSmokeCoAlarmClusterRevision()
+    ~ReadRefrigeratorAlarmClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
+            NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ClusterRevision read Error", error);
+                LogNSError("RefrigeratorAlarm ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61444,25 +62422,25 @@ class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmClusterRevision()
+    SubscribeAttributeRefrigeratorAlarmClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmClusterRevision()
+    ~SubscribeAttributeRefrigeratorAlarmClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RefrigeratorAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RefrigeratorAlarm::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61476,7 +62454,7 @@ class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61493,17 +62471,16 @@ class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherAlarm                                             | 0x005D |
+| Cluster DishwasherMode                                              | 0x0059 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Reset                                                             |   0x00 |
-| * ModifyEnabledAlarms                                               |   0x01 |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * Latch                                                             | 0x0001 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -61512,104 +62489,64 @@ class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command Reset
+ * Command ChangeToMode
  */
-class DishwasherAlarmReset : public ClusterCommand {
+class DishwasherModeChangeToMode : public ClusterCommand {
 public:
-    DishwasherAlarmReset()
-        : ClusterCommand("reset")
-    {
-        AddArgument("Alarms", 0, UINT32_MAX, &mRequest.alarms);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    DishwasherModeChangeToMode()
+        : ClusterCommand("change-to-mode")
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRDishwasherAlarmClusterResetParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.alarms = [NSNumber numberWithUnsignedInt:mRequest.alarms.Raw()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type mRequest;
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
-/*
- * Command ModifyEnabledAlarms
- */
-class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
-public:
-    DishwasherAlarmModifyEnabledAlarms()
-        : ClusterCommand("modify-enabled-alarms")
-    {
-        AddArgument("Mask", 0, UINT32_MAX, &mRequest.mask);
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.mask = [NSNumber numberWithUnsignedInt:mRequest.mask.Raw()];
+#if MTR_ENABLE_PROVISIONAL
+        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster modifyEnabledAlarmsWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+            [cluster changeToModeWithParams:params completion:
+                                                       ^(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                           NSLog(@"Values: %@", values);
+                                                           if (error == nil) {
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                           }
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
+    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -61617,34 +62554,34 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Mask
+ * Attribute SupportedModes
  */
-class ReadDishwasherAlarmMask : public ReadAttribute {
+class ReadDishwasherModeSupportedModes : public ReadAttribute {
 public:
-    ReadDishwasherAlarmMask()
-        : ReadAttribute("mask")
+    ReadDishwasherModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadDishwasherAlarmMask()
+    ~ReadDishwasherModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Mask::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm Mask read Error", error);
+                LogNSError("DishwasherMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61653,25 +62590,25 @@ class ReadDishwasherAlarmMask : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmMask()
-        : SubscribeAttribute("mask")
+    SubscribeAttributeDishwasherModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmMask()
+    ~SubscribeAttributeDishwasherModeSupportedModes()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Mask::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::SupportedModes::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61682,10 +62619,10 @@ class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMaskWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61702,34 +62639,34 @@ class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Latch
+ * Attribute CurrentMode
  */
-class ReadDishwasherAlarmLatch : public ReadAttribute {
+class ReadDishwasherModeCurrentMode : public ReadAttribute {
 public:
-    ReadDishwasherAlarmLatch()
-        : ReadAttribute("latch")
+    ReadDishwasherModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadDishwasherAlarmLatch()
+    ~ReadDishwasherModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Latch::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm Latch read Error", error);
+                LogNSError("DishwasherMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61738,25 +62675,25 @@ class ReadDishwasherAlarmLatch : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmLatch()
-        : SubscribeAttribute("latch")
+    SubscribeAttributeDishwasherModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmLatch()
+    ~SubscribeAttributeDishwasherModeCurrentMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Latch::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::CurrentMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61767,10 +62704,10 @@ class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLatchWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
+                NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61787,34 +62724,34 @@ class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute State
+ * Attribute StartUpMode
  */
-class ReadDishwasherAlarmState : public ReadAttribute {
+class ReadDishwasherModeStartUpMode : public ReadAttribute {
 public:
-    ReadDishwasherAlarmState()
-        : ReadAttribute("state")
+    ReadDishwasherModeStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadDishwasherAlarmState()
+    ~ReadDishwasherModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::State::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.State response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm State read Error", error);
+                LogNSError("DishwasherMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61823,110 +62760,69 @@ class ReadDishwasherAlarmState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
+class WriteDishwasherModeStartUpMode : public WriteAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmState()
-        : SubscribeAttribute("state")
+    WriteDishwasherModeStartUpMode()
+        : WriteAttribute("start-up-mode")
     {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeDishwasherAlarmState()
+    ~WriteDishwasherModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::State::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
-        [cluster subscribeAttributeStateWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.State response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
-/*
- * Attribute Supported
- */
-class ReadDishwasherAlarmSupported : public ReadAttribute {
-public:
-    ReadDishwasherAlarmSupported()
-        : ReadAttribute("supported")
-    {
-    }
-
-    ~ReadDishwasherAlarmSupported()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Supported::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.Supported response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("DishwasherAlarm Supported read Error", error);
+        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("DishwasherMode StartUpMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmSupported()
-        : SubscribeAttribute("supported")
+    SubscribeAttributeDishwasherModeStartUpMode()
+        : SubscribeAttribute("start-up-mode")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmSupported()
+    ~SubscribeAttributeDishwasherModeStartUpMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Supported::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -61937,10 +62833,10 @@ class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedWithParams:params
+        [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Supported response %@", [value description]);
+                NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61957,34 +62853,34 @@ class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute OnMode
  */
-class ReadDishwasherAlarmGeneratedCommandList : public ReadAttribute {
+class ReadDishwasherModeOnMode : public ReadAttribute {
 public:
-    ReadDishwasherAlarmGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadDishwasherModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadDishwasherAlarmGeneratedCommandList()
+    ~ReadDishwasherModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm GeneratedCommandList read Error", error);
+                LogNSError("DishwasherMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61993,25 +62889,154 @@ class ReadDishwasherAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAttribute {
+class WriteDishwasherModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteDishwasherModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeDishwasherAlarmGeneratedCommandList()
+    ~WriteDishwasherModeOnMode()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("DishwasherMode OnMode write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherModeOnMode()
+        : SubscribeAttribute("on-mode")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherModeOnMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::OnMode::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOnModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherMode.OnMode response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
+public:
+    ReadDishwasherModeGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadDishwasherModeGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherMode GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherModeGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherModeGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62025,7 +63050,7 @@ class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAt
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.GeneratedCommandList response %@", [value description]);
+                NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62044,32 +63069,32 @@ class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAt
 /*
  * Attribute AcceptedCommandList
  */
-class ReadDishwasherAlarmAcceptedCommandList : public ReadAttribute {
+class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDishwasherAlarmAcceptedCommandList()
+    ReadDishwasherModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDishwasherAlarmAcceptedCommandList()
+    ~ReadDishwasherModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.AcceptedCommandList response %@", [value description]);
+            NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm AcceptedCommandList read Error", error);
+                LogNSError("DishwasherMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62078,25 +63103,25 @@ class ReadDishwasherAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmAcceptedCommandList()
+    SubscribeAttributeDishwasherModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmAcceptedCommandList()
+    ~SubscribeAttributeDishwasherModeAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62110,7 +63135,7 @@ class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAtt
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.AcceptedCommandList response %@", [value description]);
+                NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62129,32 +63154,32 @@ class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAtt
 /*
  * Attribute EventList
  */
-class ReadDishwasherAlarmEventList : public ReadAttribute {
+class ReadDishwasherModeEventList : public ReadAttribute {
 public:
-    ReadDishwasherAlarmEventList()
+    ReadDishwasherModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadDishwasherAlarmEventList()
+    ~ReadDishwasherModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.EventList response %@", [value description]);
+            NSLog(@"DishwasherMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm EventList read Error", error);
+                LogNSError("DishwasherMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62163,25 +63188,25 @@ class ReadDishwasherAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmEventList()
+    SubscribeAttributeDishwasherModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmEventList()
+    ~SubscribeAttributeDishwasherModeEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62195,7 +63220,7 @@ class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.EventList response %@", [value description]);
+                NSLog(@"DishwasherMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62214,32 +63239,32 @@ class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadDishwasherAlarmAttributeList : public ReadAttribute {
+class ReadDishwasherModeAttributeList : public ReadAttribute {
 public:
-    ReadDishwasherAlarmAttributeList()
+    ReadDishwasherModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDishwasherAlarmAttributeList()
+    ~ReadDishwasherModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.AttributeList response %@", [value description]);
+            NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm AttributeList read Error", error);
+                LogNSError("DishwasherMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62248,25 +63273,25 @@ class ReadDishwasherAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmAttributeList()
+    SubscribeAttributeDishwasherModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmAttributeList()
+    ~SubscribeAttributeDishwasherModeAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62280,7 +63305,7 @@ class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.AttributeList response %@", [value description]);
+                NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62299,32 +63324,32 @@ class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute
 /*
  * Attribute FeatureMap
  */
-class ReadDishwasherAlarmFeatureMap : public ReadAttribute {
+class ReadDishwasherModeFeatureMap : public ReadAttribute {
 public:
-    ReadDishwasherAlarmFeatureMap()
+    ReadDishwasherModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDishwasherAlarmFeatureMap()
+    ~ReadDishwasherModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.FeatureMap response %@", [value description]);
+            NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm FeatureMap read Error", error);
+                LogNSError("DishwasherMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62333,25 +63358,25 @@ class ReadDishwasherAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmFeatureMap()
+    SubscribeAttributeDishwasherModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmFeatureMap()
+    ~SubscribeAttributeDishwasherModeFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62365,7 +63390,7 @@ class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.FeatureMap response %@", [value description]);
+                NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62384,32 +63409,32 @@ class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadDishwasherAlarmClusterRevision : public ReadAttribute {
+class ReadDishwasherModeClusterRevision : public ReadAttribute {
 public:
-    ReadDishwasherAlarmClusterRevision()
+    ReadDishwasherModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDishwasherAlarmClusterRevision()
+    ~ReadDishwasherModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+            NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherAlarm ClusterRevision read Error", error);
+                LogNSError("DishwasherMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62418,25 +63443,25 @@ class ReadDishwasherAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmClusterRevision()
+    SubscribeAttributeDishwasherModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmClusterRevision()
+    ~SubscribeAttributeDishwasherModeClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherMode::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62450,7 +63475,7 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+                NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62467,21 +63492,12 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster OperationalState                                            | 0x0060 |
+| Cluster AirQuality                                                  | 0x005B |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Pause                                                             |   0x00 |
-| * Stop                                                              |   0x01 |
-| * Start                                                             |   0x02 |
-| * Resume                                                            |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * PhaseList                                                         | 0x0000 |
-| * CurrentPhase                                                      | 0x0001 |
-| * CountdownTime                                                     | 0x0002 |
-| * OperationalStateList                                              | 0x0003 |
-| * OperationalState                                                  | 0x0004 |
-| * OperationalError                                                  | 0x0005 |
+| * AirQuality                                                        | 0x0000 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -62490,250 +63506,124 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * OperationalError                                                  | 0x0000 |
-| * OperationCompletion                                               | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
+
 /*
- * Command Pause
+ * Attribute AirQuality
  */
-class OperationalStatePause : public ClusterCommand {
+class ReadAirQualityAirQuality : public ReadAttribute {
 public:
-    OperationalStatePause()
-        : ClusterCommand("pause")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    ReadAirQualityAirQuality()
+        : ReadAttribute("air-quality")
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTROperationalStateClusterPauseParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster pauseWithParams:params completion:
-                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command Stop
- */
-class OperationalStateStop : public ClusterCommand {
-public:
-    OperationalStateStop()
-        : ClusterCommand("stop")
+    ~ReadAirQualityAirQuality()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AirQuality::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTROperationalStateClusterStopParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopWithParams:params completion:
-                                               ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
-        }
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAirQualityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.AirQuality response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("AirQuality AirQuality read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command Start
- */
-class OperationalStateStart : public ClusterCommand {
+class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
 public:
-    OperationalStateStart()
-        : ClusterCommand("start")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    SubscribeAttributeAirQualityAirQuality()
+        : SubscribeAttribute("air-quality")
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTROperationalStateClusterStartParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster startWithParams:params completion:
-                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command Resume
- */
-class OperationalStateResume : public ClusterCommand {
-public:
-    OperationalStateResume()
-        : ClusterCommand("resume")
+    ~SubscribeAttributeAirQualityAirQuality()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AirQuality::Id;
 
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTROperationalStateClusterResumeParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resumeWithParams:params completion:
-                                                 ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
         }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAirQualityWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AirQuality.AirQuality response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PhaseList
+ * Attribute GeneratedCommandList
  */
-class ReadOperationalStatePhaseList : public ReadAttribute {
+class ReadAirQualityGeneratedCommandList : public ReadAttribute {
 public:
-    ReadOperationalStatePhaseList()
-        : ReadAttribute("phase-list")
+    ReadAirQualityGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadOperationalStatePhaseList()
+    ~ReadAirQualityGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::PhaseList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.PhaseList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState PhaseList read Error", error);
+                LogNSError("AirQuality GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62742,25 +63632,25 @@ class ReadOperationalStatePhaseList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStatePhaseList()
-        : SubscribeAttribute("phase-list")
+    SubscribeAttributeAirQualityGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStatePhaseList()
+    ~SubscribeAttributeAirQualityGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::PhaseList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62771,10 +63661,10 @@ class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePhaseListWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.PhaseList response %@", [value description]);
+                NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62791,34 +63681,34 @@ class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentPhase
+ * Attribute AcceptedCommandList
  */
-class ReadOperationalStateCurrentPhase : public ReadAttribute {
+class ReadAirQualityAcceptedCommandList : public ReadAttribute {
 public:
-    ReadOperationalStateCurrentPhase()
-        : ReadAttribute("current-phase")
+    ReadAirQualityAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadOperationalStateCurrentPhase()
+    ~ReadAirQualityAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::CurrentPhase::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.CurrentPhase response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState CurrentPhase read Error", error);
+                LogNSError("AirQuality AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62827,25 +63717,25 @@ class ReadOperationalStateCurrentPhase : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute {
+class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateCurrentPhase()
-        : SubscribeAttribute("current-phase")
+    SubscribeAttributeAirQualityAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateCurrentPhase()
+    ~SubscribeAttributeAirQualityAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::CurrentPhase::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62856,10 +63746,10 @@ class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentPhaseWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.CurrentPhase response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62876,34 +63766,34 @@ class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CountdownTime
+ * Attribute EventList
  */
-class ReadOperationalStateCountdownTime : public ReadAttribute {
+class ReadAirQualityEventList : public ReadAttribute {
 public:
-    ReadOperationalStateCountdownTime()
-        : ReadAttribute("countdown-time")
+    ReadAirQualityEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadOperationalStateCountdownTime()
+    ~ReadAirQualityEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::CountdownTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.CountdownTime response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState CountdownTime read Error", error);
+                LogNSError("AirQuality EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62912,25 +63802,25 @@ class ReadOperationalStateCountdownTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribute {
+class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateCountdownTime()
-        : SubscribeAttribute("countdown-time")
+    SubscribeAttributeAirQualityEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateCountdownTime()
+    ~SubscribeAttributeAirQualityEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::CountdownTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -62941,10 +63831,10 @@ class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCountdownTimeWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.CountdownTime response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AirQuality.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62961,34 +63851,34 @@ class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalStateList
+ * Attribute AttributeList
  */
-class ReadOperationalStateOperationalStateList : public ReadAttribute {
+class ReadAirQualityAttributeList : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalStateList()
-        : ReadAttribute("operational-state-list")
+    ReadAirQualityAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadOperationalStateOperationalStateList()
+    ~ReadAirQualityAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalStateList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.OperationalStateList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState OperationalStateList read Error", error);
+                LogNSError("AirQuality AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62997,25 +63887,25 @@ class ReadOperationalStateOperationalStateList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalStateList()
-        : SubscribeAttribute("operational-state-list")
+    SubscribeAttributeAirQualityAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateOperationalStateList()
+    ~SubscribeAttributeAirQualityAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalStateList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63026,10 +63916,10 @@ class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalStateList response %@", [value description]);
+                NSLog(@"AirQuality.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63046,34 +63936,34 @@ class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalState
+ * Attribute FeatureMap
  */
-class ReadOperationalStateOperationalState : public ReadAttribute {
+class ReadAirQualityFeatureMap : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalState()
-        : ReadAttribute("operational-state")
+    ReadAirQualityFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadOperationalStateOperationalState()
+    ~ReadAirQualityFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.OperationalState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState OperationalState read Error", error);
+                LogNSError("AirQuality FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63082,25 +63972,25 @@ class ReadOperationalStateOperationalState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttribute {
+class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalState()
-        : SubscribeAttribute("operational-state")
+    SubscribeAttributeAirQualityFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeOperationalStateOperationalState()
+    ~SubscribeAttributeAirQualityFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63111,10 +64001,10 @@ class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalState response %@", [value description]);
+                NSLog(@"AirQuality.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63131,34 +64021,34 @@ class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalError
+ * Attribute ClusterRevision
  */
-class ReadOperationalStateOperationalError : public ReadAttribute {
+class ReadAirQualityClusterRevision : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalError()
-        : ReadAttribute("operational-error")
+    ReadAirQualityClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadOperationalStateOperationalError()
+    ~ReadAirQualityClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalError::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalErrorWithCompletion:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.OperationalError response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState OperationalError read Error", error);
+                LogNSError("AirQuality ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63167,25 +64057,25 @@ class ReadOperationalStateOperationalError : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttribute {
+class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalError()
-        : SubscribeAttribute("operational-error")
+    SubscribeAttributeAirQualityClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeOperationalStateOperationalError()
+    ~SubscribeAttributeAirQualityClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalError::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AirQuality::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AirQuality::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63196,10 +64086,10 @@ class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalErrorWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalError response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63212,38 +64102,128 @@ class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttri
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster SmokeCoAlarm                                                | 0x005C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelfTestRequest                                                   |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ExpressedState                                                    | 0x0000 |
+| * SmokeState                                                        | 0x0001 |
+| * COState                                                           | 0x0002 |
+| * BatteryAlert                                                      | 0x0003 |
+| * DeviceMuted                                                       | 0x0004 |
+| * TestInProgress                                                    | 0x0005 |
+| * HardwareFaultAlert                                                | 0x0006 |
+| * EndOfServiceAlert                                                 | 0x0007 |
+| * InterconnectSmokeAlarm                                            | 0x0008 |
+| * InterconnectCOAlarm                                               | 0x0009 |
+| * ContaminationState                                                | 0x000A |
+| * SmokeSensitivityLevel                                             | 0x000B |
+| * ExpiryDate                                                        | 0x000C |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * SmokeAlarm                                                        | 0x0000 |
+| * COAlarm                                                           | 0x0001 |
+| * LowBattery                                                        | 0x0002 |
+| * HardwareFault                                                     | 0x0003 |
+| * EndOfService                                                      | 0x0004 |
+| * SelfTestComplete                                                  | 0x0005 |
+| * AlarmMuted                                                        | 0x0006 |
+| * MuteEnded                                                         | 0x0007 |
+| * InterconnectSmokeAlarm                                            | 0x0008 |
+| * InterconnectCOAlarm                                               | 0x0009 |
+| * AllClear                                                          | 0x000A |
+\*----------------------------------------------------------------------------*/
 
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Attribute GeneratedCommandList
+ * Command SelfTestRequest
  */
-class ReadOperationalStateGeneratedCommandList : public ReadAttribute {
+class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
 public:
-    ReadOperationalStateGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    SmokeCoAlarmSelfTestRequest()
+        : ClusterCommand("self-test-request")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalStateGeneratedCommandList()
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster selfTestRequestWithParams:params completion:
+                                                          ^(NSError * _Nullable error) {
+                                                              responsesNeeded--;
+                                                              if (error != nil) {
+                                                                  mError = error;
+                                                                  LogNSError("Error", error);
+                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                              }
+                                                              if (responsesNeeded == 0) {
+                                                                  SetCommandExitStatus(mError);
+                                                              }
+                                                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ExpressedState
+ */
+class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmExpressedState()
+        : ReadAttribute("expressed-state")
+    {
+    }
+
+    ~ReadSmokeCoAlarmExpressedState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpressedState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeExpressedStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState GeneratedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm ExpressedState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63252,25 +64232,25 @@ class ReadOperationalStateGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeSmokeCoAlarmExpressedState()
+        : SubscribeAttribute("expressed-state")
     {
     }
 
-    ~SubscribeAttributeOperationalStateGeneratedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmExpressedState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpressedState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63281,10 +64261,10 @@ class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeExpressedStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63301,34 +64281,34 @@ class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute SmokeState
  */
-class ReadOperationalStateAcceptedCommandList : public ReadAttribute {
+class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
 public:
-    ReadOperationalStateAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadSmokeCoAlarmSmokeState()
+        : ReadAttribute("smoke-state")
     {
     }
 
-    ~ReadOperationalStateAcceptedCommandList()
+    ~ReadSmokeCoAlarmSmokeState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSmokeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState AcceptedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm SmokeState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63337,25 +64317,25 @@ class ReadOperationalStateAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeSmokeCoAlarmSmokeState()
+        : SubscribeAttribute("smoke-state")
     {
     }
 
-    ~SubscribeAttributeOperationalStateAcceptedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmSmokeState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63366,10 +64346,10 @@ class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeSmokeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63386,34 +64366,34 @@ class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute COState
  */
-class ReadOperationalStateEventList : public ReadAttribute {
+class ReadSmokeCoAlarmCOState : public ReadAttribute {
 public:
-    ReadOperationalStateEventList()
-        : ReadAttribute("event-list")
+    ReadSmokeCoAlarmCOState()
+        : ReadAttribute("costate")
     {
     }
 
-    ~ReadOperationalStateEventList()
+    ~ReadSmokeCoAlarmCOState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::COState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCOStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.COState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState EventList read Error", error);
+                LogNSError("SmokeCOAlarm COState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63422,25 +64402,25 @@ class ReadOperationalStateEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeSmokeCoAlarmCOState()
+        : SubscribeAttribute("costate")
     {
     }
 
-    ~SubscribeAttributeOperationalStateEventList()
+    ~SubscribeAttributeSmokeCoAlarmCOState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::COState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63451,10 +64431,10 @@ class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeCOStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.COState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63471,34 +64451,34 @@ class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute BatteryAlert
  */
-class ReadOperationalStateAttributeList : public ReadAttribute {
+class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
 public:
-    ReadOperationalStateAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadSmokeCoAlarmBatteryAlert()
+        : ReadAttribute("battery-alert")
     {
     }
 
-    ~ReadOperationalStateAttributeList()
+    ~ReadSmokeCoAlarmBatteryAlert()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::BatteryAlert::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeBatteryAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState AttributeList read Error", error);
+                LogNSError("SmokeCOAlarm BatteryAlert read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63507,25 +64487,25 @@ class ReadOperationalStateAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeSmokeCoAlarmBatteryAlert()
+        : SubscribeAttribute("battery-alert")
     {
     }
 
-    ~SubscribeAttributeOperationalStateAttributeList()
+    ~SubscribeAttributeSmokeCoAlarmBatteryAlert()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::BatteryAlert::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63536,10 +64516,10 @@ class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeBatteryAlertWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63556,34 +64536,34 @@ class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute DeviceMuted
  */
-class ReadOperationalStateFeatureMap : public ReadAttribute {
+class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
 public:
-    ReadOperationalStateFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadSmokeCoAlarmDeviceMuted()
+        : ReadAttribute("device-muted")
     {
     }
 
-    ~ReadOperationalStateFeatureMap()
+    ~ReadSmokeCoAlarmDeviceMuted()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::DeviceMuted::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDeviceMutedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState FeatureMap read Error", error);
+                LogNSError("SmokeCOAlarm DeviceMuted read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63592,25 +64572,25 @@ class ReadOperationalStateFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeSmokeCoAlarmDeviceMuted()
+        : SubscribeAttribute("device-muted")
     {
     }
 
-    ~SubscribeAttributeOperationalStateFeatureMap()
+    ~SubscribeAttributeSmokeCoAlarmDeviceMuted()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::DeviceMuted::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63621,10 +64601,10 @@ class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeDeviceMutedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63641,34 +64621,34 @@ class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute TestInProgress
  */
-class ReadOperationalStateClusterRevision : public ReadAttribute {
+class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
 public:
-    ReadOperationalStateClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadSmokeCoAlarmTestInProgress()
+        : ReadAttribute("test-in-progress")
     {
     }
 
-    ~ReadOperationalStateClusterRevision()
+    ~ReadSmokeCoAlarmTestInProgress()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::TestInProgress::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTestInProgressWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState ClusterRevision read Error", error);
+                LogNSError("SmokeCOAlarm TestInProgress read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63677,25 +64657,25 @@ class ReadOperationalStateClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeSmokeCoAlarmTestInProgress()
+        : SubscribeAttribute("test-in-progress")
     {
     }
 
-    ~SubscribeAttributeOperationalStateClusterRevision()
+    ~SubscribeAttributeSmokeCoAlarmTestInProgress()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::TestInProgress::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -63706,10 +64686,10 @@ class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeTestInProgressWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63722,277 +64702,674 @@ class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttrib
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster RvcOperationalState                                         | 0x0061 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * Pause                                                             |   0x00 |
-| * Stop                                                              |   0x01 |
-| * Start                                                             |   0x02 |
-| * Resume                                                            |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * PhaseList                                                         | 0x0000 |
-| * CurrentPhase                                                      | 0x0001 |
-| * CountdownTime                                                     | 0x0002 |
-| * OperationalStateList                                              | 0x0003 |
-| * OperationalState                                                  | 0x0004 |
-| * OperationalError                                                  | 0x0005 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * OperationalError                                                  | 0x0000 |
-| * OperationCompletion                                               | 0x0001 |
-\*----------------------------------------------------------------------------*/
 
-#if MTR_ENABLE_PROVISIONAL
 /*
- * Command Pause
+ * Attribute HardwareFaultAlert
  */
-class RvcOperationalStatePause : public ClusterCommand {
+class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
 public:
-    RvcOperationalStatePause()
-        : ClusterCommand("pause")
+    ReadSmokeCoAlarmHardwareFaultAlert()
+        : ReadAttribute("hardware-fault-alert")
+    {
+    }
+
+    ~ReadSmokeCoAlarmHardwareFaultAlert()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::HardwareFaultAlert::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCOperationalStateClusterPauseParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster pauseWithParams:params completion:
-                                                ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
-        }
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeHardwareFaultAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.HardwareFaultAlert response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm HardwareFaultAlert read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
+class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
+        : SubscribeAttribute("hardware-fault-alert")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::HardwareFaultAlert::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeHardwareFaultAlertWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.HardwareFaultAlert response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
+
 /*
- * Command Stop
+ * Attribute EndOfServiceAlert
  */
-class RvcOperationalStateStop : public ClusterCommand {
+class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
 public:
-    RvcOperationalStateStop()
-        : ClusterCommand("stop")
+    ReadSmokeCoAlarmEndOfServiceAlert()
+        : ReadAttribute("end-of-service-alert")
+    {
+    }
+
+    ~ReadSmokeCoAlarmEndOfServiceAlert()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EndOfServiceAlert::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCOperationalStateClusterStopParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopWithParams:params completion:
-                                               ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
-        }
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEndOfServiceAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.EndOfServiceAlert response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm EndOfServiceAlert read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
+
+class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
+        : SubscribeAttribute("end-of-service-alert")
+    {
+    }
 
-private:
+    ~SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EndOfServiceAlert::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEndOfServiceAlertWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.EndOfServiceAlert response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
+
 /*
- * Command Start
+ * Attribute InterconnectSmokeAlarm
  */
-class RvcOperationalStateStart : public ClusterCommand {
+class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
 public:
-    RvcOperationalStateStart()
-        : ClusterCommand("start")
+    ReadSmokeCoAlarmInterconnectSmokeAlarm()
+        : ReadAttribute("interconnect-smoke-alarm")
+    {
+    }
+
+    ~ReadSmokeCoAlarmInterconnectSmokeAlarm()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCOperationalStateClusterStartParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster startWithParams:params completion:
-                                                ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeInterconnectSmokeAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.InterconnectSmokeAlarm response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm InterconnectSmokeAlarm read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
+        : SubscribeAttribute("interconnect-smoke-alarm")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
         }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeInterconnectSmokeAlarmWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.InterconnectSmokeAlarm response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
         return CHIP_NO_ERROR;
     }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute InterconnectCOAlarm
+ */
+class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmInterconnectCOAlarm()
+        : ReadAttribute("interconnect-coalarm")
+    {
+    }
 
-private:
+    ~ReadSmokeCoAlarmInterconnectCOAlarm()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeInterconnectCOAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.InterconnectCOAlarm response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm InterconnectCOAlarm read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
+        : SubscribeAttribute("interconnect-coalarm")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectCOAlarm::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeInterconnectCOAlarmWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.InterconnectCOAlarm response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
+
 /*
- * Command Resume
+ * Attribute ContaminationState
  */
-class RvcOperationalStateResume : public ClusterCommand {
+class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
 public:
-    RvcOperationalStateResume()
-        : ClusterCommand("resume")
+    ReadSmokeCoAlarmContaminationState()
+        : ReadAttribute("contamination-state")
+    {
+    }
+
+    ~ReadSmokeCoAlarmContaminationState()
     {
-        ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ContaminationState::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resumeWithParams:params completion:
-                                                 ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeContaminationStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.ContaminationState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm ContaminationState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmContaminationState()
+        : SubscribeAttribute("contamination-state")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmContaminationState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ContaminationState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
         }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeContaminationStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.ContaminationState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SmokeSensitivityLevel
+ */
+class ReadSmokeCoAlarmSmokeSensitivityLevel : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmSmokeSensitivityLevel()
+        : ReadAttribute("smoke-sensitivity-level")
+    {
+    }
+
+    ~ReadSmokeCoAlarmSmokeSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSmokeSensitivityLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm SmokeSensitivityLevel read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteSmokeCoAlarmSmokeSensitivityLevel : public WriteAttribute {
+public:
+    WriteSmokeCoAlarmSmokeSensitivityLevel()
+        : WriteAttribute("smoke-sensitivity-level")
+    {
+        AddArgument("attr-name", "smoke-sensitivity-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteSmokeCoAlarmSmokeSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSmokeSensitivityLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("SmokeCOAlarm SmokeSensitivityLevel write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 
 private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
+        : SubscribeAttribute("smoke-sensitivity-level")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeSmokeSensitivityLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ExpiryDate
+ */
+class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmExpiryDate()
+        : ReadAttribute("expiry-date")
+    {
+    }
+
+    ~ReadSmokeCoAlarmExpiryDate()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpiryDate::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeExpiryDateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm ExpiryDate read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmExpiryDate()
+        : SubscribeAttribute("expiry-date")
+    {
+    }
 
+    ~SubscribeAttributeSmokeCoAlarmExpiryDate()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ExpiryDate::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeExpiryDateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PhaseList
+ * Attribute GeneratedCommandList
  */
-class ReadRvcOperationalStatePhaseList : public ReadAttribute {
+class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcOperationalStatePhaseList()
-        : ReadAttribute("phase-list")
+    ReadSmokeCoAlarmGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcOperationalStatePhaseList()
+    ~ReadSmokeCoAlarmGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::PhaseList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.PhaseList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState PhaseList read Error", error);
+                LogNSError("SmokeCOAlarm GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64001,25 +65378,25 @@ class ReadRvcOperationalStatePhaseList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStatePhaseList()
-        : SubscribeAttribute("phase-list")
+    SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStatePhaseList()
+    ~SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::PhaseList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64030,10 +65407,10 @@ class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePhaseListWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.PhaseList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64050,34 +65427,34 @@ class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentPhase
+ * Attribute AcceptedCommandList
  */
-class ReadRvcOperationalStateCurrentPhase : public ReadAttribute {
+class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateCurrentPhase()
-        : ReadAttribute("current-phase")
+    ReadSmokeCoAlarmAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcOperationalStateCurrentPhase()
+    ~ReadSmokeCoAlarmAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CurrentPhase::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.CurrentPhase response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState CurrentPhase read Error", error);
+                LogNSError("SmokeCOAlarm AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64086,25 +65463,25 @@ class ReadRvcOperationalStateCurrentPhase : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateCurrentPhase()
-        : SubscribeAttribute("current-phase")
+    SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateCurrentPhase()
+    ~SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CurrentPhase::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64115,10 +65492,10 @@ class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentPhaseWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.CurrentPhase response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64135,34 +65512,34 @@ class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CountdownTime
+ * Attribute EventList
  */
-class ReadRvcOperationalStateCountdownTime : public ReadAttribute {
+class ReadSmokeCoAlarmEventList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateCountdownTime()
-        : ReadAttribute("countdown-time")
+    ReadSmokeCoAlarmEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcOperationalStateCountdownTime()
+    ~ReadSmokeCoAlarmEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CountdownTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.CountdownTime response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState CountdownTime read Error", error);
+                LogNSError("SmokeCOAlarm EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64171,25 +65548,25 @@ class ReadRvcOperationalStateCountdownTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateCountdownTime()
-        : SubscribeAttribute("countdown-time")
+    SubscribeAttributeSmokeCoAlarmEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateCountdownTime()
+    ~SubscribeAttributeSmokeCoAlarmEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CountdownTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64200,10 +65577,10 @@ class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCountdownTimeWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.CountdownTime response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64220,34 +65597,34 @@ class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalStateList
+ * Attribute AttributeList
  */
-class ReadRvcOperationalStateOperationalStateList : public ReadAttribute {
+class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalStateList()
-        : ReadAttribute("operational-state-list")
+    ReadSmokeCoAlarmAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalStateList()
+    ~ReadSmokeCoAlarmAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalStateList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.OperationalStateList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState OperationalStateList read Error", error);
+                LogNSError("SmokeCOAlarm AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64256,25 +65633,25 @@ class ReadRvcOperationalStateOperationalStateList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalStateList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalStateList()
-        : SubscribeAttribute("operational-state-list")
+    SubscribeAttributeSmokeCoAlarmAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalStateList()
+    ~SubscribeAttributeSmokeCoAlarmAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalStateList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64285,10 +65662,10 @@ class SubscribeAttributeRvcOperationalStateOperationalStateList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalStateList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64305,34 +65682,34 @@ class SubscribeAttributeRvcOperationalStateOperationalStateList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalState
+ * Attribute FeatureMap
  */
-class ReadRvcOperationalStateOperationalState : public ReadAttribute {
+class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalState()
-        : ReadAttribute("operational-state")
+    ReadSmokeCoAlarmFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalState()
+    ~ReadSmokeCoAlarmFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.OperationalState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState OperationalState read Error", error);
+                LogNSError("SmokeCOAlarm FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64341,25 +65718,25 @@ class ReadRvcOperationalStateOperationalState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalState()
-        : SubscribeAttribute("operational-state")
+    SubscribeAttributeSmokeCoAlarmFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalState()
+    ~SubscribeAttributeSmokeCoAlarmFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalState::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64370,10 +65747,10 @@ class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalState response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64390,34 +65767,12533 @@ class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalError
+ * Attribute ClusterRevision
+ */
+class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadSmokeCoAlarmClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster DishwasherAlarm                                             | 0x005D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Reset                                                             |   0x00 |
+| * ModifyEnabledAlarms                                               |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Mask                                                              | 0x0000 |
+| * Latch                                                             | 0x0001 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Reset
+ */
+class DishwasherAlarmReset : public ClusterCommand {
+public:
+    DishwasherAlarmReset()
+        : ClusterCommand("reset")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("Alarms", 0, UINT32_MAX, &mRequest.alarms);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::Reset::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDishwasherAlarmClusterResetParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.alarms = [NSNumber numberWithUnsignedInt:mRequest.alarms.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetWithParams:params completion:
+                                                ^(NSError * _Nullable error) {
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ModifyEnabledAlarms
+ */
+class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
+public:
+    DishwasherAlarmModifyEnabledAlarms()
+        : ClusterCommand("modify-enabled-alarms")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("Mask", 0, UINT32_MAX, &mRequest.mask);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.mask = [NSNumber numberWithUnsignedInt:mRequest.mask.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster modifyEnabledAlarmsWithParams:params completion:
+                                                              ^(NSError * _Nullable error) {
+                                                                  responsesNeeded--;
+                                                                  if (error != nil) {
+                                                                      mError = error;
+                                                                      LogNSError("Error", error);
+                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                  }
+                                                                  if (responsesNeeded == 0) {
+                                                                      SetCommandExitStatus(mError);
+                                                                  }
+                                                              }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Mask
+ */
+class ReadDishwasherAlarmMask : public ReadAttribute {
+public:
+    ReadDishwasherAlarmMask()
+        : ReadAttribute("mask")
+    {
+    }
+
+    ~ReadDishwasherAlarmMask()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Mask::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm Mask read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmMask()
+        : SubscribeAttribute("mask")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmMask()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Mask::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeMaskWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Latch
+ */
+class ReadDishwasherAlarmLatch : public ReadAttribute {
+public:
+    ReadDishwasherAlarmLatch()
+        : ReadAttribute("latch")
+    {
+    }
+
+    ~ReadDishwasherAlarmLatch()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Latch::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm Latch read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmLatch()
+        : SubscribeAttribute("latch")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmLatch()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Latch::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeLatchWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute State
+ */
+class ReadDishwasherAlarmState : public ReadAttribute {
+public:
+    ReadDishwasherAlarmState()
+        : ReadAttribute("state")
+    {
+    }
+
+    ~ReadDishwasherAlarmState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::State::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.State response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm State read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmState()
+        : SubscribeAttribute("state")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::State::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.State response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Supported
+ */
+class ReadDishwasherAlarmSupported : public ReadAttribute {
+public:
+    ReadDishwasherAlarmSupported()
+        : ReadAttribute("supported")
+    {
+    }
+
+    ~ReadDishwasherAlarmSupported()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Supported::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.Supported response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm Supported read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmSupported()
+        : SubscribeAttribute("supported")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmSupported()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::Supported::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeSupportedWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.Supported response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadDishwasherAlarmGeneratedCommandList : public ReadAttribute {
+public:
+    ReadDishwasherAlarmGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadDishwasherAlarmGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadDishwasherAlarmAcceptedCommandList : public ReadAttribute {
+public:
+    ReadDishwasherAlarmAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadDishwasherAlarmAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadDishwasherAlarmEventList : public ReadAttribute {
+public:
+    ReadDishwasherAlarmEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadDishwasherAlarmEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadDishwasherAlarmAttributeList : public ReadAttribute {
+public:
+    ReadDishwasherAlarmAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadDishwasherAlarmAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadDishwasherAlarmFeatureMap : public ReadAttribute {
+public:
+    ReadDishwasherAlarmFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadDishwasherAlarmFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadDishwasherAlarmClusterRevision : public ReadAttribute {
+public:
+    ReadDishwasherAlarmClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadDishwasherAlarmClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DishwasherAlarm ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherAlarmClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherAlarmClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DishwasherAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DishwasherAlarm::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster MicrowaveOvenMode                                           | 0x005E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SupportedModes
+ */
+class ReadMicrowaveOvenModeSupportedModes : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeSupportedModes()
+        : ReadAttribute("supported-modes")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeSupportedModes()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::SupportedModes::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.SupportedModes response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode SupportedModes read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeSupportedModes : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeSupportedModes()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::SupportedModes::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeSupportedModesWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.SupportedModes response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CurrentMode
+ */
+class ReadMicrowaveOvenModeCurrentMode : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeCurrentMode()
+        : ReadAttribute("current-mode")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeCurrentMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::CurrentMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.CurrentMode response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode CurrentMode read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeCurrentMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeCurrentMode()
+        : SubscribeAttribute("current-mode")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeCurrentMode()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::CurrentMode::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCurrentModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.CurrentMode response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadMicrowaveOvenModeGeneratedCommandList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadMicrowaveOvenModeAcceptedCommandList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadMicrowaveOvenModeEventList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadMicrowaveOvenModeAttributeList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadMicrowaveOvenModeFeatureMap : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadMicrowaveOvenModeClusterRevision : public ReadAttribute {
+public:
+    ReadMicrowaveOvenModeClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadMicrowaveOvenModeClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenMode.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenMode ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenModeClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenModeClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenModeClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenMode::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenMode.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster MicrowaveOvenControl                                        | 0x005F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SetCookingParameters                                              |   0x00 |
+| * AddMoreTime                                                       |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CookTime                                                          | 0x0001 |
+| * PowerSetting                                                      | 0x0002 |
+| * MinPower                                                          | 0x0003 |
+| * MaxPower                                                          | 0x0004 |
+| * PowerStep                                                         | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command SetCookingParameters
+ */
+class MicrowaveOvenControlSetCookingParameters : public ClusterCommand {
+public:
+    MicrowaveOvenControlSetCookingParameters()
+        : ClusterCommand("set-cooking-parameters")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("CookMode", 0, UINT8_MAX, &mRequest.cookMode);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("CookTime", 0, UINT32_MAX, &mRequest.cookTime);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("PowerSetting", 0, UINT8_MAX, &mRequest.powerSetting);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRMicrowaveOvenControlClusterSetCookingParametersParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.cookMode.HasValue()) {
+            params.cookMode = [NSNumber numberWithUnsignedChar:mRequest.cookMode.Value()];
+        } else {
+            params.cookMode = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.cookTime.HasValue()) {
+            params.cookTime = [NSNumber numberWithUnsignedInt:mRequest.cookTime.Value()];
+        } else {
+            params.cookTime = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.powerSetting.HasValue()) {
+            params.powerSetting = [NSNumber numberWithUnsignedChar:mRequest.powerSetting.Value()];
+        } else {
+            params.powerSetting = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setCookingParametersWithParams:params completion:
+                                                               ^(NSError * _Nullable error) {
+                                                                   responsesNeeded--;
+                                                                   if (error != nil) {
+                                                                       mError = error;
+                                                                       LogNSError("Error", error);
+                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                   }
+                                                                   if (responsesNeeded == 0) {
+                                                                       SetCommandExitStatus(mError);
+                                                                   }
+                                                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command AddMoreTime
+ */
+class MicrowaveOvenControlAddMoreTime : public ClusterCommand {
+public:
+    MicrowaveOvenControlAddMoreTime()
+        : ClusterCommand("add-more-time")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("TimeToAdd", 0, UINT32_MAX, &mRequest.timeToAdd);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRMicrowaveOvenControlClusterAddMoreTimeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.timeToAdd = [NSNumber numberWithUnsignedInt:mRequest.timeToAdd];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addMoreTimeWithParams:params completion:
+                                                      ^(NSError * _Nullable error) {
+                                                          responsesNeeded--;
+                                                          if (error != nil) {
+                                                              mError = error;
+                                                              LogNSError("Error", error);
+                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                          }
+                                                          if (responsesNeeded == 0) {
+                                                              SetCommandExitStatus(mError);
+                                                          }
+                                                      }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CookTime
+ */
+class ReadMicrowaveOvenControlCookTime : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlCookTime()
+        : ReadAttribute("cook-time")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlCookTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::CookTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCookTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.CookTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl CookTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlCookTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlCookTime()
+        : SubscribeAttribute("cook-time")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlCookTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::CookTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCookTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.CookTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute PowerSetting
+ */
+class ReadMicrowaveOvenControlPowerSetting : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlPowerSetting()
+        : ReadAttribute("power-setting")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlPowerSetting()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::PowerSetting::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributePowerSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.PowerSetting response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl PowerSetting read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlPowerSetting : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlPowerSetting()
+        : SubscribeAttribute("power-setting")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlPowerSetting()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::PowerSetting::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributePowerSettingWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.PowerSetting response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute MinPower
+ */
+class ReadMicrowaveOvenControlMinPower : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlMinPower()
+        : ReadAttribute("min-power")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlMinPower()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::MinPower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMinPowerWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.MinPower response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl MinPower read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlMinPower : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlMinPower()
+        : SubscribeAttribute("min-power")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlMinPower()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::MinPower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeMinPowerWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.MinPower response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute MaxPower
+ */
+class ReadMicrowaveOvenControlMaxPower : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlMaxPower()
+        : ReadAttribute("max-power")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlMaxPower()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::MaxPower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaxPowerWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.MaxPower response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl MaxPower read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlMaxPower : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlMaxPower()
+        : SubscribeAttribute("max-power")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlMaxPower()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::MaxPower::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeMaxPowerWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.MaxPower response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute PowerStep
+ */
+class ReadMicrowaveOvenControlPowerStep : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlPowerStep()
+        : ReadAttribute("power-step")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlPowerStep()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::PowerStep::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributePowerStepWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.PowerStep response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl PowerStep read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlPowerStep : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlPowerStep()
+        : SubscribeAttribute("power-step")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlPowerStep()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::PowerStep::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributePowerStepWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.PowerStep response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadMicrowaveOvenControlGeneratedCommandList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadMicrowaveOvenControlAcceptedCommandList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadMicrowaveOvenControlEventList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadMicrowaveOvenControlAttributeList : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadMicrowaveOvenControlFeatureMap : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadMicrowaveOvenControlClusterRevision : public ReadAttribute {
+public:
+    ReadMicrowaveOvenControlClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadMicrowaveOvenControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MicrowaveOvenControl.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("MicrowaveOvenControl ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeMicrowaveOvenControlClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeMicrowaveOvenControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeMicrowaveOvenControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::MicrowaveOvenControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MicrowaveOvenControl.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster OperationalState                                            | 0x0060 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Pause
+ */
+class OperationalStatePause : public ClusterCommand {
+public:
+    OperationalStatePause()
+        : ClusterCommand("pause")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Pause::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROperationalStateClusterPauseParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster pauseWithParams:params completion:
+                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Stop
+ */
+class OperationalStateStop : public ClusterCommand {
+public:
+    OperationalStateStop()
+        : ClusterCommand("stop")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Stop::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROperationalStateClusterStopParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopWithParams:params completion:
+                                               ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                   NSLog(@"Values: %@", values);
+                                                   if (error == nil) {
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                   }
+                                                   responsesNeeded--;
+                                                   if (error != nil) {
+                                                       mError = error;
+                                                       LogNSError("Error", error);
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                   }
+                                                   if (responsesNeeded == 0) {
+                                                       SetCommandExitStatus(mError);
+                                                   }
+                                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Start
+ */
+class OperationalStateStart : public ClusterCommand {
+public:
+    OperationalStateStart()
+        : ClusterCommand("start")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Start::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROperationalStateClusterStartParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startWithParams:params completion:
+                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Resume
+ */
+class OperationalStateResume : public ClusterCommand {
+public:
+    OperationalStateResume()
+        : ClusterCommand("resume")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::OperationalState::Commands::Resume::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTROperationalStateClusterResumeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resumeWithParams:params completion:
+                                                 ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                     NSLog(@"Values: %@", values);
+                                                     if (error == nil) {
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                     }
+                                                     responsesNeeded--;
+                                                     if (error != nil) {
+                                                         mError = error;
+                                                         LogNSError("Error", error);
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                     }
+                                                     if (responsesNeeded == 0) {
+                                                         SetCommandExitStatus(mError);
+                                                     }
+                                                 }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute PhaseList
+ */
+class ReadOperationalStatePhaseList : public ReadAttribute {
+public:
+    ReadOperationalStatePhaseList()
+        : ReadAttribute("phase-list")
+    {
+    }
+
+    ~ReadOperationalStatePhaseList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::PhaseList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.PhaseList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState PhaseList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStatePhaseList()
+        : SubscribeAttribute("phase-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStatePhaseList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::PhaseList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributePhaseListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.PhaseList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CurrentPhase
+ */
+class ReadOperationalStateCurrentPhase : public ReadAttribute {
+public:
+    ReadOperationalStateCurrentPhase()
+        : ReadAttribute("current-phase")
+    {
+    }
+
+    ~ReadOperationalStateCurrentPhase()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::CurrentPhase::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.CurrentPhase response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState CurrentPhase read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateCurrentPhase()
+        : SubscribeAttribute("current-phase")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateCurrentPhase()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::CurrentPhase::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCurrentPhaseWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.CurrentPhase response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CountdownTime
+ */
+class ReadOperationalStateCountdownTime : public ReadAttribute {
+public:
+    ReadOperationalStateCountdownTime()
+        : ReadAttribute("countdown-time")
+    {
+    }
+
+    ~ReadOperationalStateCountdownTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::CountdownTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.CountdownTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState CountdownTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateCountdownTime()
+        : SubscribeAttribute("countdown-time")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateCountdownTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::CountdownTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCountdownTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.CountdownTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalStateList
+ */
+class ReadOperationalStateOperationalStateList : public ReadAttribute {
+public:
+    ReadOperationalStateOperationalStateList()
+        : ReadAttribute("operational-state-list")
+    {
+    }
+
+    ~ReadOperationalStateOperationalStateList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalStateList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.OperationalStateList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState OperationalStateList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateOperationalStateList()
+        : SubscribeAttribute("operational-state-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateOperationalStateList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalStateList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalStateListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.OperationalStateList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalState
+ */
+class ReadOperationalStateOperationalState : public ReadAttribute {
+public:
+    ReadOperationalStateOperationalState()
+        : ReadAttribute("operational-state")
+    {
+    }
+
+    ~ReadOperationalStateOperationalState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.OperationalState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState OperationalState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateOperationalState()
+        : SubscribeAttribute("operational-state")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateOperationalState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.OperationalState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalError
+ */
+class ReadOperationalStateOperationalError : public ReadAttribute {
+public:
+    ReadOperationalStateOperationalError()
+        : ReadAttribute("operational-error")
+    {
+    }
+
+    ~ReadOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalErrorWithCompletion:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.OperationalError response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState OperationalError read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateOperationalError()
+        : SubscribeAttribute("operational-error")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalErrorWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.OperationalError response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadOperationalStateGeneratedCommandList : public ReadAttribute {
+public:
+    ReadOperationalStateGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadOperationalStateGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadOperationalStateAcceptedCommandList : public ReadAttribute {
+public:
+    ReadOperationalStateAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadOperationalStateAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadOperationalStateEventList : public ReadAttribute {
+public:
+    ReadOperationalStateEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadOperationalStateEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadOperationalStateAttributeList : public ReadAttribute {
+public:
+    ReadOperationalStateAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadOperationalStateAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadOperationalStateFeatureMap : public ReadAttribute {
+public:
+    ReadOperationalStateFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadOperationalStateFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadOperationalStateClusterRevision : public ReadAttribute {
+public:
+    ReadOperationalStateClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadOperationalStateClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::OperationalState::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("OperationalState ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalStateClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeOperationalStateClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::OperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::OperationalState::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster RvcOperationalState                                         | 0x0061 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Pause                                                             |   0x00 |
+| * Stop                                                              |   0x01 |
+| * Start                                                             |   0x02 |
+| * Resume                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * PhaseList                                                         | 0x0000 |
+| * CurrentPhase                                                      | 0x0001 |
+| * CountdownTime                                                     | 0x0002 |
+| * OperationalStateList                                              | 0x0003 |
+| * OperationalState                                                  | 0x0004 |
+| * OperationalError                                                  | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * OperationalError                                                  | 0x0000 |
+| * OperationCompletion                                               | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Pause
+ */
+class RvcOperationalStatePause : public ClusterCommand {
+public:
+    RvcOperationalStatePause()
+        : ClusterCommand("pause")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCOperationalStateClusterPauseParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster pauseWithParams:params completion:
+                                                ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Stop
+ */
+class RvcOperationalStateStop : public ClusterCommand {
+public:
+    RvcOperationalStateStop()
+        : ClusterCommand("stop")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCOperationalStateClusterStopParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopWithParams:params completion:
+                                               ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                   NSLog(@"Values: %@", values);
+                                                   if (error == nil) {
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                   }
+                                                   responsesNeeded--;
+                                                   if (error != nil) {
+                                                       mError = error;
+                                                       LogNSError("Error", error);
+                                                       constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                   }
+                                                   if (responsesNeeded == 0) {
+                                                       SetCommandExitStatus(mError);
+                                                   }
+                                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Start
+ */
+class RvcOperationalStateStart : public ClusterCommand {
+public:
+    RvcOperationalStateStart()
+        : ClusterCommand("start")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCOperationalStateClusterStartParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startWithParams:params completion:
+                                                ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    if (error == nil) {
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                    }
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Resume
+ */
+class RvcOperationalStateResume : public ClusterCommand {
+public:
+    RvcOperationalStateResume()
+        : ClusterCommand("resume")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resumeWithParams:params completion:
+                                                 ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                     NSLog(@"Values: %@", values);
+                                                     if (error == nil) {
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                     }
+                                                     responsesNeeded--;
+                                                     if (error != nil) {
+                                                         mError = error;
+                                                         LogNSError("Error", error);
+                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                     }
+                                                     if (responsesNeeded == 0) {
+                                                         SetCommandExitStatus(mError);
+                                                     }
+                                                 }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute PhaseList
+ */
+class ReadRvcOperationalStatePhaseList : public ReadAttribute {
+public:
+    ReadRvcOperationalStatePhaseList()
+        : ReadAttribute("phase-list")
+    {
+    }
+
+    ~ReadRvcOperationalStatePhaseList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::PhaseList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.PhaseList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState PhaseList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStatePhaseList()
+        : SubscribeAttribute("phase-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStatePhaseList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::PhaseList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributePhaseListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.PhaseList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CurrentPhase
+ */
+class ReadRvcOperationalStateCurrentPhase : public ReadAttribute {
+public:
+    ReadRvcOperationalStateCurrentPhase()
+        : ReadAttribute("current-phase")
+    {
+    }
+
+    ~ReadRvcOperationalStateCurrentPhase()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CurrentPhase::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.CurrentPhase response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState CurrentPhase read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateCurrentPhase()
+        : SubscribeAttribute("current-phase")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateCurrentPhase()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CurrentPhase::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCurrentPhaseWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.CurrentPhase response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CountdownTime
+ */
+class ReadRvcOperationalStateCountdownTime : public ReadAttribute {
+public:
+    ReadRvcOperationalStateCountdownTime()
+        : ReadAttribute("countdown-time")
+    {
+    }
+
+    ~ReadRvcOperationalStateCountdownTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CountdownTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.CountdownTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState CountdownTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateCountdownTime()
+        : SubscribeAttribute("countdown-time")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateCountdownTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::CountdownTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCountdownTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.CountdownTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalStateList
+ */
+class ReadRvcOperationalStateOperationalStateList : public ReadAttribute {
+public:
+    ReadRvcOperationalStateOperationalStateList()
+        : ReadAttribute("operational-state-list")
+    {
+    }
+
+    ~ReadRvcOperationalStateOperationalStateList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalStateList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.OperationalStateList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState OperationalStateList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateOperationalStateList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateOperationalStateList()
+        : SubscribeAttribute("operational-state-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateOperationalStateList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalStateList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalStateListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.OperationalStateList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalState
+ */
+class ReadRvcOperationalStateOperationalState : public ReadAttribute {
+public:
+    ReadRvcOperationalStateOperationalState()
+        : ReadAttribute("operational-state")
+    {
+    }
+
+    ~ReadRvcOperationalStateOperationalState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.OperationalState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState OperationalState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateOperationalState()
+        : SubscribeAttribute("operational-state")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateOperationalState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.OperationalState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OperationalError
+ */
+class ReadRvcOperationalStateOperationalError : public ReadAttribute {
+public:
+    ReadRvcOperationalStateOperationalError()
+        : ReadAttribute("operational-error")
+    {
+    }
+
+    ~ReadRvcOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOperationalErrorWithCompletion:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.OperationalError response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState OperationalError read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateOperationalError()
+        : SubscribeAttribute("operational-error")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateOperationalError()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalError::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOperationalErrorWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.OperationalError response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadRvcOperationalStateGeneratedCommandList : public ReadAttribute {
+public:
+    ReadRvcOperationalStateGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadRvcOperationalStateGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadRvcOperationalStateAcceptedCommandList : public ReadAttribute {
+public:
+    ReadRvcOperationalStateAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadRvcOperationalStateAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadRvcOperationalStateEventList : public ReadAttribute {
+public:
+    ReadRvcOperationalStateEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadRvcOperationalStateEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadRvcOperationalStateAttributeList : public ReadAttribute {
+public:
+    ReadRvcOperationalStateAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadRvcOperationalStateAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadRvcOperationalStateFeatureMap : public ReadAttribute {
+public:
+    ReadRvcOperationalStateFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadRvcOperationalStateFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadRvcOperationalStateClusterRevision : public ReadAttribute {
+public:
+    ReadRvcOperationalStateClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadRvcOperationalStateClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCOperationalState.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("RVCOperationalState ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeRvcOperationalStateClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeRvcOperationalStateClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RVCOperationalState.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster HepaFilterMonitoring                                        | 0x0071 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCondition                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Condition                                                         | 0x0000 |
+| * DegradationDirection                                              | 0x0001 |
+| * ChangeIndication                                                  | 0x0002 |
+| * InPlaceIndicator                                                  | 0x0003 |
+| * LastChangedTime                                                   | 0x0004 |
+| * ReplacementProductList                                            | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ResetCondition
+ */
+class HepaFilterMonitoringResetCondition : public ClusterCommand {
+public:
+    HepaFilterMonitoringResetCondition()
+        : ClusterCommand("reset-condition")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetConditionWithParams:params completion:
+                                                         ^(NSError * _Nullable error) {
+                                                             responsesNeeded--;
+                                                             if (error != nil) {
+                                                                 mError = error;
+                                                                 LogNSError("Error", error);
+                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                             }
+                                                             if (responsesNeeded == 0) {
+                                                                 SetCommandExitStatus(mError);
+                                                             }
+                                                         }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Condition
+ */
+class ReadHepaFilterMonitoringCondition : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringCondition()
+        : ReadAttribute("condition")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringCondition()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::Condition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.Condition response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring Condition read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringCondition()
+        : SubscribeAttribute("condition")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringCondition()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::Condition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeConditionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.Condition response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute DegradationDirection
+ */
+class ReadHepaFilterMonitoringDegradationDirection : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringDegradationDirection()
+        : ReadAttribute("degradation-direction")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringDegradationDirection()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::DegradationDirection::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring DegradationDirection read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringDegradationDirection()
+        : SubscribeAttribute("degradation-direction")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringDegradationDirection()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::DegradationDirection::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeDegradationDirectionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ChangeIndication
+ */
+class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringChangeIndication()
+        : ReadAttribute("change-indication")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringChangeIndication()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ChangeIndication::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring ChangeIndication read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringChangeIndication()
+        : SubscribeAttribute("change-indication")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringChangeIndication()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ChangeIndication::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeChangeIndicationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute InPlaceIndicator
+ */
+class ReadHepaFilterMonitoringInPlaceIndicator : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringInPlaceIndicator()
+        : ReadAttribute("in-place-indicator")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringInPlaceIndicator()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::InPlaceIndicator::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring InPlaceIndicator read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
+        : SubscribeAttribute("in-place-indicator")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::InPlaceIndicator::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute LastChangedTime
+ */
+class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringLastChangedTime()
+        : ReadAttribute("last-changed-time")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring LastChangedTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
+public:
+    WriteHepaFilterMonitoringLastChangedTime()
+        : WriteAttribute("last-changed-time")
+    {
+        AddArgument("attr-name", "last-changed-time");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteHepaFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
+        }
+
+        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("HEPAFilterMonitoring LastChangedTime write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint32_t> mValue;
+};
+
+class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringLastChangedTime()
+        : SubscribeAttribute("last-changed-time")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeLastChangedTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ReplacementProductList
+ */
+class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringReplacementProductList()
+        : ReadAttribute("replacement-product-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringReplacementProductList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ReplacementProductList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.ReplacementProductList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring ReplacementProductList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringReplacementProductList()
+        : SubscribeAttribute("replacement-product-list")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringReplacementProductList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ReplacementProductList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeReplacementProductListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.ReplacementProductList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadHepaFilterMonitoringEventList : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
+public:
+    ReadHepaFilterMonitoringClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("HEPAFilterMonitoring ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeHepaFilterMonitoringClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeHepaFilterMonitoringClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster ActivatedCarbonFilterMonitoring                             | 0x0072 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCondition                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Condition                                                         | 0x0000 |
+| * DegradationDirection                                              | 0x0001 |
+| * ChangeIndication                                                  | 0x0002 |
+| * InPlaceIndicator                                                  | 0x0003 |
+| * LastChangedTime                                                   | 0x0004 |
+| * ReplacementProductList                                            | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ResetCondition
+ */
+class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand {
+public:
+    ActivatedCarbonFilterMonitoringResetCondition()
+        : ClusterCommand("reset-condition")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetConditionWithParams:params completion:
+                                                         ^(NSError * _Nullable error) {
+                                                             responsesNeeded--;
+                                                             if (error != nil) {
+                                                                 mError = error;
+                                                                 LogNSError("Error", error);
+                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                             }
+                                                             if (responsesNeeded == 0) {
+                                                                 SetCommandExitStatus(mError);
+                                                             }
+                                                         }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Condition
+ */
+class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringCondition()
+        : ReadAttribute("condition")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringCondition()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::Condition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring Condition read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
+        : SubscribeAttribute("condition")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::Condition::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeConditionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute DegradationDirection
+ */
+class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringDegradationDirection()
+        : ReadAttribute("degradation-direction")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringDegradationDirection()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring DegradationDirection read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
+        : SubscribeAttribute("degradation-direction")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeDegradationDirectionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ChangeIndication
+ */
+class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringChangeIndication()
+        : ReadAttribute("change-indication")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringChangeIndication()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring ChangeIndication read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
+        : SubscribeAttribute("change-indication")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeChangeIndicationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute InPlaceIndicator
+ */
+class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
+        : ReadAttribute("in-place-indicator")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring InPlaceIndicator read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
+        : SubscribeAttribute("in-place-indicator")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute LastChangedTime
+ */
+class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringLastChangedTime()
+        : ReadAttribute("last-changed-time")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteActivatedCarbonFilterMonitoringLastChangedTime : public WriteAttribute {
+public:
+    WriteActivatedCarbonFilterMonitoringLastChangedTime()
+        : WriteAttribute("last-changed-time")
+    {
+        AddArgument("attr-name", "last-changed-time");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteActivatedCarbonFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
+        }
+
+        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint32_t> mValue;
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
+        : SubscribeAttribute("last-changed-time")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeLastChangedTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ReplacementProductList
+ */
+class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringReplacementProductList()
+        : ReadAttribute("replacement-product-list")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringReplacementProductList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.ReplacementProductList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring ReplacementProductList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
+        : SubscribeAttribute("replacement-product-list")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeReplacementProductListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.ReplacementProductList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute {
+public:
+    ReadActivatedCarbonFilterMonitoringClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadActivatedCarbonFilterMonitoringClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ActivatedCarbonFilterMonitoring ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster BooleanSensorConfiguration                                  | 0x0080 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SuppressRequest                                                   |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SensitivityLevel                                                  | 0x0000 |
+| * AlarmsActive                                                      | 0x0001 |
+| * AlarmsSuppressed                                                  | 0x0002 |
+| * AlarmsEnabled                                                     | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * AlarmsStateChanged                                                | 0x0000 |
+| * SensorFault                                                       | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command SuppressRequest
+ */
+class BooleanSensorConfigurationSuppressRequest : public ClusterCommand {
+public:
+    BooleanSensorConfigurationSuppressRequest()
+        : ClusterCommand("suppress-request")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("AlarmsToSuppress", 0, UINT8_MAX, &mRequest.alarmsToSuppress);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRBooleanSensorConfigurationClusterSuppressRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.alarmsToSuppress = [NSNumber numberWithUnsignedChar:mRequest.alarmsToSuppress.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster suppressRequestWithParams:params completion:
+                                                          ^(NSError * _Nullable error) {
+                                                              responsesNeeded--;
+                                                              if (error != nil) {
+                                                                  mError = error;
+                                                                  LogNSError("Error", error);
+                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                              }
+                                                              if (responsesNeeded == 0) {
+                                                                  SetCommandExitStatus(mError);
+                                                              }
+                                                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SensitivityLevel
+ */
+class ReadBooleanSensorConfigurationSensitivityLevel : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationSensitivityLevel()
+        : ReadAttribute("sensitivity-level")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::SensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSensitivityLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.SensitivityLevel response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration SensitivityLevel read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteBooleanSensorConfigurationSensitivityLevel : public WriteAttribute {
+public:
+    WriteBooleanSensorConfigurationSensitivityLevel()
+        : WriteAttribute("sensitivity-level")
+    {
+        AddArgument("attr-name", "sensitivity-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteBooleanSensorConfigurationSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::SensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSensitivityLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("BooleanSensorConfiguration SensitivityLevel write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeBooleanSensorConfigurationSensitivityLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationSensitivityLevel()
+        : SubscribeAttribute("sensitivity-level")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationSensitivityLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::SensitivityLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeSensitivityLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.SensitivityLevel response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AlarmsActive
+ */
+class ReadBooleanSensorConfigurationAlarmsActive : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationAlarmsActive()
+        : ReadAttribute("alarms-active")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationAlarmsActive()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsActive::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAlarmsActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.AlarmsActive response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration AlarmsActive read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationAlarmsActive : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationAlarmsActive()
+        : SubscribeAttribute("alarms-active")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationAlarmsActive()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsActive::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAlarmsActiveWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AlarmsActive response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AlarmsSuppressed
+ */
+class ReadBooleanSensorConfigurationAlarmsSuppressed : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationAlarmsSuppressed()
+        : ReadAttribute("alarms-suppressed")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationAlarmsSuppressed()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsSuppressed::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAlarmsSuppressedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.AlarmsSuppressed response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration AlarmsSuppressed read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed()
+        : SubscribeAttribute("alarms-suppressed")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsSuppressed::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAlarmsSuppressedWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AlarmsSuppressed response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AlarmsEnabled
+ */
+class ReadBooleanSensorConfigurationAlarmsEnabled : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationAlarmsEnabled()
+        : ReadAttribute("alarms-enabled")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationAlarmsEnabled()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsEnabled::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAlarmsEnabledWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.AlarmsEnabled response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration AlarmsEnabled read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteBooleanSensorConfigurationAlarmsEnabled : public WriteAttribute {
+public:
+    WriteBooleanSensorConfigurationAlarmsEnabled()
+        : WriteAttribute("alarms-enabled")
+    {
+        AddArgument("attr-name", "alarms-enabled");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteBooleanSensorConfigurationAlarmsEnabled()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsEnabled::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeAlarmsEnabledWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("BooleanSensorConfiguration AlarmsEnabled write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeBooleanSensorConfigurationAlarmsEnabled : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationAlarmsEnabled()
+        : SubscribeAttribute("alarms-enabled")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationAlarmsEnabled()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AlarmsEnabled::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAlarmsEnabledWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AlarmsEnabled response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadBooleanSensorConfigurationGeneratedCommandList : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadBooleanSensorConfigurationAcceptedCommandList : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadBooleanSensorConfigurationEventList : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadBooleanSensorConfigurationAttributeList : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadBooleanSensorConfigurationFeatureMap : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadBooleanSensorConfigurationClusterRevision : public ReadAttribute {
+public:
+    ReadBooleanSensorConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanSensorConfiguration.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("BooleanSensorConfiguration ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBooleanSensorConfigurationClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeBooleanSensorConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeBooleanSensorConfigurationClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::BooleanSensorConfiguration::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterBooleanSensorConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster ValveConfigurationAndControl                                | 0x0081 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Open                                                              |   0x00 |
+| * Close                                                             |   0x01 |
+| * SetLevel                                                          |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * OpenDuration                                                      | 0x0000 |
+| * AutoCloseTime                                                     | 0x0001 |
+| * RemainingDuration                                                 | 0x0002 |
+| * CurrentState                                                      | 0x0003 |
+| * TargetState                                                       | 0x0004 |
+| * StartUpState                                                      | 0x0005 |
+| * CurrentLevel                                                      | 0x0006 |
+| * TargetLevel                                                       | 0x0007 |
+| * OpenLevel                                                         | 0x0008 |
+| * ValveFault                                                        | 0x0009 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * ValveStateChanged                                                 | 0x0000 |
+| * ValveFault                                                        | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Open
+ */
+class ValveConfigurationAndControlOpen : public ClusterCommand {
+public:
+    ValveConfigurationAndControlOpen()
+        : ClusterCommand("open")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("OpenDuration", 0, UINT32_MAX, &mRequest.openDuration);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRValveConfigurationAndControlClusterOpenParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.openDuration.HasValue()) {
+            params.openDuration = [NSNumber numberWithUnsignedInt:mRequest.openDuration.Value()];
+        } else {
+            params.openDuration = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster openWithParams:params completion:
+                                               ^(NSError * _Nullable error) {
+                                                   responsesNeeded--;
+                                                   if (error != nil) {
+                                                       mError = error;
+                                                       LogNSError("Error", error);
+                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                   }
+                                                   if (responsesNeeded == 0) {
+                                                       SetCommandExitStatus(mError);
+                                                   }
+                                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Close
+ */
+class ValveConfigurationAndControlClose : public ClusterCommand {
+public:
+    ValveConfigurationAndControlClose()
+        : ClusterCommand("close")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRValveConfigurationAndControlClusterCloseParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster closeWithParams:params completion:
+                                                ^(NSError * _Nullable error) {
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command SetLevel
+ */
+class ValveConfigurationAndControlSetLevel : public ClusterCommand {
+public:
+    ValveConfigurationAndControlSetLevel()
+        : ClusterCommand("set-level")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("OpenDuration", 0, UINT32_MAX, &mRequest.openDuration);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRValveConfigurationAndControlClusterSetLevelParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.openDuration.HasValue()) {
+            params.openDuration = [NSNumber numberWithUnsignedInt:mRequest.openDuration.Value()];
+        } else {
+            params.openDuration = nil;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setLevelWithParams:params completion:
+                                                   ^(NSError * _Nullable error) {
+                                                       responsesNeeded--;
+                                                       if (error != nil) {
+                                                           mError = error;
+                                                           LogNSError("Error", error);
+                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                       }
+                                                       if (responsesNeeded == 0) {
+                                                           SetCommandExitStatus(mError);
+                                                       }
+                                                   }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OpenDuration
+ */
+class ReadValveConfigurationAndControlOpenDuration : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlOpenDuration()
+        : ReadAttribute("open-duration")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlOpenDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOpenDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.OpenDuration response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl OpenDuration read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteValveConfigurationAndControlOpenDuration : public WriteAttribute {
+public:
+    WriteValveConfigurationAndControlOpenDuration()
+        : WriteAttribute("open-duration")
+    {
+        AddArgument("attr-name", "open-duration");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteValveConfigurationAndControlOpenDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
+        }
+
+        [cluster writeAttributeOpenDurationWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("ValveConfigurationAndControl OpenDuration write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint32_t> mValue;
+};
+
+class SubscribeAttributeValveConfigurationAndControlOpenDuration : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlOpenDuration()
+        : SubscribeAttribute("open-duration")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlOpenDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOpenDurationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.OpenDuration response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AutoCloseTime
+ */
+class ReadValveConfigurationAndControlAutoCloseTime : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlAutoCloseTime()
+        : ReadAttribute("auto-close-time")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlAutoCloseTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AutoCloseTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAutoCloseTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.AutoCloseTime response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl AutoCloseTime read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlAutoCloseTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlAutoCloseTime()
+        : SubscribeAttribute("auto-close-time")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlAutoCloseTime()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AutoCloseTime::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAutoCloseTimeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.AutoCloseTime response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute RemainingDuration
+ */
+class ReadValveConfigurationAndControlRemainingDuration : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlRemainingDuration()
+        : ReadAttribute("remaining-duration")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlRemainingDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::RemainingDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeRemainingDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.RemainingDuration response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl RemainingDuration read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlRemainingDuration : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlRemainingDuration()
+        : SubscribeAttribute("remaining-duration")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlRemainingDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::RemainingDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeRemainingDurationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.RemainingDuration response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CurrentState
+ */
+class ReadValveConfigurationAndControlCurrentState : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlCurrentState()
+        : ReadAttribute("current-state")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlCurrentState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::CurrentState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.CurrentState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl CurrentState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlCurrentState : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlCurrentState()
+        : SubscribeAttribute("current-state")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlCurrentState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::CurrentState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCurrentStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.CurrentState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute TargetState
+ */
+class ReadValveConfigurationAndControlTargetState : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlTargetState()
+        : ReadAttribute("target-state")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlTargetState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::TargetState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTargetStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.TargetState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl TargetState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlTargetState : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlTargetState()
+        : SubscribeAttribute("target-state")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlTargetState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::TargetState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeTargetStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.TargetState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute StartUpState
+ */
+class ReadValveConfigurationAndControlStartUpState : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlStartUpState()
+        : ReadAttribute("start-up-state")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlStartUpState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::StartUpState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStartUpStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.StartUpState response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl StartUpState read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteValveConfigurationAndControlStartUpState : public WriteAttribute {
+public:
+    WriteValveConfigurationAndControlStartUpState()
+        : WriteAttribute("start-up-state")
+    {
+        AddArgument("attr-name", "start-up-state");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteValveConfigurationAndControlStartUpState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::StartUpState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeStartUpStateWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("ValveConfigurationAndControl StartUpState write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeValveConfigurationAndControlStartUpState : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlStartUpState()
+        : SubscribeAttribute("start-up-state")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlStartUpState()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::StartUpState::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeStartUpStateWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.StartUpState response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute CurrentLevel
+ */
+class ReadValveConfigurationAndControlCurrentLevel : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlCurrentLevel()
+        : ReadAttribute("current-level")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlCurrentLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::CurrentLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.CurrentLevel response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl CurrentLevel read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlCurrentLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlCurrentLevel()
+        : SubscribeAttribute("current-level")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlCurrentLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::CurrentLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeCurrentLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.CurrentLevel response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute TargetLevel
+ */
+class ReadValveConfigurationAndControlTargetLevel : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlTargetLevel()
+        : ReadAttribute("target-level")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlTargetLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::TargetLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeTargetLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.TargetLevel response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl TargetLevel read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlTargetLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlTargetLevel()
+        : SubscribeAttribute("target-level")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlTargetLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::TargetLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeTargetLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.TargetLevel response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute OpenLevel
+ */
+class ReadValveConfigurationAndControlOpenLevel : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlOpenLevel()
+        : ReadAttribute("open-level")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlOpenLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOpenLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.OpenLevel response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl OpenLevel read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteValveConfigurationAndControlOpenLevel : public WriteAttribute {
+public:
+    WriteValveConfigurationAndControlOpenLevel()
+        : WriteAttribute("open-level")
+    {
+        AddArgument("attr-name", "open-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteValveConfigurationAndControlOpenLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
+
+        [cluster writeAttributeOpenLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("ValveConfigurationAndControl OpenLevel write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<chip::Percent> mValue;
+};
+
+class SubscribeAttributeValveConfigurationAndControlOpenLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlOpenLevel()
+        : SubscribeAttribute("open-level")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlOpenLevel()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenLevel::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeOpenLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.OpenLevel response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ValveFault
+ */
+class ReadValveConfigurationAndControlValveFault : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlValveFault()
+        : ReadAttribute("valve-fault")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlValveFault()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::ValveFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeValveFaultWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.ValveFault response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl ValveFault read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlValveFault : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlValveFault()
+        : SubscribeAttribute("valve-fault")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlValveFault()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::ValveFault::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeValveFaultWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.ValveFault response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadValveConfigurationAndControlGeneratedCommandList : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadValveConfigurationAndControlAcceptedCommandList : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadValveConfigurationAndControlEventList : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadValveConfigurationAndControlAttributeList : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadValveConfigurationAndControlFeatureMap : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadValveConfigurationAndControlClusterRevision : public ReadAttribute {
+public:
+    ReadValveConfigurationAndControlClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ValveConfigurationAndControl.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ValveConfigurationAndControl ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeValveConfigurationAndControlClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeValveConfigurationAndControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeValveConfigurationAndControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::ValveConfigurationAndControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ValveConfigurationAndControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ValveConfigurationAndControl.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster DemandResponseLoadControl                                   | 0x0096 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * RegisterLoadControlProgramRequest                                 |   0x00 |
+| * UnregisterLoadControlProgramRequest                               |   0x01 |
+| * AddLoadControlEventRequest                                        |   0x02 |
+| * RemoveLoadControlEventRequest                                     |   0x03 |
+| * ClearLoadControlEventsRequest                                     |   0x04 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * LoadControlPrograms                                               | 0x0000 |
+| * NumberOfLoadControlPrograms                                       | 0x0001 |
+| * Events                                                            | 0x0002 |
+| * ActiveEvents                                                      | 0x0003 |
+| * NumberOfEventsPerProgram                                          | 0x0004 |
+| * NumberOfTransitions                                               | 0x0005 |
+| * DefaultRandomStart                                                | 0x0006 |
+| * DefaultRandomDuration                                             | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * LoadControlEventStatusChange                                      | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command RegisterLoadControlProgramRequest
+ */
+class DemandResponseLoadControlRegisterLoadControlProgramRequest : public ClusterCommand {
+public:
+    DemandResponseLoadControlRegisterLoadControlProgramRequest()
+        : ClusterCommand("register-load-control-program-request")
+        , mComplex_LoadControlProgram(&mRequest.loadControlProgram)
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("LoadControlProgram", &mComplex_LoadControlProgram);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.loadControlProgram = [MTRDemandResponseLoadControlClusterLoadControlProgramStruct new];
+        params.loadControlProgram.programID = [NSData dataWithBytes:mRequest.loadControlProgram.programID.data() length:mRequest.loadControlProgram.programID.size()];
+        params.loadControlProgram.name = [[NSString alloc] initWithBytes:mRequest.loadControlProgram.name.data() length:mRequest.loadControlProgram.name.size() encoding:NSUTF8StringEncoding];
+        if (mRequest.loadControlProgram.enrollmentGroup.IsNull()) {
+            params.loadControlProgram.enrollmentGroup = nil;
+        } else {
+            params.loadControlProgram.enrollmentGroup = [NSNumber numberWithUnsignedChar:mRequest.loadControlProgram.enrollmentGroup.Value()];
+        }
+        if (mRequest.loadControlProgram.randomStartMinutes.IsNull()) {
+            params.loadControlProgram.randomStartMinutes = nil;
+        } else {
+            params.loadControlProgram.randomStartMinutes = [NSNumber numberWithUnsignedChar:mRequest.loadControlProgram.randomStartMinutes.Value()];
+        }
+        if (mRequest.loadControlProgram.randomDurationMinutes.IsNull()) {
+            params.loadControlProgram.randomDurationMinutes = nil;
+        } else {
+            params.loadControlProgram.randomDurationMinutes = [NSNumber numberWithUnsignedChar:mRequest.loadControlProgram.randomDurationMinutes.Value()];
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster registerLoadControlProgramRequestWithParams:params completion:
+                                                                            ^(NSError * _Nullable error) {
+                                                                                responsesNeeded--;
+                                                                                if (error != nil) {
+                                                                                    mError = error;
+                                                                                    LogNSError("Error", error);
+                                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                                }
+                                                                                if (responsesNeeded == 0) {
+                                                                                    SetCommandExitStatus(mError);
+                                                                                }
+                                                                            }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type> mComplex_LoadControlProgram;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command UnregisterLoadControlProgramRequest
+ */
+class DemandResponseLoadControlUnregisterLoadControlProgramRequest : public ClusterCommand {
+public:
+    DemandResponseLoadControlUnregisterLoadControlProgramRequest()
+        : ClusterCommand("unregister-load-control-program-request")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("LoadControlProgramID", &mRequest.loadControlProgramID);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.loadControlProgramID = [NSData dataWithBytes:mRequest.loadControlProgramID.data() length:mRequest.loadControlProgramID.size()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster unregisterLoadControlProgramRequestWithParams:params completion:
+                                                                              ^(NSError * _Nullable error) {
+                                                                                  responsesNeeded--;
+                                                                                  if (error != nil) {
+                                                                                      mError = error;
+                                                                                      LogNSError("Error", error);
+                                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                                  }
+                                                                                  if (responsesNeeded == 0) {
+                                                                                      SetCommandExitStatus(mError);
+                                                                                  }
+                                                                              }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command AddLoadControlEventRequest
+ */
+class DemandResponseLoadControlAddLoadControlEventRequest : public ClusterCommand {
+public:
+    DemandResponseLoadControlAddLoadControlEventRequest()
+        : ClusterCommand("add-load-control-event-request")
+        , mComplex_Event(&mRequest.event)
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("Event", &mComplex_Event);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.event = [MTRDemandResponseLoadControlClusterLoadControlEventStruct new];
+        params.event.eventID = [NSData dataWithBytes:mRequest.event.eventID.data() length:mRequest.event.eventID.size()];
+        if (mRequest.event.programID.IsNull()) {
+            params.event.programID = nil;
+        } else {
+            params.event.programID = [NSData dataWithBytes:mRequest.event.programID.Value().data() length:mRequest.event.programID.Value().size()];
+        }
+        params.event.control = [NSNumber numberWithUnsignedShort:mRequest.event.control.Raw()];
+        params.event.deviceClass = [NSNumber numberWithUnsignedInt:mRequest.event.deviceClass.Raw()];
+        if (mRequest.event.enrollmentGroup.HasValue()) {
+            params.event.enrollmentGroup = [NSNumber numberWithUnsignedChar:mRequest.event.enrollmentGroup.Value()];
+        } else {
+            params.event.enrollmentGroup = nil;
+        }
+        params.event.criticality = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.event.criticality)];
+        if (mRequest.event.startTime.IsNull()) {
+            params.event.startTime = nil;
+        } else {
+            params.event.startTime = [NSNumber numberWithUnsignedInt:mRequest.event.startTime.Value()];
+        }
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.event.transitions) {
+                MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct * newElement_1;
+                newElement_1 = [MTRDemandResponseLoadControlClusterLoadControlEventTransitionStruct new];
+                newElement_1.duration = [NSNumber numberWithUnsignedShort:entry_1.duration];
+                newElement_1.control = [NSNumber numberWithUnsignedShort:entry_1.control.Raw()];
+                if (entry_1.temperatureControl.HasValue()) {
+                    newElement_1.temperatureControl = [MTRDemandResponseLoadControlClusterTemperatureControlStruct new];
+                    if (entry_1.temperatureControl.Value().coolingTempOffset.HasValue()) {
+                        if (entry_1.temperatureControl.Value().coolingTempOffset.Value().IsNull()) {
+                            newElement_1.temperatureControl.coolingTempOffset = nil;
+                        } else {
+                            newElement_1.temperatureControl.coolingTempOffset = [NSNumber numberWithUnsignedShort:entry_1.temperatureControl.Value().coolingTempOffset.Value().Value()];
+                        }
+                    } else {
+                        newElement_1.temperatureControl.coolingTempOffset = nil;
+                    }
+                    if (entry_1.temperatureControl.Value().heatingtTempOffset.HasValue()) {
+                        if (entry_1.temperatureControl.Value().heatingtTempOffset.Value().IsNull()) {
+                            newElement_1.temperatureControl.heatingtTempOffset = nil;
+                        } else {
+                            newElement_1.temperatureControl.heatingtTempOffset = [NSNumber numberWithUnsignedShort:entry_1.temperatureControl.Value().heatingtTempOffset.Value().Value()];
+                        }
+                    } else {
+                        newElement_1.temperatureControl.heatingtTempOffset = nil;
+                    }
+                    if (entry_1.temperatureControl.Value().coolingTempSetpoint.HasValue()) {
+                        if (entry_1.temperatureControl.Value().coolingTempSetpoint.Value().IsNull()) {
+                            newElement_1.temperatureControl.coolingTempSetpoint = nil;
+                        } else {
+                            newElement_1.temperatureControl.coolingTempSetpoint = [NSNumber numberWithShort:entry_1.temperatureControl.Value().coolingTempSetpoint.Value().Value()];
+                        }
+                    } else {
+                        newElement_1.temperatureControl.coolingTempSetpoint = nil;
+                    }
+                    if (entry_1.temperatureControl.Value().heatingTempSetpoint.HasValue()) {
+                        if (entry_1.temperatureControl.Value().heatingTempSetpoint.Value().IsNull()) {
+                            newElement_1.temperatureControl.heatingTempSetpoint = nil;
+                        } else {
+                            newElement_1.temperatureControl.heatingTempSetpoint = [NSNumber numberWithShort:entry_1.temperatureControl.Value().heatingTempSetpoint.Value().Value()];
+                        }
+                    } else {
+                        newElement_1.temperatureControl.heatingTempSetpoint = nil;
+                    }
+                } else {
+                    newElement_1.temperatureControl = nil;
+                }
+                if (entry_1.averageLoadControl.HasValue()) {
+                    newElement_1.averageLoadControl = [MTRDemandResponseLoadControlClusterAverageLoadControlStruct new];
+                    newElement_1.averageLoadControl.loadAdjustment = [NSNumber numberWithChar:entry_1.averageLoadControl.Value().loadAdjustment];
+                } else {
+                    newElement_1.averageLoadControl = nil;
+                }
+                if (entry_1.dutyCycleControl.HasValue()) {
+                    newElement_1.dutyCycleControl = [MTRDemandResponseLoadControlClusterDutyCycleControlStruct new];
+                    newElement_1.dutyCycleControl.dutyCycle = [NSNumber numberWithUnsignedChar:entry_1.dutyCycleControl.Value().dutyCycle];
+                } else {
+                    newElement_1.dutyCycleControl = nil;
+                }
+                if (entry_1.powerSavingsControl.HasValue()) {
+                    newElement_1.powerSavingsControl = [MTRDemandResponseLoadControlClusterPowerSavingsControlStruct new];
+                    newElement_1.powerSavingsControl.powerSavings = [NSNumber numberWithUnsignedChar:entry_1.powerSavingsControl.Value().powerSavings];
+                } else {
+                    newElement_1.powerSavingsControl = nil;
+                }
+                if (entry_1.heatingSourceControl.HasValue()) {
+                    newElement_1.heatingSourceControl = [MTRDemandResponseLoadControlClusterHeatingSourceControlStruct new];
+                    newElement_1.heatingSourceControl.heatingSource = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.heatingSourceControl.Value().heatingSource)];
+                } else {
+                    newElement_1.heatingSourceControl = nil;
+                }
+                [array_1 addObject:newElement_1];
+            }
+            params.event.transitions = array_1;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addLoadControlEventRequestWithParams:params completion:
+                                                                     ^(NSError * _Nullable error) {
+                                                                         responsesNeeded--;
+                                                                         if (error != nil) {
+                                                                             mError = error;
+                                                                             LogNSError("Error", error);
+                                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                         }
+                                                                         if (responsesNeeded == 0) {
+                                                                             SetCommandExitStatus(mError);
+                                                                         }
+                                                                     }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type> mComplex_Event;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command RemoveLoadControlEventRequest
+ */
+class DemandResponseLoadControlRemoveLoadControlEventRequest : public ClusterCommand {
+public:
+    DemandResponseLoadControlRemoveLoadControlEventRequest()
+        : ClusterCommand("remove-load-control-event-request")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("EventID", &mRequest.eventID);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("CancelControl", 0, UINT16_MAX, &mRequest.cancelControl);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.eventID = [NSData dataWithBytes:mRequest.eventID.data() length:mRequest.eventID.size()];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        params.cancelControl = [NSNumber numberWithUnsignedShort:mRequest.cancelControl.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster removeLoadControlEventRequestWithParams:params completion:
+                                                                        ^(NSError * _Nullable error) {
+                                                                            responsesNeeded--;
+                                                                            if (error != nil) {
+                                                                                mError = error;
+                                                                                LogNSError("Error", error);
+                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                            }
+                                                                            if (responsesNeeded == 0) {
+                                                                                SetCommandExitStatus(mError);
+                                                                            }
+                                                                        }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ClearLoadControlEventsRequest
+ */
+class DemandResponseLoadControlClearLoadControlEventsRequest : public ClusterCommand {
+public:
+    DemandResponseLoadControlClearLoadControlEventsRequest()
+        : ClusterCommand("clear-load-control-events-request")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearLoadControlEventsRequestWithParams:params completion:
+                                                                        ^(NSError * _Nullable error) {
+                                                                            responsesNeeded--;
+                                                                            if (error != nil) {
+                                                                                mError = error;
+                                                                                LogNSError("Error", error);
+                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                            }
+                                                                            if (responsesNeeded == 0) {
+                                                                                SetCommandExitStatus(mError);
+                                                                            }
+                                                                        }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute LoadControlPrograms
+ */
+class ReadDemandResponseLoadControlLoadControlPrograms : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlLoadControlPrograms()
+        : ReadAttribute("load-control-programs")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlLoadControlPrograms()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::LoadControlPrograms::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeLoadControlProgramsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.LoadControlPrograms response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl LoadControlPrograms read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlLoadControlPrograms : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlLoadControlPrograms()
+        : SubscribeAttribute("load-control-programs")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlLoadControlPrograms()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::LoadControlPrograms::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeLoadControlProgramsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.LoadControlPrograms response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute NumberOfLoadControlPrograms
+ */
+class ReadDemandResponseLoadControlNumberOfLoadControlPrograms : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlNumberOfLoadControlPrograms()
+        : ReadAttribute("number-of-load-control-programs")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlNumberOfLoadControlPrograms()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfLoadControlProgramsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.NumberOfLoadControlPrograms response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl NumberOfLoadControlPrograms read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlNumberOfLoadControlPrograms : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlNumberOfLoadControlPrograms()
+        : SubscribeAttribute("number-of-load-control-programs")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlNumberOfLoadControlPrograms()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeNumberOfLoadControlProgramsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.NumberOfLoadControlPrograms response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Events
+ */
+class ReadDemandResponseLoadControlEvents : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlEvents()
+        : ReadAttribute("events")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlEvents()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::Events::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.Events response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl Events read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlEvents()
+        : SubscribeAttribute("events")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlEvents()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::Events::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.Events response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ActiveEvents
+ */
+class ReadDemandResponseLoadControlActiveEvents : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlActiveEvents()
+        : ReadAttribute("active-events")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlActiveEvents()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::ActiveEvents::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeActiveEventsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.ActiveEvents response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl ActiveEvents read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlActiveEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlActiveEvents()
+        : SubscribeAttribute("active-events")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlActiveEvents()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::ActiveEvents::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeActiveEventsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.ActiveEvents response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute NumberOfEventsPerProgram
+ */
+class ReadDemandResponseLoadControlNumberOfEventsPerProgram : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlNumberOfEventsPerProgram()
+        : ReadAttribute("number-of-events-per-program")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlNumberOfEventsPerProgram()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfEventsPerProgramWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.NumberOfEventsPerProgram response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl NumberOfEventsPerProgram read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlNumberOfEventsPerProgram : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlNumberOfEventsPerProgram()
+        : SubscribeAttribute("number-of-events-per-program")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlNumberOfEventsPerProgram()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeNumberOfEventsPerProgramWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.NumberOfEventsPerProgram response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute NumberOfTransitions
+ */
+class ReadDemandResponseLoadControlNumberOfTransitions : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlNumberOfTransitions()
+        : ReadAttribute("number-of-transitions")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlNumberOfTransitions()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransitions::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfTransitionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.NumberOfTransitions response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl NumberOfTransitions read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlNumberOfTransitions : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlNumberOfTransitions()
+        : SubscribeAttribute("number-of-transitions")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlNumberOfTransitions()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransitions::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeNumberOfTransitionsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.NumberOfTransitions response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute DefaultRandomStart
+ */
+class ReadDemandResponseLoadControlDefaultRandomStart : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlDefaultRandomStart()
+        : ReadAttribute("default-random-start")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlDefaultRandomStart()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomStart::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDefaultRandomStartWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.DefaultRandomStart response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl DefaultRandomStart read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteDemandResponseLoadControlDefaultRandomStart : public WriteAttribute {
+public:
+    WriteDemandResponseLoadControlDefaultRandomStart()
+        : WriteAttribute("default-random-start")
+    {
+        AddArgument("attr-name", "default-random-start");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteDemandResponseLoadControlDefaultRandomStart()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomStart::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeDefaultRandomStartWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("DemandResponseLoadControl DefaultRandomStart write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDemandResponseLoadControlDefaultRandomStart : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlDefaultRandomStart()
+        : SubscribeAttribute("default-random-start")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlDefaultRandomStart()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomStart::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeDefaultRandomStartWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.DefaultRandomStart response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute DefaultRandomDuration
+ */
+class ReadDemandResponseLoadControlDefaultRandomDuration : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlDefaultRandomDuration()
+        : ReadAttribute("default-random-duration")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlDefaultRandomDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDefaultRandomDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.DefaultRandomDuration response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl DefaultRandomDuration read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteDemandResponseLoadControlDefaultRandomDuration : public WriteAttribute {
+public:
+    WriteDemandResponseLoadControlDefaultRandomDuration()
+        : WriteAttribute("default-random-duration")
+    {
+        AddArgument("attr-name", "default-random-duration");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteDemandResponseLoadControlDefaultRandomDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeDefaultRandomDurationWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("DemandResponseLoadControl DefaultRandomDuration write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDemandResponseLoadControlDefaultRandomDuration : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlDefaultRandomDuration()
+        : SubscribeAttribute("default-random-duration")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlDefaultRandomDuration()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DefaultRandomDuration::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeDefaultRandomDurationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.DefaultRandomDuration response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadDemandResponseLoadControlGeneratedCommandList : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.GeneratedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl GeneratedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlGeneratedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::GeneratedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.GeneratedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadDemandResponseLoadControlAcceptedCommandList : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.AcceptedCommandList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl AcceptedCommandList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlAcceptedCommandList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::AcceptedCommandList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.AcceptedCommandList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute EventList
+ */
+class ReadDemandResponseLoadControlEventList : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlEventList()
+        : ReadAttribute("event-list")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.EventList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl EventList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlEventList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlEventList()
+        : SubscribeAttribute("event-list")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlEventList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::EventList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeEventListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.EventList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute AttributeList
+ */
+class ReadDemandResponseLoadControlAttributeList : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.AttributeList response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl AttributeList read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlAttributeList()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::AttributeList::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeAttributeListWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.AttributeList response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadDemandResponseLoadControlFeatureMap : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.FeatureMap response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl FeatureMap read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlFeatureMap()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::FeatureMap::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeFeatureMapWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.FeatureMap response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ClusterRevision
+ */
+class ReadDemandResponseLoadControlClusterRevision : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.ClusterRevision response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("DemandResponseLoadControl ClusterRevision read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDemandResponseLoadControlClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeDemandResponseLoadControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeDemandResponseLoadControlClusterRevision()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::ClusterRevision::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeClusterRevisionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DemandResponseLoadControl.ClusterRevision response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| Cluster EnergyEvse                                                  | 0x0099 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Disable                                                           |   0x01 |
+| * EnableCharging                                                    |   0x02 |
+| * EnableDischarging                                                 |   0x03 |
+| * StartDiagnostics                                                  |   0x04 |
+| * SetTargets                                                        |   0x05 |
+| * GetTargets                                                        |   0x06 |
+| * ClearTargets                                                      |   0x07 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * State                                                             | 0x0000 |
+| * SupplyState                                                       | 0x0001 |
+| * FaultState                                                        | 0x0002 |
+| * ChargingEnabledUntil                                              | 0x0003 |
+| * DischargingEnabledUntil                                           | 0x0004 |
+| * CircuitCapacity                                                   | 0x0005 |
+| * MinimumChargeCurrent                                              | 0x0006 |
+| * MaximumChargeCurrent                                              | 0x0007 |
+| * MaximumDischargeCurrent                                           | 0x0008 |
+| * UserMaximumChargeCurrent                                          | 0x0009 |
+| * RandomizationDelayWindow                                          | 0x000A |
+| * NumberOfWeeklyTargets                                             | 0x0021 |
+| * NumberOfDailyTargets                                              | 0x0022 |
+| * NextChargeStartTime                                               | 0x0023 |
+| * NextChargeTargetTime                                              | 0x0024 |
+| * NextChargeRequiredEnergy                                          | 0x0025 |
+| * NextChargeTargetSoC                                               | 0x0026 |
+| * ApproximateEVEfficiency                                           | 0x0027 |
+| * StateOfCharge                                                     | 0x0030 |
+| * BatteryCapacity                                                   | 0x0031 |
+| * VehicleID                                                         | 0x0032 |
+| * SessionID                                                         | 0x0040 |
+| * SessionDuration                                                   | 0x0041 |
+| * SessionEnergyCharged                                              | 0x0042 |
+| * SessionEnergyDischarged                                           | 0x0043 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * EVConnected                                                       | 0x0000 |
+| * EVNotDetected                                                     | 0x0001 |
+| * EnergyTransferStarted                                             | 0x0002 |
+| * EnergyTransferStopped                                             | 0x0003 |
+| * Fault                                                             | 0x0004 |
+| * Rfid                                                              | 0x0005 |
+\*----------------------------------------------------------------------------*/
+
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command Disable
+ */
+class EnergyEvseDisable : public ClusterCommand {
+public:
+    EnergyEvseDisable()
+        : ClusterCommand("disable")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::Disable::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterDisableParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster disableWithParams:params completion:
+                                                  ^(NSError * _Nullable error) {
+                                                      responsesNeeded--;
+                                                      if (error != nil) {
+                                                          mError = error;
+                                                          LogNSError("Error", error);
+                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                      }
+                                                      if (responsesNeeded == 0) {
+                                                          SetCommandExitStatus(mError);
+                                                      }
+                                                  }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command EnableCharging
+ */
+class EnergyEvseEnableCharging : public ClusterCommand {
+public:
+    EnergyEvseEnableCharging()
+        : ClusterCommand("enable-charging")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("ChargingEnabledUntil", 0, UINT32_MAX, &mRequest.chargingEnabledUntil);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("MinimumChargeCurrent", INT64_MIN, INT64_MAX, &mRequest.minimumChargeCurrent);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("MaximumChargeCurrent", INT64_MIN, INT64_MAX, &mRequest.maximumChargeCurrent);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterEnableChargingParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.chargingEnabledUntil.IsNull()) {
+            params.chargingEnabledUntil = nil;
+        } else {
+            params.chargingEnabledUntil = [NSNumber numberWithUnsignedInt:mRequest.chargingEnabledUntil.Value()];
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        params.minimumChargeCurrent = [NSNumber numberWithLongLong:mRequest.minimumChargeCurrent];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        params.maximumChargeCurrent = [NSNumber numberWithLongLong:mRequest.maximumChargeCurrent];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enableChargingWithParams:params completion:
+                                                         ^(NSError * _Nullable error) {
+                                                             responsesNeeded--;
+                                                             if (error != nil) {
+                                                                 mError = error;
+                                                                 LogNSError("Error", error);
+                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                             }
+                                                             if (responsesNeeded == 0) {
+                                                                 SetCommandExitStatus(mError);
+                                                             }
+                                                         }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::EnergyEvse::Commands::EnableCharging::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command EnableDischarging
+ */
+class EnergyEvseEnableDischarging : public ClusterCommand {
+public:
+    EnergyEvseEnableDischarging()
+        : ClusterCommand("enable-discharging")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("DischargingEnabledUntil", 0, UINT32_MAX, &mRequest.dischargingEnabledUntil);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("MaximumDischargeCurrent", INT64_MIN, INT64_MAX, &mRequest.maximumDischargeCurrent);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterEnableDischargingParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        if (mRequest.dischargingEnabledUntil.IsNull()) {
+            params.dischargingEnabledUntil = nil;
+        } else {
+            params.dischargingEnabledUntil = [NSNumber numberWithUnsignedInt:mRequest.dischargingEnabledUntil.Value()];
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        params.maximumDischargeCurrent = [NSNumber numberWithLongLong:mRequest.maximumDischargeCurrent];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enableDischargingWithParams:params completion:
+                                                            ^(NSError * _Nullable error) {
+                                                                responsesNeeded--;
+                                                                if (error != nil) {
+                                                                    mError = error;
+                                                                    LogNSError("Error", error);
+                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                                }
+                                                                if (responsesNeeded == 0) {
+                                                                    SetCommandExitStatus(mError);
+                                                                }
+                                                            }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::EnergyEvse::Commands::EnableDischarging::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command StartDiagnostics
+ */
+class EnergyEvseStartDiagnostics : public ClusterCommand {
+public:
+    EnergyEvseStartDiagnostics()
+        : ClusterCommand("start-diagnostics")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::StartDiagnostics::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterStartDiagnosticsParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startDiagnosticsWithParams:params completion:
+                                                           ^(NSError * _Nullable error) {
+                                                               responsesNeeded--;
+                                                               if (error != nil) {
+                                                                   mError = error;
+                                                                   LogNSError("Error", error);
+                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                               }
+                                                               if (responsesNeeded == 0) {
+                                                                   SetCommandExitStatus(mError);
+                                                               }
+                                                           }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command SetTargets
+ */
+class EnergyEvseSetTargets : public ClusterCommand {
+public:
+    EnergyEvseSetTargets()
+        : ClusterCommand("set-targets")
+        , mComplex_ChargingTargets(&mRequest.chargingTargets)
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("DayOfWeekforSequence", 0, UINT8_MAX, &mRequest.dayOfWeekforSequence);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("ChargingTargets", &mComplex_ChargingTargets);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::SetTargets::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterSetTargetsParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.dayOfWeekforSequence = [NSNumber numberWithUnsignedChar:mRequest.dayOfWeekforSequence.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.chargingTargets) {
+                MTREnergyEVSEClusterChargingTargetStruct * newElement_0;
+                newElement_0 = [MTREnergyEVSEClusterChargingTargetStruct new];
+                newElement_0.targetTime = [NSNumber numberWithUnsignedShort:entry_0.targetTime];
+                if (entry_0.targetSoC.HasValue()) {
+                    newElement_0.targetSoC = [NSNumber numberWithUnsignedChar:entry_0.targetSoC.Value()];
+                } else {
+                    newElement_0.targetSoC = nil;
+                }
+                if (entry_0.addedEnergy.HasValue()) {
+                    newElement_0.addedEnergy = [NSNumber numberWithLongLong:entry_0.addedEnergy.Value()];
+                } else {
+                    newElement_0.addedEnergy = nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            params.chargingTargets = array_0;
+        }
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setTargetsWithParams:params completion:
+                                                     ^(NSError * _Nullable error) {
+                                                         responsesNeeded--;
+                                                         if (error != nil) {
+                                                             mError = error;
+                                                             LogNSError("Error", error);
+                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                         }
+                                                         if (responsesNeeded == 0) {
+                                                             SetCommandExitStatus(mError);
+                                                         }
+                                                     }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::EnergyEvse::Commands::SetTargets::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::EnergyEvse::Structs::ChargingTargetStruct::Type>> mComplex_ChargingTargets;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command GetTargets
+ */
+class EnergyEvseGetTargets : public ClusterCommand {
+public:
+    EnergyEvseGetTargets()
+        : ClusterCommand("get-targets")
+    {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::GetTargets::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterGetTargetsParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
+        params.daysToReturn = [NSNumber numberWithUnsignedChar:mRequest.daysToReturn.Raw()];
+#endif // MTR_ENABLE_PROVISIONAL
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getTargetsWithParams:params completion:
+                                                     ^(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                         NSLog(@"Values: %@", values);
+                                                         if (error == nil) {
+                                                             constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
+                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                                                         }
+                                                         responsesNeeded--;
+                                                         if (error != nil) {
+                                                             mError = error;
+                                                             LogNSError("Error", error);
+                                                             constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
+                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                                                         }
+                                                         if (responsesNeeded == 0) {
+                                                             SetCommandExitStatus(mError);
+                                                         }
+                                                     }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::EnergyEvse::Commands::GetTargets::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ClearTargets
+ */
+class EnergyEvseClearTargets : public ClusterCommand {
+public:
+    EnergyEvseClearTargets()
+        : ClusterCommand("clear-targets")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId commandId = chip::app::Clusters::EnergyEvse::Commands::ClearTargets::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTREnergyEVSEClusterClearTargetsParams alloc] init];
+        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearTargetsWithParams:params completion:
+                                                       ^(NSError * _Nullable error) {
+                                                           responsesNeeded--;
+                                                           if (error != nil) {
+                                                               mError = error;
+                                                               LogNSError("Error", error);
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                                                           }
+                                                           if (responsesNeeded == 0) {
+                                                               SetCommandExitStatus(mError);
+                                                           }
+                                                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute State
  */
-class ReadRvcOperationalStateOperationalError : public ReadAttribute {
+class ReadEnergyEvseState : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalError()
-        : ReadAttribute("operational-error")
+    ReadEnergyEvseState()
+        : ReadAttribute("state")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalError()
+    ~ReadEnergyEvseState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalError::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::State::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOperationalErrorWithCompletion:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.OperationalError response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.State response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState OperationalError read Error", error);
+                LogNSError("EnergyEVSE State read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64426,25 +78302,25 @@ class ReadRvcOperationalStateOperationalError : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseState : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalError()
-        : SubscribeAttribute("operational-error")
+    SubscribeAttributeEnergyEvseState()
+        : SubscribeAttribute("state")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalError()
+    ~SubscribeAttributeEnergyEvseState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::OperationalError::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::State::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64455,10 +78331,10 @@ class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalErrorWithParams:params
+        [cluster subscribeAttributeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalError response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.State response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64475,34 +78351,34 @@ class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute SupplyState
  */
-class ReadRvcOperationalStateGeneratedCommandList : public ReadAttribute {
+class ReadEnergyEvseSupplyState : public ReadAttribute {
 public:
-    ReadRvcOperationalStateGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadEnergyEvseSupplyState()
+        : ReadAttribute("supply-state")
     {
     }
 
-    ~ReadRvcOperationalStateGeneratedCommandList()
+    ~ReadEnergyEvseSupplyState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SupplyState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupplyStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.SupplyState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState GeneratedCommandList read Error", error);
+                LogNSError("EnergyEVSE SupplyState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64511,25 +78387,25 @@ class ReadRvcOperationalStateGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseSupplyState : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeEnergyEvseSupplyState()
+        : SubscribeAttribute("supply-state")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateGeneratedCommandList()
+    ~SubscribeAttributeEnergyEvseSupplyState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SupplyState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64540,10 +78416,10 @@ class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeSupplyStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.SupplyState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64560,34 +78436,34 @@ class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute FaultState
  */
-class ReadRvcOperationalStateAcceptedCommandList : public ReadAttribute {
+class ReadEnergyEvseFaultState : public ReadAttribute {
 public:
-    ReadRvcOperationalStateAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadEnergyEvseFaultState()
+        : ReadAttribute("fault-state")
     {
     }
 
-    ~ReadRvcOperationalStateAcceptedCommandList()
+    ~ReadEnergyEvseFaultState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::FaultState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFaultStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.FaultState response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState AcceptedCommandList read Error", error);
+                LogNSError("EnergyEVSE FaultState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64596,25 +78472,25 @@ class ReadRvcOperationalStateAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseFaultState : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeEnergyEvseFaultState()
+        : SubscribeAttribute("fault-state")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateAcceptedCommandList()
+    ~SubscribeAttributeEnergyEvseFaultState()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::FaultState::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64625,10 +78501,10 @@ class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public Subscrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeFaultStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.FaultState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64645,34 +78521,34 @@ class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public Subscrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute ChargingEnabledUntil
  */
-class ReadRvcOperationalStateEventList : public ReadAttribute {
+class ReadEnergyEvseChargingEnabledUntil : public ReadAttribute {
 public:
-    ReadRvcOperationalStateEventList()
-        : ReadAttribute("event-list")
+    ReadEnergyEvseChargingEnabledUntil()
+        : ReadAttribute("charging-enabled-until")
     {
     }
 
-    ~ReadRvcOperationalStateEventList()
+    ~ReadEnergyEvseChargingEnabledUntil()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ChargingEnabledUntil::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeChargingEnabledUntilWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.ChargingEnabledUntil response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState EventList read Error", error);
+                LogNSError("EnergyEVSE ChargingEnabledUntil read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64681,25 +78557,25 @@ class ReadRvcOperationalStateEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseChargingEnabledUntil : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeEnergyEvseChargingEnabledUntil()
+        : SubscribeAttribute("charging-enabled-until")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateEventList()
+    ~SubscribeAttributeEnergyEvseChargingEnabledUntil()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ChargingEnabledUntil::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64710,10 +78586,10 @@ class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeChargingEnabledUntilWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.ChargingEnabledUntil response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64730,34 +78606,34 @@ class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute DischargingEnabledUntil
  */
-class ReadRvcOperationalStateAttributeList : public ReadAttribute {
+class ReadEnergyEvseDischargingEnabledUntil : public ReadAttribute {
 public:
-    ReadRvcOperationalStateAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadEnergyEvseDischargingEnabledUntil()
+        : ReadAttribute("discharging-enabled-until")
     {
     }
 
-    ~ReadRvcOperationalStateAttributeList()
+    ~ReadEnergyEvseDischargingEnabledUntil()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::DischargingEnabledUntil::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDischargingEnabledUntilWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.DischargingEnabledUntil response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState AttributeList read Error", error);
+                LogNSError("EnergyEVSE DischargingEnabledUntil read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64766,25 +78642,25 @@ class ReadRvcOperationalStateAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseDischargingEnabledUntil : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeEnergyEvseDischargingEnabledUntil()
+        : SubscribeAttribute("discharging-enabled-until")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateAttributeList()
+    ~SubscribeAttributeEnergyEvseDischargingEnabledUntil()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::DischargingEnabledUntil::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64795,10 +78671,10 @@ class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeDischargingEnabledUntilWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.DischargingEnabledUntil response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64815,34 +78691,34 @@ class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute CircuitCapacity
  */
-class ReadRvcOperationalStateFeatureMap : public ReadAttribute {
+class ReadEnergyEvseCircuitCapacity : public ReadAttribute {
 public:
-    ReadRvcOperationalStateFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadEnergyEvseCircuitCapacity()
+        : ReadAttribute("circuit-capacity")
     {
     }
 
-    ~ReadRvcOperationalStateFeatureMap()
+    ~ReadEnergyEvseCircuitCapacity()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::CircuitCapacity::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCircuitCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.CircuitCapacity response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState FeatureMap read Error", error);
+                LogNSError("EnergyEVSE CircuitCapacity read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64851,25 +78727,25 @@ class ReadRvcOperationalStateFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseCircuitCapacity : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeEnergyEvseCircuitCapacity()
+        : SubscribeAttribute("circuit-capacity")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateFeatureMap()
+    ~SubscribeAttributeEnergyEvseCircuitCapacity()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::CircuitCapacity::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64880,10 +78756,10 @@ class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeCircuitCapacityWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.FeatureMap response %@", [value description]);
+                NSLog(@"EnergyEVSE.CircuitCapacity response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64900,34 +78776,34 @@ class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute MinimumChargeCurrent
  */
-class ReadRvcOperationalStateClusterRevision : public ReadAttribute {
+class ReadEnergyEvseMinimumChargeCurrent : public ReadAttribute {
 public:
-    ReadRvcOperationalStateClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadEnergyEvseMinimumChargeCurrent()
+        : ReadAttribute("minimum-charge-current")
     {
     }
 
-    ~ReadRvcOperationalStateClusterRevision()
+    ~ReadEnergyEvseMinimumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MinimumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCOperationalState.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMinimumChargeCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.MinimumChargeCurrent response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCOperationalState ClusterRevision read Error", error);
+                LogNSError("EnergyEVSE MinimumChargeCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64936,25 +78812,25 @@ class ReadRvcOperationalStateClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseMinimumChargeCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeEnergyEvseMinimumChargeCurrent()
+        : SubscribeAttribute("minimum-charge-current")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateClusterRevision()
+    ~SubscribeAttributeEnergyEvseMinimumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::RvcOperationalState::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MinimumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -64965,10 +78841,10 @@ class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeMinimumChargeCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.ClusterRevision response %@", [value description]);
+                NSLog(@"EnergyEVSE.MinimumChargeCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64982,109 +78858,37 @@ class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAtt
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster HepaFilterMonitoring                                        | 0x0071 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ResetCondition                                                    |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Condition                                                         | 0x0000 |
-| * DegradationDirection                                              | 0x0001 |
-| * ChangeIndication                                                  | 0x0002 |
-| * InPlaceIndicator                                                  | 0x0003 |
-| * LastChangedTime                                                   | 0x0004 |
-| * ReplacementProductList                                            | 0x0005 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command ResetCondition
- */
-class HepaFilterMonitoringResetCondition : public ClusterCommand {
-public:
-    HepaFilterMonitoringResetCondition()
-        : ClusterCommand("reset-condition")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetConditionWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Condition
+ * Attribute MaximumChargeCurrent
  */
-class ReadHepaFilterMonitoringCondition : public ReadAttribute {
+class ReadEnergyEvseMaximumChargeCurrent : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringCondition()
-        : ReadAttribute("condition")
+    ReadEnergyEvseMaximumChargeCurrent()
+        : ReadAttribute("maximum-charge-current")
     {
     }
 
-    ~ReadHepaFilterMonitoringCondition()
+    ~ReadEnergyEvseMaximumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::Condition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MaximumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.Condition response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaximumChargeCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.MaximumChargeCurrent response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring Condition read Error", error);
+                LogNSError("EnergyEVSE MaximumChargeCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65093,25 +78897,25 @@ class ReadHepaFilterMonitoringCondition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseMaximumChargeCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringCondition()
-        : SubscribeAttribute("condition")
+    SubscribeAttributeEnergyEvseMaximumChargeCurrent()
+        : SubscribeAttribute("maximum-charge-current")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringCondition()
+    ~SubscribeAttributeEnergyEvseMaximumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::Condition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MaximumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65122,10 +78926,10 @@ class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeConditionWithParams:params
+        [cluster subscribeAttributeMaximumChargeCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.Condition response %@", [value description]);
+                NSLog(@"EnergyEVSE.MaximumChargeCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65142,34 +78946,34 @@ class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DegradationDirection
+ * Attribute MaximumDischargeCurrent
  */
-class ReadHepaFilterMonitoringDegradationDirection : public ReadAttribute {
+class ReadEnergyEvseMaximumDischargeCurrent : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringDegradationDirection()
-        : ReadAttribute("degradation-direction")
+    ReadEnergyEvseMaximumDischargeCurrent()
+        : ReadAttribute("maximum-discharge-current")
     {
     }
 
-    ~ReadHepaFilterMonitoringDegradationDirection()
+    ~ReadEnergyEvseMaximumDischargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::DegradationDirection::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MaximumDischargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeMaximumDischargeCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.MaximumDischargeCurrent response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring DegradationDirection read Error", error);
+                LogNSError("EnergyEVSE MaximumDischargeCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65178,25 +78982,25 @@ class ReadHepaFilterMonitoringDegradationDirection : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseMaximumDischargeCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringDegradationDirection()
-        : SubscribeAttribute("degradation-direction")
+    SubscribeAttributeEnergyEvseMaximumDischargeCurrent()
+        : SubscribeAttribute("maximum-discharge-current")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringDegradationDirection()
+    ~SubscribeAttributeEnergyEvseMaximumDischargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::DegradationDirection::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::MaximumDischargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65207,10 +79011,10 @@ class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDegradationDirectionWithParams:params
+        [cluster subscribeAttributeMaximumDischargeCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
+                NSLog(@"EnergyEVSE.MaximumDischargeCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65227,34 +79031,34 @@ class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ChangeIndication
+ * Attribute UserMaximumChargeCurrent
  */
-class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
+class ReadEnergyEvseUserMaximumChargeCurrent : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringChangeIndication()
-        : ReadAttribute("change-indication")
+    ReadEnergyEvseUserMaximumChargeCurrent()
+        : ReadAttribute("user-maximum-charge-current")
     {
     }
 
-    ~ReadHepaFilterMonitoringChangeIndication()
+    ~ReadEnergyEvseUserMaximumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ChangeIndication::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::UserMaximumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeUserMaximumChargeCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.UserMaximumChargeCurrent response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring ChangeIndication read Error", error);
+                LogNSError("EnergyEVSE UserMaximumChargeCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65263,110 +79067,66 @@ class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeAttribute {
+class WriteEnergyEvseUserMaximumChargeCurrent : public WriteAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringChangeIndication()
-        : SubscribeAttribute("change-indication")
+    WriteEnergyEvseUserMaximumChargeCurrent()
+        : WriteAttribute("user-maximum-charge-current")
     {
+        AddArgument("attr-name", "user-maximum-charge-current");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringChangeIndication()
+    ~WriteEnergyEvseUserMaximumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ChangeIndication::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::UserMaximumChargeCurrent::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
-        if (mKeepSubscriptions.HasValue()) {
-            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
-        }
-        if (mFabricFiltered.HasValue()) {
-            params.filterByFabric = mFabricFiltered.Value();
-        }
-        if (mAutoResubscribe.HasValue()) {
-            params.resubscribeAutomatically = mAutoResubscribe.Value();
-        }
-        [cluster subscribeAttributeChangeIndicationWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
-                if (error == nil) {
-                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-                } else {
-                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-                }
-                SetCommandExitStatus(error);
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
-/*
- * Attribute InPlaceIndicator
- */
-class ReadHepaFilterMonitoringInPlaceIndicator : public ReadAttribute {
-public:
-    ReadHepaFilterMonitoringInPlaceIndicator()
-        : ReadAttribute("in-place-indicator")
-    {
-    }
-
-    ~ReadHepaFilterMonitoringInPlaceIndicator()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::InPlaceIndicator::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("HEPAFilterMonitoring InPlaceIndicator read Error", error);
+        [cluster writeAttributeUserMaximumChargeCurrentWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("EnergyEVSE UserMaximumChargeCurrent write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    int64_t mValue;
 };
 
-class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseUserMaximumChargeCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
-        : SubscribeAttribute("in-place-indicator")
+    SubscribeAttributeEnergyEvseUserMaximumChargeCurrent()
+        : SubscribeAttribute("user-maximum-charge-current")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
+    ~SubscribeAttributeEnergyEvseUserMaximumChargeCurrent()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::InPlaceIndicator::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::UserMaximumChargeCurrent::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65377,10 +79137,10 @@ class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+        [cluster subscribeAttributeUserMaximumChargeCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                NSLog(@"EnergyEVSE.UserMaximumChargeCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65397,34 +79157,34 @@ class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute LastChangedTime
+ * Attribute RandomizationDelayWindow
  */
-class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
+class ReadEnergyEvseRandomizationDelayWindow : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringLastChangedTime()
-        : ReadAttribute("last-changed-time")
+    ReadEnergyEvseRandomizationDelayWindow()
+        : ReadAttribute("randomization-delay-window")
     {
     }
 
-    ~ReadHepaFilterMonitoringLastChangedTime()
+    ~ReadEnergyEvseRandomizationDelayWindow()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::RandomizationDelayWindow::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeRandomizationDelayWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.RandomizationDelayWindow response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring LastChangedTime read Error", error);
+                LogNSError("EnergyEVSE RandomizationDelayWindow read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65433,39 +79193,36 @@ class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
     }
 };
 
-class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
+class WriteEnergyEvseRandomizationDelayWindow : public WriteAttribute {
 public:
-    WriteHepaFilterMonitoringLastChangedTime()
-        : WriteAttribute("last-changed-time")
+    WriteEnergyEvseRandomizationDelayWindow()
+        : WriteAttribute("randomization-delay-window")
     {
-        AddArgument("attr-name", "last-changed-time");
+        AddArgument("attr-name", "randomization-delay-window");
         AddArgument("attr-value", 0, UINT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteHepaFilterMonitoringLastChangedTime()
+    ~WriteEnergyEvseRandomizationDelayWindow()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::RandomizationDelayWindow::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
 
-        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeRandomizationDelayWindowWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("HEPAFilterMonitoring LastChangedTime write Error", error);
+                LogNSError("EnergyEVSE RandomizationDelayWindow write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65474,28 +79231,28 @@ class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
     }
 
 private:
-    chip::app::DataModel::Nullable<uint32_t> mValue;
+    uint32_t mValue;
 };
 
-class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseRandomizationDelayWindow : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringLastChangedTime()
-        : SubscribeAttribute("last-changed-time")
+    SubscribeAttributeEnergyEvseRandomizationDelayWindow()
+        : SubscribeAttribute("randomization-delay-window")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringLastChangedTime()
+    ~SubscribeAttributeEnergyEvseRandomizationDelayWindow()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::RandomizationDelayWindow::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65506,10 +79263,10 @@ class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLastChangedTimeWithParams:params
+        [cluster subscribeAttributeRandomizationDelayWindowWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
+                NSLog(@"EnergyEVSE.RandomizationDelayWindow response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65526,34 +79283,34 @@ class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ReplacementProductList
+ * Attribute NumberOfWeeklyTargets
  */
-class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
+class ReadEnergyEvseNumberOfWeeklyTargets : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringReplacementProductList()
-        : ReadAttribute("replacement-product-list")
+    ReadEnergyEvseNumberOfWeeklyTargets()
+        : ReadAttribute("number-of-weekly-targets")
     {
     }
 
-    ~ReadHepaFilterMonitoringReplacementProductList()
+    ~ReadEnergyEvseNumberOfWeeklyTargets()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ReplacementProductList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NumberOfWeeklyTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.ReplacementProductList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfWeeklyTargetsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NumberOfWeeklyTargets response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring ReplacementProductList read Error", error);
+                LogNSError("EnergyEVSE NumberOfWeeklyTargets read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65562,25 +79319,25 @@ class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNumberOfWeeklyTargets : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringReplacementProductList()
-        : SubscribeAttribute("replacement-product-list")
+    SubscribeAttributeEnergyEvseNumberOfWeeklyTargets()
+        : SubscribeAttribute("number-of-weekly-targets")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringReplacementProductList()
+    ~SubscribeAttributeEnergyEvseNumberOfWeeklyTargets()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ReplacementProductList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NumberOfWeeklyTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65591,10 +79348,10 @@ class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public Subs
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeReplacementProductListWithParams:params
+        [cluster subscribeAttributeNumberOfWeeklyTargetsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.ReplacementProductList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.NumberOfWeeklyTargets response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65611,34 +79368,34 @@ class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public Subs
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute NumberOfDailyTargets
  */
-class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
+class ReadEnergyEvseNumberOfDailyTargets : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadEnergyEvseNumberOfDailyTargets()
+        : ReadAttribute("number-of-daily-targets")
     {
     }
 
-    ~ReadHepaFilterMonitoringGeneratedCommandList()
+    ~ReadEnergyEvseNumberOfDailyTargets()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NumberOfDailyTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfDailyTargetsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NumberOfDailyTargets response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring GeneratedCommandList read Error", error);
+                LogNSError("EnergyEVSE NumberOfDailyTargets read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65647,25 +79404,25 @@ class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNumberOfDailyTargets : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeEnergyEvseNumberOfDailyTargets()
+        : SubscribeAttribute("number-of-daily-targets")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+    ~SubscribeAttributeEnergyEvseNumberOfDailyTargets()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NumberOfDailyTargets::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65676,10 +79433,10 @@ class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeNumberOfDailyTargetsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.NumberOfDailyTargets response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65696,34 +79453,34 @@ class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute NextChargeStartTime
  */
-class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
+class ReadEnergyEvseNextChargeStartTime : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadEnergyEvseNextChargeStartTime()
+        : ReadAttribute("next-charge-start-time")
     {
     }
 
-    ~ReadHepaFilterMonitoringAcceptedCommandList()
+    ~ReadEnergyEvseNextChargeStartTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeStartTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNextChargeStartTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NextChargeStartTime response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring AcceptedCommandList read Error", error);
+                LogNSError("EnergyEVSE NextChargeStartTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65732,25 +79489,25 @@ class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNextChargeStartTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeEnergyEvseNextChargeStartTime()
+        : SubscribeAttribute("next-charge-start-time")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+    ~SubscribeAttributeEnergyEvseNextChargeStartTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeStartTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65761,10 +79518,10 @@ class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeNextChargeStartTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.NextChargeStartTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65781,34 +79538,34 @@ class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute NextChargeTargetTime
  */
-class ReadHepaFilterMonitoringEventList : public ReadAttribute {
+class ReadEnergyEvseNextChargeTargetTime : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringEventList()
-        : ReadAttribute("event-list")
+    ReadEnergyEvseNextChargeTargetTime()
+        : ReadAttribute("next-charge-target-time")
     {
     }
 
-    ~ReadHepaFilterMonitoringEventList()
+    ~ReadEnergyEvseNextChargeTargetTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeTargetTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNextChargeTargetTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NextChargeTargetTime response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring EventList read Error", error);
+                LogNSError("EnergyEVSE NextChargeTargetTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65817,25 +79574,25 @@ class ReadHepaFilterMonitoringEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNextChargeTargetTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeEnergyEvseNextChargeTargetTime()
+        : SubscribeAttribute("next-charge-target-time")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringEventList()
+    ~SubscribeAttributeEnergyEvseNextChargeTargetTime()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeTargetTime::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65846,10 +79603,10 @@ class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeNextChargeTargetTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.NextChargeTargetTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65866,34 +79623,34 @@ class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute NextChargeRequiredEnergy
  */
-class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
+class ReadEnergyEvseNextChargeRequiredEnergy : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadEnergyEvseNextChargeRequiredEnergy()
+        : ReadAttribute("next-charge-required-energy")
     {
     }
 
-    ~ReadHepaFilterMonitoringAttributeList()
+    ~ReadEnergyEvseNextChargeRequiredEnergy()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeRequiredEnergy::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNextChargeRequiredEnergyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NextChargeRequiredEnergy response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring AttributeList read Error", error);
+                LogNSError("EnergyEVSE NextChargeRequiredEnergy read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65902,25 +79659,25 @@ class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNextChargeRequiredEnergy : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeEnergyEvseNextChargeRequiredEnergy()
+        : SubscribeAttribute("next-charge-required-energy")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringAttributeList()
+    ~SubscribeAttributeEnergyEvseNextChargeRequiredEnergy()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeRequiredEnergy::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -65931,10 +79688,10 @@ class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeNextChargeRequiredEnergyWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.NextChargeRequiredEnergy response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65951,34 +79708,34 @@ class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute NextChargeTargetSoC
  */
-class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
+class ReadEnergyEvseNextChargeTargetSoC : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadEnergyEvseNextChargeTargetSoC()
+        : ReadAttribute("next-charge-target-so-c")
     {
     }
 
-    ~ReadHepaFilterMonitoringFeatureMap()
+    ~ReadEnergyEvseNextChargeTargetSoC()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeTargetSoC::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNextChargeTargetSoCWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.NextChargeTargetSoC response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring FeatureMap read Error", error);
+                LogNSError("EnergyEVSE NextChargeTargetSoC read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65987,25 +79744,25 @@ class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseNextChargeTargetSoC : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeEnergyEvseNextChargeTargetSoC()
+        : SubscribeAttribute("next-charge-target-so-c")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringFeatureMap()
+    ~SubscribeAttributeEnergyEvseNextChargeTargetSoC()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::NextChargeTargetSoC::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66016,10 +79773,10 @@ class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeNextChargeTargetSoCWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+                NSLog(@"EnergyEVSE.NextChargeTargetSoC response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66036,34 +79793,34 @@ class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute ApproximateEVEfficiency
  */
-class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
+class ReadEnergyEvseApproximateEVEfficiency : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadEnergyEvseApproximateEVEfficiency()
+        : ReadAttribute("approximate-evefficiency")
     {
     }
 
-    ~ReadHepaFilterMonitoringClusterRevision()
+    ~ReadEnergyEvseApproximateEVEfficiency()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ApproximateEVEfficiency::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeApproximateEVEfficiencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.ApproximateEVEfficiency response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring ClusterRevision read Error", error);
+                LogNSError("EnergyEVSE ApproximateEVEfficiency read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66072,25 +79829,69 @@ class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAttribute {
+class WriteEnergyEvseApproximateEVEfficiency : public WriteAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteEnergyEvseApproximateEVEfficiency()
+        : WriteAttribute("approximate-evefficiency")
     {
+        AddArgument("attr-name", "approximate-evefficiency");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringClusterRevision()
+    ~WriteEnergyEvseApproximateEVEfficiency()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ApproximateEVEfficiency::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedShort:mValue.Value()];
+        }
+
+        [cluster writeAttributeApproximateEVEfficiencyWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("EnergyEVSE ApproximateEVEfficiency write Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint16_t> mValue;
+};
+
+class SubscribeAttributeEnergyEvseApproximateEVEfficiency : public SubscribeAttribute {
+public:
+    SubscribeAttributeEnergyEvseApproximateEVEfficiency()
+        : SubscribeAttribute("approximate-evefficiency")
+    {
+    }
+
+    ~SubscribeAttributeEnergyEvseApproximateEVEfficiency()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ApproximateEVEfficiency::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66101,10 +79902,10 @@ class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeApproximateEVEfficiencyWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+                NSLog(@"EnergyEVSE.ApproximateEVEfficiency response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66118,109 +79919,37 @@ class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAt
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*----------------------------------------------------------------------------*\
-| Cluster ActivatedCarbonFilterMonitoring                             | 0x0072 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ResetCondition                                                    |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Condition                                                         | 0x0000 |
-| * DegradationDirection                                              | 0x0001 |
-| * ChangeIndication                                                  | 0x0002 |
-| * InPlaceIndicator                                                  | 0x0003 |
-| * LastChangedTime                                                   | 0x0004 |
-| * ReplacementProductList                                            | 0x0005 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * EventList                                                         | 0xFFFA |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command ResetCondition
- */
-class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand {
-public:
-    ActivatedCarbonFilterMonitoringResetCondition()
-        : ClusterCommand("reset-condition")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
-        params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetConditionWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Condition
+ * Attribute StateOfCharge
  */
-class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
+class ReadEnergyEvseStateOfCharge : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringCondition()
-        : ReadAttribute("condition")
+    ReadEnergyEvseStateOfCharge()
+        : ReadAttribute("state-of-charge")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringCondition()
+    ~ReadEnergyEvseStateOfCharge()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::Condition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::StateOfCharge::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeStateOfChargeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.StateOfCharge response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring Condition read Error", error);
+                LogNSError("EnergyEVSE StateOfCharge read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66229,25 +79958,25 @@ class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseStateOfCharge : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
-        : SubscribeAttribute("condition")
+    SubscribeAttributeEnergyEvseStateOfCharge()
+        : SubscribeAttribute("state-of-charge")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
+    ~SubscribeAttributeEnergyEvseStateOfCharge()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::Condition::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::StateOfCharge::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66258,10 +79987,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeConditionWithParams:params
+        [cluster subscribeAttributeStateOfChargeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
+                NSLog(@"EnergyEVSE.StateOfCharge response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66278,34 +80007,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DegradationDirection
+ * Attribute BatteryCapacity
  */
-class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttribute {
+class ReadEnergyEvseBatteryCapacity : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringDegradationDirection()
-        : ReadAttribute("degradation-direction")
+    ReadEnergyEvseBatteryCapacity()
+        : ReadAttribute("battery-capacity")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringDegradationDirection()
+    ~ReadEnergyEvseBatteryCapacity()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::BatteryCapacity::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeBatteryCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.BatteryCapacity response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring DegradationDirection read Error", error);
+                LogNSError("EnergyEVSE BatteryCapacity read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66314,25 +80043,25 @@ class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttri
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseBatteryCapacity : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
-        : SubscribeAttribute("degradation-direction")
+    SubscribeAttributeEnergyEvseBatteryCapacity()
+        : SubscribeAttribute("battery-capacity")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
+    ~SubscribeAttributeEnergyEvseBatteryCapacity()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::DegradationDirection::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::BatteryCapacity::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66343,10 +80072,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : pu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDegradationDirectionWithParams:params
+        [cluster subscribeAttributeBatteryCapacityWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
+                NSLog(@"EnergyEVSE.BatteryCapacity response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66363,34 +80092,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : pu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ChangeIndication
+ * Attribute VehicleID
  */
-class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute {
+class ReadEnergyEvseVehicleID : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringChangeIndication()
-        : ReadAttribute("change-indication")
+    ReadEnergyEvseVehicleID()
+        : ReadAttribute("vehicle-id")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringChangeIndication()
+    ~ReadEnergyEvseVehicleID()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::VehicleID::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeVehicleIDWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.VehicleID response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring ChangeIndication read Error", error);
+                LogNSError("EnergyEVSE VehicleID read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66399,25 +80128,25 @@ class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseVehicleID : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
-        : SubscribeAttribute("change-indication")
+    SubscribeAttributeEnergyEvseVehicleID()
+        : SubscribeAttribute("vehicle-id")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
+    ~SubscribeAttributeEnergyEvseVehicleID()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ChangeIndication::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::VehicleID::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66428,10 +80157,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeChangeIndicationWithParams:params
+        [cluster subscribeAttributeVehicleIDWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.VehicleID response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66448,34 +80177,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InPlaceIndicator
+ * Attribute SessionID
  */
-class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute {
+class ReadEnergyEvseSessionID : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
-        : ReadAttribute("in-place-indicator")
+    ReadEnergyEvseSessionID()
+        : ReadAttribute("session-id")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
+    ~ReadEnergyEvseSessionID()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionID::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSessionIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.SessionID response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring InPlaceIndicator read Error", error);
+                LogNSError("EnergyEVSE SessionID read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66484,25 +80213,25 @@ class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseSessionID : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
-        : SubscribeAttribute("in-place-indicator")
+    SubscribeAttributeEnergyEvseSessionID()
+        : SubscribeAttribute("session-id")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
+    ~SubscribeAttributeEnergyEvseSessionID()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::InPlaceIndicator::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionID::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66513,10 +80242,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+        [cluster subscribeAttributeSessionIDWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                NSLog(@"EnergyEVSE.SessionID response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66533,34 +80262,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute LastChangedTime
+ * Attribute SessionDuration
  */
-class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute {
+class ReadEnergyEvseSessionDuration : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringLastChangedTime()
-        : ReadAttribute("last-changed-time")
+    ReadEnergyEvseSessionDuration()
+        : ReadAttribute("session-duration")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringLastChangedTime()
+    ~ReadEnergyEvseSessionDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionDuration::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSessionDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.SessionDuration response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime read Error", error);
+                LogNSError("EnergyEVSE SessionDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66569,69 +80298,110 @@ class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute
     }
 };
 
-class WriteActivatedCarbonFilterMonitoringLastChangedTime : public WriteAttribute {
+class SubscribeAttributeEnergyEvseSessionDuration : public SubscribeAttribute {
 public:
-    WriteActivatedCarbonFilterMonitoringLastChangedTime()
-        : WriteAttribute("last-changed-time")
+    SubscribeAttributeEnergyEvseSessionDuration()
+        : SubscribeAttribute("session-duration")
     {
-        AddArgument("attr-name", "last-changed-time");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteActivatedCarbonFilterMonitoringLastChangedTime()
+    ~SubscribeAttributeEnergyEvseSessionDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionDuration::Id;
 
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
+        [cluster subscribeAttributeSessionDurationWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.SessionDuration response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
 
-        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime write Error", error);
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SessionEnergyCharged
+ */
+class ReadEnergyEvseSessionEnergyCharged : public ReadAttribute {
+public:
+    ReadEnergyEvseSessionEnergyCharged()
+        : ReadAttribute("session-energy-charged")
+    {
+    }
+
+    ~ReadEnergyEvseSessionEnergyCharged()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionEnergyCharged::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSessionEnergyChargedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.SessionEnergyCharged response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("EnergyEVSE SessionEnergyCharged read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint32_t> mValue;
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseSessionEnergyCharged : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
-        : SubscribeAttribute("last-changed-time")
+    SubscribeAttributeEnergyEvseSessionEnergyCharged()
+        : SubscribeAttribute("session-energy-charged")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
+    ~SubscribeAttributeEnergyEvseSessionEnergyCharged()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionEnergyCharged::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66642,10 +80412,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLastChangedTimeWithParams:params
+        [cluster subscribeAttributeSessionEnergyChargedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
+                NSLog(@"EnergyEVSE.SessionEnergyCharged response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66662,34 +80432,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ReplacementProductList
+ * Attribute SessionEnergyDischarged
  */
-class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAttribute {
+class ReadEnergyEvseSessionEnergyDischarged : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringReplacementProductList()
-        : ReadAttribute("replacement-product-list")
+    ReadEnergyEvseSessionEnergyDischarged()
+        : ReadAttribute("session-energy-discharged")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringReplacementProductList()
+    ~ReadEnergyEvseSessionEnergyDischarged()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionEnergyDischarged::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.ReplacementProductList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSessionEnergyDischargedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EnergyEVSE.SessionEnergyDischarged response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring ReplacementProductList read Error", error);
+                LogNSError("EnergyEVSE SessionEnergyDischarged read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66698,25 +80468,25 @@ class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAtt
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseSessionEnergyDischarged : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
-        : SubscribeAttribute("replacement-product-list")
+    SubscribeAttributeEnergyEvseSessionEnergyDischarged()
+        : SubscribeAttribute("session-energy-discharged")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
+    ~SubscribeAttributeEnergyEvseSessionEnergyDischarged()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ReplacementProductList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::SessionEnergyDischarged::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66727,10 +80497,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList :
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeReplacementProductListWithParams:params
+        [cluster subscribeAttributeSessionEnergyDischargedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.ReplacementProductList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EnergyEVSE.SessionEnergyDischarged response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66749,32 +80519,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList :
 /*
  * Attribute GeneratedCommandList
  */
-class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttribute {
+class ReadEnergyEvseGeneratedCommandList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ReadEnergyEvseGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ~ReadEnergyEvseGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            NSLog(@"EnergyEVSE.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring GeneratedCommandList read Error", error);
+                LogNSError("EnergyEVSE GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66783,25 +80553,25 @@ class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttri
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+    SubscribeAttributeEnergyEvseGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ~SubscribeAttributeEnergyEvseGeneratedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::GeneratedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::GeneratedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66815,7 +80585,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : pu
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+                NSLog(@"EnergyEVSE.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66834,32 +80604,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : pu
 /*
  * Attribute AcceptedCommandList
  */
-class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttribute {
+class ReadEnergyEvseAcceptedCommandList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ReadEnergyEvseAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ~ReadEnergyEvseAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            NSLog(@"EnergyEVSE.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring AcceptedCommandList read Error", error);
+                LogNSError("EnergyEVSE AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66868,25 +80638,25 @@ class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttrib
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+    SubscribeAttributeEnergyEvseAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ~SubscribeAttributeEnergyEvseAcceptedCommandList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AcceptedCommandList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::AcceptedCommandList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66900,7 +80670,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : pub
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+                NSLog(@"EnergyEVSE.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66919,32 +80689,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : pub
 /*
  * Attribute EventList
  */
-class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
+class ReadEnergyEvseEventList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringEventList()
+    ReadEnergyEvseEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringEventList()
+    ~ReadEnergyEvseEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
+            NSLog(@"EnergyEVSE.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring EventList read Error", error);
+                LogNSError("EnergyEVSE EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66953,25 +80723,25 @@ class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+    SubscribeAttributeEnergyEvseEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+    ~SubscribeAttributeEnergyEvseEventList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::EventList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::EventList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -66985,7 +80755,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public Subscr
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
+                NSLog(@"EnergyEVSE.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67004,32 +80774,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public Subscr
 /*
  * Attribute AttributeList
  */
-class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
+class ReadEnergyEvseAttributeList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringAttributeList()
+    ReadEnergyEvseAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringAttributeList()
+    ~ReadEnergyEvseAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
+            NSLog(@"EnergyEVSE.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring AttributeList read Error", error);
+                LogNSError("EnergyEVSE AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67038,25 +80808,25 @@ class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+    SubscribeAttributeEnergyEvseAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+    ~SubscribeAttributeEnergyEvseAttributeList()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::AttributeList::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::AttributeList::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -67070,7 +80840,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public Su
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
+                NSLog(@"EnergyEVSE.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67089,32 +80859,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public Su
 /*
  * Attribute FeatureMap
  */
-class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
+class ReadEnergyEvseFeatureMap : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringFeatureMap()
+    ReadEnergyEvseFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringFeatureMap()
+    ~ReadEnergyEvseFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
+            NSLog(@"EnergyEVSE.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring FeatureMap read Error", error);
+                LogNSError("EnergyEVSE FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67123,25 +80893,25 @@ class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+    SubscribeAttributeEnergyEvseFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+    ~SubscribeAttributeEnergyEvseFeatureMap()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::FeatureMap::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::FeatureMap::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -67155,7 +80925,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public Subsc
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
+                NSLog(@"EnergyEVSE.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67174,32 +80944,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public Subsc
 /*
  * Attribute ClusterRevision
  */
-class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute {
+class ReadEnergyEvseClusterRevision : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringClusterRevision()
+    ReadEnergyEvseClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringClusterRevision()
+    ~ReadEnergyEvseClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+            NSLog(@"EnergyEVSE.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring ClusterRevision read Error", error);
+                LogNSError("EnergyEVSE ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67208,25 +80978,25 @@ class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeEnergyEvseClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+    SubscribeAttributeEnergyEvseClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+    ~SubscribeAttributeEnergyEvseClusterRevision()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::ClusterRevision::Id;
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::EnergyEvse::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::EnergyEvse::Attributes::ClusterRevision::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterEnergyEVSE alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -67240,7 +81010,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+                NSLog(@"EnergyEVSE.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68338,7 +82108,9 @@ class DoorLockUnboltDoor : public ClusterCommand {
     DoorLockUnboltDoor()
         : ClusterCommand("unbolt-door")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("PINCode", &mRequest.PINCode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -68353,11 +82125,13 @@ class DoorLockUnboltDoor : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRDoorLockClusterUnboltDoorParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.PINCode.HasValue()) {
             params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()];
         } else {
             params.pinCode = nil;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -85523,9 +99297,15 @@ class FanControlStep : public ClusterCommand {
     FanControlStep()
         : ClusterCommand("step")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("Wrap", 0, 1, &mRequest.wrap);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("LowestOff", 0, 1, &mRequest.lowestOff);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -85540,17 +99320,23 @@ class FanControlStep : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRFanControlClusterStepParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.wrap.HasValue()) {
             params.wrap = [NSNumber numberWithBool:mRequest.wrap.Value()];
         } else {
             params.wrap = nil;
         }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         if (mRequest.lowestOff.HasValue()) {
             params.lowestOff = [NSNumber numberWithBool:mRequest.lowestOff.Value()];
         } else {
             params.lowestOff = nil;
         }
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -85736,47 +99522,6 @@ class ReadFanControlFanModeSequence : public ReadAttribute {
     }
 };
 
-class WriteFanControlFanModeSequence : public WriteAttribute {
-public:
-    WriteFanControlFanModeSequence()
-        : WriteAttribute("fan-mode-sequence")
-    {
-        AddArgument("attr-name", "fan-mode-sequence");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlFanModeSequence()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::FanControl::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::FanControl::Attributes::FanModeSequence::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeFanModeSequenceWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("FanControl FanModeSequence write Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
 class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute {
 public:
     SubscribeAttributeFanControlFanModeSequence()
@@ -118107,6 +131852,7 @@ class SubscribeAttributeRadonConcentrationMeasurementClusterRevision : public Su
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MACAddress                                                        | 0x0000 |
+| * LinkLocalAddress                                                  | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -118199,6 +131945,92 @@ class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute {
     }
 };
 
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute LinkLocalAddress
+ */
+class ReadWakeOnLanLinkLocalAddress : public ReadAttribute {
+public:
+    ReadWakeOnLanLinkLocalAddress()
+        : ReadAttribute("link-local-address")
+    {
+    }
+
+    ~ReadWakeOnLanLinkLocalAddress()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WakeOnLan::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::WakeOnLan::Attributes::LinkLocalAddress::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeLinkLocalAddressWithCompletion:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WakeOnLAN.LinkLocalAddress response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("WakeOnLAN LinkLocalAddress read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeWakeOnLanLinkLocalAddress : public SubscribeAttribute {
+public:
+    SubscribeAttributeWakeOnLanLinkLocalAddress()
+        : SubscribeAttribute("link-local-address")
+    {
+    }
+
+    ~SubscribeAttributeWakeOnLanLinkLocalAddress()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::WakeOnLan::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::WakeOnLan::Attributes::LinkLocalAddress::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeLinkLocalAddressWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLAN.LinkLocalAddress response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -124409,47 +138241,6 @@ class ReadContentLauncherSupportedStreamingProtocols : public ReadAttribute {
     }
 };
 
-class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute {
-public:
-    WriteContentLauncherSupportedStreamingProtocols()
-        : WriteAttribute("supported-streaming-protocols")
-    {
-        AddArgument("attr-name", "supported-streaming-protocols");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteContentLauncherSupportedStreamingProtocols()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ContentLauncher::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeSupportedStreamingProtocolsWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("ContentLauncher SupportedStreamingProtocols write Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
 class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public SubscribeAttribute {
 public:
     SubscribeAttributeContentLauncherSupportedStreamingProtocols()
@@ -126096,62 +139887,6 @@ class ReadApplicationLauncherCurrentApp : public ReadAttribute {
     }
 };
 
-class WriteApplicationLauncherCurrentApp : public WriteAttribute {
-public:
-    WriteApplicationLauncherCurrentApp()
-        : WriteAttribute("current-app")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "current-app");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteApplicationLauncherCurrentApp()
-    {
-    }
-
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
-    {
-        constexpr chip::ClusterId clusterId = chip::app::Clusters::ApplicationLauncher::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ApplicationLauncher::Attributes::CurrentApp::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRWriteParams alloc] init];
-        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value;
-        if (mValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [MTRApplicationLauncherClusterApplicationEPStruct new];
-            value.application = [MTRApplicationLauncherClusterApplicationStruct new];
-            value.application.catalogVendorID = [NSNumber numberWithUnsignedShort:mValue.Value().application.catalogVendorID];
-            value.application.applicationID = [[NSString alloc] initWithBytes:mValue.Value().application.applicationID.data() length:mValue.Value().application.applicationID.size() encoding:NSUTF8StringEncoding];
-            if (mValue.Value().endpoint.HasValue()) {
-                value.endpoint = [NSNumber numberWithUnsignedShort:mValue.Value().endpoint.Value()];
-            } else {
-                value.endpoint = nil;
-            }
-        }
-
-        [cluster writeAttributeCurrentAppWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("ApplicationLauncher CurrentApp write Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEPStruct::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEPStruct::Type>> mComplex;
-};
-
 class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribute {
 public:
     SubscribeAttributeApplicationLauncherCurrentApp()
@@ -152821,8 +166556,12 @@ class SampleMeiAddArguments : public ClusterCommand {
     SampleMeiAddArguments()
         : ClusterCommand("add-arguments")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -152837,8 +166576,12 @@ class SampleMeiAddArguments : public ClusterCommand {
         __auto_type * cluster = [[MTRBaseClusterSampleMEI alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSampleMEIClusterAddArgumentsParams alloc] init];
         params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+#if MTR_ENABLE_PROVISIONAL
         params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         params.arg2 = [NSNumber numberWithUnsignedChar:mRequest.arg2];
+#endif // MTR_ENABLE_PROVISIONAL
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -153622,8 +167365,8 @@ void registerClusterScenes(Commands & commands)
         make_unique<SubscribeAttributeScenesSceneTableSize>(), //
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadScenesRemainingCapacity>(), //
-        make_unique<SubscribeAttributeScenesRemainingCapacity>(), //
+        make_unique<ReadScenesFabricSceneInfo>(), //
+        make_unique<SubscribeAttributeScenesFabricSceneInfo>(), //
 #endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadScenesGeneratedCommandList>(), //
         make_unique<SubscribeAttributeScenesGeneratedCommandList>(), //
@@ -154113,6 +167856,14 @@ void registerClusterBasicInformation(Commands & commands)
         make_unique<SubscribeAttributeBasicInformationCapabilityMinima>(), //
         make_unique<ReadBasicInformationProductAppearance>(), //
         make_unique<SubscribeAttributeBasicInformationProductAppearance>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBasicInformationSpecificationVersion>(), //
+        make_unique<SubscribeAttributeBasicInformationSpecificationVersion>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBasicInformationMaxPathsPerInvoke>(), //
+        make_unique<SubscribeAttributeBasicInformationMaxPathsPerInvoke>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadBasicInformationGeneratedCommandList>(), //
         make_unique<SubscribeAttributeBasicInformationGeneratedCommandList>(), //
         make_unique<ReadBasicInformationAcceptedCommandList>(), //
@@ -154494,6 +168245,9 @@ void registerClusterNetworkCommissioning(Commands & commands)
         make_unique<NetworkCommissioningRemoveNetwork>(), //
         make_unique<NetworkCommissioningConnectNetwork>(), //
         make_unique<NetworkCommissioningReorderNetwork>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<NetworkCommissioningQueryIdentity>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadAttribute>(Id), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
@@ -154514,12 +168268,18 @@ void registerClusterNetworkCommissioning(Commands & commands)
         make_unique<SubscribeAttributeNetworkCommissioningLastNetworkID>(), //
         make_unique<ReadNetworkCommissioningLastConnectErrorValue>(), //
         make_unique<SubscribeAttributeNetworkCommissioningLastConnectErrorValue>(), //
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadNetworkCommissioningSupportedWiFiBands>(), //
         make_unique<SubscribeAttributeNetworkCommissioningSupportedWiFiBands>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadNetworkCommissioningSupportedThreadFeatures>(), //
         make_unique<SubscribeAttributeNetworkCommissioningSupportedThreadFeatures>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadNetworkCommissioningThreadVersion>(), //
         make_unique<SubscribeAttributeNetworkCommissioningThreadVersion>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadNetworkCommissioningGeneratedCommandList>(), //
         make_unique<SubscribeAttributeNetworkCommissioningGeneratedCommandList>(), //
         make_unique<ReadNetworkCommissioningAcceptedCommandList>(), //
@@ -154577,6 +168337,9 @@ void registerClusterGeneralDiagnostics(Commands & commands)
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
         make_unique<GeneralDiagnosticsTestEventTrigger>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<GeneralDiagnosticsTimeSnapshot>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadAttribute>(Id), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
@@ -154598,10 +168361,6 @@ void registerClusterGeneralDiagnostics(Commands & commands)
         make_unique<SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults>(), //
         make_unique<ReadGeneralDiagnosticsTestEventTriggersEnabled>(), //
         make_unique<SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled>(), //
-#if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadGeneralDiagnosticsAverageWearCount>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsAverageWearCount>(), //
-#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadGeneralDiagnosticsGeneratedCommandList>(), //
         make_unique<SubscribeAttributeGeneralDiagnosticsGeneratedCommandList>(), //
         make_unique<ReadGeneralDiagnosticsAcceptedCommandList>(), //
@@ -155444,6 +169203,262 @@ void registerClusterIcdManagement(Commands & commands)
     commands.RegisterCluster(clusterName, clusterCommands);
 #endif // MTR_ENABLE_PROVISIONAL
 }
+void registerClusterTimer(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::Timer;
+
+    const char * clusterName = "Timer";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<TimerSetTimer>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<TimerResetTimer>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<TimerAddTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<TimerReduceTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerSetTime>(), //
+        make_unique<SubscribeAttributeTimerSetTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerTimeRemaining>(), //
+        make_unique<SubscribeAttributeTimerTimeRemaining>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerTimerState>(), //
+        make_unique<SubscribeAttributeTimerTimerState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeTimerGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeTimerAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerEventList>(), //
+        make_unique<SubscribeAttributeTimerEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerAttributeList>(), //
+        make_unique<SubscribeAttributeTimerAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerFeatureMap>(), //
+        make_unique<SubscribeAttributeTimerFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadTimerClusterRevision>(), //
+        make_unique<SubscribeAttributeTimerClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterOvenCavityOperationalState(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::OvenCavityOperationalState;
+
+    const char * clusterName = "OvenCavityOperationalState";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<OvenCavityOperationalStatePause>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<OvenCavityOperationalStateStop>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<OvenCavityOperationalStateStart>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<OvenCavityOperationalStateResume>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStatePhaseList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStatePhaseList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateCurrentPhase>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateCurrentPhase>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateCountdownTime>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateCountdownTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateOperationalStateList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateOperationalStateList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateOperationalState>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateOperationalState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateOperationalError>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateOperationalError>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateEventList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateAttributeList>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateFeatureMap>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenCavityOperationalStateClusterRevision>(), //
+        make_unique<SubscribeAttributeOvenCavityOperationalStateClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEvent>(Id), //
+        make_unique<SubscribeEvent>(Id), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterOvenMode(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::OvenMode;
+
+    const char * clusterName = "OvenMode";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<OvenModeChangeToMode>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeSupportedModes>(), //
+        make_unique<SubscribeAttributeOvenModeSupportedModes>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeCurrentMode>(), //
+        make_unique<SubscribeAttributeOvenModeCurrentMode>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeStartUpMode>(), //
+        make_unique<WriteOvenModeStartUpMode>(), //
+        make_unique<SubscribeAttributeOvenModeStartUpMode>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeOnMode>(), //
+        make_unique<WriteOvenModeOnMode>(), //
+        make_unique<SubscribeAttributeOvenModeOnMode>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOvenModeGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOvenModeAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeEventList>(), //
+        make_unique<SubscribeAttributeOvenModeEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeAttributeList>(), //
+        make_unique<SubscribeAttributeOvenModeAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeFeatureMap>(), //
+        make_unique<SubscribeAttributeOvenModeFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadOvenModeClusterRevision>(), //
+        make_unique<SubscribeAttributeOvenModeClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterLaundryDryerControls(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::LaundryDryerControls;
+
+    const char * clusterName = "LaundryDryerControls";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsSupportedDrynessLevels>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsSupportedDrynessLevels>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsSelectedDrynessLevel>(), //
+        make_unique<WriteLaundryDryerControlsSelectedDrynessLevel>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsSelectedDrynessLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsEventList>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsAttributeList>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsFeatureMap>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadLaundryDryerControlsClusterRevision>(), //
+        make_unique<SubscribeAttributeLaundryDryerControlsClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
 void registerClusterModeSelect(Commands & commands)
 {
     using namespace chip::app::Clusters::ModeSelect;
@@ -156179,6 +170194,122 @@ void registerClusterDishwasherAlarm(Commands & commands)
     commands.RegisterCluster(clusterName, clusterCommands);
 #endif // MTR_ENABLE_PROVISIONAL
 }
+void registerClusterMicrowaveOvenMode(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::MicrowaveOvenMode;
+
+    const char * clusterName = "MicrowaveOvenMode";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeSupportedModes>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeSupportedModes>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeCurrentMode>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeCurrentMode>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeEventList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeAttributeList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeFeatureMap>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenModeClusterRevision>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenModeClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterMicrowaveOvenControl(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::MicrowaveOvenControl;
+
+    const char * clusterName = "MicrowaveOvenControl";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<MicrowaveOvenControlSetCookingParameters>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<MicrowaveOvenControlAddMoreTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlCookTime>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlCookTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlPowerSetting>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlPowerSetting>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlMinPower>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlMinPower>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlMaxPower>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlMaxPower>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlPowerStep>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlPowerStep>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlEventList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlAttributeList>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlFeatureMap>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadMicrowaveOvenControlClusterRevision>(), //
+        make_unique<SubscribeAttributeMicrowaveOvenControlClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
 void registerClusterOperationalState(Commands & commands)
 {
 #if MTR_ENABLE_PROVISIONAL
@@ -156475,6 +170606,424 @@ void registerClusterActivatedCarbonFilterMonitoring(Commands & commands)
     commands.RegisterCluster(clusterName, clusterCommands);
 #endif // MTR_ENABLE_PROVISIONAL
 }
+void registerClusterBooleanSensorConfiguration(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::BooleanSensorConfiguration;
+
+    const char * clusterName = "BooleanSensorConfiguration";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<BooleanSensorConfigurationSuppressRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationSensitivityLevel>(), //
+        make_unique<WriteBooleanSensorConfigurationSensitivityLevel>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationSensitivityLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationAlarmsActive>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationAlarmsActive>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationAlarmsSuppressed>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationAlarmsEnabled>(), //
+        make_unique<WriteBooleanSensorConfigurationAlarmsEnabled>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationAlarmsEnabled>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationEventList>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationAttributeList>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationFeatureMap>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadBooleanSensorConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeBooleanSensorConfigurationClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEvent>(Id), //
+        make_unique<SubscribeEvent>(Id), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterValveConfigurationAndControl(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::ValveConfigurationAndControl;
+
+    const char * clusterName = "ValveConfigurationAndControl";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ValveConfigurationAndControlOpen>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ValveConfigurationAndControlClose>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ValveConfigurationAndControlSetLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlOpenDuration>(), //
+        make_unique<WriteValveConfigurationAndControlOpenDuration>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlOpenDuration>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlAutoCloseTime>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlAutoCloseTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlRemainingDuration>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlRemainingDuration>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlCurrentState>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlCurrentState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlTargetState>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlTargetState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlStartUpState>(), //
+        make_unique<WriteValveConfigurationAndControlStartUpState>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlStartUpState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlCurrentLevel>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlCurrentLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlTargetLevel>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlTargetLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlOpenLevel>(), //
+        make_unique<WriteValveConfigurationAndControlOpenLevel>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlOpenLevel>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlValveFault>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlValveFault>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlEventList>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlAttributeList>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlFeatureMap>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadValveConfigurationAndControlClusterRevision>(), //
+        make_unique<SubscribeAttributeValveConfigurationAndControlClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEvent>(Id), //
+        make_unique<SubscribeEvent>(Id), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterDemandResponseLoadControl(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::DemandResponseLoadControl;
+
+    const char * clusterName = "DemandResponseLoadControl";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<DemandResponseLoadControlRegisterLoadControlProgramRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<DemandResponseLoadControlUnregisterLoadControlProgramRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<DemandResponseLoadControlAddLoadControlEventRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<DemandResponseLoadControlRemoveLoadControlEventRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<DemandResponseLoadControlClearLoadControlEventsRequest>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlLoadControlPrograms>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlLoadControlPrograms>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlNumberOfLoadControlPrograms>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlNumberOfLoadControlPrograms>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlEvents>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlEvents>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlActiveEvents>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlActiveEvents>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlNumberOfEventsPerProgram>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlNumberOfEventsPerProgram>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlNumberOfTransitions>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlNumberOfTransitions>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlDefaultRandomStart>(), //
+        make_unique<WriteDemandResponseLoadControlDefaultRandomStart>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlDefaultRandomStart>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlDefaultRandomDuration>(), //
+        make_unique<WriteDemandResponseLoadControlDefaultRandomDuration>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlDefaultRandomDuration>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlEventList>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlAttributeList>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlFeatureMap>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadDemandResponseLoadControlClusterRevision>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEvent>(Id), //
+        make_unique<SubscribeEvent>(Id), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+void registerClusterEnergyEvse(Commands & commands)
+{
+#if MTR_ENABLE_PROVISIONAL
+    using namespace chip::app::Clusters::EnergyEvse;
+
+    const char * clusterName = "EnergyEvse";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseDisable>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseEnableCharging>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseEnableDischarging>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseStartDiagnostics>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseSetTargets>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseGetTargets>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<EnergyEvseClearTargets>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAttribute>(Id), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseState>(), //
+        make_unique<SubscribeAttributeEnergyEvseState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseSupplyState>(), //
+        make_unique<SubscribeAttributeEnergyEvseSupplyState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseFaultState>(), //
+        make_unique<SubscribeAttributeEnergyEvseFaultState>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseChargingEnabledUntil>(), //
+        make_unique<SubscribeAttributeEnergyEvseChargingEnabledUntil>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseDischargingEnabledUntil>(), //
+        make_unique<SubscribeAttributeEnergyEvseDischargingEnabledUntil>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseCircuitCapacity>(), //
+        make_unique<SubscribeAttributeEnergyEvseCircuitCapacity>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseMinimumChargeCurrent>(), //
+        make_unique<SubscribeAttributeEnergyEvseMinimumChargeCurrent>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseMaximumChargeCurrent>(), //
+        make_unique<SubscribeAttributeEnergyEvseMaximumChargeCurrent>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseMaximumDischargeCurrent>(), //
+        make_unique<SubscribeAttributeEnergyEvseMaximumDischargeCurrent>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseUserMaximumChargeCurrent>(), //
+        make_unique<WriteEnergyEvseUserMaximumChargeCurrent>(), //
+        make_unique<SubscribeAttributeEnergyEvseUserMaximumChargeCurrent>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseRandomizationDelayWindow>(), //
+        make_unique<WriteEnergyEvseRandomizationDelayWindow>(), //
+        make_unique<SubscribeAttributeEnergyEvseRandomizationDelayWindow>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNumberOfWeeklyTargets>(), //
+        make_unique<SubscribeAttributeEnergyEvseNumberOfWeeklyTargets>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNumberOfDailyTargets>(), //
+        make_unique<SubscribeAttributeEnergyEvseNumberOfDailyTargets>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNextChargeStartTime>(), //
+        make_unique<SubscribeAttributeEnergyEvseNextChargeStartTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNextChargeTargetTime>(), //
+        make_unique<SubscribeAttributeEnergyEvseNextChargeTargetTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNextChargeRequiredEnergy>(), //
+        make_unique<SubscribeAttributeEnergyEvseNextChargeRequiredEnergy>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseNextChargeTargetSoC>(), //
+        make_unique<SubscribeAttributeEnergyEvseNextChargeTargetSoC>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseApproximateEVEfficiency>(), //
+        make_unique<WriteEnergyEvseApproximateEVEfficiency>(), //
+        make_unique<SubscribeAttributeEnergyEvseApproximateEVEfficiency>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseStateOfCharge>(), //
+        make_unique<SubscribeAttributeEnergyEvseStateOfCharge>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseBatteryCapacity>(), //
+        make_unique<SubscribeAttributeEnergyEvseBatteryCapacity>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseVehicleID>(), //
+        make_unique<SubscribeAttributeEnergyEvseVehicleID>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseSessionID>(), //
+        make_unique<SubscribeAttributeEnergyEvseSessionID>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseSessionDuration>(), //
+        make_unique<SubscribeAttributeEnergyEvseSessionDuration>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseSessionEnergyCharged>(), //
+        make_unique<SubscribeAttributeEnergyEvseSessionEnergyCharged>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseSessionEnergyDischarged>(), //
+        make_unique<SubscribeAttributeEnergyEvseSessionEnergyDischarged>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeEnergyEvseGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeEnergyEvseAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseEventList>(), //
+        make_unique<SubscribeAttributeEnergyEvseEventList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseAttributeList>(), //
+        make_unique<SubscribeAttributeEnergyEvseAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseFeatureMap>(), //
+        make_unique<SubscribeAttributeEnergyEvseFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEnergyEvseClusterRevision>(), //
+        make_unique<SubscribeAttributeEnergyEvseClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadEvent>(Id), //
+        make_unique<SubscribeEvent>(Id), //
+    };
+
+    commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
+}
 void registerClusterDoorLock(Commands & commands)
 {
     using namespace chip::app::Clusters::DoorLock;
@@ -157012,7 +171561,6 @@ void registerClusterFanControl(Commands & commands)
         make_unique<WriteFanControlFanMode>(), //
         make_unique<SubscribeAttributeFanControlFanMode>(), //
         make_unique<ReadFanControlFanModeSequence>(), //
-        make_unique<WriteFanControlFanModeSequence>(), //
         make_unique<SubscribeAttributeFanControlFanModeSequence>(), //
         make_unique<ReadFanControlPercentSetting>(), //
         make_unique<WriteFanControlPercentSetting>(), //
@@ -158451,6 +172999,10 @@ void registerClusterWakeOnLan(Commands & commands)
         make_unique<SubscribeAttribute>(Id), //
         make_unique<ReadWakeOnLanMACAddress>(), //
         make_unique<SubscribeAttributeWakeOnLanMACAddress>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadWakeOnLanLinkLocalAddress>(), //
+        make_unique<SubscribeAttributeWakeOnLanLinkLocalAddress>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadWakeOnLanGeneratedCommandList>(), //
         make_unique<SubscribeAttributeWakeOnLanGeneratedCommandList>(), //
         make_unique<ReadWakeOnLanAcceptedCommandList>(), //
@@ -158708,7 +173260,6 @@ void registerClusterContentLauncher(Commands & commands)
         make_unique<ReadContentLauncherAcceptHeader>(), //
         make_unique<SubscribeAttributeContentLauncherAcceptHeader>(), //
         make_unique<ReadContentLauncherSupportedStreamingProtocols>(), //
-        make_unique<WriteContentLauncherSupportedStreamingProtocols>(), //
         make_unique<SubscribeAttributeContentLauncherSupportedStreamingProtocols>(), //
         make_unique<ReadContentLauncherGeneratedCommandList>(), //
         make_unique<SubscribeAttributeContentLauncherGeneratedCommandList>(), //
@@ -158780,7 +173331,6 @@ void registerClusterApplicationLauncher(Commands & commands)
         make_unique<ReadApplicationLauncherCatalogList>(), //
         make_unique<SubscribeAttributeApplicationLauncherCatalogList>(), //
         make_unique<ReadApplicationLauncherCurrentApp>(), //
-        make_unique<WriteApplicationLauncherCurrentApp>(), //
         make_unique<SubscribeAttributeApplicationLauncherCurrentApp>(), //
         make_unique<ReadApplicationLauncherGeneratedCommandList>(), //
         make_unique<SubscribeAttributeApplicationLauncherGeneratedCommandList>(), //
@@ -159582,6 +174132,10 @@ void registerClusters(Commands & commands)
     registerClusterUserLabel(commands);
     registerClusterBooleanState(commands);
     registerClusterIcdManagement(commands);
+    registerClusterTimer(commands);
+    registerClusterOvenCavityOperationalState(commands);
+    registerClusterOvenMode(commands);
+    registerClusterLaundryDryerControls(commands);
     registerClusterModeSelect(commands);
     registerClusterLaundryWasherMode(commands);
     registerClusterRefrigeratorAndTemperatureControlledCabinetMode(commands);
@@ -159594,10 +174148,16 @@ void registerClusters(Commands & commands)
     registerClusterAirQuality(commands);
     registerClusterSmokeCoAlarm(commands);
     registerClusterDishwasherAlarm(commands);
+    registerClusterMicrowaveOvenMode(commands);
+    registerClusterMicrowaveOvenControl(commands);
     registerClusterOperationalState(commands);
     registerClusterRvcOperationalState(commands);
     registerClusterHepaFilterMonitoring(commands);
     registerClusterActivatedCarbonFilterMonitoring(commands);
+    registerClusterBooleanSensorConfiguration(commands);
+    registerClusterValveConfigurationAndControl(commands);
+    registerClusterDemandResponseLoadControl(commands);
+    registerClusterEnergyEvse(commands);
     registerClusterDoorLock(commands);
     registerClusterWindowCovering(commands);
     registerClusterBarrierControl(commands);
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 5cce9bf5cd4a62..1c9892f1a4c767 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -86,7 +86,6 @@ class TestList : public Command {
         printf("Test_TC_RNCONC_2_1\n");
         printf("Test_TC_TVOCCONC_1_1\n");
         printf("Test_TC_TVOCCONC_2_1\n");
-        printf("TestIcdManagementCluster\n");
         printf("Test_TC_OPCREDS_1_2\n");
         printf("Test_TC_BINFO_1_1\n");
         printf("Test_TC_CNET_1_3\n");
@@ -110,6 +109,7 @@ class TestList : public Command {
         printf("Test_TC_DGGEN_1_1\n");
         printf("Test_TC_GRPKEY_1_1\n");
         printf("Test_TC_GRPKEY_2_2\n");
+        printf("TestIcdManagementCluster\n");
         printf("Test_TC_ICDM_1_1\n");
         printf("Test_TC_I_1_1\n");
         printf("Test_TC_I_2_1\n");
@@ -195,6 +195,7 @@ class TestList : public Command {
         printf("Test_TC_PCC_2_3\n");
         printf("Test_TC_PCC_2_4\n");
         printf("Test_TC_REFALM_1_1\n");
+        printf("Test_TC_REFALM_2_1\n");
         printf("Test_TC_RH_1_1\n");
         printf("Test_TC_RVCCLEANM_1_1\n");
         printf("Test_TC_RVCRUNM_1_1\n");
@@ -295,6 +296,7 @@ class TestList : public Command {
         printf("Test_TC_DRLK_2_11\n");
         printf("TestGroupsCluster\n");
         printf("Test_TC_G_1_1\n");
+        printf("TestScenesFabricRemoval\n");
         printf("Test_TC_S_1_1\n");
         printf("Test_TC_S_2_1\n");
         printf("Test_TC_S_2_4\n");
@@ -738,7 +740,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entries Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entries: Error: %@", err);
+            } else {
+                NSLog(@"Write entries: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -758,7 +764,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -903,7 +913,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entries empty lists Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entries empty lists: Error: %@", err);
+            } else {
+                NSLog(@"Write entries empty lists: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -923,7 +937,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -981,7 +999,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry invalid privilege Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry invalid privilege: Error: %@", err);
+            } else {
+                NSLog(@"Write entry invalid privilege: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -1000,7 +1022,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1053,7 +1079,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry invalid auth mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry invalid auth mode: Error: %@", err);
+            } else {
+                NSLog(@"Write entry invalid auth mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -1072,7 +1102,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1130,7 +1164,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry invalid subject Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry invalid subject: Error: %@", err);
+            } else {
+                NSLog(@"Write entry invalid subject: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -1149,7 +1187,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1210,7 +1252,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry invalid target Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry invalid target: Error: %@", err);
+            } else {
+                NSLog(@"Write entry invalid target: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -1229,7 +1275,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1325,7 +1375,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry too many subjects Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry too many subjects: Error: %@", err);
+            } else {
+                NSLog(@"Write entry too many subjects: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
@@ -1344,7 +1398,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1520,7 +1578,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write entry too many targets Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write entry too many targets: Error: %@", err);
+            } else {
+                NSLog(@"Write entry too many targets: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
@@ -1539,7 +1601,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1776,7 +1842,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write too many entries Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write too many entries: Error: %@", err);
+            } else {
+                NSLog(@"Write too many entries: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
             NextTest();
@@ -1795,7 +1865,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1924,7 +1998,11 @@ class TestAccessControlCluster : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Restore ACL Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Restore ACL: Error: %@", err);
+            } else {
+                NSLog(@"Restore ACL: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1944,7 +2022,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify: Error: %@", err);
+            } else {
+                NSLog(@"Verify: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1972,7 +2054,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSubjectsPerAccessControlEntryWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (SubjectsPerAccessControlEntry) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate resource minima (SubjectsPerAccessControlEntry): Error: %@", err);
+            } else {
+                NSLog(@"Validate resource minima (SubjectsPerAccessControlEntry): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -1992,7 +2078,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetsPerAccessControlEntryWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (TargetsPerAccessControlEntry) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate resource minima (TargetsPerAccessControlEntry): Error: %@", err);
+            } else {
+                NSLog(@"Validate resource minima (TargetsPerAccessControlEntry): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2012,7 +2102,11 @@ class TestAccessControlCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAccessControlEntriesPerFabricWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (AccessControlEntriesPerFabric) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate resource minima (AccessControlEntriesPerFabric): Error: %@", err);
+            } else {
+                NSLog(@"Validate resource minima (AccessControlEntriesPerFabric): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2188,7 +2282,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2212,7 +2310,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads FeatureMap attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2236,7 +2338,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2266,7 +2372,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2295,7 +2405,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute (Extension) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute (Extension) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute (Extension) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2316,7 +2430,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2340,7 +2458,11 @@ class Test_TC_ACL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2481,7 +2603,11 @@ class Test_TC_ACL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSubjectsPerAccessControlEntryWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads SubjectsPerAccessControlEntry attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads SubjectsPerAccessControlEntry attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads SubjectsPerAccessControlEntry attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2503,7 +2629,11 @@ class Test_TC_ACL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetsPerAccessControlEntryWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads TargetsPerAccessControlEntry attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads TargetsPerAccessControlEntry attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads TargetsPerAccessControlEntry attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2525,7 +2655,11 @@ class Test_TC_ACL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAccessControlEntriesPerFabricWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AccessControlEntriesPerFabric attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AccessControlEntriesPerFabric attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AccessControlEntriesPerFabric attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2857,7 +2991,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster CurrentFabricIndex attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster CurrentFabricIndex attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster CurrentFabricIndex attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2881,7 +3019,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2914,7 +3056,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct: Data field: D_OK_EMPTY : 1718 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct: Data field: D_OK_EMPTY : 1718: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct: Data field: D_OK_EMPTY : 1718: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2934,7 +3080,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2971,7 +3121,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_SINGLE :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_SINGLE :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_SINGLE :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -2991,7 +3145,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3028,7 +3186,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_FULL :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_FULL :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_OK_FULL :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3048,7 +3210,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3085,7 +3251,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_LENGTH :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_LENGTH :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_LENGTH :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3112,7 +3282,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 11: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_STRUCT : 1518 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_STRUCT : 1518: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_STRUCT : 1518: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3139,7 +3313,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 12: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_LIST :3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_LIST :3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_LIST :3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3166,7 +3344,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 13: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_ELEM :17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_ELEM :17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_ELEM :17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3193,7 +3375,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 14: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_OVERFLOW : 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_OVERFLOW : 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1 .struct Data field: D_BAD_OVERFLOW : 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3220,7 +3406,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 15: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_UNDERFLOW :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 15: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_UNDERFLOW :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700: Error: %@", err);
+            } else {
+                NSLog(@"Step 15: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1. struct Data field: D_BAD_UNDERFLOW :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3247,7 +3437,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 16: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_BAD_NONE Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 16: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_BAD_NONE: Error: %@", err);
+            } else {
+                NSLog(@"Step 16: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element 1.struct Data field: D_BAD_NONE: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3279,7 +3473,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 17: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements . value is list of AccessControlExtensionStruct containing 2 elements . first element contains Data field: D_OK_EMPTY 1718 . second element contains Data field: D_OK_SINGLE 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 17: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements . value is list of AccessControlExtensionStruct containing 2 elements . first element contains Data field: D_OK_EMPTY 1718 . second element contains Data field: D_OK_SINGLE 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Error: %@", err);
+            } else {
+                NSLog(@"Step 17: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements . value is list of AccessControlExtensionStruct containing 2 elements . first element contains Data field: D_OK_EMPTY 1718 . second element contains Data field: D_OK_SINGLE 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -3298,7 +3496,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 18: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 18: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 18: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3330,7 +3532,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
             extensionArgument = temp_0;
         }
         [cluster writeAttributeExtensionWithValue:extensionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 19: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is an empty list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 19: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is an empty list: Error: %@", err);
+            } else {
+                NSLog(@"Step 19: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is an empty list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3350,7 +3556,11 @@ class Test_TC_ACL_2_3 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeExtensionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 20: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 20: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 20: TH1 reads DUT Endpoint 0 AccessControl cluster Extension attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3758,7 +3968,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP2 - Write ACL giving admin privilege on all EP0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP2 - Write ACL giving admin privilege on all EP0: Error: %@", err);
+            } else {
+                NSLog(@"TP2 - Write ACL giving admin privilege on all EP0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3778,7 +3992,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeNOCsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP3 - Read the NOC attribute (Node operational credentials - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP3 - Read the NOC attribute (Node operational credentials - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP3 - Read the NOC attribute (Node operational credentials - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3800,7 +4018,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP4 - Write the location attribute (Basic - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP4 - Write the location attribute (Basic - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP4 - Write the location attribute (Basic - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3821,7 +4043,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         params.label = @"TestFabric";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer) Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3841,7 +4067,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"TestNode";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP6 - Write NodeLabel attribute (Basic - requires manage) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP6 - Write NodeLabel attribute (Basic - requires manage): Error: %@", err);
+            } else {
+                NSLog(@"TP6 - Write NodeLabel attribute (Basic - requires manage): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3865,7 +4095,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster testEventTriggerWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"TP7 - Send TestEventTrigger (General Diagnostics - requires manage) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"TP7 - Send TestEventTrigger (General Diagnostics - requires manage): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"TP7 - Send TestEventTrigger (General Diagnostics - requires manage): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                            NextTest();
@@ -3882,7 +4116,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP8 - Tead the VendorID attribute (Basic - requires view) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP8 - Tead the VendorID attribute (Basic - requires view): Error: %@", err);
+            } else {
+                NSLog(@"TP8 - Tead the VendorID attribute (Basic - requires view): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3954,7 +4192,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0: Error: %@", err);
+            } else {
+                NSLog(@"TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -3974,7 +4216,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeNOCsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP10 - Read the NOC attribute (Node operational credentials - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP10 - Read the NOC attribute (Node operational credentials - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP10 - Read the NOC attribute (Node operational credentials - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -3993,7 +4239,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP11 - Write the location attribute (Basic - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP11 - Write the location attribute (Basic - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP11 - Write the location attribute (Basic - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4013,7 +4263,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         params.label = @"TestFabric";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer) Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                             NextTest();
@@ -4032,7 +4286,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"TestNode";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP13(6) - Write NodeLabel attribute (Basic - requires manage) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP13(6) - Write NodeLabel attribute (Basic - requires manage): Error: %@", err);
+            } else {
+                NSLog(@"TP13(6) - Write NodeLabel attribute (Basic - requires manage): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4056,7 +4314,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster testEventTriggerWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                            NextTest();
@@ -4073,7 +4335,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP13(8) - Tead the VendorID attribute (Basic - requires view) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP13(8) - Tead the VendorID attribute (Basic - requires view): Error: %@", err);
+            } else {
+                NSLog(@"TP13(8) - Tead the VendorID attribute (Basic - requires view): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4145,7 +4411,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0: Error: %@", err);
+            } else {
+                NSLog(@"TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4165,7 +4435,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeNOCsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP15(10) - Read the NOC attribute (Node operational credentials - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP15(10) - Read the NOC attribute (Node operational credentials - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP15(10) - Read the NOC attribute (Node operational credentials - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4184,7 +4458,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP15(11) - Write the location attribute (Basic - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP15(11) - Write the location attribute (Basic - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP15(11) - Write the location attribute (Basic - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4204,7 +4482,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         params.label = @"TestFabric";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer) Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                             NextTest();
@@ -4223,7 +4505,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"TestNode";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP16 - Write NodeLabel attribute (Basic - requires manage) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP16 - Write NodeLabel attribute (Basic - requires manage): Error: %@", err);
+            } else {
+                NSLog(@"TP16 - Write NodeLabel attribute (Basic - requires manage): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4246,7 +4532,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster testEventTriggerWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"TP17 - Send TestEventTrigger (General Diagnostics - requires manage) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"TP17 - Send TestEventTrigger (General Diagnostics - requires manage): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"TP17 - Send TestEventTrigger (General Diagnostics - requires manage): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                            NextTest();
@@ -4263,7 +4553,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP18(8) - Tead the VendorID attribute (Basic - requires view) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP18(8) - Tead the VendorID attribute (Basic - requires view): Error: %@", err);
+            } else {
+                NSLog(@"TP18(8) - Tead the VendorID attribute (Basic - requires view): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4335,7 +4629,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0: Error: %@", err);
+            } else {
+                NSLog(@"TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4355,7 +4653,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeNOCsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP20(10) - Read the NOC attribute (Node operational credentials - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP20(10) - Read the NOC attribute (Node operational credentials - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP20(10) - Read the NOC attribute (Node operational credentials - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4374,7 +4676,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP20(11) - Write the location attribute (Basic - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP20(11) - Write the location attribute (Basic - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP20(11) - Write the location attribute (Basic - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4394,7 +4700,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         params.label = @"TestFabric";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer) Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                             NextTest();
@@ -4413,7 +4723,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"TestNode";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP21(16) - Write NodeLabel attribute (Basic - requires manage) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP21(16) - Write NodeLabel attribute (Basic - requires manage): Error: %@", err);
+            } else {
+                NSLog(@"TP21(16) - Write NodeLabel attribute (Basic - requires manage): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4436,7 +4750,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster testEventTriggerWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                            NextTest();
@@ -4453,7 +4771,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP22(8) - Tead the VendorID attribute (Basic - requires view) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP22(8) - Tead the VendorID attribute (Basic - requires view): Error: %@", err);
+            } else {
+                NSLog(@"TP22(8) - Tead the VendorID attribute (Basic - requires view): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4501,7 +4823,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP23 - Write ACL giving only admin privilege ACL cluster Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP23 - Write ACL giving only admin privilege ACL cluster: Error: %@", err);
+            } else {
+                NSLog(@"TP23 - Write ACL giving only admin privilege ACL cluster: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4521,7 +4847,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeNOCsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP24(10) - Read the NOC attribute (Node operational credentials - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP24(10) - Read the NOC attribute (Node operational credentials - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP24(10) - Read the NOC attribute (Node operational credentials - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4540,7 +4870,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP24(11) - Write the location attribute (Basic - requires administer) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP24(11) - Write the location attribute (Basic - requires administer): Error: %@", err);
+            } else {
+                NSLog(@"TP24(11) - Write the location attribute (Basic - requires administer): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4560,7 +4894,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         params.label = @"TestFabric";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer) Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer): Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                             NextTest();
@@ -4579,7 +4917,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"TestNode";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP25(16) - Write NodeLabel attribute (Basic - requires manage) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP25(16) - Write NodeLabel attribute (Basic - requires manage): Error: %@", err);
+            } else {
+                NSLog(@"TP25(16) - Write NodeLabel attribute (Basic - requires manage): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4602,7 +4944,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster testEventTriggerWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
                                                            NextTest();
@@ -4619,7 +4965,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TP26 - Tead the VendorID attribute (Basic - requires view) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP26 - Tead the VendorID attribute (Basic - requires view): Error: %@", err);
+            } else {
+                NSLog(@"TP26 - Tead the VendorID attribute (Basic - requires view): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -4656,7 +5006,11 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TP27 - Write ACL to restore full access Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TP27 - Write ACL to restore full access: Error: %@", err);
+            } else {
+                NSLog(@"TP27 - Write ACL to restore full access: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -4812,8 +5166,8 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             err = TestStep7Th1ReadsDescriptorClusterExpectSuccess_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS\n");
-            err = TestStep8Th1ReadsBasicClusterExpectUnsupportedAccess_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect UNSUPPORTED_ACCESS\n");
+            err = TestStep8Th1ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectUnsupportedAccess_15();
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS\n");
@@ -4832,20 +5186,20 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             err = TestStep9Th2ReadsDescriptorClusterExpectUnsupportedAccess_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 10: TH2 reads basic cluster - expect SUCCESS\n");
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect SUCCESS\n");
             if (ShouldSkip("PICS_SDK_CI_ONLY")) {
                 NextTest();
                 return;
             }
-            err = TestStep10Th2ReadsBasicClusterExpectSuccess_18();
+            err = TestStep10Th2ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectSuccess_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Step 10: TH2 reads basic cluster - expect SUCCESS\n");
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect SUCCESS\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestStep10Th2ReadsBasicClusterExpectSuccess_19();
+            err = TestStep10Th2ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectSuccess_19();
             break;
         case 20:
             ChipLogProgress(chipTool, " ***** Test Step 20 : Step 11: TH1 resets ACL to default\n");
@@ -4985,7 +5339,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH1 reads the fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH1 reads the fabric index: Error: %@", err);
+            } else {
+                NSLog(@"TH1 reads the fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5027,7 +5385,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
         [cluster openCommissioningWindowWithParams:params completion:
                                                               ^(NSError * _Nullable err) {
-                                                                  NSLog(@"Step 2: Open Commissioning Window from alpha Error: %@", err);
+                                                                  if (err != nil) {
+                                                                      NSLog(@"Step 2: Open Commissioning Window from alpha: Error: %@", err);
+                                                                  } else {
+                                                                      NSLog(@"Step 2: Open Commissioning Window from alpha: Success");
+                                                                  }
 
                                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5071,7 +5433,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH2 reads the fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH2 reads the fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH2 reads the fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5166,7 +5532,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5: TH1 writes ACL giving view privilege for descriptor cluster Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH1 writes ACL giving view privilege for descriptor cluster: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH1 writes ACL giving view privilege for descriptor cluster: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5247,7 +5617,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6: TH2 writes ACL giving view privilge for basic cluster Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH2 writes ACL giving view privilge for basic cluster: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH2 writes ACL giving view privilge for basic cluster: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5275,7 +5649,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDeviceTypeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH1 reads descriptor cluster - expect SUCCESS Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH1 reads descriptor cluster - expect SUCCESS: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH1 reads descriptor cluster - expect SUCCESS: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5285,7 +5663,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep8Th1ReadsBasicClusterExpectUnsupportedAccess_15()
+    CHIP_ERROR TestStep8Th1ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectUnsupportedAccess_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -5293,7 +5671,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect UNSUPPORTED_ACCESS: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect UNSUPPORTED_ACCESS: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -5310,7 +5692,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDeviceTypeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS));
             NextTest();
@@ -5329,7 +5715,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestStep10Th2ReadsBasicClusterExpectSuccess_18()
+    CHIP_ERROR TestStep10Th2ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectSuccess_18()
     {
 
         MTRBaseDevice * device = GetDevice("beta");
@@ -5337,7 +5723,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH2 reads basic cluster - expect SUCCESS Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect SUCCESS: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID attribute - expect SUCCESS: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5347,7 +5737,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep10Th2ReadsBasicClusterExpectSuccess_19()
+    CHIP_ERROR TestStep10Th2ReadsDutEndpoint0BasicInformationClusterVendorIDAttributeExpectSuccess_19()
     {
 
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
@@ -5385,7 +5775,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 11: TH1 resets ACL to default Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH1 resets ACL to default: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH1 resets ACL to default: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5407,7 +5801,11 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             [th2FabricIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Step 12: TH1 sends RemoveFabric command for TH2 Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 12: TH1 sends RemoveFabric command for TH2: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 12: TH1 sends RemoveFabric command for TH2: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5628,7 +6026,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5652,7 +6054,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5676,7 +6082,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given AIRQUAL.S.F00(Fair) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given AIRQUAL.S.F00(Fair) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given AIRQUAL.S.F00(Fair) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5695,7 +6105,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given AIRQUAL.S.F01(Moderate) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given AIRQUAL.S.F01(Moderate) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given AIRQUAL.S.F01(Moderate) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5714,7 +6128,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given AIRQUAL.S.F02(VeryPoor) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given AIRQUAL.S.F02(VeryPoor) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given AIRQUAL.S.F02(VeryPoor) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5733,7 +6151,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given AIRQUAL.S.F03(ExtremelyPoor) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given AIRQUAL.S.F03(ExtremelyPoor) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given AIRQUAL.S.F03(ExtremelyPoor) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5752,7 +6174,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5779,7 +6205,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5805,7 +6235,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5824,7 +6258,11 @@ class Test_TC_AIRQUAL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -5943,7 +6381,11 @@ class Test_TC_AIRQUAL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAirQualityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the AirQuality attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the AirQuality attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the AirQuality attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6121,7 +6563,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6145,7 +6591,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6169,7 +6619,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6196,7 +6650,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6222,7 +6680,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6246,7 +6708,11 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6365,7 +6831,11 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read mandatory non-global attribute: StateValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read mandatory non-global attribute: StateValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read mandatory non-global attribute: StateValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6705,7 +7175,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6729,7 +7203,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6753,7 +7231,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6780,7 +7262,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6806,7 +7292,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(VendorName) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(VendorName) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(VendorName) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6827,7 +7317,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads optional attribute(VendorID) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads optional attribute(VendorID) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads optional attribute(VendorID) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6848,7 +7342,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute(ProductName) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute(ProductName) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute(ProductName) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6869,7 +7367,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads optional attribute(NodeLabel) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads optional attribute(NodeLabel) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads optional attribute(NodeLabel) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6890,7 +7392,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads optional attribute(HardwareVersion) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads optional attribute(HardwareVersion) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads optional attribute(HardwareVersion) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6911,7 +7417,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads optional attribute(HardwareVersionString) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads optional attribute(HardwareVersionString) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads optional attribute(HardwareVersionString) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6932,7 +7442,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads optional attribute(SoftwareVersion) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads optional attribute(SoftwareVersion) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads optional attribute(SoftwareVersion) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6953,7 +7467,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads optional attribute(SoftwareVersionString) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads optional attribute(SoftwareVersionString) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads optional attribute(SoftwareVersionString) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6974,7 +7492,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads optional attribute(ManufacturingDate) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads optional attribute(ManufacturingDate) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads optional attribute(ManufacturingDate) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -6995,7 +7517,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: TH reads optional attribute(PartNumber) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: TH reads optional attribute(PartNumber) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: TH reads optional attribute(PartNumber) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7016,7 +7542,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4l: TH reads optional attribute(ProductURL) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4l: TH reads optional attribute(ProductURL) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4l: TH reads optional attribute(ProductURL) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7037,7 +7567,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4m: TH reads optional attribute(ProductLabel) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4m: TH reads optional attribute(ProductLabel) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4m: TH reads optional attribute(ProductLabel) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7058,7 +7592,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4n: TH reads optional attribute(SerialNumber) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4n: TH reads optional attribute(SerialNumber) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4n: TH reads optional attribute(SerialNumber) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7079,7 +7617,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4o: TH reads optional attribute(UniqueID) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4o: TH reads optional attribute(UniqueID) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4o: TH reads optional attribute(UniqueID) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7100,7 +7642,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7124,7 +7670,11 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH1 reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH1 reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH1 reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7304,7 +7854,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7328,7 +7882,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7352,7 +7910,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7380,7 +7942,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7407,7 +7973,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(SetupURL) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(SetupURL) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(SetupURL) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7438,7 +8008,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7458,7 +8032,11 @@ class Test_TC_ACT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7627,7 +8205,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7651,7 +8233,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7675,7 +8261,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7702,7 +8292,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7728,7 +8322,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -7752,7 +8350,11 @@ class Test_TC_BIND_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8710,7 +9312,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8734,7 +9340,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8758,7 +9368,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given CC.S.F00(HS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given CC.S.F00(HS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given CC.S.F00(HS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8777,7 +9391,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given CC.S.F01(EHue) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given CC.S.F01(EHue) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given CC.S.F01(EHue) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8796,7 +9414,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given CC.S.F02(CL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given CC.S.F02(CL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given CC.S.F02(CL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8815,7 +9437,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given CC.S.F03(XY) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given CC.S.F03(XY) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given CC.S.F03(XY) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8834,7 +9460,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given CC.S.F04(CT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given CC.S.F04(CT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given CC.S.F04(CT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8853,7 +9483,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8883,7 +9517,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8912,7 +9550,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(CurrentHue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(CurrentHue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(CurrentHue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8933,7 +9575,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute(CurrentSaturation) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute(CurrentSaturation) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute(CurrentSaturation) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8954,7 +9600,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional attribute(RemainingTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional attribute(RemainingTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional attribute(RemainingTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8975,7 +9625,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional attribute(CurrentX) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional attribute(CurrentX) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional attribute(CurrentX) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -8996,7 +9650,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional attribute(CurrentY) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional attribute(CurrentY) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional attribute(CurrentY) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9017,7 +9675,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read the optional attribute(DriftCompensation) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read the optional attribute(DriftCompensation) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read the optional attribute(DriftCompensation) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9038,7 +9700,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional attribute(CompensationText) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional attribute(CompensationText) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional attribute(CompensationText) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9059,7 +9725,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Read the optional attribute(ColorTemperatureMireds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Read the optional attribute(ColorTemperatureMireds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Read the optional attribute(ColorTemperatureMireds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9080,7 +9750,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional attribute(NumberOfPrimaries) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional attribute(NumberOfPrimaries) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional attribute(NumberOfPrimaries) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9101,7 +9775,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Read the optional attribute(Primary1X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Read the optional attribute(Primary1X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Read the optional attribute(Primary1X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9122,7 +9800,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4l: Read the optional attribute(Primary1Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4l: Read the optional attribute(Primary1Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4l: Read the optional attribute(Primary1Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9143,7 +9825,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4m: Read the optional attribute(Primary1Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4m: Read the optional attribute(Primary1Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4m: Read the optional attribute(Primary1Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9164,7 +9850,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4n: Read the optional attribute(Primary2X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4n: Read the optional attribute(Primary2X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4n: Read the optional attribute(Primary2X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9185,7 +9875,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4o: Read the optional attribute(Primary2Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4o: Read the optional attribute(Primary2Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4o: Read the optional attribute(Primary2Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9206,7 +9900,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4p: Read the optional attribute(Primary2Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4p: Read the optional attribute(Primary2Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4p: Read the optional attribute(Primary2Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9227,7 +9925,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4q: Read the optional attribute(Primary3X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4q: Read the optional attribute(Primary3X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4q: Read the optional attribute(Primary3X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9248,7 +9950,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4r: Read the optional attribute(Primary3Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4r: Read the optional attribute(Primary3Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4r: Read the optional attribute(Primary3Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9269,7 +9975,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4s: Read the optional attribute(Primary3Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4s: Read the optional attribute(Primary3Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4s: Read the optional attribute(Primary3Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9290,7 +10000,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4t: Read the optional attribute(Primary4X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4t: Read the optional attribute(Primary4X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4t: Read the optional attribute(Primary4X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9311,7 +10025,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4u: Read the optional attribute(Primary4Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4u: Read the optional attribute(Primary4Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4u: Read the optional attribute(Primary4Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9332,7 +10050,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4v: Read the optional attribute(Primary4Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4v: Read the optional attribute(Primary4Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4v: Read the optional attribute(Primary4Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9353,7 +10075,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4w: Read the optional attribute(Primary5X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4w: Read the optional attribute(Primary5X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4w: Read the optional attribute(Primary5X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9374,7 +10100,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4x: Read the optional attribute(Primary5Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4x: Read the optional attribute(Primary5Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4x: Read the optional attribute(Primary5Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9395,7 +10125,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4y: Read the optional attribute(Primary5Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4y: Read the optional attribute(Primary5Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4y: Read the optional attribute(Primary5Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9416,7 +10150,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4z: Read the optional attribute(Primary6X) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4z: Read the optional attribute(Primary6X) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4z: Read the optional attribute(Primary6X) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9437,7 +10175,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a1: Read the optional attribute(Primary6Y) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a1: Read the optional attribute(Primary6Y) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a1: Read the optional attribute(Primary6Y) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9458,7 +10200,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a2: Read the optional attribute(Primary6Intensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a2: Read the optional attribute(Primary6Intensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a2: Read the optional attribute(Primary6Intensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9479,7 +10225,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a3: Read the optional attribute(WhitePointX) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a3: Read the optional attribute(WhitePointX) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a3: Read the optional attribute(WhitePointX) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9500,7 +10250,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a4: Read the optional attribute(WhitePointY) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a4: Read the optional attribute(WhitePointY) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a4: Read the optional attribute(WhitePointY) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9521,7 +10275,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a5: Read the optional attribute(ColorPointRX) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a5: Read the optional attribute(ColorPointRX) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a5: Read the optional attribute(ColorPointRX) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9542,7 +10300,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a6: Read the optional attribute(ColorPointRY) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a6: Read the optional attribute(ColorPointRY) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a6: Read the optional attribute(ColorPointRY) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9563,7 +10325,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a7: Read the optional attribute(ColorPointRIntensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a7: Read the optional attribute(ColorPointRIntensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a7: Read the optional attribute(ColorPointRIntensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9584,7 +10350,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a8: Read the optional attribute(ColorPointGX) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a8: Read the optional attribute(ColorPointGX) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a8: Read the optional attribute(ColorPointGX) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9605,7 +10375,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a9: Read the optional attribute(ColorPointGY) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a9: Read the optional attribute(ColorPointGY) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a9: Read the optional attribute(ColorPointGY) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9626,7 +10400,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a10: Read the optional attribute(ColorPointGIntensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a10: Read the optional attribute(ColorPointGIntensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a10: Read the optional attribute(ColorPointGIntensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9647,7 +10425,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a11: Read the optional attribute(ColorPointBX) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a11: Read the optional attribute(ColorPointBX) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a11: Read the optional attribute(ColorPointBX) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9668,7 +10450,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a12: Read the optional attribute(ColorPointBY) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a12: Read the optional attribute(ColorPointBY) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a12: Read the optional attribute(ColorPointBY) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9689,7 +10475,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a13: Read the optional attribute(ColorPointBIntensity) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a13: Read the optional attribute(ColorPointBIntensity) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a13: Read the optional attribute(ColorPointBIntensity) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9710,7 +10500,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a14: Read the optional attribute(EnhancedCurrentHue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a14: Read the optional attribute(EnhancedCurrentHue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a14: Read the optional attribute(EnhancedCurrentHue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9731,7 +10525,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a15: Read the optional attribute(ColorLoopActive) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a15: Read the optional attribute(ColorLoopActive) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a15: Read the optional attribute(ColorLoopActive) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9752,7 +10550,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a16: Read the optional attribute(ColorLoopDirection) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a16: Read the optional attribute(ColorLoopDirection) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a16: Read the optional attribute(ColorLoopDirection) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9773,7 +10575,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a17: Read the optional attribute(ColorLoopTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a17: Read the optional attribute(ColorLoopTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a17: Read the optional attribute(ColorLoopTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9794,7 +10600,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a18: Read the optional attribute(ColorLoopStartEnhancedHue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a18: Read the optional attribute(ColorLoopStartEnhancedHue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a18: Read the optional attribute(ColorLoopStartEnhancedHue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9815,7 +10625,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a19: Read the optional attribute(ColorLoopStoredEnhancedHue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a19: Read the optional attribute(ColorLoopStoredEnhancedHue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a19: Read the optional attribute(ColorLoopStoredEnhancedHue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9836,7 +10650,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a20: Read the optional attribute(ColorTempPhysicalMinMireds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a20: Read the optional attribute(ColorTempPhysicalMinMireds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a20: Read the optional attribute(ColorTempPhysicalMinMireds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9857,7 +10675,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a21: Read the optional attribute(ColorTempPhysicalMaxMireds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a21: Read the optional attribute(ColorTempPhysicalMaxMireds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a21: Read the optional attribute(ColorTempPhysicalMaxMireds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9878,7 +10700,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a22: Read the optional attribute(CoupleColorTempToLevelMinMireds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a22: Read the optional attribute(CoupleColorTempToLevelMinMireds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a22: Read the optional attribute(CoupleColorTempToLevelMinMireds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9899,7 +10725,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a23: Read the optional attribute(StartUpColorTemperatureMireds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a23: Read the optional attribute(StartUpColorTemperatureMireds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a23: Read the optional attribute(StartUpColorTemperatureMireds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9920,7 +10750,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read the optional command(MoveToHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read the optional command(MoveToHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read the optional command(MoveToHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9941,7 +10775,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read the optional command(MoveHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read the optional command(MoveHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read the optional command(MoveHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9962,7 +10800,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read the optional command(StepHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read the optional command(StepHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read the optional command(StepHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -9983,7 +10825,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Read the optional command(MoveToSaturation) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Read the optional command(MoveToSaturation) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Read the optional command(MoveToSaturation) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10004,7 +10850,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6e: Read the optional command(MoveSaturation) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6e: Read the optional command(MoveSaturation) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6e: Read the optional command(MoveSaturation) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10025,7 +10875,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6f: Read the optional command(StepSaturation) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6f: Read the optional command(StepSaturation) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6f: Read the optional command(StepSaturation) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10046,7 +10900,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6g: Read the optional command(MoveToHueAndSaturation) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6g: Read the optional command(MoveToHueAndSaturation) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6g: Read the optional command(MoveToHueAndSaturation) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10067,7 +10925,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6h: Read the optional command(MoveToColor) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6h: Read the optional command(MoveToColor) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6h: Read the optional command(MoveToColor) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10088,7 +10950,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6i: Read the optional command(MoveColor) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6i: Read the optional command(MoveColor) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6i: Read the optional command(MoveColor) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10109,7 +10975,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6j: Read the optional command(StepColor) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6j: Read the optional command(StepColor) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6j: Read the optional command(StepColor) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10130,7 +11000,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6k: Read the optional command(MoveToColorTemperature) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6k: Read the optional command(MoveToColorTemperature) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6k: Read the optional command(MoveToColorTemperature) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10151,7 +11025,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6l: Read the optional command(EnhancedMoveToHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6l: Read the optional command(EnhancedMoveToHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6l: Read the optional command(EnhancedMoveToHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10172,7 +11050,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6m: Read the optional command(EnhancedMoveHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6m: Read the optional command(EnhancedMoveHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6m: Read the optional command(EnhancedMoveHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10193,7 +11075,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6n: Read the optional command(EnhancedStepHue) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6n: Read the optional command(EnhancedStepHue) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6n: Read the optional command(EnhancedStepHue) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10214,7 +11100,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6o: Read the optional command(EnhancedMoveToHueAndSaturation) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6o: Read the optional command(EnhancedMoveToHueAndSaturation) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6o: Read the optional command(EnhancedMoveToHueAndSaturation) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10235,7 +11125,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6p: Read the optional command(ColorLoopSet) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6p: Read the optional command(ColorLoopSet) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6p: Read the optional command(ColorLoopSet) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10256,7 +11150,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6q: Read the optional command(StopMoveStep) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6q: Read the optional command(StopMoveStep) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6q: Read the optional command(StopMoveStep) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10277,7 +11175,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6r: Read the optional command(MoveColorTemperature) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6r: Read the optional command(MoveColorTemperature) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6r: Read the optional command(MoveColorTemperature) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10298,7 +11200,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6s: Read the optional command(StepColorTemperature) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6s: Read the optional command(StepColorTemperature) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6s: Read the optional command(StepColorTemperature) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -10319,7 +11225,11 @@ class Test_TC_CC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11006,7 +11916,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11028,7 +11942,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11050,7 +11968,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRemainingTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads RemainingTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads RemainingTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads RemainingTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11072,7 +11994,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11094,7 +12020,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11116,7 +12046,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDriftCompensationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads DriftCompensation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads DriftCompensation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads DriftCompensation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11138,7 +12072,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCompensationTextWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads CompensationText attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads CompensationText attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads CompensationText attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11158,7 +12096,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads ColorTemperatureMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads ColorTemperatureMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads ColorTemperatureMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11180,7 +12122,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11202,7 +12148,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads Options attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads Options attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads Options attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11224,7 +12174,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11246,7 +12200,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11268,7 +12226,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: TH reads ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: TH reads ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: TH reads ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11290,7 +12252,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 15: TH reads ColorLoopDirection attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 15: TH reads ColorLoopDirection attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 15: TH reads ColorLoopDirection attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11312,7 +12278,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 16: TH reads ColorLoopTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 16: TH reads ColorLoopTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 16: TH reads ColorLoopTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11334,7 +12304,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 17: TH reads ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 17: TH reads ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 17: TH reads ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11356,7 +12330,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 18: TH reads ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 18: TH reads ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 18: TH reads ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11379,7 +12357,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 18a: Saving for comparision in step 19 reads FeatureMap attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 18a: Saving for comparision in step 19 reads FeatureMap attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 18a: Saving for comparision in step 19 reads FeatureMap attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11401,7 +12383,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorCapabilitiesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 19: TH reads ColorCapabilities attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 19: TH reads ColorCapabilities attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 19: TH reads ColorCapabilities attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11428,7 +12414,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMinMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 20: TH reads ColorTempPhysicalMinMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 20: TH reads ColorTempPhysicalMinMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 20: TH reads ColorTempPhysicalMinMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11450,7 +12440,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMaxMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 21: TH reads ColorTempPhysicalMaxMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 21: TH reads ColorTempPhysicalMaxMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 21: TH reads ColorTempPhysicalMaxMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11472,7 +12466,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCoupleColorTempToLevelMinMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 22: TH reads CoupleColorTempToLevelMinMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 22: TH reads CoupleColorTempToLevelMinMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 22: TH reads CoupleColorTempToLevelMinMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11494,7 +12492,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 23: TH reads StartUpColorTemperatureMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 23: TH reads StartUpColorTemperatureMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 23: TH reads StartUpColorTemperatureMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11519,7 +12521,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfPrimariesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 24: TH reads NumberOfPrimaries attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 24: TH reads NumberOfPrimaries attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 24: TH reads NumberOfPrimaries attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11724,7 +12730,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWhitePointXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 43: TH reads WhitePointX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 43: TH reads WhitePointX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 43: TH reads WhitePointX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11746,7 +12756,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWhitePointYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 44: TH reads WhitePointY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 44: TH reads WhitePointY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 44: TH reads WhitePointY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11768,7 +12782,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointRXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 45: TH reads ColorPointRX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 45: TH reads ColorPointRX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 45: TH reads ColorPointRX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11790,7 +12808,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointRYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 46: TH reads ColorPointRY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 46: TH reads ColorPointRY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 46: TH reads ColorPointRY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11812,7 +12834,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointRIntensityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 47: TH reads ColorPointRIntensity attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 47: TH reads ColorPointRIntensity attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 47: TH reads ColorPointRIntensity attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11837,7 +12863,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointGXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 48: TH reads ColorPointGX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 48: TH reads ColorPointGX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 48: TH reads ColorPointGX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11859,7 +12889,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointGYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 49: TH reads ColorPointGY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 49: TH reads ColorPointGY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 49: TH reads ColorPointGY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11881,7 +12915,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointGIntensityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 50: TH reads ColorPointGIntensity attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 50: TH reads ColorPointGIntensity attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 50: TH reads ColorPointGIntensity attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11906,7 +12944,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointBXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 51: TH reads ColorPointBX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 51: TH reads ColorPointBX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 51: TH reads ColorPointBX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11928,7 +12970,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointBYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 52: TH reads ColorPointBY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 52: TH reads ColorPointBY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 52: TH reads ColorPointBY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -11950,7 +12996,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorPointBIntensityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 53: TH reads ColorPointBIntensity attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 53: TH reads ColorPointBIntensity attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 53: TH reads ColorPointBIntensity attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12392,7 +13442,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12411,7 +13465,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12441,7 +13499,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12477,7 +13539,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 2b: TH sends MoveHue command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 2b: TH sends MoveHue command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 2b: TH sends MoveHue command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12503,7 +13569,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12532,7 +13602,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12571,7 +13645,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 2e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 2e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 2e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12589,7 +13667,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12618,7 +13700,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2g: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2g: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2g: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12651,7 +13737,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=60, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=60, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=60, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12687,7 +13777,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 3b: TH sends MoveHue command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 3b: TH sends MoveHue command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 3b: TH sends MoveHue command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12713,7 +13807,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12742,7 +13840,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12781,7 +13883,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 3e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 3e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 3e: TH sends MoveHue command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12799,7 +13905,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12828,7 +13938,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12849,7 +13963,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12875,7 +13993,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12902,7 +14024,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -12920,7 +14046,11 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13294,7 +14424,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13313,7 +14447,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13343,7 +14481,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 2a: TH sends MoveToHue command to DUT with Hue=200, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13381,7 +14523,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 2b: TH sends StepHue command to DUT with StepMode=0x01 (up), StepSize=60 and TransitionTime=200 (20s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 2b: TH sends StepHue command to DUT with StepMode=0x01 (up), StepSize=60 and TransitionTime=200 (20s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 2b: TH sends StepHue command to DUT with StepMode=0x01 (up), StepSize=60 and TransitionTime=200 (20s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13407,7 +14553,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13436,7 +14586,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13465,7 +14619,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13498,7 +14656,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=50, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=50, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 3a: TH sends MoveToHue command to DUT with Hue=50, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13536,7 +14698,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepHueWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 3b: TH sends StepHue command to DUT with StepMode=0x03 (down), StepSize=60 and TransitionTime=200 (20s) Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 3b: TH sends StepHue command to DUT with StepMode=0x03 (down), StepSize=60 and TransitionTime=200 (20s): Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 3b: TH sends StepHue command to DUT with StepMode=0x03 (down), StepSize=60 and TransitionTime=200 (20s): Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13562,7 +14728,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13591,7 +14761,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13620,7 +14794,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13641,7 +14819,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13667,7 +14849,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13694,7 +14880,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -13712,7 +14902,11 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14011,7 +15205,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14030,7 +15228,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14058,7 +15260,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=60 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=60 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=60 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14094,7 +15300,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 2b: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=300 (30s) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 2b: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=300 (30s): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 2b: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=300 (30s): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14120,7 +15330,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14149,7 +15363,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14178,7 +15396,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14207,7 +15429,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14228,7 +15454,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14254,7 +15484,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14281,7 +15515,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14299,7 +15537,11 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14772,7 +16014,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14791,7 +16037,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14819,7 +16069,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14855,7 +16109,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 2b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 2b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 2b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14881,7 +16139,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14910,7 +16172,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14939,7 +16205,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -14970,7 +16240,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=120 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15006,7 +16280,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 3b: TH sends MoveSaturation command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 3b: TH sends MoveSaturation command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 3b: TH sends MoveSaturation command to DUT with MoveMode=0x03 (down) and Rate=5 (units/s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15032,7 +16310,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15061,7 +16343,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15090,7 +16376,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15121,7 +16411,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 4a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 4a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 4a: TH sends MoveToSaturation command to DUT with Saturation=150 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15157,7 +16451,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 4b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 4b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 4b: TH sends MoveSaturation command to DUT with MoveMode=0x01 (up) and Rate=5 (units/s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15183,7 +16481,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15214,7 +16516,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 4d: TH sends MoveSaturation command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 4d: TH sends MoveSaturation command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 4d: TH sends MoveSaturation command to DUT with MoveMode=0x00 (stop) and Rate=5 (units/s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15232,7 +16538,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15261,7 +16571,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15282,7 +16596,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15308,7 +16626,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15335,7 +16657,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15353,7 +16679,11 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15793,7 +17123,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15812,7 +17146,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15840,7 +17178,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=200 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=200 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 2a: TH sends MoveToSaturation command to DUT with Saturation=200 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15878,7 +17220,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 2b: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=40 and TransitionTime=200 (20s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 2b: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=40 and TransitionTime=200 (20s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 2b: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=40 and TransitionTime=200 (20s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15904,7 +17250,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15933,7 +17283,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15962,7 +17316,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -15995,7 +17353,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 2f: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=20 and TransitionTime=100 (10s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 2f: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=20 and TransitionTime=100 (10s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 2f: TH sends StepSaturation command to DUT with StepMode=0x01 (up), StepSize=20 and TransitionTime=100 (10s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16021,7 +17383,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2g: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2g: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2g: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16052,7 +17418,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToSaturationWithParams:params completion:
                                                        ^(NSError * _Nullable err) {
-                                                           NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=50 and TransitionTime=0 (immediately) Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=50 and TransitionTime=0 (immediately): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Step 3a: TH sends MoveToSaturation command to DUT with Saturation=50 and TransitionTime=0 (immediately): Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16090,7 +17460,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 3b: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=40 and TransitionTime=200 (20s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 3b: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=40 and TransitionTime=200 (20s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 3b: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=40 and TransitionTime=200 (20s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16116,7 +17490,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: H reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: H reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: H reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16145,7 +17523,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16174,7 +17556,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16207,7 +17593,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepSaturationWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Step 3f: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=20 and TransitionTime=100 (10 s) Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 3f: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=20 and TransitionTime=100 (10 s): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 3f: TH sends StepSaturation command to DUT with StepMode=0x03 (down), StepSize=20 and TransitionTime=100 (10 s): Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16233,7 +17623,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16256,7 +17650,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16282,7 +17680,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: H reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: H reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: H reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16309,7 +17711,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16327,7 +17733,11 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16657,7 +18067,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16676,7 +18090,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16706,7 +18124,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueAndSaturationWithParams:params completion:
                                                              ^(NSError * _Nullable err) {
-                                                                 NSLog(@"Step 2a: TH sends MoveToHueAndSaturation command to DUT with Hue=200, Saturation=50 and TransitionTime=0 (immediately) Error: %@", err);
+                                                                 if (err != nil) {
+                                                                     NSLog(@"Step 2a: TH sends MoveToHueAndSaturation command to DUT with Hue=200, Saturation=50 and TransitionTime=0 (immediately): Error: %@", err);
+                                                                 } else {
+                                                                     NSLog(@"Step 2a: TH sends MoveToHueAndSaturation command to DUT with Hue=200, Saturation=50 and TransitionTime=0 (immediately): Success");
+                                                                 }
 
                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16732,7 +18154,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads CurrentHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads CurrentHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads CurrentHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16753,7 +18179,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b1: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b1: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b1: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16786,7 +18216,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToHueAndSaturationWithParams:params completion:
                                                              ^(NSError * _Nullable err) {
-                                                                 NSLog(@"Step 3a: TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and TransitionTime=200 (20s) Error: %@", err);
+                                                                 if (err != nil) {
+                                                                     NSLog(@"Step 3a: TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and TransitionTime=200 (20s): Error: %@", err);
+                                                                 } else {
+                                                                     NSLog(@"Step 3a: TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and TransitionTime=200 (20s): Success");
+                                                                 }
 
                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16812,7 +18246,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16833,7 +18271,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b1: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b1: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b1: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16862,7 +18304,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16883,7 +18329,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c1: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c1: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c1: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16913,7 +18363,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16934,7 +18388,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d1: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d1: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d1: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16955,7 +18413,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -16981,7 +18443,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17008,7 +18474,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17026,7 +18496,11 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17796,7 +19270,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17815,7 +19293,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17845,7 +19327,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17871,7 +19357,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17892,7 +19382,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b1: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b1: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b1: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17925,7 +19419,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 3a: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 200 (20s) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 3a: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 200 (20s): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 3a: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 200 (20s): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17951,7 +19449,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -17972,7 +19474,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18001,7 +19507,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18022,7 +19532,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18051,7 +19565,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18072,7 +19590,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18096,7 +19618,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18114,7 +19640,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH read Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH read Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH read Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18138,7 +19668,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4c: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4c: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4c: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18168,7 +19702,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4d: TH sends a MoveToColor command to the DUT with ColorX = 32768/0x8000 (x=0.5) (purple) ColorY = 19660/0x4CCC (y=0.3) TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4d: TH sends a MoveToColor command to the DUT with ColorX = 32768/0x8000 (x=0.5) (purple) ColorY = 19660/0x4CCC (y=0.3) TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4d: TH sends a MoveToColor command to the DUT with ColorX = 32768/0x8000 (x=0.5) (purple) ColorY = 19660/0x4CCC (y=0.3) TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18194,7 +19732,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18215,7 +19757,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18237,7 +19783,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4f: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4f: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4f: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18267,7 +19817,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18293,7 +19847,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18316,7 +19874,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18351,7 +19913,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18377,7 +19943,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18400,7 +19970,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18435,7 +20009,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18461,7 +20039,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18482,7 +20064,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18506,7 +20092,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH writes 1 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH writes 1 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH writes 1 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18524,7 +20114,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH read Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH read Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH read Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18548,7 +20142,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 5c: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5c: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5c: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18578,7 +20176,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5d: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5d: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5d: TH sends MoveToColor command to DUT, with ColorX = 32768/0x8000 ColorY = 19660/0x4CCC TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18604,7 +20206,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5e: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5e: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5e: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18625,7 +20231,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5e: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5e: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5e: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18647,7 +20257,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 5f: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5f: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5f: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18677,7 +20291,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5g: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 13107/0x3333 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18703,7 +20321,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5h: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5h: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5h: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18724,7 +20346,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5h: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5h: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5h: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18757,7 +20383,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5i: TH sends MoveToColor command to DUT, with ColorX = 13107/0x3333 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18783,7 +20413,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5j: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5j: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5j: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18806,7 +20440,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5j: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5j: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5j: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18841,7 +20479,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5k: TH sends MoveToColor command to DUT, with ColorX = 26214/0x6666 ColorY = 32768/0x8000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18867,7 +20509,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5l: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5l: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5l: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18888,7 +20534,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5l: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5l: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5l: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18909,7 +20559,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18935,7 +20589,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18962,7 +20620,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -18980,7 +20642,11 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19321,7 +20987,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19340,7 +21010,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19370,7 +21044,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 1a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 26000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 1a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 26000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 1a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 26000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19406,7 +21084,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveColorWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 2a: TH sends MoveColor command to DUT Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 2a: TH sends MoveColor command to DUT: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 2a: TH sends MoveColor command to DUT: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19432,7 +21114,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19453,7 +21139,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19482,7 +21172,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19503,7 +21197,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19533,7 +21231,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19558,7 +21260,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19588,7 +21294,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stopMoveStepWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 3a: TH sends StopMoveStep command to DUT Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 3a: TH sends StopMoveStep command to DUT: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 3a: TH sends StopMoveStep command to DUT: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19606,7 +21316,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19627,7 +21341,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19648,7 +21366,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19674,7 +21396,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19701,7 +21427,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -19719,7 +21449,11 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20027,7 +21761,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20046,7 +21784,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20076,7 +21818,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 20000 TransitionTime = 0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 20000 TransitionTime = 0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2a: TH sends MoveToColor command to DUT, with ColorX = 33000 ColorY = 20000 TransitionTime = 0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20114,7 +21860,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepColorWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 3a: TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 (20s) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 3a: TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 (20s): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 3a: TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 (20s): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20140,7 +21890,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20161,7 +21915,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20190,7 +21948,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20211,7 +21973,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20240,7 +22006,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentXWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentX attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentX attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentX attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20261,7 +22031,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentYWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentY attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentY attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentY attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20282,7 +22056,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20308,7 +22086,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20335,7 +22117,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20353,7 +22139,11 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20692,7 +22482,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20711,7 +22505,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20730,7 +22528,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMinMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: H reads ColorTempPhysicalMinMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: H reads ColorTempPhysicalMinMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: H reads ColorTempPhysicalMinMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20756,7 +22558,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMaxMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads ColorTempPhysicalMaxMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads ColorTempPhysicalMaxMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads ColorTempPhysicalMaxMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20781,7 +22587,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20813,7 +22623,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorTemperatureWithParams:params completion:
                                                              ^(NSError * _Nullable err) {
-                                                                 NSLog(@"Step 2a: TH sends MoveToColorTemperature command to DUT with ColorTemperatureMireds=310 and TransitionTime=0 (immediately). Error: %@", err);
+                                                                 if (err != nil) {
+                                                                     NSLog(@"Step 2a: TH sends MoveToColorTemperature command to DUT with ColorTemperatureMireds=310 and TransitionTime=0 (immediately).: Error: %@", err);
+                                                                 } else {
+                                                                     NSLog(@"Step 2a: TH sends MoveToColorTemperature command to DUT with ColorTemperatureMireds=310 and TransitionTime=0 (immediately).: Success");
+                                                                 }
 
                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20849,7 +22663,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToColorTemperatureWithParams:params completion:
                                                              ^(NSError * _Nullable err) {
-                                                                 NSLog(@"Step 2b: TH sends MoveToColorTemperatur command to DUT with ColorTemperatureMireds=250 and TransitionTime=300 (30s). Error: %@", err);
+                                                                 if (err != nil) {
+                                                                     NSLog(@"Step 2b: TH sends MoveToColorTemperatur command to DUT with ColorTemperatureMireds=250 and TransitionTime=300 (30s).: Error: %@", err);
+                                                                 } else {
+                                                                     NSLog(@"Step 2b: TH sends MoveToColorTemperatur command to DUT with ColorTemperatureMireds=250 and TransitionTime=300 (30s).: Success");
+                                                                 }
 
                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20875,7 +22693,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20904,7 +22726,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20933,7 +22759,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20962,7 +22792,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -20983,7 +22817,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21009,7 +22847,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21036,7 +22878,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21062,7 +22908,11 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21375,7 +23225,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21394,7 +23248,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21412,7 +23270,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 0c: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0c: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 0c: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21434,7 +23296,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMinMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 0d: TH reads ColorTempPhysicalMinMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0d: TH reads ColorTempPhysicalMinMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 0d: TH reads ColorTempPhysicalMinMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21456,7 +23322,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTempPhysicalMaxMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 0e: TH reads ColorTempPhysicalMaxMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0e: TH reads ColorTempPhysicalMaxMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 0e: TH reads ColorTempPhysicalMaxMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21478,7 +23348,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads from the DUT the StartUpColorTemperatureMireds attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads from the DUT the StartUpColorTemperatureMireds attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads from the DUT the StartUpColorTemperatureMireds attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21514,7 +23388,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads StartUpColorTemperatureMireds attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads StartUpColorTemperatureMireds attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads StartUpColorTemperatureMireds attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21577,7 +23455,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the StartUpColorTemperatureMireds attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the StartUpColorTemperatureMireds attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the StartUpColorTemperatureMireds attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21605,7 +23487,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorTemperatureMiredsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads ColorTemperatureMireds attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads ColorTemperatureMireds attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21628,7 +23514,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21654,7 +23544,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21681,7 +23575,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -21707,7 +23605,11 @@ class Test_TC_CC_6_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22125,7 +24027,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22144,7 +24050,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22174,7 +24084,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"Step 2a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=6000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately). Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Step 2a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=6000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Step 2a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=6000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22212,7 +24126,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedStepHueWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Step 2b: TH sends EnhancedStepHue command to DUT with StepMode=0x01 (up), StepSize=6000 and TransitionTime=300 (30s). Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 2b: TH sends EnhancedStepHue command to DUT with StepMode=0x01 (up), StepSize=6000 and TransitionTime=300 (30s).: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 2b: TH sends EnhancedStepHue command to DUT with StepMode=0x01 (up), StepSize=6000 and TransitionTime=300 (30s).: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22238,7 +24156,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22267,7 +24189,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22296,7 +24222,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22325,7 +24255,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22358,7 +24292,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"Step 5a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=12000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately). Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Step 5a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=12000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Step 5a: TH sends EnhancedMoveToHue command to DUT with EnhancedHue=12000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22396,7 +24334,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedStepHueWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Step 5b: TH sends EnhancedStepHue command to DUT with StepMode=0x03 (down), StepSize=6000 and TransitionTime=300 (30s) Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 5b: TH sends EnhancedStepHue command to DUT with StepMode=0x03 (down), StepSize=6000 and TransitionTime=300 (30s): Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 5b: TH sends EnhancedStepHue command to DUT with StepMode=0x03 (down), StepSize=6000 and TransitionTime=300 (30s): Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22422,7 +24364,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22451,7 +24397,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22480,7 +24430,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22509,7 +24463,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22530,7 +24488,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22556,7 +24518,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22583,7 +24549,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22601,7 +24571,11 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22931,7 +24905,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22950,7 +24928,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -22980,7 +24962,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueAndSaturationWithParams:params completion:
                                                                      ^(NSError * _Nullable err) {
-                                                                         NSLog(@"Step 2a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=20000, Saturation=50 and TransitionTime=0 (immediately) Error: %@", err);
+                                                                         if (err != nil) {
+                                                                             NSLog(@"Step 2a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=20000, Saturation=50 and TransitionTime=0 (immediately): Error: %@", err);
+                                                                         } else {
+                                                                             NSLog(@"Step 2a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=20000, Saturation=50 and TransitionTime=0 (immediately): Success");
+                                                                         }
 
                                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23006,7 +24992,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23027,7 +25017,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23060,7 +25054,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueAndSaturationWithParams:params completion:
                                                                      ^(NSError * _Nullable err) {
-                                                                         NSLog(@"Step 3a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=16000, Saturation=80 and TransitionTime=200 (20s) Error: %@", err);
+                                                                         if (err != nil) {
+                                                                             NSLog(@"Step 3a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=16000, Saturation=80 and TransitionTime=200 (20s): Error: %@", err);
+                                                                         } else {
+                                                                             NSLog(@"Step 3a: TH sends EnhancedMoveToHueAndSaturation command to DUT with EnhancedHue=16000, Saturation=80 and TransitionTime=200 (20s): Success");
+                                                                         }
 
                                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23086,7 +25084,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23108,7 +25110,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23137,7 +25143,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23159,7 +25169,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23188,7 +25202,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23211,7 +25229,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSaturationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads CurrentSaturation attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23234,7 +25256,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads ColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads ColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23260,7 +25286,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedColorModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads EnhancedColorMode attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23287,7 +25317,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off light that we turned on Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off light that we turned on: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off light that we turned on: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23305,7 +25339,11 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23912,7 +25950,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23931,7 +25973,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -23961,7 +26007,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately). Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24003,7 +26053,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24021,7 +26075,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24060,7 +26118,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24078,7 +26140,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24117,7 +26183,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x4 (UpdateTime) and Time attribute to 5 (5s for one loop) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x4 (UpdateTime) and Time attribute to 5 (5s for one loop) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x4 (UpdateTime) and Time attribute to 5 (5s for one loop) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24135,7 +26205,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24174,7 +26248,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x8 (UpdateStartHue) and StartHue attribute to 0x00A0 to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x8 (UpdateStartHue) and StartHue attribute to 0x00A0 to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x8 (UpdateStartHue) and StartHue attribute to 0x00A0 to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24192,7 +26270,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24231,7 +26313,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24249,7 +26335,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24272,7 +26362,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24304,7 +26398,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparison in step 8d read ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparison in step 8d read ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparison in step 8d read ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24326,7 +26424,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24356,7 +26458,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24394,7 +26500,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24412,7 +26522,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24436,7 +26550,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparison in step 6c read ColorLoopStoredEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparison in step 6c read ColorLoopStoredEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparison in step 6c read ColorLoopStoredEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24458,7 +26576,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24497,7 +26619,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24515,7 +26641,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24554,7 +26684,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24572,7 +26706,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24595,7 +26733,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24627,7 +26769,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 8d read ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 8d read ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 8d read ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24649,7 +26795,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24679,7 +26829,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24717,7 +26871,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24735,7 +26893,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24759,7 +26921,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 9c read ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 9c read ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 9c read ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24781,7 +26947,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24816,7 +26986,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately). Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24842,7 +27016,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24881,7 +27059,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x0 (decrement hue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24899,7 +27081,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24938,7 +27124,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24956,7 +27146,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -24979,7 +27173,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25011,7 +27209,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 12d read ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 12d read ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 12d read ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25033,7 +27235,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25063,7 +27269,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25101,7 +27311,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25119,7 +27333,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25143,7 +27361,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 13c read ColorLoopStoredEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 13c read ColorLoopStoredEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 13c read ColorLoopStoredEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25165,7 +27387,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25204,7 +27430,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25222,7 +27452,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25261,7 +27495,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x2 (start from EnhancedCurrentHue) to DUT: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25279,7 +27517,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25302,7 +27544,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25334,7 +27580,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 15d read ColorLoopStartEnhancedHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 15d read ColorLoopStartEnhancedHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 15d read ColorLoopStartEnhancedHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25356,7 +27606,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25386,7 +27640,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25424,7 +27682,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25442,7 +27704,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25466,7 +27732,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision in step 16b read ColorLoopStoredEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision in step 16b read ColorLoopStoredEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision in step 16b read ColorLoopStoredEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25488,7 +27758,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25512,7 +27786,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off light for color control tests Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off light for color control tests: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off light for color control tests: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25530,7 +27808,11 @@ class TestColorControl_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25850,7 +28132,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25869,7 +28155,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25899,7 +28189,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster enhancedMoveToHueWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately). Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"TH sends EnhancedMoveToHue command to DUT with EnhancedHue=0x4000, Direction=0x00 (shortest distance) and TransitionTime=0 (immediately).: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25941,7 +28235,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0xF, Action attribute to 0x0 (De-activate), Direction attribute to 0x0 (decrement hue), Time attribute to 30, and StartHue attribute to 0x00A0 to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0xF, Action attribute to 0x0 (De-activate), Direction attribute to 0x0 (decrement hue), Time attribute to 30, and StartHue attribute to 0x00A0 to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0xF, Action attribute to 0x0 (De-activate), Direction attribute to 0x0 (decrement hue), Time attribute to 30, and StartHue attribute to 0x00A0 to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25959,7 +28257,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -25982,7 +28284,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26005,7 +28311,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopTime attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopTime attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopTime attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26028,7 +28338,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStartEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26067,7 +28381,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x1 (start from ColorLoopStartEnhancedHue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26085,7 +28403,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26108,7 +28430,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopStoredEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26140,7 +28466,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26162,7 +28492,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26192,7 +28526,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26230,7 +28568,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x2 (UpdateDirection) and Direction attribute to 0x1 (increment hue) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26248,7 +28590,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopDirection attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopDirection attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopDirection attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26280,7 +28626,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStartEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision read ColorLoopStartEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26302,7 +28652,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26332,7 +28686,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26370,7 +28728,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster colorLoopSetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH sends ColorLoopSet command to with UpdateFlag attribute to 0x1 (UpdateAction) and Action attribute to 0x0 (De-activate) to DUT.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26388,7 +28750,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopActiveWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ColorLoopActive attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Read ColorLoopActive attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26412,7 +28778,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeColorLoopStoredEnhancedHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Saving value for comparision read ColorLoopStoredEnhancedHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Saving value for comparision read ColorLoopStoredEnhancedHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Saving value for comparision read ColorLoopStoredEnhancedHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26434,7 +28804,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnhancedCurrentHueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read EnhancedCurrentHue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Read EnhancedCurrentHue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26458,7 +28832,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn off light for color control tests Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn off light for color control tests: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn off light for color control tests: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26476,7 +28854,11 @@ class TestColorControl_9_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26886,7 +29268,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26910,7 +29296,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26929,7 +29319,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given CDOCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given CDOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given CDOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26948,7 +29342,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given CDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given CDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given CDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26967,7 +29365,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given CDOCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given CDOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given CDOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -26986,7 +29388,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given CDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given CDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given CDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27005,7 +29411,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given CDOCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given CDOCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given CDOCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27024,7 +29434,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given CDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given CDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given CDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27043,7 +29457,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given CDOCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given CDOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given CDOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27062,7 +29480,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given CDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given CDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given CDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27081,7 +29503,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given CDOCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given CDOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given CDOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27100,7 +29526,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given CDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given CDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given CDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27119,7 +29549,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given CDOCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given CDOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given CDOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27138,7 +29572,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given CDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given CDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given CDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27157,7 +29595,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27184,7 +29626,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27210,7 +29656,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27231,7 +29681,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CDOCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CDOCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CDOCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27252,7 +29706,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27276,7 +29734,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CDOCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CDOCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CDOCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27301,7 +29763,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27323,7 +29789,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27345,7 +29815,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27367,7 +29841,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CDOCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27389,7 +29867,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27410,7 +29892,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CDOCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CDOCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CDOCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27431,7 +29917,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27455,7 +29945,11 @@ class Test_TC_CDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27674,7 +30168,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27702,7 +30200,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27729,7 +30231,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27754,7 +30260,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27779,7 +30289,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27801,7 +30315,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27826,7 +30344,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27848,7 +30370,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27870,7 +30396,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -27892,7 +30422,11 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28301,7 +30835,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28325,7 +30863,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28344,7 +30886,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given CMOCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given CMOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given CMOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28363,7 +30909,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given CMOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given CMOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given CMOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28382,7 +30932,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given CMOCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given CMOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given CMOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28401,7 +30955,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given CMOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given CMOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given CMOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28420,7 +30978,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given CMOCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given CMOCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given CMOCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28439,7 +31001,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given CMOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given CMOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given CMOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28458,7 +31024,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given CMOCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given CMOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given CMOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28477,7 +31047,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given CMOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given CMOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given CMOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28496,7 +31070,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given CMOCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given CMOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given CMOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28515,7 +31093,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given CMOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given CMOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given CMOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28534,7 +31116,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given CMOCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given CMOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given CMOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28553,7 +31139,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given CMOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given CMOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given CMOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28572,7 +31162,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28599,7 +31193,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28625,7 +31223,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28646,7 +31248,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CMOCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CMOCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when CMOCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28667,7 +31273,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28691,7 +31301,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CMOCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CMOCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when CMOCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28716,7 +31330,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28738,7 +31356,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28760,7 +31382,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28782,7 +31408,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when CMOCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28804,7 +31434,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28825,7 +31459,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CMOCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CMOCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when CMOCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28846,7 +31484,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -28870,7 +31512,11 @@ class Test_TC_CMOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29089,7 +31735,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29117,7 +31767,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29144,7 +31798,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29169,7 +31827,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29194,7 +31856,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29216,7 +31882,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29241,7 +31911,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29263,7 +31937,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29285,7 +31963,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29307,7 +31989,11 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29716,7 +32402,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29740,7 +32430,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29759,7 +32453,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given FLDCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given FLDCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given FLDCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29778,7 +32476,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given FLDCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given FLDCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given FLDCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29797,7 +32499,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given FLDCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given FLDCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given FLDCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29816,7 +32522,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given FLDCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given FLDCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given FLDCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29835,7 +32545,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given FLDCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given FLDCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given FLDCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29854,7 +32568,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given FLDCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given FLDCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given FLDCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29873,7 +32591,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given FLDCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given FLDCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given FLDCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29892,7 +32614,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given FLDCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given FLDCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given FLDCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29911,7 +32637,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given FLDCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given FLDCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given FLDCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29930,7 +32660,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given FLDCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given FLDCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given FLDCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29949,7 +32683,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given FLDCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given FLDCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given FLDCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29968,7 +32706,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given FLDCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given FLDCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given FLDCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -29987,7 +32729,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30014,7 +32760,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30040,7 +32790,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30061,7 +32815,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when FLDCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when FLDCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when FLDCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30082,7 +32840,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30106,7 +32868,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when FLDCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when FLDCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when FLDCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30131,7 +32897,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30153,7 +32923,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30175,7 +32949,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30197,7 +32975,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when FLDCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30219,7 +33001,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30240,7 +33026,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when FLDCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when FLDCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when FLDCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30261,7 +33051,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30285,7 +33079,11 @@ class Test_TC_FLDCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30504,7 +33302,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30532,7 +33334,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30559,7 +33365,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30584,7 +33394,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30609,7 +33423,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30631,7 +33449,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30656,7 +33478,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30678,7 +33504,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30700,7 +33530,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -30722,7 +33556,11 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31131,7 +33969,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31155,7 +33997,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31174,7 +34020,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given NDOCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given NDOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given NDOCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31193,7 +34043,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given NDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given NDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given NDOCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31212,7 +34066,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given NDOCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given NDOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given NDOCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31231,7 +34089,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given NDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given NDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given NDOCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31250,7 +34112,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given NDOCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given NDOCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given NDOCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31269,7 +34135,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given NDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given NDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given NDOCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31288,7 +34158,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given NDOCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given NDOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given NDOCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31307,7 +34181,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given NDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given NDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given NDOCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31326,7 +34204,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given NDOCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given NDOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given NDOCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31345,7 +34227,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given NDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given NDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given NDOCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31364,7 +34250,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given NDOCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given NDOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given NDOCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31383,7 +34273,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given NDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given NDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given NDOCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31402,7 +34296,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31429,7 +34327,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31455,7 +34357,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31476,7 +34382,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when NDOCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when NDOCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when NDOCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31497,7 +34407,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31521,7 +34435,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when NDOCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when NDOCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when NDOCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31546,7 +34464,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31568,7 +34490,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31590,7 +34516,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31612,7 +34542,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when NDOCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31634,7 +34568,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31655,7 +34593,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when NDOCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when NDOCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when NDOCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31676,7 +34618,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31700,7 +34646,11 @@ class Test_TC_NDOCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31919,7 +34869,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31947,7 +34901,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31974,7 +34932,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31999,7 +34961,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32024,7 +34990,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32046,7 +35016,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32071,7 +35045,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32093,7 +35071,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32115,7 +35097,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32137,7 +35123,11 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32546,7 +35536,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32570,7 +35564,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32589,7 +35587,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given OZCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given OZCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given OZCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32608,7 +35610,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given OZCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given OZCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given OZCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32627,7 +35633,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given OZCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given OZCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given OZCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32646,7 +35656,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given OZCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given OZCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given OZCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32665,7 +35679,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given OZCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given OZCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given OZCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32684,7 +35702,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given OZCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given OZCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given OZCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32703,7 +35725,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given OZCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given OZCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given OZCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32722,7 +35748,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given OZCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given OZCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given OZCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32741,7 +35771,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given OZCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given OZCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given OZCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32760,7 +35794,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given OZCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given OZCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given OZCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32779,7 +35817,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given OZCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given OZCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given OZCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32798,7 +35840,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given OZCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given OZCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given OZCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32817,7 +35863,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32844,7 +35894,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32870,7 +35924,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32891,7 +35949,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when OZCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when OZCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when OZCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32912,7 +35974,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32936,7 +36002,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when OZCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when OZCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when OZCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32961,7 +36031,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32983,7 +36057,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33005,7 +36083,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33027,7 +36109,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when OZCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33049,7 +36135,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33070,7 +36160,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when OZCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when OZCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when OZCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33091,7 +36185,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33115,7 +36213,11 @@ class Test_TC_OZCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33334,7 +36436,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33362,7 +36468,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33389,7 +36499,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33414,7 +36528,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33439,7 +36557,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33461,7 +36583,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33486,7 +36612,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33508,7 +36638,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33530,7 +36664,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33552,7 +36690,11 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33961,7 +37103,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -33985,7 +37131,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34004,7 +37154,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given PMHCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given PMHCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given PMHCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34023,7 +37177,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PMHCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PMHCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PMHCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34042,7 +37200,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given PMHCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given PMHCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given PMHCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34061,7 +37223,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given PMHCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given PMHCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given PMHCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34080,7 +37246,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given PMHCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given PMHCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given PMHCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34099,7 +37269,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given PMHCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given PMHCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given PMHCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34118,7 +37292,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given PMHCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given PMHCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given PMHCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34137,7 +37315,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given PMHCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given PMHCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given PMHCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34156,7 +37338,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given PMHCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given PMHCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given PMHCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34175,7 +37361,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given PMHCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given PMHCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given PMHCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34194,7 +37384,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given PMHCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given PMHCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given PMHCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34213,7 +37407,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given PMHCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given PMHCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given PMHCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34232,7 +37430,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34259,7 +37461,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34285,7 +37491,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34306,7 +37516,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMHCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMHCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMHCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34327,7 +37541,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34351,7 +37569,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMHCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMHCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMHCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34376,7 +37598,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34398,7 +37624,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34420,7 +37650,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34442,7 +37676,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMHCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34464,7 +37702,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34485,7 +37727,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMHCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMHCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMHCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34506,7 +37752,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34530,7 +37780,11 @@ class Test_TC_PMHCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34749,7 +38003,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34777,7 +38035,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34804,7 +38066,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34829,7 +38095,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34854,7 +38124,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34876,7 +38150,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34901,7 +38179,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34923,7 +38205,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34945,7 +38231,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -34967,7 +38257,11 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35376,7 +38670,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35400,7 +38698,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35419,7 +38721,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given PMICONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given PMICONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given PMICONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35438,7 +38744,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PMICONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PMICONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PMICONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35457,7 +38767,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given PMICONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given PMICONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given PMICONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35476,7 +38790,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given PMICONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given PMICONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given PMICONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35495,7 +38813,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given PMICONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given PMICONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given PMICONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35514,7 +38836,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given PMICONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given PMICONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given PMICONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35533,7 +38859,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given PMICONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given PMICONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given PMICONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35552,7 +38882,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given PMICONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given PMICONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given PMICONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35571,7 +38905,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given PMICONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given PMICONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given PMICONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35590,7 +38928,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given PMICONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given PMICONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given PMICONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35609,7 +38951,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given PMICONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given PMICONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given PMICONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35628,7 +38974,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given PMICONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given PMICONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given PMICONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35647,7 +38997,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35674,7 +39028,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35700,7 +39058,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35721,7 +39083,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMICONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMICONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMICONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35742,7 +39108,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35766,7 +39136,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMICONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMICONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMICONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35791,7 +39165,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35813,7 +39191,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35835,7 +39217,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35857,7 +39243,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMICONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35879,7 +39269,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35900,7 +39294,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMICONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMICONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMICONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35921,7 +39319,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -35945,7 +39347,11 @@ class Test_TC_PMICONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36164,7 +39570,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36192,7 +39602,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36219,7 +39633,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36244,7 +39662,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36269,7 +39691,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36291,7 +39717,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36316,7 +39746,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36338,7 +39772,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36360,7 +39798,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36382,7 +39824,11 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36791,7 +40237,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36815,7 +40265,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36834,7 +40288,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given PMKCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given PMKCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given PMKCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36853,7 +40311,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PMKCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PMKCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PMKCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36872,7 +40334,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given PMKCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given PMKCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given PMKCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36891,7 +40357,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given PMKCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given PMKCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given PMKCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36910,7 +40380,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given PMKCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given PMKCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given PMKCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36929,7 +40403,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given PMKCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given PMKCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given PMKCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36948,7 +40426,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given PMKCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given PMKCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given PMKCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36967,7 +40449,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given PMKCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given PMKCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given PMKCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -36986,7 +40472,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given PMKCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given PMKCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given PMKCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37005,7 +40495,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given PMKCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given PMKCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given PMKCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37024,7 +40518,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given PMKCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given PMKCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given PMKCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37043,7 +40541,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given PMKCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given PMKCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given PMKCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37062,7 +40564,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37089,7 +40595,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37115,7 +40625,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37136,7 +40650,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMKCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMKCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when PMKCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37157,7 +40675,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37181,7 +40703,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMKCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMKCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when PMKCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37206,7 +40732,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37228,7 +40758,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37250,7 +40784,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37272,7 +40810,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when PMKCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37294,7 +40836,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37315,7 +40861,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMKCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMKCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when PMKCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37336,7 +40886,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37360,7 +40914,11 @@ class Test_TC_PMKCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37579,7 +41137,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37607,7 +41169,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37634,7 +41200,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37659,7 +41229,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37684,7 +41258,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37706,7 +41284,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37731,7 +41313,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37753,7 +41339,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37775,7 +41365,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -37797,7 +41391,11 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38206,7 +41804,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38230,7 +41832,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38249,7 +41855,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given RNCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given RNCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given RNCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38268,7 +41878,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given RNCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given RNCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given RNCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38287,7 +41901,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given RNCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given RNCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given RNCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38306,7 +41924,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given RNCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given RNCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given RNCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38325,7 +41947,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given RNCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given RNCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given RNCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38344,7 +41970,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given RNCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given RNCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given RNCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38363,7 +41993,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given RNCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given RNCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given RNCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38382,7 +42016,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given RNCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given RNCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given RNCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38401,7 +42039,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given RNCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given RNCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given RNCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38420,7 +42062,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given RNCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given RNCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given RNCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38439,7 +42085,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given RNCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given RNCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given RNCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38458,7 +42108,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given RNCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given RNCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given RNCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38477,7 +42131,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38504,7 +42162,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38530,7 +42192,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38551,7 +42217,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when RNCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when RNCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when RNCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38572,7 +42242,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38596,7 +42270,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when RNCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when RNCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when RNCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38621,7 +42299,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38643,7 +42325,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38665,7 +42351,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38687,7 +42377,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when RNCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38709,7 +42403,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38730,7 +42428,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when RNCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when RNCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when RNCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38751,7 +42453,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38775,7 +42481,11 @@ class Test_TC_RNCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -38994,7 +42704,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39022,7 +42736,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39049,7 +42767,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39074,7 +42796,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39099,7 +42825,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39121,7 +42851,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: H reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: H reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: H reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39146,7 +42880,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39168,7 +42906,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39190,7 +42932,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39212,7 +42958,11 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39621,7 +43371,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39645,7 +43399,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap and check for either bit 0 or 1 set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39664,7 +43422,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given TVOCCONC.S.F00(MEA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given TVOCCONC.S.F00(MEA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given TVOCCONC.S.F00(MEA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39683,7 +43445,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given TVOCCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given TVOCCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given TVOCCONC.S.F00(MEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39702,7 +43468,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given TVOCCONC.S.F01(LEV) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given TVOCCONC.S.F01(LEV) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given TVOCCONC.S.F01(LEV) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39721,7 +43491,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given TVOCCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given TVOCCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given TVOCCONC.S.F01(LEV) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39740,7 +43514,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given TVOCCONC.S.F02(MED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given TVOCCONC.S.F02(MED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given TVOCCONC.S.F02(MED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39759,7 +43537,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given TVOCCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given TVOCCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given TVOCCONC.S.F02(MED) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39778,7 +43560,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given TVOCCONC.S.F03(CRI) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given TVOCCONC.S.F03(CRI) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given TVOCCONC.S.F03(CRI) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39797,7 +43583,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given TVOCCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given TVOCCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given TVOCCONC.S.F03(CRI) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39816,7 +43606,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given TVOCCONC.S.F04(PEA) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given TVOCCONC.S.F04(PEA) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given TVOCCONC.S.F04(PEA) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39835,7 +43629,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given TVOCCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given TVOCCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given TVOCCONC.S.F04(PEA) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39854,7 +43652,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given TVOCCONC.S.F05(AVG) ensure featuremap has the correct bits set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given TVOCCONC.S.F05(AVG) ensure featuremap has the correct bits set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given TVOCCONC.S.F05(AVG) ensure featuremap has the correct bits set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39873,7 +43675,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3m: Given TVOCCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Given TVOCCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Given TVOCCONC.S.F05(AVG) is not set, ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39892,7 +43698,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39919,7 +43729,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39945,7 +43759,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute Uncertainty in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39966,7 +43784,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when TVOCCONC.S.A0007 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when TVOCCONC.S.A0007 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Check the optional attribute Uncertainty is excluded from AttributeList when TVOCCONC.S.A0007 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -39987,7 +43809,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional, feature dependent attributes MeasuredValue, MinMeasuredValue, MaxMeasuredValue and Measurement Unit in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40011,7 +43837,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when TVOCCONC.S.F00 (MEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when TVOCCONC.S.F00 (MEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Check that MeasuredValue, MinMeasuredValue, MaxMeasuredValue, Measurement Unit and Uncertainty are excluded from AttributeList when TVOCCONC.S.F00 (MEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40036,7 +43866,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional, feature dependent attributes PeakMeasuredValue & PeakMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40058,7 +43892,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F04 (PEA) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F04 (PEA) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Check that PeakMeasuredValue & PeakMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F04 (PEA) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40080,7 +43918,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional, feature dependent attributes AverageMeasuredValue AverageMeasuredValueWindow in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40102,7 +43944,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F05 (AVG) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F05 (AVG) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Check that AverageMeasuredValue and AverageMeasuredValueWindow are excluded from AttributeList when TVOCCONC.S.F05 (AVG) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40124,7 +43970,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the optional, feature dependent attribute LevelValue in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40145,7 +43995,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when TVOCCONC.S.F01 (LEV) is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when TVOCCONC.S.F01 (LEV) is not set: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Check that LevelValue is excluded from AttributeList when TVOCCONC.S.F01 (LEV) is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40166,7 +44020,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40190,7 +44048,11 @@ class Test_TC_TVOCCONC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40409,7 +44271,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40437,7 +44303,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40464,7 +44334,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the MeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40489,7 +44363,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the PeakMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40514,7 +44392,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePeakMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40536,7 +44418,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the AverageMeasuredValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40561,7 +44447,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAverageMeasuredValueWindowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the AverageMeasuredValueWindow attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40583,7 +44473,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the MeasurementUnit attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40605,7 +44499,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasurementMediumWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the MeasurementMedium attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40627,7 +44525,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLevelValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the LevelValue attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -40642,11 +44544,11 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge {
     }
 };
 
-class TestIcdManagementCluster : public TestCommandBridge {
+class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TestIcdManagementCluster()
-        : TestCommandBridge("TestIcdManagementCluster")
+    Test_TC_OPCREDS_1_2()
+        : TestCommandBridge("Test_TC_OPCREDS_1_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -40656,7 +44558,7 @@ class TestIcdManagementCluster : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~TestIcdManagementCluster()
+    ~Test_TC_OPCREDS_1_2()
     {
     }
 
@@ -40666,11 +44568,11 @@ class TestIcdManagementCluster : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TestIcdManagementCluster\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OPCREDS_1_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TestIcdManagementCluster\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OPCREDS_1_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -40683,938 +44585,48 @@ class TestIcdManagementCluster : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
+            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read IdleModeDuration\n");
-            err = TestReadIdleModeDuration_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads the ClusterRevision from DUT\n");
+            err = TestStep2ThReadsTheClusterRevisionFromDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read ActiveModeDuration\n");
-            err = TestReadActiveModeDuration_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads the FeatureMap from DUT\n");
+            err = TestStep3ThReadsTheFeatureMapFromDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read ActiveModeThreshold\n");
-            err = TestReadActiveModeThreshold_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: TH reads AttributeList from DUT\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4ThReadsAttributeListFromDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read ICDCounter\n");
-            err = TestReadICDCounter_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4: TH reads AttributeList from DUT\n");
+            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4ThReadsAttributeListFromDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read ClientsSupportedPerFabric\n");
-            err = TestReadClientsSupportedPerFabric_5();
-            break;
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: TH reads EventList from DUT\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            NextTest();
+            return;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Unregister 1.0\n");
-            err = TestUnregister10_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: TH reads AcceptedCommandList from DUT\n");
+            err = TestStep6ThReadsAcceptedCommandListFromDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Unregister 2.0\n");
-            err = TestUnregister20_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Unregister 3.0\n");
-            err = TestUnregister30_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Register 1.0 (key too short)\n");
-            err = TestRegister10KeyTooShort_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Register 1.0 (key too long)\n");
-            err = TestRegister10KeyTooLong_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Register 1.1\n");
-            err = TestRegister11_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Register 2.1\n");
-            err = TestRegister21_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Register 3.1\n");
-            err = TestRegister31_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Register 1.1 (update)\n");
-            err = TestRegister11Update_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Register 2.2 (wrong verification key)\n");
-            err = TestRegister22WrongVerificationKey_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Unregister 1.1 (wrong key)\n");
-            err = TestUnregister11WrongKey_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Unregister 2.1\n");
-            err = TestUnregister21_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Read RegisteredClients\n");
-            err = TestReadRegisteredClients_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Unregister 1.3\n");
-            err = TestUnregister13_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Unregister 2.2\n");
-            err = TestUnregister22_25();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 26;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadIdleModeDuration_1()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeIdleModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read IdleModeDuration Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("IdleModeDuration", actualValue, 2UL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadActiveModeDuration_2()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeActiveModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ActiveModeDuration Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ActiveModeDuration", actualValue, 300UL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadActiveModeThreshold_3()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeActiveModeThresholdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ActiveModeThreshold Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ActiveModeThreshold", actualValue, 300U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadICDCounter_4()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeICDCounterWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ICDCounter Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadClientsSupportedPerFabric_5()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClientsSupportedPerFabricWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ClientsSupportedPerFabric Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClientsSupportedPerFabric", actualValue, 2U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister10_6()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 1.0 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister20_7()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:102ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 2.0 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister30_8()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:102ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 3.0 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_9()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(0)));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister10KeyTooShort_10()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:1001ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036" length:15];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 1.0 (key too short) Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister10KeyTooLong_11()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:1001ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\377" length:17];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 1.0 (key too long) Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister11_12()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:1001ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" length:16];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 1.1 Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                         {
-                                                             id actualValue = values.icdCounter;
-                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
-                                                         }
-
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister21_13()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:201ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:2001ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-./" length:16];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 2.1 Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                         {
-                                                             id actualValue = values.icdCounter;
-                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
-                                                         }
-
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister31_14()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:301ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:3001ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"0123456789:;<=>?" length:16];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 3.1 Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_15()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1001ULL));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister11Update_16()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:1002ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"\001\021!1AQaq\201\221\241\261\301\321\341\361" length:16];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 1.1 (update) Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                         {
-                                                             id actualValue = values.icdCounter;
-                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
-                                                         }
-
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_17()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRegister22WrongVerificationKey_18()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:201ULL];
-        params.monitoredSubject =
-            [NSNumber numberWithUnsignedLongLong:2002ULL];
-        params.key =
-            [[NSData alloc] initWithBytes:"\002\022\0422BRbr\202\222\242\262\302\322\342/" length:16];
-        params.verificationKey =
-            [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-//" length:16];
-        [cluster registerClientWithParams:params completion:
-                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Register 2.2 (wrong verification key) Error: %@", err);
-
-                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                         {
-                                                             id actualValue = values.icdCounter;
-                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
-                                                         }
-
-                                                         NextTest();
-                                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_19()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2002ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister11WrongKey_20()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        params.verificationKey =
-            [[NSData alloc] initWithBytes:"\001!!1AQaq\201\221\241\261\301\321\341\361" length:16];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 1.1 (wrong key) Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_21()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(1)));
-                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 201ULL));
-                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 2002ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister21_22()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:201ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 2.1 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadRegisteredClients_23()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRReadParams alloc] init];
-        params.filterByFabric = true;
-        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read RegisteredClients Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(0)));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister13_24()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:101ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 1.3 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestUnregister22_25()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
-        params.checkInNodeID =
-            [NSNumber numberWithUnsignedLongLong:102ULL];
-        [cluster unregisterClientWithParams:params completion:
-                                                       ^(NSError * _Nullable err) {
-                                                           NSLog(@"Unregister 2.2 Error: %@", err);
-
-                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OPCREDS_1_2()
-        : TestCommandBridge("Test_TC_OPCREDS_1_2")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_OPCREDS_1_2()
-    {
-    }
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OPCREDS_1_2\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OPCREDS_1_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
-            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads the ClusterRevision from DUT\n");
-            err = TestStep2ThReadsTheClusterRevisionFromDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads the FeatureMap from DUT\n");
-            err = TestStep3ThReadsTheFeatureMapFromDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: TH reads AttributeList from DUT\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4ThReadsAttributeListFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4: TH reads AttributeList from DUT\n");
-            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4ThReadsAttributeListFromDut_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: TH reads EventList from DUT\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            NextTest();
-            return;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: TH reads AcceptedCommandList from DUT\n");
-            err = TestStep6ThReadsAcceptedCommandListFromDut_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 7: TH reads GeneratedCommandList from DUT\n");
-            err = TestStep7ThReadsGeneratedCommandListFromDut_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 7: TH reads GeneratedCommandList from DUT\n");
+            err = TestStep7ThReadsGeneratedCommandListFromDut_7();
             break;
         }
 
@@ -41684,7 +44696,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41708,7 +44724,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41732,7 +44752,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41764,7 +44788,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41795,7 +44823,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41823,7 +44855,11 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42124,13 +45160,17 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -42148,7 +45188,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42172,7 +45216,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42210,7 +45258,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42247,7 +45299,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(ManufacturingDate) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(ManufacturingDate) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(ManufacturingDate) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42268,7 +45324,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads optional attribute(PartNumber) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads optional attribute(PartNumber) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads optional attribute(PartNumber) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42289,7 +45349,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute(ProductURL) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute(ProductURL) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute(ProductURL) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42310,7 +45374,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads optional attribute(ProductLabel) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads optional attribute(ProductLabel) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads optional attribute(ProductLabel) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42331,7 +45399,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads optional attribute(SerialNumber) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads optional attribute(SerialNumber) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads optional attribute(SerialNumber) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42352,7 +45424,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads optional attribute(LocalConfigDisabled) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads optional attribute(LocalConfigDisabled) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads optional attribute(LocalConfigDisabled) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42373,7 +45449,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads optional attribute(Reachable) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads optional attribute(Reachable) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads optional attribute(Reachable) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42394,7 +45474,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads optional attribute(UniqueID) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads optional attribute(UniqueID) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads optional attribute(UniqueID) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42415,7 +45499,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42434,7 +45522,11 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42725,7 +45817,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42749,7 +45845,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42772,7 +45872,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the global attribute: FeatureMap when CNET.S.F00 is set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the global attribute: FeatureMap when CNET.S.F00 is set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the global attribute: FeatureMap when CNET.S.F00 is set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42795,7 +45899,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the global attribute: FeatureMap when CNET.S.F01 is set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the global attribute: FeatureMap when CNET.S.F01 is set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the global attribute: FeatureMap when CNET.S.F01 is set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42818,7 +45926,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Read the global attribute: FeatureMap when CNET.S.F02 is set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read the global attribute: FeatureMap when CNET.S.F02 is set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read the global attribute: FeatureMap when CNET.S.F02 is set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42841,7 +45953,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42867,7 +45983,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42892,7 +46012,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read mandatory attributes in AttributeList if CNET.S.F00(WI)/CNET.S.F01(TH)/CNET.S.F02(ET) is true Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read mandatory attributes in AttributeList if CNET.S.F00(WI)/CNET.S.F01(TH)/CNET.S.F02(ET) is true: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read mandatory attributes in AttributeList if CNET.S.F00(WI)/CNET.S.F01(TH)/CNET.S.F02(ET) is true: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42918,7 +46042,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute(ScanMaxTimeSeconds): AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute(ScanMaxTimeSeconds): AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute(ScanMaxTimeSeconds): AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42939,7 +46067,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Reading optional attribute(ConnectMaxTimeSeconds) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Reading optional attribute(ConnectMaxTimeSeconds) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Reading optional attribute(ConnectMaxTimeSeconds) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42960,7 +46092,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read AcceptedCommandList If DUT supports Wi-Fi/Thread related features CNET.S.F00(WI),CNET.S.F01(TH) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read AcceptedCommandList If DUT supports Wi-Fi/Thread related features CNET.S.F00(WI),CNET.S.F01(TH): Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read AcceptedCommandList If DUT supports Wi-Fi/Thread related features CNET.S.F00(WI),CNET.S.F01(TH): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42984,7 +46120,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read AcceptedCommandList If DUT supports Wi-Fi related features (CNET.S.F00(WI) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read AcceptedCommandList If DUT supports Wi-Fi related features (CNET.S.F00(WI) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read AcceptedCommandList If DUT supports Wi-Fi related features (CNET.S.F00(WI) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43005,7 +46145,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read AcceptedCommandList If DUT supports Thread related features(CNET.S.F01(TH) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read AcceptedCommandList If DUT supports Thread related features(CNET.S.F01(TH) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read AcceptedCommandList If DUT supports Thread related features(CNET.S.F01(TH) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43026,7 +46170,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Read AcceptedCommandList If DUT supports Ethernet related features(CNET.S.F02(TH) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Read AcceptedCommandList If DUT supports Ethernet related features(CNET.S.F02(TH) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Read AcceptedCommandList If DUT supports Ethernet related features(CNET.S.F02(TH) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43049,7 +46197,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7a: Read the GeneratedCommandList If DUT supports Wi-Fi/Thread related features(CNET.S.F00(WI) or CNET.S.F01(TH) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7a: Read the GeneratedCommandList If DUT supports Wi-Fi/Thread related features(CNET.S.F00(WI) or CNET.S.F01(TH) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 7a: Read the GeneratedCommandList If DUT supports Wi-Fi/Thread related features(CNET.S.F00(WI) or CNET.S.F01(TH) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43072,7 +46224,11 @@ class Test_TC_CNET_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b: Read the GeneratedCommandList If DUT supports Ethernet related features(CNET.S.F02(ET) must be true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b: Read the GeneratedCommandList If DUT supports Ethernet related features(CNET.S.F02(ET) must be true): Error: %@", err);
+            } else {
+                NSLog(@"Step 7b: Read the GeneratedCommandList If DUT supports Ethernet related features(CNET.S.F02(ET) must be true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43266,7 +46422,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43290,7 +46450,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43309,7 +46473,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. 0x0001: SHALL be included if and only if DESC.S.F00(TagList) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. 0x0001: SHALL be included if and only if DESC.S.F00(TagList): Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. 0x0001: SHALL be included if and only if DESC.S.F00(TagList): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43328,7 +46496,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43358,7 +46530,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43387,7 +46563,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0004: SHALL be included if and only if DESC.S.F00 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0004: SHALL be included if and only if DESC.S.F00: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0004: SHALL be included if and only if DESC.S.F00: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43408,7 +46588,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43432,7 +46616,11 @@ class Test_TC_DESC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43601,7 +46789,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43625,7 +46817,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43649,7 +46845,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43675,7 +46875,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43700,7 +46904,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43725,7 +46933,11 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44035,7 +47247,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44059,7 +47275,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44083,7 +47303,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given DGETH.S.F00 ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given DGETH.S.F00 ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given DGETH.S.F00 ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44102,7 +47326,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given DGETH.S.F01 ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given DGETH.S.F01 ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given DGETH.S.F01 ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44121,7 +47349,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44147,7 +47379,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44172,7 +47408,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(PHYRate) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(PHYRate) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(PHYRate) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44193,7 +47433,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads optional attribute(FullDuplex) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads optional attribute(FullDuplex) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads optional attribute(FullDuplex) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44214,7 +47458,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44235,7 +47483,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F00(PKTCNT)) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44256,7 +47508,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44277,7 +47533,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44298,7 +47558,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads optional attribute(PacketRxCount) and Feature dependent(DGETH.S.F01(ERRCNT)) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44319,7 +47583,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads optional attribute(CarrierDetect) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads optional attribute(CarrierDetect) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads optional attribute(CarrierDetect) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44340,7 +47608,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads optional attribute(TimeSinceReset) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads optional attribute(TimeSinceReset) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads optional attribute(TimeSinceReset) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44361,7 +47633,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44382,7 +47658,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44406,7 +47686,11 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44664,7 +47948,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read PHYRate attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read PHYRate attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read PHYRate attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44687,7 +47975,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFullDuplexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read FullDuplex attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read FullDuplex attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read FullDuplex attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44710,7 +48002,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read PacketRxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read PacketRxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read PacketRxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44767,7 +48063,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: Read PacketTxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: Read PacketTxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: Read PacketTxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44799,7 +48099,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTxErrCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read TxErrCount attribute constraints, Upon a node reboot, the value will be reset to 0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read TxErrCount attribute constraints, Upon a node reboot, the value will be reset to 0: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read TxErrCount attribute constraints, Upon a node reboot, the value will be reset to 0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44823,7 +48127,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCollisionCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read CollisionCount attribute , Upon a node reboot, the value will be reset to 0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read CollisionCount attribute , Upon a node reboot, the value will be reset to 0: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read CollisionCount attribute , Upon a node reboot, the value will be reset to 0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44847,7 +48155,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOverrunCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Read OverrunCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Read OverrunCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Read OverrunCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44871,7 +48183,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCarrierDetectWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Read CarrierDetect attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Read CarrierDetect attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Read CarrierDetect attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44894,7 +48210,11 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTimeSinceResetWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Read TimeSinceReset attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Read TimeSinceReset attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Read TimeSinceReset attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45231,7 +48551,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.1: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.1: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.1: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45256,7 +48580,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.2: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.2: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.2: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45281,7 +48609,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.3: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.3: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.3: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45306,7 +48638,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.4: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.4: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.4: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45331,7 +48667,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.5: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.5: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.5: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45356,7 +48696,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.6: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.6: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.6: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45381,7 +48725,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.7: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.7: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.7: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45406,7 +48754,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.8: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.8: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.8: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45431,7 +48783,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.9: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.9: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.9: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45456,7 +48812,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePHYRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a.10: TH reads PHYRate attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a.10: TH reads PHYRate attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a.10: TH reads PHYRate attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45482,7 +48842,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads PacketRxCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads PacketRxCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads PacketRxCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45505,7 +48869,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads PacketTxCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads PacketTxCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads PacketTxCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45528,7 +48896,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTxErrCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads TxErrCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads TxErrCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads TxErrCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45551,7 +48923,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCollisionCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CollisionCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CollisionCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CollisionCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45574,7 +48950,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOverrunCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads OverrunCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads OverrunCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads OverrunCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45597,7 +48977,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
 
         [cluster resetCountsWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2g: Sends ResetCounts command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2g: Sends ResetCounts command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2g: Sends ResetCounts command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45635,7 +49019,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTxErrCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2j: TH reads TxErrCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2j: TH reads TxErrCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2j: TH reads TxErrCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45655,7 +49043,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCollisionCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2k: TH reads CollisionCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2k: TH reads CollisionCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2k: TH reads CollisionCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45675,7 +49067,11 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOverrunCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2l: TH reads OverrunCount attribute value from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2l: TH reads OverrunCount attribute value from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2l: TH reads OverrunCount attribute value from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45851,7 +49247,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45875,7 +49275,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45899,7 +49303,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45928,7 +49336,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45956,7 +49368,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45977,7 +49393,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46001,7 +49421,11 @@ class Test_TC_FLW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46170,7 +49594,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46194,7 +49622,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46218,7 +49650,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46245,7 +49681,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46271,7 +49711,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46295,7 +49739,11 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46593,7 +50041,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46617,7 +50069,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46641,7 +50097,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given FAN.S.F00(SPD) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given FAN.S.F00(SPD) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given FAN.S.F00(SPD) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46660,7 +50120,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given FAN.S.F01(AUT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given FAN.S.F01(AUT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given FAN.S.F01(AUT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46679,7 +50143,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given FAN.S.F02(RCK) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given FAN.S.F02(RCK) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given FAN.S.F02(RCK) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46698,7 +50166,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given FAN.S.F03(WND) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given FAN.S.F03(WND) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given FAN.S.F03(WND) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46717,7 +50189,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given FAN.S.F04(STEP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given FAN.S.F04(STEP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given FAN.S.F04(STEP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46736,7 +50212,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given FAN.S.F05(DIR) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given FAN.S.F05(DIR) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given FAN.S.F05(DIR) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46755,7 +50235,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46785,7 +50269,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46814,7 +50302,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46837,7 +50329,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46859,7 +50355,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46881,7 +50381,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46902,7 +50406,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46926,7 +50434,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional command (Step) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional command (Step) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional command (Step) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46947,7 +50459,11 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47099,7 +50615,11 @@ class Test_TC_FAN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFanModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the FanMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the FanMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the FanMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47121,7 +50641,11 @@ class Test_TC_FAN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFanModeSequenceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the FanModeSequence attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the FanModeSequence attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the FanModeSequence attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47143,7 +50667,11 @@ class Test_TC_FAN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the the PercentSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the the PercentSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the the PercentSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47168,7 +50696,11 @@ class Test_TC_FAN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the the PercentCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the the PercentCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the the PercentCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47308,7 +50840,11 @@ class Test_TC_FAN_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedMaxWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the SpeedMax attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the SpeedMax attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the SpeedMax attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47333,7 +50869,11 @@ class Test_TC_FAN_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the SpeedSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the SpeedSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the SpeedSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47358,7 +50898,11 @@ class Test_TC_FAN_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the the SpeedCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the the SpeedCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the the SpeedCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47486,7 +51030,11 @@ class Test_TC_FAN_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRockSupportWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the RockSupport attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the RockSupport attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the RockSupport attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47505,7 +51053,11 @@ class Test_TC_FAN_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRockSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the RockSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the RockSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the RockSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47630,7 +51182,11 @@ class Test_TC_FAN_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindSupportWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the WindSupport attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the WindSupport attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the WindSupport attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47649,7 +51205,11 @@ class Test_TC_FAN_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the WindSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the WindSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the WindSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47911,7 +51471,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         fanModeArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeFanModeWithValue:fanModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH writes a supported FanMode attribute that is other than off to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH writes a supported FanMode attribute that is other than off to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH writes a supported FanMode attribute that is other than off to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47937,7 +51501,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFanModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads from the DUT the the FanMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads from the DUT the the FanMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads from the DUT the the FanMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47963,7 +51531,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         fanModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeFanModeWithValue:fanModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2.1a: TH writes the Off value of FanMode attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2.1a: TH writes the Off value of FanMode attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2.1a: TH writes the Off value of FanMode attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47989,7 +51561,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2.1b: TH reads from the DUT the PercentSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2.1b: TH reads from the DUT the PercentSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2.1b: TH reads from the DUT the PercentSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48013,7 +51589,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2.1c: TH reads from the DUT the PercentCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2.1c: TH reads from the DUT the PercentCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2.1c: TH reads from the DUT the PercentCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48038,7 +51618,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         id percentSettingArgument;
         percentSettingArgument = mConfigPercentSetting.HasValue() ? [NSNumber numberWithUnsignedChar:mConfigPercentSetting.Value()] : [NSNumber numberWithUnsignedChar:30U];
         [cluster writeAttributePercentSettingWithValue:percentSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH writes PercentSetting attribute a non-zero value to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH writes PercentSetting attribute a non-zero value to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH writes PercentSetting attribute a non-zero value to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48064,7 +51648,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads from the DUT the PercentCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads from the DUT the PercentCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads from the DUT the PercentCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48087,7 +51675,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads from the DUT the PercentSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads from the DUT the PercentSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads from the DUT the PercentSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48114,7 +51706,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         percentSettingArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributePercentSettingWithValue:percentSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3.1a: TH writes PercentSetting attribute a zero value to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3.1a: TH writes PercentSetting attribute a zero value to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3.1a: TH writes PercentSetting attribute a zero value to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48140,7 +51736,11 @@ class Test_TC_FAN_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFanModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3.1b: TH reads from the DUT the the FanMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3.1b: TH reads from the DUT the the FanMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3.1b: TH reads from the DUT the the FanMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48303,7 +51903,11 @@ class Test_TC_FAN_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedMaxWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the SpeedMax attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the SpeedMax attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the SpeedMax attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48328,7 +51932,11 @@ class Test_TC_FAN_3_2 : public TestCommandBridge {
         speedSettingArgument =
             [rSpeedMax copy];
         [cluster writeAttributeSpeedSettingWithValue:speedSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3: TH writes to the DUT the a value less than or equal to the value read in step 2 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH writes to the DUT the a value less than or equal to the value read in step 2: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH writes to the DUT the a value less than or equal to the value read in step 2: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48354,7 +51962,11 @@ class Test_TC_FAN_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the SpeedSetting attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the SpeedSetting attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the SpeedSetting attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48382,7 +51994,11 @@ class Test_TC_FAN_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the SpeedCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the SpeedCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the SpeedCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48558,7 +52174,11 @@ class Test_TC_FAN_3_6 : public TestCommandBridge {
         airflowDirectionArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeAirflowDirectionWithValue:airflowDirectionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2: TH writes a value of Forward to the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH writes a value of Forward to the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH writes a value of Forward to the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48584,7 +52204,11 @@ class Test_TC_FAN_3_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAirflowDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the AirflowDirection attribute and check it is forwards Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the AirflowDirection attribute and check it is forwards: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the AirflowDirection attribute and check it is forwards: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48610,7 +52234,11 @@ class Test_TC_FAN_3_6 : public TestCommandBridge {
         airflowDirectionArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeAirflowDirectionWithValue:airflowDirectionArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: TH writes a value of Reverse to the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH writes a value of Reverse to the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH writes a value of Reverse to the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48636,7 +52264,11 @@ class Test_TC_FAN_3_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAirflowDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the AirflowDirection attribute and check it is reverse Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the AirflowDirection attribute and check it is reverse: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the AirflowDirection attribute and check it is reverse: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48804,7 +52436,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48828,7 +52464,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48852,7 +52492,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48883,7 +52527,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48913,7 +52561,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48936,7 +52588,11 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49120,7 +52776,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH1 reads the BreadCrumb Attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH1 reads the BreadCrumb Attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH1 reads the BreadCrumb Attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49142,7 +52802,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         breadcrumbArgument =
             [NSNumber numberWithUnsignedLongLong:1ULL];
         [cluster writeAttributeBreadcrumbWithValue:breadcrumbArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2: TH1 writes the BreadCrumb attribute as 1 to the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH1 writes the BreadCrumb attribute as 1 to the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH1 writes the BreadCrumb attribute as 1 to the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49160,7 +52824,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH1 reads the BreadCrumb attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH1 reads the BreadCrumb attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH1 reads the BreadCrumb attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49183,7 +52851,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRegulatoryConfigWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH1 reads the RegulatoryConfig attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH1 reads the RegulatoryConfig attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH1 reads the RegulatoryConfig attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49204,7 +52876,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationCapabilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH1 reads the LocationCapability attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH1 reads the LocationCapability attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH1 reads the LocationCapability attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49225,7 +52901,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBasicCommissioningInfoWithCompletion:^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH1 reads BasicCommissioningInfo attribute from DUT and Verify that the BasicCommissioningInfo attribute has the following field: FailSafeExpiryLengthSeconds field value is within a duration range of 0 to 65535 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH1 reads BasicCommissioningInfo attribute from DUT and Verify that the BasicCommissioningInfo attribute has the following field: FailSafeExpiryLengthSeconds field value is within a duration range of 0 to 65535: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH1 reads BasicCommissioningInfo attribute from DUT and Verify that the BasicCommissioningInfo attribute has the following field: FailSafeExpiryLengthSeconds field value is within a duration range of 0 to 65535: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49243,7 +52923,11 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportsConcurrentConnectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH1 reads SupportsConcurrentConnection attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH1 reads SupportsConcurrentConnection attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH1 reads SupportsConcurrentConnection attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49324,12 +53008,8 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
             err = TestStep4aReadTheGlobalAttributeAttributeList_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Read optional attribute(UpTime) in AttributeList\n");
-            if (ShouldSkip("DGGEN.S.A0002")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4bReadOptionalAttributeUpTimeInAttributeList_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Validate presence of mandatory attribute(UpTime) in AttributeList\n");
+            err = TestStep4bValidatePresenceOfMandatoryAttributeUpTimeInAttributeList_5();
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4c: Read optional attribute(TotalOperationalHours) in AttributeList\n");
@@ -49506,13 +53186,17 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -49530,7 +53214,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49554,7 +53242,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49583,7 +53275,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49603,7 +53299,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4bReadOptionalAttributeUpTimeInAttributeList_5()
+    CHIP_ERROR TestStep4bValidatePresenceOfMandatoryAttributeUpTimeInAttributeList_5()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -49611,7 +53307,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read optional attribute(UpTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Validate presence of mandatory attribute(UpTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Validate presence of mandatory attribute(UpTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49632,7 +53332,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read optional attribute(TotalOperationalHours) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read optional attribute(TotalOperationalHours) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read optional attribute(TotalOperationalHours) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49653,7 +53357,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read optional attribute(BootReason) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read optional attribute(BootReason) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read optional attribute(BootReason) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49674,7 +53382,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read optional attribute(ActiveHardwareFaults) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read optional attribute(ActiveHardwareFaults) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read optional attribute(ActiveHardwareFaults) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49695,7 +53407,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read optional attribute(ActiveRadioFaults) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read optional attribute(ActiveRadioFaults) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read optional attribute(ActiveRadioFaults) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49716,7 +53432,11 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read optional attribute(ActiveNetworkFaults) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read optional attribute(ActiveNetworkFaults) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read optional attribute(ActiveNetworkFaults) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49737,12 +53457,17 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL));
 
             NextTest();
         }];
@@ -49758,13 +53483,18 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(1)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 2UL));
             }
 
             VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list"));
@@ -49942,7 +53672,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49966,7 +53700,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49990,7 +53728,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given GRPKEY.S.F00(CS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given GRPKEY.S.F00(CS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given GRPKEY.S.F00(CS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50009,7 +53751,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50039,7 +53785,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50068,7 +53818,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50092,7 +53846,11 @@ class Test_TC_GRPKEY_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50562,7 +54320,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxGroupKeysPerFabricWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads MaxGroupKeysPerFabric attribute from GroupKeyManagement cluster on DUT using a fabric-filtered read. Save the value as Max_GrpKey for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads MaxGroupKeysPerFabric attribute from GroupKeyManagement cluster on DUT using a fabric-filtered read. Save the value as Max_GrpKey for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads MaxGroupKeysPerFabric attribute from GroupKeyManagement cluster on DUT using a fabric-filtered read. Save the value as Max_GrpKey for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50604,7 +54366,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50626,7 +54392,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:26U];
         [cluster keySetReadWithParams:params completion:
                                                  ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                     NSLog(@"Step 3: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a Error: %@", err);
+                                                     if (err != nil) {
+                                                         NSLog(@"Step 3: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a: Error: %@", err);
+                                                     } else {
+                                                         NSLog(@"Step 3: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a: Success");
+                                                     }
 
                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50675,7 +54445,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50711,7 +54485,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -50748,7 +54526,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50784,7 +54566,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 7: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 7: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 7: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50821,7 +54607,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 8: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 8: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 8: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50857,7 +54647,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 9: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 9: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 9: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50893,7 +54687,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 10: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 10: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 10: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50930,7 +54728,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 11: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime1 is earlier than EpochStartTime0 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 11: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime1 is earlier than EpochStartTime0: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 11: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime1 is earlier than EpochStartTime0: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -50965,7 +54767,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 12: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey1 and EpochStartTime1 are null when EpochKey2 and EpochStartTime2 are not null Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 12: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey1 and EpochStartTime1 are null when EpochKey2 and EpochStartTime2 are not null: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 12: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey1 and EpochStartTime1 are null when EpochKey2 and EpochStartTime2 are not null: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -51001,7 +54807,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 13: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is set to null and EpochStartTime2 is not null Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 13: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is set to null and EpochStartTime2 is not null: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 13: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is set to null and EpochStartTime2 is not null: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -51037,7 +54847,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 14: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is not null and EpochStartTime2 is null Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 14: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is not null and EpochStartTime2 is null: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 14: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochKey2 is not null and EpochStartTime2 is null: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -51074,7 +54888,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 15: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime2 is earlier than EpochStartTime1 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 15: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime2 is earlier than EpochStartTime1: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 15: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: EpochStartTime2 is earlier than EpochStartTime1: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                       NextTest();
@@ -51111,7 +54929,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51148,7 +54970,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16: Repeat the step by sending EpochKey1 with 1 byte value (< 16 bytes) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16: Repeat the step by sending EpochKey1 with 1 byte value (< 16 bytes): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16: Repeat the step by sending EpochKey1 with 1 byte value (< 16 bytes): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51185,7 +55011,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16: Note: Repeat the step by sending EpochKey2 with 1 byte value (< 16 bytes) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16: Note: Repeat the step by sending EpochKey2 with 1 byte value (< 16 bytes): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16: Note: Repeat the step by sending EpochKey2 with 1 byte value (< 16 bytes): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51222,7 +55052,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16a: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 15 bytes value (< 16 byte) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16a: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 15 bytes value (< 16 byte): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16a: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 15 bytes value (< 16 byte): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51259,7 +55093,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey1 having 15 bytes value (< 16 byte) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey1 having 15 bytes value (< 16 byte): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey1 having 15 bytes value (< 16 byte): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51296,7 +55134,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey2 having 15 bytes value (< 16 byte) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey2 having 15 bytes value (< 16 byte): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16a: Repeat step 16a by sending KeySetWrite Command with EpochKey2 having 15 bytes value (< 16 byte): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51333,7 +55175,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16b: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 17 bytes value (> 16 bytes) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16b: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 17 bytes value (> 16 bytes): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16b: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT. Note: Repeat step 16 by sending KeySetWrite Command with EpochKey0, EpochKey1 and EpochKey2 having 17 bytes value (> 16 bytes): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51370,7 +55216,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey1 having 17 bytes value (> 16 bytes) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey1 having 17 bytes value (> 16 bytes): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey1 having 17 bytes value (> 16 bytes): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51407,7 +55257,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey2 having 17 bytes value (> 16 bytes) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey2 having 17 bytes value (> 16 bytes): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 16b: Repeat step 16 by sending KeySetWrite Command with EpochKey2 having 17 bytes value (> 16 bytes): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -51444,7 +55298,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 17: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0. Note: KeySetWrite command is sent with different EpochKeys,EpochStartTime1 and EpochStartTime2 values Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 17: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0. Note: KeySetWrite command is sent with different EpochKeys,EpochStartTime1 and EpochStartTime2 values: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 17: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0. Note: KeySetWrite command is sent with different EpochKeys,EpochStartTime1 and EpochStartTime2 values: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51466,7 +55324,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:26U];
         [cluster keySetReadWithParams:params completion:
                                                  ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                     NSLog(@"Step 18: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a Error: %@", err);
+                                                     if (err != nil) {
+                                                         NSLog(@"Step 18: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a: Error: %@", err);
+                                                     } else {
+                                                         NSLog(@"Step 18: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a: Success");
+                                                     }
 
                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51503,7 +55365,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:27U];
         [cluster keySetReadWithParams:params completion:
                                                  ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                     NSLog(@"Step 19: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01b that does not exist in the GroupKeyMap attribute list. Error: %@", err);
+                                                     if (err != nil) {
+                                                         NSLog(@"Step 19: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01b that does not exist in the GroupKeyMap attribute list.: Error: %@", err);
+                                                     } else {
+                                                         NSLog(@"Step 19: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01b that does not exist in the GroupKeyMap attribute list.: Success");
+                                                     }
 
                                                      VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
                                                      NextTest();
@@ -51524,7 +55390,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:26U];
         [cluster keySetRemoveWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 20: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 20: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 20: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51572,7 +55442,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 22: TH again sends KeySetWrite command to DUT with any other GroupKeySetID not used yet. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 22: TH again sends KeySetWrite command to DUT with any other GroupKeySetID not used yet.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 22: TH again sends KeySetWrite command to DUT with any other GroupKeySetID not used yet.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
                                                       NextTest();
@@ -51603,7 +55477,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster keySetRemoveWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 24: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x0 Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 24: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x0: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 24: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x0: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                        NextTest();
@@ -51624,7 +55502,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:27U];
         [cluster keySetRemoveWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 25: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01b that does not exist in the GroupKeyMap attribute list. Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 25: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01b that does not exist in the GroupKeyMap attribute list.: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 25: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01b that does not exist in the GroupKeyMap attribute list.: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
                                                        NextTest();
@@ -51634,11 +55516,11 @@ class Test_TC_GRPKEY_2_2 : public TestCommandBridge {
     }
 };
 
-class Test_TC_ICDM_1_1 : public TestCommandBridge {
+class TestIcdManagementCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_ICDM_1_1()
-        : TestCommandBridge("Test_TC_ICDM_1_1")
+    TestIcdManagementCluster()
+        : TestCommandBridge("TestIcdManagementCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -51648,7 +55530,7 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_ICDM_1_1()
+    ~TestIcdManagementCluster()
     {
     }
 
@@ -51658,11 +55540,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ICDM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: TestIcdManagementCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ICDM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TestIcdManagementCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -51675,116 +55557,1140 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
-            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads ClusterRevision attribute from DUT\n");
-            err = TestStep2ThReadsClusterRevisionAttributeFromDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read Feature Map\n");
+            err = TestReadFeatureMap_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads FeatureMap attribute from DUT\n");
-            if (ShouldSkip("ICDM.S.F00")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3ThReadsFeatureMapAttributeFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read IdleModeDuration\n");
+            err = TestReadIdleModeDuration_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 3: TH reads FeatureMap attribute from DUT\n");
-            if (ShouldSkip(" !ICDM.S.F00 ")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3ThReadsFeatureMapAttributeFromDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read ActiveModeDuration\n");
+            err = TestReadActiveModeDuration_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4a: TH reads AttributeList attribute from DUT\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4aThReadsAttributeListAttributeFromDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read ActiveModeThreshold\n");
+            err = TestReadActiveModeThreshold_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4a: TH reads AttributeList attribute from DUT\n");
-            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4aThReadsAttributeListAttributeFromDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read ICDCounter\n");
+            err = TestReadICDCounter_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4b: Read the optional attribute(RegisteredClients) in AttributeList\n");
-            if (ShouldSkip("ICDM.S.A0003")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4bReadTheOptionalAttributeRegisteredClientsInAttributeList_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read ClientsSupportedPerFabric\n");
+            err = TestReadClientsSupportedPerFabric_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 4c: Read the optional attribute(IcdCounter) in AttributeList\n");
-            if (ShouldSkip("ICDM.S.A0004")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4cReadTheOptionalAttributeIcdCounterInAttributeList_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Unregister 1.0\n");
+            err = TestUnregister10_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 4d: Read the optional attribute(ClientsSupportedPerFabric) in AttributeList\n");
-            if (ShouldSkip("ICDM.S.A0005")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4dReadTheOptionalAttributeClientsSupportedPerFabricInAttributeList_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Unregister 2.0\n");
+            err = TestUnregister20_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 5: Read the global attribute: EventList\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            NextTest();
-            return;
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Unregister 3.0\n");
+            err = TestUnregister30_9();
+            break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 6a: TH reads AcceptedCommandList attribute from DUT\n");
-            if (ShouldSkip(" !ICDM.S.F00 && !ICDM.S.C03.Rsp ")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6aThReadsAcceptedCommandListAttributeFromDut_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 6b: TH reads AcceptedCommandList attribute from DUT if ICDM.S.F00 is true\n");
-            if (ShouldSkip("ICDM.S.F00")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6bThReadsAcceptedCommandListAttributeFromDutIfIcdmsf00IsTrue_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Register 1.0 (key too short)\n");
+            err = TestRegister10KeyTooShort_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 6c: Read the optional command (StayActiveRequest) in AttributeList\n");
-            if (ShouldSkip("ICDM.S.C03.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6cReadTheOptionalCommandStayActiveRequestInAttributeList_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Register 1.0 (key too long)\n");
+            err = TestRegister10KeyTooLong_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 7: TH reads GeneratedCommandList attribute from DUT\n");
-            if (ShouldSkip(" !ICDM.S.F00 ")) {
-                NextTest();
-                return;
-            }
-            err = TestStep7ThReadsGeneratedCommandListAttributeFromDut_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Register 1.1\n");
+            err = TestRegister11_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 7: TH reads GeneratedCommandList attribute from DUT\n");
-            if (ShouldSkip("ICDM.S.F00")) {
-                NextTest();
-                return;
-            }
-            err = TestStep7ThReadsGeneratedCommandListAttributeFromDut_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Register 2.1\n");
+            err = TestRegister21_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Register 3.1\n");
+            err = TestRegister31_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Register 1.1 (update)\n");
+            err = TestRegister11Update_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Register 2.2 (wrong verification key)\n");
+            err = TestRegister22WrongVerificationKey_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Unregister 1.1 (wrong key)\n");
+            err = TestUnregister11WrongKey_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Unregister 2.1\n");
+            err = TestUnregister21_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_24();
+            break;
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Unregister 1.3\n");
+            err = TestUnregister13_25();
+            break;
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Unregister 2.2\n");
+            err = TestUnregister22_26();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 27;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestReadFeatureMap_1()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read Feature Map: Error: %@", err);
+            } else {
+                NSLog(@"Read Feature Map: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 7UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadIdleModeDuration_2()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeIdleModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read IdleModeDuration: Error: %@", err);
+            } else {
+                NSLog(@"Read IdleModeDuration: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("IdleModeDuration", actualValue, 3600UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadActiveModeDuration_3()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeActiveModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read ActiveModeDuration: Error: %@", err);
+            } else {
+                NSLog(@"Read ActiveModeDuration: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ActiveModeDuration", actualValue, 10000UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadActiveModeThreshold_4()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeActiveModeThresholdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read ActiveModeThreshold: Error: %@", err);
+            } else {
+                NSLog(@"Read ActiveModeThreshold: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ActiveModeThreshold", actualValue, 1000U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadICDCounter_5()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeICDCounterWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read ICDCounter: Error: %@", err);
+            } else {
+                NSLog(@"Read ICDCounter: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadClientsSupportedPerFabric_6()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClientsSupportedPerFabricWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read ClientsSupportedPerFabric: Error: %@", err);
+            } else {
+                NSLog(@"Read ClientsSupportedPerFabric: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClientsSupportedPerFabric", actualValue, 2U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister10_7()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 1.0: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 1.0: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister20_8()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:102ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 2.0: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 2.0: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister30_9()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:102ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 3.0: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 3.0: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_10()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister10KeyTooShort_11()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:1001ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036" length:15];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 1.0 (key too short): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 1.0 (key too short): Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister10KeyTooLong_12()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:1001ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\377" length:17];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 1.0 (key too long): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 1.0 (key too long): Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister11_13()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:1001ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" length:16];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 1.1: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 1.1: Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                         {
+                                                             id actualValue = values.icdCounter;
+                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
+                                                         }
+
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister21_14()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:201ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:2001ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-./" length:16];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 2.1: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 2.1: Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                         {
+                                                             id actualValue = values.icdCounter;
+                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
+                                                         }
+
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister31_15()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:301ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:3001ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"0123456789:;<=>?" length:16];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 3.1: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 3.1: Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_16()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1001ULL));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister11Update_17()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:1002ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"\001\021!1AQaq\201\221\241\261\301\321\341\361" length:16];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 1.1 (update): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 1.1 (update): Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                         {
+                                                             id actualValue = values.icdCounter;
+                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
+                                                         }
+
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_18()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRegister22WrongVerificationKey_19()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterRegisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:201ULL];
+        params.monitoredSubject =
+            [NSNumber numberWithUnsignedLongLong:2002ULL];
+        params.key =
+            [[NSData alloc] initWithBytes:"\002\022\0422BRbr\202\222\242\262\302\322\342/" length:16];
+        params.verificationKey =
+            [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-//" length:16];
+        [cluster registerClientWithParams:params completion:
+                                                     ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                         if (err != nil) {
+                                                             NSLog(@"Register 2.2 (wrong verification key): Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Register 2.2 (wrong verification key): Success");
+                                                         }
+
+                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                         {
+                                                             id actualValue = values.icdCounter;
+                                                             VerifyOrReturn(CheckValue("ICDCounter", actualValue, 0UL));
+                                                         }
+
+                                                         NextTest();
+                                                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_20()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2002ULL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister11WrongKey_21()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        params.verificationKey =
+            [[NSData alloc] initWithBytes:"\001!!1AQaq\201\221\241\261\301\321\341\361" length:16];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 1.1 (wrong key): Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 1.1 (wrong key): Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_22()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(1)));
+                VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 201ULL));
+                VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 2002ULL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister21_23()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:201ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 2.1: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 2.1: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadRegisteredClients_24()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeRegisteredClientsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read RegisteredClients: Error: %@", err);
+            } else {
+                NSLog(@"Read RegisteredClients: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister13_25()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:101ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 1.3: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 1.3: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUnregister22_26()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRICDManagementClusterUnregisterClientParams alloc] init];
+        params.checkInNodeID =
+            [NSNumber numberWithUnsignedLongLong:102ULL];
+        [cluster unregisterClientWithParams:params completion:
+                                                       ^(NSError * _Nullable err) {
+                                                           if (err != nil) {
+                                                               NSLog(@"Unregister 2.2: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Unregister 2.2: Success");
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_ICDM_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_ICDM_1_1()
+        : TestCommandBridge("Test_TC_ICDM_1_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_ICDM_1_1()
+    {
+    }
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ICDM_1_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ICDM_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
+            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads ClusterRevision attribute from DUT\n");
+            err = TestStep2ThReadsClusterRevisionAttributeFromDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads FeatureMap attribute from DUT\n");
+            if (ShouldSkip("ICDM.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3ThReadsFeatureMapAttributeFromDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 3: TH reads FeatureMap attribute from DUT\n");
+            if (ShouldSkip(" !ICDM.S.F00 ")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3ThReadsFeatureMapAttributeFromDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4a: TH reads AttributeList attribute from DUT\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4aThReadsAttributeListAttributeFromDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4a: TH reads AttributeList attribute from DUT\n");
+            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4aThReadsAttributeListAttributeFromDut_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4b: Read the optional attribute(RegisteredClients) in AttributeList\n");
+            if (ShouldSkip("ICDM.S.A0003")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4bReadTheOptionalAttributeRegisteredClientsInAttributeList_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 4c: Read the optional attribute(IcdCounter) in AttributeList\n");
+            if (ShouldSkip("ICDM.S.A0004")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4cReadTheOptionalAttributeIcdCounterInAttributeList_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 4d: Read the optional attribute(ClientsSupportedPerFabric) in AttributeList\n");
+            if (ShouldSkip("ICDM.S.A0005")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4dReadTheOptionalAttributeClientsSupportedPerFabricInAttributeList_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 5: Read the global attribute: EventList\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            NextTest();
+            return;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 6a: TH reads AcceptedCommandList attribute from DUT\n");
+            if (ShouldSkip(" !ICDM.S.F00 && !ICDM.S.C03.Rsp ")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6aThReadsAcceptedCommandListAttributeFromDut_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 6b: TH reads AcceptedCommandList attribute from DUT if ICDM.S.F00 is true\n");
+            if (ShouldSkip("ICDM.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6bThReadsAcceptedCommandListAttributeFromDutIfIcdmsf00IsTrue_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 6c: Read the optional command (StayActiveRequest) in AttributeList\n");
+            if (ShouldSkip("ICDM.S.C03.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6cReadTheOptionalCommandStayActiveRequestInAttributeList_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 7: TH reads GeneratedCommandList attribute from DUT\n");
+            if (ShouldSkip(" !ICDM.S.F00 ")) {
+                NextTest();
+                return;
+            }
+            err = TestStep7ThReadsGeneratedCommandListAttributeFromDut_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 7: TH reads GeneratedCommandList attribute from DUT\n");
+            if (ShouldSkip("ICDM.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestStep7ThReadsGeneratedCommandListAttributeFromDut_14();
             break;
         }
 
@@ -51875,7 +56781,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads ClusterRevision attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51899,15 +56809,14 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads FeatureMap attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL));
-            }
-
             VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
             NextTest();
         }];
@@ -51923,7 +56832,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads FeatureMap attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads FeatureMap attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51947,7 +56860,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -51976,7 +56893,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52004,7 +56925,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(RegisteredClients) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(RegisteredClients) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(RegisteredClients) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52025,7 +56950,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute(IcdCounter) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute(IcdCounter) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute(IcdCounter) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52046,7 +56975,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional attribute(ClientsSupportedPerFabric) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional attribute(ClientsSupportedPerFabric) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional attribute(ClientsSupportedPerFabric) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52067,7 +57000,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52091,7 +57028,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads AcceptedCommandList attribute from DUT if ICDM.S.F00 is true Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads AcceptedCommandList attribute from DUT if ICDM.S.F00 is true: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads AcceptedCommandList attribute from DUT if ICDM.S.F00 is true: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52113,7 +57054,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read the optional command (StayActiveRequest) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read the optional command (StayActiveRequest) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read the optional command (StayActiveRequest) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52134,7 +57079,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52158,7 +57107,11 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52335,7 +57288,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52359,7 +57316,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52383,7 +57344,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52410,7 +57375,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52437,7 +57406,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52458,7 +57431,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52479,7 +57456,11 @@ class Test_TC_I_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52609,7 +57590,11 @@ class Test_TC_I_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the IdentifyTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the IdentifyTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the IdentifyTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52631,7 +57616,11 @@ class Test_TC_I_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the IdentifyType attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the IdentifyType attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the IdentifyType attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52862,7 +57851,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads the IdentifyType attribute from the DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads the IdentifyType attribute from the DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads the IdentifyType attribute from the DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52901,7 +57894,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:60U];
         [cluster identifyWithParams:params completion:
                                                ^(NSError * _Nullable err) {
-                                                   NSLog(@"Step 2a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x003c (60s). Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Step 2a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x003c (60s).: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Step 2a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x003c (60s).: Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52919,7 +57916,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads immediately IdentifyTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads immediately IdentifyTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads immediately IdentifyTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52948,7 +57949,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: After 10 seconds, the TH reads IdentifyTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: After 10 seconds, the TH reads IdentifyTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: After 10 seconds, the TH reads IdentifyTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52973,7 +57978,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster identifyWithParams:params completion:
                                                ^(NSError * _Nullable err) {
-                                                   NSLog(@"Step 4a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x0000 (stop identifying). Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Step 4a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x0000 (stop identifying).: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Step 4a: TH sends Identify command to DUT, with the IdentifyTime field set to 0x0000 (stop identifying).: Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -52991,7 +58000,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads immediately IdentifyTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads immediately IdentifyTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads immediately IdentifyTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53017,7 +58030,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         identifyTimeArgument =
             [NSNumber numberWithUnsignedShort:15U];
         [cluster writeAttributeIdentifyTimeWithValue:identifyTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH writes a value of 0x000f (15s) to IdentifyTime attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH writes a value of 0x000f (15s) to IdentifyTime attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH writes a value of 0x000f (15s) to IdentifyTime attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53043,7 +58060,11 @@ class Test_TC_I_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeIdentifyTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: After 15 seconds, the TH reads IdentifyTime attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: After 15 seconds, the TH reads IdentifyTime attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: After 15 seconds, the TH reads IdentifyTime attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53384,7 +58405,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53418,7 +58443,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53452,7 +58481,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2c: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x02 okay and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2c: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x02 okay and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2c: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x02 okay and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53486,7 +58519,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2d: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x0b channel change and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2d: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x0b channel change and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2d: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x0b channel change and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53520,7 +58557,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2e: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2e: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2e: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53554,7 +58595,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2f: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xfe finish effect and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2f: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xfe finish effect and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2f: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xfe finish effect and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53588,7 +58633,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2g: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2g: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2g: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x01 breathe and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53622,7 +58671,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2h: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2h: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2h: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53656,7 +58709,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:66U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 3a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x42 unknown Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 3a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x42 unknown: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 3a: TH sends TriggerEffect command to DUT with the effect identifier field set to 0x00 blink and the effect variant field set to 0x42 unknown: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53690,7 +58747,11 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster triggerEffectWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 3b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 3b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 3b: TH sends TriggerEffect command to DUT with the effect identifier field set to 0xff stop effect and the effect variant field set to 0x00 default: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53885,7 +58946,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53909,7 +58974,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53933,7 +59002,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53962,7 +59035,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -53990,7 +59067,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54011,7 +59092,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute(LightSensorType) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute(LightSensorType) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute(LightSensorType) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54032,7 +59117,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54056,7 +59145,11 @@ class Test_TC_ILL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54219,7 +59312,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads MinMeasuredValue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads MinMeasuredValue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads MinMeasuredValue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54244,7 +59341,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads MaxMeasuredValue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads MaxMeasuredValue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads MaxMeasuredValue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54269,7 +59370,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads MeasuredValue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads MeasuredValue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads MeasuredValue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54294,7 +59399,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads Tolerance attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads Tolerance attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads Tolerance attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54316,7 +59425,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLightSensorTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads LightSensorType attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads LightSensorType attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads LightSensorType attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54506,7 +59619,11 @@ class Test_TC_ILL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH reads MinMeasuredValue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH reads MinMeasuredValue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH reads MinMeasuredValue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54533,7 +59650,11 @@ class Test_TC_ILL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads MaxMeasuredValue attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads MaxMeasuredValue attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads MaxMeasuredValue attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54577,7 +59698,11 @@ class Test_TC_ILL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: After a few seconds, TH reads MeasuredValue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: After a few seconds, TH reads MeasuredValue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: After a few seconds, TH reads MeasuredValue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54619,7 +59744,11 @@ class Test_TC_ILL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: After a few seconds, TH reads MeasuredValue attribute from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: After a few seconds, TH reads MeasuredValue attribute from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: After a few seconds, TH reads MeasuredValue attribute from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54924,7 +60053,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54948,7 +60081,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54972,7 +60109,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given LVL.S.F00(OO) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given LVL.S.F00(OO) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given LVL.S.F00(OO) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -54991,7 +60132,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given LVL.S.F01(LT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given LVL.S.F01(LT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given LVL.S.F01(LT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55010,7 +60155,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: Given LVL.S.F02(FQ) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: Given LVL.S.F02(FQ) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: Given LVL.S.F02(FQ) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55029,7 +60178,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55058,7 +60211,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55086,7 +60243,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(StartUpCurrentLevel and RemainingTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(StartUpCurrentLevel and RemainingTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(StartUpCurrentLevel and RemainingTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55108,7 +60269,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(CurrentFrequency, MinFrequency and MinFrequency) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentFrequency, MinFrequency and MinFrequency) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentFrequency, MinFrequency and MinFrequency) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55131,7 +60296,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Read the optional attribute(MinLevel) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read the optional attribute(MinLevel) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read the optional attribute(MinLevel) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55152,7 +60321,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Read the optional attribute(MaxLevel) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Read the optional attribute(MaxLevel) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Read the optional attribute(MaxLevel) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55173,7 +60346,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Read the optional attribute(OnOffTransitionTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Read the optional attribute(OnOffTransitionTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Read the optional attribute(OnOffTransitionTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55194,7 +60371,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Read the optional attribute(OnTransitionTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Read the optional attribute(OnTransitionTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Read the optional attribute(OnTransitionTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55215,7 +60396,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Read the optional attribute(OffTransitionTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Read the optional attribute(OffTransitionTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Read the optional attribute(OffTransitionTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55236,7 +60421,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Read the optional attribute(DefaultMoveRate) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Read the optional attribute(DefaultMoveRate) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Read the optional attribute(DefaultMoveRate) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55257,7 +60446,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55285,7 +60478,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a.1: Read the Feature-dependent(LVL.S.F02) command in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a.1: Read the Feature-dependent(LVL.S.F02) command in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a.1: Read the Feature-dependent(LVL.S.F02) command in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55306,7 +60503,11 @@ class Test_TC_LVL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55635,7 +60836,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the CurrentLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the CurrentLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the CurrentLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55663,7 +60868,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRemainingTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Reads the RemainingTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Reads the RemainingTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Reads the RemainingTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55686,7 +60895,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Reads the MinLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Reads the MinLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Reads the MinLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55715,7 +60928,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Reads the MinLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Reads the MinLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Reads the MinLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55741,7 +60958,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Reads the MaxLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Reads the MaxLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Reads the MaxLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55771,7 +60992,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Reads the MaxLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Reads the MaxLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Reads the MaxLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55796,7 +61021,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55821,7 +61050,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b & 4C Reads the CurrentLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55846,7 +61079,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads the CurrentFrequency attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads the CurrentFrequency attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads the CurrentFrequency attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55869,7 +61106,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Reads the MinFrequency attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Reads the MinFrequency attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Reads the MinFrequency attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55895,7 +61136,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads the MaxFrequency attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads the MaxFrequency attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads the MaxFrequency attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55920,7 +61165,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b & 7C Reads the CurrentFrequency attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b & 7C Reads the CurrentFrequency attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7b & 7C Reads the CurrentFrequency attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55942,7 +61191,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Reads the OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Reads the OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Reads the OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55964,7 +61217,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9a: Reads the OnLevel attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9a: Reads the OnLevel attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 9a: Reads the OnLevel attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55989,7 +61246,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9b: Reads the OnLevel attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9b: Reads the OnLevel attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 9b: Reads the OnLevel attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56014,7 +61275,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Reads the OnTransitionTime attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Reads the OnTransitionTime attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Reads the OnTransitionTime attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56039,7 +61304,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: Reads the OffTransitionTime attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: Reads the OffTransitionTime attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 11: Reads the OffTransitionTime attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56064,7 +61333,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDefaultMoveRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Reads the DefaultMoveRate attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Reads the DefaultMoveRate attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Reads the DefaultMoveRate attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56089,7 +61362,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: Reads the Options attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: Reads the Options attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 13: Reads the Options attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56108,7 +61385,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: Reads the StartUpCurrentLevel attribute  Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: Reads the StartUpCurrentLevel attribute : Error: %@", err);
+            } else {
+                NSLog(@"Step 14: Reads the StartUpCurrentLevel attribute : Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56439,7 +61720,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: Reads the OnOffTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: Reads the OnOffTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: Reads the OnOffTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56466,7 +61751,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id onOffTransitionTimeArgument;
         onOffTransitionTimeArgument = mOnOffTransitionTimeConfigValue.HasValue() ? [NSNumber numberWithUnsignedShort:mOnOffTransitionTimeConfigValue.Value()] : [NSNumber numberWithUnsignedShort:10U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1b: writes the OnOffTransitionTime attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: writes the OnOffTransitionTime attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: writes the OnOffTransitionTime attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56484,7 +61773,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: Reads the OnOffTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: Reads the OnOffTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: Reads the OnOffTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56511,7 +61804,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Reads the OnLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Reads the OnLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Reads the OnLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56541,7 +61838,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id onLevelArgument;
         onLevelArgument = mOnLevelConfigValue.HasValue() ? [NSNumber numberWithUnsignedChar:mOnLevelConfigValue.Value()] : [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeOnLevelWithValue:onLevelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2b: writes the OnLevel attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: writes the OnLevel attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: writes the OnLevel attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56559,7 +61860,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Reads the OnLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Reads the OnLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Reads the OnLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56589,7 +61894,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Reads the OnTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Reads the OnTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Reads the OnTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56619,7 +61928,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id onTransitionTimeArgument;
         onTransitionTimeArgument = mOnTransitionTimeConfigValue.HasValue() ? [NSNumber numberWithUnsignedShort:mOnTransitionTimeConfigValue.Value()] : [NSNumber numberWithUnsignedShort:5U];
         [cluster writeAttributeOnTransitionTimeWithValue:onTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3b: Writes the OnTransitionTime attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Writes the OnTransitionTime attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Writes the OnTransitionTime attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56637,7 +61950,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Reads the OnTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Reads the OnTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Reads the OnTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56667,7 +61984,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Reads the OffTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Reads the OffTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Reads the OffTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56697,7 +62018,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id offTransitionTimeArgument;
         offTransitionTimeArgument = mOffTransitionTimeConfigValue.HasValue() ? [NSNumber numberWithUnsignedShort:mOffTransitionTimeConfigValue.Value()] : [NSNumber numberWithUnsignedShort:10U];
         [cluster writeAttributeOffTransitionTimeWithValue:offTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4b: Writes the OffTransitionTime attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Writes the OffTransitionTime attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Writes the OffTransitionTime attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56715,7 +62040,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Reads the OffTransitionTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Reads the OffTransitionTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Reads the OffTransitionTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56745,7 +62074,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDefaultMoveRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: Reads the DefaultMoveRate attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: Reads the DefaultMoveRate attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: Reads the DefaultMoveRate attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56775,7 +62108,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id defaultMoveRateArgument;
         defaultMoveRateArgument = mDefaultMoveRateConfigValue.HasValue() ? [NSNumber numberWithUnsignedChar:mDefaultMoveRateConfigValue.Value()] : [NSNumber numberWithUnsignedChar:111U];
         [cluster writeAttributeDefaultMoveRateWithValue:defaultMoveRateArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5b: Writes the DefaultMoveRate attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: Writes the DefaultMoveRate attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: Writes the DefaultMoveRate attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56793,7 +62130,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDefaultMoveRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: Reads the DefaultMoveRate attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: Reads the DefaultMoveRate attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: Reads the DefaultMoveRate attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56823,7 +62164,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Reads the StartUpCurrentLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Reads the StartUpCurrentLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Reads the StartUpCurrentLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56853,7 +62198,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         id startUpCurrentLevelArgument;
         startUpCurrentLevelArgument = mStartUpCurrentLevelConfigValue.HasValue() ? [NSNumber numberWithUnsignedChar:mStartUpCurrentLevelConfigValue.Value()] : [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeStartUpCurrentLevelWithValue:startUpCurrentLevelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6b: Rwrites the StartUpCurrentLevel attribute on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Rwrites the StartUpCurrentLevel attribute on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Rwrites the StartUpCurrentLevel attribute on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56871,7 +62220,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Rreads the StartUpCurrentLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Rreads the StartUpCurrentLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Rreads the StartUpCurrentLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -56903,7 +62256,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"writes back default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"writes back default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"writes back default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57496,7 +62853,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57514,7 +62875,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57540,7 +62905,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Precondition: write default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57561,7 +62930,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57581,7 +62954,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         id onLevelArgument;
         onLevelArgument = nil;
         [cluster writeAttributeOnLevelWithValue:onLevelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes NULL to the OnLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes NULL to the OnLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes NULL to the OnLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57600,7 +62977,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57628,7 +63009,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithOnOffWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 2b: TH sends a MoveToLevelWithOnOff command to DUT, with Level =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 2b: TH sends a MoveToLevelWithOnOff command to DUT, with Level =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 2b: TH sends a MoveToLevelWithOnOff command to DUT, with Level =50 and TransitionTime =0 (immediate): Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57646,7 +63031,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57669,7 +63058,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57694,7 +63087,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3a: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57722,7 +63119,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57740,7 +63141,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57774,7 +63179,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4a: TH sends a MoveToLevel command to the DUT with Level = 200 and TransitionTime = 300 (30 s). This means the level should increase by 150 units in 30s, so 5 units/s Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4a: TH sends a MoveToLevel command to the DUT with Level = 200 and TransitionTime = 300 (30 s). This means the level should increase by 150 units in 30s, so 5 units/s: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4a: TH sends a MoveToLevel command to the DUT with Level = 200 and TransitionTime = 300 (30 s). This means the level should increase by 150 units in 30s, so 5 units/s: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57800,7 +63209,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57832,7 +63245,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57864,7 +63281,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57896,7 +63317,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57920,7 +63345,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57947,7 +63376,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57965,7 +63398,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -57989,7 +63426,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 5c: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5c: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5c: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58017,7 +63458,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5d: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5d: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5d: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58035,7 +63480,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58060,7 +63509,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 5f: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5f: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5f: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58088,7 +63541,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5g: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5g: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5g: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58106,7 +63563,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5h: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5h: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5h: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58140,7 +63601,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5i: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5i: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5i: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58158,7 +63623,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5j: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5j: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5j: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58192,7 +63661,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5k: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5k: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5k: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58210,7 +63683,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5l: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5l: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5l: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58237,7 +63714,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH writes 1 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH writes 1 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH writes 1 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58255,7 +63736,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOptionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58279,7 +63764,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 6c: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6c: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6c: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58307,7 +63796,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6d: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6d: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6d: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58325,7 +63818,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58350,7 +63847,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 6f: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6f: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6f: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58378,7 +63879,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6g: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6g: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6g: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58396,7 +63901,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6h: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6h: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6h: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58430,7 +63939,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6i: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6i: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6i: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58448,7 +63961,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6j: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6j: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6j: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58482,7 +63999,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6k: TH sends a MoveToLevel command to the DUT with Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6k: TH sends a MoveToLevel command to the DUT with: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6k: TH sends a MoveToLevel command to the DUT with: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58500,7 +64021,11 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6l: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6l: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6l: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58864,7 +64389,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58882,7 +64411,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58908,7 +64441,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Precondition: write default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58929,7 +64466,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58947,7 +64488,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58970,7 +64515,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -58998,7 +64547,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveWithOnOffWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2b: TH sends a MoveWithOnOff command to DUT, with MoveMode =0x00 (up) and Rate =10 (units/s) Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2b: TH sends a MoveWithOnOff command to DUT, with MoveMode =0x00 (up) and Rate =10 (units/s): Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2b: TH sends a MoveWithOnOff command to DUT, with MoveMode =0x00 (up) and Rate =10 (units/s): Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59016,7 +64569,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59040,7 +64597,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59074,7 +64635,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59099,7 +64664,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3a: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59127,7 +64696,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59145,7 +64718,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59179,7 +64756,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveWithParams:params completion:
                                            ^(NSError * _Nullable err) {
-                                               NSLog(@"Step 4a: TH sends a Move command to the DUT with MoveMode =0x00 (up) and Rate =5 (units/s) Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 4a: TH sends a Move command to the DUT with MoveMode =0x00 (up) and Rate =5 (units/s): Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 4a: TH sends a Move command to the DUT with MoveMode =0x00 (up) and Rate =5 (units/s): Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59205,7 +64786,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59237,7 +64822,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59269,7 +64858,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59301,7 +64894,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59326,7 +64923,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59344,7 +64945,11 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59678,7 +65283,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59696,7 +65305,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59722,7 +65335,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Precondition: write default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59743,7 +65360,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59762,7 +65383,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59792,7 +65417,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepWithOnOffWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 2b: TH sends a StepWithOnOff command to DUT, with StepMode =0x00 (up), StepSize =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2b: TH sends a StepWithOnOff command to DUT, with StepMode =0x00 (up), StepSize =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2b: TH sends a StepWithOnOff command to DUT, with StepMode =0x00 (up), StepSize =50 and TransitionTime =0 (immediate): Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59810,7 +65439,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OnOff attribute (On/Off cluster) from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59834,7 +65467,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3a: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3a: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59862,7 +65499,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 3b: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59880,7 +65521,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Reads current level attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Reads current level attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Reads current level attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59916,7 +65561,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stepWithParams:params completion:
                                            ^(NSError * _Nullable err) {
-                                               NSLog(@"Step 4a: TH sends a Step command to the DUT with StepMode =0x00 (up), StepSize =150 and TransitionTime =300 Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 4a: TH sends a Step command to the DUT with StepMode =0x00 (up), StepSize =150 and TransitionTime =300: Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 4a: TH sends a Step command to the DUT with StepMode =0x00 (up), StepSize =150 and TransitionTime =300: Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59942,7 +65591,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59974,7 +65627,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60006,7 +65663,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60038,7 +65699,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60062,7 +65727,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT (after DUT has finished the transition) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT (after DUT has finished the transition): Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads CurrentLevel attribute from DUT (after DUT has finished the transition): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60087,7 +65756,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60105,7 +65778,11 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60394,7 +66071,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Precondition: write default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60415,7 +66096,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: H writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: H writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: H writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60434,7 +66119,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60462,7 +66151,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2a: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2a: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2a: TH sends a MoveToLevel command to DUT, with Level =50 and TransitionTime =0 (immediate): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60480,7 +66173,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60514,7 +66211,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveWithParams:params completion:
                                            ^(NSError * _Nullable err) {
-                                               NSLog(@"Step 2c: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s) Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 2c: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s): Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 2c: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s): Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60546,7 +66247,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stopWithParams:params completion:
                                            ^(NSError * _Nullable err) {
-                                               NSLog(@"Step 3: Sends stop command to DUT Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 3: Sends stop command to DUT: Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 3: Sends stop command to DUT: Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60574,7 +66279,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60608,7 +66317,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveWithParams:params completion:
                                            ^(NSError * _Nullable err) {
-                                               NSLog(@"Step 5: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s) Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 5: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s): Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 5: TH sends a Move command to the DUT, with the MoveMode field set to 0x00 (move up) and the Rate field set to 0x05 (5 units/s): Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60640,7 +66353,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster stopWithOnOffWithParams:params completion:
                                                     ^(NSError * _Nullable err) {
-                                                        NSLog(@"Step 6: TH sends a StopWithOnOff command to the DUT Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 6: TH sends a StopWithOnOff command to the DUT: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 6: TH sends a StopWithOnOff command to the DUT: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60668,7 +66385,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60693,7 +66414,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Precondition send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -60711,7 +66436,11 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61026,7 +66755,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Precondition: write default value of OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Precondition: write default value of OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61047,7 +66780,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         optionsArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOptionsWithValue:optionsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0a: TH writes 0 to the Options attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 0a: TH writes 0 to the Options attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61066,7 +66803,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61085,7 +66826,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH reads the MinLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH reads the MinLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH reads the MinLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61111,7 +66856,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads the MaxLevel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61145,7 +66894,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 1c: TH sends a MoveToLevel command to DUT, with the Level field set to a value between the MinLevel and MaxLevel values (if present, otherwise between 0x01 and 0xFE) and the TransitionTime field set to 0x0000 (move immediately). Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 1c: TH sends a MoveToLevel command to DUT, with the Level field set to a value between the MinLevel and MaxLevel values (if present, otherwise between 0x01 and 0xFE) and the TransitionTime field set to 0x0000 (move immediately).: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 1c: TH sends a MoveToLevel command to DUT, with the Level field set to a value between the MinLevel and MaxLevel values (if present, otherwise between 0x01 and 0xFE) and the TransitionTime field set to 0x0000 (move immediately).: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61171,7 +66924,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: TH reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: TH reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: TH reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61196,7 +66953,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH reads the CurrentFrequency attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH reads the CurrentFrequency attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH reads the CurrentFrequency attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61222,7 +66983,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads the MinFrequency attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads the MinFrequency attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads the MinFrequency attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61248,7 +67013,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads the MaxFrequency attribute and check, if fmax < fmin, FAIL the test. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads the MaxFrequency attribute and check, if fmax < fmin, FAIL the test.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads the MaxFrequency attribute and check, if fmax < fmin, FAIL the test.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61273,7 +67042,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: sanity check on values read in steps 2a..2c, if fc < fmin, FAIL the test and fc > fmax, FAIL the test Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: sanity check on values read in steps 2a..2c, if fc < fmin, FAIL the test and fc > fmax, FAIL the test: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: sanity check on values read in steps 2a..2c, if fc < fmin, FAIL the test and fc > fmax, FAIL the test: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61298,7 +67071,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         params.frequency = mRandomFrequencyValue.HasValue() ? [NSNumber numberWithUnsignedShort:mRandomFrequencyValue.Value()] : [NSNumber numberWithUnsignedShort:30000U];
         [cluster moveToClosestFrequencyWithParams:params completion:
                                                              ^(NSError * _Nullable err) {
-                                                                 NSLog(@"Step 3a: TH sends a MoveToClosestFrequency command to DUT, with the frequency field set to a random value frand, chosen such that: fmin < frand < fmax Error: %@", err);
+                                                                 if (err != nil) {
+                                                                     NSLog(@"Step 3a: TH sends a MoveToClosestFrequency command to DUT, with the frequency field set to a random value frand, chosen such that: fmin < frand < fmax: Error: %@", err);
+                                                                 } else {
+                                                                     NSLog(@"Step 3a: TH sends a MoveToClosestFrequency command to DUT, with the frequency field set to a random value frand, chosen such that: fmin < frand < fmax: Success");
+                                                                 }
 
                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61324,7 +67101,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads the CurrentFrequency attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads the CurrentFrequency attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads the CurrentFrequency attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61357,7 +67138,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads the CurrentFrequency attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads the CurrentFrequency attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads the CurrentFrequency attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61390,7 +67175,11 @@ class Test_TC_LVL_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads the CurrentFrequency attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads the CurrentFrequency attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads the CurrentFrequency attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61558,7 +67347,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61582,7 +67375,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61606,7 +67403,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61634,7 +67435,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61661,7 +67466,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61685,7 +67494,11 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61880,7 +67693,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61904,7 +67721,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61928,7 +67749,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Given LUNIT.S.F00(TEMP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Given LUNIT.S.F00(TEMP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Given LUNIT.S.F00(TEMP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61947,7 +67772,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61973,7 +67802,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -61998,7 +67831,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads Feature dependent(LUNIT.S.F00) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads Feature dependent(LUNIT.S.F00) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads Feature dependent(LUNIT.S.F00) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62019,7 +67856,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62043,7 +67884,11 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62239,7 +68084,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads TemperatureUnit attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads TemperatureUnit attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads TemperatureUnit attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62261,7 +68110,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         temperatureUnitArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeTemperatureUnitWithValue:temperatureUnitArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2: TH writes 0 (Fahrenheit) to TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH writes 0 (Fahrenheit) to TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH writes 0 (Fahrenheit) to TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62279,7 +68132,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62305,7 +68162,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         temperatureUnitArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeTemperatureUnitWithValue:temperatureUnitArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: TH writes 1 (Celsius) to TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH writes 1 (Celsius) to TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH writes 1 (Celsius) to TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62323,7 +68184,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62349,7 +68214,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         temperatureUnitArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeTemperatureUnitWithValue:temperatureUnitArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6: TH writes 2 (Kelvin) to TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH writes 2 (Kelvin) to TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH writes 2 (Kelvin) to TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62367,7 +68236,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureUnitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62393,7 +68266,11 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge {
         temperatureUnitArgument =
             [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeTemperatureUnitWithValue:temperatureUnitArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 8: TH writes 5 to TemperatureUnit attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH writes 5 to TemperatureUnit attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH writes 5 to TemperatureUnit attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -62577,7 +68454,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62601,7 +68482,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62623,7 +68508,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62650,7 +68539,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62676,7 +68569,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(ActiveCalendarType) in AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(ActiveCalendarType) in AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(ActiveCalendarType) in AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62697,7 +68594,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads optional attribute(SupportedCalendarTypes) in AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads optional attribute(SupportedCalendarTypes) in AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads optional attribute(SupportedCalendarTypes) in AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62718,7 +68619,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62742,7 +68647,11 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62971,7 +68880,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeHourFormatWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads HourFormat attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads HourFormat attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads HourFormat attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -62993,7 +68906,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         hourFormatArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeHourFormatWithValue:hourFormatArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2: If (LTIME.S.A0000.12HR) TH writes 0 to HourFormat attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: If (LTIME.S.A0000.12HR) TH writes 0 to HourFormat attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: If (LTIME.S.A0000.12HR) TH writes 0 to HourFormat attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63011,7 +68928,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeHourFormatWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads HourFormat attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads HourFormat attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads HourFormat attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63037,7 +68958,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         hourFormatArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeHourFormatWithValue:hourFormatArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: If (LTIME.S.A0000.24HR) TH writes 1 to HourFormat attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: If (LTIME.S.A0000.24HR) TH writes 1 to HourFormat attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: If (LTIME.S.A0000.24HR) TH writes 1 to HourFormat attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63055,7 +68980,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeHourFormatWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads HourFormat attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads HourFormat attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads HourFormat attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63078,7 +69007,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeActiveCalendarTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads ActiveCalendarType attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads ActiveCalendarType attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads ActiveCalendarType attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63099,7 +69032,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedCalendarTypesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads SupportedCalendarTypes attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads SupportedCalendarTypes attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads SupportedCalendarTypes attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63141,7 +69078,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         activeCalendarTypeArgument =
             [NSNumber numberWithUnsignedChar:50U];
         [cluster writeAttributeActiveCalendarTypeWithValue:activeCalendarTypeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 10: TH writes 50 to ActiveCalendarType attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH writes 50 to ActiveCalendarType attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH writes 50 to ActiveCalendarType attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -63161,7 +69102,11 @@ class Test_TC_LTIME_3_1 : public TestCommandBridge {
         hourFormatArgument =
             [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeHourFormatWithValue:hourFormatArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 11: TH writes 5 to HourFormat attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH writes 5 to HourFormat attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH writes 5 to HourFormat attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -63360,7 +69305,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63384,7 +69333,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if LWM.S.F00(DEPONOFF) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if LWM.S.F00(DEPONOFF): Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if LWM.S.F00(DEPONOFF): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63403,7 +69356,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63427,7 +69384,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63455,7 +69416,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63482,7 +69447,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(StartUpMode) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(StartUpMode) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(StartUpMode) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63503,7 +69472,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent attribute(DEPONOFF) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent attribute(DEPONOFF) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent attribute(DEPONOFF) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63524,7 +69497,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63545,7 +69522,11 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63799,7 +69780,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the SupportedModes attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the SupportedModes attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the SupportedModes attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63820,7 +69805,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the CurrentMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the CurrentMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the CurrentMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63849,7 +69838,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
             [old_current_mode_dut copy];
         [cluster changeToModeWithParams:params completion:
                                                    ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Step 4: TH sends a ChangeToMode command to the DUT with NewMode set to new_mode_th Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 4: TH sends a ChangeToMode command to the DUT with NewMode set to new_mode_th: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 4: TH sends a ChangeToMode command to the DUT with NewMode set to new_mode_th: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63883,7 +69876,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the CurrentMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the CurrentMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the CurrentMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63918,7 +69915,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the CurrentMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the CurrentMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the CurrentMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63956,7 +69957,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the CurrentMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the CurrentMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the CurrentMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63984,7 +69989,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         params.newMode = mNewModeChangeOk.HasValue() ? [NSNumber numberWithUnsignedChar:mNewModeChangeOk.Value()] : [NSNumber numberWithUnsignedChar:2U];
         [cluster changeToModeWithParams:params completion:
                                                    ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Step 11: TH sends a ChangeToMode command to the DUT with NewMode set to PIXIT.LWM.MODE_CHANGE_OK Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 11: TH sends a ChangeToMode command to the DUT with NewMode set to PIXIT.LWM.MODE_CHANGE_OK: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 11: TH sends a ChangeToMode command to the DUT with NewMode set to PIXIT.LWM.MODE_CHANGE_OK: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64007,7 +70016,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64033,7 +70046,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         params.newMode = mInvalidModeTh.HasValue() ? [NSNumber numberWithUnsignedChar:mInvalidModeTh.Value()] : [NSNumber numberWithUnsignedChar:5U];
         [cluster changeToModeWithParams:params completion:
                                                    ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Step 13: TH sends a ChangeToMode command to the DUT with NewMode set to invalid_mode_th Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 13: TH sends a ChangeToMode command to the DUT with NewMode set to invalid_mode_th: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 13: TH sends a ChangeToMode command to the DUT with NewMode set to invalid_mode_th: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64056,7 +70073,11 @@ class Test_TC_LWM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: TH reads from the DUT the CurrentMode attribute.   Verify that the DUT response contains an integer value equal to PIXIT.LWM.MODE_CHANGE_OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64272,7 +70293,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64296,7 +70321,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. If WASHERCTRL.S.F00(SPIN) & WASHERCTRL.S.F01(RINSE) are false Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. If WASHERCTRL.S.F00(SPIN) & WASHERCTRL.S.F01(RINSE) are false: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. If WASHERCTRL.S.F00(SPIN) & WASHERCTRL.S.F01(RINSE) are false: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64320,7 +70349,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0 set to 1 if the DUT is capable of controlling the washer using the spin attributes (WASHERCTRL.S.F00(SPIN) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0 set to 1 if the DUT is capable of controlling the washer using the spin attributes (WASHERCTRL.S.F00(SPIN) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0 set to 1 if the DUT is capable of controlling the washer using the spin attributes (WASHERCTRL.S.F00(SPIN) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64339,7 +70372,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 1 set to 1 if the DUT supports rinse attributes (WASHERCTRL.S.F01(RINSE) is true) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 1 set to 1 if the DUT supports rinse attributes (WASHERCTRL.S.F01(RINSE) is true): Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 1 set to 1 if the DUT supports rinse attributes (WASHERCTRL.S.F01(RINSE) is true): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64358,7 +70395,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64384,7 +70425,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64409,7 +70454,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the feature dependent(WASHERCTRL.S.F00) attributes in AttributeList from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the feature dependent(WASHERCTRL.S.F00) attributes in AttributeList from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the feature dependent(WASHERCTRL.S.F00) attributes in AttributeList from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64431,7 +70480,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the feature dependent(WASHERCTRL.S.F01) attributes in AttributeList from DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the feature dependent(WASHERCTRL.S.F01) attributes in AttributeList from DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the feature dependent(WASHERCTRL.S.F01) attributes in AttributeList from DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64453,7 +70506,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64477,7 +70534,11 @@ class Test_TC_WASHERCTRL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64662,7 +70723,11 @@ class Test_TC_WASHERCTRL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpinSpeedsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the SpinSpeeds attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the SpinSpeeds attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the SpinSpeeds attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64682,7 +70747,11 @@ class Test_TC_WASHERCTRL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpinSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the SpinSpeedCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the SpinSpeedCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the SpinSpeedCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64718,7 +70787,11 @@ class Test_TC_WASHERCTRL_2_1 : public TestCommandBridge {
         id spinSpeedCurrentArgument;
         spinSpeedCurrentArgument = mSpinSpeedCurrentValue.HasValue() ? [NSNumber numberWithUnsignedChar:mSpinSpeedCurrentValue.Value()] : [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeSpinSpeedCurrentWithValue:spinSpeedCurrentArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: TH writes a supported SpinSpeedCurrent attribute that is a valid index into the list of spin speeds (0 to numSpinSpeeds-1) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH writes a supported SpinSpeedCurrent attribute that is a valid index into the list of spin speeds (0 to numSpinSpeeds-1): Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH writes a supported SpinSpeedCurrent attribute that is a valid index into the list of spin speeds (0 to numSpinSpeeds-1): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64744,7 +70817,11 @@ class Test_TC_WASHERCTRL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpinSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: after a few seconds, TH reads from the DUT the SpinSpeedCurrent attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: after a few seconds, TH reads from the DUT the SpinSpeedCurrent attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: after a few seconds, TH reads from the DUT the SpinSpeedCurrent attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64774,7 +70851,11 @@ class Test_TC_WASHERCTRL_2_1 : public TestCommandBridge {
         id spinSpeedCurrentArgument;
         spinSpeedCurrentArgument = mUnsupportedSpinSpeedCurrentValue.HasValue() ? [NSNumber numberWithUnsignedChar:mUnsupportedSpinSpeedCurrentValue.Value()] : [NSNumber numberWithUnsignedChar:17U];
         [cluster writeAttributeSpinSpeedCurrentWithValue:spinSpeedCurrentArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6: TH writes an unsupported SpinSpeedCurrent attribute that is other than 0 to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH writes an unsupported SpinSpeedCurrent attribute that is other than 0 to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH writes an unsupported SpinSpeedCurrent attribute that is other than 0 to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -64952,7 +71033,11 @@ class Test_TC_WASHERCTRL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfRinsesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the the NumberOfRinses attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the the NumberOfRinses attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the the NumberOfRinses attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64974,7 +71059,11 @@ class Test_TC_WASHERCTRL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedRinsesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the the SupportedRinses attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the the SupportedRinses attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the the SupportedRinses attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -64996,7 +71085,11 @@ class Test_TC_WASHERCTRL_2_2 : public TestCommandBridge {
         id numberOfRinsesArgument;
         numberOfRinsesArgument = mNumberOfRinsesValue.HasValue() ? [NSNumber numberWithUnsignedChar:mNumberOfRinsesValue.Value()] : [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeNumberOfRinsesWithValue:numberOfRinsesArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4: TH writes a supported NumberOfRinses attribute to DUT within the range of the SupportedRinses list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH writes a supported NumberOfRinses attribute to DUT within the range of the SupportedRinses list: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH writes a supported NumberOfRinses attribute to DUT within the range of the SupportedRinses list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65022,7 +71115,11 @@ class Test_TC_WASHERCTRL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfRinsesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: after a few seconds, TH reads from the DUT the NumberOfRinses attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: after a few seconds, TH reads from the DUT the NumberOfRinses attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: after a few seconds, TH reads from the DUT the NumberOfRinses attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65057,7 +71154,11 @@ class Test_TC_WASHERCTRL_2_2 : public TestCommandBridge {
         id numberOfRinsesArgument;
         numberOfRinsesArgument = mUnsupportedNumberOfRinsesValue.HasValue() ? [NSNumber numberWithUnsignedChar:mUnsupportedNumberOfRinsesValue.Value()] : [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeNumberOfRinsesWithValue:numberOfRinsesArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 7: TH writes an unsupported NumberOfRinses attribute to DUT while DUT is not in a valid state. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH writes an unsupported NumberOfRinses attribute to DUT while DUT is not in a valid state.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH writes an unsupported NumberOfRinses attribute to DUT while DUT is not in a valid state.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_IN_STATE));
             NextTest();
@@ -65219,7 +71320,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65243,7 +71348,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65267,7 +71376,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65297,7 +71410,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65326,7 +71443,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65351,7 +71472,11 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65557,7 +71682,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65581,7 +71710,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65605,7 +71738,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65624,7 +71761,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65643,7 +71784,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65662,7 +71807,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65688,7 +71837,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65713,7 +71866,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65734,7 +71891,11 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65937,7 +72098,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65961,7 +72126,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -65985,7 +72154,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66009,7 +72182,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66035,7 +72212,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66060,7 +72241,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(CatalogList) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(CatalogList) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(CatalogList) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66081,7 +72266,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(CurrentApp) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentApp) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentApp) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66102,7 +72291,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66125,7 +72318,11 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66328,7 +72525,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66352,7 +72553,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66376,7 +72581,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66395,7 +72604,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66421,7 +72634,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66446,7 +72663,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(InputList) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(InputList) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(InputList) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66467,7 +72688,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(CurrentInput) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentInput) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(CurrentInput) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66488,7 +72713,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66512,7 +72741,11 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66692,7 +72925,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66716,7 +72953,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66740,7 +72981,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66766,7 +73011,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66791,7 +73040,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(MACAddress) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(MACAddress) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(MACAddress) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66812,7 +73065,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -66836,7 +73093,11 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67105,7 +73366,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67129,7 +73394,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67153,7 +73422,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67172,7 +73445,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67191,7 +73468,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67217,7 +73498,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67242,7 +73527,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(ChannelList): AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(ChannelList): AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(ChannelList): AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67263,7 +73552,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Reading optional attribute(Lineup) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Reading optional attribute(Lineup) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Reading optional attribute(Lineup) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67284,7 +73577,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Read the optional attribute(CurrentChannel): AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read the optional attribute(CurrentChannel): AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read the optional attribute(CurrentChannel): AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67305,7 +73602,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the optional command(ChangeChannel) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the optional command(ChangeChannel) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the optional command(ChangeChannel) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67326,7 +73627,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional command(ChangeChannelByNumber) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional command(ChangeChannelByNumber) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional command(ChangeChannelByNumber) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67347,7 +73652,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional command(SkipChannel) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional command(SkipChannel) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional command(SkipChannel) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67368,7 +73677,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67392,7 +73705,11 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67738,7 +74055,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67762,7 +74083,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67786,7 +74111,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67805,7 +74134,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67824,7 +74157,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67851,7 +74188,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67877,7 +74218,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(StartTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(StartTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(StartTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67898,7 +74243,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(Duration) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(Duration) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(Duration) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67919,7 +74268,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Read the optional attribute(SampledPosition) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read the optional attribute(SampledPosition) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read the optional attribute(SampledPosition) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67940,7 +74293,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Read the optional attribute(PlaybackSpeed) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Read the optional attribute(PlaybackSpeed) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Read the optional attribute(PlaybackSpeed) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67961,7 +74318,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Read the optional attribute(SeekRangeEnd) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Read the optional attribute(SeekRangeEnd) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Read the optional attribute(SeekRangeEnd) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67982,7 +74343,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Read the optional attribute(SeekRangeStart) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Read the optional attribute(SeekRangeStart) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Read the optional attribute(SeekRangeStart) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68003,7 +74368,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68026,7 +74395,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional command(StartOver) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional command(StartOver) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional command(StartOver) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68047,7 +74420,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional command(Previous) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional command(Previous) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional command(Previous) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68068,7 +74445,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional command(Next) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional command(Next) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional command(Next) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68089,7 +74470,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional command(Rewind) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional command(Rewind) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional command(Rewind) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68110,7 +74495,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional command(FastForward) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional command(FastForward) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional command(FastForward) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68131,7 +74520,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read the optional command(SkipForward) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read the optional command(SkipForward) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read the optional command(SkipForward) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68152,7 +74545,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the optional command(SkipBackward) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the optional command(SkipBackward) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the optional command(SkipBackward) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68173,7 +74570,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Read the optional command(Seek) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Read the optional command(Seek) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Read the optional command(Seek) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68194,7 +74595,11 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68375,7 +74780,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68399,7 +74808,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68418,7 +74831,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68437,7 +74854,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68465,7 +74886,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68492,7 +74917,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68513,7 +74942,11 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68693,7 +75126,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68717,7 +75154,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68741,7 +75182,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68768,7 +75213,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68794,7 +75243,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(CurrentTarget) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(CurrentTarget) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(CurrentTarget) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68815,7 +75268,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -68836,7 +75293,11 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69035,7 +75496,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69059,7 +75524,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69083,7 +75552,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69114,7 +75587,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69144,7 +75621,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(VendorName) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(VendorName) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(VendorName) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69165,7 +75646,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(VendorID) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(VendorID) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(VendorID) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69186,7 +75671,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Read the optional attribute(ProductID) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read the optional attribute(ProductID) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read the optional attribute(ProductID) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69207,7 +75696,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69231,7 +75724,11 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69463,7 +75960,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69487,7 +75988,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69511,7 +76016,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69530,7 +76039,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69549,7 +76062,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69575,7 +76092,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69600,7 +76121,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read the optional attribute(AcceptHeader): AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Read the optional attribute(AcceptHeader): AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read the optional attribute(AcceptHeader): AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69621,7 +76146,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read the optional attribute(SupportedStreamingProtocols): AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read the optional attribute(SupportedStreamingProtocols): AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read the optional attribute(SupportedStreamingProtocols): AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69642,7 +76171,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the optional command(LaunchContent) in AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the optional command(LaunchContent) in AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the optional command(LaunchContent) in AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69663,7 +76196,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional command(LaunchURL) in AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional command(LaunchURL) in AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional command(LaunchURL) in AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69684,7 +76221,11 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69850,7 +76391,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69874,7 +76419,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69898,7 +76447,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69924,7 +76477,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69949,7 +76506,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -69972,7 +76533,11 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70089,7 +76654,11 @@ class Test_TC_LOWPOWER_2_1 : public TestCommandBridge {
 
         [cluster sleepWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1: TH sends Sleep command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1: TH sends Sleep command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1: TH sends Sleep command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70217,7 +76786,11 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:10U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1: TH sends CEC Settings Keys(0x0A) to DUT Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1: TH sends CEC Settings Keys(0x0A) to DUT: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1: TH sends CEC Settings Keys(0x0A) to DUT: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70244,7 +76817,11 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:9U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 2: TH sends CEC Home Keys(0x09) to DUT Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 2: TH sends CEC Home Keys(0x09) to DUT: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 2: TH sends CEC Home Keys(0x09) to DUT: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70454,7 +77031,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:33U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1a: Send Numbers1 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1a: Send Numbers1: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1a: Send Numbers1: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70481,7 +77062,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:34U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1b: Send Numbers2 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1b: Send Numbers2: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1b: Send Numbers2: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70508,7 +77093,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:35U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1c: Send Numbers3 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1c: Send Numbers3: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1c: Send Numbers3: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70535,7 +77124,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:36U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1d: Send Numbers4 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1d: Send Numbers4: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1d: Send Numbers4: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70562,7 +77155,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:37U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1e: Send Numbers5 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1e: Send Numbers5: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1e: Send Numbers5: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70589,7 +77186,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:38U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1f: Send Numbers6 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1f: Send Numbers6: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1f: Send Numbers6: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70616,7 +77217,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:39U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1g: Send Numbers7 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1g: Send Numbers7: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1g: Send Numbers7: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70643,7 +77248,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:40U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1h: Send Numbers8 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1h: Send Numbers8: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1h: Send Numbers8: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70670,7 +77279,11 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:41U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 1i: Send Numbers9 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 1i: Send Numbers9: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 1i: Send Numbers9: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70788,7 +77401,11 @@ class Test_TC_APPLAUNCHER_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCatalogListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads CatalogList attribute from the DUT and where each entry in the list is a CSA-issued Vendor Id of type unsigned 16 bit integer ranging between 0-65536 for the catalog Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads CatalogList attribute from the DUT and where each entry in the list is a CSA-issued Vendor Id of type unsigned 16 bit integer ranging between 0-65536 for the catalog: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads CatalogList attribute from the DUT and where each entry in the list is a CSA-issued Vendor Id of type unsigned 16 bit integer ranging between 0-65536 for the catalog: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -70901,7 +77518,11 @@ class Test_TC_APPLAUNCHER_3_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentAppWithCompletion:^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads CurrentApp attribute from the DUT and Verify the in-focus application attributes, which should include the display Application ID(type:uint16) Catalog Vendor ID(type:string) or Null if there is no current in-focus application Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads CurrentApp attribute from the DUT and Verify the in-focus application attributes, which should include the display Application ID(type:uint16) Catalog Vendor ID(type:string) or Null if there is no current in-focus application: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads CurrentApp attribute from the DUT and Verify the in-focus application attributes, which should include the display Application ID(type:uint16) Catalog Vendor ID(type:string) or Null if there is no current in-focus application: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71014,7 +77635,11 @@ class Test_TC_MEDIAINPUT_3_10 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71151,7 +77776,11 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71172,7 +77801,11 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge {
         params.index = mIndex.HasValue() ? [NSNumber numberWithUnsignedChar:mIndex.Value()] : [NSNumber numberWithUnsignedChar:1U];
         [cluster selectInputWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2: TH sends SelectInput command to DUT to select an input by passing the index of the preferred input. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2: TH sends SelectInput command to DUT to select an input by passing the index of the preferred input.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2: TH sends SelectInput command to DUT to select an input by passing the index of the preferred input.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71190,7 +77823,11 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentInputWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads _CurrentInput attribute from the DUT to show the current input selected. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads _CurrentInput attribute from the DUT to show the current input selected.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads _CurrentInput attribute from the DUT to show the current input selected.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71330,7 +77967,11 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available and Verify list of available inputs supported by the device is provided, where each entry in the list contains an index(type:uint 8), InputType (InputType Enums), Name (type: Strings), and Description(Type:String): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71349,7 +77990,11 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge {
 
         [cluster showInputStatusWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2: Show Input Status Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: Show Input Status Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: Show Input Status Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71368,7 +78013,11 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge {
 
         [cluster hideInputStatusWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3: Hide Input Status Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3: Hide Input Status Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3: Hide Input Status Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71505,7 +78154,11 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the InputList attribute from the DUT to show list of Inputs available: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71528,7 +78181,11 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge {
         params.name = @"A1";
         [cluster renameInputWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 2: TH sends a RenameInput command to DUT to rename an input from the list returned in step 1 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 2: TH sends a RenameInput command to DUT to rename an input from the list returned in step 1: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 2: TH sends a RenameInput command to DUT to rename an input from the list returned in step 1: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71651,7 +78308,11 @@ class Test_TC_CHANNEL_5_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT to show list of Inputs available and Verify that the response contains a list of the known TV channels. Each list element should consist of the following,Major number (unsigned 16-bit integer, mandatory),Minor number (unsigned 16-bit integer, mandatory),Name (String, optional),Call sign (String, optional),Affiliate call sign (String, optional) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT to show list of Inputs available and Verify that the response contains a list of the known TV channels. Each list element should consist of the following,Major number (unsigned 16-bit integer, mandatory),Minor number (unsigned 16-bit integer, mandatory),Name (String, optional),Call sign (String, optional),Affiliate call sign (String, optional): Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT to show list of Inputs available and Verify that the response contains a list of the known TV channels. Each list element should consist of the following,Major number (unsigned 16-bit integer, mandatory),Minor number (unsigned 16-bit integer, mandatory),Name (String, optional),Call sign (String, optional),Affiliate call sign (String, optional): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71801,7 +78462,11 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the ChannelList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71824,7 +78489,11 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge {
         params.minorNumber = mMinornumber.HasValue() ? [NSNumber numberWithUnsignedShort:mMinornumber.Value()] : [NSNumber numberWithUnsignedShort:1U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Step 2: TH sends a ChangeChannelByNumber command to the DUT with channel information (major and minor numbers) from the list in step 1 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Step 2: TH sends a ChangeChannelByNumber command to the DUT with channel information (major and minor numbers) from the list in step 1: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Step 2: TH sends a ChangeChannelByNumber command to the DUT with channel information (major and minor numbers) from the list in step 1: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -71852,7 +78521,11 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72035,7 +78708,11 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the Lineup attribute from the DUT to show list of Inputs available and Verify that the response contains a lineup info object Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the Lineup attribute from the DUT to show list of Inputs available and Verify that the response contains a lineup info object: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the Lineup attribute from the DUT to show list of Inputs available and Verify that the response contains a lineup info object: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72053,7 +78730,11 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ChannelList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ChannelList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ChannelList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72072,7 +78753,11 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the CurrentChannel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72101,7 +78786,11 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
             [NSNumber numberWithShort:1];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 4: TH sends a SkipChannel command to the DUT with a value of 1 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 4: TH sends a SkipChannel command to the DUT with a value of 1: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 4: TH sends a SkipChannel command to the DUT with a value of 1: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72129,7 +78818,11 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads the CurrentChannel attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads the CurrentChannel attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads the CurrentChannel attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72364,7 +79057,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Precondition: Media content in a paused state at the beginning of the content Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72387,7 +79084,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72411,7 +79112,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
 
         [cluster playWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 2: Sends a Play command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: Sends a Play command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: Sends a Play command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72444,7 +79149,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72468,7 +79177,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 4: sends a Pause command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4: sends a Pause command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4: sends a Pause command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72501,7 +79214,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72525,7 +79242,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
 
         [cluster stopWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 6: Sends a Stop command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6: Sends a Stop command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6: Sends a Stop command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72558,7 +79279,11 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72853,7 +79578,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Precondition: Media content in a paused state at the beginning of the content Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72876,7 +79605,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the CurrentState attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the CurrentState attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the CurrentState attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72900,7 +79633,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
 
         [cluster playWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 2: Sends a Play command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: Sends a Play command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: Sends a Play command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72933,7 +79670,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72957,7 +79698,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
 
         [cluster startOverWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 4: Sends a StartOver command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4: Sends a StartOver command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4: Sends a StartOver command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -72991,7 +79736,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
 
         [cluster nextWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 5: Sends a Next command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5: Sends a Next command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5: Sends a Next command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73025,7 +79774,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
 
         [cluster previousWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 6: Sends a Previous command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6: Sends a Previous command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6: Sends a Previous command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73062,7 +79815,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:10000ULL];
         [cluster skipForwardWithParams:params completion:
                                                   ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Step 7: Sends a SkipForward command to the DUT  Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 7: Sends a SkipForward command to the DUT : Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 7: Sends a SkipForward command to the DUT : Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73095,7 +79852,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Reads the SampledPosition attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Reads the SampledPosition attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Reads the SampledPosition attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73124,7 +79885,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:10000ULL];
         [cluster skipBackwardWithParams:params completion:
                                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Step 9: Sends a SkipBackward command to the DUT  Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 9: Sends a SkipBackward command to the DUT : Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 9: Sends a SkipBackward command to the DUT : Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73157,7 +79922,11 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Reads the SampledPosition attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Reads the SampledPosition attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Reads the SampledPosition attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73379,7 +80148,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Precondition: Media content in a paused state at the beginning of the content Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73406,7 +80179,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:10000ULL];
         [cluster seekWithParams:params completion:
                                            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                               NSLog(@"Step 1: TH sends a Seek command to the DUT with a Position value of 10000 Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 1: TH sends a Seek command to the DUT with a Position value of 10000: Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 1: TH sends a Seek command to the DUT with a Position value of 10000: Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73439,7 +80216,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the SampledPosition attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the SampledPosition attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the SampledPosition attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73464,7 +80245,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the StartTime attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the StartTime attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the StartTime attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73487,7 +80272,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSeekRangeEndWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads the SeekRangeEnd attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads the SeekRangeEnd attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads the SeekRangeEnd attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73512,7 +80301,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSeekRangeStartWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads the SeekRangeStart attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads the SeekRangeStart attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads the SeekRangeStart attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73537,7 +80330,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads the Duration attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads the Duration attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads the Duration attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73566,7 +80363,11 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge {
         params.position = mSeekPosition.HasValue() ? [NSNumber numberWithUnsignedLongLong:mSeekPosition.Value()] : [NSNumber numberWithUnsignedLongLong:100000000ULL];
         [cluster seekWithParams:params completion:
                                            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                               NSLog(@"Step 7: TH sends a Seek command to the DUT with a Position value beyond the furthest valid position (ex: beyond the duration of the media) Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Step 7: TH sends a Seek command to the DUT with a Position value beyond the furthest valid position (ex: beyond the duration of the media): Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Step 7: TH sends a Seek command to the DUT with a Position value beyond the furthest valid position (ex: beyond the duration of the media): Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73926,7 +80727,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Precondition: Media content in a paused state at the beginning of the content Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Error: %@", err);
+                         } else {
+                             NSLog(@"Precondition: Media content in a paused state at the beginning of the content: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73949,7 +80754,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the CurrentState attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the CurrentState attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the CurrentState attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73972,7 +80781,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -73996,7 +80809,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster fastForwardWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 3: Sends a FastForward command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3: Sends a FastForward command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3: Sends a FastForward command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74029,7 +80846,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74052,7 +80873,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74076,7 +80901,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster fastForwardWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 6: Sends a FastForward command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6: Sends a FastForward command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6: Sends a FastForward command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74109,7 +80938,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74133,7 +80966,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster rewindWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 8: Sends a Rewind command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 8: Sends a Rewind command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 8: Sends a Rewind command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74166,7 +81003,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Reads the CurrentState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Reads the CurrentState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Reads the CurrentState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74189,7 +81030,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74213,7 +81058,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster rewindWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 11: Sends a Rewind command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 11: Sends a Rewind command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 11: Sends a Rewind command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74246,7 +81095,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74270,7 +81123,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
 
         [cluster playWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Step 13: Sends a Play command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 13: Sends a Play command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 13: Sends a Play command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74303,7 +81160,11 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: Reads the PlaybackSpeed attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: Reads the PlaybackSpeed attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: Reads the PlaybackSpeed attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74465,7 +81326,11 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOutputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the OutputList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the OutputList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the OutputList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74487,7 +81352,11 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge {
         params.index = mIndex.HasValue() ? [NSNumber numberWithUnsignedChar:mIndex.Value()] : [NSNumber numberWithUnsignedChar:1U];
         [cluster selectOutputWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 2: Sends a SelectAudioOutput command Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 2: Sends a SelectAudioOutput command: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 2: Sends a SelectAudioOutput command: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74505,7 +81374,11 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentOutputWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads the CurrentOutput attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads the CurrentOutput attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads the CurrentOutput attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74648,7 +81521,11 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOutputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the OutputList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the OutputList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the OutputList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74675,7 +81552,11 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge {
         params.name = @"CertTest";
         [cluster renameOutputWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 2: TH sends a RenameOutput command to the DUT with an index from the list in step 1 and the name 'CertTest' Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 2: TH sends a RenameOutput command to the DUT with an index from the list in step 1 and the name 'CertTest': Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 2: TH sends a RenameOutput command to the DUT with an index from the list in step 1 and the name 'CertTest': Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74833,7 +81714,11 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentTargetWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: Reads the CurrentTarget attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: Reads the CurrentTarget attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: Reads the CurrentTarget attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74856,7 +81741,11 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: Reads the TargetList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: Reads the TargetList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: Reads the TargetList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74882,7 +81771,11 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge {
         params.target = mTargetvalue.HasValue() ? [NSNumber numberWithUnsignedChar:mTargetvalue.Value()] : [NSNumber numberWithUnsignedChar:1U];
         [cluster navigateTargetWithParams:params completion:
                                                      ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Step 2a: Sends a NavigateTarget command Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Step 2a: Sends a NavigateTarget command: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Step 2a: Sends a NavigateTarget command: Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -74900,7 +81793,11 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentTargetWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Reads the CurrentTarget attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Reads the CurrentTarget attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Reads the CurrentTarget attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75095,7 +81992,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: Reads the VendorName attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: Reads the VendorName attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: Reads the VendorName attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75115,7 +82016,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Reads the VendorID attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Reads the VendorID attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Reads the VendorID attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75134,11 +82039,15 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads the ApplicationName attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads the ApplicationName attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads the ApplicationName attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("applicationName", "long_char_string", "char_string"));
+            VerifyOrReturn(CheckConstraintType("applicationName", "long_char_string", "long_char_string"));
             VerifyOrReturn(CheckConstraintMaxLength("applicationName", value, 256));
             NextTest();
         }];
@@ -75154,7 +82063,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeProductIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Reads the ProductID attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Reads the ProductID attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Reads the ProductID attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75176,7 +82089,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationWithCompletion:^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads the Application attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads the Application attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads the Application attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75195,7 +82112,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Reads the Status attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Reads the Status attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Reads the Status attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75216,7 +82137,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationVersionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads the ApplicationVersion attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads the ApplicationVersion attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads the ApplicationVersion attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75236,7 +82161,11 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAllowedVendorListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Reads the AllowedVendorList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Reads the AllowedVendorList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Reads the AllowedVendorList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75361,7 +82290,11 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptHeaderWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the AcceptHeader attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the AcceptHeader attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the AcceptHeader attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75380,7 +82313,11 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedStreamingProtocolsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the SupportedStreamingProtocols attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the SupportedStreamingProtocols attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the SupportedStreamingProtocols attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75516,7 +82453,11 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMACAddressWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads the MACAddress attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads the MACAddress attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads the MACAddress attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75536,7 +82477,11 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge {
 
         [cluster sleepWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2: TH sends a Sleep command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: TH sends a Sleep command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: TH sends a Sleep command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75706,7 +82651,11 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"Hello World" length:11];
         [cluster launchAppWithParams:params completion:
                                                 ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Launch an app with the provided a application ID Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Launch an app with the provided a application ID: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Launch an app with the provided a application ID: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75733,7 +82682,11 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge {
         params.tempAccountIdentifier = mTempAccountIdentifier.HasValue() ? [[NSString alloc] initWithBytes:mTempAccountIdentifier.Value().data() length:mTempAccountIdentifier.Value().size() encoding:NSUTF8StringEncoding] : @"1111";
         [cluster getSetupPINWithParams:params completion:
                                                   ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Step 1: TH sends a GetSetupPIN command to the DUT with test values provided by the product maker. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 1: TH sends a GetSetupPIN command to the DUT with test values provided by the product maker.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 1: TH sends a GetSetupPIN command to the DUT with test values provided by the product maker.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75761,7 +82714,11 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge {
             [setupPIN copy];
         [cluster loginWithParams:params completion:
                                             ^(NSError * _Nullable err) {
-                                                NSLog(@"Step 2: TH sends a Login command to the DUT with test values provided by the product maker. Error: %@", err);
+                                                if (err != nil) {
+                                                    NSLog(@"Step 2: TH sends a Login command to the DUT with test values provided by the product maker.: Error: %@", err);
+                                                } else {
+                                                    NSLog(@"Step 2: TH sends a Login command to the DUT with test values provided by the product maker.: Success");
+                                                }
 
                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75780,7 +82737,11 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge {
 
         [cluster logoutWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3: TH sends a Logout command to the DUT with test values provided by the product maker. Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3: TH sends a Logout command to the DUT with test values provided by the product maker.: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3: TH sends a Logout command to the DUT with test values provided by the product maker.: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -75958,7 +82919,11 @@ class Test_TC_CONTENTLAUNCHER_10_3 : public TestCommandBridge {
         params.data = mData.HasValue() ? [[NSString alloc] initWithBytes:mData.Value().data() length:mData.Value().size() encoding:NSUTF8StringEncoding] : @"exampleData";
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to false Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to false: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to false: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76020,7 +82985,11 @@ class Test_TC_CONTENTLAUNCHER_10_3 : public TestCommandBridge {
         params.data = mData.HasValue() ? [[NSString alloc] initWithBytes:mData.Value().data() length:mData.Value().size() encoding:NSUTF8StringEncoding] : @"exampleData";
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to true Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to true: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with a search parameter and string, and AutoPlay flag set to true: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76246,7 +83215,11 @@ class Test_TC_CONTENTLAUNCHER_10_5 : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 1: TH sends a LaunchURL command to the DUT with a known good content URL string Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 1: TH sends a LaunchURL command to the DUT with a known good content URL string: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 1: TH sends a LaunchURL command to the DUT with a known good content URL string: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76286,7 +83259,11 @@ class Test_TC_CONTENTLAUNCHER_10_5 : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 2: TH sends a LaunchURL command to the DUT with a known good content URL string and a display string Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 2: TH sends a LaunchURL command to the DUT with a known good content URL string and a display string: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 2: TH sends a LaunchURL command to the DUT with a known good content URL string and a display string: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76330,7 +83307,11 @@ class Test_TC_CONTENTLAUNCHER_10_5 : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 3: TH sends a LaunchURL command to the DUT with a known good content URL string and a brand information object. Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 3: TH sends a LaunchURL command to the DUT with a known good content URL string and a brand information object.: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 3: TH sends a LaunchURL command to the DUT with a known good content URL string and a brand information object.: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76369,7 +83350,11 @@ class Test_TC_CONTENTLAUNCHER_10_5 : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 4: TH sends a LaunchURL command to the DUT with a known unreachable content URL string. Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 4: TH sends a LaunchURL command to the DUT with a known unreachable content URL string.: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 4: TH sends a LaunchURL command to the DUT with a known unreachable content URL string.: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76398,7 +83383,11 @@ class Test_TC_CONTENTLAUNCHER_10_5 : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 5: TH sends a LaunchURL command to the DUT with a known un-authorized content URL string. Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 5: TH sends a LaunchURL command to the DUT with a known un-authorized content URL string.: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 5: TH sends a LaunchURL command to the DUT with a known un-authorized content URL string.: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76808,7 +83797,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Actor and Value as An Actor’s name, for example, Gaby sHoffman Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Actor and Value as An Actor’s name, for example, Gaby sHoffman: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 1: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Actor and Value as An Actor’s name, for example, Gaby sHoffman: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76856,7 +83849,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Channel and Value as Channel Name name, for example, PBS Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Channel and Value as Channel Name name, for example, PBS: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Channel and Value as Channel Name name, for example, PBS: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76904,7 +83901,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:false];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 3: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Character and Value as Character’s name,for example,Snow White Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 3: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Character and Value as Character’s name,for example,Snow White: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 3: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Character and Value as Character’s name,for example,Snow White: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -76952,7 +83953,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 4: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Director and Value as Director’s name, for example, Spike Lee Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 4: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Director and Value as Director’s name, for example, Spike Lee: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 4: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Director and Value as Director’s name, for example, Spike Lee: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77000,7 +84005,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 5: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Event and Value as An Event’s name , for example Football games Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 5: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Event and Value as An Event’s name , for example Football games: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 5: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Event and Value as An Event’s name , for example Football games: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77048,7 +84057,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 6: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Franchise and Value as Franchise’s name,for example Star Wars Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 6: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Franchise and Value as Franchise’s name,for example Star Wars: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 6: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Franchise and Value as Franchise’s name,for example Star Wars: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77096,7 +84109,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 7: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Genre and Value as Genre’s name, for example Horror Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 7: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Genre and Value as Genre’s name, for example Horror: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 7: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Genre and Value as Genre’s name, for example Horror: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77144,7 +84161,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 8: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As League and Value as League’s name, for example NCAA Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 8: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As League and Value as League’s name, for example NCAA: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 8: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As League and Value as League’s name, for example NCAA: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77192,7 +84213,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 9: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Popularity and Value as Popularity’s name Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 9: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Popularity and Value as Popularity’s name: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 9: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Popularity and Value as Popularity’s name: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77240,7 +84265,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 10: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Provider and Value as Provider’s name, for example Netflix Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 10: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Provider and Value as Provider’s name, for example Netflix: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 10: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Provider and Value as Provider’s name, for example Netflix: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77288,7 +84317,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 11: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Sport and Value as Sport’s name, for example, football Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 11: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Sport and Value as Sport’s name, for example, football: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 11: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Sport and Value as Sport’s name, for example, football: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77336,7 +84369,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 12: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As SportsTeam and Value as SportTeam’s name , for example Arsenel Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 12: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As SportsTeam and Value as SportTeam’s name , for example Arsenel: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 12: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As SportsTeam and Value as SportTeam’s name , for example Arsenel: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77384,7 +84421,11 @@ class Test_TC_CONTENTLAUNCHER_10_7 : public TestCommandBridge {
             [NSNumber numberWithBool:true];
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 13: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Type and Value as Type’s name, for example TVSeries Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 13: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Type and Value as Type’s name, for example TVSeries: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 13: TH sends a LaunchContent command to the DUT with search parameter consisting of Type As Type and Value as Type’s name, for example TVSeries: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77599,7 +84640,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77623,7 +84668,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77647,7 +84696,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77671,7 +84724,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77701,7 +84758,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77730,7 +84791,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77751,7 +84816,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads the optional attribute(OnMode) in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads the optional attribute(OnMode) in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads the optional attribute(OnMode) in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77772,7 +84841,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -77793,7 +84866,11 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78062,7 +85139,11 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Install ACL for QueryImage Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Install ACL for QueryImage: Error: %@", err);
+            } else {
+                NSLog(@"Install ACL for QueryImage: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78112,7 +85193,11 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
         params.endpoint = mEndpoint.HasValue() ? [NSNumber numberWithUnsignedShort:mEndpoint.Value()] : [NSNumber numberWithUnsignedShort:0U];
         [cluster announceOTAProviderWithParams:params completion:
                                                           ^(NSError * _Nullable err) {
-                                                              NSLog(@"Send an announce OTA provider command to the requestor Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Send an announce OTA provider command to the requestor: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Send an announce OTA provider command to the requestor: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78294,7 +85379,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78318,7 +85407,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78342,7 +85435,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78371,7 +85468,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78399,7 +85500,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78423,7 +85528,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78663,7 +85772,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupancyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Reads mandatory attribute constrains: Occupancy Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Reads mandatory attribute constrains: Occupancy: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Reads mandatory attribute constrains: Occupancy: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78685,7 +85798,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupancySensorTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorType Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorType: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorType: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78707,7 +85824,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupancySensorTypeBitmapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Reads mandatory attribute constrains: OccupancySensorTypeBitmap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Reads mandatory attribute constrains: OccupancySensorTypeBitmap: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Reads mandatory attribute constrains: OccupancySensorTypeBitmap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78729,7 +85850,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePIROccupiedToUnoccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads optional attribute: PIROccupiedToUnoccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads optional attribute: PIROccupiedToUnoccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads optional attribute: PIROccupiedToUnoccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78751,7 +85876,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePIRUnoccupiedToOccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78773,7 +85902,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePIRUnoccupiedToOccupiedThresholdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78795,7 +85928,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78817,7 +85954,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Read attribute: UltrasonicUnoccupiedToOccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Read attribute: UltrasonicUnoccupiedToOccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Read attribute: UltrasonicUnoccupiedToOccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78839,7 +85980,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Read attribute: UltrasonicUnoccupiedToOccupiedThreshold Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Read attribute: UltrasonicUnoccupiedToOccupiedThreshold: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Read attribute: UltrasonicUnoccupiedToOccupiedThreshold: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78861,7 +86006,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78883,7 +86032,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -78905,7 +86058,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79033,7 +86190,11 @@ class Test_TC_OCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupancySensorTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Reads mandatory attribute constrains: OccupancySensorType Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Reads mandatory attribute constrains: OccupancySensorType: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Reads mandatory attribute constrains: OccupancySensorType: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79055,7 +86216,11 @@ class Test_TC_OCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupancySensorTypeBitmapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorTypeBitmap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorTypeBitmap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads mandatory attribute constrains: OccupancySensorTypeBitmap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79270,7 +86435,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79292,7 +86461,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79316,7 +86489,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given OO.S.F00(LT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given OO.S.F00(LT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given OO.S.F00(LT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79335,7 +86512,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given OO.S.F01(DF) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given OO.S.F01(DF) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given OO.S.F01(DF) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79354,7 +86535,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79381,7 +86566,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79407,7 +86596,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the feature dependent(OO.S.F00) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the feature dependent(OO.S.F00) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the feature dependent(OO.S.F00) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79431,7 +86624,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79454,7 +86651,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read the feature dependent(OO.S.F00) commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read the feature dependent(OO.S.F00) commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read the feature dependent(OO.S.F00) commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79477,7 +86678,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79640,7 +86845,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the mandatory attribute: OnOff Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the mandatory attribute: OnOff: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the mandatory attribute: OnOff: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79659,7 +86868,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGlobalSceneControlWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read LT attribute: GlobalSceneControl Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read LT attribute: GlobalSceneControl: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read LT attribute: GlobalSceneControl: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79678,7 +86891,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read LT attribute: OnTime Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read LT attribute: OnTime: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read LT attribute: OnTime: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79700,7 +86917,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOffWaitTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read LT attribute: OffWaitTime Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read LT attribute: OffWaitTime: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read LT attribute: OffWaitTime: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -79722,7 +86943,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read LT attribute: StartUpOnOff Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read LT attribute: StartUpOnOff: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read LT attribute: StartUpOnOff: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80064,7 +87289,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: Send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: Send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: Send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80082,7 +87311,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80106,7 +87339,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3a: Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3a: Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3a: Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80124,7 +87361,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80148,7 +87389,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3c: Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3c: Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3c: Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80166,7 +87411,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80190,7 +87439,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4a: Send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4a: Send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4a: Send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80208,7 +87461,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80232,7 +87489,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4c: Send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4c: Send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4c: Send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80250,7 +87511,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80274,7 +87539,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster toggleWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 5c: Send Toggle Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 5c: Send Toggle Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 5c: Send Toggle Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80300,7 +87569,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5d: Check on/off attribute value is true after toggle command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5d: Check on/off attribute value is true after toggle command: Error: %@", err);
+            } else {
+                NSLog(@"Step 5d: Check on/off attribute value is true after toggle command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80324,7 +87597,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster toggleWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Toggle Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Toggle Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Toggle Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80350,7 +87627,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after toggle command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after toggle command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after toggle command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80383,7 +87664,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80416,7 +87701,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80440,7 +87729,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Reset Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Reset Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Reset Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80458,7 +87751,11 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80883,7 +88180,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2: TH sends On command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: TH sends On command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: TH sends On command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80904,7 +88205,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         startUpOnOffArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH writes a value of 0 to StartUpOnOff attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH writes a value of 0 to StartUpOnOff attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH writes a value of 0 to StartUpOnOff attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80947,7 +88252,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -80973,7 +88282,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         startUpOnOffArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH writes a value of 1 to StartUpOnOff attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH writes a value of 1 to StartUpOnOff attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH writes a value of 1 to StartUpOnOff attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81016,7 +88329,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81042,7 +88359,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         startUpOnOffArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH writes a value of 2 to StartUpOnOff attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH writes a value of 2 to StartUpOnOff attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH writes a value of 2 to StartUpOnOff attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81085,7 +88406,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5d: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5d: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5d: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81133,7 +88458,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5g: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5g: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5g: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81158,7 +88487,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         id startUpOnOffArgument;
         startUpOnOffArgument = nil;
         [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH writes NULL to StartUpOnOff attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH writes NULL to StartUpOnOff attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH writes NULL to StartUpOnOff attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81201,7 +88534,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81225,7 +88562,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 6e: TH sends Off command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 6e: TH sends Off command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 6e: TH sends Off command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81243,7 +88584,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6f: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6f: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6f: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81291,7 +88636,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6i: TH reads the OnOff attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6i: TH reads the OnOff attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6i: TH reads the OnOff attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81533,7 +88882,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81557,7 +88910,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81581,7 +88938,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81612,7 +88973,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81642,7 +89007,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81663,7 +89032,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read the optional command(Start) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read the optional command(Start) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read the optional command(Start) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81685,7 +89058,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81706,7 +89083,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read the optional command(Pause) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read the optional command(Pause) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read the optional command(Pause) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81728,7 +89109,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81750,7 +89135,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -81774,7 +89163,11 @@ class Test_TC_OPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82065,7 +89458,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82089,7 +89486,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82113,7 +89514,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given PS.S.F00(WIRED) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given PS.S.F00(WIRED) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given PS.S.F00(WIRED) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82132,7 +89537,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PS.S.F01(BAT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PS.S.F01(BAT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PS.S.F01(BAT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82151,7 +89560,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PS.S.F02(RECHG) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PS.S.F02(RECHG) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PS.S.F02(RECHG) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82170,7 +89583,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given PS.S.F03(REPLC) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given PS.S.F03(REPLC) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given PS.S.F03(REPLC) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82189,7 +89606,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82219,7 +89640,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82248,7 +89673,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the Feature dependent(PS.S.F00-WIRED) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the Feature dependent(PS.S.F00-WIRED) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the Feature dependent(PS.S.F00-WIRED) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82269,7 +89698,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the Feature dependent(PS.S.F01-BAT) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the Feature dependent(PS.S.F01-BAT) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the Feature dependent(PS.S.F01-BAT) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82292,7 +89725,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(PS.S.F02-RECHG) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(PS.S.F02-RECHG) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(PS.S.F02-RECHG) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82314,7 +89751,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the Feature dependent(PS.S.F03-REPLC) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the Feature dependent(PS.S.F03-REPLC) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the Feature dependent(PS.S.F03-REPLC) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82336,7 +89777,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82360,7 +89805,11 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82820,7 +90269,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Test Harness Client reads Status attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Test Harness Client reads Status attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Test Harness Client reads Status attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82842,7 +90295,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOrderWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Test Harness Client reads Order attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Test Harness Client reads Order attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Test Harness Client reads Order attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82864,7 +90321,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Test Harness Client reads Description attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Test Harness Client reads Description attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Test Harness Client reads Description attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82884,7 +90345,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredAssessedInputVoltageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82909,7 +90374,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredAssessedInputFrequencyWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82934,7 +90403,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredCurrentTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Test Harness Client reads WiredCurrentType attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Test Harness Client reads WiredCurrentType attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Test Harness Client reads WiredCurrentType attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82956,7 +90429,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredAssessedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Test Harness Client reads WiredAssessedCurrent attribute from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Test Harness Client reads WiredAssessedCurrent attribute from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Test Harness Client reads WiredAssessedCurrent attribute from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -82981,7 +90458,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredNominalVoltageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Test Harness Client reads WiredNominalVoltage from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Test Harness Client reads WiredNominalVoltage from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Test Harness Client reads WiredNominalVoltage from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83003,7 +90484,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredMaximumCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Test Harness Client reads WiredMaximumCurrent from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Test Harness Client reads WiredMaximumCurrent from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Test Harness Client reads WiredMaximumCurrent from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83025,7 +90510,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiredPresentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: Test Harness Client reads WiredPresent from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: Test Harness Client reads WiredPresent from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: Test Harness Client reads WiredPresent from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83044,7 +90533,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeActiveWiredFaultsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Test Harness Client reads ActiveWiredFaults from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Test Harness Client reads ActiveWiredFaults from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Test Harness Client reads ActiveWiredFaults from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83064,7 +90557,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatVoltageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: Test Harness Client reads BatVoltage from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: Test Harness Client reads BatVoltage from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: Test Harness Client reads BatVoltage from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83089,7 +90586,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatPercentRemainingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: Test Harness Client reads BatPercentRemaining from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: Test Harness Client reads BatPercentRemaining from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: Test Harness Client reads BatPercentRemaining from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83114,7 +90615,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatTimeRemainingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 15: Test Harness Client reads BatTimeRemaining from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 15: Test Harness Client reads BatTimeRemaining from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 15: Test Harness Client reads BatTimeRemaining from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83139,7 +90644,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatChargeLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 16: Test Harness Client reads BatChargeLevel from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 16: Test Harness Client reads BatChargeLevel from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 16: Test Harness Client reads BatChargeLevel from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83161,7 +90670,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatReplacementNeededWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 17: Test Harness Client reads BatReplacementNeeded from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 17: Test Harness Client reads BatReplacementNeeded from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 17: Test Harness Client reads BatReplacementNeeded from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83180,7 +90693,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatReplaceabilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 18: Test Harness Client reads BatReplaceability from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 18: Test Harness Client reads BatReplaceability from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 18: Test Harness Client reads BatReplaceability from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83202,7 +90719,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatPresentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 19: Test Harness Client reads BatPresent from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 19: Test Harness Client reads BatPresent from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 19: Test Harness Client reads BatPresent from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83221,7 +90742,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeActiveBatFaultsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 20: Test Harness Client readsActiveBatFaults from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 20: Test Harness Client readsActiveBatFaults from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 20: Test Harness Client readsActiveBatFaults from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83241,7 +90766,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatReplacementDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 21: Test Harness Client reads BatReplacementDescription from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 21: Test Harness Client reads BatReplacementDescription from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 21: Test Harness Client reads BatReplacementDescription from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83261,7 +90790,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatCommonDesignationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 22: Test Harness Client reads BatCommonDesignation from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 22: Test Harness Client reads BatCommonDesignation from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 22: Test Harness Client reads BatCommonDesignation from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83283,7 +90816,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatANSIDesignationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 23: Test Harness Client reads BatANSIDesignation from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 23: Test Harness Client reads BatANSIDesignation from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 23: Test Harness Client reads BatANSIDesignation from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83303,7 +90840,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatIECDesignationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 24: Test Harness Client reads BatIECDesignation from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 24: Test Harness Client reads BatIECDesignation from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 24: Test Harness Client reads BatIECDesignation from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83323,7 +90864,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatApprovedChemistryWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 25: Test Harness Client reads BatApprovedChemistry from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 25: Test Harness Client reads BatApprovedChemistry from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 25: Test Harness Client reads BatApprovedChemistry from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83345,7 +90890,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 26: Test Harness Client reads BatCapacity from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 26: Test Harness Client reads BatCapacity from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 26: Test Harness Client reads BatCapacity from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83367,7 +90916,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatQuantityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 27: Test Harness Client reads BatQuantity from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 27: Test Harness Client reads BatQuantity from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 27: Test Harness Client reads BatQuantity from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83389,7 +90942,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatChargeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 28: Test Harness Client reads BatChargeState from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 28: Test Harness Client reads BatChargeState from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 28: Test Harness Client reads BatChargeState from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83411,7 +90968,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatTimeToFullChargeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 29: Test Harness Client reads BatTimeToFullCharge from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 29: Test Harness Client reads BatTimeToFullCharge from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 29: Test Harness Client reads BatTimeToFullCharge from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83436,7 +90997,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatFunctionalWhileChargingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 30: Test Harness Client reads BatFunctionalWhileCharging from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 30: Test Harness Client reads BatFunctionalWhileCharging from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 30: Test Harness Client reads BatFunctionalWhileCharging from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83455,7 +91020,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatChargingCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 31: Test Harness Client reads BatChargingCurrent from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 31: Test Harness Client reads BatChargingCurrent from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 31: Test Harness Client reads BatChargingCurrent from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83480,7 +91049,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeActiveBatChargeFaultsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 32: Test Harness Client reads ActiveBatChargeFaults from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 32: Test Harness Client reads ActiveBatChargeFaults from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 32: Test Harness Client reads ActiveBatChargeFaults from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83500,7 +91073,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEndpointListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 33: Test Harness Client reads EndpointList from Server DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 33: Test Harness Client reads EndpointList from Server DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 33: Test Harness Client reads EndpointList from Server DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83745,7 +91322,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83769,7 +91350,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83793,7 +91378,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Given PRS.S.F00(EXT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Given PRS.S.F00(EXT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Given PRS.S.F00(EXT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83812,7 +91401,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83841,7 +91434,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global mandatory attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83869,7 +91466,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(ScaledValue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(ScaledValue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(ScaledValue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83890,7 +91491,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute(MinScaledValue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute(MinScaledValue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute(MinScaledValue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83911,7 +91516,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional attribute(MaxScaledValue) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional attribute(MaxScaledValue) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional attribute(MaxScaledValue) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83932,7 +91541,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional attribute(Scale) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional attribute(Scale) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional attribute(Scale) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83953,7 +91566,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional attribute(Tolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional attribute(Tolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional attribute(Tolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83974,7 +91591,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read the optional attribute(ScaledTolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read the optional attribute(ScaledTolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read the optional attribute(ScaledTolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -83995,7 +91616,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84019,7 +91644,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7:  Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7:  Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7:  Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84227,7 +91856,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the mandatory attribute constraints: MinMeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the mandatory attribute constraints: MinMeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the mandatory attribute constraints: MinMeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84256,7 +91889,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the mandatory attribute constraints: MaxMeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the mandatory attribute constraints: MaxMeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the mandatory attribute constraints: MaxMeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84284,7 +91921,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the mandatory attribute constraints: MeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the mandatory attribute constraints: MeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the mandatory attribute constraints: MeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84309,7 +91950,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the optional attribute: Tolerance Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the optional attribute: Tolerance: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the optional attribute: Tolerance: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84332,7 +91977,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinScaledValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional attribute: MinScaledValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional attribute: MinScaledValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional attribute: MinScaledValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84361,7 +92010,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxScaledValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the optional attribute: MaxScaledValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the optional attribute: MaxScaledValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the optional attribute: MaxScaledValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84389,7 +92042,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScaledValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Read the optional attribute: ScaledValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Read the optional attribute: ScaledValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Read the optional attribute: ScaledValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84414,7 +92071,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScaledToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Read the optional attribute: ScaledTolerance Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Read the optional attribute: ScaledTolerance: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Read the optional attribute: ScaledTolerance: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84436,7 +92097,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScaleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Read the optional attribute: Scale Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Read the optional attribute: Scale: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Read the optional attribute: Scale: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84583,7 +92248,11 @@ class Test_TC_PRS_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MeasuredValue attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MeasuredValue attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MeasuredValue attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -84623,7 +92292,11 @@ class Test_TC_PRS_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: After a few seconds, TH reads from the DUT the MeasuredValue attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: After a few seconds, TH reads from the DUT the MeasuredValue attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: After a few seconds, TH reads from the DUT the MeasuredValue attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85234,7 +92907,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85258,7 +92935,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85282,7 +92963,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85301,7 +92986,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85320,7 +93009,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given PCC.S.F02(FLW) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given PCC.S.F02(FLW) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given PCC.S.F02(FLW) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85339,7 +93032,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given PCC.S.F03(SPD) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given PCC.S.F03(SPD) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given PCC.S.F03(SPD) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85358,7 +93055,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85377,7 +93078,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85396,7 +93101,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85415,7 +93124,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85448,7 +93161,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85480,7 +93197,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85501,7 +93222,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85522,7 +93247,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85543,7 +93272,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85564,7 +93297,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85585,7 +93322,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85606,7 +93347,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85627,7 +93372,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85648,7 +93397,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85669,7 +93422,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85690,7 +93447,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4l: TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4l: TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4l: TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85711,7 +93472,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4m: TH reads optional attribute(Speed) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4m: TH reads optional attribute(Speed) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4m: TH reads optional attribute(Speed) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85732,7 +93497,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4n: TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4n: TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4n: TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85753,7 +93522,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4o: TH reads optional attribute(Power) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4o: TH reads optional attribute(Power) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4o: TH reads optional attribute(Power) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85774,7 +93547,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4p: TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4p: TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4p: TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85795,7 +93572,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4q: TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4q: TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4q: TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85816,7 +93597,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -85840,7 +93625,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7:  TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7:  TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7:  TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86201,7 +93990,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxPressureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the mandatory attribute: MaxPressure Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the mandatory attribute: MaxPressure: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the mandatory attribute: MaxPressure: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86226,7 +94019,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the mandatory attribute: MaxSpeed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the mandatory attribute: MaxSpeed: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the mandatory attribute: MaxSpeed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86251,7 +94048,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxFlowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the mandatory attribute: MaxFlow Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the mandatory attribute: MaxFlow: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the mandatory attribute: MaxFlow: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86276,7 +94077,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinConstPressureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the optional attribute: MinConstPressure Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the optional attribute: MinConstPressure: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the optional attribute: MinConstPressure: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86301,7 +94106,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxConstPressureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional attribute: MaxConstPressure Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional attribute: MaxConstPressure: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional attribute: MaxConstPressure: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86326,7 +94135,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinCompPressureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the optional attribute: MinCompPressure Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the optional attribute: MinCompPressure: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the optional attribute: MinCompPressure: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86351,7 +94164,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxCompPressureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Read the optional attribute: MaxCompPressure Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Read the optional attribute: MaxCompPressure: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Read the optional attribute: MaxCompPressure: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86376,7 +94193,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinConstSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Read the optional attribute: MinConstSpeed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Read the optional attribute: MinConstSpeed: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Read the optional attribute: MinConstSpeed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86401,7 +94222,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxConstSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Read the optional attribute: MaxConstSpeed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Read the optional attribute: MaxConstSpeed: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Read the optional attribute: MaxConstSpeed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86426,7 +94251,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinConstFlowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: Read the optional attribute: MinConstFlow Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: Read the optional attribute: MinConstFlow: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: Read the optional attribute: MinConstFlow: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86451,7 +94280,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxConstFlowWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Read the optional attribute: MaxConstFlow Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Read the optional attribute: MaxConstFlow: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Read the optional attribute: MaxConstFlow: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86476,7 +94309,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinConstTempWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: Read the optional attribute: MinConstTemp Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: Read the optional attribute: MinConstTemp: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: Read the optional attribute: MinConstTemp: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86501,7 +94338,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxConstTempWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: Read the optional attribute: MaxConstTemp Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: Read the optional attribute: MaxConstTemp: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: Read the optional attribute: MaxConstTemp: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86526,7 +94367,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePumpStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 15: Read the optional attribute: PumpStatus Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 15: Read the optional attribute: PumpStatus: Error: %@", err);
+            } else {
+                NSLog(@"Step 15: Read the optional attribute: PumpStatus: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86548,7 +94393,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 16: Read attribute: EffectiveOperationMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 16: Read attribute: EffectiveOperationMode: Error: %@", err);
+            } else {
+                NSLog(@"Step 16: Read attribute: EffectiveOperationMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86570,7 +94419,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 17: Read attribute: EffectiveControlMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 17: Read attribute: EffectiveControlMode: Error: %@", err);
+            } else {
+                NSLog(@"Step 17: Read attribute: EffectiveControlMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86592,7 +94445,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 18: Read attribute: Capacity Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 18: Read attribute: Capacity: Error: %@", err);
+            } else {
+                NSLog(@"Step 18: Read attribute: Capacity: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86617,7 +94474,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 19: Read the optional attribute: Speed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 19: Read the optional attribute: Speed: Error: %@", err);
+            } else {
+                NSLog(@"Step 19: Read the optional attribute: Speed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86642,7 +94503,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeRunningHoursWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 20: Read the optional attribute: LifetimeRunningHours Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 20: Read the optional attribute: LifetimeRunningHours: Error: %@", err);
+            } else {
+                NSLog(@"Step 20: Read the optional attribute: LifetimeRunningHours: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86667,7 +94532,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePowerWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 21: Read the optional attribute: Power Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 21: Read the optional attribute: Power: Error: %@", err);
+            } else {
+                NSLog(@"Step 21: Read the optional attribute: Power: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86692,7 +94561,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeEnergyConsumedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 22: Read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 22: Read the optional attribute: LifetimeEnergyConsumed: Error: %@", err);
+            } else {
+                NSLog(@"Step 22: Read the optional attribute: LifetimeEnergyConsumed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86717,7 +94590,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 23: Read optional attribute: OperationMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 23: Read optional attribute: OperationMode: Error: %@", err);
+            } else {
+                NSLog(@"Step 23: Read optional attribute: OperationMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86739,7 +94616,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 24: Read optional attribute: ControlMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 24: Read optional attribute: ControlMode: Error: %@", err);
+            } else {
+                NSLog(@"Step 24: Read optional attribute: ControlMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86936,7 +94817,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         operationModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOperationModeWithValue:operationModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86954,7 +94839,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86980,7 +94869,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         operationModeArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeOperationModeWithValue:operationModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH write 1 (Minimum) to the OperationMode attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH write 1 (Minimum) to the OperationMode attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH write 1 (Minimum) to the OperationMode attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -86998,7 +94891,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads from the DUT the EffectiveOperationMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads from the DUT the EffectiveOperationMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads from the DUT the EffectiveOperationMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87024,7 +94921,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         operationModeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeOperationModeWithValue:operationModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87042,7 +94943,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the EffectiveOperationMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the EffectiveOperationMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the EffectiveOperationMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87068,7 +94973,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         operationModeArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeOperationModeWithValue:operationModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH write 3 (Local) to the OperationMode attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH write 3 (Local) to the OperationMode attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH write 3 (Local) to the OperationMode attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87086,7 +94995,11 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads from the DUT the EffectiveOperationMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads from the DUT the EffectiveOperationMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads from the DUT the EffectiveOperationMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87350,7 +95263,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         operationModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeOperationModeWithValue:operationModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH write 0 (Normal) to the OperationMode attribute to DUT.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87368,7 +95285,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveOperationModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads from the DUT the EffectiveOperationMode attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87394,7 +95315,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH write 0 (ConstantSpeed) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH write 0 (ConstantSpeed) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH write 0 (ConstantSpeed) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87412,7 +95337,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads from the DUT the EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads from the DUT the EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads from the DUT the EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87438,7 +95367,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH write 1 (ConstantPressure) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH write 1 (ConstantPressure) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH write 1 (ConstantPressure) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87456,7 +95389,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87482,7 +95419,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: TH write 2 (ProportionalPressure) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: TH write 2 (ProportionalPressure) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: TH write 2 (ProportionalPressure) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87500,7 +95441,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads from the DUT the EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads from the DUT the EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads from the DUT the EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87526,7 +95471,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH write 3 (ConstantFlow) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH write 3 (ConstantFlow) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH write 3 (ConstantFlow) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87544,7 +95493,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads from the DUT the _EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads from the DUT the _EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads from the DUT the _EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87570,7 +95523,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 7a: TH write 5 (ConstantTemperature) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7a: TH write 5 (ConstantTemperature) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7a: TH write 5 (ConstantTemperature) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87588,7 +95545,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b: TH reads from the DUT the EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b: TH reads from the DUT the EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7b: TH reads from the DUT the EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87614,7 +95575,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         controlModeArgument =
             [NSNumber numberWithUnsignedChar:7U];
         [cluster writeAttributeControlModeWithValue:controlModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 8a: TH write 7 (Automatic) to the ControlMode attribute to DUT one at a time. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8a: TH write 7 (Automatic) to the ControlMode attribute to DUT one at a time.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8a: TH write 7 (Automatic) to the ControlMode attribute to DUT one at a time.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87632,7 +95597,11 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEffectiveControlModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8b: TH reads from the DUT the EffectiveControlMode attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8b: TH reads from the DUT the EffectiveControlMode attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 8b: TH reads from the DUT the EffectiveControlMode attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87874,7 +95843,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeRunningHoursArgument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeLifetimeRunningHoursWithValue:lifetimeRunningHoursArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: Write 1 to the LifetimeRunningHours attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Write 1 to the LifetimeRunningHours attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Write 1 to the LifetimeRunningHours attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87892,7 +95865,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeRunningHoursWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Reads the attribute: LifetimeRunningHours Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Reads the attribute: LifetimeRunningHours: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Reads the attribute: LifetimeRunningHours: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87919,7 +95896,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeRunningHoursArgument =
             [NSNumber numberWithUnsignedInt:2UL];
         [cluster writeAttributeLifetimeRunningHoursWithValue:lifetimeRunningHoursArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: Write 2 to the LifetimeRunningHours attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Write 2 to the LifetimeRunningHours attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Write 2 to the LifetimeRunningHours attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87937,7 +95918,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeRunningHoursWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Reads the attribute: LifetimeRunningHours Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Reads the attribute: LifetimeRunningHours: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Reads the attribute: LifetimeRunningHours: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87964,7 +95949,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeRunningHoursArgument =
             [NSNumber numberWithUnsignedInt:3UL];
         [cluster writeAttributeLifetimeRunningHoursWithValue:lifetimeRunningHoursArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: Write 3 to the LifetimeRunningHours attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Write 3 to the LifetimeRunningHours attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Write 3 to the LifetimeRunningHours attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -87982,7 +95971,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeRunningHoursWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Reads the attribute: LifetimeRunningHours Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Reads the attribute: LifetimeRunningHours: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Reads the attribute: LifetimeRunningHours: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88009,7 +96002,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeEnergyConsumedArgument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeLifetimeEnergyConsumedWithValue:lifetimeEnergyConsumedArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 5a: Write 1 to the LifetimeEnergyConsumed attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: Write 1 to the LifetimeEnergyConsumed attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: Write 1 to the LifetimeEnergyConsumed attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88027,7 +96024,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeEnergyConsumedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: Reads the attribute: LifetimeEnergyConsumed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: Reads the attribute: LifetimeEnergyConsumed: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: Reads the attribute: LifetimeEnergyConsumed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88054,7 +96055,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeEnergyConsumedArgument =
             [NSNumber numberWithUnsignedInt:2UL];
         [cluster writeAttributeLifetimeEnergyConsumedWithValue:lifetimeEnergyConsumedArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 6a: Write 2 to the LifetimeEnergyConsumed attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Write 2 to the LifetimeEnergyConsumed attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Write 2 to the LifetimeEnergyConsumed attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88072,7 +96077,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeEnergyConsumedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Reads the attribute: LifetimeEnergyConsumed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Reads the attribute: LifetimeEnergyConsumed: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Reads the attribute: LifetimeEnergyConsumed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88099,7 +96108,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         lifetimeEnergyConsumedArgument =
             [NSNumber numberWithUnsignedInt:3UL];
         [cluster writeAttributeLifetimeEnergyConsumedWithValue:lifetimeEnergyConsumedArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 7a: Write 3 to the LifetimeEnergyConsumed attribute to DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7a: Write 3 to the LifetimeEnergyConsumed attribute to DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7a: Write 3 to the LifetimeEnergyConsumed attribute to DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88117,7 +96130,11 @@ class Test_TC_PCC_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLifetimeEnergyConsumedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b: Reads the attribute: LifetimeEnergyConsumed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b: Reads the attribute: LifetimeEnergyConsumed: Error: %@", err);
+            } else {
+                NSLog(@"Step 7b: Reads the attribute: LifetimeEnergyConsumed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88286,7 +96303,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88310,7 +96331,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88334,7 +96359,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88364,7 +96393,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88393,7 +96426,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88417,7 +96454,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88434,11 +96475,11 @@ class Test_TC_REFALM_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_RH_1_1 : public TestCommandBridge {
+class Test_TC_REFALM_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_RH_1_1()
-        : TestCommandBridge("Test_TC_RH_1_1")
+    Test_TC_REFALM_2_1()
+        : TestCommandBridge("Test_TC_REFALM_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -88448,7 +96489,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_RH_1_1()
+    ~Test_TC_REFALM_2_1()
     {
     }
 
@@ -88458,11 +96499,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_REFALM_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_RH_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_REFALM_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -88475,57 +96516,264 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
-            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Commission DUT to TH (can be skipped if done in a preceding test)\n");
+            err = TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read ClusterRevision attribute from the DUT\n");
-            err = TestStep2ReadClusterRevisionAttributeFromTheDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: Read FeatureMap attribute from the DUT\n");
-            err = TestStep3ReadFeatureMapAttributeFromTheDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4a: Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Ensure that the door alarm is not locally suppressed and the door is closed\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestStep4aReadTheGlobalAttributeAttributeList_3();
+            err = TestStep2EnsureThatTheDoorAlarmIsNotLocallySuppressedAndTheDoorIsClosed_1();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4a: Read the global attribute: AttributeList\n");
-            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3:TH reads from the DUT the Mask attribute\n");
+            if (ShouldSkip("REFALM.S.A0000")) {
                 NextTest();
                 return;
             }
-            err = TestStep4aReadTheGlobalAttributeAttributeList_4();
+            err = TestStep3thReadsFromTheDutTheMaskAttribute_2();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Read the optional attribute(Tolerance) in AttributeList\n");
-            if (ShouldSkip("RH.S.A0003")) {
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4:TH reads from the DUT the State attribute\n");
+            if (ShouldSkip("REFALM.S.A0002")) {
                 NextTest();
                 return;
             }
-            err = TestStep4bReadTheOptionalAttributeToleranceInAttributeList_5();
+            err = TestStep4thReadsFromTheDutTheStateAttribute_3();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 5: Read the global attribute: AcceptedCommandList\n");
-            err = TestStep5ReadTheGlobalAttributeAcceptedCommandList_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6: Read the global attribute: GeneratedCommandList\n");
-            err = TestStep6ReadTheGlobalAttributeGeneratedCommandList_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read the global attribute: EventList\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 5:TH reads from the DUT the Supportedask attribute\n");
+            if (ShouldSkip("REFALM.S.A0003")) {
                 NextTest();
                 return;
             }
-            NextTest();
-            return;
+            err = TestStep5thReadsFromTheDutTheSupportedaskAttribute_4();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 5;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestStep2EnsureThatTheDoorAlarmIsNotLocallySuppressedAndTheDoorIsClosed_1()
+    {
+
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestStep3thReadsFromTheDutTheMaskAttribute_2()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 3:TH reads from the DUT the Mask attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3:TH reads from the DUT the Mask attribute: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("mask", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep4thReadsFromTheDutTheStateAttribute_3()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 4:TH reads from the DUT the State attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4:TH reads from the DUT the State attribute: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("state", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep5thReadsFromTheDutTheSupportedaskAttribute_4()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 5:TH reads from the DUT the Supportedask attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5:TH reads from the DUT the Supportedask attribute: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("supported", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_RH_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_RH_1_1()
+        : TestCommandBridge("Test_TC_RH_1_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_RH_1_1()
+    {
+    }
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_1_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_RH_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n");
+            err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read ClusterRevision attribute from the DUT\n");
+            err = TestStep2ReadClusterRevisionAttributeFromTheDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: Read FeatureMap attribute from the DUT\n");
+            err = TestStep3ReadFeatureMapAttributeFromTheDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4a: Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4aReadTheGlobalAttributeAttributeList_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4a: Read the global attribute: AttributeList\n");
+            if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4aReadTheGlobalAttributeAttributeList_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Read the optional attribute(Tolerance) in AttributeList\n");
+            if (ShouldSkip("RH.S.A0003")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4bReadTheOptionalAttributeToleranceInAttributeList_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 5: Read the global attribute: AcceptedCommandList\n");
+            err = TestStep5ReadTheGlobalAttributeAcceptedCommandList_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6: Read the global attribute: GeneratedCommandList\n");
+            err = TestStep6ReadTheGlobalAttributeGeneratedCommandList_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read the global attribute: EventList\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            NextTest();
+            return;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -88597,7 +96845,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88621,7 +96873,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88645,7 +96901,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88674,7 +96934,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88702,7 +96966,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88723,7 +96991,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88747,7 +97019,11 @@ class Test_TC_RH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88972,7 +97248,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -88996,7 +97276,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89020,7 +97304,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Given RVCCLEANM.S.F00(DEPONOFF) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Given RVCCLEANM.S.F00(DEPONOFF) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Given RVCCLEANM.S.F00(DEPONOFF) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89039,7 +97327,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89067,7 +97359,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89094,7 +97390,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89115,7 +97415,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89136,7 +97440,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCCLEANM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89157,7 +97465,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode): Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89182,7 +97494,11 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse): Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89408,7 +97724,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89432,7 +97752,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89456,7 +97780,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given RVCRUNM.S.F00(DEPONOFF) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given RVCRUNM.S.F00(DEPONOFF) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given RVCRUNM.S.F00(DEPONOFF) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89475,7 +97803,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89503,7 +97835,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89530,7 +97866,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads the optional attribute(StartUpMode) in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89551,7 +97891,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89572,7 +97916,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the Feature dependent(RVCRUNM.S.F00 - DEPONOFF) and optional attribute(OnMode) is not in AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89593,7 +97941,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode): Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute AcceptedCommandList. Check if it contains id 0x0 (ChangeToMode): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89618,7 +97970,11 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse): Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList. Check if it contains id 0x1 (ChangeToModeResponse): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89862,7 +98218,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89886,7 +98246,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads the FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89910,7 +98274,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89941,7 +98309,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads the AttributeList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89971,7 +98343,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the optional attribute(CountdownTime) in the AttributeList from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -89992,7 +98368,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read the optional command(Pause) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read the optional command(Pause) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read the optional command(Pause) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90014,7 +98394,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read the optional command(Stop) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90036,7 +98420,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read the optional command(Start) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read the optional command(Start) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read the optional command(Start) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90057,7 +98445,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Read the optional command(Resume) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90079,7 +98471,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90103,7 +98499,11 @@ class Test_TC_RVCOPSTATE_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90460,7 +98860,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90484,7 +98888,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90508,7 +98916,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute(Smoke Alarm) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute(Smoke Alarm): Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute(Smoke Alarm): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90532,7 +98944,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute(CO Alarm) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute(CO Alarm): Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute(CO Alarm): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90556,7 +98972,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute(Smoke Alarm & CO Alarm) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute(Smoke Alarm & CO Alarm): Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute(Smoke Alarm & CO Alarm): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90580,7 +99000,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90610,7 +99034,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute(SmokeState) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute(SmokeState): Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute(SmokeState): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90631,7 +99059,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute(COState) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute(COState): Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute(COState): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90652,7 +99084,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute(DeviceMuted) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute(DeviceMuted): Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute(DeviceMuted): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90673,7 +99109,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads from the DUT the AttributeList attribute(InterconnectSmokeAlarm) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads from the DUT the AttributeList attribute(InterconnectSmokeAlarm): Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads from the DUT the AttributeList attribute(InterconnectSmokeAlarm): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90694,7 +99134,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads from the DUT the AttributeList attribute(InterconnectCOAlarm) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads from the DUT the AttributeList attribute(InterconnectCOAlarm): Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads from the DUT the AttributeList attribute(InterconnectCOAlarm): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90715,7 +99159,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads from the DUT the AttributeList attribute(ContaminationState) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads from the DUT the AttributeList attribute(ContaminationState): Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads from the DUT the AttributeList attribute(ContaminationState): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90736,7 +99184,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads from the DUT the AttributeList attribute(SmokeSensitivityLevel) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads from the DUT the AttributeList attribute(SmokeSensitivityLevel): Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads from the DUT the AttributeList attribute(SmokeSensitivityLevel): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90757,7 +99209,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads from the DUT the AttributeList attribute(ExpiryDate) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads from the DUT the AttributeList attribute(ExpiryDate): Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads from the DUT the AttributeList attribute(ExpiryDate): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90778,7 +99234,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads from the DUT the AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads from the DUT the AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads from the DUT the AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90802,7 +99262,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads from the DUT the AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads from the DUT the AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads from the DUT the AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -90823,7 +99287,11 @@ class Test_TC_SMOKECO_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91074,7 +99542,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeExpressedStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ExpressedState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ExpressedState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ExpressedState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91096,7 +99568,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSmokeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the SmokeState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the SmokeState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the SmokeState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91118,7 +99594,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCOStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the COState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the COState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the COState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91140,7 +99620,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBatteryAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the BatteryAlert attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the BatteryAlert attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the BatteryAlert attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91162,7 +99646,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDeviceMutedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the DeviceMuted attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the DeviceMuted attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the DeviceMuted attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91184,7 +99672,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTestInProgressWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the TestInProgress attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the TestInProgress attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the TestInProgress attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91203,7 +99695,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeHardwareFaultAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the HardwareFaultAlert attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the HardwareFaultAlert attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the HardwareFaultAlert attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91222,7 +99718,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEndOfServiceAlertWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the EndOfServiceAlert attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the EndOfServiceAlert attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the EndOfServiceAlert attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91244,7 +99744,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInterconnectSmokeAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: TH reads from the DUT the InterconnectSmokeAlarm attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: TH reads from the DUT the InterconnectSmokeAlarm attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: TH reads from the DUT the InterconnectSmokeAlarm attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91266,7 +99770,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInterconnectCOAlarmWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: TH reads from the DUT the InterconnectCOAlarm attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: TH reads from the DUT the InterconnectCOAlarm attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: TH reads from the DUT the InterconnectCOAlarm attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91288,7 +99796,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeContaminationStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: TH reads from the DUT the ContaminationState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: TH reads from the DUT the ContaminationState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: TH reads from the DUT the ContaminationState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91310,7 +99822,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSmokeSensitivityLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: TH reads from the DUT the SmokeSensitivityLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: TH reads from the DUT the SmokeSensitivityLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: TH reads from the DUT the SmokeSensitivityLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91332,7 +99848,11 @@ class Test_TC_SMOKECO_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeExpiryDateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: TH reads from the DUT the ExpiryDate attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: TH reads from the DUT the ExpiryDate attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: TH reads from the DUT the ExpiryDate attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91632,7 +100152,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91656,7 +100180,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Read FeatureMap  attribute and Check values of flags in this FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Read FeatureMap  attribute and Check values of flags in this FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Read FeatureMap  attribute and Check values of flags in this FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91680,7 +100208,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Given SWTCH.S.F00(LS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Given SWTCH.S.F00(LS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Given SWTCH.S.F00(LS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91699,7 +100231,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Given SWTCH.S.F01(MS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Given SWTCH.S.F01(MS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Given SWTCH.S.F01(MS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91718,7 +100254,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: Given SWTCH.S.F02(MSR) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: Given SWTCH.S.F02(MSR) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: Given SWTCH.S.F02(MSR) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91737,7 +100277,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: Given SWTCH.S.F03(MSL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: Given SWTCH.S.F03(MSL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: Given SWTCH.S.F03(MSL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91756,7 +100300,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: Given SWTCH.S.F04(MSM) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: Given SWTCH.S.F04(MSM) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: Given SWTCH.S.F04(MSM) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91775,7 +100323,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91796,7 +100348,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91824,7 +100380,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91851,7 +100411,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -91875,7 +100439,11 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92081,7 +100649,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92105,7 +100677,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92129,7 +100705,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if TCCM.S.F00(DEPONOFF) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if TCCM.S.F00(DEPONOFF): Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL be 1 if and only if TCCM.S.F00(DEPONOFF): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92148,7 +100728,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92176,7 +100760,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92203,7 +100791,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0002: SHALL be included if and only if TCCM.S.A0002(StartUpMode) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0002: SHALL be included if and only if TCCM.S.A0002(StartUpMode): Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0002: SHALL be included if and only if TCCM.S.A0002(StartUpMode): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92224,7 +100816,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003 SHALL be included if and only if TCCM.S.F00(DEPONOFF) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003 SHALL be included if and only if TCCM.S.F00(DEPONOFF): Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003 SHALL be included if and only if TCCM.S.F00(DEPONOFF): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92245,7 +100841,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92266,7 +100866,11 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92502,7 +101106,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92526,7 +101134,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads from the DUT the FeatureMap attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92550,7 +101162,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute. bit 0: SHALL be 1 if and only if TCTL.S.F00(TN) & !TCTL.S.F01(TL) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute. bit 0: SHALL be 1 if and only if TCTL.S.F00(TN) & !TCTL.S.F01(TL): Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads from the DUT the FeatureMap attribute. bit 0: SHALL be 1 if and only if TCTL.S.F00(TN) & !TCTL.S.F01(TL): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92569,7 +101185,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute. bit 1: SHALL be 1 if and only if TCTL.S.F01(TL) & !TCTL.S.F00(TN) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute. bit 1: SHALL be 1 if and only if TCTL.S.F01(TL) & !TCTL.S.F00(TN): Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads from the DUT the FeatureMap attribute. bit 1: SHALL be 1 if and only if TCTL.S.F01(TL) & !TCTL.S.F00(TN): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92588,7 +101208,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute. bit 2: SHALL be 1 if and only if TCTL.S.F02(A_STEP) & TCTL.S.F00(TN) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute. bit 2: SHALL be 1 if and only if TCTL.S.F02(A_STEP) & TCTL.S.F00(TN): Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads from the DUT the FeatureMap attribute. bit 2: SHALL be 1 if and only if TCTL.S.F02(A_STEP) & TCTL.S.F00(TN): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92607,7 +101231,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92633,7 +101261,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92658,7 +101290,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0000, 0x0001, 0x0002: SHALL be included if and only if TCTL.S.F00(TN) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0000, 0x0001, 0x0002: SHALL be included if and only if TCTL.S.F00(TN): Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads from the DUT the AttributeList attribute. 0x0000, 0x0001, 0x0002: SHALL be included if and only if TCTL.S.F00(TN): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92681,7 +101317,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003: SHALL be included if and only if TCTL.S.F02(A_STEP) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003: SHALL be included if and only if TCTL.S.F02(A_STEP): Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003: SHALL be included if and only if TCTL.S.F02(A_STEP): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92702,7 +101342,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute. 0x0004 & 0x0005: SHALL be included if and only if TCTL.S.F01(TL) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute. 0x0004 & 0x0005: SHALL be included if and only if TCTL.S.F01(TL): Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads from the DUT the AttributeList attribute. 0x0004 & 0x0005: SHALL be included if and only if TCTL.S.F01(TL): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92724,7 +101368,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92745,7 +101393,11 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92887,7 +101539,11 @@ class Test_TC_TCTL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the MinTemperature attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the MinTemperature attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the MinTemperature attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92911,7 +101567,11 @@ class Test_TC_TCTL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxTemperatureWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the MaxTemperature attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the MaxTemperature attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the MaxTemperature attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -92936,7 +101596,11 @@ class Test_TC_TCTL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureSetpointWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the TemperatureSetpoint attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the TemperatureSetpoint attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the TemperatureSetpoint attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93077,7 +101741,11 @@ class Test_TC_TCTL_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the SelectedTemperatureLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the SelectedTemperatureLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the SelectedTemperatureLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93099,7 +101767,11 @@ class Test_TC_TCTL_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedTemperatureLevelsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the SupportedTemperatureLevels attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the SupportedTemperatureLevels attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the SupportedTemperatureLevels attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93285,7 +101957,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read ClusterRevision attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read ClusterRevision attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read ClusterRevision attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93309,7 +101985,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read FeatureMap attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read FeatureMap attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read FeatureMap attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93333,7 +102013,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93362,7 +102046,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93390,7 +102078,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the optional attribute(Tolerance) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93411,7 +102103,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Read AcceptedCommandList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Read AcceptedCommandList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Read AcceptedCommandList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93435,7 +102131,11 @@ class Test_TC_TMP_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read GeneratedCommandList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read GeneratedCommandList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read GeneratedCommandList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -93588,13 +102288,17 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the mandatory attribute: MinMeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the mandatory attribute: MinMeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the mandatory attribute: MinMeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -27315));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32766));
             }
@@ -93617,13 +102321,17 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the mandatory attribute: MaxMeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the mandatory attribute: MaxMeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the mandatory attribute: MaxMeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], CurrentMinMeasured));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
             }
@@ -93645,13 +102353,17 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the mandatory attribute: MeasuredValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the mandatory attribute: MeasuredValue: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the mandatory attribute: MeasuredValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("measuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("measuredValue", [value shortValue], CurrentMinMeasured));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("measuredValue", [value shortValue], CurrentMaxMeasured));
             }
@@ -93670,7 +102382,11 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional attribute: Tolerance Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional attribute: Tolerance: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional attribute: Tolerance: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94417,7 +103133,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94441,7 +103161,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94465,7 +103189,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given TSTAT.S.F00(HEAT ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given TSTAT.S.F00(HEAT ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given TSTAT.S.F00(HEAT ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94484,7 +103212,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given TSTAT.S.F01(COOL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given TSTAT.S.F01(COOL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given TSTAT.S.F01(COOL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94503,7 +103235,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given TSTAT.S.F02(OCC) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given TSTAT.S.F02(OCC) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given TSTAT.S.F02(OCC) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94522,7 +103258,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given TSTAT.S.F03(SCH) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given TSTAT.S.F03(SCH) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given TSTAT.S.F03(SCH) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94541,7 +103281,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given TSTAT.S.F04(SB) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given TSTAT.S.F04(SB) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given TSTAT.S.F04(SB) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94560,7 +103304,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given TSTAT.S.F05(AUTO) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given TSTAT.S.F05(AUTO) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given TSTAT.S.F05(AUTO) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94579,7 +103327,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given TSTAT.S.F06(LTNE) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given TSTAT.S.F06(LTNE) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given TSTAT.S.F06(LTNE) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94598,7 +103350,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94627,7 +103383,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94655,7 +103415,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the Feature dependent(TSTAT.S.F00(HEAT)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the Feature dependent(TSTAT.S.F00(HEAT)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the Feature dependent(TSTAT.S.F00(HEAT)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94676,7 +103440,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(TSTAT.S.F01(COOL)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(TSTAT.S.F01(COOL)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(TSTAT.S.F01(COOL)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94697,7 +103465,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the Feature dependent(TSTAT.S.F02(OCC)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the Feature dependent(TSTAT.S.F02(OCC)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the Feature dependent(TSTAT.S.F02(OCC)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94718,7 +103490,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the Feature dependent(TSTAT.S.F00(HEAT) & TSTAT.S.F02(OCC)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the Feature dependent(TSTAT.S.F00(HEAT) & TSTAT.S.F02(OCC)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the Feature dependent(TSTAT.S.F00(HEAT) & TSTAT.S.F02(OCC)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94739,7 +103515,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the Feature dependent(TSTAT.S.F01(COOL) & TSTAT.S.F02(OCC)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the Feature dependent(TSTAT.S.F01(COOL) & TSTAT.S.F02(OCC)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the Feature dependent(TSTAT.S.F01(COOL) & TSTAT.S.F02(OCC)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94760,7 +103540,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read the Feature dependent(TSTAT.S.F05(AUTO)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read the Feature dependent(TSTAT.S.F05(AUTO)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read the Feature dependent(TSTAT.S.F05(AUTO)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94783,7 +103567,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: Read the Feature dependent(TSTAT.S.F03(SCH)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: Read the Feature dependent(TSTAT.S.F03(SCH)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: Read the Feature dependent(TSTAT.S.F03(SCH)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94806,7 +103594,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: Read the Feature dependent(TSTAT.S.F04(SB)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: Read the Feature dependent(TSTAT.S.F04(SB)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: Read the Feature dependent(TSTAT.S.F04(SB)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94829,7 +103621,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: Read the Feature dependent(TSTAT.S.F04(SB) & TSTAT.S.F02(OCC)) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: Read the Feature dependent(TSTAT.S.F04(SB) & TSTAT.S.F02(OCC)) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: Read the Feature dependent(TSTAT.S.F04(SB) & TSTAT.S.F02(OCC)) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94852,7 +103648,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94873,7 +103673,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4l: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4l: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4l: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94894,7 +103698,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4m: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4m: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4m: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94915,7 +103723,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4n: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4n: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4n: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94936,7 +103748,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4o: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4o: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4o: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94957,7 +103773,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4p: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4p: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4p: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94978,7 +103798,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4q: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4q: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4q: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -94999,7 +103823,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4r: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4r: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4r: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95020,7 +103848,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4s: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4s: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4s: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95041,7 +103873,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4t: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4t: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4t: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95062,7 +103898,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4u: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4u: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4u: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95083,7 +103923,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4x: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4x: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4x: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95104,7 +103948,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5y: Read the optional attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5y: Read the optional attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5y: Read the optional attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95125,7 +103973,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4z: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4z: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4z: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95146,7 +103998,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4A: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4A: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4A: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95167,7 +104023,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4B: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4B: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4B: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95188,7 +104048,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4C: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4C: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4C: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95209,7 +104073,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5D: Read the optional attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5D: Read the optional attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5D: Read the optional attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95230,7 +104098,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4E: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4E: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4E: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95251,7 +104123,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4F: Read the optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4F: Read the optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4F: Read the optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95272,7 +104148,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5G: Read the optional attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5G: Read the optional attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5G: Read the optional attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95293,7 +104173,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4H: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4H: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4H: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95314,7 +104198,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4I: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4I: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4I: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95335,7 +104223,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4J: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4J: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4J: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95356,7 +104248,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4K: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4K: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4K: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95377,7 +104273,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4L: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4L: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4L: Read the Feature dependent(TSTAT.S.F00(HEAT)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95398,7 +104298,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4M: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4M: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4M: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95419,7 +104323,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4N: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4N: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4N: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95440,7 +104348,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4O: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4O: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4O: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95461,7 +104373,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4P: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4P: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4P: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95482,7 +104398,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4Q: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4Q: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4Q: Read the Feature dependent(TSTAT.S.F01(COOL)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95503,7 +104423,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4R: Read the Feature dependent(TSTAT.S.F05(AUTO)) optional attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4R: Read the Feature dependent(TSTAT.S.F05(AUTO)) optional attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4R: Read the Feature dependent(TSTAT.S.F05(AUTO)) optional attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95524,7 +104448,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5a: Read the mandatory commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5a: Read the mandatory commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5a: Read the mandatory commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95545,7 +104473,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95568,7 +104500,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: Read the optional (GetRelayStatusLog) command in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: Read the optional (GetRelayStatusLog) command in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: Read the optional (GetRelayStatusLog) command in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95589,7 +104525,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95613,7 +104553,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95634,7 +104578,11 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read optional command (GetRelayStatusLogResponse) in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read optional command (GetRelayStatusLogResponse) in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read optional command (GetRelayStatusLogResponse) in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95811,7 +104759,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95835,7 +104787,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95859,7 +104815,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95887,7 +104847,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95914,7 +104878,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95935,7 +104903,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -95959,7 +104931,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96100,7 +105076,11 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureDisplayModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the mandatory attribute: TemperatureDisplayMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the mandatory attribute: TemperatureDisplayMode: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the mandatory attribute: TemperatureDisplayMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96122,7 +105102,11 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Read the mandatory attribute: KeypadLockout Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Read the mandatory attribute: KeypadLockout: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Read the mandatory attribute: KeypadLockout: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96144,7 +105128,11 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScheduleProgrammingVisibilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the optional attribute: ScheduleProgrammingVisibility Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the optional attribute: ScheduleProgrammingVisibility: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the optional attribute: ScheduleProgrammingVisibility: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96649,7 +105637,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         temperatureDisplayModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: Writes a value of 0 to TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Writes a value of 0 to TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Writes a value of 0 to TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96677,7 +105669,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureDisplayModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads the TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads the TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads the TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96703,7 +105699,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         temperatureDisplayModeArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2c: Writes a value of 1 to TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Writes a value of 1 to TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Writes a value of 1 to TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96731,7 +105731,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureDisplayModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH reads the TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH reads the TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH reads the TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96757,7 +105761,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         temperatureDisplayModeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2e: Writes a value of greater than 1 to TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: Writes a value of greater than 1 to TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: Writes a value of greater than 1 to TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -96774,7 +105782,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTemperatureDisplayModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads the TemperatureDisplayMode attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads the TemperatureDisplayMode attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads the TemperatureDisplayMode attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96800,7 +105812,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: Writes a value of 0 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Writes a value of 0 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Writes a value of 0 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96828,7 +105844,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96854,7 +105874,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3c: Writes a value of 1 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Writes a value of 1 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Writes a value of 1 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96882,7 +105906,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96908,7 +105936,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3e: Writes a value of 2 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Writes a value of 2 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Writes a value of 2 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96936,7 +105968,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96962,7 +105998,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3g: Writes a value of 3 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Writes a value of 3 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Writes a value of 3 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96990,7 +106030,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97016,7 +106060,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:4U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3i: Writes a value of 4 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Writes a value of 4 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Writes a value of 4 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97044,7 +106092,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97070,7 +106122,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3k: Writes a value of 5 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Writes a value of 5 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Writes a value of 5 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97098,7 +106154,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97124,7 +106184,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         keypadLockoutArgument =
             [NSNumber numberWithUnsignedChar:6U];
         [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3m: Writes a value of greater than 5 to KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3m: Writes a value of greater than 5 to KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3m: Writes a value of greater than 5 to KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -97141,7 +106205,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeKeypadLockoutWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3n: TH reads the KeypadLockout attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3n: TH reads the KeypadLockout attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3n: TH reads the KeypadLockout attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97167,7 +106235,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         scheduleProgrammingVisibilityArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4a: Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97195,7 +106267,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScheduleProgrammingVisibilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads the ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads the ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads the ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97221,7 +106297,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         scheduleProgrammingVisibilityArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4c: Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97249,7 +106329,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScheduleProgrammingVisibilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads the ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads the ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads the ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97275,7 +106359,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         scheduleProgrammingVisibilityArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 4e: Writes a value of greater than 1 to ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Writes a value of greater than 1 to ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Writes a value of greater than 1 to ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -97292,7 +106380,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeScheduleProgrammingVisibilityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads the ScheduleProgrammingVisibility attribute of DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads the ScheduleProgrammingVisibility attribute of DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads the ScheduleProgrammingVisibility attribute of DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97611,7 +106703,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97635,7 +106731,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97659,7 +106759,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given DGTHREAD.S.F00(PKTCNT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given DGTHREAD.S.F00(PKTCNT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given DGTHREAD.S.F00(PKTCNT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97678,7 +106782,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given DGTHREAD.S.F01(ERRCNT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given DGTHREAD.S.F01(ERRCNT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given DGTHREAD.S.F01(ERRCNT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97697,7 +106805,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given DGTHREAD.S.F02(MLECNT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given DGTHREAD.S.F02(MLECNT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given DGTHREAD.S.F02(MLECNT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97716,7 +106828,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given DGTHREAD.S.F03(MACCNT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given DGTHREAD.S.F03(MACCNT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given DGTHREAD.S.F03(MACCNT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97735,7 +106851,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97778,7 +106898,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads mandatory attributes in AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97820,7 +106944,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads Feature dependent attribute(DGTHREAD.S.F01(ERRCNT)) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads Feature dependent attribute(DGTHREAD.S.F01(ERRCNT)) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads Feature dependent attribute(DGTHREAD.S.F01(ERRCNT)) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97841,7 +106969,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97869,7 +107001,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97923,7 +107059,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional attribute (ActiveTimestamp) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional attribute (ActiveTimestamp) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional attribute (ActiveTimestamp) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97944,7 +107084,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the optional attribute (PendingTimestamp) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the optional attribute (PendingTimestamp) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the optional attribute (PendingTimestamp) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97965,7 +107109,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: Read the optional attribute (Delay) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: Read the optional attribute (Delay) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: Read the optional attribute (Delay) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97986,7 +107134,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98010,7 +107162,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98031,7 +107187,11 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98516,7 +107676,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS2: read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS2: read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"TS2: read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98539,7 +107703,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98558,7 +107726,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given !TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given !TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given !TIMESYNC.S.F00(TZ) ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98577,7 +107749,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98596,7 +107772,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given !TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given !TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given !TIMESYNC.S.F01(NTPC) ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98615,7 +107795,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98634,7 +107818,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given !TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given !TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given !TIMESYNC.S.F02(NTPS) ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98653,7 +107841,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98672,7 +107864,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS3: Given !TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit clear Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS3: Given !TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit clear: Error: %@", err);
+            } else {
+                NSLog(@"TS3: Given !TIMESYNC.S.F03(TSC) ensure featuremap has the correct bit clear: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98691,7 +107887,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for mandatory attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for mandatory attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for mandatory attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98718,7 +107918,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for mandatory attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for mandatory attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for mandatory attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98744,7 +107948,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for optional attribute TimeSource in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for optional attribute TimeSource in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for optional attribute TimeSource in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98764,7 +107972,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for optional attribute TimeSource not in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for optional attribute TimeSource not in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for optional attribute TimeSource not in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98784,7 +107996,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for TZ feature-based attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for TZ feature-based attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for TZ feature-based attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98809,7 +108025,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for TZ feature-based attributes not in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for TZ feature-based attributes not in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for TZ feature-based attributes not in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98834,7 +108054,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for NTPC feature-based attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for NTPC feature-based attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for NTPC feature-based attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98855,7 +108079,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for NTPC feature-based attributes not in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for NTPC feature-based attributes not in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for NTPC feature-based attributes not in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98876,7 +108104,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for NTPS feature-based attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for NTPS feature-based attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for NTPS feature-based attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98896,7 +108128,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for NTPS feature-based attributes not in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for NTPS feature-based attributes not in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for NTPS feature-based attributes not in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98916,7 +108152,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for TSC feature-based attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for TSC feature-based attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for TSC feature-based attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98936,7 +108176,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS4: Check for TSC feature-based attributes not in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS4: Check for TSC feature-based attributes not in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"TS4: Check for TSC feature-based attributes not in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98956,7 +108200,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for mandatory commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for mandatory commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for mandatory commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98976,7 +108224,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for TZ feature-based commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for TZ feature-based commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for TZ feature-based commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98997,7 +108249,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for TZ feature-based commands in not AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for TZ feature-based commands in not AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for TZ feature-based commands in not AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99018,7 +108274,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for NTPC feature-based commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for NTPC feature-based commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for NTPC feature-based commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99038,7 +108298,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for NTPC feature-based commands in not AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for NTPC feature-based commands in not AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for NTPC feature-based commands in not AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99058,7 +108322,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for TSC feature-based commands in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for TSC feature-based commands in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for TSC feature-based commands in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99078,7 +108346,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS6: Check for TSC feature-based commands in not AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS6: Check for TSC feature-based commands in not AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS6: Check for TSC feature-based commands in not AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99098,7 +108370,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS7: Check for TZ feature-based commands in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS7: Check for TZ feature-based commands in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS7: Check for TZ feature-based commands in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99118,7 +108394,11 @@ class Test_TC_TIMESYNC_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TS7: Check for TZ feature-based commands in not GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TS7: Check for TZ feature-based commands in not GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"TS7: Check for TZ feature-based commands in not GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99285,7 +108565,11 @@ class Test_TC_TIMESYNC_2_3 : public TestCommandBridge {
 
         [cluster setTrustedTimeSourceWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 1: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource fields set as follows: NodeID: th_node_id, Endpoint: 0 Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 1: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource fields set as follows: NodeID: th_node_id, Endpoint: 0: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 1: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource fields set as follows: NodeID: th_node_id, Endpoint: 0: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99304,7 +108588,11 @@ class Test_TC_TIMESYNC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the CurrentFabricIndex attribute from the Node Operational Credentials Cluster and saves as th_fabric_idx Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the CurrentFabricIndex attribute from the Node Operational Credentials Cluster and saves as th_fabric_idx: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the CurrentFabricIndex attribute from the Node Operational Credentials Cluster and saves as th_fabric_idx: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99326,7 +108614,11 @@ class Test_TC_TIMESYNC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTrustedTimeSourceWithCompletion:^(MTRTimeSynchronizationClusterTrustedTimeSourceStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the TrustedTimeSource attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the TrustedTimeSource attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the TrustedTimeSource attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99355,7 +108647,11 @@ class Test_TC_TIMESYNC_2_3 : public TestCommandBridge {
         params.trustedTimeSource = nil;
         [cluster setTrustedTimeSourceWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 4: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource set to null. Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 4: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource set to null.: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 4: TH sends the SetTrustedTimeSource command to the DUT with the TrustedTimeSource set to null.: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99373,7 +108669,11 @@ class Test_TC_TIMESYNC_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTrustedTimeSourceWithCompletion:^(MTRTimeSynchronizationClusterTrustedTimeSourceStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the TrustedTimeSource attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the TrustedTimeSource attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the TrustedTimeSource attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99541,7 +108841,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99565,7 +108869,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99589,7 +108897,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99616,7 +108928,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the AttributeList attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99642,7 +108958,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99666,7 +108986,11 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99785,7 +109109,11 @@ class Test_TC_ULABEL_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99931,7 +109259,11 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1: TH writes LabelList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH writes LabelList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH writes LabelList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99949,7 +109281,11 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads LabelList attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads LabelList attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads LabelList attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100097,7 +109433,11 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1: TH writes LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH writes LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH writes LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -100123,7 +109463,11 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2: TH writes LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH writes LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH writes LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -100281,7 +109625,11 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1: TH writes LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH writes LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH writes LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100299,7 +109647,11 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100335,7 +109687,11 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3: TH writes LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH writes LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH writes LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100353,7 +109709,11 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads LabelList attribute of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads LabelList attribute of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads LabelList attribute of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100630,7 +109990,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100654,7 +110018,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100678,7 +110046,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given DGWIFI.S.F00(PacketCounts) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given DGWIFI.S.F00(PacketCounts) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given DGWIFI.S.F00(PacketCounts) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100697,7 +110069,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given DGWIFI.S.F01(ErrorCounts) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given DGWIFI.S.F01(ErrorCounts) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given DGWIFI.S.F01(ErrorCounts) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100716,7 +110092,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100747,7 +110127,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100777,7 +110161,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads Feature dependent(DGWIFI.S.F00) attributes in attributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads Feature dependent(DGWIFI.S.F00) attributes in attributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads Feature dependent(DGWIFI.S.F00) attributes in attributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100802,7 +110190,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads Feature dependent(DGWIFI.S.F01) attributes in attributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads Feature dependent(DGWIFI.S.F01) attributes in attributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads Feature dependent(DGWIFI.S.F01) attributes in attributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100824,7 +110216,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute (CurrentMaxRate) in AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute (CurrentMaxRate) in AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute (CurrentMaxRate) in AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100845,7 +110241,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100869,7 +110269,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100890,7 +110294,11 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101141,7 +110549,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBSSIDWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads BSSID attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads BSSID attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads BSSID attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101164,7 +110576,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSecurityTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: Reads SecurityType attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: Reads SecurityType attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: Reads SecurityType attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101187,7 +110603,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWiFiVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Reads WiFiVersion attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Reads WiFiVersion attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Reads WiFiVersion attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101212,7 +110632,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChannelNumberWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: Reads ChannelNumber attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: Reads ChannelNumber attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: Reads ChannelNumber attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101237,7 +110661,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRSSIWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Reads RSSI attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Reads RSSI attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Reads RSSI attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101262,7 +110690,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBeaconLostCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Reads BeaconLostCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Reads BeaconLostCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Reads BeaconLostCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101287,7 +110719,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBeaconRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: Reads BeaconRxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: Reads BeaconRxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: Reads BeaconRxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101312,7 +110748,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketMulticastRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: Reads PacketMulticastRxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 9: Reads PacketMulticastRxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: Reads PacketMulticastRxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101337,7 +110777,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketMulticastTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 10: Reads PacketMulticastTxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 10: Reads PacketMulticastTxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 10: Reads PacketMulticastTxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101362,7 +110806,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketUnicastRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 11: Reads PacketUnicastRxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 11: Reads PacketUnicastRxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 11: Reads PacketUnicastRxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101387,7 +110835,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketUnicastTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 12: Reads PacketUnicastTxCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 12: Reads PacketUnicastTxCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 12: Reads PacketUnicastTxCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101412,7 +110864,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentMaxRateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 13: Reads CurrentMaxRate attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 13: Reads CurrentMaxRate attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 13: Reads CurrentMaxRate attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101435,7 +110891,11 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOverrunCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 14: Reads OverrunCount attribute constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 14: Reads OverrunCount attribute constraints: Error: %@", err);
+            } else {
+                NSLog(@"Step 14: Reads OverrunCount attribute constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101620,7 +111080,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
 
         [cluster resetCountsWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2: TH sends ResetCounts command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2: TH sends ResetCounts command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2: TH sends ResetCounts command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101638,7 +111102,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBeaconLostCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: Reads BeaconLostCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: Reads BeaconLostCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: Reads BeaconLostCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101663,7 +111131,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBeaconRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: Reads BeaconRxCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: Reads BeaconRxCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: Reads BeaconRxCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101688,7 +111160,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketMulticastRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: Reads PacketMulticastRxCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: Reads PacketMulticastRxCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: Reads PacketMulticastRxCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101713,7 +111189,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketMulticastTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: Reads PacketMulticastTxCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: Reads PacketMulticastTxCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: Reads PacketMulticastTxCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101738,7 +111218,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketUnicastRxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: Reads PacketUnicastRxCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: Reads PacketUnicastRxCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: Reads PacketUnicastRxCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101763,7 +111247,11 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePacketUnicastTxCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: Reads PacketUnicastTxCount attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: Reads PacketUnicastTxCount attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: Reads PacketUnicastTxCount attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102080,7 +111568,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the (0xFFFD) ClusterRevision attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the (0xFFFD) ClusterRevision attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the (0xFFFD) ClusterRevision attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102107,7 +111599,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads from the DUT the (0xFFFC) FeatureMap attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads from the DUT the (0xFFFC) FeatureMap attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads from the DUT the (0xFFFC) FeatureMap attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102131,7 +111627,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given WNCV.S.F00(LF) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given WNCV.S.F00(LF) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given WNCV.S.F00(LF) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102150,7 +111650,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given  WNCV.S.F01(TL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given  WNCV.S.F01(TL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given  WNCV.S.F01(TL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102169,7 +111673,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given WNCV.S.F02(PA_LF) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given WNCV.S.F02(PA_LF) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given WNCV.S.F02(PA_LF) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102188,7 +111696,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given WNCV.S.F03(ABS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given WNCV.S.F03(ABS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given WNCV.S.F03(ABS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102207,7 +111719,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given WNCV.S.F04(PA_TL) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given WNCV.S.F04(PA_TL) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given WNCV.S.F04(PA_TL) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102226,7 +111742,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102257,7 +111777,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads from the DUT the (0xFFFB) AttributeList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102287,7 +111811,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(SafetyStatus) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(SafetyStatus) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(SafetyStatus) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102308,7 +111836,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 & WNCV.S.F03) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 & WNCV.S.F03) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 & WNCV.S.F03) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102330,7 +111862,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 ) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 ) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the Feature dependent(WNCV.S.F00 & WNCV.S.F02 ) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102352,7 +111888,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 & WNCV.S.F03) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 & WNCV.S.F03) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 & WNCV.S.F03) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102374,7 +111914,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 ) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 ) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: Read the Feature dependent(WNCV.S.F01 & WNCV.S.F04 ) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102396,7 +111940,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102419,7 +111967,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads Feature dependent(WNCV.S.F00 & WNCV.S.F02) command in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads Feature dependent(WNCV.S.F00 & WNCV.S.F02) command in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads Feature dependent(WNCV.S.F00 & WNCV.S.F02) command in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102440,7 +111992,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F03) command in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F03) command in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F03) command in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102461,7 +112017,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F04) command in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F04) command in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: TH reads Feature dependent(WNCV.S.F01 & WNCV.S.F04) command in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102482,7 +112042,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102865,7 +112429,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: read the RO mandatory attribute default: Type Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: read the RO mandatory attribute default: Type: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: read the RO mandatory attribute default: Type: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102887,7 +112455,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: read the RO mandatory attribute default: ConfigStatus Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: read the RO mandatory attribute default: ConfigStatus: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: read the RO mandatory attribute default: ConfigStatus: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102909,7 +112481,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: read the RO mandatory attribute default: OperationalStatus Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: read the RO mandatory attribute default: OperationalStatus: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: read the RO mandatory attribute default: OperationalStatus: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102931,7 +112507,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEndProductTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: read the RO mandatory attribute default: EndProductType Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: read the RO mandatory attribute default: EndProductType: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: read the RO mandatory attribute default: EndProductType: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102953,7 +112533,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: read the RW mandatory attribute default: Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: read the RW mandatory attribute default: Mode: Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: read the RW mandatory attribute default: Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102978,7 +112562,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1f: write a value into the RW mandatory attribute:: Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1f: write a value into the RW mandatory attribute:: Mode: Error: %@", err);
+            } else {
+                NSLog(@"Step 1f: write a value into the RW mandatory attribute:: Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102996,7 +112584,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2a: read the RO optional attribute default: TargetPositionLiftPercent100ths Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: read the RO optional attribute default: TargetPositionLiftPercent100ths: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: read the RO optional attribute default: TargetPositionLiftPercent100ths: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103021,7 +112613,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: read the RO optional attribute default: TargetPositionTiltPercent100ths Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: read the RO optional attribute default: TargetPositionTiltPercent100ths: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: read the RO optional attribute default: TargetPositionTiltPercent100ths: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103046,7 +112642,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103071,7 +112671,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103097,7 +112701,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInstalledOpenLimitLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: read the RO optional attribute default: InstalledOpenLimitLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: read the RO optional attribute default: InstalledOpenLimitLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: read the RO optional attribute default: InstalledOpenLimitLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103123,7 +112731,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInstalledClosedLimitLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: read the RO optional attribute default: InstalledClosedLimitLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: read the RO optional attribute default: InstalledClosedLimitLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: read the RO optional attribute default: InstalledClosedLimitLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103149,7 +112761,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInstalledOpenLimitTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2g: read the RO optional attribute default: InstalledOpenLimitTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2g: read the RO optional attribute default: InstalledOpenLimitTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 2g: read the RO optional attribute default: InstalledOpenLimitTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103175,7 +112791,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInstalledClosedLimitTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2h: read the RO optional attribute default: InstalledClosedLimitTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2h: read the RO optional attribute default: InstalledClosedLimitTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 2h: read the RO optional attribute default: InstalledClosedLimitTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103200,7 +112820,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSafetyStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: read the RO mandatory attribute default: SafetyStatus Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: read the RO mandatory attribute default: SafetyStatus: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: read the RO mandatory attribute default: SafetyStatus: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103222,7 +112846,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhysicalClosedLimitLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: read the RO optional attribute default: PhysicalClosedLimitLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: read the RO optional attribute default: PhysicalClosedLimitLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: read the RO optional attribute default: PhysicalClosedLimitLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103244,7 +112872,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhysicalClosedLimitTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: read the RO optional attribute default: PhysicalClosedLimitTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: read the RO optional attribute default: PhysicalClosedLimitTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: read the RO optional attribute default: PhysicalClosedLimitTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103266,7 +112898,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103291,7 +112927,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: read the RO optional attribute default: CurrentPositionLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103316,7 +112956,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103341,7 +112985,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: read the RO optional attribute default: CurrentPositionTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103366,7 +113014,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfActuationsLiftWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: read the RO optional attribute default: NumberOfActuationsLift Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: read the RO optional attribute default: NumberOfActuationsLift: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: read the RO optional attribute default: NumberOfActuationsLift: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103388,7 +113040,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfActuationsTiltWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: read the RO optional attribute default: NumberOfActuationsTilt Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: read the RO optional attribute default: NumberOfActuationsTilt: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: read the RO optional attribute default: NumberOfActuationsTilt: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103410,7 +113066,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: read the RO optional attribute default: CurrentPositionLiftPercentage Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: read the RO optional attribute default: CurrentPositionLiftPercentage: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: read the RO optional attribute default: CurrentPositionLiftPercentage: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103435,7 +113095,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i:read the RO optional attribute default: CurrentPositionTiltPercentage Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i:read the RO optional attribute default: CurrentPositionTiltPercentage: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i:read the RO optional attribute default: CurrentPositionTiltPercentage: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103599,7 +113263,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103618,7 +113286,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: Reads ConfigStatus attribute from DUT, if (WNCV.S.F00(LF) & WNCV.S.F02(PA_LF)) value of bit 3 must be 1b else 0b: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103637,7 +113309,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b, Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b,: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b,: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103656,7 +113332,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b, Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b,: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: Reads ConfigStatus attribute from DUT, if (WNCV.S.F01(TL) & WNCV.S.F04(PA_TL)) value of bit 4 must be 1b else 0b,: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103675,7 +113355,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: Reads ConfigStatus attribute from DUT, value of bit 0 must be 1b (operational) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: Reads ConfigStatus attribute from DUT, value of bit 0 must be 1b (operational): Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: Reads ConfigStatus attribute from DUT, value of bit 0 must be 1b (operational): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103968,7 +113652,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH set the Mode Attribute bit0 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH set the Mode Attribute bit0 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH set the Mode Attribute bit0 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -103986,7 +113674,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104010,7 +113702,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1c: TH clear the Mode Attribute bit0 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: TH clear the Mode Attribute bit0 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: TH clear the Mode Attribute bit0 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104028,7 +113724,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104052,7 +113752,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2a: TH set the Mode Attribute bit1 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2a: TH set the Mode Attribute bit1 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2a: TH set the Mode Attribute bit1 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104071,7 +113775,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2b: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2b: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2b: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104096,7 +113804,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                          NextTest();
@@ -104116,7 +113828,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 2d: TH clear the Mode Attribute bit1 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: TH clear the Mode Attribute bit1 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: TH clear the Mode Attribute bit1 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104134,7 +113850,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104155,7 +113875,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2f: TH reads the Mode Attribute from the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2f: TH reads the Mode Attribute from the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2f: TH reads the Mode Attribute from the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104177,7 +113901,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2g: TH send DownOrClose command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2g: TH send DownOrClose command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2g: TH send DownOrClose command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104198,7 +113926,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:4U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH set the Mode Attribute bit2 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH set the Mode Attribute bit2 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH set the Mode Attribute bit2 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104217,7 +113949,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3b: TH send DownOrClose command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3b: TH send DownOrClose command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3b: TH send DownOrClose command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_BUSY));
                          NextTest();
@@ -104235,7 +113971,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104262,7 +114002,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         modeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeModeWithValue:modeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3d: TH clear the Mode Attribute bit2 of the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: TH clear the Mode Attribute bit2 of the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: TH clear the Mode Attribute bit2 of the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104281,7 +114025,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 3e: TH send DownOrClose command to the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 3e: TH send DownOrClose command to the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 3e: TH send DownOrClose command to the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104299,7 +114047,11 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConfigStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: TH reads ConfigStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: TH reads ConfigStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: TH reads ConfigStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104415,7 +114167,11 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEndProductTypeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads EndProductType attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads EndProductType attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads EndProductType attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104816,7 +114572,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104842,7 +114602,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104867,7 +114631,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104892,7 +114660,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104917,7 +114689,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104943,7 +114719,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends UpOrOpen command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends UpOrOpen command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends UpOrOpen command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104969,7 +114749,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104993,7 +114777,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105026,7 +114814,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105052,7 +114844,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         bitmap8Argument =
             [OperationalStatusValue copy];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105070,7 +114866,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105094,7 +114894,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a4: TH check OperationalStatus value bit 2..3 (WNCV.S.F00(LF)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a4: TH check OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a4: TH check OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105118,7 +114922,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105142,7 +114950,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a6: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a6: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a6: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105174,7 +114986,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105199,7 +115015,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105224,7 +115044,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105249,7 +115073,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105275,7 +115103,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster stopMotionWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4a: TH sends a StopMotion command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4a: TH sends a StopMotion command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4a: TH sends a StopMotion command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105301,7 +115133,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105332,7 +115168,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105357,7 +115197,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105761,7 +115605,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105787,7 +115635,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105812,7 +115664,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105837,7 +115693,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105862,7 +115722,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105888,7 +115752,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends DownOrClose command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends DownOrClose command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends DownOrClose command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105914,7 +115782,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105938,7 +115810,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105971,7 +115847,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a1: TH reads OperationalStatus attribute's bit 0..1: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105997,7 +115877,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         bitmap8Argument =
             [OperationalStatusValue copy];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps.: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a2: Write attribute BITMAP8 with OperationalStatusValue to do the bits checks in upcoming OperationalStatus read steps.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106015,7 +115899,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a3: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106039,7 +115927,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a4: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a4: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a4: TH checks OperationalStatus value bit 2..3 (WNCV.S.F00(LF)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106063,7 +115955,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a5: TH checks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106087,7 +115983,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a6: TH chesks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a6: TH chesks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a6: TH chesks OperationalStatus value bit 4..5 (WNCV.S.F01(TL)): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106119,7 +116019,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106144,7 +116048,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106169,7 +116077,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106194,7 +116106,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106220,7 +116136,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         [cluster stopMotionWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 4a: TH sends a StopMotion command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 4a: TH sends a StopMotion command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 4a: TH sends a StopMotion command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106246,7 +116166,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106277,7 +116201,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106302,7 +116230,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106571,7 +116503,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106598,7 +116534,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106624,7 +116564,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106656,7 +116600,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
 
         test_Test_TC_WNCV_3_3_OperationalStatus_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Step 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Step 2: Subscribe to DUT reports on OperationalStatus attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Step 2: Subscribe to DUT reports on OperationalStatus attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106686,7 +116634,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Step 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Step 2: Subscribe to DUT reports on OperationalStatus attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Step 2: Subscribe to DUT reports on OperationalStatus attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_Test_TC_WNCV_3_3_OperationalStatus_Reported
@@ -106710,7 +116662,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
 
         [cluster stopMotionWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends a StopMotion command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends a StopMotion command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends a StopMotion command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106736,7 +116692,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT after a StopMotion Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT after a StopMotion: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT after a StopMotion: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106767,7 +116727,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2e: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2e: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2e: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106791,7 +116755,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106818,7 +116786,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal with CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal with CurrentPositionLiftPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal with CurrentPositionLiftPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106847,7 +116819,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106874,7 +116850,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal with CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal with CurrentPositionTiltPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal with CurrentPositionTiltPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107082,7 +117062,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107109,7 +117093,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends UpOrOpen command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends UpOrOpen command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends UpOrOpen command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107135,7 +117123,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107158,7 +117150,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107182,7 +117178,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107206,7 +117206,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107230,7 +117234,11 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107434,7 +117442,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107461,7 +117473,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2a: TH sends DownOrClose command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2a: TH sends DownOrClose command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2a: TH sends DownOrClose command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107487,7 +117503,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107510,7 +117530,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107534,7 +117558,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107558,7 +117586,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107582,7 +117614,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107860,7 +117896,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107886,7 +117926,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107912,7 +117956,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2500U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2a: TH sends GoToLiftPercentage command with 25 percent to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2a: TH sends GoToLiftPercentage command with 25 percent to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2a: TH sends GoToLiftPercentage command with 25 percent to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107938,7 +117986,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107970,7 +118022,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107993,7 +118049,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108017,7 +118077,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108045,7 +118109,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:7520U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108071,7 +118139,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108103,7 +118175,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108126,7 +118202,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108150,7 +118230,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108428,7 +118512,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
 
         [cluster downOrCloseWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108454,7 +118542,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108480,7 +118572,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:3000U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2a: TH sends GoToTiltPercentage command with 30 percent to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2a: TH sends GoToTiltPercentage command with 30 percent to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2a: TH sends GoToTiltPercentage command with 30 percent to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108506,7 +118602,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108538,7 +118638,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108561,7 +118665,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108585,7 +118693,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108613,7 +118725,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:6005U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 60.05 percent to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 60.05 percent to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 60.05 percent to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108639,7 +118755,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108671,7 +118791,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5b: TH reads OperationalStatus attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108694,7 +118818,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108718,7 +118846,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108882,7 +119014,11 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108909,7 +119045,11 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108942,7 +119082,11 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:12288U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2b: TH sends GoToLiftPercentage command with BadParam to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2b: TH sends GoToLiftPercentage command with BadParam to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2b: TH sends GoToLiftPercentage command with BadParam to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -108963,7 +119107,11 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:10001U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 3a: TH sends GoToLiftPercentage command with 10001 to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 3a: TH sends GoToLiftPercentage command with 10001 to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 3a: TH sends GoToLiftPercentage command with 10001 to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -108984,7 +119132,11 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -109141,7 +119293,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109168,7 +119324,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercentageWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109201,7 +119361,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:12288U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2b: TH sends GoToTiltPercentage command with BadParam to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2b: TH sends GoToTiltPercentage command with BadParam to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2b: TH sends GoToTiltPercentage command with BadParam to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -109222,7 +119386,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:10001U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 3a: TH sends GoToTiltPercentage command with 10001 to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 3a: TH sends GoToTiltPercentage command with 10001 to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 3a: TH sends GoToTiltPercentage command with 10001 to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -109243,7 +119411,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                              NextTest();
@@ -109497,7 +119669,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
 
         [cluster upOrOpenWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0b: TH sends UpOrOpen command to preposition the DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0b: TH sends UpOrOpen command to preposition the DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0b: TH sends UpOrOpen command to preposition the DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109519,7 +119695,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:9000U];
         [cluster goToLiftPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109546,7 +119726,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
 
         [cluster stopMotionWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 1c: TH sends StopMotion command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 1c: TH sends StopMotion command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 1c: TH sends StopMotion command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109576,7 +119760,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:9000U];
         [cluster goToTiltPercentageWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109603,7 +119791,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
 
         [cluster stopMotionWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 2c: TH sends StopMotion command to DUT Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 2c: TH sends StopMotion command to DUT: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 2c: TH sends StopMotion command to DUT: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109630,7 +119822,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads CurrentPositionLiftPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads CurrentPositionLiftPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109656,7 +119852,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: TH reads CurrentPositionTiltPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: TH reads CurrentPositionTiltPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109706,7 +119906,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: TH reads CurrentPositionLiftPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: TH reads CurrentPositionLiftPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109734,7 +119938,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: TH reads CurrentPositionTiltPercent100ths from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: TH reads CurrentPositionTiltPercent100ths from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109867,7 +120075,11 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTargetListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Target Navigator list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Target Navigator list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Target Navigator list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109894,7 +120106,11 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentTargetWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current navigator target Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute current navigator target: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute current navigator target: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109922,7 +120138,11 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         params.data = @"1";
         [cluster navigateTargetWithParams:params completion:
                                                      ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                         NSLog(@"Navigate Target Request Command Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Navigate Target Request Command: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Navigate Target Request Command: Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110069,7 +120289,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOutputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Audio Output list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Audio Output list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Audio Output list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110101,7 +120325,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentOutputWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current audio output Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute current audio output: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute current audio output: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110128,7 +120356,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster selectOutputWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Select Output Command Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Select Output Command: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Select Output Command: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110151,7 +120383,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
         params.name = @"HDMI Test";
         [cluster renameOutputWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Rename Output Command Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Rename Output Command: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Rename Output Command: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110169,7 +120405,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOutputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Audio Output list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Audio Output list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Audio Output list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110320,7 +120560,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCatalogListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Application Launcher list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Application Launcher list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Application Launcher list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110345,7 +120589,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentAppWithCompletion:^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application launcher app Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application launcher app: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application launcher app: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110377,7 +120625,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"data" length:4];
         [cluster launchAppWithParams:params completion:
                                                 ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Launch App Command Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Launch App Command: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Launch App Command: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110412,7 +120664,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
 
         [cluster stopAppWithParams:params completion:
                                               ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Stop App Command Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Stop App Command: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Stop App Command: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110447,7 +120703,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
 
         [cluster hideAppWithParams:params completion:
                                               ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Hide App Command Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Hide App Command: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Hide App Command: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110570,7 +120830,11 @@ class TV_KeypadInputCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:3U];
         [cluster sendKeyWithParams:params completion:
                                               ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Send Key Command Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Send Key Command: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Send Key Command: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110701,7 +120965,11 @@ class TV_AccountLoginCluster : public TestCommandBridge {
         params.tempAccountIdentifier = @"asdf";
         [cluster getSetupPINWithParams:params completion:
                                                   ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Get Setup PIN Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Get Setup PIN Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Get Setup PIN Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110728,7 +120996,11 @@ class TV_AccountLoginCluster : public TestCommandBridge {
         params.setupPIN = @"tempPin123";
         [cluster loginWithParams:params completion:
                                             ^(NSError * _Nullable err) {
-                                                NSLog(@"Login Command Error: %@", err);
+                                                if (err != nil) {
+                                                    NSLog(@"Login Command: Error: %@", err);
+                                                } else {
+                                                    NSLog(@"Login Command: Success");
+                                                }
 
                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110747,7 +121019,11 @@ class TV_AccountLoginCluster : public TestCommandBridge {
 
         [cluster logoutWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Logout Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Logout Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Logout Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -110856,7 +121132,11 @@ class TV_WakeOnLanCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMACAddressWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read mac address Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read mac address: Error: %@", err);
+            } else {
+                NSLog(@"Read mac address: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111015,7 +121295,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor name Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor name: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor name: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111038,7 +121322,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor id: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111061,7 +121349,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application name Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application name: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application name: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111084,7 +121376,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeProductIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute product id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute product id: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute product id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111107,7 +121403,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application status Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application status: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application status: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111130,7 +121430,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationWithCompletion:^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application status Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application status: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application status: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111154,7 +121458,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeApplicationVersionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application version Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application version: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application version: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111177,7 +121485,11 @@ class TV_ApplicationBasicCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAllowedVendorListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application allowed vendor list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute application allowed vendor list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute application allowed vendor list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111433,7 +121745,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute playback state Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute playback state: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute playback state: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111456,7 +121772,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute start time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute start time: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute start time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111480,7 +121800,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute duration Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute duration: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute duration: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111504,7 +121828,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute position: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute position: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111530,7 +121858,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePlaybackSpeedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute playback speed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute playback speed: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute playback speed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111553,7 +121885,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSeekRangeEndWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute seek range end Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute seek range end: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute seek range end: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111577,7 +121913,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSeekRangeStartWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute seek range start Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute seek range start: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute seek range start: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111602,7 +121942,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster playWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Play Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Play Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Play Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111631,7 +121975,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Pause Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Pause Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Pause Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111660,7 +122008,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster stopWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Stop Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Stop Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Stop Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111689,7 +122041,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster startOverWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Start Over Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Start Over Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Start Over Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111718,7 +122074,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster previousWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Previous Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Previous Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Previous Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111747,7 +122107,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster nextWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Next Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Next Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Next Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111776,7 +122140,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster rewindWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Rewind Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Rewind Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Rewind Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111805,7 +122173,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
 
         [cluster fastForwardWithCompletion:
                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Media Playback Fast Forward Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Media Playback Fast Forward Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Media Playback Fast Forward Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111837,7 +122209,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:500ULL];
         [cluster skipForwardWithParams:params completion:
                                                   ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Media Playback Skip Forward Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Media Playback Skip Forward Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Media Playback Skip Forward Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111865,7 +122241,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after skip forward Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute position after skip forward: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute position after skip forward: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111895,7 +122275,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:100ULL];
         [cluster skipBackwardWithParams:params completion:
                                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Media Playback Skip Backward Command Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Media Playback Skip Backward Command: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Media Playback Skip Backward Command: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111923,7 +122307,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after skip backward Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute position after skip backward: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute position after skip backward: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111953,7 +122341,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:1000ULL];
         [cluster seekWithParams:params completion:
                                            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                                               NSLog(@"Media Playback Seek Command Error: %@", err);
+                                               if (err != nil) {
+                                                   NSLog(@"Media Playback Seek Command: Error: %@", err);
+                                               } else {
+                                                   NSLog(@"Media Playback Seek Command: Success");
+                                               }
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -111981,7 +122373,11 @@ class TV_MediaPlaybackCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSampledPositionWithCompletion:^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after seek Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute position after seek: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute position after seek: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112504,7 +122900,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Channel list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Channel list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Channel list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112547,7 +122947,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute channel lineup Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute channel lineup: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute channel lineup: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112574,7 +122978,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute current channel: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112605,7 +123013,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         params.match = @"PBS";
         [cluster changeChannelWithParams:params completion:
                                                     ^(MTRChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Change Channel Command Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Change Channel Command: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Change Channel Command: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112639,7 +123051,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Change Channel By Number Command Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Change Channel By Number Command: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Change Channel By Number Command: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112661,7 +123077,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:2];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Skip Channel Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Skip Channel Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Skip Channel Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112679,7 +123099,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112711,7 +123135,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:123];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Skip Channel Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Skip Channel Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Skip Channel Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112729,7 +123157,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112763,7 +123195,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 1.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 1.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112785,7 +123221,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:1];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 1.2 - Skip Up By 1 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 1.2 - Skip Up By 1: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 1.2 - Skip Up By 1: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112803,7 +123243,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112837,7 +123281,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 2.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 2.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 2.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112859,7 +123307,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:2];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 2.2 - Skip Up By 2 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 2.2 - Skip Up By 2: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 2.2 - Skip Up By 2: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112877,7 +123329,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112911,7 +123367,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 3.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 3.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 3.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112933,7 +123393,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:3];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 3.2 - Skip Up By 3 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 3.2 - Skip Up By 3: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 3.2 - Skip Up By 3: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112951,7 +123415,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -112985,7 +123453,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 4.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 4.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 4.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113007,7 +123479,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:4];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 4.2 - Skip Up By 4 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 4.2 - Skip Up By 4: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 4.2 - Skip Up By 4: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113025,7 +123501,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113057,7 +123537,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:5];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 5.2 - Skip Up By 5 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 5.2 - Skip Up By 5: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 5.2 - Skip Up By 5: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113075,7 +123559,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113109,7 +123597,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 6.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 6.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 6.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113131,7 +123623,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:6];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 6.2 - Skip Up By 6 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 6.2 - Skip Up By 6: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 6.2 - Skip Up By 6: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113149,7 +123645,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113183,7 +123683,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 7.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 7.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 7.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113205,7 +123709,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:7];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 7.2 - Skip Up By 7 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 7.2 - Skip Up By 7: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 7.2 - Skip Up By 7: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113223,7 +123731,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113257,7 +123769,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 8.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 8.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 8.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113279,7 +123795,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:8];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 8.2 - Skip Up By 8 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 8.2 - Skip Up By 8: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 8.2 - Skip Up By 8: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113297,7 +123817,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113329,7 +123853,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-1];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 1.2 - Skip Down By 1 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 1.2 - Skip Down By 1: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 1.2 - Skip Down By 1: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113347,7 +123875,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113381,7 +123913,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 2.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 2.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 2.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113403,7 +123939,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-2];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 2.2 - Skip Down By 2 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 2.2 - Skip Down By 2: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 2.2 - Skip Down By 2: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113421,7 +123961,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113455,7 +123999,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 3.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 3.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 3.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113477,7 +124025,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-3];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 3.2 - Skip Down By 3 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 3.2 - Skip Down By 3: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 3.2 - Skip Down By 3: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113495,7 +124047,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113529,7 +124085,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 4.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 4.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 4.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113551,7 +124111,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-4];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 4.2 - Skip Down By 4 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 4.2 - Skip Down By 4: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 4.2 - Skip Down By 4: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113569,7 +124133,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113601,7 +124169,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-5];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 5.2 - Skip Down By 5 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 5.2 - Skip Down By 5: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 5.2 - Skip Down By 5: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113619,7 +124191,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113653,7 +124229,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 6.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 6.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 6.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113675,7 +124255,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-6];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 6.2 - Skip Down By 6 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 6.2 - Skip Down By 6: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 6.2 - Skip Down By 6: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113693,7 +124277,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113727,7 +124315,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 7.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 7.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 7.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113749,7 +124341,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-7];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 7.2 - Skip Down By 7 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 7.2 - Skip Down By 7: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 7.2 - Skip Down By 7: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113767,7 +124363,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113801,7 +124401,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 8.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 8.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 8.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113823,7 +124427,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-8];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 8.2 - Skip Down By 8 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 8.2 - Skip Down By 8: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 8.2 - Skip Down By 8: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113841,7 +124449,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113873,7 +124485,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:32767];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 1.2 - Skip Up By 32,767 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 1.2 - Skip Up By 32,767: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 1.2 - Skip Up By 32,767: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113891,7 +124507,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113925,7 +124545,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster changeChannelByNumberWithParams:params completion:
                                                             ^(NSError * _Nullable err) {
-                                                                NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err);
+                                                                if (err != nil) {
+                                                                    NSLog(@"Test 1.1 - Start from Channel 3: Error: %@", err);
+                                                                } else {
+                                                                    NSLog(@"Test 1.1 - Start from Channel 3: Success");
+                                                                }
 
                                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113947,7 +124571,11 @@ class TV_ChannelCluster : public TestCommandBridge {
             [NSNumber numberWithShort:-32768];
         [cluster skipChannelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Test 1.2 - Skip Down By 32,768 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Test 1.2 - Skip Down By 32,768: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Test 1.2 - Skip Down By 32,768: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -113965,7 +124593,11 @@ class TV_ChannelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Error: %@", err);
+            } else {
+                NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114085,7 +124717,11 @@ class TV_LowPowerCluster : public TestCommandBridge {
 
         [cluster sleepWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Sleep Input Status Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Sleep Input Status Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Sleep Input Status Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114215,7 +124851,11 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptHeaderWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute accept header list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute accept header list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute accept header list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114240,7 +124880,11 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedStreamingProtocolsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute supported streaming protocols Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute supported streaming protocols: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute supported streaming protocols: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114287,7 +124931,11 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
         params.data = @"exampleData";
         [cluster launchContentWithParams:params completion:
                                                     ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Launch Content Command Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Launch Content Command: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Launch Content Command: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114376,7 +125024,11 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
 
         [cluster launchURLWithParams:params completion:
                                                 ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Launch URL Command Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Launch URL Command: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Launch URL Command: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114537,7 +125189,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute media input list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute media input list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute media input list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114568,7 +125224,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentInputWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current media input Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current media input: Error: %@", err);
+            } else {
+                NSLog(@"Read current media input: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114595,7 +125255,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster selectInputWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Select Input Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Select Input Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Select Input Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114614,7 +125278,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
 
         [cluster hideInputStatusWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Hide Input Status Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Hide Input Status Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Hide Input Status Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114633,7 +125301,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
 
         [cluster showInputStatusWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Show Input Status Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Show Input Status Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Show Input Status Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114656,7 +125328,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
         params.name = @"HDMI Test";
         [cluster renameInputWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Rename Input Command Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Rename Input Command: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Rename Input Command: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114674,7 +125350,11 @@ class TV_MediaInputCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInputListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute media input list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute media input list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute media input list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114831,7 +125511,11 @@ class TestCASERecovery : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDataModelRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read an attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read an attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read an attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -114871,7 +125555,11 @@ class TestCASERecovery : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDataModelRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read an attribute again Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read an attribute again: Error: %@", err);
+            } else {
+                NSLog(@"Read an attribute again: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
@@ -114898,7 +125586,11 @@ class TestCASERecovery : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDataModelRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read an attribute a third time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read an attribute a third time: Error: %@", err);
+            } else {
+                NSLog(@"Read an attribute a third time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118443,7 +129135,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Test Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Test Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Test Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118462,7 +129158,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testNotHandledWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Test Not Handled Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Test Not Handled Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Test Not Handled Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                          NextTest();
@@ -118480,7 +129180,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testSpecificWithCompletion:
                      ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Send Test Specific Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Test Specific Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Test Specific Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118509,7 +129213,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:17U];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118538,7 +129246,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:6U];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send failing Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send failing Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send failing Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                            NextTest();
@@ -118555,7 +129267,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118581,7 +129297,11 @@ class TestCluster : public TestCommandBridge {
         booleanArgument =
             [NSNumber numberWithBool:1];
         [cluster writeAttributeBooleanWithValue:booleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BOOLEAN True Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BOOLEAN True: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BOOLEAN True: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118599,7 +129319,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN True Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN True: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN True: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118625,7 +129349,11 @@ class TestCluster : public TestCommandBridge {
         booleanArgument =
             [NSNumber numberWithBool:0];
         [cluster writeAttributeBooleanWithValue:booleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BOOLEAN False Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BOOLEAN False: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BOOLEAN False: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118643,7 +129371,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN False Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN False: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN False: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118666,7 +129398,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118692,7 +129428,11 @@ class TestCluster : public TestCommandBridge {
         bitmap8Argument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118710,7 +129450,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118736,7 +129480,11 @@ class TestCluster : public TestCommandBridge {
         bitmap8Argument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118754,7 +129502,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118777,7 +129529,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118803,7 +129559,11 @@ class TestCluster : public TestCommandBridge {
         bitmap16Argument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeBitmap16WithValue:bitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118821,7 +129581,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118847,7 +129611,11 @@ class TestCluster : public TestCommandBridge {
         bitmap16Argument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeBitmap16WithValue:bitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118865,7 +129633,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118888,7 +129660,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118914,7 +129690,11 @@ class TestCluster : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:4294967295UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118932,7 +129712,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118958,7 +129742,11 @@ class TestCluster : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118976,7 +129764,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -118999,7 +129791,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119025,7 +129821,11 @@ class TestCluster : public TestCommandBridge {
         bitmap64Argument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551615ULL];
         [cluster writeAttributeBitmap64WithValue:bitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP64 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP64 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP64 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119043,7 +129843,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119069,7 +129873,11 @@ class TestCluster : public TestCommandBridge {
         bitmap64Argument =
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster writeAttributeBitmap64WithValue:bitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP64 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP64 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP64 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119087,7 +129895,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119110,7 +129922,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119136,7 +129952,11 @@ class TestCluster : public TestCommandBridge {
         int8uArgument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeInt8uWithValue:int8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119154,7 +129974,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119180,7 +130004,11 @@ class TestCluster : public TestCommandBridge {
         int8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeInt8uWithValue:int8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119198,7 +130026,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119221,7 +130053,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119247,7 +130083,11 @@ class TestCluster : public TestCommandBridge {
         int16uArgument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeInt16uWithValue:int16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119265,7 +130105,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119291,7 +130135,11 @@ class TestCluster : public TestCommandBridge {
         int16uArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeInt16uWithValue:int16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119309,7 +130157,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119332,7 +130184,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119358,7 +130214,11 @@ class TestCluster : public TestCommandBridge {
         int32uArgument =
             [NSNumber numberWithUnsignedInt:4294967295UL];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119376,7 +130236,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119402,7 +130266,11 @@ class TestCluster : public TestCommandBridge {
         int32uArgument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119420,7 +130288,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119443,7 +130315,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119469,7 +130345,11 @@ class TestCluster : public TestCommandBridge {
         int64uArgument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551615ULL];
         [cluster writeAttributeInt64uWithValue:int64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119487,7 +130367,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119513,7 +130397,11 @@ class TestCluster : public TestCommandBridge {
         int64uArgument =
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster writeAttributeInt64uWithValue:int64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119531,7 +130419,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119554,7 +130446,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119580,7 +130476,11 @@ class TestCluster : public TestCommandBridge {
         int8sArgument =
             [NSNumber numberWithChar:127];
         [cluster writeAttributeInt8sWithValue:int8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119598,7 +130498,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119624,7 +130528,11 @@ class TestCluster : public TestCommandBridge {
         int8sArgument =
             [NSNumber numberWithChar:-128];
         [cluster writeAttributeInt8sWithValue:int8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119642,7 +130550,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119668,7 +130580,11 @@ class TestCluster : public TestCommandBridge {
         int8sArgument =
             [NSNumber numberWithChar:0];
         [cluster writeAttributeInt8sWithValue:int8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119686,7 +130602,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119709,7 +130629,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119735,7 +130659,11 @@ class TestCluster : public TestCommandBridge {
         int16sArgument =
             [NSNumber numberWithShort:32767];
         [cluster writeAttributeInt16sWithValue:int16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119753,7 +130681,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119779,7 +130711,11 @@ class TestCluster : public TestCommandBridge {
         int16sArgument =
             [NSNumber numberWithShort:-32768];
         [cluster writeAttributeInt16sWithValue:int16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119797,7 +130733,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119823,7 +130763,11 @@ class TestCluster : public TestCommandBridge {
         int16sArgument =
             [NSNumber numberWithShort:0];
         [cluster writeAttributeInt16sWithValue:int16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119841,7 +130785,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119864,7 +130812,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119890,7 +130842,11 @@ class TestCluster : public TestCommandBridge {
         int32sArgument =
             [NSNumber numberWithInt:2147483647L];
         [cluster writeAttributeInt32sWithValue:int32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119908,7 +130864,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119934,7 +130894,11 @@ class TestCluster : public TestCommandBridge {
         int32sArgument =
             [NSNumber numberWithInt:-2147483648L];
         [cluster writeAttributeInt32sWithValue:int32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119952,7 +130916,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119978,7 +130946,11 @@ class TestCluster : public TestCommandBridge {
         int32sArgument =
             [NSNumber numberWithInt:0L];
         [cluster writeAttributeInt32sWithValue:int32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -119996,7 +130968,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120019,7 +130995,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120045,7 +131025,11 @@ class TestCluster : public TestCommandBridge {
         int64sArgument =
             [NSNumber numberWithLongLong:9223372036854775807LL];
         [cluster writeAttributeInt64sWithValue:int64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120063,7 +131047,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120089,7 +131077,11 @@ class TestCluster : public TestCommandBridge {
         int64sArgument =
             [NSNumber numberWithLongLong:-9223372036854775807LL];
         [cluster writeAttributeInt64sWithValue:int64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120107,7 +131099,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120133,7 +131129,11 @@ class TestCluster : public TestCommandBridge {
         int64sArgument =
             [NSNumber numberWithLongLong:0LL];
         [cluster writeAttributeInt64sWithValue:int64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120151,7 +131151,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120174,7 +131178,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute SINGLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute SINGLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute SINGLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120200,7 +131208,11 @@ class TestCluster : public TestCommandBridge {
         floatSingleArgument =
             [NSNumber numberWithFloat:0.1f];
         [cluster writeAttributeFloatSingleWithValue:floatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute SINGLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute SINGLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute SINGLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120218,7 +131230,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute SINGLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute SINGLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute SINGLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120244,7 +131260,11 @@ class TestCluster : public TestCommandBridge {
         floatSingleArgument =
             [NSNumber numberWithFloat:17000000000.0f];
         [cluster writeAttributeFloatSingleWithValue:floatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute SINGLE large Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute SINGLE large Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute SINGLE large Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120262,7 +131282,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute SINGLE large Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute SINGLE large Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute SINGLE large Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120288,7 +131312,11 @@ class TestCluster : public TestCommandBridge {
         floatSingleArgument =
             [NSNumber numberWithFloat:1.7e-10f];
         [cluster writeAttributeFloatSingleWithValue:floatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute SINGLE small Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute SINGLE small Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute SINGLE small Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120306,7 +131334,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute SINGLE small Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute SINGLE small Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute SINGLE small Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120332,7 +131364,11 @@ class TestCluster : public TestCommandBridge {
         floatSingleArgument =
             [NSNumber numberWithFloat:0.0f];
         [cluster writeAttributeFloatSingleWithValue:floatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute SINGLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute SINGLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute SINGLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120350,7 +131386,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute SINGLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute SINGLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute SINGLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120373,7 +131413,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute DOUBLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute DOUBLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute DOUBLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120399,7 +131443,11 @@ class TestCluster : public TestCommandBridge {
         floatDoubleArgument =
             [NSNumber numberWithDouble:0.1234567890123];
         [cluster writeAttributeFloatDoubleWithValue:floatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute DOUBLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute DOUBLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute DOUBLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120417,7 +131465,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute DOUBLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute DOUBLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute DOUBLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120443,7 +131495,11 @@ class TestCluster : public TestCommandBridge {
         floatDoubleArgument =
             [NSNumber numberWithDouble:1.7e+200];
         [cluster writeAttributeFloatDoubleWithValue:floatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute DOUBLE large Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute DOUBLE large Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute DOUBLE large Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120461,7 +131517,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute DOUBLE large Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute DOUBLE large Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute DOUBLE large Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120487,7 +131547,11 @@ class TestCluster : public TestCommandBridge {
         floatDoubleArgument =
             [NSNumber numberWithDouble:1.7e-200];
         [cluster writeAttributeFloatDoubleWithValue:floatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute DOUBLE small Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute DOUBLE small Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute DOUBLE small Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120505,7 +131569,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute DOUBLE small Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute DOUBLE small Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute DOUBLE small Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120531,7 +131599,11 @@ class TestCluster : public TestCommandBridge {
         floatDoubleArgument =
             [NSNumber numberWithDouble:0];
         [cluster writeAttributeFloatDoubleWithValue:floatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute DOUBLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute DOUBLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute DOUBLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120549,7 +131621,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute DOUBLE Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute DOUBLE Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute DOUBLE Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120572,7 +131648,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120598,7 +131678,11 @@ class TestCluster : public TestCommandBridge {
         enum8Argument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeEnum8WithValue:enum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120616,7 +131700,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120642,7 +131730,11 @@ class TestCluster : public TestCommandBridge {
         enum8Argument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeEnum8WithValue:enum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120660,7 +131752,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120683,7 +131779,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120709,7 +131809,11 @@ class TestCluster : public TestCommandBridge {
         enum16Argument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeEnum16WithValue:enum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120727,7 +131831,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120753,7 +131861,11 @@ class TestCluster : public TestCommandBridge {
         enum16Argument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeEnum16WithValue:enum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120771,7 +131883,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120794,7 +131910,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120820,7 +131940,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"Tes\000ti\000ng" length:9];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING with embedded null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING with embedded null: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING with embedded null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120838,7 +131962,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING with embedded null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING with embedded null: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING with embedded null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120864,7 +131992,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"\x00\x01\x02\x03\x04\x05" length:6];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING with hex: format Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING with hex: format: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING with hex: format: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120882,7 +132014,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING with hex: format Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING with hex: format: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING with hex: format: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120908,7 +132044,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"\015\012\377\042\240" length:5];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING with weird chars Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING with weird chars: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING with weird chars: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120926,7 +132066,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING with weird chars Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING with weird chars: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING with weird chars: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120952,7 +132096,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"TestValue" length:9];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120970,7 +132118,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -120996,7 +132148,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"TestValueLongerThan10" length:21];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -121013,7 +132169,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121039,7 +132199,11 @@ class TestCluster : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"" length:0];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121057,7 +132221,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLongOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LONG_OCTET_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LONG_OCTET_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LONG_OCTET_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121083,7 +132251,11 @@ class TestCluster : public TestCommandBridge {
         longOctetStringArgument =
             [[NSData alloc] initWithBytes:"111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" length:300];
         [cluster writeAttributeLongOctetStringWithValue:longOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LONG_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LONG_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LONG_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121101,7 +132273,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLongOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LONG_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LONG_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LONG_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121127,7 +132303,11 @@ class TestCluster : public TestCommandBridge {
         longOctetStringArgument =
             [[NSData alloc] initWithBytes:"" length:0];
         [cluster writeAttributeLongOctetStringWithValue:longOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LONG_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LONG_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LONG_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121145,7 +132325,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121170,7 +132354,11 @@ class TestCluster : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"☉T☉";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121188,7 +132376,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121213,7 +132405,11 @@ class TestCluster : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"☉TestValueLongerThan10☉";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING - Value too long Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING - Value too long: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING - Value too long: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -121230,7 +132426,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121255,7 +132455,11 @@ class TestCluster : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING - Empty Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING - Empty: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING - Empty: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121273,7 +132477,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLongCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LONG_CHAR_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LONG_CHAR_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LONG_CHAR_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121298,7 +132506,11 @@ class TestCluster : public TestCommandBridge {
         id longCharStringArgument;
         longCharStringArgument = @"☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉☉";
         [cluster writeAttributeLongCharStringWithValue:longCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LONG_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LONG_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LONG_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121316,7 +132528,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLongCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LONG_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LONG_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LONG_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121341,7 +132557,11 @@ class TestCluster : public TestCommandBridge {
         id longCharStringArgument;
         longCharStringArgument = @"";
         [cluster writeAttributeLongCharStringWithValue:longCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LONG_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LONG_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LONG_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121359,7 +132579,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListLongOctetStringWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read): Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121401,7 +132625,11 @@ class TestCluster : public TestCommandBridge {
             listLongOctetStringArgument = temp_0;
         }
         [cluster writeAttributeListLongOctetStringWithValue:listLongOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write): Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121419,7 +132647,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListLongOctetStringWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read): Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST_LONG_OCTET_STRING (for chunked read): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121460,7 +132692,11 @@ class TestCluster : public TestCommandBridge {
             listLongOctetStringArgument = temp_0;
         }
         [cluster writeAttributeListLongOctetStringWithValue:listLongOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write): Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121478,7 +132714,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121504,7 +132744,11 @@ class TestCluster : public TestCommandBridge {
         epochUsArgument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551615ULL];
         [cluster writeAttributeEpochUsWithValue:epochUsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_US Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_US Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_US Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121522,7 +132766,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121548,7 +132796,11 @@ class TestCluster : public TestCommandBridge {
         epochUsArgument =
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster writeAttributeEpochUsWithValue:epochUsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_US Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_US Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_US Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121566,7 +132818,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121589,7 +132845,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121615,7 +132875,11 @@ class TestCluster : public TestCommandBridge {
         epochSArgument =
             [NSNumber numberWithUnsignedInt:4294967295UL];
         [cluster writeAttributeEpochSWithValue:epochSArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121633,7 +132897,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121659,7 +132927,11 @@ class TestCluster : public TestCommandBridge {
         epochSArgument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeEpochSWithValue:epochSArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121677,7 +132949,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121700,7 +132976,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeUnsupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute UNSUPPORTED Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute UNSUPPORTED: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute UNSUPPORTED: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE));
             NextTest();
@@ -121720,7 +133000,11 @@ class TestCluster : public TestCommandBridge {
         unsupportedArgument =
             [NSNumber numberWithBool:0];
         [cluster writeAttributeUnsupportedWithValue:unsupportedArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Writeattribute UNSUPPORTED Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Writeattribute UNSUPPORTED: Error: %@", err);
+            } else {
+                NSLog(@"Writeattribute UNSUPPORTED: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE));
             NextTest();
@@ -121738,7 +133022,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Test Command to unsupported endpoint Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Test Command to unsupported endpoint: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Test Command to unsupported endpoint: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
                          NextTest();
@@ -121756,7 +133044,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Test Command to unsupported cluster Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Test Command to unsupported cluster: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Test Command to unsupported cluster: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
                          NextTest();
@@ -121773,7 +133065,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor_id Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor_id Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor_id Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121799,7 +133095,11 @@ class TestCluster : public TestCommandBridge {
         vendorIdArgument =
             [NSNumber numberWithUnsignedShort:17U];
         [cluster writeAttributeVendorIdWithValue:vendorIdArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute vendor_id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute vendor_id: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute vendor_id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121817,7 +133117,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor_id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor_id: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor_id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121843,7 +133147,11 @@ class TestCluster : public TestCommandBridge {
         vendorIdArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeVendorIdWithValue:vendorIdArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Restore attribute vendor_id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Restore attribute vendor_id: Error: %@", err);
+            } else {
+                NSLog(@"Restore attribute vendor_id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121867,7 +133175,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster testEnumsRequestWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send a command with a vendor_id and enum Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send a command with a vendor_id and enum: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send a command with a vendor_id and enum: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121901,7 +133213,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:101U];
         [cluster testEnumsRequestWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send a command with a vendor_id and invalid enum Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send a command with a vendor_id and invalid enum: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send a command with a vendor_id and invalid enum: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                            NextTest();
@@ -121937,7 +133253,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testStructArgumentRequestWithParams:params completion:
                                                                 ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                    NSLog(@"Send Test Command With Struct Argument and arg1.b is true Error: %@", err);
+                                                                    if (err != nil) {
+                                                                        NSLog(@"Send Test Command With Struct Argument and arg1.b is true: Error: %@", err);
+                                                                    } else {
+                                                                        NSLog(@"Send Test Command With Struct Argument and arg1.b is true: Success");
+                                                                    }
 
                                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -121979,7 +133299,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testStructArgumentRequestWithParams:params completion:
                                                                 ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                    NSLog(@"Send Test Command With Struct Argument and arg1.b is false Error: %@", err);
+                                                                    if (err != nil) {
+                                                                        NSLog(@"Send Test Command With Struct Argument and arg1.b is false: Error: %@", err);
+                                                                    } else {
+                                                                        NSLog(@"Send Test Command With Struct Argument and arg1.b is false: Success");
+                                                                    }
 
                                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122026,7 +133350,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testNestedStructArgumentRequestWithParams:params completion:
                                                                       ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                          NSLog(@"Send Test Command With Nested Struct Argument and arg1.c.b is true Error: %@", err);
+                                                                          if (err != nil) {
+                                                                              NSLog(@"Send Test Command With Nested Struct Argument and arg1.c.b is true: Error: %@", err);
+                                                                          } else {
+                                                                              NSLog(@"Send Test Command With Nested Struct Argument and arg1.c.b is true: Success");
+                                                                          }
 
                                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122073,7 +133401,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testNestedStructArgumentRequestWithParams:params completion:
                                                                       ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                          NSLog(@"Send Test Command With Nested Struct Argument arg1.c.b is false Error: %@", err);
+                                                                          if (err != nil) {
+                                                                              NSLog(@"Send Test Command With Nested Struct Argument arg1.c.b is false: Error: %@", err);
+                                                                          } else {
+                                                                              NSLog(@"Send Test Command With Nested Struct Argument arg1.c.b is false: Success");
+                                                                          }
 
                                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122187,7 +133519,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testNestedStructListArgumentRequestWithParams:params completion:
                                                                           ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                              NSLog(@"Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true Error: %@", err);
+                                                                              if (err != nil) {
+                                                                                  NSLog(@"Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true: Error: %@", err);
+                                                                              } else {
+                                                                                  NSLog(@"Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true: Success");
+                                                                              }
 
                                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122301,7 +133637,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster testNestedStructListArgumentRequestWithParams:params completion:
                                                                           ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                              NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false Error: %@", err);
+                                                                              if (err != nil) {
+                                                                                  NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false: Error: %@", err);
+                                                                              } else {
+                                                                                  NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false: Success");
+                                                                              }
 
                                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122343,7 +133683,11 @@ class TestCluster : public TestCommandBridge {
 
         [cluster simpleStructEchoRequestWithParams:params completion:
                                                               ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                  NSLog(@"Send Test Command With Struct Argument and see what we get back Error: %@", err);
+                                                                  if (err != nil) {
+                                                                      NSLog(@"Send Test Command With Struct Argument and see what we get back: Error: %@", err);
+                                                                  } else {
+                                                                      NSLog(@"Send Test Command With Struct Argument and see what we get back: Success");
+                                                                  }
 
                                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122397,7 +133741,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListInt8UArgumentRequestWithParams:params completion:
                                                                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                       NSLog(@"Send Test Command With List of INT8U and none of them is set to 0 Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Send Test Command With List of INT8U and none of them is set to 0: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Send Test Command With List of INT8U and none of them is set to 0: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122446,7 +133794,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListInt8UArgumentRequestWithParams:params completion:
                                                                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                       NSLog(@"Send Test Command With List of INT8U and one of them is set to 0 Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Send Test Command With List of INT8U and one of them is set to 0: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Send Test Command With List of INT8U and one of them is set to 0: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122493,7 +133845,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListInt8UReverseRequestWithParams:params completion:
                                                                   ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                      NSLog(@"Send Test Command With List of INT8U and get it reversed Error: %@", err);
+                                                                      if (err != nil) {
+                                                                          NSLog(@"Send Test Command With List of INT8U and get it reversed: Error: %@", err);
+                                                                      } else {
+                                                                          NSLog(@"Send Test Command With List of INT8U and get it reversed: Success");
+                                                                      }
 
                                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122531,7 +133887,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListInt8UReverseRequestWithParams:params completion:
                                                                   ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                      NSLog(@"Send Test Command With empty List of INT8U and get an empty list back Error: %@", err);
+                                                                      if (err != nil) {
+                                                                          NSLog(@"Send Test Command With empty List of INT8U and get an empty list back: Error: %@", err);
+                                                                      } else {
+                                                                          NSLog(@"Send Test Command With empty List of INT8U and get an empty list back: Success");
+                                                                      }
 
                                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122594,7 +133954,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListStructArgumentRequestWithParams:params completion:
                                                                     ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                        NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is true Error: %@", err);
+                                                                        if (err != nil) {
+                                                                            NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is true: Error: %@", err);
+                                                                        } else {
+                                                                            NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is true: Success");
+                                                                        }
 
                                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122657,7 +134021,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListStructArgumentRequestWithParams:params completion:
                                                                     ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                        NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is false Error: %@", err);
+                                                                        if (err != nil) {
+                                                                            NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is false: Error: %@", err);
+                                                                        } else {
+                                                                            NSLog(@"Send Test Command With List of Struct Argument and arg1.b of first item is false: Success");
+                                                                        }
 
                                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122775,7 +134143,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListNestedStructListArgumentRequestWithParams:params completion:
                                                                               ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                                  NSLog(@"Send Test Command With List of Nested Struct List Argument and all fields b of elements of arg1.d are true Error: %@", err);
+                                                                                  if (err != nil) {
+                                                                                      NSLog(@"Send Test Command With List of Nested Struct List Argument and all fields b of elements of arg1.d are true: Error: %@", err);
+                                                                                  } else {
+                                                                                      NSLog(@"Send Test Command With List of Nested Struct List Argument and all fields b of elements of arg1.d are true: Success");
+                                                                                  }
 
                                                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122893,7 +134265,11 @@ class TestCluster : public TestCommandBridge {
         }
         [cluster testListNestedStructListArgumentRequestWithParams:params completion:
                                                                               ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                                  NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false Error: %@", err);
+                                                                                  if (err != nil) {
+                                                                                      NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false: Error: %@", err);
+                                                                                  } else {
+                                                                                      NSLog(@"Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false: Success");
+                                                                                  }
 
                                                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122929,7 +134305,11 @@ class TestCluster : public TestCommandBridge {
             listInt8uArgument = temp_0;
         }
         [cluster writeAttributeListInt8uWithValue:listInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST With List of INT8U and none of them is set to 0 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST With List of INT8U and none of them is set to 0: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST With List of INT8U and none of them is set to 0: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122947,7 +134327,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListInt8uWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST With List of INT8U Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST With List of INT8U: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST With List of INT8U: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -122987,7 +134371,11 @@ class TestCluster : public TestCommandBridge {
             listOctetStringArgument = temp_0;
         }
         [cluster writeAttributeListOctetStringWithValue:listOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST With List of OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST With List of OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST With List of OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123005,7 +134393,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListOctetStringWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST With List of OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST With List of OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST With List of OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123061,7 +134453,11 @@ class TestCluster : public TestCommandBridge {
             listStructOctetStringArgument = temp_0;
         }
         [cluster writeAttributeListStructOctetStringWithValue:listStructOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST With List of LIST_STRUCT_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST With List of LIST_STRUCT_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST With List of LIST_STRUCT_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123079,7 +134475,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListStructOctetStringWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST With List of LIST_STRUCT_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST With List of LIST_STRUCT_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST With List of LIST_STRUCT_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123114,7 +134514,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:5U];
         [cluster testNullableOptionalRequestWithParams:params completion:
                                                                   ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                      NSLog(@"Send Test Command with optional arg set. Error: %@", err);
+                                                                      if (err != nil) {
+                                                                          NSLog(@"Send Test Command with optional arg set.: Error: %@", err);
+                                                                      } else {
+                                                                          NSLog(@"Send Test Command with optional arg set.: Success");
+                                                                      }
 
                                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123155,7 +134559,11 @@ class TestCluster : public TestCommandBridge {
         __auto_type * params = [[MTRUnitTestingClusterTestNullableOptionalRequestParams alloc] init];
         [cluster testNullableOptionalRequestWithParams:params completion:
                                                                   ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                                      NSLog(@"Send Test Command without its optional arg. Error: %@", err);
+                                                                      if (err != nil) {
+                                                                          NSLog(@"Send Test Command without its optional arg.: Error: %@", err);
+                                                                      } else {
+                                                                          NSLog(@"Send Test Command without its optional arg.: Success");
+                                                                      }
 
                                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123178,7 +134586,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListNullablesAndOptionalsStructWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read list of structs containing nullables and optionals Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read list of structs containing nullables and optionals: Error: %@", err);
+            } else {
+                NSLog(@"Read list of structs containing nullables and optionals: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123223,7 +134635,11 @@ class TestCluster : public TestCommandBridge {
             listNullablesAndOptionalsStructArgument = temp_0;
         }
         [cluster writeAttributeListNullablesAndOptionalsStructWithValue:listNullablesAndOptionalsStructArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write list of structs containing nullables and optionals Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write list of structs containing nullables and optionals: Error: %@", err);
+            } else {
+                NSLog(@"Write list of structs containing nullables and optionals: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123241,7 +134657,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListNullablesAndOptionalsStructWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read list of structs containing nullables and optionals after writing Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read list of structs containing nullables and optionals after writing: Error: %@", err);
+            } else {
+                NSLog(@"Read list of structs containing nullables and optionals after writing: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123273,7 +134693,11 @@ class TestCluster : public TestCommandBridge {
         id nullableBooleanArgument;
         nullableBooleanArgument = nil;
         [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BOOLEAN null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BOOLEAN null: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BOOLEAN null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123292,7 +134716,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BOOLEAN null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN null: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123321,7 +134749,11 @@ class TestCluster : public TestCommandBridge {
         nullableBooleanArgument =
             [NSNumber numberWithBool:true];
         [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BOOLEAN True Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BOOLEAN True: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BOOLEAN True: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123339,7 +134771,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BOOLEAN True Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN True: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN True: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123363,7 +134799,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BOOLEAN not null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN not null: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BOOLEAN not null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123388,7 +134828,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap8Argument =
             [NSNumber numberWithUnsignedChar:254U];
         [cluster writeAttributeNullableBitmap8WithValue:nullableBitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123406,7 +134850,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123433,7 +134881,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap8Argument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeNullableBitmap8WithValue:nullableBitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP8 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -123451,7 +134903,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP8 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123480,7 +134936,11 @@ class TestCluster : public TestCommandBridge {
         id nullableBitmap8Argument;
         nullableBitmap8Argument = nil;
         [cluster writeAttributeNullableBitmap8WithValue:nullableBitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP8 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP8 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123498,7 +134958,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP8 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123521,7 +134985,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP8 not 254 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 not 254 Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP8 not 254 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123546,7 +135014,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap16Argument =
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster writeAttributeNullableBitmap16WithValue:nullableBitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123564,7 +135036,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123591,7 +135067,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap16Argument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeNullableBitmap16WithValue:nullableBitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP16 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -123608,7 +135088,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP16 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123634,7 +135118,11 @@ class TestCluster : public TestCommandBridge {
         id nullableBitmap16Argument;
         nullableBitmap16Argument = nil;
         [cluster writeAttributeNullableBitmap16WithValue:nullableBitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP16 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP16 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123652,7 +135140,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP16 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP16 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123678,7 +135170,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap32Argument =
             [NSNumber numberWithUnsignedInt:4294967294UL];
         [cluster writeAttributeNullableBitmap32WithValue:nullableBitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP32 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123696,7 +135192,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP32 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123723,7 +135223,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap32Argument =
             [NSNumber numberWithUnsignedInt:4294967295UL];
         [cluster writeAttributeNullableBitmap32WithValue:nullableBitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP32 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -123740,7 +135244,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP32 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123766,7 +135274,11 @@ class TestCluster : public TestCommandBridge {
         id nullableBitmap32Argument;
         nullableBitmap32Argument = nil;
         [cluster writeAttributeNullableBitmap32WithValue:nullableBitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP32 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP32 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123784,7 +135296,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP32 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP32 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123810,7 +135326,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap64Argument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551614ULL];
         [cluster writeAttributeNullableBitmap64WithValue:nullableBitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP64 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123828,7 +135348,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP64 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123855,7 +135379,11 @@ class TestCluster : public TestCommandBridge {
         nullableBitmap64Argument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551615ULL];
         [cluster writeAttributeNullableBitmap64WithValue:nullableBitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP64 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -123872,7 +135400,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP64 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123898,7 +135430,11 @@ class TestCluster : public TestCommandBridge {
         id nullableBitmap64Argument;
         nullableBitmap64Argument = nil;
         [cluster writeAttributeNullableBitmap64WithValue:nullableBitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_BITMAP64 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_BITMAP64 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123916,7 +135452,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_BITMAP64 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_BITMAP64 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123942,7 +135482,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123960,7 +135504,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -123987,7 +135535,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:254U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124005,7 +135557,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124032,7 +135588,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -124049,7 +135609,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124073,7 +135637,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U unchanged Value with constraint Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U unchanged Value with constraint: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U unchanged Value with constraint: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124097,7 +135665,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt8uArgument;
         nullableInt8uArgument = nil;
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124115,7 +135687,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124138,7 +135714,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124162,7 +135742,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124187,7 +135771,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:128U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124205,7 +135793,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124229,7 +135821,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124254,7 +135850,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16uArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeNullableInt16uWithValue:nullableInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124272,7 +135872,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124299,7 +135903,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16uArgument =
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster writeAttributeNullableInt16uWithValue:nullableInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124317,7 +135925,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124344,7 +135956,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16uArgument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeNullableInt16uWithValue:nullableInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16U Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16U Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16U Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -124361,7 +135977,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124387,7 +136007,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt16uArgument;
         nullableInt16uArgument = nil;
         [cluster writeAttributeNullableInt16uWithValue:nullableInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124405,7 +136029,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124428,7 +136056,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124452,7 +136084,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124477,7 +136113,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16uArgument =
             [NSNumber numberWithUnsignedShort:32000U];
         [cluster writeAttributeNullableInt16uWithValue:nullableInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16U Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16U Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16U Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124495,7 +136135,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124519,7 +136163,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16U notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16U notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16U notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124544,7 +136192,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32uArgument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeNullableInt32uWithValue:nullableInt32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124562,7 +136214,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124589,7 +136245,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32uArgument =
             [NSNumber numberWithUnsignedInt:4294967294UL];
         [cluster writeAttributeNullableInt32uWithValue:nullableInt32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124607,7 +136267,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124634,7 +136298,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32uArgument =
             [NSNumber numberWithUnsignedInt:4294967295UL];
         [cluster writeAttributeNullableInt32uWithValue:nullableInt32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32U Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32U Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32U Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -124651,7 +136319,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124677,7 +136349,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt32uArgument;
         nullableInt32uArgument = nil;
         [cluster writeAttributeNullableInt32uWithValue:nullableInt32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124695,7 +136371,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124718,7 +136398,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124742,7 +136426,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124767,7 +136455,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32uArgument =
             [NSNumber numberWithUnsignedInt:2147483647UL];
         [cluster writeAttributeNullableInt32uWithValue:nullableInt32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32U Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32U Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32U Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124785,7 +136477,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124809,7 +136505,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32U notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32U notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32U notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124834,7 +136534,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64uArgument =
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster writeAttributeNullableInt64uWithValue:nullableInt64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124852,7 +136556,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124879,7 +136587,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64uArgument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551614ULL];
         [cluster writeAttributeNullableInt64uWithValue:nullableInt64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124897,7 +136609,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124924,7 +136640,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64uArgument =
             [NSNumber numberWithUnsignedLongLong:18446744073709551615ULL];
         [cluster writeAttributeNullableInt64uWithValue:nullableInt64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64U Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64U Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64U Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -124941,7 +136661,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124967,7 +136691,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt64uArgument;
         nullableInt64uArgument = nil;
         [cluster writeAttributeNullableInt64uWithValue:nullableInt64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -124985,7 +136713,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125008,7 +136740,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125032,7 +136768,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125057,7 +136797,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64uArgument =
             [NSNumber numberWithUnsignedLongLong:18000000000000000000ULL];
         [cluster writeAttributeNullableInt64uWithValue:nullableInt64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64U Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64U Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64U Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125075,7 +136819,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125099,7 +136847,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64U notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64U notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64U notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125124,7 +136876,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8sArgument =
             [NSNumber numberWithChar:-127];
         [cluster writeAttributeNullableInt8sWithValue:nullableInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125142,7 +136898,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125169,7 +136929,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8sArgument =
             [NSNumber numberWithChar:-128];
         [cluster writeAttributeNullableInt8sWithValue:nullableInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8S Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8S Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8S Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -125186,7 +136950,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125212,7 +136980,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt8sArgument;
         nullableInt8sArgument = nil;
         [cluster writeAttributeNullableInt8sWithValue:nullableInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125230,7 +137002,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125253,7 +137029,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125277,7 +137057,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125302,7 +137086,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt8sArgument =
             [NSNumber numberWithChar:-127];
         [cluster writeAttributeNullableInt8sWithValue:nullableInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8S Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8S Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8S Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125320,7 +137108,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125344,7 +137136,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8S notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8S notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8S notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125369,7 +137165,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16sArgument =
             [NSNumber numberWithShort:-32767];
         [cluster writeAttributeNullableInt16sWithValue:nullableInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125387,7 +137187,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125414,7 +137218,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16sArgument =
             [NSNumber numberWithShort:-32768];
         [cluster writeAttributeNullableInt16sWithValue:nullableInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16S Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16S Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16S Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -125431,7 +137239,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125457,7 +137269,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt16sArgument;
         nullableInt16sArgument = nil;
         [cluster writeAttributeNullableInt16sWithValue:nullableInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125475,7 +137291,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125498,7 +137318,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125522,7 +137346,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125547,7 +137375,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt16sArgument =
             [NSNumber numberWithShort:-32767];
         [cluster writeAttributeNullableInt16sWithValue:nullableInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT16S Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT16S Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT16S Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125565,7 +137397,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125589,7 +137425,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT16S notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT16S notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT16S notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125614,7 +137454,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32sArgument =
             [NSNumber numberWithInt:-2147483647L];
         [cluster writeAttributeNullableInt32sWithValue:nullableInt32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125632,7 +137476,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125659,7 +137507,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32sArgument =
             [NSNumber numberWithInt:-2147483648L];
         [cluster writeAttributeNullableInt32sWithValue:nullableInt32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32S Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32S Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32S Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -125676,7 +137528,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125702,7 +137558,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt32sArgument;
         nullableInt32sArgument = nil;
         [cluster writeAttributeNullableInt32sWithValue:nullableInt32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125720,7 +137580,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125743,7 +137607,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125767,7 +137635,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125792,7 +137664,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt32sArgument =
             [NSNumber numberWithInt:-2147483647L];
         [cluster writeAttributeNullableInt32sWithValue:nullableInt32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT32S Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT32S Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT32S Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125810,7 +137686,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125834,7 +137714,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT32S notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT32S notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT32S notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125859,7 +137743,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64sArgument =
             [NSNumber numberWithLongLong:-9223372036854775807LL];
         [cluster writeAttributeNullableInt64sWithValue:nullableInt64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125877,7 +137765,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125904,7 +137796,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64sArgument =
             [NSNumber numberWithLongLong:-9223372036854775807LL - 1LL];
         [cluster writeAttributeNullableInt64sWithValue:nullableInt64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64S Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64S Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64S Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -125921,7 +137817,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125947,7 +137847,11 @@ class TestCluster : public TestCommandBridge {
         id nullableInt64sArgument;
         nullableInt64sArgument = nil;
         [cluster writeAttributeNullableInt64sWithValue:nullableInt64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125965,7 +137869,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -125988,7 +137896,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S null Value & range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value & range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value & range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126012,7 +137924,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S null Value & not Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value & not: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S null Value & not: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126037,7 +137953,11 @@ class TestCluster : public TestCommandBridge {
         nullableInt64sArgument =
             [NSNumber numberWithLongLong:-9223372036854775807LL];
         [cluster writeAttributeNullableInt64sWithValue:nullableInt64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT64S Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT64S Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT64S Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126055,7 +137975,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S Value in range Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S Value in range: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S Value in range: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126079,7 +138003,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT64S notValue OK Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT64S notValue OK: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT64S notValue OK: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126104,7 +138032,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatSingleArgument =
             [NSNumber numberWithFloat:0.1f];
         [cluster writeAttributeNullableFloatSingleWithValue:nullableFloatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SINGLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SINGLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SINGLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126122,7 +138054,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SINGLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SINGLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SINGLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126149,7 +138085,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatSingleArgument =
             [NSNumber numberWithFloat:INFINITY];
         [cluster writeAttributeNullableFloatSingleWithValue:nullableFloatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SINGLE largest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SINGLE largest Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SINGLE largest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126167,7 +138107,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SINGLE largest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SINGLE largest Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SINGLE largest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126194,7 +138138,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatSingleArgument =
             [NSNumber numberWithFloat:-INFINITY];
         [cluster writeAttributeNullableFloatSingleWithValue:nullableFloatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SINGLE smallest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SINGLE smallest Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SINGLE smallest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126212,7 +138160,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SINGLE smallest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SINGLE smallest Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SINGLE smallest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126238,7 +138190,11 @@ class TestCluster : public TestCommandBridge {
         id nullableFloatSingleArgument;
         nullableFloatSingleArgument = nil;
         [cluster writeAttributeNullableFloatSingleWithValue:nullableFloatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SINGLE null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SINGLE null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SINGLE null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126256,7 +138212,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SINGLE null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SINGLE null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SINGLE null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126282,7 +138242,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatSingleArgument =
             [NSNumber numberWithFloat:0.0f];
         [cluster writeAttributeNullableFloatSingleWithValue:nullableFloatSingleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SINGLE 0 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SINGLE 0 Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SINGLE 0 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126300,7 +138264,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatSingleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SINGLE 0 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SINGLE 0 Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SINGLE 0 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126327,7 +138295,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatDoubleArgument =
             [NSNumber numberWithDouble:0.1234567890123];
         [cluster writeAttributeNullableFloatDoubleWithValue:nullableFloatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_DOUBLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_DOUBLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_DOUBLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126345,7 +138317,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_DOUBLE medium Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_DOUBLE medium Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_DOUBLE medium Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126372,7 +138348,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatDoubleArgument =
             [NSNumber numberWithDouble:INFINITY];
         [cluster writeAttributeNullableFloatDoubleWithValue:nullableFloatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_DOUBLE largest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_DOUBLE largest Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_DOUBLE largest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126390,7 +138370,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_DOUBLE largest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_DOUBLE largest Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_DOUBLE largest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126417,7 +138401,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatDoubleArgument =
             [NSNumber numberWithDouble:-INFINITY];
         [cluster writeAttributeNullableFloatDoubleWithValue:nullableFloatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_DOUBLE smallest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_DOUBLE smallest Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_DOUBLE smallest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126435,7 +138423,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_DOUBLE smallest Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_DOUBLE smallest Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_DOUBLE smallest Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126461,7 +138453,11 @@ class TestCluster : public TestCommandBridge {
         id nullableFloatDoubleArgument;
         nullableFloatDoubleArgument = nil;
         [cluster writeAttributeNullableFloatDoubleWithValue:nullableFloatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_DOUBLE null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_DOUBLE null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_DOUBLE null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126479,7 +138475,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_DOUBLE null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_DOUBLE null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_DOUBLE null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126505,7 +138505,11 @@ class TestCluster : public TestCommandBridge {
         nullableFloatDoubleArgument =
             [NSNumber numberWithDouble:0];
         [cluster writeAttributeNullableFloatDoubleWithValue:nullableFloatDoubleArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_DOUBLE 0 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_DOUBLE 0 Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_DOUBLE 0 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126523,7 +138527,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableFloatDoubleWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_DOUBLE 0 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_DOUBLE 0 Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_DOUBLE 0 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126550,7 +138558,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum8Argument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableEnum8WithValue:nullableEnum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126568,7 +138580,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM8 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM8 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM8 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126595,7 +138611,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum8Argument =
             [NSNumber numberWithUnsignedChar:254U];
         [cluster writeAttributeNullableEnum8WithValue:nullableEnum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126613,7 +138633,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM8 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM8 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM8 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126640,7 +138664,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum8Argument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeNullableEnum8WithValue:nullableEnum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM8 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM8 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -126657,7 +138685,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM8 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM8 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM8 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126683,7 +138715,11 @@ class TestCluster : public TestCommandBridge {
         id nullableEnum8Argument;
         nullableEnum8Argument = nil;
         [cluster writeAttributeNullableEnum8WithValue:nullableEnum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM8 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM8 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM8 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126701,7 +138737,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM8 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM8 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM8 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126727,7 +138767,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum16Argument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeNullableEnum16WithValue:nullableEnum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126745,7 +138789,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM16 Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM16 Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM16 Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126772,7 +138820,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum16Argument =
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster writeAttributeNullableEnum16WithValue:nullableEnum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126790,7 +138842,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM16 Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM16 Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM16 Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126817,7 +138873,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnum16Argument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeNullableEnum16WithValue:nullableEnum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM16 Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM16 Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -126834,7 +138894,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM16 unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM16 unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM16 unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126860,7 +138924,11 @@ class TestCluster : public TestCommandBridge {
         id nullableEnum16Argument;
         nullableEnum16Argument = nil;
         [cluster writeAttributeNullableEnum16WithValue:nullableEnum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_ENUM16 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_ENUM16 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_ENUM16 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126878,7 +138946,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_ENUM16 null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_ENUM16 null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_ENUM16 null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126904,7 +138976,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnumAttrArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableEnumAttrWithValue:nullableEnumAttrArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126922,7 +138998,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Min Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Min Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Min Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126949,7 +139029,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnumAttrArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeNullableEnumAttrWithValue:nullableEnumAttrArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126967,7 +139051,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Max Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Max Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM Max Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -126994,7 +139082,11 @@ class TestCluster : public TestCommandBridge {
         nullableEnumAttrArgument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeNullableEnumAttrWithValue:nullableEnumAttrArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Invalid Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Invalid Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM Invalid Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127012,7 +139104,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM unchanged Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM unchanged Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM unchanged Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127041,7 +139137,11 @@ class TestCluster : public TestCommandBridge {
         id nullableEnumAttrArgument;
         nullableEnumAttrArgument = nil;
         [cluster writeAttributeNullableEnumAttrWithValue:nullableEnumAttrArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM null Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_SIMPLE_ENUM null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127059,7 +139159,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127082,7 +139186,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM not 3 Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM not 3 Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM not 3 Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127104,7 +139212,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127131,7 +139243,11 @@ class TestCluster : public TestCommandBridge {
         nullableOctetStringArgument =
             [[NSData alloc] initWithBytes:"TestValue" length:9];
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127150,7 +139266,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127179,7 +139299,11 @@ class TestCluster : public TestCommandBridge {
         id nullableOctetStringArgument;
         nullableOctetStringArgument = nil;
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127197,7 +139321,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127223,7 +139351,11 @@ class TestCluster : public TestCommandBridge {
         nullableOctetStringArgument =
             [[NSData alloc] initWithBytes:"" length:0];
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127241,7 +139373,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127265,7 +139401,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING not TestValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING not TestValue: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING not TestValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127287,7 +139427,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127313,7 +139457,11 @@ class TestCluster : public TestCommandBridge {
         id nullableCharStringArgument;
         nullableCharStringArgument = @"☉T☉";
         [cluster writeAttributeNullableCharStringWithValue:nullableCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127332,7 +139480,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127359,7 +139511,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127389,7 +139545,11 @@ class TestCluster : public TestCommandBridge {
         id nullableCharStringArgument;
         nullableCharStringArgument = nil;
         [cluster writeAttributeNullableCharStringWithValue:nullableCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_CHAR_STRING - Value too long Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING - Value too long: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING - Value too long: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127407,7 +139567,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127432,7 +139596,11 @@ class TestCluster : public TestCommandBridge {
         id nullableCharStringArgument;
         nullableCharStringArgument = @"";
         [cluster writeAttributeNullableCharStringWithValue:nullableCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_CHAR_STRING - Empty Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING - Empty: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING - Empty: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127450,7 +139618,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127474,7 +139646,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING not ☉T☉ Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING not ☉T☉: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING not ☉T☉: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127496,7 +139672,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListInt8uWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute from nonexistent endpoint. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute from nonexistent endpoint.: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute from nonexistent endpoint.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             NextTest();
@@ -127513,7 +139693,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListInt8uWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute from nonexistent cluster. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute from nonexistent cluster.: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute from nonexistent cluster.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             NextTest();
@@ -127532,7 +139716,11 @@ class TestCluster : public TestCommandBridge {
         __auto_type * params = [[MTRUnitTestingClusterTestSimpleOptionalArgumentRequestParams alloc] init];
         [cluster testSimpleOptionalArgumentRequestWithParams:params completion:
                                                                         ^(NSError * _Nullable err) {
-                                                                            NSLog(@"Send a command that takes an optional parameter but do not set it. Error: %@", err);
+                                                                            if (err != nil) {
+                                                                                NSLog(@"Send a command that takes an optional parameter but do not set it.: Error: %@", err);
+                                                                            } else {
+                                                                                NSLog(@"Send a command that takes an optional parameter but do not set it.: Success");
+                                                                            }
 
                                                                             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                                             NextTest();
@@ -127553,7 +139741,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithBool:1];
         [cluster testSimpleOptionalArgumentRequestWithParams:params completion:
                                                                         ^(NSError * _Nullable err) {
-                                                                            NSLog(@"Send a command that takes an optional parameter but do not set it. Error: %@", err);
+                                                                            if (err != nil) {
+                                                                                NSLog(@"Send a command that takes an optional parameter but do not set it.: Error: %@", err);
+                                                                            } else {
+                                                                                NSLog(@"Send a command that takes an optional parameter but do not set it.: Success");
+                                                                            }
 
                                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127575,7 +139767,11 @@ class TestCluster : public TestCommandBridge {
 
         test_TestCluster_list_int8u_Reported
             = ^(NSArray * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe to list attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe to list attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe to list attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127613,7 +139809,11 @@ class TestCluster : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe to list attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe to list attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe to list attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestCluster_list_int8u_Reported
@@ -127649,7 +139849,11 @@ class TestCluster : public TestCommandBridge {
             listInt8uArgument = temp_0;
         }
         [cluster writeAttributeListInt8uWithValue:listInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write subscribed-to list attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write subscribed-to list attribute: Error: %@", err);
+            } else {
+                NSLog(@"Write subscribed-to list attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127668,7 +139872,11 @@ class TestCluster : public TestCommandBridge {
 
         test_TestCluster_list_int8u_Reported
             = ^(NSArray * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for list attribute report Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for list attribute report: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for list attribute report: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127695,7 +139903,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127721,7 +139933,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127741,7 +139957,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:19U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127761,7 +139981,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:101U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127781,7 +140005,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:255U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127798,7 +140026,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 8-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127824,7 +140056,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:20U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127842,7 +140078,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 8-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127868,7 +140108,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:100U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127886,7 +140130,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 8-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127912,7 +140160,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:50U];
         [cluster writeAttributeRangeRestrictedInt8uWithValue:rangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127930,7 +140182,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 8-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 8-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127953,7 +140209,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -127979,7 +140239,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -127999,7 +140263,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:99U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128019,7 +140287,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:1001U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128039,7 +140311,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:65535U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128056,7 +140332,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 16-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128082,7 +140362,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:100U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128100,7 +140384,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 16-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128126,7 +140414,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:1000U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128144,7 +140436,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 16-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128170,7 +140466,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:500U];
         [cluster writeAttributeRangeRestrictedInt16uWithValue:rangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128188,7 +140488,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted unsigned 16-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted unsigned 16-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128211,7 +140515,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128237,7 +140545,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-128];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128257,7 +140569,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-41];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128277,7 +140593,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:51];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128297,7 +140617,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:127];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128314,7 +140638,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 8-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 8-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 8-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128340,7 +140668,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-40];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128358,7 +140690,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 8-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128384,7 +140720,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:50];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128402,7 +140742,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 8-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128428,7 +140772,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:6];
         [cluster writeAttributeRangeRestrictedInt8sWithValue:rangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128446,7 +140794,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 8-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 8-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128469,7 +140821,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128495,7 +140851,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-32768];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128515,7 +140875,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-151];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128535,7 +140899,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:201];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128555,7 +140923,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:32767];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128572,7 +140944,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 16-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 16-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 16-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128598,7 +140974,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-150];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128616,7 +140996,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 16-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128642,7 +141026,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:200];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128660,7 +141048,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 16-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128686,7 +141078,11 @@ class TestCluster : public TestCommandBridge {
         rangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:7];
         [cluster writeAttributeRangeRestrictedInt16sWithValue:rangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128704,7 +141100,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify range-restricted signed 16-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify range-restricted signed 16-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128727,7 +141127,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128754,7 +141158,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128774,7 +141182,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:19U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128794,7 +141206,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:101U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128814,7 +141230,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:254U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -128831,7 +141251,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128858,7 +141282,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:20U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128876,7 +141304,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128903,7 +141335,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:100U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128921,7 +141357,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128948,7 +141388,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8uArgument =
             [NSNumber numberWithUnsignedChar:50U];
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128966,7 +141410,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -128992,7 +141440,11 @@ class TestCluster : public TestCommandBridge {
         id nullableRangeRestrictedInt8uArgument;
         nullableRangeRestrictedInt8uArgument = nil;
         [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:nullableRangeRestrictedInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write null value to a nullable range-restricted unsigned 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write null value to a nullable range-restricted unsigned 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write null value to a nullable range-restricted unsigned 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129010,7 +141462,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is null: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 8-bit integer value is null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129033,7 +141489,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129060,7 +141520,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129080,7 +141544,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:99U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129100,7 +141568,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:1001U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129120,7 +141592,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129137,7 +141613,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129164,7 +141644,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:100U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129182,7 +141666,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129209,7 +141697,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:1000U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129227,7 +141719,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129254,7 +141750,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16uArgument =
             [NSNumber numberWithUnsignedShort:500U];
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129272,7 +141772,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129298,7 +141802,11 @@ class TestCluster : public TestCommandBridge {
         id nullableRangeRestrictedInt16uArgument;
         nullableRangeRestrictedInt16uArgument = nil;
         [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:nullableRangeRestrictedInt16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write null value to a nullable range-restricted unsigned 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write null value to a nullable range-restricted unsigned 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write null value to a nullable range-restricted unsigned 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129316,7 +141824,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is null: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted unsigned 16-bit integer value is null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129339,7 +141851,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129366,7 +141882,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-127];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129386,7 +141906,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-41];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129406,7 +141930,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:51];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129426,7 +141954,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:127];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129443,7 +141975,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 8-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129470,7 +142006,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:-40];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129488,7 +142028,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129515,7 +142059,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:50];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129533,7 +142081,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129560,7 +142112,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt8sArgument =
             [NSNumber numberWithChar:6];
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129578,7 +142134,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129604,7 +142164,11 @@ class TestCluster : public TestCommandBridge {
         id nullableRangeRestrictedInt8sArgument;
         nullableRangeRestrictedInt8sArgument = nil;
         [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:nullableRangeRestrictedInt8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write null value to a nullable range-restricted signed 8-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write null value to a nullable range-restricted signed 8-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write null value to a nullable range-restricted signed 8-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129622,7 +142186,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at null: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 8-bit integer value is at null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129645,7 +142213,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Read nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129672,7 +142244,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-32767];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129692,7 +142268,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-151];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-below-range value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-below-range value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-below-range value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129712,7 +142292,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:201];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write just-above-range value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write just-above-range value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write just-above-range value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129732,7 +142316,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:32767];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -129749,7 +142337,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 16-bit integer value has not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value has not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value has not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129776,7 +142368,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:-150];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write min valid value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write min valid value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write min valid value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129794,7 +142390,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at min valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at min valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at min valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129821,7 +142421,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:200];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write max valid value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write max valid value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write max valid value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129839,7 +142443,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at max valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at max valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at max valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129866,7 +142474,11 @@ class TestCluster : public TestCommandBridge {
         nullableRangeRestrictedInt16sArgument =
             [NSNumber numberWithShort:7];
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write middle valid value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write middle valid value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write middle valid value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129884,7 +142496,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at mid valid Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at mid valid: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is at mid valid: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129910,7 +142526,11 @@ class TestCluster : public TestCommandBridge {
         id nullableRangeRestrictedInt16sArgument;
         nullableRangeRestrictedInt16sArgument = nil;
         [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:nullableRangeRestrictedInt16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write null value to a nullable range-restricted signed 16-bit integer Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write null value to a nullable range-restricted signed 16-bit integer: Error: %@", err);
+            } else {
+                NSLog(@"Write null value to a nullable range-restricted signed 16-bit integer: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129928,7 +142548,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableRangeRestrictedInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify nullable range-restricted signed 16-bit integer value is null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is null: Error: %@", err);
+            } else {
+                NSLog(@"Verify nullable range-restricted signed 16-bit integer value is null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -129954,7 +142578,11 @@ class TestCluster : public TestCommandBridge {
         generalErrorBooleanArgument =
             [NSNumber numberWithBool:false];
         [cluster writeAttributeGeneralErrorBooleanWithValue:generalErrorBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute that returns general status on write Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute that returns general status on write: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute that returns general status on write: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             NextTest();
@@ -129974,7 +142602,11 @@ class TestCluster : public TestCommandBridge {
         clusterErrorBooleanArgument =
             [NSNumber numberWithBool:false];
         [cluster writeAttributeClusterErrorBooleanWithValue:clusterErrorBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute that returns cluster-specific status on write Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute that returns cluster-specific status on write: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute that returns cluster-specific status on write: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
@@ -129991,7 +142623,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneralErrorBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute that returns general status on read Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute that returns general status on read: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute that returns general status on read: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             NextTest();
@@ -130008,7 +142644,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterErrorBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read attribute that returns cluster-specific status on read Error: %@", err);
+            if (err != nil) {
+                NSLog(@"read attribute that returns cluster-specific status on read: Error: %@", err);
+            } else {
+                NSLog(@"read attribute that returns cluster-specific status on read: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
@@ -130025,7 +142665,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read AcceptedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"read AcceptedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"read AcceptedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130066,7 +142710,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read GeneratedCommandList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"read GeneratedCommandList attribute: Error: %@", err);
+            } else {
+                NSLog(@"read GeneratedCommandList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130116,7 +142764,11 @@ class TestCluster : public TestCommandBridge {
             [NSNumber numberWithDouble:3.14159265358979];
 
         [cluster writeAttributeStructAttrWithValue:structAttrArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write struct-typed attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write struct-typed attribute: Error: %@", err);
+            } else {
+                NSLog(@"Write struct-typed attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130134,7 +142786,11 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStructAttrWithCompletion:^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read struct-typed attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read struct-typed attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read struct-typed attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130681,7 +143337,11 @@ class TestConstraints : public TestCommandBridge {
             listInt8uArgument = temp_0;
         }
         [cluster writeAttributeListInt8uWithValue:listInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST With List of INT8U Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST With List of INT8U: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST With List of INT8U: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130699,7 +143359,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListInt8uWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST With Partial List of INT8U that should be in it Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST With Partial List of INT8U that should be in it: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST With Partial List of INT8U that should be in it: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130721,7 +143385,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeListInt8uWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute LIST With Partial List of INT8U that should not be included Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute LIST With Partial List of INT8U that should not be included: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute LIST With Partial List of INT8U that should not be included: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130747,7 +143415,11 @@ class TestConstraints : public TestCommandBridge {
             listInt8uArgument = temp_0;
         }
         [cluster writeAttributeListInt8uWithValue:listInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute LIST Back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute LIST Back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute LIST Back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130765,7 +143437,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130791,7 +143467,11 @@ class TestConstraints : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:5UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 with MaskVal1 and MaskVal3 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 with MaskVal1 and MaskVal3: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 with MaskVal1 and MaskVal3: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130809,7 +143489,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130832,7 +143516,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130855,7 +143543,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130878,7 +143570,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are set: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130904,7 +143600,11 @@ class TestConstraints : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 with MaskVal1 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 with MaskVal1: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 with MaskVal1: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130922,7 +143622,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 with MaskVal1 and ensure Maskval1 or MaskVal3 are set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and ensure Maskval1 or MaskVal3 are set: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 with MaskVal1 and ensure Maskval1 or MaskVal3 are set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130948,7 +143652,11 @@ class TestConstraints : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 Back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 Back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 Back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130969,7 +143677,11 @@ class TestConstraints : public TestCommandBridge {
         int32uArgument =
             [NSNumber numberWithUnsignedInt:5UL];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -130987,7 +143699,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Value MinValue Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Value MinValue Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Value MinValue Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131007,7 +143723,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Value MaxValue Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Value MaxValue Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Value MaxValue Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131027,7 +143747,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Value NotValue Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Value NotValue Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Value NotValue Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131050,7 +143774,11 @@ class TestConstraints : public TestCommandBridge {
         int32uArgument =
             [NSNumber numberWithUnsignedInt:0UL];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Value Back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Value Back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Value Back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131070,7 +143798,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"** Test **";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131088,7 +143820,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value MinLength Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value MinLength Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value MinLength Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131107,7 +143843,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value MaxLength Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value MaxLength Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value MaxLength Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131126,7 +143866,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value StartsWith Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value StartsWith Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value StartsWith Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131145,7 +143889,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value EndsWith Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value EndsWith Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value EndsWith Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131166,7 +143914,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"lowercase";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131184,7 +143936,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131206,7 +143962,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"UPPERCASE";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131224,7 +143984,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131246,7 +144010,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"lowUPPER";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131264,7 +144032,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131286,7 +144058,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"1234567890";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value with only digits Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value with only digits: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value with only digits: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131304,7 +144080,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131326,7 +144106,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"12.4,76:";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value with only non-letters Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value with only non-letters: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value with only non-letters: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131344,7 +144128,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131366,7 +144154,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"ABC;.* ";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value with uppercase letters and symbols Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value with uppercase letters and symbols: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value with uppercase letters and symbols: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131384,7 +144176,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131406,7 +144202,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"abc;.* ";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value with lowercase letters and symbols Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value with lowercase letters and symbols: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value with lowercase letters and symbols: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131424,7 +144224,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131446,7 +144250,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value which is empty Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value which is empty: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value which is empty: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131464,7 +144272,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131486,7 +144298,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"ABCDEF012V";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131504,7 +144320,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131525,7 +144345,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"ABCDEF0123";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131543,7 +144367,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute CHAR_STRING Value isHexString Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131564,7 +144392,11 @@ class TestConstraints : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute CHAR_STRING Value Back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute CHAR_STRING Value Back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute CHAR_STRING Value Back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131584,7 +144416,11 @@ class TestConstraints : public TestCommandBridge {
         id nullableCharStringArgument;
         nullableCharStringArgument = nil;
         [cluster writeAttributeNullableCharStringWithValue:nullableCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_CHAR_STRING Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131602,7 +144438,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MinLength Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MinLength Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MinLength Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131625,7 +144465,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MaxLength Constraints Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MaxLength Constraints: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_CHAR_STRING Value MaxLength Constraints: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131650,7 +144494,11 @@ class TestConstraints : public TestCommandBridge {
         id nullableCharStringArgument;
         nullableCharStringArgument = @"";
         [cluster writeAttributeNullableCharStringWithValue:nullableCharStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_CHAR_STRING Value Back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING Value Back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_CHAR_STRING Value Back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131668,7 +144516,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131695,7 +144547,11 @@ class TestConstraints : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U with a value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U with a value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U with a value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131713,7 +144569,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U with a value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U with a value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U with a value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131736,7 +144596,11 @@ class TestConstraints : public TestCommandBridge {
         id nullableInt8uArgument;
         nullableInt8uArgument = nil;
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U without a value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U without a value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U without a value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131754,7 +144618,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_INT8U with a value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_INT8U with a value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_INT8U with a value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131778,7 +144646,11 @@ class TestConstraints : public TestCommandBridge {
         nullableInt8uArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeNullableInt8uWithValue:nullableInt8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_INT8U back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_INT8U back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_INT8U back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131796,7 +144668,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131823,7 +144699,11 @@ class TestConstraints : public TestCommandBridge {
         nullableOctetStringArgument =
             [[NSData alloc] initWithBytes:"TestValue" length:9];
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131841,7 +144721,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131864,7 +144748,11 @@ class TestConstraints : public TestCommandBridge {
         id nullableOctetStringArgument;
         nullableOctetStringArgument = nil;
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131882,7 +144770,11 @@ class TestConstraints : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_OCTET_STRING Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute NULLABLE_OCTET_STRING: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -131906,7 +144798,11 @@ class TestConstraints : public TestCommandBridge {
         nullableOctetStringArgument =
             [[NSData alloc] initWithBytes:"" length:0];
         [cluster writeAttributeNullableOctetStringWithValue:nullableOctetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute NULLABLE_OCTET_STRING back to Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING back to Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute NULLABLE_OCTET_STRING back to Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133026,7 +145922,11 @@ class TestSaveAs : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:17U];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133058,7 +145958,11 @@ class TestSaveAs : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:17U];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133087,7 +145991,11 @@ class TestSaveAs : public TestCommandBridge {
             [TestAddArgumentDefaultValue copy];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133108,7 +146016,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133137,7 +146049,11 @@ class TestSaveAs : public TestCommandBridge {
         booleanArgument =
             [NSNumber numberWithBool:1];
         [cluster writeAttributeBooleanWithValue:booleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BOOLEAN Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BOOLEAN Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BOOLEAN Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133155,7 +146071,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133178,7 +146098,11 @@ class TestSaveAs : public TestCommandBridge {
         booleanArgument =
             [readAttributeBooleanDefaultValue copy];
         [cluster writeAttributeBooleanWithValue:booleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BOOLEAN DefaultValue Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BOOLEAN DefaultValue: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BOOLEAN DefaultValue: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133196,7 +146120,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BOOLEAN False Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BOOLEAN False: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BOOLEAN False: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133220,7 +146148,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133249,7 +146181,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap8Argument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP8 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP8 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP8 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133267,7 +146203,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133290,7 +146230,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap8Argument =
             [readAttributeBitmap8DefaultValue copy];
         [cluster writeAttributeBitmap8WithValue:bitmap8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133308,7 +146252,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133332,7 +146280,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133361,7 +146313,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap16Argument =
             [NSNumber numberWithUnsignedShort:1U];
         [cluster writeAttributeBitmap16WithValue:bitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP16 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP16 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP16 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133379,7 +146335,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133402,7 +146362,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap16Argument =
             [readAttributeBitmap16DefaultValue copy];
         [cluster writeAttributeBitmap16WithValue:bitmap16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133420,7 +146384,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133444,7 +146412,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133473,7 +146445,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap32Argument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133491,7 +146467,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133514,7 +146494,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap32Argument =
             [readAttributeBitmap32DefaultValue copy];
         [cluster writeAttributeBitmap32WithValue:bitmap32Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP32 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP32 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP32 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133532,7 +146516,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap32WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP32 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP32 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP32 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133556,7 +146544,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133585,7 +146577,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap64Argument =
             [NSNumber numberWithUnsignedLongLong:1ULL];
         [cluster writeAttributeBitmap64WithValue:bitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP64 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP64 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP64 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133603,7 +146599,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133626,7 +146626,11 @@ class TestSaveAs : public TestCommandBridge {
         bitmap64Argument =
             [readAttributeBitmap64DefaultValue copy];
         [cluster writeAttributeBitmap64WithValue:bitmap64Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute BITMAP64 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute BITMAP64 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute BITMAP64 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133644,7 +146648,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBitmap64WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute BITMAP64 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute BITMAP64 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute BITMAP64 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133668,7 +146676,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133697,7 +146709,11 @@ class TestSaveAs : public TestCommandBridge {
         int8uArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeInt8uWithValue:int8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133715,7 +146731,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133738,7 +146758,11 @@ class TestSaveAs : public TestCommandBridge {
         int8uArgument =
             [readAttributeInt8uDefaultValue copy];
         [cluster writeAttributeInt8uWithValue:int8uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133756,7 +146780,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133780,7 +146808,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133809,7 +146841,11 @@ class TestSaveAs : public TestCommandBridge {
         int16uArgument =
             [NSNumber numberWithUnsignedShort:1U];
         [cluster writeAttributeInt16uWithValue:int16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133827,7 +146863,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133850,7 +146890,11 @@ class TestSaveAs : public TestCommandBridge {
         int16uArgument =
             [readAttributeInt16uDefaultValue copy];
         [cluster writeAttributeInt16uWithValue:int16uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133868,7 +146912,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133892,7 +146940,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133921,7 +146973,11 @@ class TestSaveAs : public TestCommandBridge {
         int32uArgument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133939,7 +146995,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133962,7 +147022,11 @@ class TestSaveAs : public TestCommandBridge {
         int32uArgument =
             [readAttributeInt32uDefaultValue copy];
         [cluster writeAttributeInt32uWithValue:int32uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -133980,7 +147044,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134004,7 +147072,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134033,7 +147105,11 @@ class TestSaveAs : public TestCommandBridge {
         int64uArgument =
             [NSNumber numberWithUnsignedLongLong:1ULL];
         [cluster writeAttributeInt64uWithValue:int64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134051,7 +147127,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134074,7 +147154,11 @@ class TestSaveAs : public TestCommandBridge {
         int64uArgument =
             [readAttributeInt64uDefaultValue copy];
         [cluster writeAttributeInt64uWithValue:int64uArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134092,7 +147176,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64uWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64U Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64U Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64U Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134116,7 +147204,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134145,7 +147237,11 @@ class TestSaveAs : public TestCommandBridge {
         int8sArgument =
             [NSNumber numberWithChar:1];
         [cluster writeAttributeInt8sWithValue:int8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134163,7 +147259,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134186,7 +147286,11 @@ class TestSaveAs : public TestCommandBridge {
         int8sArgument =
             [readAttributeInt8sDefaultValue copy];
         [cluster writeAttributeInt8sWithValue:int8sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134204,7 +147308,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt8sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT8S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT8S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT8S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134228,7 +147336,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134257,7 +147369,11 @@ class TestSaveAs : public TestCommandBridge {
         int16sArgument =
             [NSNumber numberWithShort:1];
         [cluster writeAttributeInt16sWithValue:int16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134275,7 +147391,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134298,7 +147418,11 @@ class TestSaveAs : public TestCommandBridge {
         int16sArgument =
             [readAttributeInt16sDefaultValue copy];
         [cluster writeAttributeInt16sWithValue:int16sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134316,7 +147440,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt16sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT16S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT16S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT16S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134340,7 +147468,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134369,7 +147501,11 @@ class TestSaveAs : public TestCommandBridge {
         int32sArgument =
             [NSNumber numberWithInt:1L];
         [cluster writeAttributeInt32sWithValue:int32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134387,7 +147523,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134410,7 +147550,11 @@ class TestSaveAs : public TestCommandBridge {
         int32sArgument =
             [readAttributeInt32sDefaultValue copy];
         [cluster writeAttributeInt32sWithValue:int32sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134428,7 +147572,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt32sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT32S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT32S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT32S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134452,7 +147600,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134481,7 +147633,11 @@ class TestSaveAs : public TestCommandBridge {
         int64sArgument =
             [NSNumber numberWithLongLong:1LL];
         [cluster writeAttributeInt64sWithValue:int64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INTS Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INTS Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INTS Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134499,7 +147655,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134522,7 +147682,11 @@ class TestSaveAs : public TestCommandBridge {
         int64sArgument =
             [readAttributeInt64sDefaultValue copy];
         [cluster writeAttributeInt64sWithValue:int64sArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134540,7 +147704,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInt64sWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute INT64S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute INT64S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute INT64S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134564,7 +147732,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134593,7 +147765,11 @@ class TestSaveAs : public TestCommandBridge {
         enum8Argument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeEnum8WithValue:enum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM8 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM8 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM8 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134611,7 +147787,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134634,7 +147814,11 @@ class TestSaveAs : public TestCommandBridge {
         enum8Argument =
             [readAttributeEnum8DefaultValue copy];
         [cluster writeAttributeEnum8WithValue:enum8Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134652,7 +147836,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum8WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM8 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM8 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM8 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134676,7 +147864,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134705,7 +147897,11 @@ class TestSaveAs : public TestCommandBridge {
         enum16Argument =
             [NSNumber numberWithUnsignedShort:1U];
         [cluster writeAttributeEnum16WithValue:enum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM16 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM16 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM16 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134723,7 +147919,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134746,7 +147946,11 @@ class TestSaveAs : public TestCommandBridge {
         enum16Argument =
             [readAttributeEnum16DefaultValue copy];
         [cluster writeAttributeEnum16WithValue:enum16Argument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute ENUM16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute ENUM16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute ENUM16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134764,7 +147968,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEnum16WithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ENUM16 Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ENUM16 Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ENUM16 Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134788,7 +147996,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134817,7 +148029,11 @@ class TestSaveAs : public TestCommandBridge {
         epochUsArgument =
             [NSNumber numberWithUnsignedLongLong:1ULL];
         [cluster writeAttributeEpochUsWithValue:epochUsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_US Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_US Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_US Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134835,7 +148051,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134858,7 +148078,11 @@ class TestSaveAs : public TestCommandBridge {
         epochUsArgument =
             [readAttributeEpochUSDefaultValue copy];
         [cluster writeAttributeEpochUsWithValue:epochUsArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_US Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_US Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_US Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134876,7 +148100,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochUsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_US Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_US Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_US Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134900,7 +148128,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134929,7 +148161,11 @@ class TestSaveAs : public TestCommandBridge {
         epochSArgument =
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster writeAttributeEpochSWithValue:epochSArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134947,7 +148183,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134970,7 +148210,11 @@ class TestSaveAs : public TestCommandBridge {
         epochSArgument =
             [readAttributeEpochSDefaultValue copy];
         [cluster writeAttributeEpochSWithValue:epochSArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute EPOCH_S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute EPOCH_S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute EPOCH_S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -134988,7 +148232,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeEpochSWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute EPOCH_S Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute EPOCH_S Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute EPOCH_S Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135012,7 +148260,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor_id Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor_id Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor_id Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135041,7 +148293,11 @@ class TestSaveAs : public TestCommandBridge {
         vendorIdArgument =
             [NSNumber numberWithUnsignedShort:1U];
         [cluster writeAttributeVendorIdWithValue:vendorIdArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute vendor_id Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute vendor_id Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute vendor_id Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135059,7 +148315,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor_id Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor_id Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor_id Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135082,7 +148342,11 @@ class TestSaveAs : public TestCommandBridge {
         vendorIdArgument =
             [readAttributeVendorIdDefaultValue copy];
         [cluster writeAttributeVendorIdWithValue:vendorIdArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute vendor_id Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute vendor_id Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute vendor_id Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135100,7 +148364,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor_id Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute vendor_id Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute vendor_id Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135124,7 +148392,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute char_string Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute char_string Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute char_string Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135150,7 +148422,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute char_string Default Value and compare to saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute char_string Default Value and compare to saved value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute char_string Default Value and compare to saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135175,7 +148451,11 @@ class TestSaveAs : public TestCommandBridge {
         id charStringArgument;
         charStringArgument = @"NotDefault";
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute char_string Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute char_string Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute char_string Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135194,7 +148474,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute char_string Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute char_string Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute char_string Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135222,7 +148506,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute char_string Not Default Value and compare to saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute char_string Not Default Value and compare to saved value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute char_string Not Default Value and compare to saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135250,7 +148538,11 @@ class TestSaveAs : public TestCommandBridge {
         charStringArgument =
             [readAttributeCharStringNotDefaultValue copy];
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute char_string Not Default Value from saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute char_string Not Default Value from saved value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute char_string Not Default Value from saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135268,7 +148560,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCharStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute char_string Not Default Value and compare to expected value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute char_string Not Default Value and compare to expected value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute char_string Not Default Value and compare to expected value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135294,7 +148590,11 @@ class TestSaveAs : public TestCommandBridge {
         charStringArgument =
             [readAttributeCharStringDefaultValue copy];
         [cluster writeAttributeCharStringWithValue:charStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute char_string Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute char_string Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute char_string Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135313,7 +148613,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute octet_string Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute octet_string Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute octet_string Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135339,7 +148643,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute octet_string Default Value and compare to saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute octet_string Default Value and compare to saved value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute octet_string Default Value and compare to saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135365,7 +148673,11 @@ class TestSaveAs : public TestCommandBridge {
         octetStringArgument =
             [[NSData alloc] initWithBytes:"NotDefault" length:10];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute octet_string Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute octet_string Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute octet_string Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135384,7 +148696,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute octet_string Not Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute octet_string Not Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute octet_string Not Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135412,7 +148728,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute octet_string Not Default Value and compare to saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute octet_string Not Default Value and compare to saved value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute octet_string Not Default Value and compare to saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135440,7 +148760,11 @@ class TestSaveAs : public TestCommandBridge {
         octetStringArgument =
             [readAttributeOctetStringNotDefaultValue copy];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute octet_string Not Default Value from saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute octet_string Not Default Value from saved value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute octet_string Not Default Value from saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135458,7 +148782,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOctetStringWithCompletion:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute octet_string Not Default Value and compare to expected value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute octet_string Not Default Value and compare to expected value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute octet_string Not Default Value and compare to expected value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135484,7 +148812,11 @@ class TestSaveAs : public TestCommandBridge {
         octetStringArgument =
             [readAttributeOctetStringDefaultValue copy];
         [cluster writeAttributeOctetStringWithValue:octetStringArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute octet_string Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute octet_string Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute octet_string Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135503,7 +148835,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute nullable_boolean Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute nullable_boolean Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute nullable_boolean Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135532,7 +148868,11 @@ class TestSaveAs : public TestCommandBridge {
         id nullableBooleanArgument;
         nullableBooleanArgument = nil;
         [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute nullable_boolean to null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute nullable_boolean to null: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute nullable_boolean to null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135551,7 +148891,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute nullable_boolean null Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute nullable_boolean null Value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute nullable_boolean null Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135577,7 +148921,11 @@ class TestSaveAs : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute nullable_boolean null Value again and compare it to the previously saved value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute nullable_boolean null Value again and compare it to the previously saved value: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute nullable_boolean null Value again and compare it to the previously saved value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135608,7 +148956,11 @@ class TestSaveAs : public TestCommandBridge {
         nullableBooleanArgument =
             [readAttributeNullableBooleanDefaultValue copy];
         [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write attribute nullable_boolean Default Value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write attribute nullable_boolean Default Value: Error: %@", err);
+            } else {
+                NSLog(@"Write attribute nullable_boolean Default Value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135735,7 +149087,11 @@ class TestConfigVariables : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:17U];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135766,7 +149122,11 @@ class TestConfigVariables : public TestCommandBridge {
             [TestAddArgumentDefaultValue copy];
         [cluster testAddArgumentsWithParams:params completion:
                                                        ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Send Test Add Arguments Command Error: %@", err);
+                                                           if (err != nil) {
+                                                               NSLog(@"Send Test Add Arguments Command: Error: %@", err);
+                                                           } else {
+                                                               NSLog(@"Send Test Add Arguments Command: Success");
+                                                           }
 
                                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135922,7 +149282,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDeviceTypeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Device list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Device list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Device list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -135949,13 +149313,17 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeServerListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Server list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Server list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Server list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ServerList", [actualValue count], static_cast<uint32_t>(29)));
+                VerifyOrReturn(CheckValue("ServerList", [actualValue count], static_cast<uint32_t>(28)));
                 VerifyOrReturn(CheckValue("", actualValue[0], 3UL));
                 VerifyOrReturn(CheckValue("", actualValue[1], 4UL));
                 VerifyOrReturn(CheckValue("", actualValue[2], 29UL));
@@ -135982,9 +149350,8 @@ class TestDescriptorCluster : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("", actualValue[23], 63UL));
                 VerifyOrReturn(CheckValue("", actualValue[24], 64UL));
                 VerifyOrReturn(CheckValue("", actualValue[25], 65UL));
-                VerifyOrReturn(CheckValue("", actualValue[26], 70UL));
-                VerifyOrReturn(CheckValue("", actualValue[27], 1029UL));
-                VerifyOrReturn(CheckValue("", actualValue[28], 4294048774UL));
+                VerifyOrReturn(CheckValue("", actualValue[26], 1029UL));
+                VerifyOrReturn(CheckValue("", actualValue[27], 4294048774UL));
             }
 
             NextTest();
@@ -136001,7 +149368,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClientListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Client list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Client list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Client list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136025,7 +149396,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePartsListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Parts list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Parts list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Parts list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136050,7 +149425,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136074,7 +149453,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTagListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Tag list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read attribute Tag list: Error: %@", err);
+            } else {
+                NSLog(@"Read attribute Tag list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136103,7 +149486,11 @@ class TestDescriptorCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read feature map Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read feature map Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read feature map Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136240,8 +149627,16 @@ class TestBasicInformation : public TestCommandBridge {
             err = TestRestoreInitialLocalConfigDisabledValue_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Read the ProductApppearance value\n");
-            err = TestReadTheProductApppearanceValue_19();
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Read the ProductAppearance value\n");
+            err = TestReadTheProductAppearanceValue_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Read the Specification Version value\n");
+            err = TestReadTheSpecificationVersionValue_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read the Max Paths Per Invoke value\n");
+            err = TestReadTheMaxPathsPerInvokeValue_21();
             break;
         }
 
@@ -136314,6 +149709,12 @@ class TestBasicInformation : public TestCommandBridge {
         case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -136324,7 +149725,7 @@ class TestBasicInformation : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 20;
+    const uint16_t mTestCount = 22;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -136347,7 +149748,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read location: Error: %@", err);
+            } else {
+                NSLog(@"Read location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136372,7 +149777,11 @@ class TestBasicInformation : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"US";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write location: Error: %@", err);
+            } else {
+                NSLog(@"Write location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136390,7 +149799,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back location: Error: %@", err);
+            } else {
+                NSLog(@"Read back location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136415,7 +149828,11 @@ class TestBasicInformation : public TestCommandBridge {
         id locationArgument;
         locationArgument = @"XX";
         [cluster writeAttributeLocationWithValue:locationArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Restore initial location value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Restore initial location value: Error: %@", err);
+            } else {
+                NSLog(@"Restore initial location value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136433,13 +149850,17 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read AttributeList value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read AttributeList value: Error: %@", err);
+            } else {
+                NSLog(@"Read AttributeList value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(26)));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(28)));
                 VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
                 VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
                 VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
@@ -136460,12 +149881,14 @@ class TestBasicInformation : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("", actualValue[17], 18UL));
                 VerifyOrReturn(CheckValue("", actualValue[18], 19UL));
                 VerifyOrReturn(CheckValue("", actualValue[19], 20UL));
-                VerifyOrReturn(CheckValue("", actualValue[20], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[21], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[22], 65530UL));
-                VerifyOrReturn(CheckValue("", actualValue[23], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[24], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[25], 65533UL));
+                VerifyOrReturn(CheckValue("", actualValue[20], 21UL));
+                VerifyOrReturn(CheckValue("", actualValue[21], 22UL));
+                VerifyOrReturn(CheckValue("", actualValue[22], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[23], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[24], 65530UL));
+                VerifyOrReturn(CheckValue("", actualValue[25], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[26], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[27], 65533UL));
             }
 
             NextTest();
@@ -136482,13 +149905,17 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read AttributeList value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read AttributeList value: Error: %@", err);
+            } else {
+                NSLog(@"Read AttributeList value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(25)));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(27)));
                 VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
                 VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
                 VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
@@ -136509,11 +149936,13 @@ class TestBasicInformation : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("", actualValue[17], 18UL));
                 VerifyOrReturn(CheckValue("", actualValue[18], 19UL));
                 VerifyOrReturn(CheckValue("", actualValue[19], 20UL));
-                VerifyOrReturn(CheckValue("", actualValue[20], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[21], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[22], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[23], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[24], 65533UL));
+                VerifyOrReturn(CheckValue("", actualValue[20], 21UL));
+                VerifyOrReturn(CheckValue("", actualValue[21], 22UL));
+                VerifyOrReturn(CheckValue("", actualValue[22], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[23], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[24], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[25], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[26], 65533UL));
             }
 
             NextTest();
@@ -136530,7 +149959,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read NodeLabel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read NodeLabel: Error: %@", err);
+            } else {
+                NSLog(@"Read NodeLabel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136555,7 +149988,11 @@ class TestBasicInformation : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"My node";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write NodeLabel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write NodeLabel: Error: %@", err);
+            } else {
+                NSLog(@"Write NodeLabel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136573,7 +150010,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back NodeLabel Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back NodeLabel: Error: %@", err);
+            } else {
+                NSLog(@"Read back NodeLabel: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136596,7 +150037,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocalConfigDisabledWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read LocalConfigDisabled Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read LocalConfigDisabled: Error: %@", err);
+            } else {
+                NSLog(@"Read LocalConfigDisabled: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136622,7 +150067,11 @@ class TestBasicInformation : public TestCommandBridge {
         localConfigDisabledArgument =
             [NSNumber numberWithBool:true];
         [cluster writeAttributeLocalConfigDisabledWithValue:localConfigDisabledArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write LocalConfigDisabled Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write LocalConfigDisabled: Error: %@", err);
+            } else {
+                NSLog(@"Write LocalConfigDisabled: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136640,7 +150089,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocalConfigDisabledWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back LocalConfigDisabled Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back LocalConfigDisabled: Error: %@", err);
+            } else {
+                NSLog(@"Read back LocalConfigDisabled: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136678,7 +150131,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back NodeLabel after reboot Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back NodeLabel after reboot: Error: %@", err);
+            } else {
+                NSLog(@"Read back NodeLabel after reboot: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136703,7 +150160,11 @@ class TestBasicInformation : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Restore initial NodeLabel value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Restore initial NodeLabel value: Error: %@", err);
+            } else {
+                NSLog(@"Restore initial NodeLabel value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136721,7 +150182,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocalConfigDisabledWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back LocalConfigDisabled after reboot Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back LocalConfigDisabled after reboot: Error: %@", err);
+            } else {
+                NSLog(@"Read back LocalConfigDisabled after reboot: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136747,7 +150212,11 @@ class TestBasicInformation : public TestCommandBridge {
         localConfigDisabledArgument =
             [NSNumber numberWithBool:false];
         [cluster writeAttributeLocalConfigDisabledWithValue:localConfigDisabledArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Restore initial LocalConfigDisabled value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Restore initial LocalConfigDisabled value: Error: %@", err);
+            } else {
+                NSLog(@"Restore initial LocalConfigDisabled value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136757,7 +150226,7 @@ class TestBasicInformation : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheProductApppearanceValue_19()
+    CHIP_ERROR TestReadTheProductAppearanceValue_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -136765,7 +150234,11 @@ class TestBasicInformation : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeProductAppearanceWithCompletion:^(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ProductApppearance value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ProductAppearance value: Error: %@", err);
+            } else {
+                NSLog(@"Read the ProductAppearance value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136781,6 +150254,60 @@ class TestBasicInformation : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestReadTheSpecificationVersionValue_20()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeSpecificationVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read the Specification Version value: Error: %@", err);
+            } else {
+                NSLog(@"Read the Specification Version value: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("SpecificationVersion", actualValue, 16973824UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheMaxPathsPerInvokeValue_21()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaxPathsPerInvokeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Read the Max Paths Per Invoke value: Error: %@", err);
+            } else {
+                NSLog(@"Read the Max Paths Per Invoke value: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MaxPathsPerInvoke", actualValue, 1U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
@@ -136934,7 +150461,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCommissionedFabricsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read number of commissioned fabrics Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read number of commissioned fabrics: Error: %@", err);
+            } else {
+                NSLog(@"Read number of commissioned fabrics: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136959,7 +150490,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Read current fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -136987,7 +150522,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open commissioning window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open commissioning window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open commissioning window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137026,7 +150565,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
 
         test_TestFabricRemovalWhileSubscribed_Fabrics_Reported
             = ^(NSArray * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe Fabrics Attribute from beta Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe Fabrics Attribute from beta: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe Fabrics Attribute from beta: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137056,7 +150599,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe Fabrics Attribute from beta Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe Fabrics Attribute from beta: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe Fabrics Attribute from beta: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestFabricRemovalWhileSubscribed_Fabrics_Reported
@@ -137083,7 +150630,11 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge {
             [ourFabricIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove single own fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove single own fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove single own fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137465,7 +151016,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         breadcrumbArgument =
             [NSNumber numberWithUnsignedLongLong:137438953472ULL];
         [cluster writeAttributeBreadcrumbWithValue:breadcrumbArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write Breadcrumb (1/2) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write Breadcrumb (1/2): Error: %@", err);
+            } else {
+                NSLog(@"Write Breadcrumb (1/2): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137483,7 +151038,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back Breadcrumb (1/2) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back Breadcrumb (1/2): Error: %@", err);
+            } else {
+                NSLog(@"Read back Breadcrumb (1/2): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137509,7 +151068,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         breadcrumbArgument =
             [NSNumber numberWithUnsignedLongLong:81ULL];
         [cluster writeAttributeBreadcrumbWithValue:breadcrumbArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write Breadcrumb (2/2) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write Breadcrumb (2/2): Error: %@", err);
+            } else {
+                NSLog(@"Write Breadcrumb (2/2): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137527,7 +151090,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back Breadcrumb (2/2) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back Breadcrumb (2/2): Error: %@", err);
+            } else {
+                NSLog(@"Read back Breadcrumb (2/2): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137565,7 +151132,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back Breadcrumb after reboot and ensure it was not persisted Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back Breadcrumb after reboot and ensure it was not persisted: Error: %@", err);
+            } else {
+                NSLog(@"Read back Breadcrumb after reboot and ensure it was not persisted: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137591,7 +151162,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         breadcrumbArgument =
             [NSNumber numberWithUnsignedLongLong:1ULL];
         [cluster writeAttributeBreadcrumbWithValue:breadcrumbArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Set Breadcrumb to nonzero value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Set Breadcrumb to nonzero value: Error: %@", err);
+            } else {
+                NSLog(@"Set Breadcrumb to nonzero value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137609,7 +151184,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb set worked Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb set worked: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb set worked: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137633,7 +151212,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
 
         [cluster commissioningCompleteWithCompletion:
                      ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Send CommissioningComplete without armed fail-safe Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send CommissioningComplete without armed fail-safe: Error: %@", err);
+                         } else {
+                             NSLog(@"Send CommissioningComplete without armed fail-safe: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137656,7 +151239,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was not touched by invalid CommissioningComplete Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was not touched by invalid CommissioningComplete: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was not touched by invalid CommissioningComplete: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137683,7 +151270,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137707,7 +151298,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:5000ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Try to arm fail-safe Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Try to arm fail-safe: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Try to arm fail-safe: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137730,7 +151325,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with commissioning window open Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with commissioning window open: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with commissioning window open: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137756,7 +151355,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         breadcrumbArgument =
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster writeAttributeBreadcrumbWithValue:breadcrumbArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Reset Breadcrumb to 0 so we can commission Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Reset Breadcrumb to 0 so we can commission: Error: %@", err);
+            } else {
+                NSLog(@"Reset Breadcrumb to 0 so we can commission: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137797,7 +151400,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:2ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Arm fail-safe Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Arm fail-safe: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Arm fail-safe: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137820,7 +151427,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was properly set by ArmFailSafe Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was properly set by ArmFailSafe: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was properly set by ArmFailSafe: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137849,7 +151460,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:5000ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Try to arm fail-safe from wrong fabric Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Try to arm fail-safe from wrong fabric: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Try to arm fail-safe from wrong fabric: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137872,7 +151487,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with existing fail-safe armed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with existing fail-safe armed: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was not touched by ArmFailSafe with existing fail-safe armed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137896,7 +151515,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
 
         [cluster commissioningCompleteWithCompletion:
                      ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Send CommissioningComplete from wrong fabric Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send CommissioningComplete from wrong fabric: Error: %@", err);
+                         } else {
+                             NSLog(@"Send CommissioningComplete from wrong fabric: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137919,7 +151542,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was not touched by CommissioningComplete from wrong fabric Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was not touched by CommissioningComplete from wrong fabric: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was not touched by CommissioningComplete from wrong fabric: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137943,7 +151570,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
 
         [cluster commissioningCompleteWithCompletion:
                      ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Close out the fail-safe gracefully Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close out the fail-safe gracefully: Error: %@", err);
+                         } else {
+                             NSLog(@"Close out the fail-safe gracefully: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137966,7 +151597,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was reset to 0 by CommissioningComplete Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was reset to 0 by CommissioningComplete: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was reset to 0 by CommissioningComplete: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -137995,7 +151630,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:3ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Arm fail-safe again Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Arm fail-safe again: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Arm fail-safe again: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138018,7 +151657,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was set by arming fail-safe again Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was set by arming fail-safe again: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was set by arming fail-safe again: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138047,7 +151690,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:4ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Force-expire the fail-safe Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Force-expire the fail-safe: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Force-expire the fail-safe: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138070,7 +151717,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeBreadcrumbWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check Breadcrumb was reset by expiring the fail-safe Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check Breadcrumb was reset by expiring the fail-safe: Error: %@", err);
+            } else {
+                NSLog(@"Check Breadcrumb was reset by expiring the fail-safe: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138093,7 +151744,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportsConcurrentConnectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate presence of SupportsConcurrentConnection Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate presence of SupportsConcurrentConnection: Error: %@", err);
+            } else {
+                NSLog(@"Validate presence of SupportsConcurrentConnection: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138113,7 +151768,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeRegulatoryConfigWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read original regulatory location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read original regulatory location: Error: %@", err);
+            } else {
+                NSLog(@"Read original regulatory location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138136,7 +151795,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read original location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read original location: Error: %@", err);
+            } else {
+                NSLog(@"Read original location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138169,7 +151832,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster setRegulatoryConfigWithParams:params completion:
                                                           ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Try to SetRegulatoryConfig with 0-length country code Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with 0-length country code: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with 0-length country code: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                               NextTest();
@@ -138186,7 +151853,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back location Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back location: Error: %@", err);
+            } else {
+                NSLog(@"Read back location: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138216,7 +151887,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster setRegulatoryConfigWithParams:params completion:
                                                           ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Try to SetRegulatoryConfig with length-1 country code Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with length-1 country code: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with length-1 country code: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                               NextTest();
@@ -138233,7 +151908,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back location second time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back location second time: Error: %@", err);
+            } else {
+                NSLog(@"Read back location second time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138263,7 +151942,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster setRegulatoryConfigWithParams:params completion:
                                                           ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Try to SetRegulatoryConfig with length-2 country code Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with length-2 country code: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Try to SetRegulatoryConfig with length-2 country code: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138291,7 +151974,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLocationWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back location third time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back location third time: Error: %@", err);
+            } else {
+                NSLog(@"Read back location third time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138322,7 +152009,11 @@ class TestGeneralCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster setRegulatoryConfigWithParams:params completion:
                                                           ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Restore initial values Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Restore initial values: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Restore initial values: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138435,7 +152126,11 @@ class TestIdentifyCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster identifyWithParams:params completion:
                                                ^(NSError * _Nullable err) {
-                                                   NSLog(@"Send Identify command and expect success response Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Send Identify command and expect success response: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Send Identify command and expect success response: Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138586,7 +152281,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedFabricsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read number of supported fabrics Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read number of supported fabrics: Error: %@", err);
+            } else {
+                NSLog(@"Read number of supported fabrics: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138607,7 +152306,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCommissionedFabricsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read number of commissioned fabrics Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read number of commissioned fabrics: Error: %@", err);
+            } else {
+                NSLog(@"Read number of commissioned fabrics: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138629,7 +152332,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Read current fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138657,7 +152364,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:243U];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove nonexistent fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove nonexistent fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove nonexistent fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138682,7 +152393,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeFabricsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read fabric list before setting label Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read fabric list before setting label: Error: %@", err);
+            } else {
+                NSLog(@"Read fabric list before setting label: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138710,7 +152425,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         params.label = @"Batcave";
         [cluster updateFabricLabelWithParams:params completion:
                                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"Set the fabric label Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Set the fabric label: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Set the fabric label: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -138740,7 +152459,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeFabricsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read fabric list after setting label Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read fabric list after setting label: Error: %@", err);
+            } else {
+                NSLog(@"Read fabric list after setting label: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139066,7 +152789,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Description Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Description: Error: %@", err);
+            } else {
+                NSLog(@"Read Description: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139089,7 +152816,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read StandardNamespace Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read StandardNamespace: Error: %@", err);
+            } else {
+                NSLog(@"Read StandardNamespace: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139113,7 +152844,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read SupportedModes Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read SupportedModes: Error: %@", err);
+            } else {
+                NSLog(@"Read SupportedModes: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139151,7 +152886,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CurrentMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read CurrentMode: Error: %@", err);
+            } else {
+                NSLog(@"Read CurrentMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139174,7 +152913,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read StartUpMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read StartUpMode: Error: %@", err);
+            } else {
+                NSLog(@"Read StartUpMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139198,7 +152941,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read OnMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read OnMode: Error: %@", err);
+            } else {
+                NSLog(@"Read OnMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139225,7 +152972,11 @@ class TestModeSelectCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:4U];
         [cluster changeToModeWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Change to Supported Mode Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Change to Supported Mode: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Change to Supported Mode: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139244,7 +152995,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Current Mode Change Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify Current Mode Change: Error: %@", err);
+            } else {
+                NSLog(@"Verify Current Mode Change: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139274,7 +153029,11 @@ class TestModeSelectCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster changeToModeWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Change to Unsupported Mode Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Change to Unsupported Mode: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Change to Unsupported Mode: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                        NextTest();
@@ -139292,7 +153051,11 @@ class TestModeSelectCluster : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Toggle OnOff Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Toggle OnOff: Error: %@", err);
+                         } else {
+                             NSLog(@"Toggle OnOff: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139311,7 +153074,11 @@ class TestModeSelectCluster : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Toggle OnOff Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Toggle OnOff: Error: %@", err);
+                         } else {
+                             NSLog(@"Toggle OnOff: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139329,7 +153096,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Current Mode does not change when OnMode is null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify Current Mode does not change when OnMode is null: Error: %@", err);
+            } else {
+                NSLog(@"Verify Current Mode does not change when OnMode is null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139355,7 +153126,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         onModeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeOnModeWithValue:onModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change to Unsupported OnMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change to Unsupported OnMode: Error: %@", err);
+            } else {
+                NSLog(@"Change to Unsupported OnMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
             NextTest();
@@ -139375,7 +153150,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         onModeArgument =
             [NSNumber numberWithUnsignedChar:7U];
         [cluster writeAttributeOnModeWithValue:onModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change OnMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change OnMode: Error: %@", err);
+            } else {
+                NSLog(@"Change OnMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139394,7 +153173,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify OnMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify OnMode: Error: %@", err);
+            } else {
+                NSLog(@"Verify OnMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139422,7 +153205,11 @@ class TestModeSelectCluster : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Toggle OnOff Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Toggle OnOff: Error: %@", err);
+                         } else {
+                             NSLog(@"Toggle OnOff: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139441,7 +153228,11 @@ class TestModeSelectCluster : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Toggle OnOff Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Toggle OnOff: Error: %@", err);
+                         } else {
+                             NSLog(@"Toggle OnOff: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139459,7 +153250,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Current Mode Changes if OnMode is not null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify Current Mode Changes if OnMode is not null: Error: %@", err);
+            } else {
+                NSLog(@"Verify Current Mode Changes if OnMode is not null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139485,7 +153280,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         startUpModeArgument =
             [NSNumber numberWithUnsignedChar:2U];
         [cluster writeAttributeStartUpModeWithValue:startUpModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change to Unsupported StartUp Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change to Unsupported StartUp Mode: Error: %@", err);
+            } else {
+                NSLog(@"Change to Unsupported StartUp Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
             NextTest();
@@ -139505,7 +153304,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         startUpModeArgument =
             [NSNumber numberWithUnsignedChar:7U];
         [cluster writeAttributeStartUpModeWithValue:startUpModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change to Supported StartUp Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change to Supported StartUp Mode: Error: %@", err);
+            } else {
+                NSLog(@"Change to Supported StartUp Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139523,7 +153326,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify StartUp Mode Change Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify StartUp Mode Change: Error: %@", err);
+            } else {
+                NSLog(@"Verify StartUp Mode Change: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139551,7 +153358,11 @@ class TestModeSelectCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster changeToModeWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Change CurrentMode to another value Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Change CurrentMode to another value: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Change CurrentMode to another value: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139572,7 +153383,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         onModeArgument =
             [NSNumber numberWithUnsignedChar:4U];
         [cluster writeAttributeOnModeWithValue:onModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change On Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change On Mode: Error: %@", err);
+            } else {
+                NSLog(@"Change On Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139593,7 +153408,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         startUpOnOffArgument =
             [NSNumber numberWithUnsignedChar:1U];
         [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Set StartUpOnOff Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Set StartUpOnOff: Error: %@", err);
+            } else {
+                NSLog(@"Set StartUpOnOff: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139626,7 +153445,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Current Mode Change based on OnMode, as it overwrites StartUpMode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify Current Mode Change based on OnMode, as it overwrites StartUpMode: Error: %@", err);
+            } else {
+                NSLog(@"Verify Current Mode Change based on OnMode, as it overwrites StartUpMode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139651,7 +153474,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         id onModeArgument;
         onModeArgument = nil;
         [cluster writeAttributeOnModeWithValue:onModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Change On Mode to Null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Change On Mode to Null: Error: %@", err);
+            } else {
+                NSLog(@"Change On Mode to Null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139684,7 +153511,11 @@ class TestModeSelectCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify Current Mode Change based on new StartUp Mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify Current Mode Change based on new StartUp Mode: Error: %@", err);
+            } else {
+                NSLog(@"Verify Current Mode Change based on new StartUp Mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139833,7 +153664,11 @@ class TestTemperatureControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedTemperatureLevelsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read supported temperature levels Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read supported temperature levels: Error: %@", err);
+            } else {
+                NSLog(@"Read supported temperature levels: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139859,7 +153694,11 @@ class TestTemperatureControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read selected temperature level Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read selected temperature level: Error: %@", err);
+            } else {
+                NSLog(@"Read selected temperature level: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139886,7 +153725,11 @@ class TestTemperatureControl : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster setTemperatureWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Set temperature level to different level Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Set temperature level to different level: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Set temperature level to different level: Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139904,7 +153747,11 @@ class TestTemperatureControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back selected temperature level Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back selected temperature level: Error: %@", err);
+            } else {
+                NSLog(@"Read back selected temperature level: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -139931,7 +153778,11 @@ class TestTemperatureControl : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:3U];
         [cluster setTemperatureWithParams:params completion:
                                                      ^(NSError * _Nullable err) {
-                                                         NSLog(@"Set temperature level to different level Error: %@", err);
+                                                         if (err != nil) {
+                                                             NSLog(@"Set temperature level to different level: Error: %@", err);
+                                                         } else {
+                                                             NSLog(@"Set temperature level to different level: Success");
+                                                         }
 
                                                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                          NextTest();
@@ -139948,7 +153799,11 @@ class TestTemperatureControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSelectedTemperatureLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back selected temperature level Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back selected temperature level: Error: %@", err);
+            } else {
+                NSLog(@"Read back selected temperature level: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140076,7 +153931,11 @@ class TestSelfFabricRemoval : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCommissionedFabricsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read number of commissioned fabrics Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read number of commissioned fabrics: Error: %@", err);
+            } else {
+                NSLog(@"Read number of commissioned fabrics: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140101,7 +153960,11 @@ class TestSelfFabricRemoval : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Read current fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140129,7 +153992,11 @@ class TestSelfFabricRemoval : public TestCommandBridge {
             [ourFabricIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove single own fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove single own fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove single own fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140792,7 +154659,11 @@ class TestBinding : public TestCommandBridge {
             bindingArgument = temp_0;
         }
         [cluster writeAttributeBindingWithValue:bindingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write empty binding table Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write empty binding table: Error: %@", err);
+            } else {
+                NSLog(@"Write empty binding table: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140812,7 +154683,11 @@ class TestBinding : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeBindingWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read empty binding table Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read empty binding table: Error: %@", err);
+            } else {
+                NSLog(@"Read empty binding table: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140856,7 +154731,11 @@ class TestBinding : public TestCommandBridge {
             bindingArgument = temp_0;
         }
         [cluster writeAttributeBindingWithValue:bindingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write invalid binding table Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write invalid binding table: Error: %@", err);
+            } else {
+                NSLog(@"Write invalid binding table: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -140902,7 +154781,11 @@ class TestBinding : public TestCommandBridge {
             bindingArgument = temp_0;
         }
         [cluster writeAttributeBindingWithValue:bindingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write binding table (endpoint 1) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write binding table (endpoint 1): Error: %@", err);
+            } else {
+                NSLog(@"Write binding table (endpoint 1): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140922,7 +154805,11 @@ class TestBinding : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeBindingWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read binding table (endpoint 1) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read binding table (endpoint 1): Error: %@", err);
+            } else {
+                NSLog(@"Read binding table (endpoint 1): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140967,7 +154854,11 @@ class TestBinding : public TestCommandBridge {
             bindingArgument = temp_0;
         }
         [cluster writeAttributeBindingWithValue:bindingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write binding table (endpoint 0) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write binding table (endpoint 0): Error: %@", err);
+            } else {
+                NSLog(@"Write binding table (endpoint 0): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -140987,7 +154878,11 @@ class TestBinding : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeBindingWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read binding table (endpoint 0) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read binding table (endpoint 0): Error: %@", err);
+            } else {
+                NSLog(@"Read binding table (endpoint 0): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141015,7 +154910,11 @@ class TestBinding : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeBindingWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify endpoint 1 not changed Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify endpoint 1 not changed: Error: %@", err);
+            } else {
+                NSLog(@"Verify endpoint 1 not changed: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141162,7 +155061,11 @@ class TestBinding : public TestCommandBridge {
             bindingArgument = temp_0;
         }
         [cluster writeAttributeBindingWithValue:bindingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write over-long binding table on endpoint 1 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write over-long binding table on endpoint 1: Error: %@", err);
+            } else {
+                NSLog(@"Write over-long binding table on endpoint 1: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
             NextTest();
@@ -141340,7 +155243,11 @@ class TestUserLabelCluster : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Commit User Label List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Commit User Label List: Error: %@", err);
+            } else {
+                NSLog(@"Commit User Label List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141358,7 +155265,11 @@ class TestUserLabelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify committed User Label List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify committed User Label List: Error: %@", err);
+            } else {
+                NSLog(@"Verify committed User Label List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141394,7 +155305,11 @@ class TestUserLabelCluster : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Clear User Label List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Clear User Label List: Error: %@", err);
+            } else {
+                NSLog(@"Clear User Label List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141412,7 +155327,11 @@ class TestUserLabelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read User Label List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read User Label List: Error: %@", err);
+            } else {
+                NSLog(@"Read User Label List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141456,7 +155375,11 @@ class TestUserLabelCluster : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write User Label List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write User Label List: Error: %@", err);
+            } else {
+                NSLog(@"Write User Label List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141489,7 +155412,11 @@ class TestUserLabelCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLabelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify User Label List after reboot Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Verify User Label List after reboot: Error: %@", err);
+            } else {
+                NSLog(@"Verify User Label List after reboot: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141627,7 +155554,11 @@ class TestUserLabelClusterConstraints : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Attempt to write overly long item for label Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Attempt to write overly long item for label: Error: %@", err);
+            } else {
+                NSLog(@"Attempt to write overly long item for label: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -141653,7 +155584,11 @@ class TestUserLabelClusterConstraints : public TestCommandBridge {
             labelListArgument = temp_0;
         }
         [cluster writeAttributeLabelListWithValue:labelListArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Attempt to write overly long item for value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Attempt to write overly long item for value: Error: %@", err);
+            } else {
+                NSLog(@"Attempt to write overly long item for value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -141817,7 +155752,11 @@ class TestArmFailSafe : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeFabricsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query fabrics list Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Query fabrics list: Error: %@", err);
+            } else {
+                NSLog(@"Query fabrics list: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141849,7 +155788,11 @@ class TestArmFailSafe : public TestCommandBridge {
             [NSNumber numberWithUnsignedLongLong:0ULL];
         [cluster armFailSafeWithParams:params completion:
                                                   ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"ArmFailSafe on target device with timeout 0 Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"ArmFailSafe on target device with timeout 0: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"ArmFailSafe on target device with timeout 0: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141872,7 +155815,11 @@ class TestArmFailSafe : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads NodeLabel mandatory attribute of target device Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Reads NodeLabel mandatory attribute of target device: Error: %@", err);
+            } else {
+                NSLog(@"Reads NodeLabel mandatory attribute of target device: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -141899,7 +155846,11 @@ class TestArmFailSafe : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"00000000" length:8];
         [cluster addTrustedRootCertificateWithParams:params completion:
                                                                 ^(NSError * _Nullable err) {
-                                                                    NSLog(@"Invoke AddTrustedRootCertificate without fail-safe Error: %@", err);
+                                                                    if (err != nil) {
+                                                                        NSLog(@"Invoke AddTrustedRootCertificate without fail-safe: Error: %@", err);
+                                                                    } else {
+                                                                        NSLog(@"Invoke AddTrustedRootCertificate without fail-safe: Success");
+                                                                    }
 
                                                                     VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
                                                                     NextTest();
@@ -141926,7 +155877,11 @@ class TestArmFailSafe : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65521U];
         [cluster addNOCWithParams:params completion:
                                              ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                 NSLog(@"Invoke AddNOC without fail-safe Error: %@", err);
+                                                 if (err != nil) {
+                                                     NSLog(@"Invoke AddNOC without fail-safe: Error: %@", err);
+                                                 } else {
+                                                     NSLog(@"Invoke AddNOC without fail-safe: Success");
+                                                 }
 
                                                  VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
                                                  NextTest();
@@ -141947,7 +155902,11 @@ class TestArmFailSafe : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"00112233" length:8];
         [cluster updateNOCWithParams:params completion:
                                                 ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Invoke UpdateNOC without fail-safe Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Invoke UpdateNOC without fail-safe: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Invoke UpdateNOC without fail-safe: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
                                                     NextTest();
@@ -141968,7 +155927,11 @@ class TestArmFailSafe : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007" length:32];
         [cluster CSRRequestWithParams:params completion:
                                                  ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                     NSLog(@"Invoke CSRRequest without fail-safe Error: %@", err);
+                                                     if (err != nil) {
+                                                         NSLog(@"Invoke CSRRequest without fail-safe: Error: %@", err);
+                                                     } else {
+                                                         NSLog(@"Invoke CSRRequest without fail-safe: Success");
+                                                     }
 
                                                      VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
                                                      NextTest();
@@ -142031,92 +155994,84 @@ class TestFanControl : public TestCommandBridge {
             err = TestReadBackFanMode_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Write fan mode sequence\n");
-            err = TestWriteFanModeSequence_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Write percent setting\n");
+            err = TestWritePercentSetting_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read back fan mode sequence\n");
-            err = TestReadBackFanModeSequence_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read back percent setting\n");
+            err = TestReadBackPercentSetting_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Write percent setting\n");
-            err = TestWritePercentSetting_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read back speed setting\n");
+            err = TestReadBackSpeedSetting_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read back percent setting\n");
-            err = TestReadBackPercentSetting_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read back speed current\n");
+            err = TestReadBackSpeedCurrent_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read back speed setting\n");
-            err = TestReadBackSpeedSetting_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Write percent setting\n");
+            err = TestWritePercentSetting_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read back speed current\n");
-            err = TestReadBackSpeedCurrent_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read back percent setting\n");
+            err = TestReadBackPercentSetting_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Write percent setting\n");
-            err = TestWritePercentSetting_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Write speed setting\n");
+            err = TestWriteSpeedSetting_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Read back percent setting\n");
-            err = TestReadBackPercentSetting_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Read back speed setting\n");
+            err = TestReadBackSpeedSetting_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Write speed setting\n");
-            err = TestWriteSpeedSetting_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read back percent setting\n");
+            err = TestReadBackPercentSetting_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Read back speed setting\n");
-            err = TestReadBackSpeedSetting_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Read back percent current\n");
+            err = TestReadBackPercentCurrent_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Read back percent setting\n");
-            err = TestReadBackPercentSetting_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Write speed setting\n");
+            err = TestWriteSpeedSetting_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Read back percent current\n");
-            err = TestReadBackPercentCurrent_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Read back speed setting\n");
+            err = TestReadBackSpeedSetting_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Write speed setting\n");
-            err = TestWriteSpeedSetting_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Write fan mode\n");
+            err = TestWriteFanMode_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Read back speed setting\n");
-            err = TestReadBackSpeedSetting_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Read back percent setting\n");
+            err = TestReadBackPercentSetting_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Write fan mode\n");
-            err = TestWriteFanMode_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Read back percent current\n");
+            err = TestReadBackPercentCurrent_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Read back percent setting\n");
-            err = TestReadBackPercentSetting_18();
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Read back speed setting\n");
+            err = TestReadBackSpeedSetting_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Read back percent current\n");
-            err = TestReadBackPercentCurrent_19();
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Read back speed current\n");
+            err = TestReadBackSpeedCurrent_19();
             break;
         case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Read back speed setting\n");
-            err = TestReadBackSpeedSetting_20();
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Write fan mode\n");
+            err = TestWriteFanMode_20();
             break;
         case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Read back speed current\n");
-            err = TestReadBackSpeedCurrent_21();
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read back percent setting\n");
+            err = TestReadBackPercentSetting_21();
             break;
         case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Write fan mode\n");
-            err = TestWriteFanMode_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Read back percent setting\n");
-            err = TestReadBackPercentSetting_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Read back speed setting\n");
-            err = TestReadBackSpeedSetting_24();
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Read back speed setting\n");
+            err = TestReadBackSpeedSetting_22();
             break;
         }
 
@@ -142198,12 +156153,6 @@ class TestFanControl : public TestCommandBridge {
         case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -142214,7 +156163,7 @@ class TestFanControl : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 25;
+    const uint16_t mTestCount = 23;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -142240,7 +156189,11 @@ class TestFanControl : public TestCommandBridge {
         fanModeArgument =
             [NSNumber numberWithUnsignedChar:3U];
         [cluster writeAttributeFanModeWithValue:fanModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write fan mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write fan mode: Error: %@", err);
+            } else {
+                NSLog(@"Write fan mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142258,57 +156211,17 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFanModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back fan mode Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FanMode", actualValue, 3U));
+            if (err != nil) {
+                NSLog(@"Read back fan mode: Error: %@", err);
+            } else {
+                NSLog(@"Read back fan mode: Success");
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWriteFanModeSequence_3()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id fanModeSequenceArgument;
-        fanModeSequenceArgument =
-            [NSNumber numberWithUnsignedChar:5U];
-        [cluster writeAttributeFanModeSequenceWithValue:fanModeSequenceArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write fan mode sequence Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadBackFanModeSequence_4()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeFanModeSequenceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back fan mode sequence Error: %@", err);
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("FanModeSequence", actualValue, 5U));
+                VerifyOrReturn(CheckValue("FanMode", actualValue, 3U));
             }
 
             NextTest();
@@ -142317,7 +156230,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritePercentSetting_5()
+    CHIP_ERROR TestWritePercentSetting_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142328,7 +156241,11 @@ class TestFanControl : public TestCommandBridge {
         percentSettingArgument =
             [NSNumber numberWithUnsignedChar:84U];
         [cluster writeAttributePercentSettingWithValue:percentSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Write percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142338,7 +156255,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentSetting_6()
+    CHIP_ERROR TestReadBackPercentSetting_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142346,7 +156263,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142362,7 +156283,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedSetting_7()
+    CHIP_ERROR TestReadBackSpeedSetting_5()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142370,7 +156291,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142386,7 +156311,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedCurrent_8()
+    CHIP_ERROR TestReadBackSpeedCurrent_6()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142394,7 +156319,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed current Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed current: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed current: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142409,7 +156338,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritePercentSetting_9()
+    CHIP_ERROR TestWritePercentSetting_7()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142419,7 +156348,11 @@ class TestFanControl : public TestCommandBridge {
         id percentSettingArgument;
         percentSettingArgument = nil;
         [cluster writeAttributePercentSettingWithValue:percentSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Write percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142429,7 +156362,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentSetting_10()
+    CHIP_ERROR TestReadBackPercentSetting_8()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142437,7 +156370,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142453,7 +156390,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteSpeedSetting_11()
+    CHIP_ERROR TestWriteSpeedSetting_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142464,7 +156401,11 @@ class TestFanControl : public TestCommandBridge {
         speedSettingArgument =
             [NSNumber numberWithUnsignedChar:73U];
         [cluster writeAttributeSpeedSettingWithValue:speedSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Write speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142474,7 +156415,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedSetting_12()
+    CHIP_ERROR TestReadBackSpeedSetting_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142482,7 +156423,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142498,7 +156443,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentSetting_13()
+    CHIP_ERROR TestReadBackPercentSetting_11()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142506,7 +156451,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142522,7 +156471,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentCurrent_14()
+    CHIP_ERROR TestReadBackPercentCurrent_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142530,7 +156479,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent current Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent current: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent current: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142545,7 +156498,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteSpeedSetting_15()
+    CHIP_ERROR TestWriteSpeedSetting_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142555,7 +156508,11 @@ class TestFanControl : public TestCommandBridge {
         id speedSettingArgument;
         speedSettingArgument = nil;
         [cluster writeAttributeSpeedSettingWithValue:speedSettingArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Write speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142565,7 +156522,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedSetting_16()
+    CHIP_ERROR TestReadBackSpeedSetting_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142573,7 +156530,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142589,7 +156550,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteFanMode_17()
+    CHIP_ERROR TestWriteFanMode_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142600,7 +156561,11 @@ class TestFanControl : public TestCommandBridge {
         fanModeArgument =
             [NSNumber numberWithUnsignedChar:0U];
         [cluster writeAttributeFanModeWithValue:fanModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write fan mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write fan mode: Error: %@", err);
+            } else {
+                NSLog(@"Write fan mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142610,7 +156575,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentSetting_18()
+    CHIP_ERROR TestReadBackPercentSetting_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142618,7 +156583,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142634,7 +156603,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentCurrent_19()
+    CHIP_ERROR TestReadBackPercentCurrent_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142642,7 +156611,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent current Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent current: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent current: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142657,7 +156630,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedSetting_20()
+    CHIP_ERROR TestReadBackSpeedSetting_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142665,7 +156638,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142681,7 +156658,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedCurrent_21()
+    CHIP_ERROR TestReadBackSpeedCurrent_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142689,7 +156666,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedCurrentWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed current Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed current: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed current: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142704,7 +156685,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteFanMode_22()
+    CHIP_ERROR TestWriteFanMode_20()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142715,7 +156696,11 @@ class TestFanControl : public TestCommandBridge {
         fanModeArgument =
             [NSNumber numberWithUnsignedChar:5U];
         [cluster writeAttributeFanModeWithValue:fanModeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write fan mode Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write fan mode: Error: %@", err);
+            } else {
+                NSLog(@"Write fan mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142725,7 +156710,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackPercentSetting_23()
+    CHIP_ERROR TestReadBackPercentSetting_21()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142733,7 +156718,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePercentSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back percent setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back percent setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back percent setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142748,7 +156737,7 @@ class TestFanControl : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackSpeedSetting_24()
+    CHIP_ERROR TestReadBackSpeedSetting_22()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -142756,7 +156745,11 @@ class TestFanControl : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSpeedSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read back speed setting Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read back speed setting: Error: %@", err);
+            } else {
+                NSLog(@"Read back speed setting: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142966,7 +156959,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: PASE reserved for future (TC-ACL-2.4 step 29) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: PASE reserved for future (TC-ACL-2.4 step 29): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: PASE reserved for future (TC-ACL-2.4 step 29): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143016,7 +157013,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: Invalid combination administer + group (TC-ACL-2.4 step 31) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: Invalid combination administer + group (TC-ACL-2.4 step 31): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: Invalid combination administer + group (TC-ACL-2.4 step 31): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143066,7 +157067,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error:  Invalid auth mode (TC-ACL-2.4 step 33) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error:  Invalid auth mode (TC-ACL-2.4 step 33): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error:  Invalid auth mode (TC-ACL-2.4 step 33): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143118,7 +157123,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error:  Invalid subject (TC-ACL-2.4 step 34) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error:  Invalid subject (TC-ACL-2.4 step 34): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error:  Invalid subject (TC-ACL-2.4 step 34): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143173,7 +157182,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error:  Invalid target (TC-ACL-2.4 step 38) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error:  Invalid target (TC-ACL-2.4 step 38): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error:  Invalid target (TC-ACL-2.4 step 38): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143230,7 +157243,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error:  target has both endpoint and device type (TC-ACL-2.4 step 42) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error:  target has both endpoint and device type (TC-ACL-2.4 step 42): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error:  target has both endpoint and device type (TC-ACL-2.4 step 42): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143277,7 +157294,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: Invalid privilege value step 32) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: Invalid privilege value step 32): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: Invalid privilege value step 32): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143329,7 +157350,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_FFFF (TC-ACL-2.4 step 35) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_FFFF (TC-ACL-2.4 step 35): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_FFFF (TC-ACL-2.4 step 35): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143381,7 +157406,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: invalid subject 0xFFFF_FFFD_0000_0000 (TC-ACL-2.4 step 36) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFD_0000_0000 (TC-ACL-2.4 step 36): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFD_0000_0000 (TC-ACL-2.4 step 36): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143433,7 +157462,11 @@ class TestAccessControlConstraints : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_0000 (TC-ACL-2.4 step 37) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_0000 (TC-ACL-2.4 step 37): Error: %@", err);
+            } else {
+                NSLog(@"Constraint error: invalid subject 0xFFFF_FFFF_FFFF_0000 (TC-ACL-2.4 step 37): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             NextTest();
@@ -143768,7 +157801,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Sends a MoveToLevel command to set CurrentLevel to min value Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Sends a MoveToLevel command to set CurrentLevel to min value: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Sends a MoveToLevel command to set CurrentLevel to min value: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143794,7 +157831,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143821,7 +157862,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         onOffTransitionTimeArgument =
             [NSNumber numberWithUnsignedShort:0U];
         [cluster writeAttributeOnOffTransitionTimeWithValue:onOffTransitionTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Write OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143847,7 +157892,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffTransitionTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read OnOffTransitionTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read OnOffTransitionTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read OnOffTransitionTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143873,7 +157922,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         onLevelArgument =
             [NSNumber numberWithUnsignedChar:254U];
         [cluster writeAttributeOnLevelWithValue:onLevelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write OnLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write OnLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Write OnLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143899,7 +157952,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read OnLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read OnLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read OnLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143923,7 +157980,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read MinValue attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read MinValue attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read MinValue attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143947,7 +158008,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143965,7 +158030,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -143996,7 +158065,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"If OnLevel is defined, check CurrentLevel is OnLevel value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"If OnLevel is defined, check CurrentLevel is OnLevel value: Error: %@", err);
+            } else {
+                NSLog(@"If OnLevel is defined, check CurrentLevel is OnLevel value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144021,7 +158094,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144039,7 +158116,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144070,7 +158151,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"If OnLevel is defined, check CurrentLevel is min value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"If OnLevel is defined, check CurrentLevel is min value: Error: %@", err);
+            } else {
+                NSLog(@"If OnLevel is defined, check CurrentLevel is min value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144104,7 +158189,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster moveToLevelWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Sends a MoveToLevel command to set CurrentLevel to a mid value Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Sends a MoveToLevel command to set CurrentLevel to a mid value: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Sends a MoveToLevel command to set CurrentLevel to a mid value: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144130,7 +158219,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads CurrentLevel attribute from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Reads CurrentLevel attribute from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Reads CurrentLevel attribute from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144156,7 +158249,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         id onLevelArgument;
         onLevelArgument = nil;
         [cluster writeAttributeOnLevelWithValue:onLevelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Set OnLevel attribute to null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Set OnLevel attribute to null: Error: %@", err);
+            } else {
+                NSLog(@"Set OnLevel attribute to null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144182,7 +158279,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read OnLevel attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read OnLevel attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read OnLevel attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144206,7 +158307,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send On Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send On Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send On Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144224,7 +158329,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is true after on command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is true after on command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144255,7 +158364,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"If OnLevel is not defined, check CurrentLevel is restored Error: %@", err);
+            if (err != nil) {
+                NSLog(@"If OnLevel is not defined, check CurrentLevel is restored: Error: %@", err);
+            } else {
+                NSLog(@"If OnLevel is not defined, check CurrentLevel is restored: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144280,7 +158393,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Send Off Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Send Off Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Send Off Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144298,7 +158415,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check on/off attribute value is false after off command: Error: %@", err);
+            } else {
+                NSLog(@"Check on/off attribute value is false after off command: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144329,7 +158450,11 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"If OnLevel is not defined, check CurrentLevel is restored Error: %@", err);
+            if (err != nil) {
+                NSLog(@"If OnLevel is not defined, check CurrentLevel is restored: Error: %@", err);
+            } else {
+                NSLog(@"If OnLevel is not defined, check CurrentLevel is restored: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144633,7 +158758,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get alpha's fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get alpha's fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Get alpha's fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144655,7 +158784,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is not open Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is not open: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is not open: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144678,7 +158811,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that there is no AdminFabricIndex Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that there is no AdminFabricIndex: Error: %@", err);
+            } else {
+                NSLog(@"Check that there is no AdminFabricIndex: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144701,7 +158838,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that there is no AdminVendorId Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that there is no AdminVendorId: Error: %@", err);
+            } else {
+                NSLog(@"Check that there is no AdminVendorId: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144728,7 +158869,11 @@ class TestCommissioningWindow : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144746,7 +158891,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is open Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is open: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is open: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144769,7 +158918,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminFabricIndex Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminFabricIndex: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminFabricIndex: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144797,7 +158950,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminVendorId is not null Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminVendorId is not null: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminVendorId is not null: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144820,7 +158977,11 @@ class TestCommissioningWindow : public TestCommandBridge {
 
         [cluster revokeCommissioningWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Close Commissioning Window Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close Commissioning Window: Error: %@", err);
+                         } else {
+                             NSLog(@"Close Commissioning Window: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144838,7 +158999,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is again not open Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is again not open: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is again not open: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144861,7 +159026,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that again there is no AdminFabricIndex Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that again there is no AdminFabricIndex: Error: %@", err);
+            } else {
+                NSLog(@"Check that again there is no AdminFabricIndex: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144884,7 +159053,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that again there is no AdminVendorId Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that again there is no AdminVendorId: Error: %@", err);
+            } else {
+                NSLog(@"Check that again there is no AdminVendorId: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144911,7 +159084,11 @@ class TestCommissioningWindow : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha again Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha again: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha again: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144946,7 +159123,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is not open for the third time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is not open for the third time: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is not open for the third time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144969,7 +159150,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that there is no AdminFabricIndex for the third time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that there is no AdminFabricIndex for the third time: Error: %@", err);
+            } else {
+                NSLog(@"Check that there is no AdminFabricIndex for the third time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -144992,7 +159177,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that there is no AdminVendorId for the third time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that there is no AdminVendorId for the third time: Error: %@", err);
+            } else {
+                NSLog(@"Check that there is no AdminVendorId for the third time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145016,7 +159205,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get beta's fabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get beta's fabric index: Error: %@", err);
+            } else {
+                NSLog(@"Get beta's fabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145042,7 +159235,11 @@ class TestCommissioningWindow : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from beta Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from beta: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from beta: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145060,7 +159257,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is open again Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is open again: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is open again: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145083,7 +159284,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminFabricIndex again Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminFabricIndex again: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminFabricIndex again: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145112,7 +159317,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminVendorId is not null again Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminVendorId is not null again: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminVendorId is not null again: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145141,7 +159350,11 @@ class TestCommissioningWindow : public TestCommandBridge {
             [betaIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove beta fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove beta fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove beta fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145159,7 +159372,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeWindowStatusWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that commissioning window is still open Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that commissioning window is still open: Error: %@", err);
+            } else {
+                NSLog(@"Check that commissioning window is still open: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145182,7 +159399,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminFabricIndex got reset Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminFabricIndex got reset: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminFabricIndex got reset: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145205,7 +159426,11 @@ class TestCommissioningWindow : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAdminVendorIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check the AdminVendorId did not get reset Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check the AdminVendorId did not get reset: Error: %@", err);
+            } else {
+                NSLog(@"Check the AdminVendorId did not get reset: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145470,7 +159695,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145509,7 +159738,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145545,7 +159778,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the fabric ID from the alpha fabric Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the fabric ID from the alpha fabric: Error: %@", err);
+            } else {
+                NSLog(@"Read the fabric ID from the alpha fabric: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145581,7 +159818,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the fabric ID from the beta fabric Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the fabric ID from the beta fabric: Error: %@", err);
+            } else {
+                NSLog(@"Read the fabric ID from the beta fabric: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145617,7 +159858,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the fabric ID from the gamma fabric Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the fabric ID from the gamma fabric: Error: %@", err);
+            } else {
+                NSLog(@"Read the fabric ID from the gamma fabric: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145654,7 +159899,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ACL from alpha and check commissioner node id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ACL from alpha and check commissioner node id: Error: %@", err);
+            } else {
+                NSLog(@"Read the ACL from alpha and check commissioner node id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145686,7 +159935,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ACL from beta and check commissioner node id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ACL from beta and check commissioner node id: Error: %@", err);
+            } else {
+                NSLog(@"Read the ACL from beta and check commissioner node id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145718,7 +159971,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ACL from gamma and check commissioner node id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ACL from gamma and check commissioner node id: Error: %@", err);
+            } else {
+                NSLog(@"Read the ACL from gamma and check commissioner node id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145768,7 +160025,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write the ACL using the commissioner node id value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write the ACL using the commissioner node id value: Error: %@", err);
+            } else {
+                NSLog(@"Write the ACL using the commissioner node id value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145806,7 +160067,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             aclArgument = temp_0;
         }
         [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write the ACL using the commissioner node id value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write the ACL using the commissioner node id value: Error: %@", err);
+            } else {
+                NSLog(@"Write the ACL using the commissioner node id value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145826,7 +160091,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ACL from beta and check commissioner node id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ACL from beta and check commissioner node id: Error: %@", err);
+            } else {
+                NSLog(@"Read the ACL from beta and check commissioner node id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145858,7 +160127,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = true;
         [cluster readAttributeACLWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the ACL from gamma and check commissioner node id Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read the ACL from gamma and check commissioner node id: Error: %@", err);
+            } else {
+                NSLog(@"Read the ACL from gamma and check commissioner node id: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145892,7 +160165,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             [betaIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove beta fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove beta fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove beta fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -145914,7 +160191,11 @@ class TestCommissionerNodeId : public TestCommandBridge {
             [gammaIndex copy];
         [cluster removeFabricWithParams:params completion:
                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                       NSLog(@"Remove gamma fabric Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Remove gamma fabric: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Remove gamma fabric: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146156,7 +160437,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTimeZoneWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Time Zone Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Time Zone: Error: %@", err);
+            } else {
+                NSLog(@"Read Time Zone: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146194,7 +160479,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone list Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone list: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone list: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146217,7 +160506,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTimeZoneWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Time Zone Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Time Zone: Error: %@", err);
+            } else {
+                NSLog(@"Read Time Zone: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146255,7 +160548,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone with missing optional name field Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone with missing optional name field: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone with missing optional name field: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146278,7 +160575,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTimeZoneWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Time Zone Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Time Zone: Error: %@", err);
+            } else {
+                NSLog(@"Read Time Zone: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146316,7 +160617,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone with very long name Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone with very long name: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone with very long name: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -146346,7 +160651,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone with first item validAt not zero Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone with first item validAt not zero: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone with first item validAt not zero: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -146383,7 +160692,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone with second item validAt zero Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone with second item validAt zero: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone with second item validAt zero: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                       NextTest();
@@ -146427,7 +160740,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone with more than supported list count Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone with more than supported list count: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone with more than supported list count: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
                                                       NextTest();
@@ -146450,7 +160767,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setTimeZoneWithParams:params completion:
                                                   ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Set Time Zone empty Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Set Time Zone empty: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Set Time Zone empty: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146473,7 +160794,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeTimeZoneWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Time Zone Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Time Zone: Error: %@", err);
+            } else {
+                NSLog(@"Read Time Zone: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146498,7 +160823,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDSTOffsetWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read DSTOffset Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read DSTOffset: Error: %@", err);
+            } else {
+                NSLog(@"Read DSTOffset: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146535,7 +160864,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset single item Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset single item: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset single item: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146559,7 +160892,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset empty Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset empty: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset empty: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146597,7 +160934,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset with more than 1 null value Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset with more than 1 null value: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset with more than 1 null value: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                        NextTest();
@@ -146635,7 +160976,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set unsorted DSTOffset entries Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set unsorted DSTOffset entries: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set unsorted DSTOffset entries: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                        NextTest();
@@ -146673,7 +161018,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset with multiple entries Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset with multiple entries: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset with multiple entries: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146691,7 +161040,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDSTOffsetWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read DSTOffset Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read DSTOffset: Error: %@", err);
+            } else {
+                NSLog(@"Read DSTOffset: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -146735,7 +161088,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset with same validStarting and validUntil Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset with same validStarting and validUntil: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset with same validStarting and validUntil: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                        NextTest();
@@ -146781,7 +161138,11 @@ class TestTimeSynchronization : public TestCommandBridge {
         }
         [cluster setDSTOffsetWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Set DSTOffset with more than supported list count Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Set DSTOffset with more than supported list count: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Set DSTOffset with more than supported list count: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
                                                        NextTest();
@@ -146980,7 +161341,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Phase List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Phase List: Error: %@", err);
+            } else {
+                NSLog(@"Read Phase List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147003,7 +161368,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Phase Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Phase: Error: %@", err);
+            } else {
+                NSLog(@"Read current Phase: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147026,7 +161395,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Countdown Time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Countdown Time: Error: %@", err);
+            } else {
+                NSLog(@"Read Countdown Time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147049,7 +161422,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Operational State List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Operational State List: Error: %@", err);
+            } else {
+                NSLog(@"Read Operational State List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147076,7 +161453,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalErrorWithCompletion:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational Error Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational Error: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational Error: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147099,7 +161480,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147123,7 +161508,11 @@ class TestOperationalState : public TestCommandBridge {
 
         [cluster startWithCompletion:
                      ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Start Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Start Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Start Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147146,7 +161535,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147170,7 +161563,11 @@ class TestOperationalState : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Pause Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Pause Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Pause Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147193,7 +161590,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147217,7 +161618,11 @@ class TestOperationalState : public TestCommandBridge {
 
         [cluster resumeWithCompletion:
                      ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Resume Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Resume Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Resume Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147240,7 +161645,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147264,7 +161673,11 @@ class TestOperationalState : public TestCommandBridge {
 
         [cluster stopWithCompletion:
                      ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Stop Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Stop Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Stop Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147287,7 +161700,11 @@ class TestOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147492,7 +161909,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributePhaseListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Phase List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Phase List: Error: %@", err);
+            } else {
+                NSLog(@"Read Phase List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147515,7 +161936,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentPhaseWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Phase Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Phase: Error: %@", err);
+            } else {
+                NSLog(@"Read current Phase: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147538,7 +161963,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCountdownTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Countdown Time Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Countdown Time: Error: %@", err);
+            } else {
+                NSLog(@"Read Countdown Time: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147561,7 +161990,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Operational State List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Operational State List: Error: %@", err);
+            } else {
+                NSLog(@"Read Operational State List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147591,7 +162024,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalErrorWithCompletion:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational Error Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational Error: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational Error: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147614,7 +162051,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147638,7 +162079,11 @@ class TestRVCOperationalState : public TestCommandBridge {
 
         [cluster startWithCompletion:
                      ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Start Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Start Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Start Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND));
                          NextTest();
@@ -147655,7 +162100,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147679,7 +162128,11 @@ class TestRVCOperationalState : public TestCommandBridge {
 
         [cluster pauseWithCompletion:
                      ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Pause Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Pause Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Pause Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147702,7 +162155,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147726,7 +162183,11 @@ class TestRVCOperationalState : public TestCommandBridge {
 
         [cluster resumeWithCompletion:
                      ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Resume Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Resume Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Resume Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147749,7 +162210,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -147773,7 +162238,11 @@ class TestRVCOperationalState : public TestCommandBridge {
 
         [cluster stopWithCompletion:
                      ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable err) {
-                         NSLog(@"Stop Command Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Stop Command: Error: %@", err);
+                         } else {
+                             NSLog(@"Stop Command: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND));
                          NextTest();
@@ -147790,7 +162259,11 @@ class TestRVCOperationalState : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current Operational State Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read current Operational State: Error: %@", err);
+            } else {
+                NSLog(@"Read current Operational State: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148044,7 +162517,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Supported Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Supported Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Supported Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148067,7 +162544,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Mask Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Mask Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Mask Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148090,7 +162571,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Latch Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Latch Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Latch Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148113,7 +162598,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read State Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read State Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read State Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148136,7 +162625,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read feature map Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read feature map Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read feature map Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148159,7 +162652,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:41UL];
         [cluster modifyEnabledAlarmsWithParams:params completion:
                                                           ^(NSError * _Nullable err) {
-                                                              NSLog(@"Modify enabled alarms Command Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Modify enabled alarms Command: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Modify enabled alarms Command: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148177,7 +162674,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Mask Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Mask Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Mask Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148200,7 +162701,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Latch Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Latch Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Latch Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148223,7 +162728,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read State Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read State Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read State Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148250,7 +162759,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:105UL];
         [cluster modifyEnabledAlarmsWithParams:params completion:
                                                           ^(NSError * _Nullable err) {
-                                                              NSLog(@"Modify enabled alarms Command Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Modify enabled alarms Command: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Modify enabled alarms Command: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                               NextTest();
@@ -148267,7 +162780,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Mask Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Mask Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Mask Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148290,7 +162807,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Latch Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Latch Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Latch Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148313,7 +162834,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read State Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read State Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read State Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148340,7 +162865,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:59UL];
         [cluster modifyEnabledAlarmsWithParams:params completion:
                                                           ^(NSError * _Nullable err) {
-                                                              NSLog(@"Modify enabled alarms Command Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Modify enabled alarms Command: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Modify enabled alarms Command: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                               NextTest();
@@ -148357,7 +162886,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Mask Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Mask Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Mask Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148380,7 +162913,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Latch Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Latch Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Latch Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148403,7 +162940,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read State Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read State Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read State Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148430,7 +162971,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:1UL];
         [cluster resetWithParams:params completion:
                                             ^(NSError * _Nullable err) {
-                                                NSLog(@"Reset Command Error: %@", err);
+                                                if (err != nil) {
+                                                    NSLog(@"Reset Command: Error: %@", err);
+                                                } else {
+                                                    NSLog(@"Reset Command: Success");
+                                                }
 
                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148448,7 +162993,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Mask Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Mask Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Mask Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148471,7 +163020,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLatchWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Latch Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Latch Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read Latch Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148494,7 +163047,11 @@ class TestDishwasherAlarm : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read State Attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read State Attribute: Error: %@", err);
+            } else {
+                NSLog(@"Read State Attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148757,7 +163314,11 @@ class TestMultiAdmin : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148786,7 +163347,11 @@ class TestMultiAdmin : public TestCommandBridge {
         __auto_type * params = [[MTRReadParams alloc] init];
         params.filterByFabric = false;
         [cluster readAttributeFabricsWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check that we just have the one fabric and did not add a new one Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Check that we just have the one fabric and did not add a new one: Error: %@", err);
+            } else {
+                NSLog(@"Check that we just have the one fabric and did not add a new one: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148811,7 +163376,11 @@ class TestMultiAdmin : public TestCommandBridge {
 
         [cluster revokeCommissioningWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Close Commissioning Window after failed commissioning Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close Commissioning Window after failed commissioning: Error: %@", err);
+                         } else {
+                             NSLog(@"Close Commissioning Window after failed commissioning: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148833,7 +163402,11 @@ class TestMultiAdmin : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from alpha again Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from alpha again: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from alpha again: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148872,7 +163445,11 @@ class TestMultiAdmin : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open Commissioning Window from beta Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open Commissioning Window from beta: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open Commissioning Window from beta: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148908,7 +163485,11 @@ class TestMultiAdmin : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: NodeLabel from alpha Error: %@", err);
+            if (err != nil) {
+                NSLog(@"read the mandatory attribute: NodeLabel from alpha: Error: %@", err);
+            } else {
+                NSLog(@"read the mandatory attribute: NodeLabel from alpha: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148936,7 +163517,11 @@ class TestMultiAdmin : public TestCommandBridge {
         id nodeLabelArgument;
         nodeLabelArgument = @"written from beta";
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"write the mandatory attribute NodeLabel from beta Error: %@", err);
+            if (err != nil) {
+                NSLog(@"write the mandatory attribute NodeLabel from beta: Error: %@", err);
+            } else {
+                NSLog(@"write the mandatory attribute NodeLabel from beta: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148954,7 +163539,11 @@ class TestMultiAdmin : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: NodeLabel from gamma Error: %@", err);
+            if (err != nil) {
+                NSLog(@"read the mandatory attribute: NodeLabel from gamma: Error: %@", err);
+            } else {
+                NSLog(@"read the mandatory attribute: NodeLabel from gamma: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -148977,7 +163566,11 @@ class TestMultiAdmin : public TestCommandBridge {
         nodeLabelArgument =
             [readFromAlpha copy];
         [cluster writeAttributeNodeLabelWithValue:nodeLabelArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"write the mandatory attribute NodeLabel back to default Error: %@", err);
+            if (err != nil) {
+                NSLog(@"write the mandatory attribute NodeLabel back to default: Error: %@", err);
+            } else {
+                NSLog(@"write the mandatory attribute NodeLabel back to default: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149225,7 +163818,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149249,7 +163846,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149273,7 +163874,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given DGSW.S.F00(Watermarks) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given DGSW.S.F00(Watermarks) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given DGSW.S.F00(Watermarks) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149292,7 +163897,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149318,7 +163927,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149343,7 +163956,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads optional attribute(ThreadMetrics) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads optional attribute(ThreadMetrics) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads optional attribute(ThreadMetrics) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149364,7 +163981,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads optional attribute(CurrentHeapFree) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads optional attribute(CurrentHeapFree) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads optional attribute(CurrentHeapFree) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149385,7 +164006,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads optional attribute(CurrentHeapUsed) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads optional attribute(CurrentHeapUsed) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads optional attribute(CurrentHeapUsed) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149406,7 +164031,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads Feature dependent attribute(CurrentHeapHighWatermark) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads Feature dependent attribute(CurrentHeapHighWatermark) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads Feature dependent attribute(CurrentHeapHighWatermark) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149427,7 +164056,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149448,7 +164081,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149472,7 +164109,11 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149630,7 +164271,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Set OnOff Attribute to false Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Set OnOff Attribute to false: Error: %@", err);
+                         } else {
+                             NSLog(@"Set OnOff Attribute to false: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149652,7 +164297,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         test_TestSubscribe_OnOff_OnOff_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe OnOff Attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe OnOff Attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe OnOff Attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149686,7 +164335,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe OnOff Attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe OnOff Attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe OnOff Attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestSubscribe_OnOff_OnOff_Reported
@@ -149710,7 +164363,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         [cluster onWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn On the light to see attribute change Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn On the light to see attribute change: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn On the light to see attribute change: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149729,7 +164386,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         test_TestSubscribe_OnOff_OnOff_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for attribute report Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for attribute report: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for attribute report: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149753,7 +164414,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         [cluster offWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Turn Off the light to see attribute change Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Turn Off the light to see attribute change: Error: %@", err);
+                         } else {
+                             NSLog(@"Turn Off the light to see attribute change: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -149772,7 +164437,11 @@ class TestSubscribe_OnOff : public TestCommandBridge {
 
         test_TestSubscribe_OnOff_OnOff_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for attribute report Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for attribute report: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for attribute report: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150015,7 +164684,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get ourfabric index Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get ourfabric index: Error: %@", err);
+            } else {
+                NSLog(@"Get ourfabric index: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150041,7 +164714,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_WindowStatus_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe WindowStatus Attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe WindowStatus Attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe WindowStatus Attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150075,7 +164752,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe WindowStatus Attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe WindowStatus Attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe WindowStatus Attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestSubscribe_AdministratorCommissioning_WindowStatus_Reported
@@ -150102,7 +164783,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open the commissioning window 1 Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open the commissioning window 1: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open the commissioning window 1: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150121,7 +164806,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_WindowStatus_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for first attribute report for WindowStatus Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for first attribute report for WindowStatus: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for first attribute report for WindowStatus: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150145,7 +164834,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         [cluster revokeCommissioningWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Close the commissioning window 1 Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close the commissioning window 1: Error: %@", err);
+                         } else {
+                             NSLog(@"Close the commissioning window 1: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150164,7 +164857,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_WindowStatus_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for second attribute report for WindowStatus Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for second attribute report for WindowStatus: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for second attribute report for WindowStatus: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150191,7 +164888,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminVendorId_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe AdminVendorId Attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe AdminVendorId Attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe AdminVendorId Attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150225,7 +164926,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe AdminVendorId Attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe AdminVendorId Attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe AdminVendorId Attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestSubscribe_AdministratorCommissioning_AdminVendorId_Reported
@@ -150252,7 +164957,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open the commissioning window 2 Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open the commissioning window 2: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open the commissioning window 2: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150271,7 +164980,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminVendorId_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for first attribute report for AdminVendorId Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for first attribute report for AdminVendorId: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for first attribute report for AdminVendorId: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150296,7 +165009,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         [cluster revokeCommissioningWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Close the commissioning window 2 Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close the commissioning window 2: Error: %@", err);
+                         } else {
+                             NSLog(@"Close the commissioning window 2: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150315,7 +165032,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminVendorId_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for second attribute report for AdminVendorId Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for second attribute report for AdminVendorId: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for second attribute report for AdminVendorId: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150342,7 +165063,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminFabricIndex_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Report: Subscribe AdminFabricIndex Attribute Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Report: Subscribe AdminFabricIndex Attribute: Error: %@", err);
+                  } else {
+                      NSLog(@"Report: Subscribe AdminFabricIndex Attribute: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150376,7 +165101,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
                 NextTest();
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Subscribe AdminFabricIndex Attribute Error: %@", err);
+                if (err != nil) {
+                    NSLog(@"Subscribe AdminFabricIndex Attribute: Error: %@", err);
+                } else {
+                    NSLog(@"Subscribe AdminFabricIndex Attribute: Success");
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
                 if (test_TestSubscribe_AdministratorCommissioning_AdminFabricIndex_Reported
@@ -150403,7 +165132,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:180U];
         [cluster openBasicCommissioningWindowWithParams:params completion:
                                                                    ^(NSError * _Nullable err) {
-                                                                       NSLog(@"Open the commissioning window 3 Error: %@", err);
+                                                                       if (err != nil) {
+                                                                           NSLog(@"Open the commissioning window 3: Error: %@", err);
+                                                                       } else {
+                                                                           NSLog(@"Open the commissioning window 3: Success");
+                                                                       }
 
                                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150422,7 +165155,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminFabricIndex_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for first attribute report for AdminFabricIndex Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for first attribute report for AdminFabricIndex: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for first attribute report for AdminFabricIndex: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150451,7 +165188,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         [cluster revokeCommissioningWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Close the commissioning window 2 Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Close the commissioning window 2: Error: %@", err);
+                         } else {
+                             NSLog(@"Close the commissioning window 2: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -150470,7 +165211,11 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge {
 
         test_TestSubscribe_AdministratorCommissioning_AdminFabricIndex_Reported
             = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                  NSLog(@"Check for second attribute report for AdminFabricIndex Error: %@", err);
+                  if (err != nil) {
+                      NSLog(@"Check for second attribute report for AdminFabricIndex: Error: %@", err);
+                  } else {
+                      NSLog(@"Check for second attribute report for AdminFabricIndex: Success");
+                  }
 
                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151470,7 +166215,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read available user slot and verify response fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read available user slot and verify response fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read available user slot and verify response fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151539,7 +166288,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get number of supported users and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get number of supported users and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get number of supported users and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151569,7 +166322,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read fails for user with index 0 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read fails for user with index 0: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read fails for user with index 0: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -151590,7 +166347,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read fails for user with index greater than Number Of Users Supported Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read fails for user with index greater than Number Of Users Supported: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read fails for user with index greater than Number Of Users Supported: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -151618,7 +166379,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Create new user with default parameters Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Create new user with default parameters: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Create new user with default parameters: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151640,7 +166405,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151726,7 +166495,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Set user at the occupied index fails with appropriate response Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Set user at the occupied index fails with appropriate response: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Set user at the occupied index fails with appropriate response: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                   NextTest();
@@ -151754,7 +166527,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify userName for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify userName for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify userName for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151776,7 +166553,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151863,7 +166644,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify userUniqueId for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify userUniqueId for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify userUniqueId for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151885,7 +166670,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151973,7 +166762,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify userStatus for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify userStatus for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify userStatus for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -151995,7 +166788,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152083,7 +166880,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify userType for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify userType for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify userType for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152105,7 +166906,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152193,7 +166998,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify credentialRule for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify credentialRule for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify credentialRule for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152215,7 +167024,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152306,7 +167119,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Modify all fields for existing user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Modify all fields for existing user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Modify all fields for existing user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152328,7 +167145,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the modified user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the modified user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152419,7 +167240,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Add another user with non-default fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Add another user with non-default fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Add another user with non-default fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152441,7 +167266,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the new user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the new user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the new user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152530,7 +167359,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Try to add a user with userStatus 0 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Try to add a user with userStatus 0: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Try to add a user with userStatus 0: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -152551,7 +167384,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:3U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Make sure the user did not get created Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Make sure the user did not get created: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Make sure the user did not get created: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152632,7 +167469,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Try to add a user with userStatus 2 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Try to add a user with userStatus 2: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Try to add a user with userStatus 2: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -152653,7 +167494,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:3U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Make sure the user did not get created Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Make sure the user did not get created: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Make sure the user did not get created: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152734,7 +167579,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Try to add a user with userStatus 3 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Try to add a user with userStatus 3: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Try to add a user with userStatus 3: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152756,7 +167605,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:3U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the new third user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the new third user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the new third user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152843,7 +167696,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Create user in the last slot Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Create user in the last slot: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Create user in the last slot: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152865,7 +167722,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NumberOfTotalUsersSupportedValue copy];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the last user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the last user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the last user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -152951,7 +167812,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"User creation in the 0 slot fails Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"User creation in the 0 slot fails: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"User creation in the 0 slot fails: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -152979,7 +167844,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"User creation in the out-of-bounds slot fails Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"User creation in the out-of-bounds slot fails: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"User creation in the out-of-bounds slot fails: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -153000,7 +167869,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Clear first user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Clear first user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Clear first user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153022,7 +167895,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read cleared user and verify it is available Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read cleared user and verify it is available: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read cleared user and verify it is available: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153102,7 +167979,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Create new user in the cleared slot Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Create new user in the cleared slot: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Create new user in the cleared slot: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153124,7 +168005,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user in the previously cleared slot and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user in the previously cleared slot and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user in the previously cleared slot and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153204,7 +168089,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Clear user with index 0 fails Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Clear user with index 0 fails: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Clear user with index 0 fails: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                     NextTest();
@@ -153225,7 +168114,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Clear user with out-of-bounds index fails Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Clear user with out-of-bounds index fails: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Clear user with out-of-bounds index fails: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                     NextTest();
@@ -153246,7 +168139,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Clear all users Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Clear all users: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Clear all users: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153268,7 +168165,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read first cleared user and verify it is available Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read first cleared user and verify it is available: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read first cleared user and verify it is available: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153340,7 +168241,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NumberOfTotalUsersSupportedValue copy];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read last cleared user and verify it is available Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read last cleared user and verify it is available: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read last cleared user and verify it is available: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153409,7 +168314,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfPINUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get number of supported PIN credentials and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get number of supported PIN credentials and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get number of supported PIN credentials and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153443,7 +168352,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Check that PIN credential does not exist Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Check that PIN credential does not exist: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Check that PIN credential does not exist: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153494,7 +168407,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Reading PIN credential with index 0 returns no credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Reading PIN credential with index 0 returns no credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Reading PIN credential with index 0 returns no credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153545,7 +168462,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Reading PIN credential with out-of-bounds index returns no credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Reading PIN credential with out-of-bounds index returns no credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Reading PIN credential with out-of-bounds index returns no credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153604,7 +168525,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Verify that a user with UserStatus = 0 cannot be added via SetCredential Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Verify that a user with UserStatus = 0 cannot be added via SetCredential: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Verify that a user with UserStatus = 0 cannot be added via SetCredential: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153654,7 +168579,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Verify that a user with UserStatus = 2 cannot be added via SetCredential Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Verify that a user with UserStatus = 2 cannot be added via SetCredential: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Verify that a user with UserStatus = 2 cannot be added via SetCredential: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153703,7 +168632,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153742,7 +168675,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Verify created user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Verify created user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Verify created user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153827,7 +168764,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Verify created PIN credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Verify created PIN credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Verify created PIN credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153888,7 +168829,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and user with index 0 fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and user with index 0 fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and user with index 0 fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153937,7 +168882,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and user with out-of-bounds index fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and user with out-of-bounds index fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and user with out-of-bounds index fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -153971,7 +168920,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfRFIDUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get number of supported RFID credentials and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get number of supported RFID credentials and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get number of supported RFID credentials and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154005,7 +168958,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Reading RFID credential with index 0 returns no credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Reading RFID credential with index 0 returns no credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Reading RFID credential with index 0 returns no credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154056,7 +169013,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Reading RFID credential with out-of-bounds index returns no credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Reading RFID credential with out-of-bounds index returns no credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Reading RFID credential with out-of-bounds index returns no credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154107,7 +169068,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Check that RFID credential does not exist Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Check that RFID credential does not exist: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Check that RFID credential does not exist: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154167,7 +169132,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user with non-null UserStatus should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserStatus should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserStatus should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154218,7 +169187,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user with non-null UserType should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserType should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserType should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154270,7 +169243,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user with non-null UserType and UserStatus should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserType and UserStatus should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user with non-null UserType and UserStatus should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154320,7 +169297,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154358,7 +169339,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Verify modified user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Verify modified user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Verify modified user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154445,7 +169430,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Verify created credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Verify created credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Verify created credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154506,7 +169495,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and user with index 0 fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and user with index 0 fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and user with index 0 fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154555,7 +169548,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and user with out-of-bounds index fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and user with out-of-bounds index fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and user with out-of-bounds index fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154604,7 +169601,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new credential and try to add it to 0 user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new credential and try to add it to 0 user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new credential and try to add it to 0 user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154654,7 +169655,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new credential and try to add it to out-of-bounds user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new credential and try to add it to out-of-bounds user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new credential and try to add it to out-of-bounds user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154704,7 +169709,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN with too short data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN with too short data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN with too short data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154754,7 +169763,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN with too long data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN with too long data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN with too long data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154804,7 +169817,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID with too short data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID with too short data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID with too short data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154855,7 +169872,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:3U];
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN with Programming user type fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN with Programming user type fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN with Programming user type fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154905,7 +169926,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID with too short data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID with too short data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID with too short data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -154954,7 +169979,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential with data the would cause duplicate Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential with data the would cause duplicate: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential with data the would cause duplicate: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155003,7 +170032,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential with data the would cause duplicate Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential with data the would cause duplicate: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential with data the would cause duplicate: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155054,7 +170087,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155105,7 +170142,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Modify credentialData of existing PIN credential with non-null UserType should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserType should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserType should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155157,7 +170198,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus and UserType should fail Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus and UserType should fail: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Modify credentialData of existing PIN credential with non-null UserStatus and UserType should fail: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155207,7 +170252,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Modify credentialData of existing PIN credential Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Modify credentialData of existing PIN credential: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Modify credentialData of existing PIN credential: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155256,7 +170305,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Verify that credential was changed by creating new credential with old data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Verify that credential was changed by creating new credential with old data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Verify that credential was changed by creating new credential with old data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155306,7 +170359,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Verify that credential was changed by creating new credential with new data Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Verify that credential was changed by creating new credential with new data: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Verify that credential was changed by creating new credential with new data: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155356,7 +170413,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155394,7 +170455,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Verify modified user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Verify modified user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Verify modified user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155492,7 +170557,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155530,7 +170599,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Verify modified user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Verify modified user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Verify modified user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155622,7 +170695,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clear first PIN credential Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clear first PIN credential: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clear first PIN credential: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155648,7 +170725,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155696,7 +170777,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user back and make sure PIN credential is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user back and make sure PIN credential is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user back and make sure PIN credential is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155786,7 +170871,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clear the second PIN credential Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clear the second PIN credential: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clear the second PIN credential: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155812,7 +170901,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155860,7 +170953,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user back and make sure related user is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user back and make sure related user is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user back and make sure related user is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155943,7 +171040,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential with user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential with user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential with user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -155986,7 +171087,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clear all the RFID credentials Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clear all the RFID credentials: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clear all the RFID credentials: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156012,7 +171117,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the fist RFID credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the fist RFID credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the fist RFID credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156063,7 +171172,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the second RFID credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the second RFID credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the second RFID credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156114,7 +171227,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the third RFID credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the third RFID credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the third RFID credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156161,7 +171278,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with first RFID back and make sure it has only PIN credential Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with first RFID back and make sure it has only PIN credential: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with first RFID back and make sure it has only PIN credential: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156242,7 +171363,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with second RFID back and make sure it is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with second RFID back and make sure it is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with second RFID back and make sure it is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156325,7 +171450,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential with user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential with user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential with user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156375,7 +171504,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new RFID credential with user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new RFID credential with user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new RFID credential with user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156425,7 +171558,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create another RFID credential with user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create another RFID credential with user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create another RFID credential with user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156463,7 +171600,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.credential = nil;
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clear all the credentials Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clear all the credentials: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clear all the credentials: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156489,7 +171630,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the first PIN credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the first PIN credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the first PIN credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156540,7 +171685,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the first RFID credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the first RFID credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the first RFID credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156591,7 +171740,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Read back the second PIN credential and make sure it is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Read back the second PIN credential and make sure it is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Read back the second PIN credential and make sure it is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156638,7 +171791,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with first PIN back and make sure it is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with first PIN back and make sure it is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with first PIN back and make sure it is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156710,7 +171867,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with first RFID back and make sure it is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with first RFID back and make sure it is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with first RFID back and make sure it is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156782,7 +171943,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:3U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with second PIN back and make sure it is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with second PIN back and make sure it is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with second PIN back and make sure it is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156854,7 +172019,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:4U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user related with last RFID back and make sure it is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user related with last RFID back and make sure it is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user related with last RFID back and make sure it is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156937,7 +172106,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new Programming PIN credential with invalid index Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new Programming PIN credential with invalid index: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new Programming PIN credential with invalid index: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -156985,7 +172158,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new Programming PIN credential with valid index Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new Programming PIN credential with valid index: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new Programming PIN credential with valid index: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157023,7 +172200,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Verify created user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Verify created user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Verify created user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157108,7 +172289,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Verify created programming PIN credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Verify created programming PIN credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Verify created programming PIN credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157169,7 +172354,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Modify the Programming PIN credential Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Modify the Programming PIN credential: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Modify the Programming PIN credential: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157210,7 +172399,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing Programming PIN fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing Programming PIN fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing Programming PIN fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157235,7 +172428,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing Programming PIN with invalid index fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing Programming PIN with invalid index fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing Programming PIN with invalid index fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157260,7 +172457,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing PIN credential with zero index fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing PIN credential with zero index fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing PIN credential with zero index fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157285,7 +172486,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing PIN credential with out-of-bound index fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing PIN credential with out-of-bound index fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing PIN credential with out-of-bound index fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157310,7 +172515,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing RFID credential with zero index fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing RFID credential with zero index fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing RFID credential with zero index fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157335,7 +172544,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clearing RFID credential with out-of-bound index fails Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clearing RFID credential with out-of-bound index fails: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clearing RFID credential with out-of-bound index fails: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                           NextTest();
@@ -157356,7 +172569,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Clear the Programming PIN user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Clear the Programming PIN user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Clear the Programming PIN user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157378,7 +172595,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Make sure Programming PIN user is deleted Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Make sure Programming PIN user is deleted: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Make sure Programming PIN user is deleted: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157454,7 +172675,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Make sure programming PIN credential is deleted Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Make sure programming PIN credential is deleted: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Make sure programming PIN credential is deleted: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157512,7 +172737,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157563,7 +172792,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create second PIN credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create second PIN credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create second PIN credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157613,7 +172846,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create third PIN credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create third PIN credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create third PIN credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157663,7 +172900,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create fourth PIN credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create fourth PIN credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create fourth PIN credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157713,7 +172954,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create fifth PIN credential and add it to existing user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create fifth PIN credential and add it to existing user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create fifth PIN credential and add it to existing user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157763,7 +173008,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Try to create sixth PIN credential and make sure it fails Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Try to create sixth PIN credential and make sure it fails: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Try to create sixth PIN credential and make sure it fails: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -157801,7 +173050,11 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Final clean-up Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Final clean-up: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Final clean-up: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158800,7 +174053,11 @@ class DL_Schedules : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and schedule user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and schedule user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and schedule user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158836,7 +174093,11 @@ class DL_Schedules : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get number of supported users Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get number of supported users: Error: %@", err);
+            } else {
+                NSLog(@"Get number of supported users: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158863,7 +174124,11 @@ class DL_Schedules : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Week Day schedules for user and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get Max number of Week Day schedules for user and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get Max number of Week Day schedules for user and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158890,7 +174155,11 @@ class DL_Schedules : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Year Day schedules for user and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get Max number of Year Day schedules for user and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get Max number of Year Day schedules for user and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158917,7 +174186,11 @@ class DL_Schedules : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfHolidaySchedulesSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Holiday schedules and verify default value Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Get Max number of Holiday schedules and verify default value: Error: %@", err);
+            } else {
+                NSLog(@"Get Max number of Holiday schedules and verify default value: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -158959,7 +174232,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -158992,7 +174269,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159025,7 +174306,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with 0 user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with 0 user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with 0 user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159058,7 +174343,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with out-of-bounds user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with out-of-bounds user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with out-of-bounds user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159091,7 +174380,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule for non-existing user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule for non-existing user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule for non-existing user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                              NextTest();
@@ -159124,7 +174417,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with 0 days mask Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with 0 days mask: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with 0 days mask: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159157,7 +174454,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule for Sunday and Monday Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule for Sunday and Monday: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule for Sunday and Monday: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159190,7 +174491,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule for Sunday Wednesday and Saturday Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule for Sunday Wednesday and Saturday: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule for Sunday Wednesday and Saturday: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159223,7 +174528,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with invalid start hour Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with invalid start hour: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with invalid start hour: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159256,7 +174565,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with invalid start minute Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with invalid start minute: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with invalid start minute: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159289,7 +174602,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with invalid end hour Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with invalid end hour: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with invalid end hour: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159322,7 +174639,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:60U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with invalid end minute Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with invalid end minute: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with invalid end minute: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159355,7 +174676,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with start hour later that end hour Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with start hour later that end hour: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with start hour later that end hour: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159388,7 +174713,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:49U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with start minute later that end minute when hours are equal Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with start minute later that end minute when hours are equal: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with start minute later that end minute when hours are equal: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159411,7 +174740,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159450,7 +174783,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Week Day schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Week Day schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Week Day schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159489,7 +174826,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Week Day schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Week Day schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Week Day schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159528,7 +174869,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Week Day schedule with 0 user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Week Day schedule with 0 user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Week Day schedule with 0 user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159567,7 +174912,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Week Day schedule with out-of-bounds user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Week Day schedule with out-of-bounds user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Week Day schedule with out-of-bounds user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159606,7 +174955,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Week Day schedule with non-existing user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Week Day schedule with non-existing user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Week Day schedule with non-existing user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159649,7 +175002,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159676,7 +175033,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159703,7 +175064,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with 0 user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with 0 user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with 0 user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159730,7 +175095,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with out-of-bounds user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with out-of-bounds user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with out-of-bounds user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159757,7 +175126,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule for non-existing user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule for non-existing user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule for non-existing user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                              NextTest();
@@ -159784,7 +175157,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345688UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with start hour later that end hour Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with start hour later that end hour: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with start hour later that end hour: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -159807,7 +175184,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159846,7 +175227,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Year Day schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Year Day schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Year Day schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159885,7 +175270,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Year Day schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Year Day schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Year Day schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159924,7 +175313,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Year Day schedule with 0 user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Year Day schedule with 0 user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Year Day schedule with 0 user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -159963,7 +175356,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Year Day schedule with out-of-bounds user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Year Day schedule with out-of-bounds user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Year Day schedule with out-of-bounds user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160002,7 +175399,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Year Day schedule with non-existing user index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Year Day schedule with non-existing user index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Year Day schedule with non-existing user index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160045,7 +175446,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Holiday schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Holiday schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Holiday schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -160072,7 +175477,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Holiday schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Holiday schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Holiday schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -160099,7 +175508,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Holiday schedule with start hour later that end hour Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Holiday schedule with start hour later that end hour: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Holiday schedule with start hour later that end hour: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -160126,7 +175539,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:5U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Holiday schedule with invalid operating mode Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Holiday schedule with invalid operating mode: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Holiday schedule with invalid operating mode: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -160147,7 +175564,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that previous operations did not create a schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160179,7 +175600,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Holiday schedule with 0 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Holiday schedule with 0 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Holiday schedule with 0 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160211,7 +175636,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupportedValue unsignedCharValue] + 1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Holiday schedule with out-of-bounds index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Holiday schedule with out-of-bounds index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Holiday schedule with out-of-bounds index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160249,7 +175678,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Holiday schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Holiday schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Holiday schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160271,7 +175704,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160330,7 +175767,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160354,7 +175795,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160422,7 +175867,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:12345689UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160446,7 +175895,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160495,7 +175948,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Week Day schedule with 0 index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Week Day schedule with 0 index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Week Day schedule with 0 index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160518,7 +175975,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Week Day schedule with out-of-bounds index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Week Day schedule with out-of-bounds index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Week Day schedule with out-of-bounds index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160541,7 +176002,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Week Day schedule with 0 user index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Week Day schedule with 0 user index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Week Day schedule with 0 user index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160564,7 +176029,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Week Day schedule with out-of-bounds user index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Week Day schedule with out-of-bounds user index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Week Day schedule with out-of-bounds user index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160587,7 +176056,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Week Day schedule with non-existing user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Week Day schedule with non-existing user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Week Day schedule with non-existing user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                                NextTest();
@@ -160610,7 +176083,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160674,7 +176151,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160721,7 +176202,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160770,7 +176255,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Year Day schedule with 0 index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Year Day schedule with 0 index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Year Day schedule with 0 index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160793,7 +176282,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Year Day schedule with out-of-bounds index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Year Day schedule with out-of-bounds index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Year Day schedule with out-of-bounds index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160816,7 +176309,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Year Day schedule with 0 user index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Year Day schedule with 0 user index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Year Day schedule with 0 user index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160839,7 +176336,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Year Day schedule with out-of-bounds user index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Year Day schedule with out-of-bounds user index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Year Day schedule with out-of-bounds user index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -160862,7 +176363,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Year Day schedule with non-existing user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Year Day schedule with non-existing user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Year Day schedule with non-existing user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                                NextTest();
@@ -160885,7 +176390,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160949,7 +176458,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -160996,7 +176509,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161043,7 +176560,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster clearHolidayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Holiday schedule with 0 index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Holiday schedule with 0 index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Holiday schedule with 0 index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -161064,7 +176585,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U];
         [cluster clearHolidayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear Holiday schedule with out-of-bounds index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear Holiday schedule with out-of-bounds index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear Holiday schedule with out-of-bounds index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -161087,7 +176612,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that week day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161151,7 +176680,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that year day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161198,7 +176731,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161257,7 +176794,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:59U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create another Week Day schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create another Week Day schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161281,7 +176822,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created week day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created week day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created week day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161349,7 +176894,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:888888888UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create another Year Day schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create another Year Day schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create another Year Day schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161373,7 +176922,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created year day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created year day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created year day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161426,7 +176979,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create another Holiday schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create another Holiday schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create another Holiday schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161448,7 +177005,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created holiday schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created holiday schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created holiday schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161497,7 +177058,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear a single week day schedule for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear a single week day schedule for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear a single week day schedule for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161521,7 +177086,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify cleared week day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify cleared week day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify cleared week day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161560,7 +177129,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear all remaining week day schedules for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear all remaining week day schedules for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161584,7 +177157,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify cleared week schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify cleared week schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify cleared week schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161623,7 +177200,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that first year day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that first year day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that first year day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161672,7 +177253,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that second year day schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that second year day schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that second year day schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161719,7 +177304,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161766,7 +177355,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that second holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that second holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that second holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161825,7 +177418,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:59U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create another Week Day schedule with valid parameters: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create another Week Day schedule with valid parameters: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161849,7 +177446,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear a single year day schedule for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear a single year day schedule for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear a single year day schedule for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161873,7 +177474,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify cleared year day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify cleared year day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify cleared year day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161912,7 +177517,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear all remaining year schedules for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear all remaining year schedules for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear all remaining year schedules for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161936,7 +177545,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify that second year day schedule was cleared Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify that second year day schedule was cleared: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify that second year day schedule was cleared: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -161975,7 +177588,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created week day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created week day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created week day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162039,7 +177656,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear all remaining week day schedules for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear all remaining week day schedules for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162068,7 +177689,11 @@ class DL_Schedules : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Create new user without credential so we can add more schedules to it Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Create new user without credential so we can add more schedules to it: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Create new user without credential so we can add more schedules to it: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162102,7 +177727,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:59U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with valid parameters for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162126,7 +177755,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created week day schedule for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created week day schedule for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created week day schedule for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162194,7 +177827,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:888888888UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162218,7 +177855,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created year day schedule for first Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created year day schedule for first: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created year day schedule for first: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162277,7 +177918,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:59U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule with valid parameters for second user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters for second user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule with valid parameters for second user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162301,7 +177946,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created week day schedule for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created week day schedule for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created week day schedule for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162369,7 +178018,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:7777777UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule for second user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule for second user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule for second user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162393,7 +178046,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify created year day schedule for first Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify created year day schedule for first: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify created year day schedule for first: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162440,7 +178097,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162464,7 +178125,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing first user also cleared week day schedules Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing first user also cleared week day schedules: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing first user also cleared week day schedules: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162503,7 +178168,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing first user also cleared year day schedules Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing first user also cleared year day schedules: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing first user also cleared year day schedules: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162542,7 +178211,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing second user also cleared week day schedules Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing second user also cleared week day schedules: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing second user also cleared week day schedules: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162581,7 +178254,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing second user also cleared year day schedules Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing second user also cleared year day schedules: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing second user also cleared year day schedules: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162618,7 +178295,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162665,7 +178346,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that second holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that second holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that second holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162718,7 +178403,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:4U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create another Holiday schedule at the last slot Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create another Holiday schedule at the last slot: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create another Holiday schedule at the last slot: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162740,7 +178429,11 @@ class DL_Schedules : public TestCommandBridge {
             [NumberOfHolidaySchedulesSupportedValue copy];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Verify Created Holiday Schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Verify Created Holiday Schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Verify Created Holiday Schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162798,7 +178491,11 @@ class DL_Schedules : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and schedule user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and schedule user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and schedule user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162849,7 +178546,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:59U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Week Day schedule for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Week Day schedule for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Week Day schedule for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162877,7 +178578,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:888888888UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Create Year Day schedule for first user Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Create Year Day schedule for first user: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Create Year Day schedule for first user: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162899,7 +178604,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster clearHolidayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear a single holiday schedule Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear a single holiday schedule: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear a single holiday schedule: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162921,7 +178630,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that first holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -162968,7 +178681,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that second holiday schedule was deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that second holiday schedule was deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that second holiday schedule was deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163000,7 +178717,11 @@ class DL_Schedules : public TestCommandBridge {
             [NumberOfHolidaySchedulesSupportedValue copy];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that third holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that third holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163049,7 +178770,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing holiday schedule did not clear week day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear week day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear week day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163113,7 +178838,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing holiday schedule did not clear year day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear year day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear year day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163160,7 +178889,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:254U];
         [cluster clearHolidayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear all remaining holiday schedules Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear all remaining holiday schedules: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear all remaining holiday schedules: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163182,7 +178915,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that first holiday is still deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that first holiday is still deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that first holiday is still deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163214,7 +178951,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:2U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that second holiday schedule was deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that second holiday schedule was deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that second holiday schedule was deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163246,7 +178987,11 @@ class DL_Schedules : public TestCommandBridge {
             [NumberOfHolidaySchedulesSupportedValue copy];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure that third holiday schedule was not deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure that third holiday schedule was not deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163280,7 +179025,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing holiday schedule did not clear week day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear week day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear week day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163344,7 +179093,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Make sure clearing holiday schedule did not clear year day schedule Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear year day schedule: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Make sure clearing holiday schedule did not clear year day schedule: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -163391,7 +179144,11 @@ class DL_Schedules : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:65534U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Final Cleanup Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Final Cleanup: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Final Cleanup: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164013,7 +179770,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164037,7 +179798,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164061,7 +179826,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given DRLK.S.F00(PIN) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given DRLK.S.F00(PIN) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given DRLK.S.F00(PIN) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164080,7 +179849,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given DRLK.S.F01(RID) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given DRLK.S.F01(RID) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given DRLK.S.F01(RID) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164099,7 +179872,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given DRLK.S.F02(FGP) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given DRLK.S.F02(FGP) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given DRLK.S.F02(FGP) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164118,7 +179895,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3e: Given DRLK.S.F04(WDSCH) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3e: Given DRLK.S.F04(WDSCH) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3e: Given DRLK.S.F04(WDSCH) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164137,7 +179918,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3f: Given DRLK.S.F05(DPS) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3f: Given DRLK.S.F05(DPS) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3f: Given DRLK.S.F05(DPS) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164156,7 +179941,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3g: Given DRLK.S.F06(FACE) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3g: Given DRLK.S.F06(FACE) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3g: Given DRLK.S.F06(FACE) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164175,7 +179964,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3h: Given DRLK.S.F07(COTA) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3h: Given DRLK.S.F07(COTA) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3h: Given DRLK.S.F07(COTA) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164194,7 +179987,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3i: Given DRLK.S.F08(USR) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3i: Given DRLK.S.F08(USR) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3i: Given DRLK.S.F08(USR) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164213,7 +180010,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3j: Given DRLK.S.F0a(YDSCH) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3j: Given DRLK.S.F0a(YDSCH) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3j: Given DRLK.S.F0a(YDSCH) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164232,7 +180033,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3k: Given DRLK.S.F0b(HDSCH) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3k: Given DRLK.S.F0b(HDSCH) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3k: Given DRLK.S.F0b(HDSCH) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164251,7 +180056,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3l: Given DRLK.S.F0c(UBOLT) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3l: Given DRLK.S.F0c(UBOLT) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3l: Given DRLK.S.F0c(UBOLT) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164270,7 +180079,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164301,7 +180114,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: TH reads AttributeList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: TH reads AttributeList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164331,7 +180148,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: TH reads Feature dependent(DRLK.S.F05) attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: TH reads Feature dependent(DRLK.S.F05) attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: TH reads Feature dependent(DRLK.S.F05) attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164352,7 +180173,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: TH reads Feature dependent(DRLK.S.F08) attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: TH reads Feature dependent(DRLK.S.F08) attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: TH reads Feature dependent(DRLK.S.F08) attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164375,7 +180200,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: TH reads Feature dependent(DRLK.S.F00) attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: TH reads Feature dependent(DRLK.S.F00) attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: TH reads Feature dependent(DRLK.S.F00) attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164398,7 +180227,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: TH reads Feature dependent(DRLK.S.F01) attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: TH reads Feature dependent(DRLK.S.F01) attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: TH reads Feature dependent(DRLK.S.F01) attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164421,7 +180254,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4f: TH reads Feature dependent(DRLK.S.F04) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4f: TH reads Feature dependent(DRLK.S.F04) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4f: TH reads Feature dependent(DRLK.S.F04) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164442,7 +180279,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4g: TH reads Feature dependent(DRLK.S.F0a) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4g: TH reads Feature dependent(DRLK.S.F0a) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4g: TH reads Feature dependent(DRLK.S.F0a) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164463,7 +180304,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4h: TH reads Feature dependent(DRLK.S.F0b) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4h: TH reads Feature dependent(DRLK.S.F0b) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4h: TH reads Feature dependent(DRLK.S.F0b) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164484,7 +180329,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4i: TH reads Feature dependent(DRLK.S.F00 or DRLK.S.F01) attributes in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4i: TH reads Feature dependent(DRLK.S.F00 or DRLK.S.F01) attributes in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4i: TH reads Feature dependent(DRLK.S.F00 or DRLK.S.F01) attributes in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164506,7 +180355,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4j: TH reads Feature dependent(DRLK.S.F07 or DRLK.S.F00) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4j: TH reads Feature dependent(DRLK.S.F07 or DRLK.S.F00) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4j: TH reads Feature dependent(DRLK.S.F07 or DRLK.S.F00) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164527,7 +180380,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4k: TH reads optional attribute(Language) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4k: TH reads optional attribute(Language) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4k: TH reads optional attribute(Language) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164548,7 +180405,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4l: TH reads optional attribute(LEDSettings) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4l: TH reads optional attribute(LEDSettings) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4l: TH reads optional attribute(LEDSettings) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164569,7 +180430,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4m: TH reads optional attribute(AutoRelockTime) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4m: TH reads optional attribute(AutoRelockTime) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4m: TH reads optional attribute(AutoRelockTime) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164590,7 +180455,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4n: TH reads optional attribute(SoundVolume) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4n: TH reads optional attribute(SoundVolume) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4n: TH reads optional attribute(SoundVolume) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164611,7 +180480,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4o: TH reads optional attribute(DefaultConfigurationRegister) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4o: TH reads optional attribute(DefaultConfigurationRegister) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4o: TH reads optional attribute(DefaultConfigurationRegister) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164632,7 +180505,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4p: TH reads optional attribute(EnableLocalProgramming) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4p: TH reads optional attribute(EnableLocalProgramming) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4p: TH reads optional attribute(EnableLocalProgramming) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164653,7 +180530,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4q: TH reads optional attribute(EnableOneTouchLocking) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4q: TH reads optional attribute(EnableOneTouchLocking) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4q: TH reads optional attribute(EnableOneTouchLocking) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164674,7 +180555,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4r: TH reads optional attribute(EnableInsideStatusLED) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4r: TH reads optional attribute(EnableInsideStatusLED) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4r: TH reads optional attribute(EnableInsideStatusLED) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164695,7 +180580,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4s: TH reads optional attribute(EnablePrivacyModeButton) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4s: TH reads optional attribute(EnablePrivacyModeButton) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4s: TH reads optional attribute(EnablePrivacyModeButton) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164716,7 +180605,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4t: TH reads optional attribute(LocalProgrammingFeatures) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4t: TH reads optional attribute(LocalProgrammingFeatures) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4t: TH reads optional attribute(LocalProgrammingFeatures) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164737,7 +180630,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164759,7 +180656,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: TH reads Feature dependent commands(DRLK.S.F04) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: TH reads Feature dependent commands(DRLK.S.F04) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: TH reads Feature dependent commands(DRLK.S.F04) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164782,7 +180683,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: TH reads Feature dependent commands(DRLK.S.F0a) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: TH reads Feature dependent commands(DRLK.S.F0a) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: TH reads Feature dependent commands(DRLK.S.F0a) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164805,7 +180710,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: TH reads Feature dependent commands(DRLK.S.F0b) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: TH reads Feature dependent commands(DRLK.S.F0b) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: TH reads Feature dependent commands(DRLK.S.F0b) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164828,7 +180737,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6e: TH reads Feature dependent commands(DRLK.S.F0c) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6e: TH reads Feature dependent commands(DRLK.S.F0c) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6e: TH reads Feature dependent commands(DRLK.S.F0c) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164849,7 +180762,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6f: TH reads Feature dependent commands(DRLK.S.F08) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6f: TH reads Feature dependent commands(DRLK.S.F08) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6f: TH reads Feature dependent commands(DRLK.S.F08) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164875,7 +180792,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6g: TH reads optional commands(DRLK.S.C03.Rsp) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6g: TH reads optional commands(DRLK.S.C03.Rsp) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6g: TH reads optional commands(DRLK.S.C03.Rsp) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164896,7 +180817,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7a: TH reads Feature dependent command(DRLK.S.F04) in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7a: TH reads Feature dependent command(DRLK.S.F04) in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7a: TH reads Feature dependent command(DRLK.S.F04) in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164917,7 +180842,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b: TH reads Feature dependent command(DRLK.S.F0a) in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b: TH reads Feature dependent command(DRLK.S.F0a) in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7b: TH reads Feature dependent command(DRLK.S.F0a) in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164938,7 +180867,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7c: TH reads Feature dependent command(DRLK.S.F0b) in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7c: TH reads Feature dependent command(DRLK.S.F0b) in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7c: TH reads Feature dependent command(DRLK.S.F0b) in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -164959,7 +180892,11 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7d: TH reads Feature dependent command(DRLK.S.F08) in GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7d: TH reads Feature dependent command(DRLK.S.F08) in GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7d: TH reads Feature dependent command(DRLK.S.F08) in GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165257,7 +181194,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Create new user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Create new user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Create new user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165279,7 +181220,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Read the user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Read the user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Read the user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165371,7 +181316,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Create new PIN credential and lock/unlock user Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Create new PIN credential and lock/unlock user: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Create new PIN credential and lock/unlock user: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165413,7 +181362,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Verify created PIN credential Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Verify created PIN credential: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Verify created PIN credential: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165462,7 +181415,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         autoRelockTimeArgument =
             [NSNumber numberWithUnsignedInt:10UL];
         [cluster writeAttributeAutoRelockTimeWithValue:autoRelockTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH writes AutoRelockTime attribute value as 10 seconds on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH writes AutoRelockTime attribute value as 10 seconds on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH writes AutoRelockTime attribute value as 10 seconds on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165483,7 +181440,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         autoRelockTimeArgument =
             [NSNumber numberWithUnsignedInt:60UL];
         [cluster writeAttributeAutoRelockTimeWithValue:autoRelockTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH writes AutoRelockTime attribute value as 60 seconds on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH writes AutoRelockTime attribute value as 60 seconds on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH writes AutoRelockTime attribute value as 60 seconds on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165504,7 +181465,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         autoRelockTimeArgument =
             [NSNumber numberWithUnsignedInt:10UL];
         [cluster writeAttributeAutoRelockTimeWithValue:autoRelockTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1c: TH writes AutoRelockTime attribute value as 10 seconds on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: TH writes AutoRelockTime attribute value as 10 seconds on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: TH writes AutoRelockTime attribute value as 10 seconds on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             NextTest();
@@ -165524,7 +181489,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         autoRelockTimeArgument =
             [NSNumber numberWithUnsignedInt:60UL];
         [cluster writeAttributeAutoRelockTimeWithValue:autoRelockTimeArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 1d: TH writes AutoRelockTime attribute value as 60 seconds on the DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: TH writes AutoRelockTime attribute value as 60 seconds on the DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: TH writes AutoRelockTime attribute value as 60 seconds on the DUT: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             NextTest();
@@ -165547,7 +181516,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"123456" length:6];
         [cluster unlockWithTimeoutWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"Step 2a: TH sends the Unlock with Timeout argument value as 10 seconds Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Step 2a: TH sends the Unlock with Timeout argument value as 10 seconds: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Step 2a: TH sends the Unlock with Timeout argument value as 10 seconds: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165571,7 +181544,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [[NSData alloc] initWithBytes:"123456" length:6];
         [cluster unlockWithTimeoutWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165593,7 +181570,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:60U];
         [cluster unlockWithTimeoutWithParams:params completion:
                                                         ^(NSError * _Nullable err) {
-                                                            NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds Error: %@", err);
+                                                            if (err != nil) {
+                                                                NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds: Error: %@", err);
+                                                            } else {
+                                                                NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds: Success");
+                                                            }
 
                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165627,7 +181608,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLockStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2c: TH reads LockState attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2c: TH reads LockState attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2c: TH reads LockState attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165655,7 +181640,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the created user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the created user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the created user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165681,7 +181670,11 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Clean the created credential Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Clean the created credential: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Clean the created credential: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165918,7 +181911,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Create new user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Create new user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Create new user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -165940,7 +181937,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Read the user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166017,7 +182018,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads NumberOfWeekDay SchedulesSupportedPerUser attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads NumberOfWeekDay SchedulesSupportedPerUser attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads NumberOfWeekDay SchedulesSupportedPerUser attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166042,7 +182047,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166082,7 +182091,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:55U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 3: TH send Set Week Day Schedule Command Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 3: TH send Set Week Day Schedule Command: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 3: TH send Set Week Day Schedule Command: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166106,7 +182119,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 4: TH send Get Week Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4: TH send Get Week Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4: TH send Get Week Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166182,7 +182199,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:55U];
         [cluster setWeekDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 5: TH send Set Week Day Schedule Command Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 5: TH send Set Week Day Schedule Command: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 5: TH send Set Week Day Schedule Command: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -166205,7 +182226,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 6: TH send Get Week Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 6: TH send Get Week Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 6: TH send Get Week Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166264,7 +182289,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 7: TH sends Get Week Day Schedule Command to DUT for non-existent User Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 7: TH sends Get Week Day Schedule Command to DUT for non-existent User: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 7: TH sends Get Week Day Schedule Command to DUT for non-existent User: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166323,7 +182352,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearWeekDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 8: TH sends Clear Week Day Schedule Command to DUT Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 8: TH sends Clear Week Day Schedule Command to DUT: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 8: TH sends Clear Week Day Schedule Command to DUT: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166347,7 +182380,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 9: TH sends Get Week Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 9: TH sends Get Week Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 9: TH sends Get Week Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166404,7 +182441,11 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the created user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the created user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the created user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166602,7 +182643,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfHolidaySchedulesSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads NumberOfHoliday SchedulesSupported and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads NumberOfHoliday SchedulesSupported and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads NumberOfHoliday SchedulesSupported and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166636,7 +182681,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 2: Create Holiday schedule with 1 index Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 2: Create Holiday schedule with 1 index: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 2: Create Holiday schedule with 1 index: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166658,7 +182707,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 3a: Get Holiday Schedule with HolidayIndex as 1 Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 3a: Get Holiday Schedule with HolidayIndex as 1: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 3a: Get Holiday Schedule with HolidayIndex as 1: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166716,7 +182769,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:5U];
         [cluster setHolidayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 4: Create Holiday schedule with invalid operating mode Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4: Create Holiday schedule with invalid operating mode: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4: Create Holiday schedule with invalid operating mode: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -166737,7 +182794,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:15U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 5: Get Holiday Schedule with Invalid HolidayIndex 15. Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 5: Get Holiday Schedule with Invalid HolidayIndex 15.: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 5: Get Holiday Schedule with Invalid HolidayIndex 15.: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166769,7 +182830,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:10U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 6: Get Holiday Schedule with the Non-scheduled HolidayIndex Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 6: Get Holiday Schedule with the Non-scheduled HolidayIndex: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 6: Get Holiday Schedule with the Non-scheduled HolidayIndex: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166801,7 +182866,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster clearHolidayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 7: Clear Holiday schedule with 1 index Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 7: Clear Holiday schedule with 1 index: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 7: Clear Holiday schedule with 1 index: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166823,7 +182892,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster getHolidayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 8: Make sure that holiday schedule was deleted Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 8: Make sure that holiday schedule was deleted: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 8: Make sure that holiday schedule was deleted: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -166855,7 +182928,11 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the created user Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the created user: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the created user: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167161,7 +183238,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Create new user Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Create new user: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Create new user: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167183,7 +183264,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Read the user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167260,7 +183345,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads NumberOfYearDay SchedulesSupportedPerUser attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads NumberOfYearDay SchedulesSupportedPerUser attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads NumberOfYearDay SchedulesSupportedPerUser attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167285,7 +183374,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads NumberOfTotalUsers Supported attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167319,7 +183412,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:1980UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 3: TH sends Set Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 3: TH sends Set Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 3: TH sends Set Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167343,7 +183440,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 4a & 4b: TH sends Get Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 4a & 4b: TH sends Get Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 4a & 4b: TH sends Get Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167401,7 +183502,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:2040UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 5: TH send Set Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 5: TH send Set Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 5: TH send Set Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                              NextTest();
@@ -167424,7 +183529,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:15U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 6: TH sends Get Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 6: TH sends Get Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 6: TH sends Get Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167480,7 +183589,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 7a: Create a user with userIndex as 5 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 7a: Create a user with userIndex as 5: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 7a: Create a user with userIndex as 5: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167504,7 +183617,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:5U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 7b: TH sends Get Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 7b: TH sends Get Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 7b: TH sends Get Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167551,7 +183668,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 8: TH sends Clear Year Day Schedule to DUT Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 8: TH sends Clear Year Day Schedule to DUT: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 8: TH sends Clear Year Day Schedule to DUT: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167575,7 +183696,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 9: TH sends Get Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 9: TH sends Get Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 9: TH sends Get Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167626,7 +183751,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedInt:2100UL];
         [cluster setYearDayScheduleWithParams:params completion:
                                                          ^(NSError * _Nullable err) {
-                                                             NSLog(@"Step 10: TH sends Set Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 10: TH sends Set Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 10: TH sends Set Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167650,7 +183779,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 11: TH sends Get Year Day Schedule Command to DUT Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 11: TH sends Get Year Day Schedule Command to DUT: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 11: TH sends Get Year Day Schedule Command to DUT: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167704,7 +183837,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getYearDayScheduleWithParams:params completion:
                                                          ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 12: TH sends Get Year Day Schedule Command to DUT for non-existent User Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Step 12: TH sends Get Year Day Schedule Command to DUT for non-existent User: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Step 12: TH sends Get Year Day Schedule Command to DUT for non-existent User: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167751,7 +183888,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 13: TH sends Clear Year Day Schedule to DUT Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 13: TH sends Clear Year Day Schedule to DUT: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 13: TH sends Clear Year Day Schedule to DUT: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                                NextTest();
@@ -167774,7 +183915,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Clear a year day schedule for the first user Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Clear a year day schedule for the first user: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Clear a year day schedule for the first user: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167796,7 +183941,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the created user with UserIndex 1 Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the created user with UserIndex 1: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the created user with UserIndex 1: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -167818,7 +183967,11 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:5U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Cleanup the created user with UserIndex 5 Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Cleanup the created user with UserIndex 5: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Cleanup the created user with UserIndex 5: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168066,7 +184219,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1: TH reads NumberOfTotalUsers Supported attribute and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1: TH reads NumberOfTotalUsers Supported attribute and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1: TH reads NumberOfTotalUsers Supported attribute and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168105,7 +184262,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 2: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 0 CredentialRule as 0 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 2: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 0 CredentialRule as 0: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 2: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 0 CredentialRule as 0: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168127,7 +184288,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 3: TH sends Get User Command to DUT with UserIndex as 1 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 3: TH sends Get User Command to DUT with UserIndex as 1: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 3: TH sends Get User Command to DUT with UserIndex as 1: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168218,7 +184383,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:3U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 4: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 10 (Invalid value) CredentialRule as 3 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 4: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 10 (Invalid value) CredentialRule as 3: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 4: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452 UserStatus as 1 UserType as 10 (Invalid value) CredentialRule as 3: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                                   NextTest();
@@ -168250,7 +184419,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 5: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 (Same as step 2) UserName as xxx UserUniqueID as 8965 UserStatus as 1 UserType as 0 CredentialRule as 0 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 5: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 (Same as step 2) UserName as xxx UserUniqueID as 8965 UserStatus as 1 UserType as 0 CredentialRule as 0: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 5: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 1 (Same as step 2) UserName as xxx UserUniqueID as 8965 UserStatus as 1 UserType as 0 CredentialRule as 0: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code : EMBER_ZCL_STATUS_FAILURE) : 0, EMBER_ZCL_STATUS_FAILURE));
                                                   NextTest();
@@ -168278,7 +184451,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 6a: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 6a: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 6a: TH sends Set User Command to DUT with the following values: OperationType as 0 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168300,7 +184477,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 6b: TH sends Get User Command to DUT with UserIndex as 2 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 6b: TH sends Get User Command to DUT with UserIndex as 2: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 6b: TH sends Get User Command to DUT with UserIndex as 2: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168386,7 +184567,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
         params.credentialRule = nil;
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Step 7: TH sends Set User Command to DUT with the following values: OperationType as 2 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 7: TH sends Set User Command to DUT with the following values: OperationType as 2 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 7: TH sends Set User Command to DUT with the following values: OperationType as 2 UserIndex as 2 UserName as NULL UserUniqueID as NULL UserStatus as NULL UserType as NULL CredentialRule as NULL: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168408,7 +184593,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 8: TH sends Get User Command to DUT with the UserIndex as 2 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 8: TH sends Get User Command to DUT with the UserIndex as 2: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 8: TH sends Get User Command to DUT with the UserIndex as 2: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168487,7 +184676,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Step 9: TH sends Clear User Command to DUT with the UserIndex as 1 Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Step 9: TH sends Clear User Command to DUT with the UserIndex as 1: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Step 9: TH sends Clear User Command to DUT with the UserIndex as 1: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168509,7 +184702,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Step 10: TH sends Get User Command to DUT with the UserIndex as 1 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Step 10: TH sends Get User Command to DUT with the UserIndex as 1: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Step 10: TH sends Get User Command to DUT with the UserIndex as 1: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168582,7 +184779,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster clearUserWithParams:params completion:
                                                 ^(NSError * _Nullable err) {
-                                                    NSLog(@"Test cleanup: TH sends Clear User Command to DUT with the UserIndex as 2 Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"Test cleanup: TH sends Clear User Command to DUT with the UserIndex as 2: Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"Test cleanup: TH sends Clear User Command to DUT with the UserIndex as 2: Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -168604,7 +184805,11 @@ class Test_TC_DRLK_2_8 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Test cleanup: TH sends Get User Command to DUT with the UserIndex as 2 Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Test cleanup: TH sends Get User Command to DUT with the UserIndex as 2: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Test cleanup: TH sends Get User Command to DUT with the UserIndex as 2: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169011,7 +185216,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster setUserWithParams:params completion:
                                               ^(NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Create new user with default parameters Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Create new user with default parameters: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Create new user with default parameters: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169033,7 +185242,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params completion:
                                               ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                  NSLog(@"Precondition: Read the user back and verify its fields Error: %@", err);
+                                                  if (err != nil) {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Error: %@", err);
+                                                  } else {
+                                                      NSLog(@"Precondition: Read the user back and verify its fields: Success");
+                                                  }
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169109,7 +185322,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNumberOfTotalUsersSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1a: TH reads NumberOfTotalUsersSupported and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1a: TH reads NumberOfTotalUsersSupported and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1a: TH reads NumberOfTotalUsersSupported and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169130,7 +185347,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinPINCodeLengthWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1b: TH reads MinPINCodeLength and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1b: TH reads MinPINCodeLength and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1b: TH reads MinPINCodeLength and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169151,7 +185372,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxPINCodeLengthWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1c: TH reads MaxPINCodeLength and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1c: TH reads MaxPINCodeLength and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1c: TH reads MaxPINCodeLength and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169172,7 +185397,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMinRFIDCodeLengthWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1d: TH reads MinRFIDCodeLength and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1d: TH reads MinRFIDCodeLength and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1d: TH reads MinRFIDCodeLength and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169193,7 +185422,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaxRFIDCodeLengthWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 1e: TH reads MaxRFIDCodeLength and saves for future use. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 1e: TH reads MaxRFIDCodeLength and saves for future use.: Error: %@", err);
+            } else {
+                NSLog(@"Step 1e: TH reads MaxRFIDCodeLength and saves for future use.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169229,7 +185462,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 2a: TH sends Set Credential Command to DUT with type PIN Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2a: TH sends Set Credential Command to DUT with type PIN: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2a: TH sends Set Credential Command to DUT with type PIN: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169278,7 +185515,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 2b: TH sends Set Credential Command to DUT with type RFID Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2b: TH sends Set Credential Command to DUT with type RFID: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2b: TH sends Set Credential Command to DUT with type RFID: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169327,7 +185568,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
         params.userType = nil;
         [cluster setCredentialWithParams:params completion:
                                                     ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                        NSLog(@"Step 2c: TH sends Set Credential Command to DUT with type FingerVein Error: %@", err);
+                                                        if (err != nil) {
+                                                            NSLog(@"Step 2c: TH sends Set Credential Command to DUT with type FingerVein: Error: %@", err);
+                                                        } else {
+                                                            NSLog(@"Step 2c: TH sends Set Credential Command to DUT with type FingerVein: Success");
+                                                        }
 
                                                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169369,63 +185614,71 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 3a: TH sends Get Credential Status Command with type PIN Error: %@", err);
-
-                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                              {
-                                                                  id actualValue = values.credentialExists;
-                                                                  VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
-                                                              }
-
-                                                              VerifyOrReturn(CheckConstraintType("credentialExists", "boolean", "boolean"));
-                                                              {
-                                                                  id actualValue = values.userIndex;
-                                                                  VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
-                                                                  VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
-                                                              }
-
-                                                              {
-                                                                  id actualValue = values.creatorFabricIndex;
-                                                                  VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
-                                                                  VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
-                                                              }
-
-                                                              {
-                                                                  id actualValue = values.lastModifiedFabricIndex;
-                                                                  VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
-                                                                  VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
-                                                              }
-
-                                                              {
-                                                                  id actualValue = values.nextCredentialIndex;
-                                                                  VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 3a: TH sends Get Credential Status Command with type PIN: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 3a: TH sends Get Credential Status Command with type PIN: Success");
+                                                              }
+
+                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                              {
+                                                                  id actualValue = values.credentialExists;
+                                                                  VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
+                                                              }
+
+                                                              VerifyOrReturn(CheckConstraintType("credentialExists", "boolean", "boolean"));
+                                                              {
+                                                                  id actualValue = values.userIndex;
+                                                                  VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                                                  VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
+                                                              }
+
+                                                              {
+                                                                  id actualValue = values.creatorFabricIndex;
+                                                                  VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                                                  VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
+                                                              }
+
+                                                              {
+                                                                  id actualValue = values.lastModifiedFabricIndex;
+                                                                  VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                                                  VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
+                                                              }
+
+                                                              {
+                                                                  id actualValue = values.nextCredentialIndex;
+                                                                  VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
+                                                              }
+
+                                                              NextTest();
+                                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep3bThSendsGetCredentialStatusCommandWithTypeRfid_12()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType =
+            [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster getCredentialStatusWithParams:params completion:
+                                                          ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 3b: TH sends Get Credential Status Command with type RFID: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 3b: TH sends Get Credential Status Command with type RFID: Success");
                                                               }
 
-                                                              NextTest();
-                                                          }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep3bThSendsGetCredentialStatusCommandWithTypeRfid_12()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
-        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType =
-            [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:1U];
-
-        [cluster getCredentialStatusWithParams:params completion:
-                                                          ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 3b: TH sends Get Credential Status Command with type RFID Error: %@", err);
-
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                               {
@@ -169479,7 +185732,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 3c: TH sends Get Credential Status Command with type FingerVein Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 3c: TH sends Get Credential Status Command with type FingerVein: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 3c: TH sends Get Credential Status Command with type FingerVein: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169534,7 +185791,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Step 4a: TH sends Clear Credential Command to DUT with type PIN Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 4a: TH sends Clear Credential Command to DUT with type PIN: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 4a: TH sends Clear Credential Command to DUT with type PIN: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169560,7 +185821,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 4b: TH sends Get Credential Status Command with type RFID Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 4b: TH sends Get Credential Status Command with type RFID: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 4b: TH sends Get Credential Status Command with type RFID: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169615,7 +185880,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 4c: TH sends Get Credential Status Command with type FingerVein Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 4c: TH sends Get Credential Status Command with type FingerVein: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 4c: TH sends Get Credential Status Command with type FingerVein: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169670,7 +185939,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Step 4d: TH sends Clear Credential Command to DUT with type RFID Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 4d: TH sends Clear Credential Command to DUT with type RFID: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 4d: TH sends Clear Credential Command to DUT with type RFID: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169696,7 +185969,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 4e: TH sends Get Credential Status Command with type FingerVein Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 4e: TH sends Get Credential Status Command with type FingerVein: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 4e: TH sends Get Credential Status Command with type FingerVein: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169751,7 +186028,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster clearCredentialWithParams:params completion:
                                                       ^(NSError * _Nullable err) {
-                                                          NSLog(@"Step 4f: TH sends Clear Credential Command to DUT with type FingerVein Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 4f: TH sends Clear Credential Command to DUT with type FingerVein: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 4f: TH sends Clear Credential Command to DUT with type FingerVein: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169777,7 +186058,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 5a: TH sends Get Credential Status Command to DUT with type PIN Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 5a: TH sends Get Credential Status Command to DUT with type PIN: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 5a: TH sends Get Credential Status Command to DUT with type PIN: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169828,7 +186113,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 5b: TH sends Get Credential Status Command to DUT with type RFID Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 5b: TH sends Get Credential Status Command to DUT with type RFID: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 5b: TH sends Get Credential Status Command to DUT with type RFID: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169879,7 +186168,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 5c: TH sends Get Credential Status Command to DUT with type FingerVein Error: %@", err);
+                                                              if (err != nil) {
+                                                                  NSLog(@"Step 5c: TH sends Get Credential Status Command to DUT with type FingerVein: Error: %@", err);
+                                                              } else {
+                                                                  NSLog(@"Step 5c: TH sends Get Credential Status Command to DUT with type FingerVein: Success");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170199,7 +186492,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Group 0 (invalid) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Group 0 (invalid): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Group 0 (invalid): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170231,7 +186528,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:257U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View First Group (not found) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View First Group (not found): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View First Group (not found): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170264,7 +186565,11 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupName = @"Group #1";
         [cluster addGroupWithParams:params completion:
                                                ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Add First Group (no keys) Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Add First Group (no keys): Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Add First Group (no keys): Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170312,7 +186617,11 @@ class TestGroupsCluster : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Add KeySet Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Add KeySet: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Add KeySet: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170351,7 +186660,11 @@ class TestGroupsCluster : public TestCommandBridge {
             groupKeyMapArgument = temp_0;
         }
         [cluster writeAttributeGroupKeyMapWithValue:groupKeyMapArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Write Group Keys Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Write Group Keys: Error: %@", err);
+            } else {
+                NSLog(@"Write Group Keys: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170374,7 +186687,11 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupName = @"12345678901234567";
         [cluster addGroupWithParams:params completion:
                                                ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Add First Group (name too long) Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Add First Group (name too long): Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Add First Group (name too long): Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170407,7 +186724,11 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupName = @"Group #101234567";
         [cluster addGroupWithParams:params completion:
                                                ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Add First Group (new) Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Add First Group (new): Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Add First Group (new): Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170439,7 +186760,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:257U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View First Group (new) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View First Group (new): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View First Group (new): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170476,7 +186801,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Second Group (not found) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Second Group (not found): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Second Group (not found): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170510,7 +186839,11 @@ class TestGroupsCluster : public TestCommandBridge {
         }
         [cluster getGroupMembershipWithParams:params completion:
                                                          ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Group Membership 1 (all) Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Group Membership 1 (all): Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Group Membership 1 (all): Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170544,7 +186877,11 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupName = @"Group #2";
         [cluster addGroupWithParams:params completion:
                                                ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Add Second Group (new) Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Add Second Group (new): Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Add Second Group (new): Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170576,7 +186913,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Second Group (new) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Second Group (new): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Second Group (new): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170613,7 +186954,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:32767U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Group 3 (not found) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Group 3 (not found): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Group 3 (not found): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170645,7 +186990,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:257U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View First Group (existing) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View First Group (existing): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View First Group (existing): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170682,7 +187031,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Second Group (existing) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Second Group (existing): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Second Group (existing): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170727,7 +187080,11 @@ class TestGroupsCluster : public TestCommandBridge {
         }
         [cluster getGroupMembershipWithParams:params completion:
                                                          ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Group Membership 2 Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Group Membership 2: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Group Membership 2: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170760,7 +187117,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:0U];
         [cluster removeGroupWithParams:params completion:
                                                   ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Remove Group 0 (invalid) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Remove Group 0 (invalid): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Remove Group 0 (invalid): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170792,7 +187153,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:260U];
         [cluster removeGroupWithParams:params completion:
                                                   ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Remove Group 4 (not found) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Remove Group 4 (not found): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Remove Group 4 (not found): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170824,7 +187189,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster removeGroupWithParams:params completion:
                                                   ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                      NSLog(@"Remove Second Group (existing) Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Remove Second Group (existing): Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Remove Second Group (existing): Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170856,7 +187225,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:257U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View First Group (not removed) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View First Group (not removed): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View First Group (not removed): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170893,7 +187266,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Second Group (removed) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Second Group (removed): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Second Group (removed): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170935,7 +187312,11 @@ class TestGroupsCluster : public TestCommandBridge {
         }
         [cluster getGroupMembershipWithParams:params completion:
                                                          ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Group Membership 3 Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Group Membership 3: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Group Membership 3: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170965,7 +187346,11 @@ class TestGroupsCluster : public TestCommandBridge {
 
         [cluster removeAllGroupsWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Remove All Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Remove All: Error: %@", err);
+                         } else {
+                             NSLog(@"Remove All: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -170987,7 +187372,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:257U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View First Group (removed) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View First Group (removed): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View First Group (removed): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171019,7 +187408,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:258U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Second Group (still removed) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Second Group (still removed): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Second Group (still removed): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171051,7 +187444,11 @@ class TestGroupsCluster : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:32767U];
         [cluster viewGroupWithParams:params completion:
                                                 ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"View Group 3 (removed) Error: %@", err);
+                                                    if (err != nil) {
+                                                        NSLog(@"View Group 3 (removed): Error: %@", err);
+                                                    } else {
+                                                        NSLog(@"View Group 3 (removed): Success");
+                                                    }
 
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171095,7 +187492,11 @@ class TestGroupsCluster : public TestCommandBridge {
         }
         [cluster getGroupMembershipWithParams:params completion:
                                                          ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Get Group Membership 4 Error: %@", err);
+                                                             if (err != nil) {
+                                                                 NSLog(@"Get Group Membership 4: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"Get Group Membership 4: Success");
+                                                             }
 
                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171260,14 +187661,1605 @@ class Test_TC_G_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 9;
+    const uint16_t mTestCount = 9;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestStep2ThReadsTheClusterRevisionFromDut_1()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads the ClusterRevision from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
+            }
+
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep3aThReadsTheFeatureMapFromDut_2()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: TH reads the FeatureMap from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL));
+            }
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep3bGivenGsf00EnsureFeaturemapHasTheCorrectBitSet_3()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 3b: Given G.S.F00 ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given G.S.F00 ensure featuremap has the correct bit set: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep4ThReadsAttributeListFromDut_4()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65530UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65532UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65533UL));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep4ThReadsAttributeListFromDut_5()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads AttributeList from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65532UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65533UL));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep6ThReadsAcceptedCommandListFromDut_7()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads AcceptedCommandList from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list"));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 4UL));
+            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 5UL));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep7ThReadsGeneratedCommandListFromDut_8()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads GeneratedCommandList from DUT: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list"));
+            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 0UL));
+            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL));
+            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 2UL));
+            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 3UL));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class TestScenesFabricRemoval : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TestScenesFabricRemoval()
+        : TestCommandBridge("TestScenesFabricRemoval")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("payload", &mPayload);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("waitAfterCommissioning", 0, UINT16_MAX, &mWaitAfterCommissioning);
+        AddArgument("PakeVerifier", &mPakeVerifier);
+        AddArgument("G1", 0, UINT16_MAX, &mG1);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~TestScenesFabricRemoval()
+    {
+    }
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TestScenesFabricRemoval\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TestScenesFabricRemoval\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Commission DUT to TH1\n");
+            err = TestCommissionDutToTh1_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH1 reads the fabric index\n");
+            err = TestTh1ReadsTheFabricIndex_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Open Commissioning Window from alpha\n");
+            err = TestOpenCommissioningWindowFromAlpha_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Waiting after opening commissioning window\n");
+            err = TestWaitingAfterOpeningCommissioningWindow_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Commission from TH2\n");
+            err = TestCommissionFromTh2_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Wait for the commissioned device to be retrieved for TH2\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrievedForTh2_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH2 reads the fabric index\n");
+            err = TestTh2ReadsTheFabricIndex_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH1 sends a RemoveAllGroups command to DUT.\n");
+            err = TestTh1SendsARemoveAllGroupsCommandToDut_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : TH 1 Add Group KeySet.\n");
+            err = TestTh1AddGroupKeySet_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH1 Map KeySets to GroupId.\n");
+            err = TestTh1MapKeySetsToGroupId_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH1 sends a AddGroup command to DUT for G1.\n");
+            err = TestTh1SendsAAddGroupCommandToDutForG1_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Preparation step : TH2 Add Group KeySet.\n");
+            err = TestPreparationStepTh2AddGroupKeySet_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Preparation step TH2 Map KeySets to GroupId.\n");
+            err = TestPreparationStepTh2MapKeySetsToGroupId_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : TH2 sends a AddGroup command to DUT for G1.\n");
+            err = TestTh2SendsAAddGroupCommandToDutForG1_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH1 confirms its Scene table is empty and gets its capacity\n");
+            err = TestTh1ConfirmsItsSceneTableIsEmptyAndGetsItsCapacity_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : TH2 confirms its Scene table is empty and has the same capacity as TH1\n");
+            err = TestTh2ConfirmsItsSceneTableIsEmptyAndHasTheSameCapacityAsTh1_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : TH1 sends an AddScene command to DUT for Scene 1 G1\n");
+            err = TestTh1SendsAnAddSceneCommandToDutForScene1G1_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : TH1 sends an AddScene command to DUT for Scene 2 G1\n");
+            err = TestTh1SendsAnAddSceneCommandToDutForScene2G1_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : TH2 sends an AddScene command to DUT for Scene 1 G1\n");
+            err = TestTh2SendsAnAddSceneCommandToDutForScene1G1_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : TH2 sends an AddScene command to DUT for Scene 2 G1\n");
+            err = TestTh2SendsAnAddSceneCommandToDutForScene2G1_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : TH1 confirms its G1 holds 2 scenes\n");
+            err = TestTh1ConfirmsItsG1Holds2Scenes_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : TH2 confirms its G1 holds 2 scenes\n");
+            err = TestTh2ConfirmsItsG1Holds2Scenes_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : TH1 sends RemoveFabric command for TH2\n");
+            err = TestTh1SendsRemoveFabricCommandForTh2_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : TH1 confirms its G1 still holds 2 scenes\n");
+            err = TestTh1ConfirmsItsG1StillHolds2Scenes_23();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 24;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<chip::CharSpan> mPayload;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<uint16_t> mWaitAfterCommissioning;
+    chip::Optional<chip::ByteSpan> mPakeVerifier;
+    chip::Optional<chip::GroupId> mG1;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestCommissionDutToTh1_0()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+    NSNumber * _Nonnull th1FabricIndex;
+
+    CHIP_ERROR TestTh1ReadsTheFabricIndex_1()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"TH1 reads the fabric index: Error: %@", err);
+            } else {
+                NSLog(@"TH1 reads the fabric index: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                th1FabricIndex = value;
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestOpenCommissioningWindowFromAlpha_2()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout =
+            [NSNumber numberWithUnsignedShort:180U];
+        params.pakePasscodeVerifier = mPakeVerifier.HasValue() ? [NSData dataWithBytes:mPakeVerifier.Value().data() length:mPakeVerifier.Value().size()] : [[NSData alloc] initWithBytes:"\xb9\x61\x70\xaa\xe8\x03\x34\x68\x84\x72\x4f\xe9\xa3\xb2\x87\xc3\x03\x30\xc2\xa6\x60\x37\x5d\x17\xbb\x20\x5a\x8c\xf1\xae\xcb\x35\x04\x57\xf8\xab\x79\xee\x25\x3a\xb6\xa8\xe4\x6b\xb0\x9e\x54\x3a\xe4\x22\x73\x6d\xe5\x01\xe3\xdb\x37\xd4\x41\xfe\x34\x49\x20\xd0\x95\x48\xe4\xc1\x82\x40\x63\x0c\x4f\xf4\x91\x3c\x53\x51\x38\x39\xb7\xc0\x7f\xcc\x06\x27\xa1\xb8\x57\x3a\x14\x9f\xcd\x1f\xa4\x66\xcf" length:97];
+        params.discriminator = mDiscriminator.HasValue() ? [NSNumber numberWithUnsignedShort:mDiscriminator.Value()] : [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations =
+            [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt =
+            [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params completion:
+                                                              ^(NSError * _Nullable err) {
+                                                                  if (err != nil) {
+                                                                      NSLog(@"Open Commissioning Window from alpha: Error: %@", err);
+                                                                  } else {
+                                                                      NSLog(@"Open Commissioning Window from alpha: Success");
+                                                                  }
+
+                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                                  NextTest();
+                                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWaitingAfterOpeningCommissioningWindow_3()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mWaitAfterCommissioning.HasValue() ? mWaitAfterCommissioning.Value() : 5000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestCommissionFromTh2_4()
+    {
+
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+        return PairWithCode("beta", value);
+    }
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrievedForTh2_5()
+    {
+
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("beta", value);
+    }
+    NSNumber * _Nonnull th2FabricIndex;
+
+    CHIP_ERROR TestTh2ReadsTheFabricIndex_6()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentFabricIndexWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"TH2 reads the fabric index: Error: %@", err);
+            } else {
+                NSLog(@"TH2 reads the fabric index: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                th2FabricIndex = value;
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1SendsARemoveAllGroupsCommandToDut_7()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster removeAllGroupsWithCompletion:
+                     ^(NSError * _Nullable err) {
+                         if (err != nil) {
+                             NSLog(@"TH1 sends a RemoveAllGroups command to DUT.: Error: %@", err);
+                         } else {
+                             NSLog(@"TH1 sends a RemoveAllGroups command to DUT.: Success");
+                         }
+
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                         NextTest();
+                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1AddGroupKeySet_8()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRGroupKeyManagementClusterKeySetWriteParams alloc] init];
+        params.groupKeySet = [[MTRGroupKeyManagementClusterGroupKeySetStruct alloc] init];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).groupKeySetID =
+            [NSNumber numberWithUnsignedShort:417U];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).groupKeySecurityPolicy =
+            [NSNumber numberWithUnsignedChar:0U];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey0 =
+            [[NSData alloc] initWithBytes:"\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime0 =
+            [NSNumber numberWithUnsignedLongLong:1110000ULL];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey1 =
+            [[NSData alloc] initWithBytes:"\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime1 =
+            [NSNumber numberWithUnsignedLongLong:1110001ULL];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey2 =
+            [[NSData alloc] initWithBytes:"\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime2 =
+            [NSNumber numberWithUnsignedLongLong:1110002ULL];
+
+        [cluster keySetWriteWithParams:params completion:
+                                                  ^(NSError * _Nullable err) {
+                                                      if (err != nil) {
+                                                          NSLog(@"TH 1 Add Group KeySet.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"TH 1 Add Group KeySet.: Success");
+                                                      }
+
+                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                      NextTest();
+                                                  }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1MapKeySetsToGroupId_9()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id groupKeyMapArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[MTRGroupKeyManagementClusterGroupKeyMapStruct alloc] init];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupId = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupKeySetID =
+                [NSNumber numberWithUnsignedShort:417U];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex =
+                [NSNumber numberWithUnsignedChar:0U];
+
+            groupKeyMapArgument = temp_0;
+        }
+        [cluster writeAttributeGroupKeyMapWithValue:groupKeyMapArgument completion:^(NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"TH1 Map KeySets to GroupId.: Error: %@", err);
+            } else {
+                NSLog(@"TH1 Map KeySets to GroupId.: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1SendsAAddGroupCommandToDutForG1_10()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.groupName = @"Group1";
+        [cluster addGroupWithParams:params completion:
+                                               ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH1 sends a AddGroup command to DUT for G1.: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH1 sends a AddGroup command to DUT for G1.: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestPreparationStepTh2AddGroupKeySet_11()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRGroupKeyManagementClusterKeySetWriteParams alloc] init];
+        params.groupKeySet = [[MTRGroupKeyManagementClusterGroupKeySetStruct alloc] init];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).groupKeySetID =
+            [NSNumber numberWithUnsignedShort:418U];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).groupKeySecurityPolicy =
+            [NSNumber numberWithUnsignedChar:0U];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey0 =
+            [[NSData alloc] initWithBytes:"\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime0 =
+            [NSNumber numberWithUnsignedLongLong:1120000ULL];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey1 =
+            [[NSData alloc] initWithBytes:"\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime1 =
+            [NSNumber numberWithUnsignedLongLong:1120001ULL];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochKey2 =
+            [[NSData alloc] initWithBytes:"\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317" length:16];
+        ((MTRGroupKeyManagementClusterGroupKeySetStruct *) params.groupKeySet).epochStartTime2 =
+            [NSNumber numberWithUnsignedLongLong:1120002ULL];
+
+        [cluster keySetWriteWithParams:params completion:
+                                                  ^(NSError * _Nullable err) {
+                                                      if (err != nil) {
+                                                          NSLog(@"Preparation step : TH2 Add Group KeySet.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Preparation step : TH2 Add Group KeySet.: Success");
+                                                      }
+
+                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                      NextTest();
+                                                  }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestPreparationStepTh2MapKeySetsToGroupId_12()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id groupKeyMapArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[MTRGroupKeyManagementClusterGroupKeyMapStruct alloc] init];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupId = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupKeySetID =
+                [NSNumber numberWithUnsignedShort:418U];
+            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex =
+                [NSNumber numberWithUnsignedChar:0U];
+
+            groupKeyMapArgument = temp_0;
+        }
+        [cluster writeAttributeGroupKeyMapWithValue:groupKeyMapArgument completion:^(NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Preparation step TH2 Map KeySets to GroupId.: Error: %@", err);
+            } else {
+                NSLog(@"Preparation step TH2 Map KeySets to GroupId.: Success");
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh2SendsAAddGroupCommandToDutForG1_13()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.groupName = @"Group1";
+        [cluster addGroupWithParams:params completion:
+                                               ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH2 sends a AddGroup command to DUT for G1.: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH2 sends a AddGroup command to DUT for G1.: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nullable fabricCapacity;
+
+    CHIP_ERROR TestTh1ConfirmsItsSceneTableIsEmptyAndGetsItsCapacity_14()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        [cluster getSceneMembershipWithParams:params completion:
+                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                             if (err != nil) {
+                                                                 NSLog(@"TH1 confirms its Scene table is empty and gets its capacity: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"TH1 confirms its Scene table is empty and gets its capacity: Success");
+                                                             }
+
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                             {
+                                                                 id actualValue = values.status;
+                                                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                             }
+
+                                                             {
+                                                                 fabricCapacity = values.capacity;
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.groupID;
+                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                             }
+
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh2ConfirmsItsSceneTableIsEmptyAndHasTheSameCapacityAsTh1_15()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        [cluster getSceneMembershipWithParams:params completion:
+                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                             if (err != nil) {
+                                                                 NSLog(@"TH2 confirms its Scene table is empty and has the same capacity as TH1: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"TH2 confirms its Scene table is empty and has the same capacity as TH1: Success");
+                                                             }
+
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                             {
+                                                                 id actualValue = values.status;
+                                                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.capacity;
+                                                                 if (fabricCapacity == nil) {
+                                                                     VerifyOrReturn(CheckValueNull("Capacity", actualValue));
+                                                                 } else {
+                                                                     VerifyOrReturn(CheckValueNonNull("Capacity", actualValue));
+                                                                     VerifyOrReturn(CheckValue("Capacity", actualValue, fabricCapacity));
+                                                                 }
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.groupID;
+                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                             }
+
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1SendsAnAddSceneCommandToDutForScene1G1_16()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterAddSceneParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.sceneID =
+            [NSNumber numberWithUnsignedChar:1U];
+        params.transitionTime =
+            [NSNumber numberWithUnsignedShort:1U];
+        params.sceneName = @"Scene1";
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            params.extensionFieldSets = temp_0;
+        }
+        [cluster addSceneWithParams:params completion:
+                                               ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH1 sends an AddScene command to DUT for Scene 1 G1: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH1 sends an AddScene command to DUT for Scene 1 G1: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.sceneID;
+                                                       VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1SendsAnAddSceneCommandToDutForScene2G1_17()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterAddSceneParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.sceneID =
+            [NSNumber numberWithUnsignedChar:2U];
+        params.transitionTime =
+            [NSNumber numberWithUnsignedShort:0U];
+        params.sceneName = @"Scene2";
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            params.extensionFieldSets = temp_0;
+        }
+        [cluster addSceneWithParams:params completion:
+                                               ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH1 sends an AddScene command to DUT for Scene 2 G1: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH1 sends an AddScene command to DUT for Scene 2 G1: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.sceneID;
+                                                       VerifyOrReturn(CheckValue("SceneID", actualValue, 2U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh2SendsAnAddSceneCommandToDutForScene1G1_18()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterAddSceneParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.sceneID =
+            [NSNumber numberWithUnsignedChar:1U];
+        params.transitionTime =
+            [NSNumber numberWithUnsignedShort:1U];
+        params.sceneName = @"Scene1";
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            params.extensionFieldSets = temp_0;
+        }
+        [cluster addSceneWithParams:params completion:
+                                               ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH2 sends an AddScene command to DUT for Scene 1 G1: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH2 sends an AddScene command to DUT for Scene 1 G1: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.sceneID;
+                                                       VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh2SendsAnAddSceneCommandToDutForScene2G1_19()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterAddSceneParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        params.sceneID =
+            [NSNumber numberWithUnsignedChar:2U];
+        params.transitionTime =
+            [NSNumber numberWithUnsignedShort:0U];
+        params.sceneName = @"Scene2";
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            params.extensionFieldSets = temp_0;
+        }
+        [cluster addSceneWithParams:params completion:
+                                               ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                   if (err != nil) {
+                                                       NSLog(@"TH2 sends an AddScene command to DUT for Scene 2 G1: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"TH2 sends an AddScene command to DUT for Scene 2 G1: Success");
+                                                   }
+
+                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                   {
+                                                       id actualValue = values.status;
+                                                       VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.groupID;
+                                                       VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                   }
+
+                                                   {
+                                                       id actualValue = values.sceneID;
+                                                       VerifyOrReturn(CheckValue("SceneID", actualValue, 2U));
+                                                   }
+
+                                                   NextTest();
+                                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1ConfirmsItsG1Holds2Scenes_20()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        [cluster getSceneMembershipWithParams:params completion:
+                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                             if (err != nil) {
+                                                                 NSLog(@"TH1 confirms its G1 holds 2 scenes: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"TH1 confirms its G1 holds 2 scenes: Success");
+                                                             }
+
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                             {
+                                                                 id actualValue = values.status;
+                                                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.capacity;
+                                                                 VerifyOrReturn(CheckValueNonNull("Capacity", actualValue));
+                                                                 VerifyOrReturn(CheckValue("Capacity", actualValue, [fabricCapacity unsignedCharValue] - 2U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.groupID;
+                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.sceneList;
+                                                                 VerifyOrReturn(CheckValue("SceneList", [actualValue count], static_cast<uint32_t>(2)));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[0], 1U));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[1], 2U));
+                                                             }
+
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh2ConfirmsItsG1Holds2Scenes_21()
+    {
+
+        MTRBaseDevice * device = GetDevice("beta");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        [cluster getSceneMembershipWithParams:params completion:
+                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                             if (err != nil) {
+                                                                 NSLog(@"TH2 confirms its G1 holds 2 scenes: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"TH2 confirms its G1 holds 2 scenes: Success");
+                                                             }
+
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                             {
+                                                                 id actualValue = values.status;
+                                                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.capacity;
+                                                                 VerifyOrReturn(CheckValueNonNull("Capacity", actualValue));
+                                                                 VerifyOrReturn(CheckValue("Capacity", actualValue, [fabricCapacity unsignedCharValue] - 2U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.groupID;
+                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.sceneList;
+                                                                 VerifyOrReturn(CheckValue("SceneList", [actualValue count], static_cast<uint32_t>(2)));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[0], 1U));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[1], 2U));
+                                                             }
+
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1SendsRemoveFabricCommandForTh2_22()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTROperationalCredentialsClusterRemoveFabricParams alloc] init];
+        params.fabricIndex =
+            [th2FabricIndex copy];
+        [cluster removeFabricWithParams:params completion:
+                                                   ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                       if (err != nil) {
+                                                           NSLog(@"TH1 sends RemoveFabric command for TH2: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"TH1 sends RemoveFabric command for TH2: Success");
+                                                       }
+
+                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                       NextTest();
+                                                   }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTh1ConfirmsItsG1StillHolds2Scenes_23()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
+        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
+        [cluster getSceneMembershipWithParams:params completion:
+                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
+                                                             if (err != nil) {
+                                                                 NSLog(@"TH1 confirms its G1 still holds 2 scenes: Error: %@", err);
+                                                             } else {
+                                                                 NSLog(@"TH1 confirms its G1 still holds 2 scenes: Success");
+                                                             }
+
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                             {
+                                                                 id actualValue = values.status;
+                                                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.capacity;
+                                                                 VerifyOrReturn(CheckValueNonNull("Capacity", actualValue));
+                                                                 VerifyOrReturn(CheckValue("Capacity", actualValue, [fabricCapacity unsignedCharValue] - 2U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.groupID;
+                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 1U));
+                                                             }
+
+                                                             {
+                                                                 id actualValue = values.sceneList;
+                                                                 VerifyOrReturn(CheckValue("SceneList", [actualValue count], static_cast<uint32_t>(2)));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[0], 1U));
+                                                                 VerifyOrReturn(CheckValue("", actualValue[1], 2U));
+                                                             }
+
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_S_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_S_1_1()
+        : TestCommandBridge("Test_TC_S_1_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_S_1_1()
+    {
+    }
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_S_1_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_S_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Commission DUT to TH (can be skipped if done in a preceding test)\n");
+            err = TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read ClusterRevision (global attribute 65533)\n");
+            err = TestStep2ReadClusterRevisionGlobalAttribute65533_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3a: Read FeatureMap NameSupport bit (global attribute 65532)\n");
+            if (ShouldSkip("(!S.S.F00)")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3aReadFeatureMapNameSupportBitGlobalAttribute65532_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 3a: Read FeatureMap NameSupport bit (global attribute 65532)\n");
+            if (ShouldSkip("S.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3aReadFeatureMapNameSupportBitGlobalAttribute65532_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 3b: Read FeatureMap Explicit bit (global attribute 65532)\n");
+            if (ShouldSkip("(!S.S.F01)")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3bReadFeatureMapExplicitBitGlobalAttribute65532_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 3b: Read FeatureMap Explicit bit (global attribute 65532)\n");
+            if (ShouldSkip("S.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3bReadFeatureMapExplicitBitGlobalAttribute65532_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 3c: Read FeatureMap TableSize bit (global attribute 65532)\n");
+            if (ShouldSkip("(!S.S.F02)")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3cReadFeatureMapTableSizeBitGlobalAttribute65532_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 3c: Read FeatureMap TableSize bit (global attribute 65532)\n");
+            if (ShouldSkip("S.S.F02")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3cReadFeatureMapTableSizeBitGlobalAttribute65532_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 3d: Read FeatureMap FabricScene bit (global attribute 65532)\n");
+            if (ShouldSkip("(!S.S.F03)")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3dReadFeatureMapFabricSceneBitGlobalAttribute65532_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 3d: Read FeatureMap FabricScene bit (global attribute 65532)\n");
+            if (ShouldSkip("S.S.F03")) {
+                NextTest();
+                return;
+            }
+            err = TestStep3dReadFeatureMapFabricSceneBitGlobalAttribute65532_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 4: Read Mandatory attributes in AttributeList (global attribute 65531)\n");
+            if (ShouldSkip("S.S")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531)\n");
+            if (ShouldSkip("(!S.S.F03)")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531)\n");
+            if (ShouldSkip("S.S.A0005")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531)\n");
+            if (ShouldSkip("S.S.F02")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531)\n");
+            if (ShouldSkip("S.S.F03")) {
+                NextTest();
+                return;
+            }
+            err = TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 5: Read EventList (global attribute 65530)\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            NextTest();
+            return;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529)\n");
+            if (ShouldSkip("S.S")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529)\n");
+            if (ShouldSkip("S.S.C40.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529)\n");
+            if (ShouldSkip("S.S.C41.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529)\n");
+            if (ShouldSkip("S.S.C42.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Step 7a: Read GeneratedCommandList (global attribute 65528)\n");
+            err = TestStep7aReadGeneratedCommandListGlobalAttribute65528_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+            if (ShouldSkip("S.S.C40.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+            if (ShouldSkip("S.S.C41.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+            if (ShouldSkip("S.S.C42.Rsp")) {
+                NextTest();
+                return;
+            }
+            err = TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_23();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 24;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0()
     {
 
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
@@ -171275,21 +189267,25 @@ class Test_TC_G_1_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestStep2ThReadsTheClusterRevisionFromDut_1()
+    CHIP_ERROR TestStep2ReadClusterRevisionGlobalAttribute65533_1()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads the ClusterRevision from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read ClusterRevision (global attribute 65533): Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read ClusterRevision (global attribute 65533): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -171299,23 +189295,22 @@ class Test_TC_G_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3aThReadsTheFeatureMapFromDut_2()
+    CHIP_ERROR TestStep3aReadFeatureMapNameSupportBitGlobalAttribute65532_2()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: TH reads the FeatureMap from DUT Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read FeatureMap NameSupport bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read FeatureMap NameSupport bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL));
-            }
-
             VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
             NextTest();
         }];
@@ -171323,15 +189318,19 @@ class Test_TC_G_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3bGivenGsf00EnsureFeaturemapHasTheCorrectBitSet_3()
+    CHIP_ERROR TestStep3aReadFeatureMapNameSupportBitGlobalAttribute65532_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given G.S.F00 ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read FeatureMap NameSupport bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read FeatureMap NameSupport bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171342,411 +189341,53 @@ class Test_TC_G_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ThReadsAttributeListFromDut_4()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65530UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65532UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65533UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep4ThReadsAttributeListFromDut_5()
+    CHIP_ERROR TestStep3bReadFeatureMapExplicitBitGlobalAttribute65532_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads AttributeList from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65532UL));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 65533UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep6ThReadsAcceptedCommandListFromDut_7()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads AcceptedCommandList from DUT Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 3b: Read FeatureMap Explicit bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read FeatureMap Explicit bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 4UL));
-            VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 5UL));
-
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7ThReadsGeneratedCommandListFromDut_8()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 0UL));
-            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL));
-            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 2UL));
-            VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 3UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_S_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_S_1_1()
-        : TestCommandBridge("Test_TC_S_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_S_1_1()
-    {
-    }
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_S_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_S_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Commission DUT to TH (can be skipped if done in a preceding test)\n");
-            err = TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read ClusterRevision (global attribute 65533)\n");
-            err = TestStep2ReadClusterRevisionGlobalAttribute65533_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3a: Read FeatureMap (global attribute 65532)\n");
-            if (ShouldSkip("(!S.S.F00)")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3aReadFeatureMapGlobalAttribute65532_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 3a: Read FeatureMap (global attribute 65532)\n");
-            if (ShouldSkip("S.S.F00")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3aReadFeatureMapGlobalAttribute65532_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 3b: Read FeatureMap (global attribute 65532)\n");
-            err = TestStep3bReadFeatureMapGlobalAttribute65532_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 3c: Read FeatureMap (global attribute 65532)\n");
-            err = TestStep3cReadFeatureMapGlobalAttribute65532_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4: Read Mandatory attributes in AttributeList (global attribute 65531)\n");
-            if (ShouldSkip("S.S")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531)\n");
-            if (ShouldSkip("(!S.S.F03)")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531)\n");
-            if (ShouldSkip("S.S.A0005")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531)\n");
-            if (ShouldSkip("S.S.F02")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531)\n");
-            if (ShouldSkip("S.S.F03")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 5: Read EventList (global attribute 65530)\n");
-            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
-                NextTest();
-                return;
-            }
-            NextTest();
-            return;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529)\n");
-            if (ShouldSkip("S.S")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529)\n");
-            if (ShouldSkip("S.S.C40.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529)\n");
-            if (ShouldSkip("S.S.C41.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529)\n");
-            if (ShouldSkip("S.S.C42.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 7a: Read GeneratedCommandList (global attribute 65528)\n");
-            err = TestStep7aReadGeneratedCommandListGlobalAttribute65528_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
-            if (ShouldSkip("S.S.C40.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
-            if (ShouldSkip("S.S.C41.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528)\n");
-            if (ShouldSkip("S.S.C42.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_19();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 20;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestStep1CommissionDutToThCanBeSkippedIfDoneInAPrecedingTest_0()
-    {
-
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestStep2ReadClusterRevisionGlobalAttribute65533_1()
+    CHIP_ERROR TestStep3bReadFeatureMapExplicitBitGlobalAttribute65532_5()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
         __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read ClusterRevision (global attribute 65533) Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 3b: Read FeatureMap Explicit bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Read FeatureMap Explicit bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
-            }
-
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3aReadFeatureMapGlobalAttribute65532_2()
+    CHIP_ERROR TestStep3cReadFeatureMapTableSizeBitGlobalAttribute65532_6()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171754,7 +189395,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read FeatureMap (global attribute 65532) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read FeatureMap TableSize bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read FeatureMap TableSize bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171765,7 +189410,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3aReadFeatureMapGlobalAttribute65532_3()
+    CHIP_ERROR TestStep3cReadFeatureMapTableSizeBitGlobalAttribute65532_7()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171773,7 +189418,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read FeatureMap (global attribute 65532) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Read FeatureMap TableSize bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Read FeatureMap TableSize bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171784,7 +189433,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3bReadFeatureMapGlobalAttribute65532_4()
+    CHIP_ERROR TestStep3dReadFeatureMapFabricSceneBitGlobalAttribute65532_8()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171792,7 +189441,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Read FeatureMap (global attribute 65532) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read FeatureMap FabricScene bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read FeatureMap FabricScene bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171803,7 +189456,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep3cReadFeatureMapGlobalAttribute65532_5()
+    CHIP_ERROR TestStep3dReadFeatureMapFabricSceneBitGlobalAttribute65532_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171811,7 +189464,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Read FeatureMap (global attribute 65532) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Read FeatureMap FabricScene bit (global attribute 65532): Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Read FeatureMap FabricScene bit (global attribute 65532): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171822,7 +189479,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_6()
+    CHIP_ERROR TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171830,7 +189487,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read Mandatory attributes in AttributeList (global attribute 65531) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read Mandatory attributes in AttributeList (global attribute 65531): Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read Mandatory attributes in AttributeList (global attribute 65531): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171848,7 +189509,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_7()
+    CHIP_ERROR TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_11()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171856,7 +189517,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531): Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171872,7 +189537,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_8()
+    CHIP_ERROR TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171880,7 +189545,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531): Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171893,7 +189562,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_9()
+    CHIP_ERROR TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171901,7 +189570,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531): Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171914,7 +189587,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_10()
+    CHIP_ERROR TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171922,7 +189595,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531): Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171935,7 +189612,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_12()
+    CHIP_ERROR TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171943,7 +189620,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529): Error: %@", err);
+            } else {
+                NSLog(@"Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171962,7 +189643,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_13()
+    CHIP_ERROR TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171970,7 +189651,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529): Error: %@", err);
+            } else {
+                NSLog(@"Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171983,7 +189668,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_14()
+    CHIP_ERROR TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171991,7 +189676,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529): Error: %@", err);
+            } else {
+                NSLog(@"Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172004,7 +189693,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_15()
+    CHIP_ERROR TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172012,7 +189701,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529): Error: %@", err);
+            } else {
+                NSLog(@"Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172025,7 +189718,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7aReadGeneratedCommandListGlobalAttribute65528_16()
+    CHIP_ERROR TestStep7aReadGeneratedCommandListGlobalAttribute65528_20()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172033,7 +189726,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7a: Read GeneratedCommandList (global attribute 65528) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7a: Read GeneratedCommandList (global attribute 65528): Error: %@", err);
+            } else {
+                NSLog(@"Step 7a: Read GeneratedCommandList (global attribute 65528): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172051,7 +189748,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_17()
+    CHIP_ERROR TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_21()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172059,7 +189756,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528): Error: %@", err);
+            } else {
+                NSLog(@"Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172072,7 +189773,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_18()
+    CHIP_ERROR TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_22()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172080,7 +189781,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528): Error: %@", err);
+            } else {
+                NSLog(@"Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172093,7 +189798,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_19()
+    CHIP_ERROR TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_23()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172101,7 +189806,11 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528) Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528): Error: %@", err);
+            } else {
+                NSLog(@"Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528): Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172161,7 +189870,7 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads from the DUT the (0x0000) SceneCount attribute\n");
-            if (ShouldSkip("S.S.A0000")) {
+            if (ShouldSkip("S.S.A0000 && (!S.S.F03)")) {
                 NextTest();
                 return;
             }
@@ -172169,7 +189878,7 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads from the DUT the (0x0001) CurrentScene attribute\n");
-            if (ShouldSkip("S.S.A0001")) {
+            if (ShouldSkip("S.S.A0001 && (!S.S.F03)")) {
                 NextTest();
                 return;
             }
@@ -172177,7 +189886,7 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: TH reads from the DUT the (0x0002) CurrentGroup attribute\n");
-            if (ShouldSkip("S.S.A0002")) {
+            if (ShouldSkip("S.S.A0002 && (!S.S.F03)")) {
                 NextTest();
                 return;
             }
@@ -172185,7 +189894,7 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Step 5: TH reads from the DUT the (0x0003) SceneValid attribute\n");
-            if (ShouldSkip("S.S.A0003")) {
+            if (ShouldSkip("S.S.A0003 && (!S.S.F03)")) {
                 NextTest();
                 return;
             }
@@ -172193,7 +189902,7 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Step 6: TH reads from the DUT the (0x0004) NameSupport attribute\n");
-            if (ShouldSkip("S.S.A0003 && S.S.F00")) {
+            if (ShouldSkip("S.S.A0004 && S.S.F00")) {
                 NextTest();
                 return;
             }
@@ -172224,12 +189933,12 @@ class Test_TC_S_2_1 : public TestCommandBridge {
             err = TestStep8ThReadsFromTheDutThe0x0006SceneTableSizeAttribute_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 9: TH reads from the DUT the (0x0007) RemainingCapacity attribute\n");
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 9: TH reads from the DUT the (0x0007) FabricSceneInfo attribute\n");
             if (ShouldSkip("S.S.A0007")) {
                 NextTest();
                 return;
             }
-            err = TestStep9ThReadsFromTheDutThe0x0007RemainingCapacityAttribute_9();
+            err = TestStep9ThReadsFromTheDutThe0x0007FabricSceneInfoAttribute_9();
             break;
         }
 
@@ -172305,7 +190014,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSceneCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the (0x0000) SceneCount attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the (0x0000) SceneCount attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the (0x0000) SceneCount attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172324,7 +190037,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentSceneWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the (0x0001) CurrentScene attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the (0x0001) CurrentScene attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the (0x0001) CurrentScene attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172343,7 +190060,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentGroupWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the (0x0002) CurrentGroup attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the (0x0002) CurrentGroup attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the (0x0002) CurrentGroup attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172362,7 +190083,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSceneValidWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the (0x0003) SceneValid attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the (0x0003) SceneValid attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the (0x0003) SceneValid attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172381,7 +190106,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNameSupportWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172405,7 +190134,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNameSupportWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the (0x0004) NameSupport attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172429,7 +190162,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLastConfiguredByWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the (0x0005) LastConfiguredBy attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the (0x0005) LastConfiguredBy attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the (0x0005) LastConfiguredBy attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172452,7 +190189,11 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSceneTableSizeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 8: TH reads from the DUT the (0x0006) SceneTableSize attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 8: TH reads from the DUT the (0x0006) SceneTableSize attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 8: TH reads from the DUT the (0x0006) SceneTableSize attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172463,19 +190204,25 @@ class Test_TC_S_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep9ThReadsFromTheDutThe0x0007RemainingCapacityAttribute_9()
+    CHIP_ERROR TestStep9ThReadsFromTheDutThe0x0007FabricSceneInfoAttribute_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
         __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRemainingCapacityWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 9: TH reads from the DUT the (0x0007) RemainingCapacity attribute Error: %@", err);
+        __auto_type * params = [[MTRReadParams alloc] init];
+        params.filterByFabric = true;
+        [cluster readAttributeFabricSceneInfoWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            if (err != nil) {
+                NSLog(@"Step 9: TH reads from the DUT the (0x0007) FabricSceneInfo attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 9: TH reads from the DUT the (0x0007) FabricSceneInfo attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("remainingCapacity", "int8u", "int8u"));
+            VerifyOrReturn(CheckConstraintType("fabricSceneInfo", "list", "list"));
             NextTest();
         }];
 
@@ -172873,7 +190620,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
 
         [cluster keySetWriteWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 0a: preparation step for using commands from Groups cluster: Add KeySet Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 0a: preparation step for using commands from Groups cluster: Add KeySet: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 0a: preparation step for using commands from Groups cluster: Add KeySet: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172903,7 +190654,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             groupKeyMapArgument = temp_0;
         }
         [cluster writeAttributeGroupKeyMapWithValue:groupKeyMapArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Step 0b: Preparation step for using commands from Groups cluster: Write Group Keys Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 0b: Preparation step for using commands from Groups cluster: Write Group Keys: Error: %@", err);
+            } else {
+                NSLog(@"Step 0b: Preparation step for using commands from Groups cluster: Write Group Keys: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172922,7 +190677,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
 
         [cluster removeAllGroupsWithCompletion:
                      ^(NSError * _Nullable err) {
-                         NSLog(@"Step 0c: TH sends a RemoveAllGroups command to DUT. Error: %@", err);
+                         if (err != nil) {
+                             NSLog(@"Step 0c: TH sends a RemoveAllGroups command to DUT.: Error: %@", err);
+                         } else {
+                             NSLog(@"Step 0c: TH sends a RemoveAllGroups command to DUT.: Success");
+                         }
 
                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172944,7 +190703,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         params.groupName = @"Group1";
         [cluster addGroupWithParams:params completion:
                                                ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Step 2a: TH sends a AddGroup command to DUT with the GroupID field set to G1. Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Step 2a: TH sends a AddGroup command to DUT with the GroupID field set to G1.: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Step 2a: TH sends a AddGroup command to DUT with the GroupID field set to G1.: Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -172975,7 +190738,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:1U];
         [cluster removeAllScenesWithParams:params completion:
                                                       ^(MTRScenesClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                          NSLog(@"Step 2b: TH sends a RemoveAllScenes command to DUT with the GroupID field set to G1. Error: %@", err);
+                                                          if (err != nil) {
+                                                              NSLog(@"Step 2b: TH sends a RemoveAllScenes command to DUT with the GroupID field set to G1.: Error: %@", err);
+                                                          } else {
+                                                              NSLog(@"Step 2b: TH sends a RemoveAllScenes command to DUT with the GroupID field set to G1.: Success");
+                                                          }
 
                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173015,7 +190782,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         }
         [cluster addSceneWithParams:params completion:
                                                ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x0001 and a set of extension fields appropriate to AC1. Error: %@", err);
+                                                   if (err != nil) {
+                                                       NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x0001 and a set of extension fields appropriate to AC1.: Error: %@", err);
+                                                   } else {
+                                                       NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x0001 and a set of extension fields appropriate to AC1.: Success");
+                                                   }
 
                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173058,7 +190829,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithOnOffWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 4a: TH configures AC1 on DUT for all implemented application clusters supporting scenes. Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 4a: TH configures AC1 on DUT for all implemented application clusters supporting scenes.: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 4a: TH configures AC1 on DUT for all implemented application clusters supporting scenes.: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173091,7 +190866,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster storeSceneWithParams:params completion:
                                                  ^(MTRScenesClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                     NSLog(@"Step 4b: TH sends a StoreScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01. Error: %@", err);
+                                                     if (err != nil) {
+                                                         NSLog(@"Step 4b: TH sends a StoreScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.: Error: %@", err);
+                                                     } else {
+                                                         NSLog(@"Step 4b: TH sends a StoreScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.: Success");
+                                                     }
 
                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173134,7 +190913,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithOnOffWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 5a: TH configures AC2 on DUT for all implemented application clusters supporting scenes. Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 5a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 5a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173160,7 +190943,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 1s, which is different from AC1 Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 1s, which is different from AC1: Error: %@", err);
+            } else {
+                NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 1s, which is different from AC1: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173199,7 +190986,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:1U];
         [cluster recallSceneWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5b: TH sends a RecallScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01 and the TransitionTime field omitted. Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 5b: TH sends a RecallScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01 and the TransitionTime field omitted.: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 5b: TH sends a RecallScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01 and the TransitionTime field omitted.: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173225,7 +191016,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH confirm the DUT reached AC1 (on level control cluster) after 20s Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH confirm the DUT reached AC1 (on level control cluster) after 20s: Error: %@", err);
+            } else {
+                NSLog(@"TH confirm the DUT reached AC1 (on level control cluster) after 20s: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173269,7 +191064,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithOnOffWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 6a: TH configures AC2 on DUT for all implemented application clusters supporting scenes. Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 6a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 6a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173304,7 +191103,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:50U];
         [cluster recallSceneWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x0032 (5s). Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x0032 (5s).: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x0032 (5s).: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173330,7 +191133,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeCurrentLevelWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 5s Error: %@", err);
+            if (err != nil) {
+                NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 5s: Error: %@", err);
+            } else {
+                NSLog(@"TH confirm the DUT reached AC2 (on level control cluster) after 5s: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173374,7 +191181,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedChar:0U];
         [cluster moveToLevelWithOnOffWithParams:params completion:
                                                            ^(NSError * _Nullable err) {
-                                                               NSLog(@"Step 7a: TH configures AC2 on DUT for all implemented application clusters supporting scenes. Error: %@", err);
+                                                               if (err != nil) {
+                                                                   NSLog(@"Step 7a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Error: %@", err);
+                                                               } else {
+                                                                   NSLog(@"Step 7a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.: Success");
+                                                               }
 
                                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173408,7 +191219,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         params.transitionTime = nil;
         [cluster recallSceneWithParams:params completion:
                                                   ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 7b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to null (no transition time override). Error: %@", err);
+                                                      if (err != nil) {
+                                                          NSLog(@"Step 7b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to null (no transition time override).: Error: %@", err);
+                                                      } else {
+                                                          NSLog(@"Step 7b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to null (no transition time override).: Success");
+                                                      }
 
                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173430,7 +191245,11 @@ class Test_TC_S_2_4 : public TestCommandBridge {
             [NSNumber numberWithUnsignedShort:417U];
         [cluster keySetRemoveWithParams:params completion:
                                                    ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 8: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a1 Error: %@", err);
+                                                       if (err != nil) {
+                                                           NSLog(@"Step 8: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a1: Error: %@", err);
+                                                       } else {
+                                                           NSLog(@"Step 8: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a1: Success");
+                                                       }
 
                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173546,7 +191365,11 @@ class TestActivatedCarbonFilterMonitoring : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate the feature map Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate the feature map: Error: %@", err);
+            } else {
+                NSLog(@"Validate the feature map: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173565,7 +191388,11 @@ class TestActivatedCarbonFilterMonitoring : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Replacement Product List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Replacement Product List: Error: %@", err);
+            } else {
+                NSLog(@"Read Replacement Product List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173696,7 +191523,11 @@ class TestHepaFilterMonitoring : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate the feature map Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Validate the feature map: Error: %@", err);
+            } else {
+                NSLog(@"Validate the feature map: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173715,7 +191546,11 @@ class TestHepaFilterMonitoring : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read Replacement Product List Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Read Replacement Product List: Error: %@", err);
+            } else {
+                NSLog(@"Read Replacement Product List: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -173989,7 +191824,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174013,7 +191852,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174037,7 +191880,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given ACFREMON.S.F00(Condition) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given ACFREMON.S.F00(Condition) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given ACFREMON.S.F00(Condition) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174056,7 +191903,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given ACFREMON.S.F01(Warning) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given ACFREMON.S.F01(Warning) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given ACFREMON.S.F01(Warning) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174075,7 +191926,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given ACFREMON.S.F01(ReplacementProductList) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given ACFREMON.S.F01(ReplacementProductList) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given ACFREMON.S.F01(ReplacementProductList) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174094,7 +191949,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174121,7 +191980,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4a: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174147,7 +192010,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174170,7 +192037,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (ACFREMON.S.A0003) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (ACFREMON.S.A0003) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (ACFREMON.S.A0003) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174191,7 +192062,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional attribute LastChangedTime (ACFREMON.S.A0004) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional attribute LastChangedTime (ACFREMON.S.A0004) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional attribute LastChangedTime (ACFREMON.S.A0004) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174212,7 +192087,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (ACFREMON.S.F02) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (ACFREMON.S.F02) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (ACFREMON.S.F02) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174233,7 +192112,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174257,7 +192140,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174278,7 +192165,11 @@ class Test_TC_ACFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174452,7 +192343,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the Condition attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the Condition attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the Condition attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174474,7 +192369,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute.. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute..: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute..: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174496,7 +192395,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174518,7 +192421,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174537,7 +192444,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174560,7 +192471,11 @@ class Test_TC_ACFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174820,7 +192735,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: Read the global attribute: ClusterRevision Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: Read the global attribute: ClusterRevision: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174844,7 +192763,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3a: Read the global attribute: FeatureMap Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Error: %@", err);
+            } else {
+                NSLog(@"Step 3a: Read the global attribute: FeatureMap: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174868,7 +192791,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3b: Given HEPAFREMON.S.F00(Condition) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3b: Given HEPAFREMON.S.F00(Condition) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3b: Given HEPAFREMON.S.F00(Condition) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174887,7 +192814,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3c: Given HEPAFREMON.S.F01(Warning) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3c: Given HEPAFREMON.S.F01(Warning) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3c: Given HEPAFREMON.S.F01(Warning) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174906,7 +192837,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3d: Given HEPAFREMON.S.F02(ReplacementProductList) ensure featuremap has the correct bit set Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3d: Given HEPAFREMON.S.F02(ReplacementProductList) ensure featuremap has the correct bit set: Error: %@", err);
+            } else {
+                NSLog(@"Step 3d: Given HEPAFREMON.S.F02(ReplacementProductList) ensure featuremap has the correct bit set: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174925,7 +192860,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174952,7 +192891,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: Read the global attribute: AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -174978,7 +192921,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4b: Read the feature dependent(HEPAFREMON.S.F00) attribute in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4b: Read the feature dependent(HEPAFREMON.S.F00) attribute in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4b: Read the feature dependent(HEPAFREMON.S.F00) attribute in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175001,7 +192948,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (HEPAFREMON.S.A0003) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (HEPAFREMON.S.A0003) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4c: Read the optional attribute InPlaceIndicator (HEPAFREMON.S.A0003) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175022,7 +192973,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4d: Read the optional attribute LastChangedTime (HEPAFREMON.S.A0004) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4d: Read the optional attribute LastChangedTime (HEPAFREMON.S.A0004) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4d: Read the optional attribute LastChangedTime (HEPAFREMON.S.A0004) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175043,7 +192998,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (HEPAFREMON.S.F02) in AttributeList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (HEPAFREMON.S.F02) in AttributeList: Error: %@", err);
+            } else {
+                NSLog(@"Step 4e: Read the optional attribute ReplacementProductList (HEPAFREMON.S.F02) in AttributeList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175064,7 +193023,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the global attribute: AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175088,7 +193051,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: Read the optional command (ResetCondition) in AcceptedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175109,7 +193076,11 @@ class Test_TC_HEPAFREMON_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: Read the global attribute: GeneratedCommandList Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175283,7 +193254,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeConditionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 2: TH reads from the DUT the Condition attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 2: TH reads from the DUT the Condition attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 2: TH reads from the DUT the Condition attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175305,7 +193280,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeDegradationDirectionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute.. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute..: Error: %@", err);
+            } else {
+                NSLog(@"Step 3: TH reads from the DUT the DegradationDirection attribute..: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175327,7 +193306,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeChangeIndicationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute. Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute.: Error: %@", err);
+            } else {
+                NSLog(@"Step 4: TH reads from the DUT the ChangeIndication attribute.: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175349,7 +193332,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 5: TH reads from the DUT the InPlaceIndicator attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175368,7 +193355,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeLastChangedTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 6: TH reads from the DUT the LastChangedTime attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175391,7 +193382,11 @@ class Test_TC_HEPAFREMON_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeReplacementProductListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute Error: %@", err);
+            if (err != nil) {
+                NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute: Error: %@", err);
+            } else {
+                NSLog(@"Step 7: TH reads from the DUT the ReplacementProductList attribute: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -175463,7 +193458,6 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_RNCONC_2_1>(),
         make_unique<Test_TC_TVOCCONC_1_1>(),
         make_unique<Test_TC_TVOCCONC_2_1>(),
-        make_unique<TestIcdManagementCluster>(),
         make_unique<Test_TC_OPCREDS_1_2>(),
         make_unique<Test_TC_BINFO_1_1>(),
         make_unique<Test_TC_CNET_1_3>(),
@@ -175487,6 +193481,7 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_DGGEN_1_1>(),
         make_unique<Test_TC_GRPKEY_1_1>(),
         make_unique<Test_TC_GRPKEY_2_2>(),
+        make_unique<TestIcdManagementCluster>(),
         make_unique<Test_TC_ICDM_1_1>(),
         make_unique<Test_TC_I_1_1>(),
         make_unique<Test_TC_I_2_1>(),
@@ -175572,6 +193567,7 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_PCC_2_3>(),
         make_unique<Test_TC_PCC_2_4>(),
         make_unique<Test_TC_REFALM_1_1>(),
+        make_unique<Test_TC_REFALM_2_1>(),
         make_unique<Test_TC_RH_1_1>(),
         make_unique<Test_TC_RVCCLEANM_1_1>(),
         make_unique<Test_TC_RVCRUNM_1_1>(),
@@ -175672,6 +193668,7 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_DRLK_2_11>(),
         make_unique<TestGroupsCluster>(),
         make_unique<Test_TC_G_1_1>(),
+        make_unique<TestScenesFabricRemoval>(),
         make_unique<Test_TC_S_1_1>(),
         make_unique<Test_TC_S_2_1>(),
         make_unique<Test_TC_S_2_4>(),
diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
index 09f959a75058dc..35de801fb5d94d 100644
--- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
@@ -320,7 +320,7 @@ class Test_TC_DGWIFI_3_2_SimulatedSuite : public TestCommand
         {
         case 0: {
             LogStep(0, "DUT sends ResetCounts command to TH");
-            VerifyOrDo(!ShouldSkip("DGWIFI.S.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DGWIFI.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WiFiNetworkDiagnostics::Id, WiFiNetworkDiagnostics::Commands::ResetCounts::Id);
         }
         }
diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
index 09f959a75058dc..35de801fb5d94d 100644
--- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
@@ -320,7 +320,7 @@ class Test_TC_DGWIFI_3_2_SimulatedSuite : public TestCommand
         {
         case 0: {
             LogStep(0, "DUT sends ResetCounts command to TH");
-            VerifyOrDo(!ShouldSkip("DGWIFI.S.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DGWIFI.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WiFiNetworkDiagnostics::Id, WiFiNetworkDiagnostics::Commands::ResetCounts::Id);
         }
         }